@webiny/api-headless-cms 0.0.0-unstable.40876133bb → 0.0.0-unstable.60e968001a

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js

@@ -0,0 +1,239 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CmsModelDynamicZoneFieldConverterPlugin = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _CmsModelFieldConverterPlugin = require("../plugins/CmsModelFieldConverterPlugin");
+
+class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlugin.CmsModelFieldConverterPlugin {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "name", "cms.field.converter.dynamicZone");
+  }
+
+  getFieldType() {
+    return "dynamicZone";
+  }
+
+  getTemplates(field) {
+    var _field$settings;
+
+    return ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.templates) || [];
+  }
+
+  convertToStorage(params) {
+    const {
+      field,
+      value,
+      converterCollection
+    } = params;
+    const templates = this.getTemplates(field);
+
+    if (templates.length === 0) {
+      return {};
+    }
+
+    if (field.multipleValues) {
+      if (!Array.isArray(value)) {
+        throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting an array value.`, "DYNAMIC_ZONE_EXPECTING_ARRAY_VALUE", {
+          field,
+          value
+        });
+      }
+
+      return {
+        [field.storageId]: value.map(item => {
+          return this.processToStorage({
+            templates,
+            converterCollection,
+            value: item
+          });
+        })
+      };
+    }
+
+    if (Array.isArray(value)) {
+      throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
+        field,
+        value
+      });
+    }
+
+    const processedValue = this.processToStorage({
+      templates,
+      converterCollection,
+      value
+    });
+    return {
+      [field.storageId]: processedValue
+    };
+  }
+
+  processToStorage(params) {
+    const {
+      templates,
+      converterCollection
+    } = params;
+    let {
+      value
+    } = params;
+
+    if (value === null || value === undefined) {
+      return undefined;
+    }
+    /**
+     * There are two ways converter needs to work:
+     * 1. when there is a _templateId
+     * 2. when there is a key which identifies which template is the data for
+     */
+
+    /**
+     * When we have a template key, everything is simple.
+     */
+
+
+    const templateId = value._templateId;
+    let graphQlName = undefined;
+    let template = undefined;
+
+    if (templateId) {
+      template = templates.find(t => {
+        return templateId === t.id;
+      });
+    }
+    /**
+     * When we do not have a templateId, then the template identifier is the key of the value object.
+     * But at that point, values under that key become the value we are working with later on.
+     */
+    //
+    else {
+      const keys = Object.keys(value);
+
+      if (keys.length === 0) {
+        return undefined;
+      } else if (keys.length > 1) {
+        throw new _error.default("There cannot be more than one dynamic zone template in a single dynamic zone field.", "DYNAMIC_ZONE_TOO_MANY_TEMPLATES", {
+          templates: keys
+        });
+      }
+
+      graphQlName = keys[0];
+      template = templates.find(t => t.gqlTypeName === graphQlName);
+    }
+
+    if (!template) {
+      throw new _error.default("Unknown template - converting to storage.", "UNKNOWN_TEMPLATE", {
+        templateId,
+        graphQlName
+      });
+    } else if (graphQlName) {
+      value = value[graphQlName];
+    }
+
+    return template.fields.reduce((values, field) => {
+      const converter = converterCollection.getConverter(field.type);
+      const converted = converter.convertToStorage({
+        field,
+        value: value ? value[field.fieldId] : undefined
+      });
+      Object.assign(values, converted);
+      return values;
+    }, {
+      _templateId: template.id
+    });
+  }
+
+  convertFromStorage(params) {
+    const {
+      field,
+      value,
+      converterCollection
+    } = params;
+    const templates = this.getTemplates(field);
+
+    if (templates.length === 0) {
+      return {};
+    }
+
+    if (field.multipleValues) {
+      if (!Array.isArray(value)) {
+        throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting an array value.`, "DYNAMIC_ZONE_EXPECTING_ARRAY_VALUE", {
+          field,
+          value
+        });
+      }
+
+      return {
+        [field.fieldId]: value.map(item => {
+          return this.processFromStorage({
+            templates,
+            converterCollection,
+            value: item
+          });
+        })
+      };
+    }
+
+    if (Array.isArray(value)) {
+      throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
+        field,
+        value
+      });
+    }
+
+    const processedValue = this.processFromStorage({
+      templates,
+      converterCollection,
+      value
+    });
+    return {
+      [field.fieldId]: processedValue
+    };
+  }
+
+  processFromStorage(params) {
+    const {
+      templates,
+      value,
+      converterCollection
+    } = params;
+
+    if (value === null || value === undefined) {
+      return undefined;
+    }
+
+    const {
+      _templateId
+    } = value;
+    const template = templates.find(t => t.id === _templateId);
+
+    if (!template) {
+      throw new _error.default("Unknown template - converting from storage.", "UNKNOWN_TEMPLATE", {
+        templateId: _templateId
+      });
+    }
+
+    return template.fields.reduce((values, field) => {
+      const converter = converterCollection.getConverter(field.type);
+      const converted = converter.convertFromStorage({
+        field,
+        value: value[field.storageId]
+      });
+      Object.assign(values, converted);
+      return values;
+    }, {
+      _templateId: template.id
+    });
+  }
+
+}
+
+exports.CmsModelDynamicZoneFieldConverterPlugin = CmsModelDynamicZoneFieldConverterPlugin;

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CmsModelDynamicZoneFieldConverterPlugin","CmsModelFieldConverterPlugin","getFieldType","getTemplates","field","settings","templates","convertToStorage","params","value","converterCollection","length","multipleValues","Array","isArray","WebinyError","fieldId","storageId","map","item","processToStorage","processedValue","undefined","templateId","_templateId","graphQlName","template","find","t","id","keys","Object","gqlTypeName","fields","reduce","values","converter","getConverter","type","converted","assign","convertFromStorage","processFromStorage"],"sources":["CmsModelDynamicZoneFieldConverterPlugin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    CmsModelFieldConverterPlugin,\n    ConvertParams\n} from \"~/plugins/CmsModelFieldConverterPlugin\";\nimport { CmsDynamicZoneTemplate, CmsEntryValues, CmsModelDynamicZoneField } from \"~/types\";\nimport { ConverterCollection } from \"~/utils/converters/ConverterCollection\";\n\ninterface DynamicZoneValue {\n    [key: string]: any;\n}\n\ninterface ProcessValue {\n    templates: CmsDynamicZoneTemplate[];\n    value: DynamicZoneValue | null;\n    converterCollection: ConverterCollection;\n}\n\nexport class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.dynamicZone\";\n\n    public override getFieldType(): string {\n        return \"dynamicZone\";\n    }\n\n    private getTemplates(field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] {\n        return field.settings?.templates || [];\n    }\n\n    public override convertToStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.multipleValues) {\n            if (!Array.isArray(value)) {\n                throw new WebinyError(\n                    `Dynamic zone field \"${field.fieldId}\" is expecting an array value.`,\n                    \"DYNAMIC_ZONE_EXPECTING_ARRAY_VALUE\",\n                    {\n                        field,\n                        value\n                    }\n                );\n            }\n            return {\n                [field.storageId]: value.map(item => {\n                    return this.processToStorage({\n                        templates,\n                        converterCollection,\n                        value: item\n                    });\n                })\n            };\n        }\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processToStorage({\n            templates,\n            converterCollection,\n            value\n        });\n        return {\n            [field.storageId]: processedValue\n        };\n    }\n\n    private processToStorage(params: ProcessValue) {\n        const { templates, converterCollection } = params;\n        let { value } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n        /**\n         * There are two ways converter needs to work:\n         * 1. when there is a _templateId\n         * 2. when there is a key which identifies which template is the data for\n         */\n\n        /**\n         * When we have a template key, everything is simple.\n         */\n        const templateId = value._templateId;\n        let graphQlName: string | undefined = undefined;\n        let template: CmsDynamicZoneTemplate | undefined = undefined;\n        if (templateId) {\n            template = templates.find(t => {\n                return templateId === t.id;\n            });\n        }\n        /**\n         * When we do not have a templateId, then the template identifier is the key of the value object.\n         * But at that point, values under that key become the value we are working with later on.\n         */\n        //\n        else {\n            const keys = Object.keys(value);\n            if (keys.length === 0) {\n                return undefined;\n            } else if (keys.length > 1) {\n                throw new WebinyError(\n                    \"There cannot be more than one dynamic zone template in a single dynamic zone field.\",\n                    \"DYNAMIC_ZONE_TOO_MANY_TEMPLATES\",\n                    {\n                        templates: keys\n                    }\n                );\n            }\n            graphQlName = keys[0] as string;\n            template = templates.find(t => t.gqlTypeName === graphQlName);\n        }\n\n        if (!template) {\n            throw new WebinyError(\"Unknown template - converting to storage.\", \"UNKNOWN_TEMPLATE\", {\n                templateId,\n                graphQlName\n            });\n        } else if (graphQlName) {\n            value = value[graphQlName];\n        }\n\n        return template.fields.reduce<Record<string, any>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertToStorage({\n                    field,\n                    value: value ? value[field.fieldId] : undefined\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n\n    public override convertFromStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.multipleValues) {\n            if (!Array.isArray(value)) {\n                throw new WebinyError(\n                    `Dynamic zone field \"${field.fieldId}\" is expecting an array value.`,\n                    \"DYNAMIC_ZONE_EXPECTING_ARRAY_VALUE\",\n                    {\n                        field,\n                        value\n                    }\n                );\n            }\n            return {\n                [field.fieldId]: value.map(item => {\n                    return this.processFromStorage({\n                        templates,\n                        converterCollection,\n                        value: item\n                    });\n                })\n            };\n        }\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processFromStorage({\n            templates,\n            converterCollection,\n            value\n        });\n        return {\n            [field.fieldId]: processedValue\n        };\n    }\n\n    private processFromStorage(params: ProcessValue) {\n        const { templates, value, converterCollection } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const { _templateId } = value;\n\n        const template = templates.find(t => t.id === _templateId);\n        if (!template) {\n            throw new WebinyError(\n                \"Unknown template - converting from storage.\",\n                \"UNKNOWN_TEMPLATE\",\n                {\n                    templateId: _templateId\n                }\n            );\n        }\n\n        return template.fields.reduce<Record<string, any>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertFromStorage({\n                    field,\n                    value: value[field.storageId]\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n}\n"],"mappings":"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"}

