@baseplate-dev/fastify-generators 0.4.1 → 0.4.3

package/dist/generators/core/fastify-redis/generated/typed-templates.js

@@ -1,12 +1,12 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
 import path from 'node:path';
 import { configServiceImportsProvider } from '#src/generators/core/config-service/generated/ts-import-providers.js';
-const mockRedis = createTsTemplateFile({
+const globalSetupRedis = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     importMapProviders: {},
-    name: 'mock-redis',
+    name: 'global-setup-redis',
     source: {
-        path: path.join(import.meta.dirname, '../templates/src/tests/scripts/mock-redis.ts'),
+        path: path.join(import.meta.dirname, '../templates/src/tests/scripts/global-setup-redis.ts'),
     },
     variables: {},
 });
@@ -20,5 +20,5 @@ const redis = createTsTemplateFile({
     },
     variables: {},
 });
-export const CORE_FASTIFY_REDIS_TEMPLATES = { mockRedis, redis };
+export const CORE_FASTIFY_REDIS_TEMPLATES = { globalSetupRedis, redis };
 //# sourceMappingURL=typed-templates.js.map

package/dist/generators/core/fastify-redis/generated/typed-templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/core/fastify-redis/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;AAEpH,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,8CAA8C,CAC/C;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,oBAAoB,CAAC;IACjC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE,oBAAoB,EAAE,4BAA4B,EAAE;IAC1E,IAAI,EAAE,OAAO;IACb,cAAc,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;IAC7D,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,oCAAoC,CAAC;KAC3E;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/core/fastify-redis/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;AAEpH,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;IAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,oBAAoB;IAC1B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,sDAAsD,CACvD;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,oBAAoB,CAAC;IACjC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,kBAAkB,EAAE,EAAE,oBAAoB,EAAE,4BAA4B,EAAE;IAC1E,IAAI,EAAE,OAAO;IACb,cAAc,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;IAC7D,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,oCAAoC,CAAC;KAC3E;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC"}

package/dist/generators/core/fastify-redis/templates/src/services/redis.ts

@@ -3,9 +3,12 @@
 import { config } from '%configServiceImports';
 import { Redis } from 'ioredis';
 
-export function createRedisClient(): Redis {
+export function createRedisClient({
+  usePrefix = true,
+}: { usePrefix?: boolean } = {}): Redis {
   return new Redis(config.REDIS_URL, {
     maxRetriesPerRequest: null,
+    keyPrefix: usePrefix ? config.REDIS_KEY_PREFIX : undefined,
   });
 }
 

package/dist/generators/core/fastify-redis/templates/src/tests/scripts/global-setup-redis.ts

@@ -0,0 +1,7 @@
+// @ts-nocheck
+
+export default function setup(): void {
+  // Set Redis key prefix for test isolation
+  process.env.REDIS_KEY_PREFIX = 'test:';
+  console.info('Redis key prefix set to "test:" for isolation');
+}

package/dist/generators/core/fastify-scripts/fastify-scripts.generator.d.ts

@@ -2,7 +2,7 @@ export interface FastifyScriptsProvider {
     getScriptDirectory(): string;
 }
 export declare const fastifyScriptsProvider: import("@baseplate-dev/sync").ProviderType<FastifyScriptsProvider>;
-export declare const fastifyScriptsGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const fastifyScriptsGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         coreFastifyScriptsPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").CoreFastifyScriptsPaths>;
     }, {

package/dist/generators/core/fastify-sentry/fastify-sentry.generator.d.ts

@@ -5,7 +5,7 @@ declare const fastifySentryConfigProvider: import("@baseplate-dev/sync").Provide
     sentryIntegrations: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
 }>, "getValues">>;
 export { fastifySentryConfigProvider };
-export declare const fastifySentryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const fastifySentryGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         coreFastifySentryPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").CoreFastifySentryPaths>;
     }, {

package/dist/generators/core/logger-service/logger-service.generator.d.ts

@@ -3,7 +3,7 @@ declare const loggerServiceConfigProvider: import("@baseplate-dev/sync").Provide
     mixins: import("@baseplate-dev/utils").MapContainer<string, TsCodeFragment>;
 }>, "getValues">>;
 export { loggerServiceConfigProvider };
