Update imports and API for server/operations (#1711)

waspc/data/Generator/templates/sdk/package.json

@@ -56,10 +56,10 @@
       "./universal/validators": "./dist/universal/validators.js",
       {=!  Parts are used by users, documented. Parts are probably used by our code, undocumented (but accessible). =}
       "./server/utils": "./dist/server/utils.js",
-      {=!  Used by our code, uncodumented (but accessible) for users. =}
-      "./server/actions": "./dist/server/actions/index.js",
-      {=!  Used by our code, uncodumented (but accessible) for users. =}
-      "./server/queries": "./dist/server/queries/index.js",
+      {=!  Used by our code (SDK for full-stack type safety), uncodumented (but accessible) for users. =}
+      "./server/opeations/actions": "./dist/server/actions/index.js",
+      {=!  Used by our code (SDK for full-stack type safety), uncodumented (but accessible) for users. =}
+      "./server/operations/queries": "./dist/server/queries/index.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
       "./server/auth/email": "./dist/server/auth/email/index.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
@@ -107,6 +107,7 @@
       "./client/crud": "./dist/client/crud/index.js",
       "./server/email": "./dist/server/email/index.js",
       "./server/jobs": "./dist/server/jobs/index.js",
+      "./server/operations": "./dist/server/operations/index.js",
       "./client/router": "./dist/client/router/index.js",
       "./client/test": "./dist/client/test/index.js"
    },

waspc/data/Generator/templates/sdk/server/actions/index.ts → waspc/data/Generator/templates/sdk/server/operations/actions/index.ts

