@webiny/api-graphql 6.6.0-alpha.0 → 6.6.0-alpha.2

package/builtInTypes/DateScalar.js

@@ -1,7 +1,12 @@
 import { DateResolver } from "graphql-scalars";
 import { GraphQLScalarType } from "graphql";
+const DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
 const DateScalar = new GraphQLScalarType({
     ...DateResolver,
+    parseValue: (value)=>{
+        if ("string" != typeof value || !DATE_RE.test(value)) throw new TypeError(`Date cannot represent an invalid date-string ${String(value)}. Expected format: YYYY-MM-DD.`);
+        return DateResolver.parseValue(value);
+    },
     serialize: (value)=>{
         if (!value) return null;
         try {

package/builtInTypes/DateScalar.js.map

@@ -1 +1 @@
-{"version":3,"file":"builtInTypes/DateScalar.js","sources":["../../src/builtInTypes/DateScalar.ts"],"sourcesContent":["import { DateResolver } from \"graphql-scalars\";\nimport { GraphQLScalarType } from \"graphql\";\nexport const DateScalar = new GraphQLScalarType<Date | string, string>({\n    ...DateResolver,\n    /**\n     * We can set value as any because we are handling it.\n     */\n    serialize: (value: any) => {\n        if (!value) {\n            return null;\n        }\n        try {\n            const date = new Date(value);\n            return date.toISOString().slice(0, 10);\n        } catch (ex) {\n            if (value.toISOString) {\n                return value.toISOString().slice(0, 10);\n            }\n            throw ex;\n        }\n    }\n});\n"],"names":["DateScalar","GraphQLScalarType","DateResolver","value","date","Date","ex"],"mappings":";;AAEO,MAAMA,aAAa,IAAIC,kBAAyC;IACnE,GAAGC,YAAY;IAIf,WAAW,CAACC;QACR,IAAI,CAACA,OACD,OAAO;QAEX,IAAI;YACA,MAAMC,OAAO,IAAIC,KAAKF;YACtB,OAAOC,KAAK,WAAW,GAAG,KAAK,CAAC,GAAG;QACvC,EAAE,OAAOE,IAAI;YACT,IAAIH,MAAM,WAAW,EACjB,OAAOA,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG;YAExC,MAAMG;QACV;IACJ;AACJ"}
+{"version":3,"file":"builtInTypes/DateScalar.js","sources":["../../src/builtInTypes/DateScalar.ts"],"sourcesContent":["import { DateResolver } from \"graphql-scalars\";\nimport { GraphQLScalarType } from \"graphql\";\n\nconst DATE_RE = /^\\d{4}-\\d{2}-\\d{2}$/;\n\nexport const DateScalar = new GraphQLScalarType<Date | string, string>({\n    ...DateResolver,\n    parseValue: (value: unknown) => {\n        if (typeof value !== \"string\" || !DATE_RE.test(value)) {\n            throw new TypeError(\n                `Date cannot represent an invalid date-string ${String(value)}. Expected format: YYYY-MM-DD.`\n            );\n        }\n        return DateResolver.parseValue(value);\n    },\n    serialize: (value: any) => {\n        if (!value) {\n            return null;\n        }\n        try {\n            const date = new Date(value);\n            return date.toISOString().slice(0, 10);\n        } catch (ex) {\n            if (value.toISOString) {\n                return value.toISOString().slice(0, 10);\n            }\n            throw ex;\n        }\n    }\n});\n"],"names":["DATE_RE","DateScalar","GraphQLScalarType","DateResolver","value","TypeError","String","date","Date","ex"],"mappings":";;AAGA,MAAMA,UAAU;AAET,MAAMC,aAAa,IAAIC,kBAAyC;IACnE,GAAGC,YAAY;IACf,YAAY,CAACC;QACT,IAAI,AAAiB,YAAjB,OAAOA,SAAsB,CAACJ,QAAQ,IAAI,CAACI,QAC3C,MAAM,IAAIC,UACN,CAAC,6CAA6C,EAAEC,OAAOF,OAAO,8BAA8B,CAAC;QAGrG,OAAOD,aAAa,UAAU,CAACC;IACnC;IACA,WAAW,CAACA;QACR,IAAI,CAACA,OACD,OAAO;QAEX,IAAI;YACA,MAAMG,OAAO,IAAIC,KAAKJ;YACtB,OAAOG,KAAK,WAAW,GAAG,KAAK,CAAC,GAAG;QACvC,EAAE,OAAOE,IAAI;YACT,IAAIL,MAAM,WAAW,EACjB,OAAOA,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG;YAExC,MAAMK;QACV;IACJ;AACJ"}

package/engine/GraphQLEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine/GraphQLEngine.js","sources":["../../src/engine/GraphQLEngine.ts"],"sourcesContent":["import { graphql } from \"graphql\";\nimport { makeExecutableSchema, mergeSchemas } from \"@graphql-tools/schema\";\nimport { mergeResolvers } from \"@graphql-tools/merge\";\nimport { Container } from \"@webiny/di\";\nimport { RequestContainer } from \"@webiny/event-handler-core\";\nimport { GraphQLEngine as GraphQLEngineAbstraction } from \"./abstractions.js\";\nimport { GraphQLContextEnhancer } from \"./GraphQLContextEnhancer.js\";\nimport { GraphQLContextualSchema } from \"./GraphQLContextualSchema.js\";\nimport { GraphQLSchemaComposer } from \"~/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { ResolverDecoration } from \"~/ResolverDecoration.js\";\nimport { createRequestBody } from \"~/createRequestBody.js\";\nimport type { IGraphQLSchemaComposer } from \"~/features/GraphQLSchemaBuilder/abstractions.js\";\nimport type { IGraphQLContextEnhancer } from \"./GraphQLContextEnhancer.js\";\nimport type { IGraphQLContextualSchema } from \"./GraphQLContextualSchema.js\";\nimport type { GraphQLRequestBody } from \"~/types.js\";\nimport type { GraphQLSchema } from \"graphql\";\n\nclass GraphQLEngineImpl implements GraphQLEngineAbstraction.Interface {\n    constructor(\n        private composer: IGraphQLSchemaComposer,\n        private container: Container,\n        private enhancers: IGraphQLContextEnhancer[],\n        private contextualSchemas: IGraphQLContextualSchema[]\n    ) {}\n\n    async execute(body: any): Promise<any> {\n        // Build context first — enhancers may be async (e.g. CMS storage init)\n        const ctx = await this.buildContext();\n\n        // NOTE: the post-auth RequestContextInitializers (CMS facade, FileModel, ...) are run once\n        // per request by the HTTP layer (RequestContextInitializerDecorator in event-handler-core),\n        // before the router dispatches — so they cover every route, not just GraphQL. Their side-\n        // effects are container registrations, which persist and are resolvable here.\n\n        // Run contextual schemas BEFORE composer.build() so that any CoreGraphQLSchemaFactory\n        // registrations they make (e.g. ACO folder schema plugins) are picked up by GraphQLSchemaComposer.\n        const extraSchemas = await this.buildContextualSchemas(ctx);\n\n        const schemaConfig = await this.composer.build(ctx);\n\n        const resolverDecoration = new ResolverDecoration();\n        if (schemaConfig.resolverDecorators) {\n            resolverDecoration.addDecorators(schemaConfig.resolverDecorators);\n        }\n\n        // Always provide base root types so that `extend type Query/Mutation` works without\n        // requiring callers to define them. With assumeValidSDL:true, empty base types are\n        // allowed at build time; graphql() then returns schema-validation errors at execution\n        // time (e.g. \"Type Query must define one or more fields.\") when no fields are registered.\n        const typeDefs = `type Query\\ntype Mutation\\n${schemaConfig.typeDefs ?? \"\"}`;\n        const staticSchema = makeExecutableSchema({\n            typeDefs,\n            resolvers: resolverDecoration.decorateResolvers(\n                mergeResolvers([schemaConfig.resolvers ?? {}])\n            ),\n            assumeValidSDL: true,\n            inheritResolversFromInterfaces: true\n        });\n\n        const schema = await this.buildSchema(staticSchema, extraSchemas);\n        const parsed = createRequestBody(body);\n\n        if (!Array.isArray(parsed)) {\n            return this.executeOne(parsed, schema, ctx);\n        }\n        // Run sequentially so per-request state (e.g. ctx.debug.logs) is scoped per query.\n        const results = [];\n        for (const b of parsed) {\n            results.push(await this.executeOne(b, schema, ctx));\n        }\n        return results;\n    }\n\n    private async buildContext(): Promise<Record<string, any>> {\n        const ctx: Record<string, any> = { container: this.container };\n        for (const enhancer of this.enhancers) {\n            await enhancer.enhance(ctx);\n        }\n        return ctx;\n    }\n\n    private async buildContextualSchemas(ctx: Record<string, any>): Promise<GraphQLSchema[]> {\n        if (this.contextualSchemas.length === 0) {\n            return [];\n        }\n        // Sequential — schemas may have ordering dependencies (e.g. Aco needs ctx.cms from HeadlessCms).\n        const schemas: GraphQLSchema[] = [];\n        for (const s of this.contextualSchemas) {\n            schemas.push(await s.build(ctx));\n        }\n        return schemas;\n    }\n\n    private async buildSchema(\n        staticSchema: GraphQLSchema,\n        extraSchemas: GraphQLSchema[]\n    ): Promise<GraphQLSchema> {\n        if (extraSchemas.length === 0) {\n            return staticSchema;\n        }\n        return mergeSchemas({ schemas: [staticSchema, ...extraSchemas] });\n    }\n\n    private async executeOne(\n        body: GraphQLRequestBody,\n        schema: GraphQLSchema,\n        ctx: Record<string, any>\n    ): Promise<any> {\n        const { query, variables, operationName } = body;\n\n        return graphql({\n            schema,\n            source: query,\n            rootValue: {},\n            contextValue: ctx,\n            variableValues: variables ?? undefined,\n            operationName: operationName ?? undefined\n        });\n    }\n}\n\nexport const GraphQLEngine = GraphQLEngineAbstraction.createImplementation({\n    implementation: GraphQLEngineImpl,\n    dependencies: [\n        GraphQLSchemaComposer,\n        RequestContainer,\n        [GraphQLContextEnhancer, { multiple: true }],\n        [GraphQLContextualSchema, { multiple: true }]\n    ]\n});\n"],"names":["GraphQLEngineImpl","composer","container","enhancers","contextualSchemas","body","ctx","extraSchemas","schemaConfig","resolverDecoration","ResolverDecoration","typeDefs","staticSchema","makeExecutableSchema","mergeResolvers","schema","parsed","createRequestBody","Array","results","b","enhancer","schemas","s","mergeSchemas","query","variables","operationName","graphql","undefined","GraphQLEngine","GraphQLEngineAbstraction","GraphQLSchemaComposer","RequestContainer","GraphQLContextEnhancer","GraphQLContextualSchema"],"mappings":";;;;;;;;;;AAiBA,MAAMA;IACF,YACYC,QAAgC,EAChCC,SAAoB,EACpBC,SAAoC,EACpCC,iBAA6C,CACvD;aAJUH,QAAQ,GAARA;aACAC,SAAS,GAATA;aACAC,SAAS,GAATA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,IAAS,EAAgB;QAEnC,MAAMC,MAAM,MAAM,IAAI,CAAC,YAAY;QASnC,MAAMC,eAAe,MAAM,IAAI,CAAC,sBAAsB,CAACD;QAEvD,MAAME,eAAe,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAACF;QAE/C,MAAMG,qBAAqB,IAAIC;QAC/B,IAAIF,aAAa,kBAAkB,EAC/BC,mBAAmB,aAAa,CAACD,aAAa,kBAAkB;QAOpE,MAAMG,WAAW,CAAC,2BAA2B,EAAEH,aAAa,QAAQ,IAAI,IAAI;QAC5E,MAAMI,eAAeC,qBAAqB;YACtCF;YACA,WAAWF,mBAAmB,iBAAiB,CAC3CK,eAAe;gBAACN,aAAa,SAAS,IAAI,CAAC;aAAE;YAEjD,gBAAgB;YAChB,gCAAgC;QACpC;QAEA,MAAMO,SAAS,MAAM,IAAI,CAAC,WAAW,CAACH,cAAcL;QACpD,MAAMS,SAASC,kBAAkBZ;QAEjC,IAAI,CAACa,MAAM,OAAO,CAACF,SACf,OAAO,IAAI,CAAC,UAAU,CAACA,QAAQD,QAAQT;QAG3C,MAAMa,UAAU,EAAE;QAClB,KAAK,MAAMC,KAAKJ,OACZG,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAACC,GAAGL,QAAQT;QAElD,OAAOa;IACX;IAEA,MAAc,eAA6C;QACvD,MAAMb,MAA2B;YAAE,WAAW,IAAI,CAAC,SAAS;QAAC;QAC7D,KAAK,MAAMe,YAAY,IAAI,CAAC,SAAS,CACjC,MAAMA,SAAS,OAAO,CAACf;QAE3B,OAAOA;IACX;IAEA,MAAc,uBAAuBA,GAAwB,EAA4B;QACrF,IAAI,AAAkC,MAAlC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAC7B,OAAO,EAAE;QAGb,MAAMgB,UAA2B,EAAE;QACnC,KAAK,MAAMC,KAAK,IAAI,CAAC,iBAAiB,CAClCD,QAAQ,IAAI,CAAC,MAAMC,EAAE,KAAK,CAACjB;QAE/B,OAAOgB;IACX;IAEA,MAAc,YACVV,YAA2B,EAC3BL,YAA6B,EACP;QACtB,IAAIA,AAAwB,MAAxBA,aAAa,MAAM,EACnB,OAAOK;QAEX,OAAOY,aAAa;YAAE,SAAS;gBAACZ;mBAAiBL;aAAa;QAAC;IACnE;IAEA,MAAc,WACVF,IAAwB,EACxBU,MAAqB,EACrBT,GAAwB,EACZ;QACZ,MAAM,EAAEmB,KAAK,EAAEC,SAAS,EAAEC,aAAa,EAAE,GAAGtB;QAE5C,OAAOuB,QAAQ;YACXb;YACA,QAAQU;YACR,WAAW,CAAC;YACZ,cAAcnB;YACd,gBAAgBoB,aAAaG;YAC7B,eAAeF,iBAAiBE;QACpC;IACJ;AACJ;AAEO,MAAMC,8BAAgBC,cAAAA,oBAA6C,CAAC;IACvE,gBAAgB/B;IAChB,cAAc;QACVgC;QACAC;QACA;YAACC;YAAwB;gBAAE,UAAU;YAAK;SAAE;QAC5C;YAACC;YAAyB;gBAAE,UAAU;YAAK;SAAE;KAChD;AACL"}
+{"version":3,"file":"engine/GraphQLEngine.js","sources":["../../src/engine/GraphQLEngine.ts"],"sourcesContent":["import { graphql } from \"graphql\";\nimport { makeExecutableSchema, mergeSchemas } from \"@graphql-tools/schema\";\nimport { mergeResolvers } from \"@graphql-tools/merge\";\nimport { Container } from \"@webiny/di\";\nimport { RequestContainer } from \"@webiny/event-handler-core\";\nimport { GraphQLEngine as GraphQLEngineAbstraction } from \"./abstractions.js\";\nimport { GraphQLContextEnhancer } from \"./GraphQLContextEnhancer.js\";\nimport { GraphQLContextualSchema } from \"./GraphQLContextualSchema.js\";\nimport { GraphQLSchemaComposer } from \"~/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { ResolverDecoration } from \"~/ResolverDecoration.js\";\nimport { createRequestBody } from \"~/createRequestBody.js\";\nimport type { IGraphQLSchemaComposer } from \"~/features/GraphQLSchemaBuilder/abstractions.js\";\nimport type { IGraphQLContextEnhancer } from \"./GraphQLContextEnhancer.js\";\nimport type { IGraphQLContextualSchema } from \"./GraphQLContextualSchema.js\";\nimport type { GraphQLRequestBody } from \"~/types.js\";\nimport type { GraphQLSchema } from \"graphql\";\n\nclass GraphQLEngineImpl implements GraphQLEngineAbstraction.Interface {\n    constructor(\n        private composer: IGraphQLSchemaComposer,\n        private container: Container,\n        private enhancers: IGraphQLContextEnhancer[],\n        private contextualSchemas: IGraphQLContextualSchema[]\n    ) {}\n\n    async execute(body: any): Promise<any> {\n        // Build context first — enhancers may be async (e.g. CMS storage init)\n        const ctx = await this.buildContext();\n\n        // Run contextual schemas BEFORE composer.build() so that any CoreGraphQLSchemaFactory\n        // registrations they make (e.g. ACO folder schema plugins) are picked up by GraphQLSchemaComposer.\n        const extraSchemas = await this.buildContextualSchemas(ctx);\n\n        const schemaConfig = await this.composer.build(ctx);\n\n        const resolverDecoration = new ResolverDecoration();\n        if (schemaConfig.resolverDecorators) {\n            resolverDecoration.addDecorators(schemaConfig.resolverDecorators);\n        }\n\n        // Always provide base root types so that `extend type Query/Mutation` works without\n        // requiring callers to define them. With assumeValidSDL:true, empty base types are\n        // allowed at build time; graphql() then returns schema-validation errors at execution\n        // time (e.g. \"Type Query must define one or more fields.\") when no fields are registered.\n        const typeDefs = `type Query\\ntype Mutation\\n${schemaConfig.typeDefs ?? \"\"}`;\n        const staticSchema = makeExecutableSchema({\n            typeDefs,\n            resolvers: resolverDecoration.decorateResolvers(\n                mergeResolvers([schemaConfig.resolvers ?? {}])\n            ),\n            assumeValidSDL: true,\n            inheritResolversFromInterfaces: true\n        });\n\n        const schema = await this.buildSchema(staticSchema, extraSchemas);\n        const parsed = createRequestBody(body);\n\n        if (!Array.isArray(parsed)) {\n            return this.executeOne(parsed, schema, ctx);\n        }\n        // Run sequentially so per-request state (e.g. ctx.debug.logs) is scoped per query.\n        const results = [];\n        for (const b of parsed) {\n            results.push(await this.executeOne(b, schema, ctx));\n        }\n        return results;\n    }\n\n    private async buildContext(): Promise<Record<string, any>> {\n        const ctx: Record<string, any> = { container: this.container };\n        for (const enhancer of this.enhancers) {\n            await enhancer.enhance(ctx);\n        }\n        return ctx;\n    }\n\n    private async buildContextualSchemas(ctx: Record<string, any>): Promise<GraphQLSchema[]> {\n        if (this.contextualSchemas.length === 0) {\n            return [];\n        }\n        // Sequential — schemas may have ordering dependencies (e.g. Aco needs ctx.cms from HeadlessCms).\n        const schemas: GraphQLSchema[] = [];\n        for (const s of this.contextualSchemas) {\n            schemas.push(await s.build(ctx));\n        }\n        return schemas;\n    }\n\n    private async buildSchema(\n        staticSchema: GraphQLSchema,\n        extraSchemas: GraphQLSchema[]\n    ): Promise<GraphQLSchema> {\n        if (extraSchemas.length === 0) {\n            return staticSchema;\n        }\n        return mergeSchemas({ schemas: [staticSchema, ...extraSchemas] });\n    }\n\n    private async executeOne(\n        body: GraphQLRequestBody,\n        schema: GraphQLSchema,\n        ctx: Record<string, any>\n    ): Promise<any> {\n        const { query, variables, operationName } = body;\n\n        return graphql({\n            schema,\n            source: query,\n            rootValue: {},\n            contextValue: ctx,\n            variableValues: variables ?? undefined,\n            operationName: operationName ?? undefined\n        });\n    }\n}\n\nexport const GraphQLEngine = GraphQLEngineAbstraction.createImplementation({\n    implementation: GraphQLEngineImpl,\n    dependencies: [\n        GraphQLSchemaComposer,\n        RequestContainer,\n        [GraphQLContextEnhancer, { multiple: true }],\n        [GraphQLContextualSchema, { multiple: true }]\n    ]\n});\n"],"names":["GraphQLEngineImpl","composer","container","enhancers","contextualSchemas","body","ctx","extraSchemas","schemaConfig","resolverDecoration","ResolverDecoration","typeDefs","staticSchema","makeExecutableSchema","mergeResolvers","schema","parsed","createRequestBody","Array","results","b","enhancer","schemas","s","mergeSchemas","query","variables","operationName","graphql","undefined","GraphQLEngine","GraphQLEngineAbstraction","GraphQLSchemaComposer","RequestContainer","GraphQLContextEnhancer","GraphQLContextualSchema"],"mappings":";;;;;;;;;;AAiBA,MAAMA;IACF,YACYC,QAAgC,EAChCC,SAAoB,EACpBC,SAAoC,EACpCC,iBAA6C,CACvD;aAJUH,QAAQ,GAARA;aACAC,SAAS,GAATA;aACAC,SAAS,GAATA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,IAAS,EAAgB;QAEnC,MAAMC,MAAM,MAAM,IAAI,CAAC,YAAY;QAInC,MAAMC,eAAe,MAAM,IAAI,CAAC,sBAAsB,CAACD;QAEvD,MAAME,eAAe,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAACF;QAE/C,MAAMG,qBAAqB,IAAIC;QAC/B,IAAIF,aAAa,kBAAkB,EAC/BC,mBAAmB,aAAa,CAACD,aAAa,kBAAkB;QAOpE,MAAMG,WAAW,CAAC,2BAA2B,EAAEH,aAAa,QAAQ,IAAI,IAAI;QAC5E,MAAMI,eAAeC,qBAAqB;YACtCF;YACA,WAAWF,mBAAmB,iBAAiB,CAC3CK,eAAe;gBAACN,aAAa,SAAS,IAAI,CAAC;aAAE;YAEjD,gBAAgB;YAChB,gCAAgC;QACpC;QAEA,MAAMO,SAAS,MAAM,IAAI,CAAC,WAAW,CAACH,cAAcL;QACpD,MAAMS,SAASC,kBAAkBZ;QAEjC,IAAI,CAACa,MAAM,OAAO,CAACF,SACf,OAAO,IAAI,CAAC,UAAU,CAACA,QAAQD,QAAQT;QAG3C,MAAMa,UAAU,EAAE;QAClB,KAAK,MAAMC,KAAKJ,OACZG,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAACC,GAAGL,QAAQT;QAElD,OAAOa;IACX;IAEA,MAAc,eAA6C;QACvD,MAAMb,MAA2B;YAAE,WAAW,IAAI,CAAC,SAAS;QAAC;QAC7D,KAAK,MAAMe,YAAY,IAAI,CAAC,SAAS,CACjC,MAAMA,SAAS,OAAO,CAACf;QAE3B,OAAOA;IACX;IAEA,MAAc,uBAAuBA,GAAwB,EAA4B;QACrF,IAAI,AAAkC,MAAlC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAC7B,OAAO,EAAE;QAGb,MAAMgB,UAA2B,EAAE;QACnC,KAAK,MAAMC,KAAK,IAAI,CAAC,iBAAiB,CAClCD,QAAQ,IAAI,CAAC,MAAMC,EAAE,KAAK,CAACjB;QAE/B,OAAOgB;IACX;IAEA,MAAc,YACVV,YAA2B,EAC3BL,YAA6B,EACP;QACtB,IAAIA,AAAwB,MAAxBA,aAAa,MAAM,EACnB,OAAOK;QAEX,OAAOY,aAAa;YAAE,SAAS;gBAACZ;mBAAiBL;aAAa;QAAC;IACnE;IAEA,MAAc,WACVF,IAAwB,EACxBU,MAAqB,EACrBT,GAAwB,EACZ;QACZ,MAAM,EAAEmB,KAAK,EAAEC,SAAS,EAAEC,aAAa,EAAE,GAAGtB;QAE5C,OAAOuB,QAAQ;YACXb;YACA,QAAQU;YACR,WAAW,CAAC;YACZ,cAAcnB;YACd,gBAAgBoB,aAAaG;YAC7B,eAAeF,iBAAiBE;QACpC;IACJ;AACJ;AAEO,MAAMC,8BAAgBC,cAAAA,oBAA6C,CAAC;IACvE,gBAAgB/B;IAChB,cAAc;QACVgC;QACAC;QACA;YAACC;YAAwB;gBAAE,UAAU;YAAK;SAAE;QAC5C;YAACC;YAAyB;gBAAE,UAAU;YAAK;SAAE;KAChD;AACL"}

package/engine/GraphQLEngineFeature.js

@@ -1,13 +1,13 @@
 import { createFeature } from "@webiny/feature/api";
 import { GraphQLSchemaComposerFeature } from "../features/GraphQLSchemaBuilder/feature.js";
 import { GraphQLEngine } from "./GraphQLEngine.js";
-import { GraphQLRoute } from "./GraphQLRoute.js";
+import { GraphQLRouteDefinition } from "./GraphQLRoute.js";
 const GraphQLEngineFeature = createFeature({
     name: "GraphQLEngine",
     register (container) {
         GraphQLSchemaComposerFeature.register(container);
         container.register(GraphQLEngine);
-        container.register(GraphQLRoute);
+        container.register(GraphQLRouteDefinition);
     }
 });
 export { GraphQLEngineFeature };

package/engine/GraphQLEngineFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine/GraphQLEngineFeature.js","sources":["../../src/engine/GraphQLEngineFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GraphQLSchemaComposerFeature } from \"~/features/GraphQLSchemaBuilder/feature.js\";\nimport { GraphQLEngine } from \"./GraphQLEngine.js\";\nimport { GraphQLRoute } from \"./GraphQLRoute.js\";\n\nexport const GraphQLEngineFeature = createFeature({\n    name: \"GraphQLEngine\",\n    register(container) {\n        GraphQLSchemaComposerFeature.register(container);\n        container.register(GraphQLEngine);\n        container.register(GraphQLRoute);\n    }\n});\n"],"names":["GraphQLEngineFeature","createFeature","container","GraphQLSchemaComposerFeature","GraphQLEngine","GraphQLRoute"],"mappings":";;;;AAKO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdC,6BAA6B,QAAQ,CAACD;QACtCA,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;IACvB;AACJ"}
+{"version":3,"file":"engine/GraphQLEngineFeature.js","sources":["../../src/engine/GraphQLEngineFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\n\nimport { GraphQLSchemaComposerFeature } from \"~/features/GraphQLSchemaBuilder/feature.js\";\nimport { GraphQLEngine } from \"./GraphQLEngine.js\";\nimport { GraphQLRouteDefinition } from \"./GraphQLRoute.js\";\n\nexport const GraphQLEngineFeature = createFeature({\n    name: \"GraphQLEngine\",\n    register(container) {\n        GraphQLSchemaComposerFeature.register(container);\n        container.register(GraphQLEngine);\n        container.register(GraphQLRouteDefinition);\n    }\n});\n"],"names":["GraphQLEngineFeature","createFeature","container","GraphQLSchemaComposerFeature","GraphQLEngine","GraphQLRouteDefinition"],"mappings":";;;;AAMO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdC,6BAA6B,QAAQ,CAACD;QACtCA,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;IACvB;AACJ"}