-export declare const loggerServiceGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<any, {
+export declare const loggerServiceGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<unknown, {
     setup: import("@baseplate-dev/sync").GeneratorTask<import("@baseplate-dev/sync").ProviderExportMap<Record<string, import("@baseplate-dev/sync").Provider>> | undefined, import("@baseplate-dev/sync").ProviderDependencyMap<Record<string, import("@baseplate-dev/sync").Provider>>, import("@baseplate-dev/sync").ProviderExportMap<Record<string, import("@baseplate-dev/sync").Provider>> | undefined>;
     nodePackages: import("@baseplate-dev/sync").AnyGeneratorTask;
     fastify: import("@baseplate-dev/sync").GeneratorTask<undefined, {

package/dist/generators/core/request-context/request-context.generator.d.ts

@@ -1,4 +1,4 @@
-export declare const requestContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const requestContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         coreRequestContextPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").CoreRequestContextPaths>;
     }, {

package/dist/generators/core/request-service-context/request-service-context.generator.d.ts

@@ -13,7 +13,7 @@ declare const requestServiceContextConfigProvider: import("@baseplate-dev/sync")
     contextPassthroughs: import("@baseplate-dev/utils").MapContainer<string, RequestServiceContextPassthrough>;
 }>, "getValues">>;
 export { requestServiceContextConfigProvider };
-export declare const requestServiceContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const requestServiceContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         coreRequestServiceContextPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").CoreRequestServiceContextPaths>;
     }, {

package/dist/generators/core/service-context/service-context.generator.d.ts

@@ -35,7 +35,7 @@ declare const serviceContextConfigProvider: import("@baseplate-dev/sync").Provid
     contextFields: import("@baseplate-dev/utils").MapContainer<string, ServiceContextField>;
 }>, "getValues">>;
 export { serviceContextConfigProvider };
-export declare const serviceContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const serviceContextGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         coreServiceContextPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").CoreServiceContextPaths>;
     }, {

package/dist/generators/core/service-file/service-file.generator.d.ts

@@ -48,8 +48,8 @@ export interface ServiceFileOutputProvider {
 }
 export declare const serviceFileOutputProvider: import("@baseplate-dev/sync").ProviderType<ServiceFileOutputProvider>;
 export declare const serviceFileGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
-    name: string;
     id: string;
+    name: string;
     fileName?: string | undefined;
 }, {
     main: import("@baseplate-dev/sync").GeneratorTask<{

package/dist/generators/core/service-file/service-file.generator.js

@@ -1,6 +1,6 @@
 import { mergeFragmentsWithHoistedFragmentsPresorted, packageScope, tsImportBuilder, typescriptFileProvider, } from '@baseplate-dev/core-generators';
 import { createGenerator, createGeneratorTask, createProviderType, createReadOnlyProviderType, } from '@baseplate-dev/sync';
-import { NamedArrayFieldContainer } from '@baseplate-dev/utils';
+import { compareStrings, NamedArrayFieldContainer } from '@baseplate-dev/utils';
 import { posixJoin } from '@baseplate-dev/utils/node';
 import { kebabCase } from 'change-case';
 import path from 'node:path';
@@ -60,7 +60,7 @@ export const serviceFileGenerator = createGenerator({
                     build: async (builder) => {
                         const orderedHeaders = headersContainer
                             .getValue()
-                            .sort((a, b) => a.name.localeCompare(b.name));
+                            .sort((a, b) => compareStrings(a.name, b.name));
                         const orderedMethods = methodsContainer
                             .getValue()
                             .sort((a, b) => a.order - b.order);

package/dist/generators/core/service-file/service-file.generator.js.map

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

package/dist/generators/email/fastify-postmark/fastify-postmark.generator.d.ts

@@ -1,6 +1,6 @@
 export type FastifyPostmarkProvider = unknown;
 export declare const fastifyPostmarkProvider: import("@baseplate-dev/sync").ProviderType<unknown>;
-export declare const fastifyPostmarkGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const fastifyPostmarkGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     nodePackages: import("@baseplate-dev/sync").AnyGeneratorTask;
     config: import("@baseplate-dev/sync").GeneratorTask<undefined, {
         provider: import("@baseplate-dev/sync").ProviderType<Omit<import("@baseplate-dev/utils").FieldMap<{

package/dist/generators/email/fastify-postmark/templates/src/services/postmark.ts

@@ -10,7 +10,7 @@ const DEFAULT_FROM = TPL_DEFAULT_FROM;
 
 interface EmailTemplateConfiguration {
   alias: string;
-  schema: z.ZodSchema;
+  schema: z.ZodType;
 }
 
 // helper for making strongly-typed template configs

package/dist/generators/index.d.ts

@@ -1,5 +1,4 @@
 export * from './auth/index.js';
-export * from './bull/index.js';
 export * from './core/index.js';
 export * from './email/index.js';
 export * from './pothos/index.js';

package/dist/generators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}

package/dist/generators/index.js

@@ -1,5 +1,4 @@
 export * from './auth/index.js';
-export * from './bull/index.js';
 export * from './core/index.js';
 export * from './email/index.js';
 export * from './pothos/index.js';

package/dist/generators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}

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

@@ -8,7 +8,7 @@ declare const pothosConfigProvider: import("@baseplate-dev/sync").ProviderType<O
     schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
     enums: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
     inputTypes: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
-    customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", PothosCustomScalarConfig>;
+    customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", PothosCustomScalarConfig>;
 }>, "getValues">>;
 export { pothosConfigProvider };
 export interface PothosSchemaProvider {
@@ -26,7 +26,7 @@ export interface PothosSchemaBaseTypesProvider {
  * A provider that provides base types for the Pothos schema, e.g. enums.
  */
 export declare const pothosSchemaBaseTypesProvider: import("@baseplate-dev/sync").ProviderType<PothosSchemaBaseTypesProvider>;
-export declare const pothosGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{}, {
+export declare const pothosGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").PothosPothosPaths>;
     }, {
@@ -65,7 +65,7 @@ export declare const pothosGenerator: import("@baseplate-dev/sync").GeneratorBun
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", PothosCustomScalarConfig>;
         }>>;
     }, {
         pothosSchemaOutput: import("@baseplate-dev/sync").ProviderExport<{
@@ -94,7 +94,7 @@ export declare const pothosGenerator: import("@baseplate-dev/sync").GeneratorBun
             schemaFiles: import("@baseplate-dev/utils").ArrayContainer<string>;
             enums: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, PothosTypeReference>;
-            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "uuid" | "int" | "dateTime" | "float" | "decimal" | "json" | "jsonObject" | "date" | "enum", PothosCustomScalarConfig>;
+            customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", PothosCustomScalarConfig>;
         }>>;
         renderers: import("@baseplate-dev/sync").ProviderType<import("./generated/template-renderers.js").PothosPothosRenderers>;
     }, any>;

package/dist/generators/pothos/pothos-auth/generated/index.d.ts

@@ -12,17 +12,25 @@ export declare const POTHOS_POTHOS_AUTH_GENERATED: {
         task: import("@baseplate-dev/sync").GeneratorTask<{
             pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<import("./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("./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>;
     };
@@ -33,20 +41,39 @@ export declare const POTHOS_POTHOS_AUTH_GENERATED: {
                 fieldAuthorizeTypes: {};
             }>;
             fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-                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;
+                    };
+                }>>;
+                serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                    createServiceContext: {};
+                    createSystemServiceContext: {};
+                    createTestServiceContext: {};
+                    ServiceContext: {
+                        isTypeOnly: true;
+                    };
                 }>>;
             }, {
                 fieldAuthorizeTypes: {};
             }>;
-            fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+            fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+                authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                    checkGlobalAuthorization: {};
+                    checkInstanceAuthorization: {};
+                    GlobalRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                    InstanceRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                }>>;
+            }, Record<never, Record<never, never>>>;
         };
     };
 };

