@postxl/generators 1.18.0 → 1.19.0

package/dist/backend-router-trpc/generators/model-routes.generator.js

@@ -75,20 +75,30 @@ import { z } from 'zod'
     ${model.trpcRoute.get.name}: procedure
       .use(authMiddleware)
       .input(${model.types.id.decoder.name})
-      .query(({ input, ctx }) => ctx.view.${variableName}.get({ id: input, user: ctx.user})),
+      .query(({ input, ctx }) =>
+        ctx.view.${variableName}.get({
+          id: input,
+          authorization: ctx.viewer,
+        }),
+      ),
 
     getByKey: procedure
       .use(authMiddleware)
       .input(z.string())
-      .query(({ input, ctx }) => ctx.view.${variableName}.getByKey({ key: input, user: ctx.user})),
+      .query(({ input, ctx }) =>
+        ctx.view.${variableName}.getByKey({
+          key: input,
+          authorization: ctx.viewer,
+        }),
+      ),
 
     ${model.trpcRoute.getMap.name}: procedure
       .use(authMiddleware)
-      .query(({ ctx }) => ctx.view.${variableName}.getAll(ctx.user)),
+      .query(({ ctx }) => ctx.view.${variableName}.getAll(ctx.viewer)),
     
     ${model.trpcRoute.getList.name}: procedure
       .use(authMiddleware)
-      .query(({ ctx }) => ctx.view.${variableName}.getList(ctx.user)),
+      .query(({ ctx }) => ctx.view.${variableName}.getList(ctx.viewer)),
 
     ${model.trpcRoute.getFiltered.name}: procedure
       .use(authMiddleware)
@@ -98,7 +108,13 @@ import { z } from 'zod'
           sort: ${model.types.sort.decoder.name},
         }),
       )
-      .query(({ input, ctx }) => ctx.view.${variableName}.getFiltered({ filters: input.filters, sort: input.sort, user: ctx.user })),
+      .query(({ input, ctx }) =>
+        ctx.view.${variableName}.getFiltered({
+          filters: input.filters,
+          sort: input.sort,
+          authorization: ctx.viewer,
+        }),
+      ),
 
     ${model.trpcRoute.getFilteredPaginated.name}: procedure
       .use(authMiddleware)
@@ -116,7 +132,7 @@ import { z } from 'zod'
         sort: input.sort,
         cursor: input.cursor ?? 1,
         limit: input.limit ?? 100,
-        user: ctx.user
+        authorization: ctx.viewer,
       })),
 
     ${model.trpcRoute.getFilterOptions.name}: procedure
@@ -128,7 +144,11 @@ import { z } from 'zod'
         }),
       )
       .query(({ input, ctx }) =>
-        ctx.view.${variableName}.getFilterOptions({ field: input.field, filters: input.filters, user: ctx.user }),
+        ctx.view.${variableName}.getFilterOptions({
+          field: input.field,
+          filters: input.filters,
+          authorization: ctx.viewer,
+        }),
       ),
 
     ${mutations.join('\n')}