package/engine/GraphQLRoute.d.ts

@@ -1,14 +1,24 @@
-import { HttpRoute } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import type { IHttpRequest, IHttpResponse } from "@webiny/event-handler-core";
 import type { IGraphQLEngine } from "./abstractions.js";
-declare class GraphQLRouteImpl implements HttpRoute.Interface {
+declare class GraphQLRouteImpl implements HttpRouteHandler.Interface {
     private engine;
-    readonly method = "POST";
-    readonly path = "/graphql";
     constructor(engine: IGraphQLEngine);
     handle(request: IHttpRequest): Promise<IHttpResponse>;
 }
 export declare const GraphQLRoute: typeof GraphQLRouteImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
 };
+declare class GraphQLRouteDefinitionImpl implements HttpRouteDefinition.Interface {
+    readonly name = "graphql";
+    readonly method = "POST";
+    readonly path = "/graphql";
+    readonly handler: typeof GraphQLRouteImpl & {
+        __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
+    };
+}
+/** What the router matches on. Zero dependencies, so building it costs nothing. */
+export declare const GraphQLRouteDefinition: typeof GraphQLRouteDefinitionImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRouteDefinition>;
+};
 export {};

package/engine/GraphQLRoute.js

@@ -1,10 +1,8 @@
-import { HttpRoute } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import { GraphQLEngine } from "./abstractions.js";
 class GraphQLRouteImpl {
     constructor(engine){
         this.engine = engine;
-        this.method = "POST";
-        this.path = "/graphql";
     }
     async handle(request) {
         const result = await this.engine.execute(request.body);
@@ -17,12 +15,24 @@ class GraphQLRouteImpl {
         };
     }
 }