package/fieldConverters/index.d.ts

@@ -1,3 +1,4 @@
 import { CmsModelObjectFieldConverterPlugin } from "./CmsModelObjectFieldConverterPlugin";
 import { CmsModelDefaultFieldConverterPlugin } from "./CmsModelDefaultFieldConverterPlugin";
-export declare const createFieldConverters: () => (CmsModelObjectFieldConverterPlugin | CmsModelDefaultFieldConverterPlugin)[];
+import { CmsModelDynamicZoneFieldConverterPlugin } from "./CmsModelDynamicZoneFieldConverterPlugin";
+export declare const createFieldConverters: () => (CmsModelObjectFieldConverterPlugin | CmsModelDefaultFieldConverterPlugin | CmsModelDynamicZoneFieldConverterPlugin)[];

package/fieldConverters/index.js

@@ -9,8 +9,10 @@ var _CmsModelObjectFieldConverterPlugin = require("./CmsModelObjectFieldConverte
 
 var _CmsModelDefaultFieldConverterPlugin = require("./CmsModelDefaultFieldConverterPlugin");
 
+var _CmsModelDynamicZoneFieldConverterPlugin = require("./CmsModelDynamicZoneFieldConverterPlugin");
+
 const createFieldConverters = () => {
-  return [new _CmsModelObjectFieldConverterPlugin.CmsModelObjectFieldConverterPlugin(), new _CmsModelDefaultFieldConverterPlugin.CmsModelDefaultFieldConverterPlugin()];
+  return [new _CmsModelObjectFieldConverterPlugin.CmsModelObjectFieldConverterPlugin(), new _CmsModelDynamicZoneFieldConverterPlugin.CmsModelDynamicZoneFieldConverterPlugin(), new _CmsModelDefaultFieldConverterPlugin.CmsModelDefaultFieldConverterPlugin()];
 };
 
 exports.createFieldConverters = createFieldConverters;

package/fieldConverters/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFieldConverters","CmsModelObjectFieldConverterPlugin","CmsModelDefaultFieldConverterPlugin"],"sources":["index.ts"],"sourcesContent":["import { CmsModelObjectFieldConverterPlugin } from \"~/fieldConverters/CmsModelObjectFieldConverterPlugin\";\nimport { CmsModelDefaultFieldConverterPlugin } from \"~/fieldConverters/CmsModelDefaultFieldConverterPlugin\";\n\nexport const createFieldConverters = () => {\n    return [new CmsModelObjectFieldConverterPlugin(), new CmsModelDefaultFieldConverterPlugin()];\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;AAEO,MAAMA,qBAAqB,GAAG,MAAM;EACvC,OAAO,CAAC,IAAIC,sEAAJ,EAAD,EAA2C,IAAIC,wEAAJ,EAA3C,CAAP;AACH,CAFM"}
+{"version":3,"names":["createFieldConverters","CmsModelObjectFieldConverterPlugin","CmsModelDynamicZoneFieldConverterPlugin","CmsModelDefaultFieldConverterPlugin"],"sources":["index.ts"],"sourcesContent":["import { CmsModelObjectFieldConverterPlugin } from \"~/fieldConverters/CmsModelObjectFieldConverterPlugin\";\nimport { CmsModelDefaultFieldConverterPlugin } from \"~/fieldConverters/CmsModelDefaultFieldConverterPlugin\";\nimport { CmsModelDynamicZoneFieldConverterPlugin } from \"~/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin\";\n\nexport const createFieldConverters = () => {\n    return [\n        new CmsModelObjectFieldConverterPlugin(),\n        new CmsModelDynamicZoneFieldConverterPlugin(),\n        new CmsModelDefaultFieldConverterPlugin()\n    ];\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AAEO,MAAMA,qBAAqB,GAAG,MAAM;EACvC,OAAO,CACH,IAAIC,sEAAJ,EADG,EAEH,IAAIC,gFAAJ,EAFG,EAGH,IAAIC,wEAAJ,EAHG,CAAP;AAKH,CANM"}

package/graphql/buildSchemaPlugins.d.ts

@@ -1,6 +1,6 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
 import { CmsContext } from "../types";
+import { CmsGraphQLSchemaPlugin } from "../plugins";
 /**
  * This factory is called whenever we need to generate graphql-schema plugins using the current context.
  */
-export declare const buildSchemaPlugins: (context: CmsContext) => Promise<GraphQLSchemaPlugin<CmsContext>[]>;
+export declare const buildSchemaPlugins: (context: CmsContext) => Promise<CmsGraphQLSchemaPlugin[]>;

package/graphql/buildSchemaPlugins.js.map

@@ -1 +1 @@
-{"version":3,"names":["buildSchemaPlugins","context","createBaseContentSchema","createModelsSchema","createContentEntriesSchema","createGroupsSchema","generateSchemaPlugins","filter","Boolean"],"sources":["buildSchemaPlugins.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { CmsContext } from \"~/types\";\nimport { createModelsSchema } from \"./schema/contentModels\";\nimport { createContentEntriesSchema } from \"./schema/contentEntries\";\nimport { createGroupsSchema } from \"./schema/contentModelGroups\";\nimport { createBaseContentSchema } from \"./schema/baseContentSchema\";\nimport { generateSchemaPlugins } from \"./schema/schemaPlugins\";\n\n/**\n * This factory is called whenever we need to generate graphql-schema plugins using the current context.\n */\n\nexport const buildSchemaPlugins = async (\n    context: CmsContext\n): Promise<GraphQLSchemaPlugin<CmsContext>[]> => {\n    return [\n        // Base GQL types and scalars\n        createBaseContentSchema(context),\n        createModelsSchema(context),\n        createContentEntriesSchema(context),\n        createGroupsSchema(context),\n        // Dynamic schema\n        ...(await generateSchemaPlugins(context))\n    ].filter(Boolean);\n};\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AAEA;AACA;AACA;AAEO,MAAMA,kBAAkB,GAAG,MAC9BC,OAD8B,IAEe;EAC7C,OAAO,CACH;EACA,IAAAC,0CAAA,EAAwBD,OAAxB,CAFG,EAGH,IAAAE,iCAAA,EAAmBF,OAAnB,CAHG,EAIH,IAAAG,0CAAA,EAA2BH,OAA3B,CAJG,EAKH,IAAAI,sCAAA,EAAmBJ,OAAnB,CALG,EAMH;EACA,IAAI,MAAM,IAAAK,oCAAA,EAAsBL,OAAtB,CAAV,CAPG,EAQLM,MARK,CAQEC,OARF,CAAP;AASH,CAZM"}
+{"version":3,"names":["buildSchemaPlugins","context","createBaseContentSchema","createModelsSchema","createContentEntriesSchema","createGroupsSchema","generateSchemaPlugins","filter","Boolean"],"sources":["buildSchemaPlugins.ts"],"sourcesContent":["import { CmsContext } from \"~/types\";\nimport { createModelsSchema } from \"./schema/contentModels\";\nimport { createContentEntriesSchema } from \"./schema/contentEntries\";\nimport { createGroupsSchema } from \"./schema/contentModelGroups\";\nimport { createBaseContentSchema } from \"./schema/baseContentSchema\";\nimport { generateSchemaPlugins } from \"./schema/schemaPlugins\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\n/**\n * This factory is called whenever we need to generate graphql-schema plugins using the current context.\n */\n\nexport const buildSchemaPlugins = async (\n    context: CmsContext\n): Promise<CmsGraphQLSchemaPlugin[]> => {\n    return [\n        // Base GQL types and scalars\n        createBaseContentSchema(context),\n        createModelsSchema(context),\n        createContentEntriesSchema(context),\n        createGroupsSchema(context),\n        // Dynamic schema\n        ...(await generateSchemaPlugins(context))\n    ].filter(Boolean);\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAGA;AACA;AACA;AAEO,MAAMA,kBAAkB,GAAG,MAC9BC,OAD8B,IAEM;EACpC,OAAO,CACH;EACA,IAAAC,0CAAA,EAAwBD,OAAxB,CAFG,EAGH,IAAAE,iCAAA,EAAmBF,OAAnB,CAHG,EAIH,IAAAG,0CAAA,EAA2BH,OAA3B,CAJG,EAKH,IAAAI,sCAAA,EAAmBJ,OAAnB,CALG,EAMH;EACA,IAAI,MAAM,IAAAK,oCAAA,EAAsBL,OAAtB,CAAV,CAPG,EAQLM,MARK,CAQEC,OARF,CAAP;AASH,CAZM"}

package/graphql/graphQLHandlerFactory.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.graphQLHandlerFactory = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _schema = require("@graphql-tools/schema");
 
 var _apiSecurity = require("@webiny/api-security");
@@ -17,10 +19,15 @@ var _processRequestBody = _interopRequireDefault(require("@webiny/handler-graphq
 
 var _buildSchemaPlugins = require("./buildSchemaPlugins");
 
-var _plugins = require("@webiny/handler-graphql/plugins");
-
 var _handler = require("@webiny/handler");
 
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _codeFrame = _interopRequireDefault(require("code-frame"));
+
+var _plugins = require("../plugins");
+
+// @ts-ignore `code-frame` has no types
 const schemaList = new Map();
 
 const generateCacheKey = async args => {
@@ -46,7 +53,7 @@ const generateSchema = async args => {
   const typeDefs = [];
   const resolvers = []; // Get schema definitions from plugins
 
-  const schemaPlugins = context.plugins.byType(_plugins.GraphQLSchemaPlugin.type);
+  const schemaPlugins = context.plugins.byType(_plugins.CmsGraphQLSchemaPlugin.type);
 
   for (const pl of schemaPlugins) {
     typeDefs.push(pl.schema.typeDefs);
@@ -73,32 +80,35 @@ const getSchema = async params => {
   const tenantId = context.tenancy.getCurrentTenant().id;
   const id = `${tenantId}#${type}#${locale.code}`;
   const cacheKey = await generateCacheKey(params);
+  const cachedSchema = schemaList.get(id);
+
+  if ((cachedSchema === null || cachedSchema === void 0 ? void 0 : cachedSchema.key) === cacheKey) {
+    return cachedSchema.schema;
+  }
 
-  if (!schemaList.has(id)) {
+  try {
     const schema = await generateSchema(params);
     schemaList.set(id, {
       key: cacheKey,
       schema
     });
     return schema;
-  }
-  /**
-   * Safe to cast because check was done few lines up.
-   */
-
-
-  const cache = schemaList.get(id);
+  } catch (err) {
+    if (!Array.isArray(err.locations)) {
+      throw new _error.default((0, _objectSpread2.default)({}, err));
+    }
 
-  if (cache.key === cacheKey) {
-    return cache.schema;
+    const [location] = err.locations;
+    throw new _error.default({
+      code: "INVALID_GRAPHQL_SCHEMA",
+      message: err.message,
+      data: {
+        invalidSegment: (0, _codeFrame.default)(err.source.body, location.line, location.column, {
+          frameSize: 15
+        })
+      }
+    });
   }
-
-  const schema = await generateSchema(params);
-  schemaList.set(id, {
-    key: cacheKey,
-    schema
-  });
-  return schema;
 };
 
 const checkEndpointAccess = async context => {
@@ -113,6 +123,22 @@ const checkEndpointAccess = async context => {
   }
 };
 
+const formatErrorPayload = error => {
+  if (error instanceof _error.default) {
+    return {
+      message: error.message,
+      code: error.code,
+      data: error.data
+    };
+  }
+
+  return {
+    name: error.name,
+    message: error.message,
+    stack: error.stack
+  };
+};
+
 const cmsRoutes = new _handler.RoutePlugin(({
   onPost,
   onOptions,
@@ -133,14 +159,18 @@ const cmsRoutes = new _handler.RoutePlugin(({
       });
     }
 
-    const schema = await getSchema({
-      context,
-      locale: context.cms.getLocale(),
-      type: context.cms.type
-    });
-    const body = request.body;
-    const result = await (0, _processRequestBody.default)(body, schema, context);
-    return reply.code(200).send(result);
+    try {
+      const schema = await getSchema({
+        context,
+        locale: context.cms.getLocale(),
+        type: context.cms.type
+      });
+      const body = request.body;
+      const result = await (0, _processRequestBody.default)(body, schema, context);
+      return reply.code(200).send(result);
+    } catch (ex) {
+      return reply.code(500).send(formatErrorPayload(ex));
+    }
   });
   onOptions("/cms/:type(^manage|preview|read$)/:locale", async (_, reply) => {
     return reply.hijack().send({});

package/graphql/graphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","generateSchema","plugins","register","buildSchemaPlugins","typeDefs","resolvers","schemaPlugins","byType","GraphQLSchemaPlugin","pl","push","schema","makeExecutableSchema","getSchema","params","tenantId","tenancy","getCurrentTenant","id","cacheKey","has","set","key","cache","get","checkEndpointAccess","permission","security","getPermission","NotAuthorizedError","data","reason","cmsRoutes","RoutePlugin","onPost","onOptions","request","reply","ex","send","error","message","stack","getLocale","body","result","processRequestBody","_","hijack","graphQLHandlerFactory","debug","debugPlugins"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import { GraphQLSchema } from \"graphql\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { ApiEndpoint, CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport { buildSchemaPlugins } from \"./buildSchemaPlugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    locale: I18NLocale;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: GetSchemaParams): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\nconst generateSchema = async (args: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = args;\n\n    context.plugins.register(await buildSchemaPlugins(context));\n    /**\n     * Really hard to type this to satisfy the makeExecutableSchema\n     */\n    // TODO @ts-refactor\n    const typeDefs: any = [];\n    const resolvers: any = [];\n\n    // Get schema definitions from plugins\n    const schemaPlugins = context.plugins.byType<GraphQLSchemaPlugin>(GraphQLSchemaPlugin.type);\n    for (const pl of schemaPlugins) {\n        typeDefs.push(pl.schema.typeDefs);\n        resolvers.push(pl.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers\n    });\n};\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 and locale parameters\n */\nconst getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context, type, locale } = params;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(params);\n    if (!schemaList.has(id)) {\n        const schema = await generateSchema(params);\n\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    }\n    /**\n     * Safe to cast because check was done few lines up.\n     */\n    const cache = schemaList.get(id) as SchemaCache;\n    if (cache.key === cacheKey) {\n        return cache.schema;\n    }\n    const schema = await generateSchema(params);\n    schemaList.set(id, {\n        key: cacheKey,\n        schema\n    });\n    return schema;\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        try {\n            await checkEndpointAccess(context);\n        } catch (ex) {\n            return reply.code(401).send({\n                data: null,\n                error: {\n                    message: ex.message || \"Not authorized!\",\n                    code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                    data: ex.data || null,\n                    stack: null\n                }\n            });\n        }\n\n        const schema = await getSchema({\n            context,\n            locale: context.cms.getLocale(),\n            type: context.cms.type as ApiEndpoint\n        });\n        const body: GraphQLRequestBody | GraphQLRequestBody[] = request.body as any;\n        const result = await processRequestBody(body, schema, context);\n        return reply.code(200).send(result);\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.hijack().send({});\n    });\n});\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":"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"}
+{"version":3,"names":["schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","generateSchema","plugins","register","buildSchemaPlugins","typeDefs","resolvers","schemaPlugins","byType","CmsGraphQLSchemaPlugin","pl","push","schema","makeExecutableSchema","getSchema","params","tenantId","tenancy","getCurrentTenant","id","cacheKey","cachedSchema","get","key","set","err","Array","isArray","locations","WebinyError","location","message","data","invalidSegment","codeFrame","source","body","line","column","frameSize","checkEndpointAccess","permission","security","getPermission","NotAuthorizedError","reason","formatErrorPayload","error","name","stack","cmsRoutes","RoutePlugin","onPost","onOptions","request","reply","ex","send","getLocale","result","processRequestBody","_","hijack","graphQLHandlerFactory","debug","debugPlugins"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import { GraphQLSchema } from \"graphql\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { ApiEndpoint, CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport { buildSchemaPlugins } from \"./buildSchemaPlugins\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport WebinyError from \"@webiny/error\";\n// @ts-ignore `code-frame` has no types\nimport codeFrame from \"code-frame\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    locale: I18NLocale;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: GetSchemaParams): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\nconst generateSchema = async (args: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = args;\n\n    context.plugins.register(await buildSchemaPlugins(context));\n    /**\n     * Really hard to type this to satisfy the makeExecutableSchema\n     */\n    // TODO @ts-refactor\n    const typeDefs: any = [];\n    const resolvers: any = [];\n\n    // Get schema definitions from plugins\n    const schemaPlugins = context.plugins.byType<CmsGraphQLSchemaPlugin>(\n        CmsGraphQLSchemaPlugin.type\n    );\n    for (const pl of schemaPlugins) {\n        typeDefs.push(pl.schema.typeDefs);\n        resolvers.push(pl.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers\n    });\n};\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 and locale parameters\n */\nconst getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context, type, locale } = params;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(params);\n    const cachedSchema = schemaList.get(id);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n    try {\n        const schema = await generateSchema(params);\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                ...err\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: codeFrame(err.source.body, location.line, location.column, {\n                    frameSize: 15\n                })\n            }\n        });\n    }\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nconst formatErrorPayload = (error: Error) => {\n    if (error instanceof WebinyError) {\n        return {\n            message: error.message,\n            code: error.code,\n            data: error.data\n        };\n    }\n\n    return {\n        name: error.name,\n        message: error.message,\n        stack: error.stack\n    };\n};\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        try {\n            await checkEndpointAccess(context);\n        } catch (ex) {\n            return reply.code(401).send({\n                data: null,\n                error: {\n                    message: ex.message || \"Not authorized!\",\n                    code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                    data: ex.data || null,\n                    stack: null\n                }\n            });\n        }\n\n        try {\n            const schema = await getSchema({\n                context,\n                locale: context.cms.getLocale(),\n                type: context.cms.type as ApiEndpoint\n            });\n            const body = request.body as GraphQLRequestBody | GraphQLRequestBody[];\n            const result = await processRequestBody(body, schema, context);\n            return reply.code(200).send(result);\n        } catch (ex) {\n            return reply.code(500).send(formatErrorPayload(ex));\n        }\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.hijack().send({});\n    });\n});\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":"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"}

package/graphql/index.d.ts

@@ -1,5 +1,5 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/types";
 import { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
 import { CmsContext } from "../types";
 export declare type CreateGraphQLParams = GraphQLHandlerFactoryParams;
-export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/api").ContextPlugin<CmsContext> | GraphQLSchemaPlugin<CmsContext> | import("@webiny/plugins/types").PluginCollection)[];
+export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/api").ContextPlugin<CmsContext> | import("@webiny/plugins/types").PluginCollection | GraphQLSchemaPlugin<CmsContext>[])[];

package/graphql/index.js

@@ -9,45 +9,56 @@ var _system = require("./system");
 
 var _graphQLHandlerFactory = require("./graphQLHandlerFactory");
 
+var _plugins = require("../plugins");
+
+var _handlerGraphql = require("@webiny/handler-graphql");
+
 const createBaseSchema = () => {
-  return {
-    name: "cms.graphql.schema.base",
-    type: "graphql-schema",
-    schema: {
-      typeDefs:
-      /* GraphQL */
-      `
-                type CmsError {
-                    code: String
-                    message: String
-                    data: JSON
-                    stack: String
-                }
-
-                type CmsCursors {
-                    next: String
-                    previous: String
-                }
-
-                type CmsListMeta {
-                    cursor: String
-                    hasMoreItems: Boolean
-                    totalCount: Int
-                }
-
-                type CmsDeleteResponse {
-                    data: Boolean
-                    error: CmsError
-                }
-
-                type CmsBooleanResponse {
-                    data: Boolean
-                    error: CmsError
-                }
-            `,
-      resolvers: {}
-    }
-  };
+  const cmsPlugin = new _plugins.CmsGraphQLSchemaPlugin({
+    typeDefs:
+    /* GraphQL */
+    `
+            type CmsError {
+                code: String
+                message: String
+                data: JSON
+                stack: String
+            }
+
+            type CmsCursors {
+                next: String
+                previous: String
+            }
+
+            type CmsListMeta {
+                cursor: String
+                hasMoreItems: Boolean
+                totalCount: Int
+            }
+
+            type CmsDeleteResponse {
+                data: Boolean
+                error: CmsError
+            }
+
+            type CmsBooleanResponse {
+                data: Boolean
+                error: CmsError
+            }
+        `,
+    resolvers: {}
+  });
+  cmsPlugin.name = "graphql.cms.schema.base";
+  const corePlugin = new _handlerGraphql.GraphQLSchemaPlugin({
+    typeDefs: cmsPlugin.schema.typeDefs,
+    resolvers: cmsPlugin.schema.resolvers
+  });
+  corePlugin.name = "graphql.cms.core.schema.base";
+  /**
+   * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.
+   */
+
+  return [cmsPlugin, corePlugin];
 };
 
 const createGraphQL = params => {

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBaseSchema","name","type","schema","typeDefs","resolvers","createGraphQL","params","createSystemSchemaPlugin","graphQLHandlerFactory"],"sources":["index.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/types\";\nimport { createSystemSchemaPlugin } from \"./system\";\nimport { graphQLHandlerFactory, GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory\";\nimport { CmsContext } from \"~/types\";\n\nconst createBaseSchema = (): GraphQLSchemaPlugin<CmsContext> => {\n    return {\n        name: \"cms.graphql.schema.base\",\n        type: \"graphql-schema\",\n        schema: {\n            typeDefs: /* GraphQL */ `\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                type CmsDeleteResponse {\n                    data: Boolean\n                    error: CmsError\n                }\n\n                type CmsBooleanResponse {\n                    data: Boolean\n                    error: CmsError\n                }\n            `,\n            resolvers: {}\n        }\n    };\n};\n\nexport type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams) => {\n    return [createBaseSchema(), createSystemSchemaPlugin(), graphQLHandlerFactory(params)];\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AAGA,MAAMA,gBAAgB,GAAG,MAAuC;EAC5D,OAAO;IACHC,IAAI,EAAE,yBADH;IAEHC,IAAI,EAAE,gBAFH;IAGHC,MAAM,EAAE;MACJC,QAAQ;MAAE;MAAe;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aA7BgB;MA8BJC,SAAS,EAAE;IA9BP;EAHL,CAAP;AAoCH,CArCD;;AAwCO,MAAMC,aAAa,GAAIC,MAAD,IAAiC;EAC1D,OAAO,CAACP,gBAAgB,EAAjB,EAAqB,IAAAQ,gCAAA,GAArB,EAAiD,IAAAC,4CAAA,EAAsBF,MAAtB,CAAjD,CAAP;AACH,CAFM"}
+{"version":3,"names":["createBaseSchema","cmsPlugin","CmsGraphQLSchemaPlugin","typeDefs","resolvers","name","corePlugin","GraphQLSchemaPlugin","schema","createGraphQL","params","createSystemSchemaPlugin","graphQLHandlerFactory"],"sources":["index.ts"],"sourcesContent":["import { createSystemSchemaPlugin } from \"./system\";\nimport { graphQLHandlerFactory, GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { CmsContext } from \"~/types\";\n\nconst createBaseSchema = (): GraphQLSchemaPlugin<CmsContext>[] => {\n    const cmsPlugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\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            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"graphql.cms.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"graphql.cms.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 type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams) => {\n    return [createBaseSchema(), createSystemSchemaPlugin(), graphQLHandlerFactory(params)];\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AAGA,MAAMA,gBAAgB,GAAG,MAAyC;EAC9D,MAAMC,SAAS,GAAG,IAAIC,+BAAJ,CAA2B;IACzCC,QAAQ;IAAE;IAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SA7BiD;IA8BzCC,SAAS,EAAE;EA9B8B,CAA3B,CAAlB;EAgCAH,SAAS,CAACI,IAAV,GAAiB,yBAAjB;EACA,MAAMC,UAAU,GAAG,IAAIC,mCAAJ,CAAwB;IACvCJ,QAAQ,EAAEF,SAAS,CAACO,MAAV,CAAiBL,QADY;IAEvCC,SAAS,EAAEH,SAAS,CAACO,MAAV,CAAiBJ;EAFW,CAAxB,CAAnB;EAIAE,UAAU,CAACD,IAAX,GAAkB,8BAAlB;EACA;AACJ;AACA;;EACI,OAAO,CAACJ,SAAD,EAAYK,UAAZ,CAAP;AACH,CA3CD;;AA8CO,MAAMG,aAAa,GAAIC,MAAD,IAAiC;EAC1D,OAAO,CAACV,gBAAgB,EAAjB,EAAqB,IAAAW,gCAAA,GAArB,EAAiD,IAAAC,4CAAA,EAAsBF,MAAtB,CAAjD,CAAP;AACH,CAFM"}

package/graphql/schema/baseContentSchema.d.ts

@@ -1,3 +1,3 @@
 import { CmsContext } from "../../types";
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
-export declare const createBaseContentSchema: (context: CmsContext) => GraphQLSchemaPlugin;
+import { CmsGraphQLSchemaPlugin } from "../../plugins";
+export declare const createBaseContentSchema: (context: CmsContext) => CmsGraphQLSchemaPlugin;