package/dist/generators/pothos/pothos-auth/generated/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIxC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIxC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/template-renderers.d.ts

@@ -11,17 +11,25 @@ export declare const POTHOS_POTHOS_AUTH_RENDERERS: {
     task: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<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("./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>;
 };

package/dist/generators/pothos/pothos-auth/generated/template-renderers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,WAAW,yBAAyB;IACxC,yBAAyB,EAAE;QACzB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,gCAAgC,CAC9B,OAAO,4BAA4B,CAAC,yBAAyB,CAC9D,EACD,oBAAoB,GAAG,OAAO,GAAG,OAAO,GAAG,gBAAgB,CAC5D,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AAmCD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;CAGxC,CAAC"}
+{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,WAAW,yBAAyB;IACxC,yBAAyB,EAAE;QACzB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,gCAAgC,CAC9B,OAAO,4BAA4B,CAAC,yBAAyB,CAC9D,EACD,oBAAoB,GAAG,OAAO,GAAG,OAAO,GAAG,gBAAgB,CAC5D,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AA0CD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;CAGxC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/template-renderers.js

@@ -1,17 +1,19 @@
 import { typescriptFileProvider } from '@baseplate-dev/core-generators';
 import { createGeneratorTask, createProviderType } from '@baseplate-dev/sync';
-import { errorHandlerServiceImportsProvider } from '#src/generators/core/error-handler-service/generated/ts-import-providers.js';
+import { authorizerUtilsImportsProvider } from '#src/generators/auth/_providers/authorizer-utils-imports.js';
+import { serviceContextImportsProvider } from '#src/generators/core/service-context/generated/ts-import-providers.js';
 import { POTHOS_POTHOS_AUTH_PATHS } from './template-paths.js';
 import { POTHOS_POTHOS_AUTH_TEMPLATES } from './typed-templates.js';
 const pothosPothosAuthRenderers = createProviderType('pothos-pothos-auth-renderers');
 const pothosPothosAuthRenderersTask = createGeneratorTask({
     dependencies: {
-        errorHandlerServiceImports: errorHandlerServiceImportsProvider,
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
         paths: POTHOS_POTHOS_AUTH_PATHS.provider,
+        serviceContextImports: serviceContextImportsProvider,
         typescriptFile: typescriptFileProvider,
     },
     exports: { pothosPothosAuthRenderers: pothosPothosAuthRenderers.export() },
-    run({ errorHandlerServiceImports, paths, typescriptFile }) {
+    run({ authorizerUtilsImports, paths, serviceContextImports, typescriptFile, }) {
         return {
             providers: {
                 pothosPothosAuthRenderers: {
@@ -20,7 +22,8 @@ const pothosPothosAuthRenderersTask = createGeneratorTask({
                             group: POTHOS_POTHOS_AUTH_TEMPLATES.fieldAuthorizePluginGroup,
                             paths,
                             importMapProviders: {
-                                errorHandlerServiceImports,
+                                authorizerUtilsImports,
+                                serviceContextImports,
                             },
                             generatorPaths: paths,
                             ...options,

package/dist/generators/pothos/pothos-auth/generated/template-renderers.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,6EAA6E,CAAC;AAEjI,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAepE,MAAM,yBAAyB,GAAG,kBAAkB,CAClD,8BAA8B,CAC/B,CAAC;AAEF,MAAM,6BAA6B,GAAG,mBAAmB,CAAC;IACxD,YAAY,EAAE;QACZ,0BAA0B,EAAE,kCAAkC;QAC9D,KAAK,EAAE,wBAAwB,CAAC,QAAQ;QACxC,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,yBAAyB,EAAE,yBAAyB,CAAC,MAAM,EAAE,EAAE;IAC1E,GAAG,CAAC,EAAE,0BAA0B,EAAE,KAAK,EAAE,cAAc,EAAE;QACvD,OAAO;YACL,SAAS,EAAE;gBACT,yBAAyB,EAAE;oBACzB,yBAAyB,EAAE;wBACzB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,mBAAmB,CAAC;4BACjC,KAAK,EAAE,4BAA4B,CAAC,yBAAyB;4BAC7D,KAAK;4BACL,kBAAkB,EAAE;gCAClB,0BAA0B;6BAC3B;4BACD,cAAc,EAAE,KAAK;4BACrB,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,QAAQ,EAAE,yBAAyB;IACnC,IAAI,EAAE,6BAA6B;CACpC,CAAC"}
+{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC;AAC7G,OAAO,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAEtH,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAepE,MAAM,yBAAyB,GAAG,kBAAkB,CAClD,8BAA8B,CAC/B,CAAC;AAEF,MAAM,6BAA6B,GAAG,mBAAmB,CAAC;IACxD,YAAY,EAAE;QACZ,sBAAsB,EAAE,8BAA8B;QACtD,KAAK,EAAE,wBAAwB,CAAC,QAAQ;QACxC,qBAAqB,EAAE,6BAA6B;QACpD,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,yBAAyB,EAAE,yBAAyB,CAAC,MAAM,EAAE,EAAE;IAC1E,GAAG,CAAC,EACF,sBAAsB,EACtB,KAAK,EACL,qBAAqB,EACrB,cAAc,GACf;QACC,OAAO;YACL,SAAS,EAAE;gBACT,yBAAyB,EAAE;oBACzB,yBAAyB,EAAE;wBACzB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,mBAAmB,CAAC;4BACjC,KAAK,EAAE,4BAA4B,CAAC,yBAAyB;4BAC7D,KAAK;4BACL,kBAAkB,EAAE;gCAClB,sBAAsB;gCACtB,qBAAqB;6BACtB;4BACD,cAAc,EAAE,KAAK;4BACrB,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,QAAQ,EAAE,yBAAyB;IACnC,IAAI,EAAE,6BAA6B;CACpC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/typed-templates.d.ts

@@ -4,20 +4,39 @@ export declare const fieldAuthorizePluginGroup: {
         fieldAuthorizeTypes: {};
     }>;
     fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-        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;
+            };
+        }>>;
+        serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createServiceContext: {};
+            createSystemServiceContext: {};
+            createTestServiceContext: {};
+            ServiceContext: {
+                isTypeOnly: true;
+            };
         }>>;
     }, {
         fieldAuthorizeTypes: {};
     }>;
-    fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+    fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
+        }>>;
+    }, Record<never, Record<never, never>>>;
 };
 export declare const POTHOS_POTHOS_AUTH_TEMPLATES: {
     fieldAuthorizePluginGroup: {
@@ -26,20 +45,39 @@ export declare const POTHOS_POTHOS_AUTH_TEMPLATES: {
             fieldAuthorizeTypes: {};
         }>;
         fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-            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;
+                };
+            }>>;
+            serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                createServiceContext: {};
+                createSystemServiceContext: {};
+                createTestServiceContext: {};
+                ServiceContext: {
+                    isTypeOnly: true;
+                };
             }>>;
         }, {
             fieldAuthorizeTypes: {};
         }>;
-        fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+        fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+            authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                checkGlobalAuthorization: {};
+                checkInstanceAuthorization: {};
+                GlobalRoleCheck: {
+                    isTypeOnly: true;
+                };
+                InstanceRoleCheck: {
+                    isTypeOnly: true;
+                };
+            }>>;
+        }, Record<never, Record<never, never>>>;
     };
 };
 //# sourceMappingURL=typed-templates.d.ts.map