@@ -11,8 +11,10 @@ import { prisma } from 'wasp/server'
 {=/ operations =}
 {=# operations =}
 
+// PRIVATE API
 export type {= operationTypeName =} = typeof {= jsFn.importIdentifier =} 
 
+// PUBLIC API
 export const {= operationName =} = async (args, context) => {
   return ({= jsFn.importIdentifier =} as any)(args, {
     ...context,

waspc/data/Generator/templates/sdk/server/actions/types.ts → waspc/data/Generator/templates/sdk/server/operations/actions/types.ts

@@ -15,6 +15,7 @@ import {
 } from 'wasp/server/_types'
 
 {=# operations =}
+// PUBLIC API
 export type {= typeName =}<Input extends Payload = never, Output extends Payload = Payload> = 
   {=# usesAuth =}
   AuthenticatedAction<

waspc/data/Generator/templates/sdk/server/operations/index.ts

@@ -0,0 +1,4 @@
+// PUBLIC API
+export * from './queries/types'
+// PUBLIC API
+export * from './actions/types'

waspc/data/Generator/templates/sdk/server/queries/index.ts → waspc/data/Generator/templates/sdk/server/operations/queries/index.ts

@@ -11,8 +11,10 @@ import { prisma } from 'wasp/server'
 {=/ operations =}
 {=# operations =}
 
+// PRIVATE API
 export type {= operationTypeName =} = typeof {= jsFn.importIdentifier =} 
 
+// PUBLIC API
 export const {= operationName =} = async (args, context) => {
   return ({= jsFn.importIdentifier =} as any)(args, {
     ...context,

waspc/data/Generator/templates/sdk/server/queries/types.ts → waspc/data/Generator/templates/sdk/server/operations/queries/types.ts

@@ -16,6 +16,7 @@ import {
 } from 'wasp/server/_types'
 
 {=# operations =}
+// PUBLIC API
 export type {= typeName =}<Input extends Payload = never, Output extends Payload = Payload> = 
   {=# usesAuth =}
   AuthenticatedQuery<

waspc/examples/todo-typescript/src/task/actions.ts

@@ -3,7 +3,7 @@ import type {
   CreateTask,
   UpdateTask,
   DeleteTasks,
-} from 'wasp/server/actions/types'
+} from 'wasp/server/operations'
 import type { Task } from 'wasp/entities'
 import { emailSender } from 'wasp/server/email'
 

waspc/examples/todo-typescript/src/task/queries.ts

@@ -1,5 +1,5 @@
 import { HttpError, AuthError } from 'wasp/server'
-import type { GetTasks } from 'wasp/server/queries/types'
+import type { GetTasks } from 'wasp/server/operations'
 import type { Task } from 'wasp/entities'
 import { ensureValidEmail, createProviderId } from 'wasp/server/auth'
 

waspc/src/Wasp/Generator/SdkGenerator.hs

@@ -47,8 +47,8 @@ import Wasp.Generator.SdkGenerator.Server.AuthG (genNewServerApi)
 import Wasp.Generator.SdkGenerator.Server.CrudG (genNewServerCrudApi)
 import Wasp.Generator.SdkGenerator.Server.EmailSenderG (depsRequiredByEmail, genNewEmailSenderApi)
 import Wasp.Generator.SdkGenerator.Server.JobGenerator (genNewJobsApi)
+import qualified Wasp.Generator.SdkGenerator.Server.OperationsGenerator as ServerOpsGen
 import Wasp.Generator.SdkGenerator.ServerApiG (genServerApi)
-import qualified Wasp.Generator.SdkGenerator.ServerOpsGenerator as ServerOpsGen
 import Wasp.Generator.SdkGenerator.WebSocketGenerator (depsRequiredByWebSockets, genWebSockets)
 import qualified Wasp.Generator.ServerGenerator.AuthG as ServerAuthG
 import qualified Wasp.Generator.WebAppGenerator.Common as WebApp
@@ -96,9 +96,9 @@ genSdkReal spec =
       genServerUtils spec,
       genPackageJson spec
     ]
+    <++> ServerOpsGen.genOperations spec
     <++> ClientOpsGen.genOperations spec
     <++> genAuth spec
-    <++> ServerOpsGen.genOperations spec
     <++> genUniversalDir
     <++> genExternalCodeDir (AS.externalCodeFiles spec)
     <++> genEntitiesAndServerTypesDirs spec

waspc/src/Wasp/Generator/SdkGenerator/Client/OperationsGenerator.hs

@@ -16,7 +16,7 @@ import Wasp.Generator.FileDraft (FileDraft)
 import Wasp.Generator.Monad (Generator)
 import Wasp.Generator.SdkGenerator.Common (SdkTemplatesDir, clientTemplatesDirInSdkTemplatesDir, makeSdkImportPath, relDirToRelFileP)
 import qualified Wasp.Generator.SdkGenerator.Common as C
-import Wasp.Generator.SdkGenerator.ServerOpsGenerator (serverOperationsDirInSdkRootDir)
+import Wasp.Generator.SdkGenerator.Server.OperationsGenerator (serverOperationsDirInSdkRootDir)
 import qualified Wasp.Generator.ServerGenerator as ServerGenerator
 import qualified Wasp.Generator.ServerGenerator.OperationsRoutesG as ServerOperationsRoutesG
 import Wasp.JsImport (JsImportName (JsImportField), JsImportPath (ModuleImportPath), getJsImportStmtAndIdentifier, makeJsImport)

waspc/src/Wasp/Generator/SdkGenerator/Common.hs

@@ -15,6 +15,8 @@ data SdkTemplatesDir
 
 data ClientTemplatesDir
 
+data ServerTemplatesDir
+
 asTmplFile :: Path' (Rel d) File' -> Path' (Rel SdkTemplatesDir) File'
 asTmplFile = SP.castRel
 
@@ -65,3 +67,6 @@ extCodeDirInSdkRootDir = [reldir|ext-src|]
 
 clientTemplatesDirInSdkTemplatesDir :: Path' (Rel SdkTemplatesDir) (Dir ClientTemplatesDir)
 clientTemplatesDirInSdkTemplatesDir = [reldir|client|]
+
+serverTemplatesDirInSdkTemplatesDir :: Path' (Rel SdkTemplatesDir) (Dir ServerTemplatesDir)
+serverTemplatesDirInSdkTemplatesDir = [reldir|server|]

waspc/src/Wasp/Generator/SdkGenerator/CrudG.hs

@@ -21,7 +21,7 @@ import Wasp.Generator.FileDraft (FileDraft)
 import qualified Wasp.Generator.JsImport as GJI
 import Wasp.Generator.Monad (Generator)
 import qualified Wasp.Generator.SdkGenerator.Common as C
-import Wasp.Generator.SdkGenerator.ServerOpsGenerator (extImportToJsImport)
+import Wasp.Generator.SdkGenerator.Server.OperationsGenerator (extImportToJsImport)
 
 genCrud :: AppSpec -> Generator [FileDraft]
 genCrud spec =

waspc/src/Wasp/Generator/SdkGenerator/ServerOpsGenerator.hs → waspc/src/Wasp/Generator/SdkGenerator/Server/OperationsGenerator.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE TypeApplications #-}
 
-module Wasp.Generator.SdkGenerator.ServerOpsGenerator where
+module Wasp.Generator.SdkGenerator.Server.OperationsGenerator where
 
 import Data.Aeson (object, (.=))
 import qualified Data.Aeson as Aeson
 import Data.List (nub)
 import Data.Maybe (fromJust, fromMaybe)
-import StrongPath (Dir', File', Path', Rel, reldir, relfile, (</>))
+import StrongPath (Dir, Dir', File', Path', Rel, reldir, relfile, (</>))
 import qualified StrongPath as SP
 import Wasp.AppSpec (AppSpec)
 import qualified Wasp.AppSpec as AS
@@ -20,25 +20,34 @@ import Wasp.Generator.Common (makeJsonWithEntityData)
 import Wasp.Generator.FileDraft (FileDraft)
 import qualified Wasp.Generator.JsImport as GJI
 import Wasp.Generator.Monad (Generator)
-import Wasp.Generator.SdkGenerator.Common (mkTmplFdWithData)
+import Wasp.Generator.SdkGenerator.Common (SdkTemplatesDir, mkTmplFdWithData, serverTemplatesDirInSdkTemplatesDir)
 import qualified Wasp.Generator.SdkGenerator.Common as C
 import Wasp.JsImport (JsImport (..), JsImportPath (..))
 import qualified Wasp.JsImport as JI
 import Wasp.Util (toUpperFirst)
 
+data ServerOpsTemplatesDir
+
+serverOpsDirInSdkTemplatesDir :: Path' (Rel SdkTemplatesDir) (Dir ServerOpsTemplatesDir)
+serverOpsDirInSdkTemplatesDir = serverTemplatesDirInSdkTemplatesDir </> [reldir|operations|]
+
+genServerOpsFileCopy :: Path' (Rel ServerOpsTemplatesDir) File' -> Generator FileDraft
+genServerOpsFileCopy path = return $ C.mkTmplFd $ serverOpsDirInSdkTemplatesDir </> path
+
 genOperations :: AppSpec -> Generator [FileDraft]
 genOperations spec =
   sequence
     [ genQueryTypesFile spec,
       genActionTypesFile spec,
       genQueriesIndex spec,
-      genActionsIndex spec
+      genActionsIndex spec,
+      genServerOpsFileCopy [relfile|index.ts|]
     ]
 
 genQueriesIndex :: AppSpec -> Generator FileDraft
 genQueriesIndex spec = return $ mkTmplFdWithData relPath tmplData
   where
-    relPath = [relfile|server/queries/index.ts|]
+    relPath = serverOpsDirInSdkTemplatesDir </> [relfile|queries/index.ts|]
     tmplData =
       object
         [ "operations" .= map getQueryData (AS.getQueries spec)
@@ -47,25 +56,23 @@ genQueriesIndex spec = return $ mkTmplFdWithData relPath tmplData
 genActionsIndex :: AppSpec -> Generator FileDraft
 genActionsIndex spec = return $ mkTmplFdWithData relPath tmplData
   where
-    relPath = [relfile|server/actions/index.ts|]
+    relPath = serverOpsDirInSdkTemplatesDir </> [relfile|actions/index.ts|]
     tmplData =
       object
         [ "operations" .= map getActionData (AS.getActions spec)
         ]
 
 genQueryTypesFile :: AppSpec -> Generator FileDraft
-genQueryTypesFile spec = genOperationTypesFile tmplFile dstFile operations isAuthEnabledGlobally
+genQueryTypesFile spec = genOperationTypesFile relPath operations isAuthEnabledGlobally
   where
-    tmplFile = [relfile|server/queries/types.ts|]
-    dstFile = [relfile|server/queries/types.ts|]
+    relPath = serverOpsDirInSdkTemplatesDir </> [relfile|queries/types.ts|]
     operations = map (uncurry AS.Operation.QueryOp) $ AS.getQueries spec
     isAuthEnabledGlobally = isAuthEnabled spec
 
 genActionTypesFile :: AppSpec -> Generator FileDraft
-genActionTypesFile spec = genOperationTypesFile tmplFile dstFile operations isAuthEnabledGlobally
+genActionTypesFile spec = genOperationTypesFile relPath operations isAuthEnabledGlobally
   where
-    tmplFile = [relfile|server/actions/types.ts|]
-    dstFile = [relfile|server/actions/types.ts|]
+    relPath = serverOpsDirInSdkTemplatesDir </> [relfile|actions/types.ts|]
     operations = map (uncurry AS.Operation.ActionOp) $ AS.getActions spec
     isAuthEnabledGlobally = isAuthEnabled spec
 
@@ -84,12 +91,11 @@ getActionData (actionName, action) = getOperationTmplData operation
 
 genOperationTypesFile ::
   Path' (Rel C.SdkTemplatesDir) File' ->
-  Path' (Rel C.SdkRootDir) File' ->
   [AS.Operation.Operation] ->
   Bool ->
   Generator FileDraft
-genOperationTypesFile tmplFile dstFile operations isAuthEnabledGlobally =
-  return $ C.mkTmplFdWithDstAndData tmplFile dstFile (Just tmplData)
+genOperationTypesFile tmplFile operations isAuthEnabledGlobally =
+  return $ C.mkTmplFdWithData tmplFile tmplData
   where
     tmplData =
       object
@@ -108,8 +114,10 @@ genOperationTypesFile tmplFile dstFile operations isAuthEnabledGlobally =
     usesAuth = fromMaybe isAuthEnabledGlobally . AS.Operation.getAuth
 
 serverOperationsDirInSdkRootDir :: AS.Operation.Operation -> Path' (Rel C.SdkRootDir) Dir'
-serverOperationsDirInSdkRootDir (AS.Operation.QueryOp _ _) = [reldir|server/queries|]
-serverOperationsDirInSdkRootDir (AS.Operation.ActionOp _ _) = [reldir|server/actions|]
+serverOperationsDirInSdkRootDir =
+  SP.castRel . (serverOpsDirInSdkTemplatesDir </>) . \case
+    (AS.Operation.QueryOp _ _) -> [reldir|queries|]
+    (AS.Operation.ActionOp _ _) -> [reldir|actions|]
 
 getOperationTmplData :: AS.Operation.Operation -> Aeson.Value
 getOperationTmplData operation =
@@ -143,18 +151,3 @@ extImportToJsImport extImport@(EI.ExtImport extImportName extImportPath) =
     importPath = C.makeSdkImportPath $ extCodeDirP </> SP.castRel extImportPath
     extCodeDirP = fromJust $ SP.relDirToPosix C.extCodeDirInSdkRootDir
     importName = GJI.extImportNameToJsImportName extImportName
-
--- extImportToImportJson :: EI.ExtImport -> Aeson.Value
--- extImportToImportJson extImport@(EI.ExtImport importName importPath) =
---   object
---     [ "isDefined" .= True,
---       "importStatement" .= Debug.trace jsImportStmt jsImportStmt,
---       "importIdentifier" .= importAlias
---     ]
---   where
---     jsImportStmt = case importName of
---       EI.ExtImportModule n -> "import " ++ n ++ " from '" ++ importPathStr ++ "'"
---       EI.ExtImportField n -> "import { " ++ n ++ " as " ++ importAlias ++ " } from '" ++ importPathStr ++ "'"
---     importPathStr = C.makeSdkImportPath $ extCodeDirP </> SP.castRel importPath
---     extCodeDirP = fromJust $ SP.relDirToPosix C.extCodeDirInSdkRootDir
--- importAlias = EI.importIdentifier extImport ++ "User"

waspc/src/Wasp/Generator/SdkGenerator/WebSocketGenerator.hs

@@ -18,7 +18,7 @@ import Wasp.Generator.FileDraft (FileDraft)
 import qualified Wasp.Generator.JsImport as GJI
 import Wasp.Generator.Monad (Generator)
 import qualified Wasp.Generator.SdkGenerator.Common as C
-import Wasp.Generator.SdkGenerator.ServerOpsGenerator (extImportToJsImport)
+import Wasp.Generator.SdkGenerator.Server.OperationsGenerator (extImportToJsImport)
 import qualified Wasp.Generator.WebSocket as AS.WS
 
 genWebSockets :: AppSpec -> Generator [FileDraft]

waspc/waspc.cabal

@@ -309,8 +309,8 @@ library
     Wasp.Generator.SdkGenerator.Server.CrudG
     Wasp.Generator.SdkGenerator.Server.EmailSenderG
     Wasp.Generator.SdkGenerator.Server.JobGenerator
+    Wasp.Generator.SdkGenerator.Server.OperationsGenerator
     Wasp.Generator.SdkGenerator.ServerApiG
-    Wasp.Generator.SdkGenerator.ServerOpsGenerator
     Wasp.Generator.SdkGenerator.WebSocketGenerator
     Wasp.Generator.ServerGenerator
     Wasp.Generator.ServerGenerator.JsImport