@webiny/api-headless-cms 6.4.5 → 6.6.0-alpha.0

package/graphql/getSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/getSchema.js","sources":["../../src/graphql/getSchema.ts"],"sourcesContent":["import { codeFrameColumns } from \"@babel/code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { generateSchema } from \"./generateSchema.js\";\nimport type { ApiEndpoint, CmsContext } from \"~/types/index.js\";\nimport type { GraphQLSchema } from \"graphql\";\nimport { generateCacheId } from \"./getSchema/generateCacheId.js\";\nimport { generateCacheKey } from \"./getSchema/generateCacheKey.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const models = await context.security.withoutAuthorization(async () => {\n        return await context.cms.listModels({\n            includePrivate: false,\n            includePlugins: true\n        });\n    });\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.cms.type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrameColumns(err.source.body, {\n                    start: {\n                        line: location.line,\n                        column: location.column\n                    }\n                })\n            }\n        });\n    }\n};\n"],"names":["schemaList","Map","getSchema","params","context","models","cacheId","generateCacheId","cacheKey","generateCacheKey","cachedSchema","schema","generateSchema","err","Array","WebinyError","location","codeFrameColumns"],"mappings":";;;;;AAoBA,MAAMA,aAAa,IAAIC;AAMhB,MAAMC,YAAY,OAAOC;IAC5B,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAMpB,MAAME,SAAS,MAAMD,QAAQ,QAAQ,CAAC,oBAAoB,CAAC,UAChD,MAAMA,QAAQ,GAAG,CAAC,UAAU,CAAC;YAChC,gBAAgB;YAChB,gBAAgB;QACpB;IAGJ,MAAME,UAAUC,gBAAgBJ;IAEhC,MAAMK,WAAW,MAAMC,iBAAiB;QAAE,GAAGN,MAAM;QAAEE;IAAO;IAC5D,MAAMK,eAAeV,WAAW,GAAG,CAACM;IACpC,IAAII,cAAc,QAAQF,UACtB,OAAOE,aAAa,MAAM;IAG9B,IAAI;QACA,MAAMC,SAAS,MAAMC,eAAe;YAChC,GAAGT,MAAM;YACTE;QACJ;QACAL,WAAW,GAAG,CAACM,SAAS;YACpB,KAAKE;YACLG;QACJ;QACA,OAAOA;IACX,EAAE,OAAOE,KAAK;QACV,IAAI,CAACC,MAAM,OAAO,CAACD,IAAI,SAAS,GAC5B,MAAM,IAAIE,MAAY;YAClB,SAASF,IAAI,OAAO;YACpB,MAAMA,IAAI,IAAI,IAAI;YAClB,MAAM;gBACF,GAAIA,IAAI,IAAI,IAAI,CAAC,CAAC;gBAClB,UAAUT,QAAQ,GAAG,CAAC,IAAI;YAC9B;QACJ;QAEJ,MAAM,CAACY,SAAS,GAAGH,IAAI,SAAS;QAEhC,MAAM,IAAIE,MAAY;YAClB,MAAM;YACN,SAASF,IAAI,OAAO;YACpB,MAAM;gBACF,gBAAgBI,iBAAiBJ,IAAI,MAAM,CAAC,IAAI,EAAE;oBAC9C,OAAO;wBACH,MAAMG,SAAS,IAAI;wBACnB,QAAQA,SAAS,MAAM;oBAC3B;gBACJ;YACJ;QACJ;IACJ;AACJ"}
+{"version":3,"file":"graphql/getSchema.js","sources":["../../src/graphql/getSchema.ts"],"sourcesContent":["import { codeFrameColumns } from \"@babel/code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport { generateSchema } from \"./generateSchema.js\";\nimport type { ApiEndpoint, CmsContext } from \"~/types/index.js\";\nimport type { GraphQLSchema } from \"graphql\";\nimport { generateCacheId } from \"./getSchema/generateCacheId.js\";\nimport { generateCacheKey } from \"./getSchema/generateCacheKey.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { ListModelsUseCase } from \"~/features/contentModel/ListModels/index.js\";\nimport { HeadlessCmsEndpointConfig } from \"~/HeadlessCmsEndpointConfig.js\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const modelsResult = await context.container\n        .resolve(IdentityContext)\n        .withoutAuthorization(async () => {\n            return context.container.resolve(ListModelsUseCase).execute({\n                includePrivate: false,\n                includePlugins: true\n            });\n        });\n    if (modelsResult.isFail()) {\n        throw modelsResult.error;\n    }\n    const models = modelsResult.value;\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.container.resolve(HeadlessCmsEndpointConfig).type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrameColumns(err.source.body, {\n                    start: {\n                        line: location.line,\n                        column: location.column\n                    }\n                })\n            }\n        });\n    }\n};\n"],"names":["schemaList","Map","getSchema","params","context","modelsResult","IdentityContext","ListModelsUseCase","models","cacheId","generateCacheId","cacheKey","generateCacheKey","cachedSchema","schema","generateSchema","err","Array","WebinyError","HeadlessCmsEndpointConfig","location","codeFrameColumns"],"mappings":";;;;;;;;AAuBA,MAAMA,aAAa,IAAIC;AAMhB,MAAMC,YAAY,OAAOC;IAC5B,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAMpB,MAAME,eAAe,MAAMD,QAAQ,SAAS,CACvC,OAAO,CAACE,iBACR,oBAAoB,CAAC,UACXF,QAAQ,SAAS,CAAC,OAAO,CAACG,mBAAmB,OAAO,CAAC;YACxD,gBAAgB;YAChB,gBAAgB;QACpB;IAER,IAAIF,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;IAE5B,MAAMG,SAASH,aAAa,KAAK;IAEjC,MAAMI,UAAUC,gBAAgBP;IAEhC,MAAMQ,WAAW,MAAMC,iBAAiB;QAAE,GAAGT,MAAM;QAAEK;IAAO;IAC5D,MAAMK,eAAeb,WAAW,GAAG,CAACS;IACpC,IAAII,cAAc,QAAQF,UACtB,OAAOE,aAAa,MAAM;IAG9B,IAAI;QACA,MAAMC,SAAS,MAAMC,eAAe;YAChC,GAAGZ,MAAM;YACTK;QACJ;QACAR,WAAW,GAAG,CAACS,SAAS;YACpB,KAAKE;YACLG;QACJ;QACA,OAAOA;IACX,EAAE,OAAOE,KAAK;QACV,IAAI,CAACC,MAAM,OAAO,CAACD,IAAI,SAAS,GAC5B,MAAM,IAAIE,MAAY;YAClB,SAASF,IAAI,OAAO;YACpB,MAAMA,IAAI,IAAI,IAAI;YAClB,MAAM;gBACF,GAAIA,IAAI,IAAI,IAAI,CAAC,CAAC;gBAClB,UAAUZ,QAAQ,SAAS,CAAC,OAAO,CAACe,2BAA2B,IAAI;YACvE;QACJ;QAEJ,MAAM,CAACC,SAAS,GAAGJ,IAAI,SAAS;QAEhC,MAAM,IAAIE,MAAY;YAClB,MAAM;YACN,SAASF,IAAI,OAAO;YACpB,MAAM;gBACF,gBAAgBK,iBAAiBL,IAAI,MAAM,CAAC,IAAI,EAAE;oBAC9C,OAAO;wBACH,MAAMI,SAAS,IAAI;wBACnB,QAAQA,SAAS,MAAM;oBAC3B;gBACJ;YACJ;QACJ;IACJ;AACJ"}

package/graphql/scalars/RevisionIdScalarPlugin.d.ts

@@ -1,2 +1,2 @@
-import type { GraphQLScalarPlugin } from "@webiny/handler-graphql/types.js";
+import type { GraphQLScalarPlugin } from "@webiny/api-graphql/types.js";
 export declare const createRevisionIdScalarPlugin: () => GraphQLScalarPlugin[];

package/graphql/scalars/RevisionIdScalarPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/scalars/RevisionIdScalarPlugin.js","sources":["../../../src/graphql/scalars/RevisionIdScalarPlugin.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types.js\";\nimport { RevisionIdScalar } from \"~/graphql/scalars/RevisionId.js\";\n\nexport const createRevisionIdScalarPlugin = (): GraphQLScalarPlugin[] => {\n    const plugin: GraphQLScalarPlugin = {\n        name: \"headlessCms.graphql.revisionIdScalar\",\n        type: \"graphql-scalar\",\n        scalar: RevisionIdScalar\n    };\n    return [plugin];\n};\n"],"names":["createRevisionIdScalarPlugin","plugin","RevisionIdScalar"],"mappings":";AAGO,MAAMA,+BAA+B;IACxC,MAAMC,SAA8B;QAChC,MAAM;QACN,MAAM;QACN,QAAQC;IACZ;IACA,OAAO;QAACD;KAAO;AACnB"}
+{"version":3,"file":"graphql/scalars/RevisionIdScalarPlugin.js","sources":["../../../src/graphql/scalars/RevisionIdScalarPlugin.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/api-graphql/types.js\";\nimport { RevisionIdScalar } from \"~/graphql/scalars/RevisionId.js\";\n\nexport const createRevisionIdScalarPlugin = (): GraphQLScalarPlugin[] => {\n    const plugin: GraphQLScalarPlugin = {\n        name: \"headlessCms.graphql.revisionIdScalar\",\n        type: \"graphql-scalar\",\n        scalar: RevisionIdScalar\n    };\n    return [plugin];\n};\n"],"names":["createRevisionIdScalarPlugin","plugin","RevisionIdScalar"],"mappings":";AAGO,MAAMA,+BAA+B;IACxC,MAAMC,SAA8B;QAChC,MAAM;QACN,MAAM;QACN,QAAQC;IACZ;IACA,OAAO;QAACD;KAAO;AACnB"}