-const GraphQLRoute = HttpRoute.createImplementation({
+const GraphQLRoute = HttpRouteHandler.createImplementation({
     implementation: GraphQLRouteImpl,
     dependencies: [
         GraphQLEngine
     ]
 });
-export { GraphQLRoute };
+class GraphQLRouteDefinitionImpl {
+    constructor(){
+        this.name = "graphql";
+        this.method = "POST";
+        this.path = "/graphql";
+        this.handler = GraphQLRoute;
+    }
+}
+const GraphQLRouteDefinition = HttpRouteDefinition.createImplementation({
+    implementation: GraphQLRouteDefinitionImpl,
+    dependencies: []
+});
+export { GraphQLRoute, GraphQLRouteDefinition };
 
 //# sourceMappingURL=GraphQLRoute.js.map

package/engine/GraphQLRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine/GraphQLRoute.js","sources":["../../src/engine/GraphQLRoute.ts"],"sourcesContent":["import { HttpRoute } from \"@webiny/event-handler-core\";\nimport { GraphQLEngine } from \"./abstractions.js\";\nimport type { IHttpRequest, IHttpResponse } from \"@webiny/event-handler-core\";\nimport type { IGraphQLEngine } from \"./abstractions.js\";\n\nclass GraphQLRouteImpl implements HttpRoute.Interface {\n    readonly method = \"POST\";\n    readonly path = \"/graphql\";\n\n    constructor(private engine: IGraphQLEngine) {}\n\n    async handle(request: IHttpRequest): Promise<IHttpResponse> {\n        const result = await this.engine.execute(request.body);\n        return {\n            statusCode: 200,\n            headers: { \"Content-Type\": \"application/json\" },\n            body: result\n        };\n    }\n}\n\nexport const GraphQLRoute = HttpRoute.createImplementation({\n    implementation: GraphQLRouteImpl,\n    dependencies: [GraphQLEngine]\n});\n"],"names":["GraphQLRouteImpl","engine","request","result","GraphQLRoute","HttpRoute","GraphQLEngine"],"mappings":";;AAKA,MAAMA;IAIF,YAAoBC,MAAsB,CAAE;aAAxBA,MAAM,GAANA;aAHX,MAAM,GAAG;aACT,IAAI,GAAG;IAE6B;IAE7C,MAAM,OAAOC,OAAqB,EAA0B;QACxD,MAAMC,SAAS,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAACD,QAAQ,IAAI;QACrD,OAAO;YACH,YAAY;YACZ,SAAS;gBAAE,gBAAgB;YAAmB;YAC9C,MAAMC;QACV;IACJ;AACJ;AAEO,MAAMC,eAAeC,UAAU,oBAAoB,CAAC;IACvD,gBAAgBL;IAChB,cAAc;QAACM;KAAc;AACjC"}
+{"version":3,"file":"engine/GraphQLRoute.js","sources":["../../src/engine/GraphQLRoute.ts"],"sourcesContent":["import { HttpRouteDefinition, HttpRouteHandler } from \"@webiny/event-handler-core\";\nimport { GraphQLEngine } from \"./abstractions.js\";\nimport type { IHttpRequest, IHttpResponse } from \"@webiny/event-handler-core\";\nimport type { IGraphQLEngine } from \"./abstractions.js\";\n\nclass GraphQLRouteImpl implements HttpRouteHandler.Interface {\n    constructor(private engine: IGraphQLEngine) {}\n\n    async handle(request: IHttpRequest): Promise<IHttpResponse> {\n        const result = await this.engine.execute(request.body);\n        return {\n            statusCode: 200,\n            headers: { \"Content-Type\": \"application/json\" },\n            body: result\n        };\n    }\n}\n\nexport const GraphQLRoute = HttpRouteHandler.createImplementation({\n    implementation: GraphQLRouteImpl,\n    dependencies: [GraphQLEngine]\n});\n\nclass GraphQLRouteDefinitionImpl implements HttpRouteDefinition.Interface {\n    readonly name = \"graphql\";\n    readonly method = \"POST\";\n    readonly path = \"/graphql\";\n    readonly handler = GraphQLRoute;\n}\n\n/** What the router matches on. Zero dependencies, so building it costs nothing. */\nexport const GraphQLRouteDefinition = HttpRouteDefinition.createImplementation({\n    implementation: GraphQLRouteDefinitionImpl,\n    dependencies: []\n});\n"],"names":["GraphQLRouteImpl","engine","request","result","GraphQLRoute","HttpRouteHandler","GraphQLEngine","GraphQLRouteDefinitionImpl","GraphQLRouteDefinition","HttpRouteDefinition"],"mappings":";;AAKA,MAAMA;IACF,YAAoBC,MAAsB,CAAE;aAAxBA,MAAM,GAANA;IAAyB;IAE7C,MAAM,OAAOC,OAAqB,EAA0B;QACxD,MAAMC,SAAS,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAACD,QAAQ,IAAI;QACrD,OAAO;YACH,YAAY;YACZ,SAAS;gBAAE,gBAAgB;YAAmB;YAC9C,MAAMC;QACV;IACJ;AACJ;AAEO,MAAMC,eAAeC,iBAAiB,oBAAoB,CAAC;IAC9D,gBAAgBL;IAChB,cAAc;QAACM;KAAc;AACjC;AAEA,MAAMC;;aACO,IAAI,GAAG;aACP,MAAM,GAAG;aACT,IAAI,GAAG;aACP,OAAO,GAAGH;;AACvB;AAGO,MAAMI,yBAAyBC,oBAAoB,oBAAoB,CAAC;IAC3E,gBAAgBF;IAChB,cAAc,EAAE;AACpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-graphql",
-	"version": "6.6.0-alpha.0",
+	"version": "6.6.0-alpha.2",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -18,27 +18,27 @@
 		"Adrian Smijulj <adrian@webiny.com>"
 	],
 	"dependencies": {
-		"@graphql-tools/merge": "9.2.2",
-		"@graphql-tools/resolvers-composition": "7.0.35",
-		"@graphql-tools/schema": "10.0.38",
-		"@graphql-tools/utils": "11.2.2",
-		"@webiny/api": "6.6.0-alpha.0",
-		"@webiny/di": "1.0.2",
-		"@webiny/error": "6.6.0-alpha.0",
-		"@webiny/event-handler-core": "6.6.0-alpha.0",
-		"@webiny/feature": "6.6.0-alpha.0",
-		"@webiny/handler": "6.6.0-alpha.0",
-		"@webiny/plugins": "6.6.0-alpha.0",
-		"@webiny/utils": "6.6.0-alpha.0",
+		"@graphql-tools/merge": "9.2.3",
+		"@graphql-tools/resolvers-composition": "7.0.36",
+		"@graphql-tools/schema": "10.1.0",
+		"@graphql-tools/utils": "12.0.0",
+		"@webiny/api": "6.6.0-alpha.2",
+		"@webiny/di": "1.1.0",
+		"@webiny/error": "6.6.0-alpha.2",
+		"@webiny/event-handler-core": "6.6.0-alpha.2",
+		"@webiny/feature": "6.6.0-alpha.2",
+		"@webiny/handler": "6.6.0-alpha.2",
+		"@webiny/plugins": "6.6.0-alpha.2",
+		"@webiny/utils": "6.6.0-alpha.2",
 		"graphql": "16.14.2",
-		"graphql-scalars": "1.25.0",
+		"graphql-scalars": "2.0.0",
 		"zod": "4.4.3"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.6.0-alpha.0",
+		"@webiny/build-tools": "6.6.0-alpha.2",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"

package/registerLegacyPluginsViaGqlContextEnhancer.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerLegacyPluginsViaGqlContextEnhancer.js","sources":["../src/registerLegacyPluginsViaGqlContextEnhancer.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { GraphQLContextEnhancer } from \"./engine/index.js\";\nimport type { IGraphQLContextEnhancer } from \"./engine/index.js\";\n\n/**\n * Escape hatch for legacy plugin-based code that hasn't been migrated to createFeature() yet.\n *\n * Accepts any plugin array (same shape as the old createHandler({ plugins: [...] })) and\n * applies them via a GraphQLContextEnhancer so they still receive the context object.\n *\n * Usage in createLambdaHandler request callback:\n *   registerLegacyPluginsViaGqlContextEnhancer(container, extensions());\n *   registerLegacyPluginsViaGqlContextEnhancer(container, [myPlugin(), anotherPlugin()]);\n */\nexport function registerLegacyPluginsViaGqlContextEnhancer(\n    container: Container,\n    plugins: any | any[]\n): void {\n    const flat = [plugins].flat(Infinity as 1).filter(Boolean);\n    let initialized = false;\n\n    const enhancer: IGraphQLContextEnhancer = {\n        async enhance(ctx: Record<string, any>): Promise<void> {\n            if (initialized) {\n                return;\n            }\n            initialized = true;\n\n            // Legacy plugins assume ctx.plugins exists (they call ctx.plugins.register() directly).\n            // Mirror the contract of the old createHandler which always initialised PluginsContainer.\n            if (!ctx.plugins) {\n                ctx.plugins = new PluginsContainer([]);\n            }\n\n            for (const plugin of flat) {\n                if (typeof plugin.apply === \"function\") {\n                    await plugin.apply(ctx);\n                } else if (ctx.plugins) {\n                    ctx.plugins.register(plugin);\n                }\n            }\n        }\n    };\n\n    container.registerInstance(GraphQLContextEnhancer, enhancer);\n}\n"],"names":["registerLegacyPluginsViaGqlContextEnhancer","container","plugins","flat","Infinity","Boolean","initialized","enhancer","ctx","PluginsContainer","plugin","GraphQLContextEnhancer"],"mappings":";;AAeO,SAASA,2CACZC,SAAoB,EACpBC,OAAoB;IAEpB,MAAMC,OAAO;QAACD;KAAQ,CAAC,IAAI,CAACE,OAAe,MAAM,CAACC;IAClD,IAAIC,cAAc;IAElB,MAAMC,WAAoC;QACtC,MAAM,SAAQC,GAAwB;YAClC,IAAIF,aACA;YAEJA,cAAc;YAId,IAAI,CAACE,IAAI,OAAO,EACZA,IAAI,OAAO,GAAG,IAAIC,iBAAiB,EAAE;YAGzC,KAAK,MAAMC,UAAUP,KACjB,IAAI,AAAwB,cAAxB,OAAOO,OAAO,KAAK,EACnB,MAAMA,OAAO,KAAK,CAACF;iBAChB,IAAIA,IAAI,OAAO,EAClBA,IAAI,OAAO,CAAC,QAAQ,CAACE;QAGjC;IACJ;IAEAT,UAAU,gBAAgB,CAACU,wBAAwBJ;AACvD"}
+{"version":3,"file":"registerLegacyPluginsViaGqlContextEnhancer.js","sources":["../src/registerLegacyPluginsViaGqlContextEnhancer.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { GraphQLContextEnhancer } from \"./engine/index.js\";\nimport type { IGraphQLContextEnhancer } from \"./engine/index.js\";\n\n/**\n * Escape hatch for legacy plugin-based code that hasn't been migrated to createFeature() yet.\n *\n * Accepts any plugin array (same shape as the old createHandler({ plugins: [...] })) and\n * applies them via a GraphQLContextEnhancer so they still receive the context object.\n *\n * Usage in createLambdaHandler request callback:\n *   registerLegacyPluginsViaGqlContextEnhancer(container, extensions());\n *   registerLegacyPluginsViaGqlContextEnhancer(container, [myPlugin(), anotherPlugin()]);\n */\nexport function registerLegacyPluginsViaGqlContextEnhancer(\n    container: Container,\n    plugins: any | any[]\n): void {\n    const flat = [plugins].flat(Infinity as 1).filter(Boolean);\n    let initialized = false;\n\n    const enhancer: IGraphQLContextEnhancer = {\n        async enhance(ctx: Record<string, any>): Promise<void> {\n            if (initialized) {\n                return;\n            }\n            initialized = true;\n\n            // Legacy plugins assume ctx.plugins exists (they call ctx.plugins.register() directly).\n            // Mirror the contract of the old createHandler which always initialised PluginsContainer.\n            if (!ctx.plugins) {\n                ctx.plugins = new PluginsContainer([]);\n            }\n\n            for (const plugin of flat) {\n                if (typeof plugin.apply === \"function\") {\n                    await plugin.apply(ctx);\n                } else if (ctx.plugins) {\n                    ctx.plugins.register(plugin);\n                }\n            }\n        }\n    };\n\n    container.registerInstance(GraphQLContextEnhancer, enhancer);\n}\n"],"names":["registerLegacyPluginsViaGqlContextEnhancer","container","plugins","flat","Infinity","Boolean","initialized","enhancer","ctx","PluginsContainer","plugin","GraphQLContextEnhancer"],"mappings":";;AAeO,SAASA,2CACZC,SAAoB,EACpBC,OAAoB;IAEpB,MAAMC,OAAO;QAACD;KAAQ,CAAC,IAAI,CAACE,KAAQ,EAAO,MAAM,CAACC;IAClD,IAAIC,cAAc;IAElB,MAAMC,WAAoC;QACtC,MAAM,SAAQC,GAAwB;YAClC,IAAIF,aACA;YAEJA,cAAc;YAId,IAAI,CAACE,IAAI,OAAO,EACZA,IAAI,OAAO,GAAG,IAAIC,iBAAiB,EAAE;YAGzC,KAAK,MAAMC,UAAUP,KACjB,IAAI,AAAwB,cAAxB,OAAOO,OAAO,KAAK,EACnB,MAAMA,OAAO,KAAK,CAACF;iBAChB,IAAIA,IAAI,OAAO,EAClBA,IAAI,OAAO,CAAC,QAAQ,CAACE;QAGjC;IACJ;IAEAT,UAAU,gBAAgB,CAACU,wBAAwBJ;AACvD"}