@baseplate-dev/fastify-generators 0.4.1 → 0.4.3

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.d.ts

@@ -1,12 +1,8 @@
 import type { TsCodeFragment } from '@baseplate-dev/core-generators';
 import { z } from 'zod';
 export declare const pothosAuthorizeConfigSchema: z.ZodObject<{
-    roles: z.ZodArray<z.ZodString, "many">;
-}, "strip", z.ZodTypeAny, {
-    roles: string[];
-}, {
-    roles: string[];
-}>;
+    roles: z.ZodArray<z.ZodString>;
+}, z.core.$strip>;
 export interface PothosAuthorizeConfig {
     roles: string[];
 }
@@ -25,17 +21,25 @@ export declare const pothosAuthGenerator: import("@baseplate-dev/sync").Generato
     renderers: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-renderers.js").PothosPothosAuthRenderers>;
     }, {
-        errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            BadRequestError: {};
-            ForbiddenError: {};
-            handleZodRequestValidationError: {};
-            HttpError: {};
-            InternalServerError: {};
-            logError: {};
-            NotFoundError: {};
-            UnauthorizedError: {};
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
         }>>;
         paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").PothosPothosAuthPaths>;
+        serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createServiceContext: {};
+            createSystemServiceContext: {};
+            createTestServiceContext: {};
+            ServiceContext: {
+                isTypeOnly: true;
+            };
+        }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;
     pothosConfig: import("@baseplate-dev/sync").GeneratorTask<any, {
@@ -46,19 +50,8 @@ export declare const pothosAuthGenerator: import("@baseplate-dev/sync").Generato
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", import("../../../index.js").PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
-        authRolesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            AUTH_ROLE_CONFIG: {};
-            AuthRole: {
-                isTypeOnly: true;
-            };
-            DEFAULT_PUBLIC_ROLES: {};
-            DEFAULT_USER_ROLES: {};
-            RoleConfig: {
-                isTypeOnly: true;
-            };
-        }>>;
     }, any>;
     main: import("@baseplate-dev/sync").GeneratorTask<any, {
         pothosSchema: import("@baseplate-dev/sync").ProviderType<import("../pothos/pothos.generator.js").PothosSchemaProvider>;

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pothos-auth.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAYrE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,2BAA2B;;;;;;EAEtC,CAAC;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,cAAc,CAAC;CACtE;AAED,eAAO,MAAM,kBAAkB,gEACwB,CAAC;AAKxD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqE9B,CAAC"}
+{"version":3,"file":"pothos-auth.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAYrE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,eAAO,MAAM,2BAA2B;;iBAEtC,CAAC;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,cAAc,CAAC;CACtE;AAED,eAAO,MAAM,kBAAkB,gEACwB,CAAC;AAKxD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8D9B,CAAC"}

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.js

@@ -1,7 +1,6 @@
 import { packageScope, tsCodeFragment, TsCodeUtils, } from '@baseplate-dev/core-generators';
 import { createGenerator, createGeneratorTask, createProviderType, } from '@baseplate-dev/sync';
 import { z } from 'zod';
-import { authRolesImportsProvider } from '#src/generators/auth/index.js';
 import { pothosConfigProvider, pothosSchemaProvider } from '../pothos/index.js';
 import { POTHOS_POTHOS_AUTH_GENERATED } from './generated/index.js';
 const descriptorSchema = z.object({
@@ -22,14 +21,11 @@ export const pothosAuthGenerator = createGenerator({
         pothosConfig: createGeneratorTask({
             dependencies: {
                 pothosConfig: pothosConfigProvider,
-                authRolesImports: authRolesImportsProvider,
             },
-            run({ pothosConfig, authRolesImports }) {
+            run({ pothosConfig }) {
                 pothosConfig.pothosPlugins.set('pothosAuthorizeByRolesPlugin', TsCodeUtils.importFragment('pothosAuthorizeByRolesPlugin', pothosAuthPluginPath));
-                pothosConfig.schemaTypeOptions.set('AuthRole', authRolesImports.AuthRole.typeFragment());
                 pothosConfig.schemaBuilderOptions.set('authorizeByRoles', TsCodeUtils.mergeFragmentsAsObject({
                     requireOnRootFields: requireOnRootFields.toString(),
-                    extractRoles: '(context) => context.auth.roles',
                 }));
             },
         }),

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"pothos-auth.generator.js","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pothos-auth.generator.js","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,WAAW,GACZ,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,mBAAmB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CAC/C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAC;AAUH,MAAM,CAAC,MAAM,kBAAkB,GAC7B,kBAAkB,CAAqB,aAAa,CAAC,CAAC;AAExD,MAAM,oBAAoB,GACxB,qDAAqD,CAAC;AAExD,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC;IACjD,IAAI,EAAE,oBAAoB;IAC1B,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;IACjC,gBAAgB;IAChB,UAAU,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;QACxC,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC,IAAI;QAC9C,SAAS,EAAE,4BAA4B,CAAC,SAAS,CAAC,IAAI;QACtD,YAAY,EAAE,mBAAmB,CAAC;YAChC,YAAY,EAAE;gBACZ,YAAY,EAAE,oBAAoB;aACnC;YACD,GAAG,CAAC,EAAE,YAAY,EAAE;gBAClB,YAAY,CAAC,aAAa,CAAC,GAAG,CAC5B,8BAA8B,EAC9B,WAAW,CAAC,cAAc,CACxB,8BAA8B,EAC9B,oBAAoB,CACrB,CACF,CAAC;gBAEF,YAAY,CAAC,oBAAoB,CAAC,GAAG,CACnC,kBAAkB,EAClB,WAAW,CAAC,sBAAsB,CAAC;oBACjC,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,EAAE;iBACpD,CAAC,CACH,CAAC;YACJ,CAAC;SACF,CAAC;QACF,IAAI,EAAE,mBAAmB,CAAC;YACxB,YAAY,EAAE;gBACZ,YAAY,EAAE,oBAAoB;gBAClC,SAAS,EAAE,4BAA4B,CAAC,SAAS,CAAC,QAAQ;aAC3D;YACD,GAAG,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE;gBAC7B,OAAO;oBACL,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;wBACvB,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;wBAEpE,YAAY,CAAC,kBAAkB,CAC7B,qDAAqD,CACtD,CAAC;oBACJ,CAAC;iBACF,CAAC;YACJ,CAAC;SACF,CAAC;QACF,aAAa,EAAE,mBAAmB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EAAE,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC;aACpD;YACD,GAAG;gBACD,OAAO;oBACL,SAAS,EAAE;wBACT,UAAU,EAAE;4BACV,qBAAqB,EAAE,CAAC,MAAM,EAAE,EAAE;4BAChC,uBAAuB;4BACvB,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;yBAC/C;qBACF;iBACF,CAAC;YACJ,CAAC;SACF,CAAC;KACH,CAAC;CACH,CAAC,CAAC"}

package/dist/generators/pothos/pothos-auth/templates/src/plugins/graphql/FieldAuthorizePlugin/global-types.ts

@@ -8,7 +8,6 @@ import type {
 import type {
   FieldNullability,
   InputFieldMap,
-  InputShapeFromFields,
   SchemaTypes,
   TypeParam,
 } from '@pothos/core';
@@ -22,18 +21,8 @@ declare global {
       authorizeByRoles: PothosAuthorizeByRolesPlugin<Types>;
     }
 
-    export interface UserSchemaTypes {
-      AuthRole: string;
-    }
-
-    export interface ExtendDefaultTypes<
-      PartialTypes extends Partial<UserSchemaTypes>,
-    > {
-      AuthRole: PartialTypes['AuthRole'] & string;
-    }
-
     export interface SchemaBuilderOptions<Types extends SchemaTypes> {
-      authorizeByRoles: AuthorizeRolePluginOptions<Types>;
+      authorizeByRoles: AuthorizeRolePluginOptions;
     }
 
     export interface FieldOptions<
@@ -45,11 +34,7 @@ declare global {
       ResolveShape,
       ResolveReturnShape,
     > {
-      authorize?: AuthorizeRoleRuleOption<
-        ParentShape,
-        InputShapeFromFields<Args>,
-        Types
-      >;
+      authorize?: AuthorizeRoleRuleOption<ParentShape>;
     }
   }
 }

package/dist/generators/pothos/pothos-auth/templates/src/plugins/graphql/FieldAuthorizePlugin/index.ts

@@ -1,13 +1,11 @@
 // @ts-nocheck
 
-import type {
-  AuthorizeRoleRuleFunction,
-  AuthorizeRoleRuleOption,
-} from '$fieldAuthorizeTypes';
+import type { AuthorizeRoleRuleOption } from '$fieldAuthorizeTypes';
+import type { ServiceContext } from '%serviceContextImports';
 import type { PothosOutputFieldConfig, SchemaTypes } from '@pothos/core';
-import type { GraphQLFieldResolver, GraphQLResolveInfo } from 'graphql';
+import type { GraphQLFieldResolver } from 'graphql';
 
-import { ForbiddenError } from '%errorHandlerServiceImports';
+import { checkInstanceAuthorization } from '%authorizerUtilsImports';
 import SchemaBuilder, { BasePlugin } from '@pothos/core';
 
 import './global-types.js';
@@ -37,59 +35,14 @@ export class PothosAuthorizeByRolesPlugin<
 
   async authorizeAccess(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    authorize: AuthorizeRoleRuleOption<any, any, Types>,
+    authorize: AuthorizeRoleRuleOption<any>,
     root: unknown,
-    args: object,
     context: Types['Context'],
-    info: GraphQLResolveInfo,
   ): Promise<void> {
     const rules = Array.isArray(authorize) ? authorize : [authorize];
-    const roles = this.builder.options.authorizeByRoles.extractRoles(context);
+    const ctx = context as ServiceContext;
 
-    // process all string rules first
-    const stringRules = rules.filter(
-      (rule): rule is Types['AuthRole'] => typeof rule === 'string',
-    );
-
-    if (stringRules.some((rule) => roles.includes(rule))) {
-      return;
-    }
-
-    const ruleFunctions = rules.filter(
-      (rule): rule is AuthorizeRoleRuleFunction<unknown, unknown, Types> =>
-        typeof rule === 'function',
-    );
-
-    // try all rules and see if any match
-    const results = await Promise.allSettled(
-      ruleFunctions.map((func) => func(root, args, context, info)),
-    );
-
-    // if any check passed, return success
-    if (results.some((r) => r.status === 'fulfilled' && r.value)) {
-      return;
-    }
-
-    // if a check threw an unexpected error, throw that since it may mean
-    // the authorization rule may have been valid but failed to run
-    const unexpectedError = results.find(
-      (r) => r.status === 'rejected' && !(r.reason instanceof ForbiddenError),
-    ) as PromiseRejectedResult | undefined;
-
-    if (unexpectedError) {
-      throw unexpectedError.reason;
-    }
-
-    // if a check threw a forbidden error with a message, throw that
-    const forbiddenError = results.find(
-      (r) => r.status === 'rejected' && r.reason instanceof ForbiddenError,
-    ) as PromiseRejectedResult | undefined;
-
-    if (forbiddenError) {
-      throw forbiddenError.reason;
-    }
-
-    throw new ForbiddenError('Forbidden');
+    await checkInstanceAuthorization(ctx, root, rules);
   }
 
   override wrapResolve(
@@ -102,7 +55,7 @@ export class PothosAuthorizeByRolesPlugin<
     }
 
     return async (source, args, context, info) => {
-      await this.authorizeAccess(authorize, source, args, context, info);
+      await this.authorizeAccess(authorize, source, context);
       return resolver(source, args, context, info);
     };
   }
@@ -117,7 +70,7 @@ export class PothosAuthorizeByRolesPlugin<
     }
 
     return async (source, args, context, info) => {
-      await this.authorizeAccess(authorize, source, args, context, info);
+      await this.authorizeAccess(authorize, source, context);
       return subscriber(source, args, context, info);
     };
   }

package/dist/generators/pothos/pothos-auth/templates/src/plugins/graphql/FieldAuthorizePlugin/types.ts

@@ -1,32 +1,35 @@
 // @ts-nocheck
 
-import type { SchemaTypes } from '@pothos/core';
-import type { GraphQLResolveInfo } from 'graphql';
+import type {
+  GlobalRoleCheck,
+  InstanceRoleCheck,
+} from '%authorizerUtilsImports';
 
-export type AuthorizeRoleRuleFunction<
-  RootType,
-  ArgsType,
-  Types extends SchemaTypes,
-> = (
-  root: RootType,
-  args: ArgsType,
-  context: Types['Context'],
-  info: GraphQLResolveInfo,
-) => boolean | Promise<boolean>;
+/**
+ * Single authorization rule - either a string (global role) or function (instance role).
+ * Discrimination: `typeof rule === 'string'` for global roles.
+ *
+ * @example
+ * ```typescript
+ * // Global role (string)
+ * const adminRule: AuthorizeRoleRule<any> = 'admin';
+ *
+ * // Instance role (function)
+ * const ownerRule: AuthorizeRoleRule<User> = (ctx, root) => root.id === ctx.auth.userId;
+ * ```
+ */
+export type AuthorizeRoleRule<RootType> =
+  | GlobalRoleCheck
+  | InstanceRoleCheck<RootType>;
 
-export type AuthorizeRoleRule<RootType, ArgsType, Types extends SchemaTypes> =
-  | Types['AuthRole']
-  | AuthorizeRoleRuleFunction<RootType, ArgsType, Types>;
+/**
+ * Authorization option - can be a single rule or array of rules.
+ * If multiple rules are provided, access is granted if ANY rule returns true.
+ */
+export type AuthorizeRoleRuleOption<RootType> =
+  | AuthorizeRoleRule<RootType>
+  | AuthorizeRoleRule<RootType>[];
 
-export type AuthorizeRoleRuleOption<
-  RootType,
-  ArgsType,
-  Types extends SchemaTypes,
-> =
-  | AuthorizeRoleRule<RootType, ArgsType, Types>
-  | AuthorizeRoleRule<RootType, ArgsType, Types>[];
-
-export interface AuthorizeRolePluginOptions<Types extends SchemaTypes> {
+export interface AuthorizeRolePluginOptions {
   requireOnRootFields?: boolean;
-  extractRoles: (context: Types['Context']) => readonly Types['AuthRole'][];
 }

package/dist/generators/pothos/pothos-enums-file/pothos-enums-file.generator.d.ts

@@ -9,8 +9,8 @@ export interface PothosEnumsFileProvider {
 }
 export declare const pothosEnumsFileProvider: import("@baseplate-dev/sync").ProviderType<PothosEnumsFileProvider>;
 export declare const pothosEnumsFileGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    name: string;
     id: string;
+    name: string;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{
         pothosEnumsFile: import("@baseplate-dev/sync").ProviderExport<PothosEnumsFileProvider>;
@@ -24,7 +24,7 @@ export declare const pothosEnumsFileGenerator: import("@baseplate-dev/sync").Gen
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, import("#src/writers/pothos/options.js").PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("#src/writers/pothos/options.js").PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", import("../../../index.js").PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
     }, any>;
 }>;

package/dist/generators/pothos/pothos-prisma/pothos-prisma.generator.d.ts

@@ -1,6 +1,6 @@
 export type PothosPrismaProvider = unknown;
 export declare const pothosPrismaProvider: import("@baseplate-dev/sync").ProviderType<unknown>;
-export declare const pothosPrismaGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const pothosPrismaGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosPrismaPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").PothosPothosPrismaPaths>;
     }, {
@@ -34,7 +34,7 @@ export declare const pothosPrismaGenerator: import("@baseplate-dev/sync").Genera
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", import("../../../index.js").PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
         prismaImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             prisma: {};

package/dist/generators/pothos/pothos-prisma-crud-mutation/pothos-prisma-crud-mutation.generator.d.ts

@@ -1,8 +1,8 @@
 export declare const pothosPrismaCrudMutationGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    name: string;
-    order: number;
     modelName: string;
+    name: string;
     crudServiceRef: string;
+    order: number;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{
         pothosField: import("@baseplate-dev/sync").ProviderExport<import("#src/generators/pothos/_providers/index.js").PothosFieldProvider>;

package/dist/generators/pothos/pothos-prisma-find-query/pothos-prisma-find-query.generator.d.ts

@@ -1,6 +1,6 @@
 export declare const pothosPrismaFindQueryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    order: number;
     modelName: string;
+    order: number;
     hasPrimaryKeyInputType: boolean;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{

package/dist/generators/pothos/pothos-prisma-list-query/pothos-prisma-list-query.generator.d.ts

@@ -1,6 +1,6 @@
 export declare const pothosPrismaListQueryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    order: number;
     modelName: string;
+    order: number;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{
         pothosField: import("@baseplate-dev/sync").ProviderExport<import("#src/generators/pothos/_providers/pothos-field.js").PothosFieldProvider>;

package/dist/generators/pothos/pothos-prisma-object/pothos-prisma-object.generator.d.ts

@@ -5,9 +5,9 @@ export interface PothosPrismaObjectProvider {
 export declare const pothosPrismaObjectProvider: import("@baseplate-dev/sync").ProviderType<PothosPrismaObjectProvider>;
 export declare function createPothosPrismaObjectTypeOutputName(modelName: string): string;
 export declare const pothosPrismaObjectGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    order: number;
     modelName: string;
     exposedFields: string[];
+    order: number;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPrismaObject: import("@baseplate-dev/sync").ProviderExport<PothosPrismaObjectProvider>;

package/dist/generators/pothos/pothos-prisma-primary-key/pothos-prisma-primary-key.generator.d.ts

@@ -1,7 +1,7 @@
 export declare function getPothosPrismaPrimaryKeyTypeOutputName(modelName: string): string;
 export declare const pothosPrismaPrimaryKeyGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    order: number;
     modelName: string;
+    order: number;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{
         pothosTypeOutput: import("@baseplate-dev/sync").ProviderExport<import("../_providers/pothos-type-output.js").PothosTypeOutputProvider>;

package/dist/generators/pothos/pothos-scalar/pothos-scalar.generator.d.ts

@@ -1,5 +1,5 @@
 export declare const pothosScalarGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    type: "uuid" | "dateTime" | "json" | "jsonObject" | "date";
+    type: "date" | "uuid" | "dateTime" | "json" | "jsonObject";
 }, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosScalarPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").PothosPothosScalarPaths>;
@@ -19,7 +19,7 @@ export declare const pothosScalarGenerator: import("@baseplate-dev/sync").Genera
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", import("../../../index.js").PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
         pothosImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             builder: {};

package/dist/generators/pothos/pothos-sentry/pothos-sentry.generator.d.ts

@@ -1,4 +1,4 @@
-export declare const pothosSentryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const pothosSentryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosSentryPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").PothosPothosSentryPaths>;
     }, {
@@ -18,7 +18,7 @@ export declare const pothosSentryGenerator: import("@baseplate-dev/sync").Genera
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", import("../../../index.js").PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
     }, any>;
 }>;

package/dist/generators/prisma/_shared/build-data-helpers/generate-operation-callbacks.d.ts

@@ -18,7 +18,7 @@ interface GenerateCreateCallbackConfig {
  * Result of generating create operation callback
  */
 interface GenerateCreateCallbackResult {
-    /** Complete create callback fragment: ({ tx, data, query }) => tx.model.create({...}) */
+    /** Complete create callback fragment: async ({ tx, data, query }) => { const item = await tx.model.create({...}); return item; } */
     createCallbackFragment: TsCodeFragment;
 }
 /**
@@ -30,20 +30,25 @@ interface GenerateCreateCallbackResult {
  * @example
  * // No relations
  * generateCreateCallback({...})
- * // Returns: ({ tx, data, query }) => tx.user.create({ data, ...query })
+ * // Returns: async ({ tx, data, query }) => {
+ * //   const item = await tx.user.create({ data, ...query });
+ * //   return item;
+ * // }
  *
  * @example
  * // With relations
  * generateCreateCallback({...})
- * // Returns: ({ tx, data, query }) =>
- * //   tx.todoItem.create({
+ * // Returns: async ({ tx, data: { assigneeId, todoListId, ...data }, query }) => {
+ * //   const item = await tx.todoItem.create({
  * //     data: {
  * //       ...data,
- * //       assignee: relationHelpers.connectCreate({ id: data.assigneeId }),
- * //       todoList: relationHelpers.connectCreate({ id: data.todoListId }),
+ * //       assignee: relationHelpers.connectCreate({ id: assigneeId }),
+ * //       todoList: relationHelpers.connectCreate({ id: todoListId }),
  * //     },
  * //     ...query,
- * //   })
+ * //   });
+ * //   return item;
+ * // }
  */
 export declare function generateCreateCallback(config: GenerateCreateCallbackConfig): GenerateCreateCallbackResult;
 /**
@@ -63,7 +68,7 @@ interface GenerateUpdateCallbackConfig {
  * Result of generating update operation callback
  */
 interface GenerateUpdateCallbackResult {
-    /** Complete update callback fragment: ({ tx, where, data, query }) => tx.model.update({...}) */
+    /** Complete update callback fragment: async ({ tx, where, data, query }) => { const item = await tx.model.update({...}); return item; } */
     updateCallbackFragment: TsCodeFragment;
 }
 /**
@@ -75,21 +80,26 @@ interface GenerateUpdateCallbackResult {
  * @example
  * // No relations
  * generateUpdateCallback({...})
- * // Returns: ({ tx, where, data, query }) => tx.user.update({ where, data, ...query })
+ * // Returns: async ({ tx, where, data, query }) => {
+ * //   const item = await tx.user.update({ where, data, ...query });
+ * //   return item;
+ * // }
  *
  * @example
  * // With relations
  * generateUpdateCallback({...})
- * // Returns: ({ tx, where, data, query }) =>
- * //   tx.todoItem.update({
+ * // Returns: async ({ tx, where, data: { assigneeId, todoListId, ...data }, query }) => {
+ * //   const item = await tx.todoItem.update({
  * //     where,
  * //     data: {
  * //       ...data,
- * //       assignee: relationHelpers.connectUpdate({ id: data.assigneeId }),
- * //       todoList: relationHelpers.connectUpdate({ id: data.todoListId }),
+ * //       assignee: relationHelpers.connectUpdate({ id: assigneeId }),
+ * //       todoList: relationHelpers.connectUpdate({ id: todoListId }),
  * //     },
  * //     ...query,
- * //   })
+ * //   });
+ * //   return item;
+ * // }
  */
 export declare function generateUpdateCallback(config: GenerateUpdateCallbackConfig): GenerateUpdateCallbackResult;
 /**
@@ -103,7 +113,7 @@ interface GenerateDeleteCallbackConfig {
  * Result of generating delete operation callback
  */
 interface GenerateDeleteCallbackResult {
-    /** Complete delete callback fragment: ({ tx, where, query }) => tx.model.delete({...}) */
+    /** Complete delete callback fragment: async ({ tx, where, query }) => { const item = await tx.model.delete({...}); return item; } */
     deleteCallbackFragment: TsCodeFragment;
 }
 /**
@@ -117,7 +127,10 @@ interface GenerateDeleteCallbackResult {
  *
  * @example
  * generateDeleteCallback({ modelVariableName: 'todoItem' })
- * // Returns: ({ tx, where, query }) => tx.todoItem.delete({ where, ...query })
+ * // Returns: async ({ tx, where, query }) => {
+ * //   const item = await tx.todoItem.delete({ where, ...query });
+ * //   return item;
+ * // }
  */
 export declare function generateDeleteCallback(config: GenerateDeleteCallbackConfig): GenerateDeleteCallbackResult;
 export {};

package/dist/generators/prisma/_shared/build-data-helpers/generate-operation-callbacks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-operation-callbacks.d.ts","sourceRoot":"","sources":["../../../../../src/generators/prisma/_shared/build-data-helpers/generate-operation-callbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAI1E;;GAEG;AACH,UAAU,4BAA4B;IACpC,4CAA4C;IAC5C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,yFAAyF;IACzF,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAiC9B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,4CAA4C;IAC5C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,gGAAgG;IAChG,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAmC9B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,0FAA0F;IAC1F,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAY9B"}
+{"version":3,"file":"generate-operation-callbacks.d.ts","sourceRoot":"","sources":["../../../../../src/generators/prisma/_shared/build-data-helpers/generate-operation-callbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAI1E;;GAEG;AACH,UAAU,4BAA4B;IACpC,4CAA4C;IAC5C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,oIAAoI;IACpI,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAqC9B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,4CAA4C;IAC5C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,2IAA2I;IAC3I,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAuC9B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,4BAA4B;IACpC,qIAAqI;IACrI,sBAAsB,EAAE,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,4BAA4B,CAc9B"}