package/graphql/schema/baseContentSchema.d.ts

@@ -1,7 +1,2 @@
-import type { CmsContext } from "../../types/index.js";
 import type { ICmsGraphQLSchemaPlugin } from "../../plugins/index.js";
-interface Params {
-    context: CmsContext;
-}
-export declare const createBaseContentSchema: ({ context }: Params) => ICmsGraphQLSchemaPlugin;
-export {};
+export declare const createBaseContentSchema: () => ICmsGraphQLSchemaPlugin;

package/graphql/schema/baseContentSchema.js

@@ -1,10 +1,10 @@
-import { AnyScalar, DateScalar, DateTimeScalar, DateTimeZScalar, IconScalar, JsonScalar, LongScalar, NumberScalar, RefInputScalar, TimeScalar } from "@webiny/handler-graphql/builtInTypes/index.js";
+import { AnyScalar, DateScalar, DateTimeScalar, DateTimeZScalar, IconScalar, JsonScalar, LongScalar, NumberScalar, RefInputScalar, TimeScalar } from "@webiny/api-graphql/builtInTypes/index.js";
 import { createCmsGraphQLSchemaPlugin } from "../../plugins/index.js";
-const createBaseContentSchema = ({ context })=>{
-    const scalars = context.plugins.byType("graphql-scalar").map((item)=>item.scalar);
+import { RevisionIdScalar } from "../scalars/RevisionId.js";
+const createBaseContentSchema = ()=>{
     const plugin = createCmsGraphQLSchemaPlugin({
         typeDefs: `
-            ${scalars.map((scalar)=>`scalar ${scalar.name}`).join(" ")}
+            scalar RevisionId
             scalar JSON
             scalar Long
             scalar RefInput
@@ -28,10 +28,7 @@ const createBaseContentSchema = ({ context })=>{
             }
         `,
         resolvers: {
-            ...scalars.reduce((acc, s)=>{
-                acc[s.name] = s;
-                return acc;
-            }, {}),
+            RevisionId: RevisionIdScalar,
             JSON: JsonScalar,
             Long: LongScalar,
             RefInput: RefInputScalar,

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/baseContentSchema.js","sources":["../../../src/graphql/schema/baseContentSchema.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types.js\";\nimport type { CmsContext } from \"~/types/index.js\";\nimport {\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    DateTimeZScalar,\n    JsonScalar,\n    LongScalar,\n    NumberScalar,\n    RefInputScalar,\n    TimeScalar,\n    IconScalar\n} from \"@webiny/handler-graphql/builtInTypes/index.js\";\nimport type { GraphQLScalarType } from \"graphql\";\nimport type { ICmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\n\ninterface Params {\n    context: CmsContext;\n}\n\nexport const createBaseContentSchema = ({ context }: Params): ICmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n            scalar Icon\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Icon: IconScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"names":["createBaseContentSchema","context","scalars","item","plugin","createCmsGraphQLSchemaPlugin","scalar","acc","s","JsonScalar","LongScalar","RefInputScalar","NumberScalar","AnyScalar","DateTimeScalar","DateTimeZScalar","DateScalar","TimeScalar","IconScalar"],"mappings":";;AAsBO,MAAMA,0BAA0B,CAAC,EAAEC,OAAO,EAAU;IACvD,MAAMC,UAAUD,QAAQ,OAAO,CAC1B,MAAM,CAAsB,kBAC5B,GAAG,CAACE,CAAAA,OAAQA,KAAK,MAAM;IAE5B,MAAMC,SAASC,6BAA6B;QACxC,UAAwB,CAAC;YACrB,EAAEH,QAAQ,GAAG,CAACI,CAAAA,SAAU,CAAC,OAAO,EAAEA,OAAO,IAAI,EAAE,EAAE,IAAI,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;QAsB/D,CAAC;QACD,WAAW;YACP,GAAGJ,QAAQ,MAAM,CAAoC,CAACK,KAAKC;gBACvDD,GAAG,CAACC,EAAE,IAAI,CAAC,GAAGA;gBACd,OAAOD;YACX,GAAG,CAAC,EAAE;YACN,MAAME;YACN,MAAMC;YACN,UAAUC;YACV,QAAQC;YACR,KAAKC;YACL,UAAUC;YACV,WAAWC;YACX,MAAMC;YACN,MAAMC;YACN,MAAMC;YACN,UAAU;gBACN,QAAQ,IAAM;YAClB;QACJ;IACJ;IACAd,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}
+{"version":3,"file":"graphql/schema/baseContentSchema.js","sources":["../../../src/graphql/schema/baseContentSchema.ts"],"sourcesContent":["import {\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    DateTimeZScalar,\n    JsonScalar,\n    LongScalar,\n    NumberScalar,\n    RefInputScalar,\n    TimeScalar,\n    IconScalar\n} from \"@webiny/api-graphql/builtInTypes/index.js\";\nimport type { ICmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport { RevisionIdScalar } from \"~/graphql/scalars/RevisionId.js\";\n\nexport const createBaseContentSchema = (): ICmsGraphQLSchemaPlugin => {\n    const plugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            scalar RevisionId\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n            scalar Icon\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            RevisionId: RevisionIdScalar,\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Icon: IconScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"names":["createBaseContentSchema","plugin","createCmsGraphQLSchemaPlugin","RevisionIdScalar","JsonScalar","LongScalar","RefInputScalar","NumberScalar","AnyScalar","DateTimeScalar","DateTimeZScalar","DateScalar","TimeScalar","IconScalar"],"mappings":";;;AAgBO,MAAMA,0BAA0B;IACnC,MAAMC,SAASC,6BAA6B;QACxC,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;QAuBzB,CAAC;QACD,WAAW;YACP,YAAYC;YACZ,MAAMC;YACN,MAAMC;YACN,UAAUC;YACV,QAAQC;YACR,KAAKC;YACL,UAAUC;YACV,WAAWC;YACX,MAAMC;YACN,MAAMC;YACN,MAAMC;YACN,UAAU;gBACN,QAAQ,IAAM;YAClB;QACJ;IACJ;IACAZ,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}

package/graphql/schema/baseSchema.d.ts

@@ -1,3 +1,3 @@
 import type { CmsContext } from "../../types/index.js";
-import { ContextPlugin } from "@webiny/api";
-export declare const createBaseSchema: () => ContextPlugin<CmsContext>;
+import type { ICmsGraphQLSchemaPlugin } from "../../plugins/index.js";
+export declare const createBaseSchemaPlugins: (_context: CmsContext) => ICmsGraphQLSchemaPlugin[];

package/graphql/schema/baseSchema.js

@@ -1,25 +1,5 @@
 import { createCmsGraphQLSchemaPlugin } from "../../plugins/index.js";
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import { ContextPlugin } from "@webiny/api";
-import camelCase from "lodash/camelCase.js";
-import { CmsModelFieldValidatorRegistry } from "../../features/validation/index.js";
-const createSkipValidatorEnum = (container)=>{
-    const registry = container.resolve(CmsModelFieldValidatorRegistry);
-    const names = registry.getAll().reduce((collection, validator)=>{
-        const name = camelCase(validator.name);
-        if (collection.includes(name)) return collection;
-        collection.push(name);
-        return collection;
-    }, []);
-    if (0 === names.length) names.push("_empty");
-    return `
-        enum SkipValidatorEnum {
-           ${names.join("\n")}
-        }
-    `;
-};
-const createSchema = (context)=>{
-    const skipValidatorEnum = createSkipValidatorEnum(context.container);
+const createBaseSchemaPlugins = (_context)=>{
     const cmsPlugin = createCmsGraphQLSchemaPlugin({
         typeDefs: `
             type CmsIdentity {
@@ -89,18 +69,16 @@ const createSchema = (context)=>{
                 folderId_not_in: [ID!]
             }
 
-            ${skipValidatorEnum}
-
             input CreateCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input CreateRevisionCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input UpdateCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input CmsIdentityInput {
@@ -147,23 +125,10 @@ const createSchema = (context)=>{
         resolvers: {}
     });
     cmsPlugin.name = "headless-cms.graphql.schema.base";
-    const corePlugin = new GraphQLSchemaPlugin({
-        typeDefs: cmsPlugin.schema.typeDefs,
-        resolvers: cmsPlugin.schema.resolvers
-    });
-    corePlugin.name = "headless-cms.graphql.core.schema.base";
     return [
-        cmsPlugin,
-        corePlugin
+        cmsPlugin
     ];
 };
-const createBaseSchema = ()=>{
-    const plugin = new ContextPlugin(async (context)=>{
-        context.plugins.register(...createSchema(context));
-    });
-    plugin.name = "headless-cms.graphql.createBaseSchema";
-    return plugin;
-};
-export { createBaseSchema };
+export { createBaseSchemaPlugins };
 
 //# sourceMappingURL=baseSchema.js.map

package/graphql/schema/baseSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/baseSchema.js","sources":["../../../src/graphql/schema/baseSchema.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport type { IGraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport camelCase from \"lodash/camelCase.js\";\nimport { CmsModelFieldValidatorRegistry } from \"~/features/validation/index.js\";\nimport type { Container } from \"@webiny/di\";\n\nconst createSkipValidatorEnum = (container: Container) => {\n    const registry = container.resolve(CmsModelFieldValidatorRegistry);\n    const names = registry.getAll().reduce<string[]>((collection, validator) => {\n        const name = camelCase(validator.name);\n        if (collection.includes(name)) {\n            return collection;\n        }\n        collection.push(name);\n        return collection;\n    }, []);\n\n    if (names.length === 0) {\n        names.push(\"_empty\");\n    }\n    return /* GraphQL */ `\n        enum SkipValidatorEnum {\n           ${names.join(\"\\n\")}\n        }\n    `;\n};\n\nconst createSchema = (context: CmsContext): IGraphQLSchemaPlugin<CmsContext>[] => {\n    const skipValidatorEnum = createSkipValidatorEnum(context.container);\n\n    const cmsPlugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            input CmsDeleteEntryOptions {\n                # force delete an entry that might have some records left behind in the database\n                # see CmsDeleteEntryOptions in types.ts\n                force: Boolean\n                # permanently delete an entry without moving it to the bin\n                permanently: Boolean\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsDeleteMultipleDataResponse {\n                id: ID!\n            }\n\n            type CmsDeleteMultipleResponse {\n                data: [CmsDeleteMultipleDataResponse!]\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            # Advanced Content Organization\n            type WbyAcoLocation {\n                folderId: ID\n            }\n\n            input WbyAcoLocationInput {\n                folderId: ID!\n            }\n\n            input WbyAcoLocationWhereInput {\n                folderId: ID\n                folderId_in: [ID!]\n                folderId_not: ID\n                folderId_not_in: [ID!]\n            }\n\n            ${skipValidatorEnum}\n\n            input CreateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CreateRevisionCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input UpdateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CmsIdentityInput {\n                id: String!\n                displayName: String!\n                type: String!\n            }\n\n            type CmsEntryValidationResponseData {\n                error: String!\n                id: String!\n                fieldId: String!\n                parents: [String!]!\n            }\n\n            type CmsEntryValidationResponse {\n                data: [CmsEntryValidationResponseData!]\n                error: CmsError\n            }\n\n            type CmsEntrySystem {\n                _empty: String\n            }\n\n            type CmsEntryLive {\n                version: Int!\n            }\n\n            input CmsEntryLiveWhereInput {\n                version: Int\n                version_gt: Int\n                version_gte: Int\n                version_lt: Int\n                version_lte: Int\n                version_not: Int\n                version_in: [Int!]\n                version_not_in: [Int!]\n            }\n\n            input ListWhereInputCmsEntrySystem {\n                _empty: String\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n\nexport const createBaseSchema = () => {\n    const plugin = new ContextPlugin<CmsContext>(async context => {\n        context.plugins.register(...createSchema(context));\n    });\n\n    plugin.name = \"headless-cms.graphql.createBaseSchema\";\n\n    return plugin;\n};\n"],"names":["createSkipValidatorEnum","container","registry","CmsModelFieldValidatorRegistry","names","collection","validator","name","camelCase","createSchema","context","skipValidatorEnum","cmsPlugin","createCmsGraphQLSchemaPlugin","corePlugin","GraphQLSchemaPlugin","createBaseSchema","plugin","ContextPlugin"],"mappings":";;;;;AASA,MAAMA,0BAA0B,CAACC;IAC7B,MAAMC,WAAWD,UAAU,OAAO,CAACE;IACnC,MAAMC,QAAQF,SAAS,MAAM,GAAG,MAAM,CAAW,CAACG,YAAYC;QAC1D,MAAMC,OAAOC,UAAUF,UAAU,IAAI;QACrC,IAAID,WAAW,QAAQ,CAACE,OACpB,OAAOF;QAEXA,WAAW,IAAI,CAACE;QAChB,OAAOF;IACX,GAAG,EAAE;IAEL,IAAID,AAAiB,MAAjBA,MAAM,MAAM,EACZA,MAAM,IAAI,CAAC;IAEf,OAAqB,CAAC;;WAEf,EAAEA,MAAM,IAAI,CAAC,MAAM;;IAE1B,CAAC;AACL;AAEA,MAAMK,eAAe,CAACC;IAClB,MAAMC,oBAAoBX,wBAAwBU,QAAQ,SAAS;IAEnE,MAAME,YAAYC,6BAA6B;QAC3C,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoErB,EAAEF,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsDxB,CAAC;QACD,WAAW,CAAC;IAChB;IACAC,UAAU,IAAI,GAAG;IACjB,MAAME,aAAa,IAAIC,oBAAgC;QACnD,UAAUH,UAAU,MAAM,CAAC,QAAQ;QACnC,WAAWA,UAAU,MAAM,CAAC,SAAS;IACzC;IACAE,WAAW,IAAI,GAAG;IAIlB,OAAO;QAACF;QAAWE;KAAW;AAClC;AAEO,MAAME,mBAAmB;IAC5B,MAAMC,SAAS,IAAIC,cAA0B,OAAMR;QAC/CA,QAAQ,OAAO,CAAC,QAAQ,IAAID,aAAaC;IAC7C;IAEAO,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}
+{"version":3,"file":"graphql/schema/baseSchema.js","sources":["../../../src/graphql/schema/baseSchema.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport type { ICmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\n\nexport const createBaseSchemaPlugins = (_context: CmsContext): ICmsGraphQLSchemaPlugin[] => {\n    const cmsPlugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            input CmsDeleteEntryOptions {\n                # force delete an entry that might have some records left behind in the database\n                # see CmsDeleteEntryOptions in types.ts\n                force: Boolean\n                # permanently delete an entry without moving it to the bin\n                permanently: Boolean\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsDeleteMultipleDataResponse {\n                id: ID!\n            }\n\n            type CmsDeleteMultipleResponse {\n                data: [CmsDeleteMultipleDataResponse!]\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            # Advanced Content Organization\n            type WbyAcoLocation {\n                folderId: ID\n            }\n\n            input WbyAcoLocationInput {\n                folderId: ID!\n            }\n\n            input WbyAcoLocationWhereInput {\n                folderId: ID\n                folderId_in: [ID!]\n                folderId_not: ID\n                folderId_not_in: [ID!]\n            }\n\n            input CreateCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input CreateRevisionCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input UpdateCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input CmsIdentityInput {\n                id: String!\n                displayName: String!\n                type: String!\n            }\n\n            type CmsEntryValidationResponseData {\n                error: String!\n                id: String!\n                fieldId: String!\n                parents: [String!]!\n            }\n\n            type CmsEntryValidationResponse {\n                data: [CmsEntryValidationResponseData!]\n                error: CmsError\n            }\n\n            type CmsEntrySystem {\n                _empty: String\n            }\n\n            type CmsEntryLive {\n                version: Int!\n            }\n\n            input CmsEntryLiveWhereInput {\n                version: Int\n                version_gt: Int\n                version_gte: Int\n                version_lt: Int\n                version_lte: Int\n                version_not: Int\n                version_in: [Int!]\n                version_not_in: [Int!]\n            }\n\n            input ListWhereInputCmsEntrySystem {\n                _empty: String\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n\n    return [cmsPlugin];\n};\n"],"names":["createBaseSchemaPlugins","_context","cmsPlugin","createCmsGraphQLSchemaPlugin"],"mappings":";AAIO,MAAMA,0BAA0B,CAACC;IACpC,MAAMC,YAAYC,6BAA6B;QAC3C,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAwHzB,CAAC;QACD,WAAW,CAAC;IAChB;IACAD,UAAU,IAAI,GAAG;IAEjB,OAAO;QAACA;KAAU;AACtB"}

package/graphql/schema/cms/CmsBaseErrorTypeFactory.d.ts

@@ -0,0 +1,14 @@
+import { CoreGraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.core.js";
+/**
+ * Defines the CmsError type in the static schema so that CmsResponseTypeDefsImpl
+ * (which references CmsError) can be safely included at schema construction time.
+ * CmsError is also defined in the dynamic schema via createBaseSchema() — mergeSchemas
+ * handles the duplicate gracefully.
+ */
+declare class CmsBaseErrorTypeDefs implements CoreGraphQLSchemaFactory.Interface {
+    execute(builder: CoreGraphQLSchemaFactory.SchemaBuilder): CoreGraphQLSchemaFactory.Return;
+}
+export declare const CmsBaseErrorTypeFactory: typeof CmsBaseErrorTypeDefs & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-graphql/graphql/abstractions.core.js").ICoreGraphQLSchemaFactory>;
+};
+export {};

package/graphql/schema/cms/CmsBaseErrorTypeFactory.js

@@ -0,0 +1,21 @@
+import { CoreGraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.core.js";
+class CmsBaseErrorTypeDefs {
+    async execute(builder) {
+        builder.addTypeDefs(`
+            type CmsError {
+                message: String!
+                code: String
+                data: JSON
+                stack: String
+            }
+        `);
+        return builder;
+    }
+}
+const CmsBaseErrorTypeFactory = CoreGraphQLSchemaFactory.createImplementation({
+    implementation: CmsBaseErrorTypeDefs,
+    dependencies: []
+});
+export { CmsBaseErrorTypeFactory };
+
+//# sourceMappingURL=CmsBaseErrorTypeFactory.js.map

package/graphql/schema/cms/CmsBaseErrorTypeFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql/schema/cms/CmsBaseErrorTypeFactory.js","sources":["../../../../src/graphql/schema/cms/CmsBaseErrorTypeFactory.ts"],"sourcesContent":["import { CoreGraphQLSchemaFactory } from \"@webiny/api-graphql/graphql/abstractions.core.js\";\n\n/**\n * Defines the CmsError type in the static schema so that CmsResponseTypeDefsImpl\n * (which references CmsError) can be safely included at schema construction time.\n * CmsError is also defined in the dynamic schema via createBaseSchema() — mergeSchemas\n * handles the duplicate gracefully.\n */\nclass CmsBaseErrorTypeDefs implements CoreGraphQLSchemaFactory.Interface {\n    async execute(\n        builder: CoreGraphQLSchemaFactory.SchemaBuilder\n    ): CoreGraphQLSchemaFactory.Return {\n        builder.addTypeDefs(/* GraphQL */ `\n            type CmsError {\n                message: String!\n                code: String\n                data: JSON\n                stack: String\n            }\n        `);\n        return builder;\n    }\n}\n\nexport const CmsBaseErrorTypeFactory = CoreGraphQLSchemaFactory.createImplementation({\n    implementation: CmsBaseErrorTypeDefs,\n    dependencies: []\n});\n"],"names":["CmsBaseErrorTypeDefs","builder","CmsBaseErrorTypeFactory","CoreGraphQLSchemaFactory"],"mappings":";AAQA,MAAMA;IACF,MAAM,QACFC,OAA+C,EAChB;QAC/BA,QAAQ,WAAW,CAAe,CAAC;;;;;;;QAOnC,CAAC;QACD,OAAOA;IACX;AACJ;AAEO,MAAMC,0BAA0BC,yBAAyB,oBAAoB,CAAC;IACjF,gBAAgBH;IAChB,cAAc,EAAE;AACpB"}

package/graphql/schema/cms/createEntryResolver.js

@@ -1,10 +1,10 @@
 import { buildFieldsSelection, getErrorMessage, getModel } from "./helpers.js";
+import { CmsSchemaExecutor } from "../../CmsSchemaExecutor.js";
 const createCreateEntryResolver = ()=>async ({ args, context })=>{
         const { modelId, data, fields } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = "manage";
-            const executeSchema = await context.cms.getExecutableSchema(apiType);
             const fieldsSelection = buildFieldsSelection(fields);
             const query = `
                 mutation Create${model.singularApiName}($data: ${model.singularApiName}Input!) {
@@ -20,7 +20,7 @@ const createCreateEntryResolver = ()=>async ({ args, context })=>{
                     }
                 }
             `;
-            const result = await executeSchema({
+            const result = await context.container.resolve(CmsSchemaExecutor).execute(apiType, {
                 query,
                 variables: {
                     data

package/graphql/schema/cms/createEntryResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/createEntryResolver.js","sources":["../../../../src/graphql/schema/cms/createEntryResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage, buildFieldsSelection } from \"./helpers.js\";\n\nexport interface CreateEntryArgs {\n    modelId: string;\n    data: Record<string, unknown>;\n    fields: string[];\n}\n\nexport const createCreateEntryResolver = () => {\n    return async ({ args, context }: { args: CreateEntryArgs; context: CmsContext }) => {\n        const { modelId, data, fields } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Use manage API for creating entries.\n            const apiType: ApiEndpoint = \"manage\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            const query = /* GraphQL */ `\n                mutation Create${model.singularApiName}($data: ${model.singularApiName}Input!) {\n                    create${model.singularApiName}(data: $data) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: { data }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"CREATE_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `create${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to create entry\"),\n                    code: \"CREATE_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createCreateEntryResolver","args","context","modelId","data","fields","model","getModel","apiType","executeSchema","fieldsSelection","buildFieldsSelection","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAWO,MAAMA,4BAA4B,IAC9B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAkD;QAC3E,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAE,GAAGJ;QAElC,IAAI;YACA,MAAMK,QAAQ,MAAMC,SAASL,SAASC;YAGtC,MAAMK,UAAuB;YAC7B,MAAMC,gBAAgB,MAAMP,QAAQ,GAAG,CAAC,mBAAmB,CAACM;YAE5D,MAAME,kBAAkBC,qBAAqBN;YAE7C,MAAMO,QAAsB,CAAC;+BACV,EAAEN,MAAM,eAAe,CAAC,QAAQ,EAAEA,MAAM,eAAe,CAAC;0BAC7D,EAAEA,MAAM,eAAe,CAAC;;4BAEtB,EAAEI,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMJ,cAAc;gBAChCG;gBACA,WAAW;oBAAER;gBAAK;YACtB;YAEA,IAAIS,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,MAAM,EAAET,MAAM,eAAe,EAAE;YACtD,OAAOO,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/schema/cms/createEntryResolver.js","sources":["../../../../src/graphql/schema/cms/createEntryResolver.ts"],"sourcesContent":["import type { CmsContext, ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage, buildFieldsSelection } from \"./helpers.js\";\nimport { CmsSchemaExecutor } from \"~/graphql/CmsSchemaExecutor.js\";\n\nexport interface CreateEntryArgs {\n    modelId: string;\n    data: Record<string, unknown>;\n    fields: string[];\n}\n\nexport const createCreateEntryResolver = () => {\n    return async ({ args, context }: { args: CreateEntryArgs; context: CmsContext }) => {\n        const { modelId, data, fields } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Use manage API for creating entries.\n            const apiType: ApiEndpoint = \"manage\";\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            const query = /* GraphQL */ `\n                mutation Create${model.singularApiName}($data: ${model.singularApiName}Input!) {\n                    create${model.singularApiName}(data: $data) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await context.container\n                .resolve(CmsSchemaExecutor)\n                .execute(apiType, { query, variables: { data } })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"CREATE_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `create${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to create entry\"),\n                    code: \"CREATE_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createCreateEntryResolver","args","context","modelId","data","fields","model","getModel","apiType","fieldsSelection","buildFieldsSelection","query","result","CmsSchemaExecutor","e","operationName","error","getErrorMessage"],"mappings":";;AAWO,MAAMA,4BAA4B,IAC9B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAkD;QAC3E,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAE,GAAGJ;QAElC,IAAI;YACA,MAAMK,QAAQ,MAAMC,SAASL,SAASC;YAGtC,MAAMK,UAAuB;YAE7B,MAAMC,kBAAkBC,qBAAqBL;YAE7C,MAAMM,QAAsB,CAAC;+BACV,EAAEL,MAAM,eAAe,CAAC,QAAQ,EAAEA,MAAM,eAAe,CAAC;0BAC7D,EAAEA,MAAM,eAAe,CAAC;;4BAEtB,EAAEG,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMV,QAAQ,SAAS,CAClC,OAAO,CAACW,mBACR,OAAO,CAACL,SAAS;gBAAEG;gBAAO,WAAW;oBAAEP;gBAAK;YAAE;YAEnD,IAAIQ,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACE,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,MAAM,EAAET,MAAM,eAAe,EAAE;YACtD,OAAOM,OAAO,IAAI,EAAE,CAACG,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}

package/graphql/schema/cms/deleteEntryResolver.js

@@ -1,10 +1,10 @@
 import { getErrorMessage, getModel } from "./helpers.js";
+import { CmsSchemaExecutor } from "../../CmsSchemaExecutor.js";
 const createDeleteEntryRevisionResolver = ()=>async ({ args, context })=>{
         const { modelId, revisionId, permanent = false } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = "manage";
-            const executeSchema = await context.cms.getExecutableSchema(apiType);
             const query = `
                 mutation Delete${model.singularApiName}($revisionId: ID!, $options: CmsDeleteEntryOptions) {
                     delete${model.singularApiName}(revision: $revisionId, options: $options) {
@@ -17,7 +17,7 @@ const createDeleteEntryRevisionResolver = ()=>async ({ args, context })=>{
                     }
                 }
             `;
-            const result = await executeSchema({
+            const result = await context.container.resolve(CmsSchemaExecutor).execute(apiType, {
                 query,
                 variables: {
                     revisionId,

package/graphql/schema/cms/deleteEntryResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/deleteEntryResolver.js","sources":["../../../../src/graphql/schema/cms/deleteEntryResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage } from \"./helpers.js\";\n\nexport interface DeleteEntryRevisionArgs {\n    modelId: string;\n    revisionId: string;\n    permanent?: boolean;\n}\n\nexport const createDeleteEntryRevisionResolver = () => {\n    return async ({ args, context }: { args: DeleteEntryRevisionArgs; context: CmsContext }) => {\n        const { modelId, revisionId, permanent = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Use manage API for deleting entries.\n            const apiType: ApiEndpoint = \"manage\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const query = /* GraphQL */ `\n                mutation Delete${model.singularApiName}($revisionId: ID!, $options: CmsDeleteEntryOptions) {\n                    delete${model.singularApiName}(revision: $revisionId, options: $options) {\n                        data\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: {\n                    revisionId,\n                    options: { permanently: permanent }\n                }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: false,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"DELETE_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `delete${model.singularApiName}`;\n            return result.data?.[operationName] || { data: false, error: null };\n        } catch (error) {\n            return {\n                data: false,\n                error: {\n                    message: getErrorMessage(error, \"Failed to delete entry\"),\n                    code: \"DELETE_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createDeleteEntryRevisionResolver","args","context","modelId","revisionId","permanent","model","getModel","apiType","executeSchema","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAWO,MAAMA,oCAAoC,IACtC,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA0D;QACnF,MAAM,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,KAAK,EAAE,GAAGJ;QAEnD,IAAI;YACA,MAAMK,QAAQ,MAAMC,SAASL,SAASC;YAGtC,MAAMK,UAAuB;YAC7B,MAAMC,gBAAgB,MAAMP,QAAQ,GAAG,CAAC,mBAAmB,CAACM;YAE5D,MAAME,QAAsB,CAAC;+BACV,EAAEJ,MAAM,eAAe,CAAC;0BAC7B,EAAEA,MAAM,eAAe,CAAC;;;;;;;;;YAStC,CAAC;YAED,MAAMK,SAAU,MAAMF,cAAc;gBAChCC;gBACA,WAAW;oBACPN;oBACA,SAAS;wBAAE,aAAaC;oBAAU;gBACtC;YACJ;YAEA,IAAIM,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,MAAM,EAAEP,MAAM,eAAe,EAAE;YACtD,OAAOK,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAAE,MAAM;gBAAO,OAAO;YAAK;QACtE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/schema/cms/deleteEntryResolver.js","sources":["../../../../src/graphql/schema/cms/deleteEntryResolver.ts"],"sourcesContent":["import type { CmsContext, ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage } from \"./helpers.js\";\nimport { CmsSchemaExecutor } from \"~/graphql/CmsSchemaExecutor.js\";\n\nexport interface DeleteEntryRevisionArgs {\n    modelId: string;\n    revisionId: string;\n    permanent?: boolean;\n}\n\nexport const createDeleteEntryRevisionResolver = () => {\n    return async ({ args, context }: { args: DeleteEntryRevisionArgs; context: CmsContext }) => {\n        const { modelId, revisionId, permanent = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Use manage API for deleting entries.\n            const apiType: ApiEndpoint = \"manage\";\n\n            const query = /* GraphQL */ `\n                mutation Delete${model.singularApiName}($revisionId: ID!, $options: CmsDeleteEntryOptions) {\n                    delete${model.singularApiName}(revision: $revisionId, options: $options) {\n                        data\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await context.container.resolve(CmsSchemaExecutor).execute(apiType, {\n                query,\n                variables: { revisionId, options: { permanently: permanent } }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: false,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"DELETE_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `delete${model.singularApiName}`;\n            return result.data?.[operationName] || { data: false, error: null };\n        } catch (error) {\n            return {\n                data: false,\n                error: {\n                    message: getErrorMessage(error, \"Failed to delete entry\"),\n                    code: \"DELETE_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createDeleteEntryRevisionResolver","args","context","modelId","revisionId","permanent","model","getModel","apiType","query","result","CmsSchemaExecutor","e","operationName","error","getErrorMessage"],"mappings":";;AAWO,MAAMA,oCAAoC,IACtC,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA0D;QACnF,MAAM,EAAEC,OAAO,EAAEC,UAAU,EAAEC,YAAY,KAAK,EAAE,GAAGJ;QAEnD,IAAI;YACA,MAAMK,QAAQ,MAAMC,SAASL,SAASC;YAGtC,MAAMK,UAAuB;YAE7B,MAAMC,QAAsB,CAAC;+BACV,EAAEH,MAAM,eAAe,CAAC;0BAC7B,EAAEA,MAAM,eAAe,CAAC;;;;;;;;;YAStC,CAAC;YAED,MAAMI,SAAU,MAAMR,QAAQ,SAAS,CAAC,OAAO,CAACS,mBAAmB,OAAO,CAACH,SAAS;gBAChFC;gBACA,WAAW;oBAAEL;oBAAY,SAAS;wBAAE,aAAaC;oBAAU;gBAAE;YACjE;YAEA,IAAIK,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACE,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,MAAM,EAAEP,MAAM,eAAe,EAAE;YACtD,OAAOI,OAAO,IAAI,EAAE,CAACG,cAAc,IAAI;gBAAE,MAAM;gBAAO,OAAO;YAAK;QACtE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}

package/graphql/schema/cms/getEntryResolver.js

@@ -1,10 +1,10 @@
 import { buildFieldsSelection, getErrorMessage, getModel } from "./helpers.js";
+import { CmsSchemaExecutor } from "../../CmsSchemaExecutor.js";
 const createGetEntryResolver = ()=>async ({ args, context })=>{
         const { modelId, where, fields, preview = false } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = preview ? "preview" : "read";
-            const executeSchema = await context.cms.getExecutableSchema(apiType);
             const fieldsSelection = buildFieldsSelection(fields);
             const query = `
                 query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {
@@ -20,7 +20,7 @@ const createGetEntryResolver = ()=>async ({ args, context })=>{
                     }
                 }
             `;
-            const result = await executeSchema({
+            const result = await context.container.resolve(CmsSchemaExecutor).execute(apiType, {
                 query,
                 variables: {
                     where

package/graphql/schema/cms/getEntryResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/getEntryResolver.js","sources":["../../../../src/graphql/schema/cms/getEntryResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage, buildFieldsSelection } from \"./helpers.js\";\n\nexport interface GetEntryArgs {\n    modelId: string;\n    where: Record<string, unknown>;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createGetEntryResolver = () => {\n    return async ({ args, context }: { args: GetEntryArgs; context: CmsContext }) => {\n        const { modelId, where, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            const query = /* GraphQL */ `\n                query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {\n                    get${model.singularApiName}(where: $where) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: { where }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"GET_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `get${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to get entry\"),\n                    code: \"GET_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createGetEntryResolver","args","context","modelId","where","fields","preview","model","getModel","apiType","executeSchema","fieldsSelection","buildFieldsSelection","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAYO,MAAMA,yBAAyB,IAC3B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA+C;QACxE,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGL;QAEpD,IAAI;YACA,MAAMM,QAAQ,MAAMC,SAASN,SAASC;YAItC,MAAMM,UAAuBH,UAAU,YAAY;YACnD,MAAMI,gBAAgB,MAAMR,QAAQ,GAAG,CAAC,mBAAmB,CAACO;YAE5D,MAAME,kBAAkBC,qBAAqBP;YAE7C,MAAMQ,QAAsB,CAAC;yBAChB,EAAEN,MAAM,eAAe,CAAC,SAAS,EAAEA,MAAM,eAAe,CAAC;uBAC3D,EAAEA,MAAM,eAAe,CAAC;;4BAEnB,EAAEI,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMJ,cAAc;gBAChCG;gBACA,WAAW;oBAAET;gBAAM;YACvB;YAEA,IAAIU,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,GAAG,EAAET,MAAM,eAAe,EAAE;YACnD,OAAOO,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/schema/cms/getEntryResolver.js","sources":["../../../../src/graphql/schema/cms/getEntryResolver.ts"],"sourcesContent":["import type { CmsContext, ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage, buildFieldsSelection } from \"./helpers.js\";\nimport { CmsSchemaExecutor } from \"~/graphql/CmsSchemaExecutor.js\";\n\nexport interface GetEntryArgs {\n    modelId: string;\n    where: Record<string, unknown>;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createGetEntryResolver = () => {\n    return async ({ args, context }: { args: GetEntryArgs; context: CmsContext }) => {\n        const { modelId, where, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            const query = /* GraphQL */ `\n                query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {\n                    get${model.singularApiName}(where: $where) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await context.container\n                .resolve(CmsSchemaExecutor)\n                .execute(apiType, { query, variables: { where } })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"GET_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `get${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to get entry\"),\n                    code: \"GET_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createGetEntryResolver","args","context","modelId","where","fields","preview","model","getModel","apiType","fieldsSelection","buildFieldsSelection","query","result","CmsSchemaExecutor","e","operationName","error","getErrorMessage"],"mappings":";;AAYO,MAAMA,yBAAyB,IAC3B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA+C;QACxE,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGL;QAEpD,IAAI;YACA,MAAMM,QAAQ,MAAMC,SAASN,SAASC;YAItC,MAAMM,UAAuBH,UAAU,YAAY;YAEnD,MAAMI,kBAAkBC,qBAAqBN;YAE7C,MAAMO,QAAsB,CAAC;yBAChB,EAAEL,MAAM,eAAe,CAAC,SAAS,EAAEA,MAAM,eAAe,CAAC;uBAC3D,EAAEA,MAAM,eAAe,CAAC;;4BAEnB,EAAEG,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMX,QAAQ,SAAS,CAClC,OAAO,CAACY,mBACR,OAAO,CAACL,SAAS;gBAAEG;gBAAO,WAAW;oBAAER;gBAAM;YAAE;YAEpD,IAAIS,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACE,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,GAAG,EAAET,MAAM,eAAe,EAAE;YACnD,OAAOM,OAAO,IAAI,EAAE,CAACG,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}

package/graphql/schema/cms/helpers/getModel.d.ts

@@ -1,6 +1,3 @@
 import type { CmsContext } from "../../../../types/index.js";
 import type { CmsModel } from "../../../../types/index.js";
-/**
- * Helper to get model by modelId.
- */
 export declare const getModel: (context: CmsContext, modelId: string) => Promise<CmsModel>;

package/graphql/schema/cms/helpers/getModel.js

@@ -1,7 +1,9 @@
+import { GetModelUseCase } from "../../../../features/contentModel/GetModel/index.js";
 const getModel = async (context, modelId)=>{
-    const model = await context.cms.getModel(modelId);
-    if (!model) throw new Error(`Model "${modelId}" not found`);
-    return model;
+    const result = await context.container.resolve(GetModelUseCase).execute(modelId);
+    if (result.isFail()) throw result.error;
+    if (!result.value) throw new Error(`Model "${modelId}" not found`);
+    return result.value;
 };
 export { getModel };
 

package/graphql/schema/cms/helpers/getModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/helpers/getModel.js","sources":["../../../../../src/graphql/schema/cms/helpers/getModel.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { CmsModel } from \"~/types/index.js\";\n\n/**\n * Helper to get model by modelId.\n */\nexport const getModel = async (context: CmsContext, modelId: string): Promise<CmsModel> => {\n    const model = await context.cms.getModel(modelId);\n    if (!model) {\n        throw new Error(`Model \"${modelId}\" not found`);\n    }\n    return model;\n};\n"],"names":["getModel","context","modelId","model","Error"],"mappings":"AAMO,MAAMA,WAAW,OAAOC,SAAqBC;IAChD,MAAMC,QAAQ,MAAMF,QAAQ,GAAG,CAAC,QAAQ,CAACC;IACzC,IAAI,CAACC,OACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEF,QAAQ,WAAW,CAAC;IAElD,OAAOC;AACX"}
+{"version":3,"file":"graphql/schema/cms/helpers/getModel.js","sources":["../../../../../src/graphql/schema/cms/helpers/getModel.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\n\nexport const getModel = async (context: CmsContext, modelId: string): Promise<CmsModel> => {\n    const result = await context.container.resolve(GetModelUseCase).execute(modelId);\n    if (result.isFail()) {\n        throw result.error;\n    }\n    if (!result.value) {\n        throw new Error(`Model \"${modelId}\" not found`);\n    }\n    return result.value;\n};\n"],"names":["getModel","context","modelId","result","GetModelUseCase","Error"],"mappings":";AAIO,MAAMA,WAAW,OAAOC,SAAqBC;IAChD,MAAMC,SAAS,MAAMF,QAAQ,SAAS,CAAC,OAAO,CAACG,iBAAiB,OAAO,CAACF;IACxE,IAAIC,OAAO,MAAM,IACb,MAAMA,OAAO,KAAK;IAEtB,IAAI,CAACA,OAAO,KAAK,EACb,MAAM,IAAIE,MAAM,CAAC,OAAO,EAAEH,QAAQ,WAAW,CAAC;IAElD,OAAOC,OAAO,KAAK;AACvB"}

package/graphql/schema/cms/helpers/transformWhereToNested.js

@@ -1,48 +1,26 @@
-const FORBIDDEN_KEYS = new Set([
-    "__proto__",
-    "prototype",
-    "constructor"
-]);
 const transformWhereToNested = (where)=>{
     if (!where) return;
-    return Object.entries(where).reduce((result, [key, value])=>{
+    const result = {};
+    for (const [key, value] of Object.entries(where)){
         if ("AND" === key || "OR" === key) {
-            if (!Array.isArray(value)) return {
-                ...result,
-                [key]: value
-            };
-            return {
-                ...result,
-                [key]: value.map((item)=>transformWhereToNested(item))
-            };
+            if (Array.isArray(value)) result[key] = value.map((item)=>transformWhereToNested(item));
+            else result[key] = value;
+            continue;
         }
         const dotIndex = key.indexOf(".");
-        if (-1 === dotIndex) {
-            if (FORBIDDEN_KEYS.has(key)) throw new Error(`Invalid where key: "${key}".`);
-            return {
-                ...result,
-                [key]: value
-            };
-        }
-        const head = key.slice(0, dotIndex);
-        const tail = key.slice(dotIndex + 1);
-        if (FORBIDDEN_KEYS.has(head)) throw new Error(`Invalid where key: "${head}".`);
-        if (Object.hasOwn(result, head)) return {
-            ...result,
-            [head]: {
-                ...result[head],
-                ...transformWhereToNested({
-                    [tail]: value
-                })
-            }
-        };
-        return {
-            ...result,
-            [head]: transformWhereToNested({
+        if (-1 === dotIndex) result[key] = value;
+        else {
+            const head = key.slice(0, dotIndex);
+            const tail = key.slice(dotIndex + 1);
+            if (void 0 === result[head]) result[head] = {};
+            const nested = result[head];
+            const expanded = transformWhereToNested({
                 [tail]: value
-            })
-        };
-    }, {});
+            });
+            Object.assign(nested, expanded);
+        }
+    }
+    return result;
 };
 export { transformWhereToNested };
 

package/graphql/schema/cms/helpers/transformWhereToNested.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/helpers/transformWhereToNested.js","sources":["../../../../../src/graphql/schema/cms/helpers/transformWhereToNested.ts"],"sourcesContent":["const FORBIDDEN_KEYS = new Set([\"__proto__\", \"prototype\", \"constructor\"]);\n\n/**\n * Transforms a flat where object with dot-notation keys into a nested object.\n * Keys without dots are passed through unchanged.\n * Handles logical operators (AND, OR) recursively.\n *\n * @param where - Where clause object potentially containing dot-notation keys\n * @returns Nested where object compatible with the GraphQL ListWhereInput type\n *\n * @example\n * transformWhereToNested({ \"values.name\": \"Keyboard\", id: \"abc\" })\n * // Returns: { values: { name: \"Keyboard\" }, id: \"abc\" }\n *\n * @example\n * transformWhereToNested({ \"values.price_gt\": 100, \"values.name_contains\": \"board\" })\n * // Returns: { values: { price_gt: 100, name_contains: \"board\" } }\n */\nexport const transformWhereToNested = (\n    where?: Record<string, unknown>\n): Record<string, unknown> | undefined => {\n    if (!where) {\n        return undefined;\n    }\n\n    return Object.entries(where).reduce<Record<string, unknown>>((result, [key, value]) => {\n        if (key === \"AND\" || key === \"OR\") {\n            if (!Array.isArray(value)) {\n                return {\n                    ...result,\n                    [key]: value\n                };\n            }\n            return {\n                ...result,\n                [key]: value.map(item => transformWhereToNested(item))\n            };\n        }\n\n        const dotIndex = key.indexOf(\".\");\n\n        if (dotIndex === -1) {\n            if (FORBIDDEN_KEYS.has(key)) {\n                throw new Error(`Invalid where key: \"${key}\".`);\n            }\n            return {\n                ...result,\n                [key]: value\n            };\n        }\n\n        const head = key.slice(0, dotIndex);\n        const tail = key.slice(dotIndex + 1);\n\n        if (FORBIDDEN_KEYS.has(head)) {\n            throw new Error(`Invalid where key: \"${head}\".`);\n        }\n\n        if (Object.hasOwn(result, head)) {\n            return {\n                ...result,\n                [head]: {\n                    ...(result[head] as Record<string, unknown>),\n                    ...transformWhereToNested({ [tail]: value })\n                }\n            };\n        }\n\n        return {\n            ...result,\n            [head]: transformWhereToNested({ [tail]: value })\n        };\n    }, {});\n};\n"],"names":["FORBIDDEN_KEYS","Set","transformWhereToNested","where","Object","result","key","value","Array","item","dotIndex","Error","head","tail"],"mappings":"AAAA,MAAMA,iBAAiB,IAAIC,IAAI;IAAC;IAAa;IAAa;CAAc;AAkBjE,MAAMC,yBAAyB,CAClCC;IAEA,IAAI,CAACA,OACD;IAGJ,OAAOC,OAAO,OAAO,CAACD,OAAO,MAAM,CAA0B,CAACE,QAAQ,CAACC,KAAKC,MAAM;QAC9E,IAAID,AAAQ,UAARA,OAAiBA,AAAQ,SAARA,KAAc;YAC/B,IAAI,CAACE,MAAM,OAAO,CAACD,QACf,OAAO;gBACH,GAAGF,MAAM;gBACT,CAACC,IAAI,EAAEC;YACX;YAEJ,OAAO;gBACH,GAAGF,MAAM;gBACT,CAACC,IAAI,EAAEC,MAAM,GAAG,CAACE,CAAAA,OAAQP,uBAAuBO;YACpD;QACJ;QAEA,MAAMC,WAAWJ,IAAI,OAAO,CAAC;QAE7B,IAAII,AAAa,OAAbA,UAAiB;YACjB,IAAIV,eAAe,GAAG,CAACM,MACnB,MAAM,IAAIK,MAAM,CAAC,oBAAoB,EAAEL,IAAI,EAAE,CAAC;YAElD,OAAO;gBACH,GAAGD,MAAM;gBACT,CAACC,IAAI,EAAEC;YACX;QACJ;QAEA,MAAMK,OAAON,IAAI,KAAK,CAAC,GAAGI;QAC1B,MAAMG,OAAOP,IAAI,KAAK,CAACI,WAAW;QAElC,IAAIV,eAAe,GAAG,CAACY,OACnB,MAAM,IAAID,MAAM,CAAC,oBAAoB,EAAEC,KAAK,EAAE,CAAC;QAGnD,IAAIR,OAAO,MAAM,CAACC,QAAQO,OACtB,OAAO;YACH,GAAGP,MAAM;YACT,CAACO,KAAK,EAAE;gBACJ,GAAIP,MAAM,CAACO,KAAK;gBAChB,GAAGV,uBAAuB;oBAAE,CAACW,KAAK,EAAEN;gBAAM,EAAE;YAChD;QACJ;QAGJ,OAAO;YACH,GAAGF,MAAM;YACT,CAACO,KAAK,EAAEV,uBAAuB;gBAAE,CAACW,KAAK,EAAEN;YAAM;QACnD;IACJ,GAAG,CAAC;AACR"}
+{"version":3,"file":"graphql/schema/cms/helpers/transformWhereToNested.js","sources":["../../../../../src/graphql/schema/cms/helpers/transformWhereToNested.ts"],"sourcesContent":["/**\n * Transforms a flat where object with dot-notation keys into a nested object.\n * Keys without dots are passed through unchanged.\n * Handles logical operators (AND, OR) recursively.\n *\n * @param where - Where clause object potentially containing dot-notation keys\n * @returns Nested where object compatible with the GraphQL ListWhereInput type\n *\n * @example\n * transformWhereToNested({ \"values.name\": \"Keyboard\", id: \"abc\" })\n * // Returns: { values: { name: \"Keyboard\" }, id: \"abc\" }\n *\n * @example\n * transformWhereToNested({ \"values.price_gt\": 100, \"values.name_contains\": \"board\" })\n * // Returns: { values: { price_gt: 100, name_contains: \"board\" } }\n */\nexport const transformWhereToNested = (\n    where?: Record<string, unknown>\n): Record<string, unknown> | undefined => {\n    if (!where) {\n        return undefined;\n    }\n\n    const result: Record<string, unknown> = {};\n\n    for (const [key, value] of Object.entries(where)) {\n        // Handle logical operators recursively.\n        if (key === \"AND\" || key === \"OR\") {\n            if (Array.isArray(value)) {\n                result[key] = value.map(item =>\n                    transformWhereToNested(item as Record<string, unknown>)\n                );\n            } else {\n                result[key] = value;\n            }\n            continue;\n        }\n\n        const dotIndex = key.indexOf(\".\");\n        if (dotIndex === -1) {\n            // No dot — pass through unchanged.\n            result[key] = value;\n        } else {\n            // Dot-notation key — expand into nested object.\n            const head = key.slice(0, dotIndex);\n            const tail = key.slice(dotIndex + 1);\n\n            if (result[head] === undefined) {\n                result[head] = {};\n            }\n\n            const nested = result[head] as Record<string, unknown>;\n            // Recursively expand in case of multiple levels of nesting.\n            const expanded = transformWhereToNested({ [tail]: value }) as Record<string, unknown>;\n            Object.assign(nested, expanded);\n        }\n    }\n\n    return result;\n};\n"],"names":["transformWhereToNested","where","result","key","value","Object","Array","item","dotIndex","head","tail","undefined","nested","expanded"],"mappings":"AAgBO,MAAMA,yBAAyB,CAClCC;IAEA,IAAI,CAACA,OACD;IAGJ,MAAMC,SAAkC,CAAC;IAEzC,KAAK,MAAM,CAACC,KAAKC,MAAM,IAAIC,OAAO,OAAO,CAACJ,OAAQ;QAE9C,IAAIE,AAAQ,UAARA,OAAiBA,AAAQ,SAARA,KAAc;YAC/B,IAAIG,MAAM,OAAO,CAACF,QACdF,MAAM,CAACC,IAAI,GAAGC,MAAM,GAAG,CAACG,CAAAA,OACpBP,uBAAuBO;iBAG3BL,MAAM,CAACC,IAAI,GAAGC;YAElB;QACJ;QAEA,MAAMI,WAAWL,IAAI,OAAO,CAAC;QAC7B,IAAIK,AAAa,OAAbA,UAEAN,MAAM,CAACC,IAAI,GAAGC;aACX;YAEH,MAAMK,OAAON,IAAI,KAAK,CAAC,GAAGK;YAC1B,MAAME,OAAOP,IAAI,KAAK,CAACK,WAAW;YAElC,IAAIN,AAAiBS,WAAjBT,MAAM,CAACO,KAAK,EACZP,MAAM,CAACO,KAAK,GAAG,CAAC;YAGpB,MAAMG,SAASV,MAAM,CAACO,KAAK;YAE3B,MAAMI,WAAWb,uBAAuB;gBAAE,CAACU,KAAK,EAAEN;YAAM;YACxDC,OAAO,MAAM,CAACO,QAAQC;QAC1B;IACJ;IAEA,OAAOX;AACX"}

package/graphql/schema/cms/listEntriesResolver.js

@@ -1,10 +1,10 @@
 import { buildFieldsSelection, getErrorMessage, getModel, transformSortToArray, transformWhereToNested } from "./helpers.js";
+import { CmsSchemaExecutor } from "../../CmsSchemaExecutor.js";
 const createListEntriesResolver = ()=>async ({ args, context })=>{
         const { modelId, where, sort, limit, after, search, fields, preview = false } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = preview ? "preview" : "read";
-            const executeSchema = await context.cms.getExecutableSchema(apiType);
             const fieldsSelection = buildFieldsSelection(fields);
             const transformedSort = transformSortToArray(sort);
             const transformedWhere = transformWhereToNested(where);
@@ -39,7 +39,7 @@ const createListEntriesResolver = ()=>async ({ args, context })=>{
                     }
                 }
             `;
-            const result = await executeSchema({
+            const result = await context.container.resolve(CmsSchemaExecutor).execute(apiType, {
                 query,
                 variables: {
                     where: transformedWhere,

package/graphql/schema/cms/listEntriesResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/listEntriesResolver.js","sources":["../../../../src/graphql/schema/cms/listEntriesResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport {\n    getModel,\n    getErrorMessage,\n    buildFieldsSelection,\n    transformSortToArray,\n    transformWhereToNested\n} from \"./helpers.js\";\n\nexport interface ListEntriesArgs {\n    modelId: string;\n    where?: Record<string, unknown>;\n    sort?: Record<string, unknown> | string[];\n    limit?: number;\n    after?: string;\n    search?: string;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createListEntriesResolver = () => {\n    return async ({ args, context }: { args: ListEntriesArgs; context: CmsContext }) => {\n        const { modelId, where, sort, limit, after, search, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            // Transform sort to array format expected by the underlying GraphQL schema.\n            // Handles both object format {createdOn: \"desc\"} and array format [\"createdOn_DESC\"].\n            const transformedSort = transformSortToArray(sort);\n\n            // Transform dot-notation where keys (e.g. \"values.name\") into nested objects\n            // (e.g. { values: { name: ... } }) so they match the typed ListWhereInput.\n            const transformedWhere = transformWhereToNested(where);\n\n            const query = /* GraphQL */ `\n                query List${model.pluralApiName}(\n                    $where: ${model.singularApiName}ListWhereInput\n                    $sort: [${model.singularApiName}ListSorter!]\n                    $limit: Int\n                    $after: String\n                    $search: String\n                ) {\n                    list${model.pluralApiName}(\n                        where: $where\n                        sort: $sort\n                        limit: $limit\n                        after: $after\n                        search: $search\n                    ) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        meta {\n                            cursor\n                            hasMoreItems\n                            totalCount\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: { where: transformedWhere, sort: transformedSort, limit, after, search }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: [],\n                    meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"LIST_ENTRIES_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `list${model.pluralApiName}`;\n            return (\n                result.data?.[operationName] || {\n                    data: [],\n                    meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                    error: null\n                }\n            );\n        } catch (error) {\n            return {\n                data: [],\n                meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                error: {\n                    message: getErrorMessage(error, \"Failed to list entries\"),\n                    code: \"LIST_ENTRIES_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createListEntriesResolver","args","context","modelId","where","sort","limit","after","search","fields","preview","model","getModel","apiType","executeSchema","fieldsSelection","buildFieldsSelection","transformedSort","transformSortToArray","transformedWhere","transformWhereToNested","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAsBO,MAAMA,4BAA4B,IAC9B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAkD;QAC3E,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,IAAI,EAAEC,KAAK,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGT;QAEhF,IAAI;YACA,MAAMU,QAAQ,MAAMC,SAASV,SAASC;YAItC,MAAMU,UAAuBH,UAAU,YAAY;YACnD,MAAMI,gBAAgB,MAAMZ,QAAQ,GAAG,CAAC,mBAAmB,CAACW;YAE5D,MAAME,kBAAkBC,qBAAqBP;YAI7C,MAAMQ,kBAAkBC,qBAAqBb;YAI7C,MAAMc,mBAAmBC,uBAAuBhB;YAEhD,MAAMiB,QAAsB,CAAC;0BACf,EAAEV,MAAM,aAAa,CAAC;4BACpB,EAAEA,MAAM,eAAe,CAAC;4BACxB,EAAEA,MAAM,eAAe,CAAC;;;;;wBAK5B,EAAEA,MAAM,aAAa,CAAC;;;;;;;;4BAQlB,EAAEI,gBAAgB;;;;;;;;;;;;;;YAclC,CAAC;YAED,MAAMO,SAAU,MAAMR,cAAc;gBAChCO;gBACA,WAAW;oBAAE,OAAOF;oBAAkB,MAAMF;oBAAiBX;oBAAOC;oBAAOC;gBAAO;YACtF;YAEA,IAAIc,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,IAAI,EAAEb,MAAM,aAAa,EAAE;YAClD,OACIW,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAC5B,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;YACX;QAER,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/schema/cms/listEntriesResolver.js","sources":["../../../../src/graphql/schema/cms/listEntriesResolver.ts"],"sourcesContent":["import type { CmsContext, ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport {\n    getModel,\n    getErrorMessage,\n    buildFieldsSelection,\n    transformSortToArray,\n    transformWhereToNested\n} from \"./helpers.js\";\nimport { CmsSchemaExecutor } from \"~/graphql/CmsSchemaExecutor.js\";\n\nexport interface ListEntriesArgs {\n    modelId: string;\n    where?: Record<string, unknown>;\n    sort?: Record<string, unknown> | string[];\n    limit?: number;\n    after?: string;\n    search?: string;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createListEntriesResolver = () => {\n    return async ({ args, context }: { args: ListEntriesArgs; context: CmsContext }) => {\n        const { modelId, where, sort, limit, after, search, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            // Transform sort to array format expected by the underlying GraphQL schema.\n            // Handles both object format {createdOn: \"desc\"} and array format [\"createdOn_DESC\"].\n            const transformedSort = transformSortToArray(sort);\n\n            // Transform dot-notation where keys (e.g. \"values.name\") into nested objects\n            // (e.g. { values: { name: ... } }) so they match the typed ListWhereInput.\n            const transformedWhere = transformWhereToNested(where);\n\n            const query = /* GraphQL */ `\n                query List${model.pluralApiName}(\n                    $where: ${model.singularApiName}ListWhereInput\n                    $sort: [${model.singularApiName}ListSorter!]\n                    $limit: Int\n                    $after: String\n                    $search: String\n                ) {\n                    list${model.pluralApiName}(\n                        where: $where\n                        sort: $sort\n                        limit: $limit\n                        after: $after\n                        search: $search\n                    ) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        meta {\n                            cursor\n                            hasMoreItems\n                            totalCount\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await context.container.resolve(CmsSchemaExecutor).execute(apiType, {\n                query,\n                variables: { where: transformedWhere, sort: transformedSort, limit, after, search }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: [],\n                    meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"LIST_ENTRIES_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `list${model.pluralApiName}`;\n            return (\n                result.data?.[operationName] || {\n                    data: [],\n                    meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                    error: null\n                }\n            );\n        } catch (error) {\n            return {\n                data: [],\n                meta: { cursor: null, hasMoreItems: false, totalCount: 0 },\n                error: {\n                    message: getErrorMessage(error, \"Failed to list entries\"),\n                    code: \"LIST_ENTRIES_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createListEntriesResolver","args","context","modelId","where","sort","limit","after","search","fields","preview","model","getModel","apiType","fieldsSelection","buildFieldsSelection","transformedSort","transformSortToArray","transformedWhere","transformWhereToNested","query","result","CmsSchemaExecutor","e","operationName","error","getErrorMessage"],"mappings":";;AAsBO,MAAMA,4BAA4B,IAC9B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAkD;QAC3E,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,IAAI,EAAEC,KAAK,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGT;QAEhF,IAAI;YACA,MAAMU,QAAQ,MAAMC,SAASV,SAASC;YAItC,MAAMU,UAAuBH,UAAU,YAAY;YAEnD,MAAMI,kBAAkBC,qBAAqBN;YAI7C,MAAMO,kBAAkBC,qBAAqBZ;YAI7C,MAAMa,mBAAmBC,uBAAuBf;YAEhD,MAAMgB,QAAsB,CAAC;0BACf,EAAET,MAAM,aAAa,CAAC;4BACpB,EAAEA,MAAM,eAAe,CAAC;4BACxB,EAAEA,MAAM,eAAe,CAAC;;;;;wBAK5B,EAAEA,MAAM,aAAa,CAAC;;;;;;;;4BAQlB,EAAEG,gBAAgB;;;;;;;;;;;;;;YAclC,CAAC;YAED,MAAMO,SAAU,MAAMnB,QAAQ,SAAS,CAAC,OAAO,CAACoB,mBAAmB,OAAO,CAACT,SAAS;gBAChFO;gBACA,WAAW;oBAAE,OAAOF;oBAAkB,MAAMF;oBAAiBV;oBAAOC;oBAAOC;gBAAO;YACtF;YAEA,IAAIa,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACE,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,IAAI,EAAEb,MAAM,aAAa,EAAE;YAClD,OACIU,OAAO,IAAI,EAAE,CAACG,cAAc,IAAI;gBAC5B,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;YACX;QAER,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM,EAAE;gBACR,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;gBACzD,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}

package/graphql/schema/cms/publishEntryResolver.js

@@ -1,10 +1,10 @@
 import { buildFieldsSelection, getErrorMessage, getModel } from "./helpers.js";
+import { CmsSchemaExecutor } from "../../CmsSchemaExecutor.js";
 const createPublishEntryRevisionResolver = ()=>async ({ args, context })=>{
         const { modelId, revisionId, fields } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = "manage";
-            const executeSchema = await context.cms.getExecutableSchema(apiType);
             const fieldsSelection = buildFieldsSelection(fields);
             const query = `
                 mutation Publish${model.singularApiName}($revisionId: ID!) {
@@ -20,7 +20,7 @@ const createPublishEntryRevisionResolver = ()=>async ({ args, context })=>{
                     }
                 }
             `;
-            const result = await executeSchema({
+            const result = await context.container.resolve(CmsSchemaExecutor).execute(apiType, {
                 query,
                 variables: {
                     revisionId