package/dist/backend-router-trpc/generators/model-routes.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAoGC;AA3GD,6DAA8C;AAI9C;;GAEG;AACH,SAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAyD;IAC3G,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;SACtE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;SAC/B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;SAC7B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAC7B,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;SAC3G,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACxG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IAExG,MAAM,SAAS,GAAa,EAAE,CAAA;IAE9B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACxE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACnC,SAAS,CAAC,IAAI,CAAC;UACX,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;iBAClD,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;mBACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;gEACkB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,aAAa,MAAM,CAAC,IAAI;OAC1G,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,eAAe,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,gCAAgC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,sBAAsB,CAAA;IACxK,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;IACpD,OAAO,QAAQ,CAAC;;;IAGd,OAAO,CAAC,QAAQ,EAAE;;iBAEL,KAAK,CAAC,SAAS,CAAC,IAAI;MAC/B,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB;;MAE1D,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI;;eAEf,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI;4CACE,YAAY;;;;;4CAKZ,YAAY;;MAElD,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI;;qCAEI,YAAY;;MAE3C,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI;;qCAEG,YAAY;;MAE3C,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;;;;qBAIjB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;kBAClC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;4CAGH,YAAY;;MAElD,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI;;;;qBAI1B,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;kBAClC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;;;;4CAMH,YAAY;;;;;;;;MAQlD,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI;;;;0BAIjB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;qBAClC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;;;;mBAIjC,YAAY;;;MAGzB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;;GAGvB,CAAA;AACH,CAAC"}
+{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":"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"}

package/dist/backend-router-trpc/generators/trpc-plugin.generator.js

@@ -43,15 +43,18 @@ function generateTrpc(context) {
         .add(context.ai.agentService)
         .add(context.authentication.service)
         .add(context.authentication.types.userInfo)
-        .add(context.authentication.types.userRoles)
+        .addType(context.types.userRoles)
         .add({
         name: Generator.toClassName('ExcelIoService'),
         location: Generator.toBackendModuleLocation('@excel-io/excel-io.service'),
     })
-        .add(context.types.user)
         .add(context.view.service)
         .add({ name: context.trpcRouter.appRoutes.name, location: context.trpcRouter.appRoutes._filePath })
-        .add({ name: context.trpcRouter._shared.context.name, location: context.trpcRouter._shared._filePath });
+        .add({ name: context.trpcRouter._shared.context.name, location: context.trpcRouter._shared._filePath })
+        .addType({
+        name: context.trpcRouter._shared.authenticatedViewer.name,
+        location: context.trpcRouter._shared._filePath,
+    });
     return /* ts */ `
 import { Injectable, Logger } from '@nestjs/common'
 import { NestFastifyApplication } from '@nestjs/platform-fastify'
@@ -84,10 +87,10 @@ export class ${context.trpcRouter.plugin.name} {
           // In \`createContext\`, we already extract the viewer from the request. However,
           // we do not throw in case we cannot identify/create a viewer or user to also allow anonymous routes.
           // To ensure that only authenticated users can access particular routes, use the \`${context.trpcRouter._middleware.auth.name}\`!
-          let viewer: { userInfo: UserInfo; userRoles: UserRoles; user: User; isAuthorized: boolean } | null = null
+          let viewer: ${context.trpcRouter._shared.authenticatedViewer.name} | null = null
 
           let userInfo: UserInfo | null = null
-          let userRoles: UserRoles = []
+          let userRoles: ${context.types.userRoles.name} = []
 
           const associatedUserInfo = await this.authService.getUserInfoFromRequest(req)
 
@@ -121,7 +124,7 @@ export class ${context.trpcRouter.plugin.name} {
               }
             }
 
-            viewer = { userInfo, userRoles, user, isAuthorized: true }
+            viewer = { userRoles, user }
           }
 
           return {

package/dist/backend-router-trpc/generators/trpc-plugin.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"trpc-plugin.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-plugin.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oCAgHC;AApHD,6DAA8C;AAI9C,SAAgB,YAAY,CAAC,OAAsB;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe;QACvC,EAAE;SACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;SACzC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC1C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC;SAC3C,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;SACvB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SACzB,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SAClG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IAEzG,OAAO,QAAQ,CAAC;;;;;EAKhB,OAAO,CAAC,QAAQ,EAAE;;;WAGT,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;;;;eAK1B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;yCACJ,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;oCAEnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;oCACzB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;0CAC7B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;uCAClC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;kBAQjD,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI;oFACiC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;+FAG5B,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8DrI,CAAA;AACF,CAAC"}
+{"version":3,"file":"trpc-plugin.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-plugin.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oCAmHC;AAvHD,6DAA8C;AAI9C,SAAgB,YAAY,CAAC,OAAsB;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe;QACvC,EAAE;SACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;SACzC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC1C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;SAChC,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SACzB,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SAClG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACtG,OAAO,CAAC;QACP,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;QACzD,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS;KAC/C,CAAC,CAAA;IAEJ,OAAO,QAAQ,CAAC;;;;;EAKhB,OAAO,CAAC,QAAQ,EAAE;;;WAGT,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;;;;eAK1B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;yCACJ,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;oCAEnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;oCACzB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;0CAC7B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;uCAClC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;kBAQjD,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI;oFACiC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;+FAG5B,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;wBAC/G,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;;;2BAGhD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0DrD,CAAA;AACF,CAAC"}

package/dist/backend-router-trpc/generators/trpc-shared.generator.js

@@ -39,14 +39,12 @@ function generateTrpcShared(context) {
     const imports = Generator.ImportGenerator.from(context.trpcRouter._shared._filePath)
         .add(context.actions.dispatcher)
         .add(context.ai.agentService)
-        .add(context.authentication.types.userInfo)
-        .add(context.authentication.types.userRoles)
+        .addType(context.types.authorizationContext)
         .add(context.authentication.service)
         .add({
         name: Generator.toClassName('ExcelIoService'),
         location: Generator.toBackendModuleLocation('@excel-io/excel-io.service'),
     })
-        .add(context.types.user)
         .add(context.view.service);
     return /* ts */ `
 // We import Fastify cookie here to ensure that the cookie plugin and its types are registered.
@@ -60,6 +58,8 @@ import { FastifyReply, FastifyRequest } from 'fastify'
 
 ${imports.generate()}
 
+export type ${context.trpcRouter._shared.authenticatedViewer.name} = ${context.types.authorizationContext.name}
+
 /**
 * The shared context available to all routes before authentication.
 */
@@ -72,27 +72,7 @@ export type ${context.trpcRouter._shared.context.name} = {
  /**
   * The viewer as derived from the current session.
   */
- viewer: {
-   /**
-    * Keycloak provided user information.
-    */
-   userInfo: ${context.authentication.types.userInfo.name}
-
-   /**
-    * The roles associated with the user.
-    */
-   userRoles: ${context.authentication.types.userRoles.name}
-
-   /**
-    * The user in the database.
-    */
-   user: ${context.types.user.name}
-
-   /**
-    * Whether the user is authorized to access the requested resource.
-    */
-   isAuthorized: boolean
- } | null
+ viewer: ${context.trpcRouter._shared.authenticatedViewer.name} | null
 
  /**
   * Authentication service to retrieve user information from the session

package/dist/backend-router-trpc/generators/trpc-shared.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"trpc-shared.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-shared.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gDA+GC;AAnHD,6DAA8C;AAI9C,SAAgB,kBAAkB,CAAC,OAAsB;IACvD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;SACjF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC1C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC;SAC3C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;SACvB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE5B,OAAO,QAAQ,CAAC;;;;;;;;;;EAUhB,OAAO,CAAC,QAAQ,EAAE;;;;;cAKN,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;;;;;;;;;eAatC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI;;;;;gBAKzC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI;;;;;WAKhD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI;;;;;;;;;;;SAWzB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;;;;;SAKnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;;;cAKpB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;YAKjC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;;wFASgD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;OACvH,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,YAAY,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;6BAEzE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;WAKzD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;eAGlC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;WAG1C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;eAErC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;;mCAGrB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;eAE9D,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;CAExD,CAAA;AACD,CAAC"}
+{"version":3,"file":"trpc-shared.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-shared.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gDA2FC;AA/FD,6DAA8C;AAI9C,SAAgB,kBAAkB,CAAC,OAAsB;IACvD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;SACjF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC;SAC3C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE5B,OAAO,QAAQ,CAAC;;;;;;;;;;EAUhB,OAAO,CAAC,QAAQ,EAAE;;cAEN,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,MAAM,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI;;;;;cAKhG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;;;;;WAS1C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;;;;;SAKrD,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;;;;;SAKnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;;;cAKpB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;YAKjC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;;wFASgD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;OACvH,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,YAAY,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;6BAEzE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;WAKzD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;eAGlC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;WAG1C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;eAErC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;;mCAGrB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;eAE9D,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;CAExD,CAAA;AACD,CAAC"}

package/dist/backend-router-trpc/router-trpc.generator.d.ts

@@ -80,6 +80,10 @@ export type TrpcRouterContext = {
          *                Use `_middleware.auth.context` to access the user!
          */
         context: Generator.ImportableType;
+        /**
+         * The authenticated viewer object (user + roles + claims).
+         */
+        authenticatedViewer: Generator.ImportableType;
     };
     /**
      * Middleware that can be used in any route

package/dist/backend-router-trpc/router-trpc.generator.js

@@ -134,6 +134,7 @@ exports.generator = {
                 procedure: { name: Generator.toFunctionName('procedure'), location: trpcLocation },
                 middleware: { name: Generator.toFunctionName('middleware'), location: trpcLocation },
                 context: { name: Generator.toTypeName('InitialContext'), location: trpcLocation },
+                authenticatedViewer: { name: Generator.toTypeName('AuthenticatedViewer'), location: trpcLocation },
             },
             _middleware: {
                 _filePath: Generator.toFilePath(`./middleware.ts`),

package/dist/backend-router-trpc/router-trpc.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":"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"}

package/dist/backend-router-trpc/template/viewer.router.ts

@@ -6,17 +6,12 @@ import { err, ok } from '@postxl/utils'
 
 import { procedure, router } from '../trpc-shared'
 
-function omit<T extends Record<string, unknown>, Key extends keyof T>(obj: T, key: Key): Omit<T, Key> {
-  const { [key]: _, ...rest } = obj
-  return rest
-}
-
 export const viewer = router({
   viewer: procedure
     .input(z.object({ pageUrl: z.string().describe('The url of the active page.') }))
     .query(async ({ ctx, input }): Promise<ViewerResult> => {
       if (ctx.viewer) {
-        return ok(omit(ctx.viewer, 'userInfo'))
+        return ok(ctx.viewer)
       }
       const redirectUrl = await ctx.auth.getAuthenticationUrl({ redirectTo: decodeURIComponent(input.pageUrl) })
 

package/dist/backend-update/update-actions.decoders.d.ts

@@ -1,14 +1,14 @@
 import { z } from 'zod';
 declare const zStandardActions: z.ZodEnum<{
-    update: "update";
     create: "create";
+    update: "update";
+    delete: "delete";
     createMany: "createMany";
     updateMany: "updateMany";
     updateField: "updateField";
     updateFieldMany: "updateFieldMany";
     upsert: "upsert";
     upsertMany: "upsertMany";
-    delete: "delete";
     deleteMany: "deleteMany";
     clone: "clone";
     cloneMany: "cloneMany";
@@ -16,15 +16,15 @@ declare const zStandardActions: z.ZodEnum<{
 export type StandardAction = z.infer<typeof zStandardActions>;
 export declare const zUpdateActions: z.ZodObject<{
     standardActions: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        update: "update";
         create: "create";
+        update: "update";
+        delete: "delete";
         createMany: "createMany";
         updateMany: "updateMany";
         updateField: "updateField";
         updateFieldMany: "updateFieldMany";
         upsert: "upsert";
         upsertMany: "upsertMany";
-        delete: "delete";
         deleteMany: "deleteMany";
         clone: "clone";
         cloneMany: "cloneMany";

package/dist/backend-upload/template/src/upload.controller.ts

@@ -38,7 +38,7 @@ export class UploadController {
     @Res({ passthrough: true }) res: FastifyReply,
   ): Promise<void> {
     const fileId: FileId = toFileId(fileIdRaw)
-    const file = await this.uploadService.getStoredFileRecord({ fileId, user: viewer.user })
+    const file = await this.uploadService.getStoredFileRecord({ fileId, authorization: viewer })
     const buffer = await this.uploadService.getBufferFromFileRecord({ fileId, location: file.url })
 
     const filename = file.name || `file-${fileId}`

package/dist/backend-upload/template/src/upload.service.ts

@@ -1,7 +1,7 @@
 import { DispatcherService } from '@actions/dispatcher.service'
 import { BadRequestException, Injectable, NotFoundException, PayloadTooLargeException } from '@nestjs/common'
 import { S3Service } from '@s3/s3.service'
-import type { FileId, User } from '@types'
+import type { AuthorizationContext, FileId, User } from '@types'
 import { ViewService } from '@view/view.service'
 
 import type { MultipartFile } from '@fastify/multipart'
@@ -140,8 +140,14 @@ export class UploadService {
     }
   }
 
-  public async getStoredFileBuffer({ fileId, user }: { fileId: FileId; user: User }): Promise<Buffer> {
-    const file = await this.viewService.files.get({ id: fileId, user })
+  public async getStoredFileBuffer({
+    fileId,
+    authorization,
+  }: {
+    fileId: FileId
+    authorization: AuthorizationContext
+  }): Promise<Buffer> {
+    const file = await this.viewService.files.get({ id: fileId, authorization })
     if (!file) {
       throw new NotFoundException(`File ${fileId} not found`)
     }
@@ -149,8 +155,8 @@ export class UploadService {
     return this.readStoredFile({ fileId, location: file.url })
   }
 
-  public async getStoredFileRecord({ fileId, user }: { fileId: FileId; user: User }) {
-    const file = await this.viewService.files.get({ id: fileId, user })
+  public async getStoredFileRecord({ fileId, authorization }: { fileId: FileId; authorization: AuthorizationContext }) {
+    const file = await this.viewService.files.get({ id: fileId, authorization })
     if (!file) {
       throw new NotFoundException(`File ${fileId} not found`)
     }