User defined imports name mangling

waspc/data/Generator/templates/server/src/dbSeed.ts

@@ -9,12 +9,12 @@
 import { prisma, DbSeedFn } from 'wasp/server'
 
 {=# dbSeeds =}
-{=& importStatement =}
+{=& seedFn.importStatement =}
 {=/ dbSeeds =}
 
 const seeds = {
   {=# dbSeeds =}
-  {= importIdentifier =},
+  {= name =}: {= seedFn.importIdentifier =},
   {=/ dbSeeds =}
 }
 

waspc/data/Generator/templates/server/src/middleware/globalMiddleware.ts

@@ -11,9 +11,10 @@ export type { MiddlewareConfig, MiddlewareConfigFn } from 'wasp/server/middlewar
 
 {=# globalMiddlewareConfigFn.isDefined =}
 {=& globalMiddlewareConfigFn.importStatement =}
+const globalMiddlewareConfigFn = {= globalMiddlewareConfigFn.importIdentifier =}
 {=/ globalMiddlewareConfigFn.isDefined =}
 {=^ globalMiddlewareConfigFn.isDefined =}
-const {=& globalMiddlewareConfigFn.importAlias =} = (mc: MiddlewareConfig) => mc
+const globalMiddlewareConfigFn = (mc: MiddlewareConfig) => mc
 {=/ globalMiddlewareConfigFn.isDefined =}
 
 // This is the set of middleware Wasp supplies by default.
@@ -29,7 +30,7 @@ const defaultGlobalMiddlewareConfig: MiddlewareConfig = new Map([
 
 // This is the global middleware that is the result of applying the user's modifications.
 // It will be used as the basis for Operations and APIs (unless they are further customized).
-const globalMiddlewareConfig: MiddlewareConfig = {=& globalMiddlewareConfigFn.importAlias =}(defaultGlobalMiddlewareConfig)
+const globalMiddlewareConfig: MiddlewareConfig = globalMiddlewareConfigFn(defaultGlobalMiddlewareConfig)
 
 // This function returns an array of Express middleware to be used by a router. It optionally
 // accepts a function that can modify the global middleware for specific route customization.

waspc/data/Generator/templates/server/src/routes/apis/index.ts

@@ -9,32 +9,32 @@ import { type AuthUser } from 'wasp/auth'
 {=/ isAuthEnabled =}
 
 {=# apiNamespaces =}
-{=& namespaceMiddlewareConfigFnImportStatement =}
+{=& namespaceMiddlewareConfigFn.importStatement =}
 {=/ apiNamespaces =}
 
 {=# apiRoutes =}
-{=& importStatement =}
+{=& apiRouteFn.importStatement =}
 {=# routeMiddlewareConfigFn.isDefined =}
 {=& routeMiddlewareConfigFn.importStatement =}
 {=/ routeMiddlewareConfigFn.isDefined =}
 {=/ apiRoutes =}
 
 const idFn: MiddlewareConfigFn = x => x
 
-{=# apiRoutes =}
-{=^ routeMiddlewareConfigFn.isDefined =}
-const {=& routeMiddlewareConfigFn.importAlias =} = idFn
-{=/ routeMiddlewareConfigFn.isDefined =}
-{=/ apiRoutes =}
-
 const router = express.Router()
 
 {=# apiNamespaces =}
-router.use('{= namespacePath =}', globalMiddlewareConfigForExpress({= namespaceMiddlewareConfigFnImportAlias =}))
+router.use('{= namespacePath =}', globalMiddlewareConfigForExpress({= namespaceMiddlewareConfigFn.importIdentifier =}))
 {=/ apiNamespaces =}
 
 {=# apiRoutes =}
-const {= apiName =}Middleware = globalMiddlewareConfigForExpress({= routeMiddlewareConfigFn.importAlias =})
+{=# routeMiddlewareConfigFn.isDefined =}
+const {= apiName =}Middleware = globalMiddlewareConfigForExpress({= routeMiddlewareConfigFn.importIdentifier =})
+{=/ routeMiddlewareConfigFn.isDefined =}
+{=^ routeMiddlewareConfigFn.isDefined =}
+const {= apiName =}Middleware = globalMiddlewareConfigForExpress(idFn)
+{=/ routeMiddlewareConfigFn.isDefined =}
+
 router.{= routeMethod =}(
   '{= routePath =}',
   {=# usesAuth =}
@@ -45,8 +45,8 @@ router.{= routeMethod =}(
   {=/ usesAuth =}
   handleRejection(
     (
-      req: Parameters<typeof {= importIdentifier =}>[0]{=# usesAuth =} & { user: AuthUser }{=/ usesAuth =},
-      res: Parameters<typeof {= importIdentifier =}>[1],
+      req: Parameters<typeof {= apiRouteFn.importIdentifier =}>[0]{=# usesAuth =} & { user: AuthUser }{=/ usesAuth =},
+      res: Parameters<typeof {= apiRouteFn.importIdentifier =}>[1],
     ) => {
       const context = {
         {=# usesAuth =}
@@ -58,7 +58,7 @@ router.{= routeMethod =}(
           {=/ entities =}
         },
       }
-      return {= importIdentifier =}(req, res, context)
+      return {= apiRouteFn.importIdentifier =}(req, res, context)
     }
   )
 )