package/dist/generators/pothos/pothos-auth/generated/typed-templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;CAIrC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAC"}
+{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AA0DA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIrC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/typed-templates.js

@@ -1,6 +1,7 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
 import path from 'node:path';
-import { errorHandlerServiceImportsProvider } from '#src/generators/core/error-handler-service/generated/ts-import-providers.js';
+import { authorizerUtilsImportsProvider } from '#src/generators/auth/_providers/authorizer-utils-imports.js';
+import { serviceContextImportsProvider } from '#src/generators/core/service-context/generated/ts-import-providers.js';
 const fieldAuthorizeGlobalTypes = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
@@ -19,7 +20,8 @@ const fieldAuthorizePlugin = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
     importMapProviders: {
-        errorHandlerServiceImports: errorHandlerServiceImportsProvider,
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
+        serviceContextImports: serviceContextImportsProvider,
     },
     name: 'field-authorize-plugin',
     referencedGeneratorTemplates: { fieldAuthorizeTypes: {} },
@@ -31,7 +33,9 @@ const fieldAuthorizePlugin = createTsTemplateFile({
 const fieldAuthorizeTypes = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
-    importMapProviders: {},
+    importMapProviders: {
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
+    },
     name: 'field-authorize-types',
     source: {
         path: path.join(import.meta.dirname, '../templates/src/plugins/graphql/FieldAuthorizePlugin/types.ts'),

package/dist/generators/pothos/pothos-auth/generated/typed-templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,6EAA6E,CAAC;AAEjI,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;IACrD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,8BAA8B;IACpC,4BAA4B,EAAE;QAC5B,oBAAoB,EAAE,EAAE;QACxB,mBAAmB,EAAE,EAAE;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,uEAAuE,CACxE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;IAChD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,0BAA0B,EAAE,kCAAkC;KAC/D;IACD,IAAI,EAAE,wBAAwB;IAC9B,4BAA4B,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACzD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;IAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,uBAAuB;IAC7B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,yBAAyB;IACzB,oBAAoB;IACpB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC;AAC7G,OAAO,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAEtH,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;IACrD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,8BAA8B;IACpC,4BAA4B,EAAE;QAC5B,oBAAoB,EAAE,EAAE;QACxB,mBAAmB,EAAE,EAAE;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,uEAAuE,CACxE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;IAChD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;QACtD,qBAAqB,EAAE,6BAA6B;KACrD;IACD,IAAI,EAAE,wBAAwB;IAC9B,4BAA4B,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACzD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;IAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;KACvD;IACD,IAAI,EAAE,uBAAuB;IAC7B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,yBAAyB;IACzB,oBAAoB;IACpB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,yBAAyB,EAAE,CAAC"}