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

package/graphqlFields/object.js

@@ -7,80 +7,82 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createObjectField = void 0;
 
-var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
-
-var _renderFields = require("../utils/renderFields");
-
-var _renderInputFields = require("../utils/renderInputFields");
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _createTypeName = require("../utils/createTypeName");
+var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
 
 var _helpers = require("./helpers");
 
-const typeFromField = params => {
-  var _field$settings;
+var _createTypeFromFields = require("../utils/createTypeFromFields");
+
+const createChildTypeDefs = params => {
+  var _field$settings, _field$settings2;
 
   const {
-    typeOfType,
-    model,
-    type,
     field,
-    fieldTypePlugins
+    plugins,
+    model,
+    endpointType
   } = params;
-  const typeSuffix = typeOfType === "input" ? "Input" : "";
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const mTypeName = (0, _createTypeName.createManageTypeName)(typeName); // `field` is an "object" field
-
   const fields = ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.fields) || [];
-  const fieldTypeName = `${mTypeName}_${(0, _upperFirst.default)(field.fieldId)}`;
-  const typeFields = [];
-  const nestedTypes = []; // Once the loop below starts, we'll be executing a recursive "object" type generation.
-  // The main trick here is that nested objects don't know who the parent is, and will generate
-  // type names using the "model", as if they're at the top level:
-  // Every time the types are returned, we need to replace the model name in the generated type name
-  // with the actual prefix which includes parent field name type.
-
-  const replace = new RegExp(`${mTypeName}_`, "g");
-
-  for (const f of fields) {
-    const result = typeOfType === "type" ? (0, _renderFields.renderField)({
-      field: f,
-      type,
-      model,
-      fieldTypePlugins
-    }) : (0, _renderInputFields.renderInputField)({
-      field: f,
+  const typeName = createTypeName({
+    model,
+    field,
+    parents: (_field$settings2 = field.settings) === null || _field$settings2 === void 0 ? void 0 : _field$settings2.parents
+  });
+  const filters = fields.map(child => {
+    var _child$settings;
+
+    const createListFilters = plugins[child.type][endpointType].createListFilters;
+
+    if (!createListFilters) {
+      return null;
+    }
+
+    const filters = createListFilters({
       model,
-      fieldTypePlugins
+      field: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        settings: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child.settings), {}, {
+          parents: (((_child$settings = child.settings) === null || _child$settings === void 0 ? void 0 : _child$settings.parents) || []).concat([field.fieldId])
+        })
+      }),
+      plugins
     });
 
-    if (!result) {
-      continue;
+    if (!filters) {
+      return null;
     }
 
-    const {
-      fields,
-      typeDefs
-    } = result;
-    typeFields.push(fields.replace(replace, `${fieldTypeName}_`));
+    return filters;
+  }).filter(Boolean).join("\n");
+  return `input ${typeName}WhereInput {
+        ${filters}
+    }`;
+};
 
-    if (typeDefs) {
-      nestedTypes.push(typeDefs.replace(replace, `${fieldTypeName}_`));
-    }
-  }
+const createTypeName = params => {
+  const {
+    model,
+    parents = [],
+    field
+  } = params;
+  return [model.modelId].concat(parents).concat([field.fieldId]).filter(Boolean).map(id => {
+    return (0, _upperFirst.default)(id);
+  }).join("_");
+};
 
-  return {
-    fieldType: `${fieldTypeName}${typeSuffix}`,
-    typeDefs:
-    /* GraphQL */
-    `
-            ${nestedTypes.join("\n")}
-            
-            ${typeOfType} ${fieldTypeName}${typeSuffix} {
-                ${typeFields.join("\n")}
-            }
-        `
-  };
+const createListFilters = ({
+  field,
+  model
+}) => {
+  var _field$settings3;
+
+  const typeName = createTypeName({
+    model,
+    field,
+    parents: (_field$settings3 = field.settings) === null || _field$settings3 === void 0 ? void 0 : _field$settings3.parents
+  });
+  return `${field.fieldId}: ${typeName}WhereInput`;
 };
 
 const createObjectField = () => {
@@ -90,17 +92,37 @@ const createObjectField = () => {
     fieldType: "object",
     isSortable: false,
     isSearchable: false,
+    validateChildFields: params => {
+      var _field$settings4, _originalField$settin;
+
+      const {
+        field,
+        originalField,
+        validate
+      } = params;
+      validate({
+        fields: ((_field$settings4 = field.settings) === null || _field$settings4 === void 0 ? void 0 : _field$settings4.fields) || [],
+        originalFields: (originalField === null || originalField === void 0 ? void 0 : (_originalField$settin = originalField.settings) === null || _originalField$settin === void 0 ? void 0 : _originalField$settin.fields) || []
+      });
+    },
     read: {
       createTypeField({
         field,
         model,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        var _field$settings5, _field$settings6;
+
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
           typeOfType: "type",
           model,
           type: "read",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: (_field$settings5 = field.settings) === null || _field$settings5 === void 0 ? void 0 : _field$settings5.parents
+          }),
+          fields: ((_field$settings6 = field.settings) === null || _field$settings6 === void 0 ? void 0 : _field$settings6.fields) || [],
           fieldTypePlugins
         });
 
@@ -112,9 +134,15 @@ const createObjectField = () => {
           fieldType,
           typeDefs
         } = result;
+        const childTypeDefs = createChildTypeDefs({
+          model,
+          field,
+          plugins: fieldTypePlugins,
+          endpointType: "read"
+        });
         return {
           fields: `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,
-          typeDefs
+          typeDefs: `${typeDefs}${childTypeDefs}`
         };
       },
 
@@ -123,9 +151,9 @@ const createObjectField = () => {
         createFieldResolvers,
         graphQLType
       }) {
-        var _field$settings2;
+        var _field$settings7;
 
-        if (!((_field$settings2 = field.settings) !== null && _field$settings2 !== void 0 && _field$settings2.fields) || field.settings.fields.length === 0) {
+        if (!((_field$settings7 = field.settings) !== null && _field$settings7 !== void 0 && _field$settings7.fields) || field.settings.fields.length === 0) {
           return false;
         }
 
@@ -138,8 +166,9 @@ const createObjectField = () => {
           resolver: null,
           typeResolvers: typeResolvers || {}
         };
-      }
+      },
 
+      createListFilters
     },
     manage: {
       createTypeField({
@@ -147,11 +176,18 @@ const createObjectField = () => {
         field,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        var _field$settings8, _field$settings9;
+
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
           typeOfType: "type",
           model,
           type: "manage",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: (_field$settings8 = field.settings) === null || _field$settings8 === void 0 ? void 0 : _field$settings8.parents
+          }),
+          fields: ((_field$settings9 = field.settings) === null || _field$settings9 === void 0 ? void 0 : _field$settings9.fields) || [],
           fieldTypePlugins
         });
 
@@ -163,9 +199,15 @@ const createObjectField = () => {
           fieldType,
           typeDefs
         } = result;
+        const childTypeDefs = createChildTypeDefs({
+          model,
+          field,
+          plugins: fieldTypePlugins,
+          endpointType: "manage"
+        });
         return {
           fields: `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,
-          typeDefs
+          typeDefs: `${typeDefs}${childTypeDefs}`
         };
       },
 
@@ -174,11 +216,18 @@ const createObjectField = () => {
         field,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        var _field$settings10, _field$settings11;
+
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
           typeOfType: "input",
           model,
           type: "manage",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: (_field$settings10 = field.settings) === null || _field$settings10 === void 0 ? void 0 : _field$settings10.parents
+          }),
+          fields: ((_field$settings11 = field.settings) === null || _field$settings11 === void 0 ? void 0 : _field$settings11.fields) || [],
           fieldTypePlugins
         });
 
@@ -201,9 +250,9 @@ const createObjectField = () => {
         field,
         createFieldResolvers
       }) {
-        var _field$settings3;
+        var _field$settings12;
 
-        if (!((_field$settings3 = field.settings) !== null && _field$settings3 !== void 0 && _field$settings3.fields) || field.settings.fields.length === 0) {
+        if (!((_field$settings12 = field.settings) !== null && _field$settings12 !== void 0 && _field$settings12.fields) || field.settings.fields.length === 0) {
           return false;
         }
 
@@ -216,8 +265,9 @@ const createObjectField = () => {
           resolver: null,
           typeResolvers: typeResolvers || {}
         };
-      }
+      },
 
+      createListFilters
     }
   };
 };

package/graphqlFields/object.js.map

@@ -1 +1 @@
-{"version":3,"names":["typeFromField","params","typeOfType","model","type","field","fieldTypePlugins","typeSuffix","typeName","createTypeName","modelId","mTypeName","createManageTypeName","fields","settings","fieldTypeName","upperFirst","fieldId","typeFields","nestedTypes","replace","RegExp","f","result","renderField","renderInputField","typeDefs","push","fieldType","join","createObjectField","name","isSortable","isSearchable","read","createTypeField","multipleValues","createResolver","createFieldResolvers","graphQLType","length","typeResolvers","resolver","manage","createInputField","attachRequiredFieldValue"],"sources":["object.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { renderField } from \"~/utils/renderFields\";\nimport { renderInputField } from \"~/utils/renderInputFields\";\nimport { createManageTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { attachRequiredFieldValue } from \"./helpers\";\n\ninterface TypeFromFieldParams {\n    typeOfType: string;\n    model: CmsModel;\n    type: ApiEndpoint;\n    field: CmsModelField;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface TypeFromFieldResponse {\n    fieldType: string;\n    typeDefs: string;\n}\nconst typeFromField = (params: TypeFromFieldParams): TypeFromFieldResponse | null => {\n    const { typeOfType, model, type, field, fieldTypePlugins } = params;\n    const typeSuffix = typeOfType === \"input\" ? \"Input\" : \"\";\n    const typeName = createTypeName(model.modelId);\n    const mTypeName = createManageTypeName(typeName);\n\n    // `field` is an \"object\" field\n    const fields: CmsModelField[] = field.settings?.fields || [];\n\n    const fieldTypeName = `${mTypeName}_${upperFirst(field.fieldId)}`;\n\n    const typeFields = [];\n    const nestedTypes = [];\n\n    // Once the loop below starts, we'll be executing a recursive \"object\" type generation.\n    // The main trick here is that nested objects don't know who the parent is, and will generate\n    // type names using the \"model\", as if they're at the top level:\n    // Every time the types are returned, we need to replace the model name in the generated type name\n    // with the actual prefix which includes parent field name type.\n    const replace = new RegExp(`${mTypeName}_`, \"g\");\n\n    for (const f of fields) {\n        const result =\n            typeOfType === \"type\"\n                ? renderField({ field: f, type, model, fieldTypePlugins })\n                : renderInputField({ field: f, model, fieldTypePlugins });\n\n        if (!result) {\n            continue;\n        }\n\n        const { fields, typeDefs } = result;\n\n        typeFields.push(fields.replace(replace, `${fieldTypeName}_`));\n        if (typeDefs) {\n            nestedTypes.push(typeDefs.replace(replace, `${fieldTypeName}_`));\n        }\n    }\n\n    return {\n        fieldType: `${fieldTypeName}${typeSuffix}`,\n        typeDefs: /* GraphQL */ `\n            ${nestedTypes.join(\"\\n\")}\n            \n            ${typeOfType} ${fieldTypeName}${typeSuffix} {\n                ${typeFields.join(\"\\n\")}\n            }\n        `\n    };\n};\n\nexport const createObjectField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-object\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"object\",\n        isSortable: false,\n        isSearchable: false,\n        read: {\n            createTypeField({ field, model, fieldTypePlugins }) {\n                const result = typeFromField({\n                    typeOfType: \"type\",\n                    model,\n                    type: \"read\",\n                    field,\n                    fieldTypePlugins\n                });\n\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                return {\n                    fields: `${field.fieldId}: ${\n                        field.multipleValues ? `[${fieldType}!]` : fieldType\n                    }`,\n                    typeDefs\n                };\n            },\n            createResolver({ field, createFieldResolvers, graphQLType }) {\n                if (!field.settings?.fields || field.settings.fields.length === 0) {\n                    return false;\n                }\n\n                const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n\n                const typeResolvers = createFieldResolvers({\n                    graphQLType: fieldType,\n                    fields: field.settings.fields\n                });\n                return {\n                    resolver: null,\n                    typeResolvers: typeResolvers || {}\n                };\n            }\n        },\n        manage: {\n            createTypeField({ model, field, fieldTypePlugins }) {\n                const result = typeFromField({\n                    typeOfType: \"type\",\n                    model,\n                    type: \"manage\",\n                    field,\n                    fieldTypePlugins\n                });\n\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                return {\n                    fields: `${field.fieldId}: ${\n                        field.multipleValues ? `[${fieldType}!]` : fieldType\n                    }`,\n                    typeDefs\n                };\n            },\n            createInputField({ model, field, fieldTypePlugins }) {\n                const result = typeFromField({\n                    typeOfType: \"input\",\n                    model,\n                    type: \"manage\",\n                    field,\n                    fieldTypePlugins\n                });\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                return {\n                    fields: attachRequiredFieldValue(\n                        `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,\n                        field\n                    ),\n                    typeDefs\n                };\n            },\n            createResolver({ graphQLType, field, createFieldResolvers }) {\n                if (!field.settings?.fields || field.settings.fields.length === 0) {\n                    return false;\n                }\n                const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n                const typeResolvers = createFieldResolvers({\n                    graphQLType: fieldType,\n                    fields: field.settings.fields\n                });\n                return {\n                    resolver: null,\n                    typeResolvers: typeResolvers || {}\n                };\n            }\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createChildTypeDefs","params","field","plugins","model","endpointType","fields","settings","typeName","createTypeName","parents","filters","map","child","createListFilters","type","concat","fieldId","filter","Boolean","join","modelId","id","lodashUpperFirst","createObjectField","name","fieldType","isSortable","isSearchable","validateChildFields","originalField","validate","originalFields","read","createTypeField","fieldTypePlugins","result","createTypeFromFields","typeOfType","typeNamePrefix","typeDefs","childTypeDefs","multipleValues","createResolver","createFieldResolvers","graphQLType","length","upperFirst","typeResolvers","resolver","manage","createInputField","attachRequiredFieldValue"],"sources":["object.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport {\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { attachRequiredFieldValue } from \"./helpers\";\nimport lodashUpperFirst from \"lodash/upperFirst\";\nimport { createTypeFromFields } from \"~/utils/createTypeFromFields\";\n\ninterface AttachTypeDefinitionsParams {\n    model: CmsModel;\n    field: CmsModelField;\n    plugins: CmsFieldTypePlugins;\n    endpointType: \"manage\" | \"read\";\n}\nconst createChildTypeDefs = (params: AttachTypeDefinitionsParams): string => {\n    const { field, plugins, model, endpointType } = params;\n    const fields = field.settings?.fields || [];\n\n    const typeName = createTypeName({\n        model,\n        field,\n        parents: field.settings?.parents\n    });\n\n    const filters = fields\n        .map(child => {\n            const createListFilters = plugins[child.type][endpointType].createListFilters;\n            if (!createListFilters) {\n                return null;\n            }\n\n            const filters = createListFilters({\n                model,\n                field: {\n                    ...child,\n                    settings: {\n                        ...child.settings,\n                        parents: (child.settings?.parents || []).concat([field.fieldId])\n                    }\n                },\n                plugins\n            });\n            if (!filters) {\n                return null;\n            }\n            return filters;\n        })\n        .filter(Boolean)\n        .join(\"\\n\");\n    return `input ${typeName}WhereInput {\n        ${filters}\n    }`;\n};\n\ninterface CreateTypeNameParams {\n    model: CmsModel;\n    parents?: string[];\n    field: CmsModelField;\n}\nconst createTypeName = (params: CreateTypeNameParams): string => {\n    const { model, parents = [], field } = params;\n    return [model.modelId]\n        .concat(parents)\n        .concat([field.fieldId])\n        .filter(Boolean)\n        .map(id => {\n            return lodashUpperFirst(id);\n        })\n        .join(\"_\");\n};\n\ninterface CreateListFiltersParams {\n    field: CmsModelField;\n    model: CmsModel;\n}\nconst createListFilters = ({ field, model }: CreateListFiltersParams) => {\n    const typeName = createTypeName({\n        model,\n        field,\n        parents: field.settings?.parents\n    });\n\n    return `${field.fieldId}: ${typeName}WhereInput`;\n};\n\nexport const createObjectField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-object\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"object\",\n        isSortable: false,\n        isSearchable: false,\n        validateChildFields: params => {\n            const { field, originalField, validate } = params;\n\n            validate({\n                fields: field.settings?.fields || [],\n                originalFields: originalField?.settings?.fields || []\n            });\n        },\n        read: {\n            createTypeField({ field, model, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    typeOfType: \"type\",\n                    model,\n                    type: \"read\",\n                    typeNamePrefix: createTypeName({\n                        model,\n                        field,\n                        parents: field.settings?.parents\n                    }),\n                    fields: field.settings?.fields || [],\n                    fieldTypePlugins\n                });\n\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                const childTypeDefs = createChildTypeDefs({\n                    model,\n                    field,\n                    plugins: fieldTypePlugins,\n                    endpointType: \"read\"\n                });\n\n                return {\n                    fields: `${field.fieldId}: ${\n                        field.multipleValues ? `[${fieldType}!]` : fieldType\n                    }`,\n                    typeDefs: `${typeDefs}${childTypeDefs}`\n                };\n            },\n            createResolver({ field, createFieldResolvers, graphQLType }) {\n                if (!field.settings?.fields || field.settings.fields.length === 0) {\n                    return false;\n                }\n\n                const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n\n                const typeResolvers = createFieldResolvers({\n                    graphQLType: fieldType,\n                    fields: field.settings.fields\n                });\n                return {\n                    resolver: null,\n                    typeResolvers: typeResolvers || {}\n                };\n            },\n            createListFilters\n        },\n        manage: {\n            createTypeField({ model, field, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    typeOfType: \"type\",\n                    model,\n                    type: \"manage\",\n                    typeNamePrefix: createTypeName({\n                        model,\n                        field,\n                        parents: field.settings?.parents\n                    }),\n                    fields: field.settings?.fields || [],\n                    fieldTypePlugins\n                });\n\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                const childTypeDefs = createChildTypeDefs({\n                    model,\n                    field,\n                    plugins: fieldTypePlugins,\n                    endpointType: \"manage\"\n                });\n\n                return {\n                    fields: `${field.fieldId}: ${\n                        field.multipleValues ? `[${fieldType}!]` : fieldType\n                    }`,\n                    typeDefs: `${typeDefs}${childTypeDefs}`\n                };\n            },\n            createInputField({ model, field, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    typeOfType: \"input\",\n                    model,\n                    type: \"manage\",\n                    typeNamePrefix: createTypeName({\n                        model,\n                        field,\n                        parents: field.settings?.parents\n                    }),\n                    fields: field.settings?.fields || [],\n                    fieldTypePlugins\n                });\n                if (!result) {\n                    return null;\n                }\n                const { fieldType, typeDefs } = result;\n\n                return {\n                    fields: attachRequiredFieldValue(\n                        `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,\n                        field\n                    ),\n                    typeDefs\n                };\n            },\n            createResolver({ graphQLType, field, createFieldResolvers }) {\n                if (!field.settings?.fields || field.settings.fields.length === 0) {\n                    return false;\n                }\n                const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n                const typeResolvers = createFieldResolvers({\n                    graphQLType: fieldType,\n                    fields: field.settings.fields\n                });\n                return {\n                    resolver: null,\n                    typeResolvers: typeResolvers || {}\n                };\n            },\n            createListFilters\n        }\n    };\n};\n"],"mappings":"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"}

package/graphqlFields/ref.js

@@ -16,7 +16,7 @@ var _utils = require("@webiny/utils");
 var _helpers = require("./helpers");
 
 const createUnionTypeName = (model, field) => {
-  return `${(0, _createTypeName.createReadTypeName)(model.modelId)}${(0, _createTypeName.createReadTypeName)(field.fieldId)}`;
+  return `${(0, _createTypeName.createReadTypeName)(model.modelId)}_${(0, _createTypeName.createReadTypeName)(field.fieldId)}`;
 };
 
 const createListFilters = ({
@@ -81,7 +81,13 @@ const createRefField = () => {
 
         const models = ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.models) || [];
         const gqlType = models.length > 1 ? createUnionTypeName(model, field) : (0, _createTypeName.createReadTypeName)(models[0].modelId);
-        return field.fieldId + `: ${field.multipleValues ? `[${gqlType}]` : gqlType}`;
+        const typeDefs = models.length > 1 ? `union ${gqlType} = ${getFieldModels(field).map(({
+          modelId
+        }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}` : "";
+        return {
+          fields: field.fieldId + `(populate: Boolean = true): ${field.multipleValues ? `[${gqlType}!]` : gqlType}`,
+          typeDefs
+        };
       },
 
       /**
@@ -102,7 +108,7 @@ const createRefField = () => {
           modelIdToTypeName.set(item.modelId, (0, _createTypeName.createReadTypeName)(item.modelId));
         }
 
-        return async (parent, _, context) => {
+        return async (parent, args, context) => {
           const {
             cms
           } = context; // Get field value for this entry
@@ -113,6 +119,10 @@ const createRefField = () => {
             return null;
           }
 
+          if (args.populate === false) {
+            return initialValue;
+          }
+
           if (field.multipleValues) {
             /**
              * We cast because value really can be array and single value.
@@ -178,37 +188,9 @@ const createRefField = () => {
         };
       },
 
-      createSchema({
-        models
-      }) {
-        const unionFields = [];
-
-        for (const model of models) {
-          // Generate a dedicated union type for every `ref` field which has more than 1 content model assigned.
-          model.fields.filter(field => {
-            var _field$settings3;
-
-            return field.type === "ref" && (((_field$settings3 = field.settings) === null || _field$settings3 === void 0 ? void 0 : _field$settings3.models) || []).length > 1;
-          }).forEach(field => unionFields.push({
-            model,
-            field,
-            typeName: createUnionTypeName(model, field)
-          }));
-        }
-
-        const unionFieldsTypeDef = unionFields.map(({
-          field,
-          typeName
-        }) => `union ${typeName} = ${getFieldModels(field).map(({
-          modelId
-        }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}`).join("\n");
-        const filteringTypeDef = `
-                ${createFilteringTypeDef()}
-                
-                ${unionFieldsTypeDef}
-            `;
+      createSchema() {
         return {
-          typeDefs: filteringTypeDef,
+          typeDefs: createFilteringTypeDef(),
           resolvers: {}
         };
       },
@@ -218,23 +200,27 @@ const createRefField = () => {
     manage: {
       createSchema() {
         /**
-         * entryId in RefFieldInput is deprecated but cannot mark it as GraphQL does not allow marking input fields as deprecated
+         * `entryId` in `RefFieldInput` is deprecated, but we cannot mark it as such in GraphQL.
+         * `entryId` is extracted at runtime from the `id` which contains both the `entryId` and revision number.
+         * See: `packages/api-headless-cms/src/crud/contentEntry/referenceFieldsMapping.ts`
          */
         return {
-          typeDefs: `
-                    type RefField {
-                        modelId: String!
-                        entryId: ID!
-                        id: ID!
-                    }
-                    
-                    input RefFieldInput {
-                        modelId: String!
-                        id: ID!
-                    }
-                    
-                    ${createFilteringTypeDef()}
-                `,
+          typeDefs:
+          /* GraphQL */
+          `
+                        type RefField {
+                            modelId: String!
+                            entryId: ID!
+                            id: ID!
+                        }
+
+                        input RefFieldInput {
+                            modelId: String!
+                            id: ID!
+                        }
+
+                        ${createFilteringTypeDef()}
+                    `,
           resolvers: {
             RefField: {
               entryId: parent => {

package/graphqlFields/ref.js.map

@@ -1 +1 @@
-{"version":3,"names":["createUnionTypeName","model","field","createReadTypeName","modelId","fieldId","createListFilters","createFilteringTypeDef","appendTypename","entries","typename","map","item","__typename","getFieldModels","settings","Array","isArray","models","modelIdToTypeName","Map","createRefField","name","type","fieldType","isSortable","isSearchable","read","createTypeField","gqlType","length","multipleValues","createResolver","params","set","parent","_","context","cms","initialValue","value","entriesByModel","reduce","collection","ref","includes","entryId","push","getters","Object","keys","idList","getModelManager","READ","getPublishedByIds","getLatestByIds","get","Promise","all","then","results","result","concat","revisions","createSchema","unionFields","fields","filter","forEach","typeName","unionFieldsTypeDef","join","filteringTypeDef","typeDefs","resolvers","manage","RefField","id","parseIdentifier","createInputField","createGraphQLInputField"],"sources":["ref.ts"],"sourcesContent":["import {\n    CmsEntry,\n    CmsContext,\n    CmsModelFieldToGraphQLPlugin,\n    CmsModel,\n    CmsModelField\n} from \"~/types\";\nimport { createReadTypeName } from \"~/utils/createTypeName\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createGraphQLInputField } from \"./helpers\";\n\ninterface RefFieldValue {\n    id?: string;\n    entryId: string;\n    modelId: string;\n}\n\ninterface UnionField {\n    model: CmsModel;\n    field: CmsModelField;\n    typeName: string;\n}\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n    return `${createReadTypeName(model.modelId)}${createReadTypeName(field.fieldId)}`;\n};\n\ninterface CreateListFilterParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFilterParams) => {\n    return `\n        ${field.fieldId}: RefFieldWhereInput\n    `;\n};\n\nconst createFilteringTypeDef = () => {\n    return `\n        input RefFieldWhereInput {\n            id: String\n            id_not: String\n            id_in: [String!]\n            id_not_in: [String]\n            entryId: String\n            entryId_not: String\n            entryId_in: [String!]\n            entryId_not_in: [String!]\n        }\n    `;\n};\n\nconst appendTypename = (entries: CmsEntry[], typename: string): CmsEntry[] => {\n    return entries.map(item => {\n        return {\n            ...item,\n            __typename: typename\n        };\n    });\n};\n/**\n * We cast settings.models as object to have modelId because internally we know that it is so.\n * Internal stuff so we are sure that settings.models contains what we require.\n */\nconst getFieldModels = (field: CmsModelField): Pick<CmsModel, \"modelId\">[] => {\n    if (!field.settings || Array.isArray(field.settings.models) === false) {\n        return [];\n    }\n    return field.settings.models as Pick<CmsModel, \"modelId\">[];\n};\n\nconst modelIdToTypeName = new Map();\n\nexport const createRefField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-ref\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"ref\",\n        isSortable: false,\n        isSearchable: true,\n        read: {\n            createTypeField({ model, field }) {\n                const models = field.settings?.models || [];\n                const gqlType =\n                    models.length > 1\n                        ? createUnionTypeName(model, field)\n                        : createReadTypeName(models[0].modelId);\n\n                return field.fieldId + `: ${field.multipleValues ? `[${gqlType}]` : gqlType}`;\n            },\n            /**\n             * TS is complaining about mixed types for createResolver.\n             * TODO @ts-refactor @pavel Maybe we should have a single createResolver method?\n             */\n            // @ts-ignore\n            createResolver(params) {\n                const { field } = params;\n                // Create a map of model types and corresponding modelIds so resolvers don't need to perform the lookup.\n                const models = field.settings?.models || [];\n                for (const item of models) {\n                    modelIdToTypeName.set(item.modelId, createReadTypeName(item.modelId));\n                }\n\n                return async (parent, _, context: CmsContext) => {\n                    const { cms } = context;\n\n                    // Get field value for this entry\n                    const initialValue = parent[field.fieldId] as RefFieldValue | RefFieldValue[];\n\n                    if (!initialValue) {\n                        return null;\n                    }\n\n                    if (field.multipleValues) {\n                        /**\n                         * We cast because value really can be array and single value.\n                         * At this point, we are 99% sure that it is an array (+ we check for it)\n                         */\n                        const value = initialValue as RefFieldValue[];\n                        if (Array.isArray(value) === false || value.length === 0) {\n                            return [];\n                        }\n\n                        const entriesByModel = value.reduce((collection, ref) => {\n                            if (!collection[ref.modelId]) {\n                                collection[ref.modelId] = [];\n                            } else if (collection[ref.modelId].includes(ref.entryId) === true) {\n                                return collection;\n                            }\n\n                            collection[ref.modelId].push(ref.entryId);\n\n                            return collection;\n                        }, {} as Record<string, string[]>);\n\n                        const getters = Object.keys(entriesByModel).map(async modelId => {\n                            const idList = entriesByModel[modelId];\n                            // Get model manager, to get access to CRUD methods\n                            const model = await cms.getModelManager(modelId);\n\n                            let entries: CmsEntry[];\n                            // `read` API works with `published` data\n                            if (cms.READ) {\n                                entries = await model.getPublishedByIds(idList);\n                            }\n                            // `preview` and `manage` with `latest` data\n                            else {\n                                entries = await model.getLatestByIds(idList);\n                            }\n\n                            return appendTypename(entries, modelIdToTypeName.get(modelId));\n                        });\n\n                        return await Promise.all(getters).then((results: any[]) =>\n                            results.reduce((result, item) => result.concat(item), [])\n                        );\n                    }\n\n                    const value = initialValue as RefFieldValue;\n\n                    // Get model manager, to get access to CRUD methods\n                    const model = await cms.getModelManager(value.modelId);\n\n                    let revisions: CmsEntry[];\n                    // `read` API works with `published` data\n                    if (cms.READ) {\n                        revisions = await model.getPublishedByIds([value.entryId]);\n                    }\n                    // `preview` API works with `latest` data\n                    else {\n                        revisions = await model.getLatestByIds([value.entryId]);\n                    }\n\n                    /**\n                     * If there are no revisions we must return null.\n                     */\n                    if (!revisions || revisions.length === 0) {\n                        return null;\n                    }\n                    return {\n                        ...revisions[0],\n                        __typename: modelIdToTypeName.get(value.modelId)\n                    };\n                };\n            },\n            createSchema({ models }) {\n                const unionFields: UnionField[] = [];\n                for (const model of models) {\n                    // Generate a dedicated union type for every `ref` field which has more than 1 content model assigned.\n                    model.fields\n                        .filter(\n                            field =>\n                                field.type === \"ref\" && (field.settings?.models || []).length > 1\n                        )\n                        .forEach(field =>\n                            unionFields.push({\n                                model,\n                                field,\n                                typeName: createUnionTypeName(model, field)\n                            })\n                        );\n                }\n                const unionFieldsTypeDef = unionFields\n                    .map(\n                        ({ field, typeName }) =>\n                            `union ${typeName} = ${getFieldModels(field)\n                                .map(({ modelId }) => createReadTypeName(modelId))\n                                .join(\" | \")}`\n                    )\n                    .join(\"\\n\");\n\n                const filteringTypeDef = `\n                ${createFilteringTypeDef()}\n                \n                ${unionFieldsTypeDef}\n            `;\n\n                return {\n                    typeDefs: filteringTypeDef,\n                    resolvers: {}\n                };\n            },\n            createListFilters\n        },\n        manage: {\n            createSchema() {\n                /**\n                 * entryId in RefFieldInput is deprecated but cannot mark it as GraphQL does not allow marking input fields as deprecated\n                 */\n                return {\n                    typeDefs: `\n                    type RefField {\n                        modelId: String!\n                        entryId: ID!\n                        id: ID!\n                    }\n                    \n                    input RefFieldInput {\n                        modelId: String!\n                        id: ID!\n                    }\n                    \n                    ${createFilteringTypeDef()}\n                `,\n                    resolvers: {\n                        RefField: {\n                            entryId: (parent: RefFieldValue) => {\n                                const { id } = parseIdentifier(parent.entryId || parent.id);\n                                return id;\n                            },\n                            id: (parent: RefFieldValue) => {\n                                return parent.id || parent.entryId;\n                            }\n                        }\n                    }\n                };\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [RefField!]`;\n                }\n                return `${field.fieldId}: RefField`;\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, \"RefFieldInput\");\n            },\n            createListFilters\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createUnionTypeName","model","field","createReadTypeName","modelId","fieldId","createListFilters","createFilteringTypeDef","appendTypename","entries","typename","map","item","__typename","getFieldModels","settings","Array","isArray","models","modelIdToTypeName","Map","createRefField","name","type","fieldType","isSortable","isSearchable","read","createTypeField","gqlType","length","typeDefs","join","fields","multipleValues","createResolver","params","set","parent","args","context","cms","initialValue","populate","value","entriesByModel","reduce","collection","ref","includes","entryId","push","getters","Object","keys","idList","getModelManager","READ","getPublishedByIds","getLatestByIds","get","Promise","all","then","results","result","concat","revisions","createSchema","resolvers","manage","RefField","id","parseIdentifier","createInputField","createGraphQLInputField"],"sources":["ref.ts"],"sourcesContent":["import {\n    CmsEntry,\n    CmsContext,\n    CmsModelFieldToGraphQLPlugin,\n    CmsModel,\n    CmsModelField\n} from \"~/types\";\nimport { createReadTypeName } from \"~/utils/createTypeName\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createGraphQLInputField } from \"./helpers\";\n\ninterface RefFieldValue {\n    /**\n     * `id` is optional for backwards compatibility with records created before this property was introduced.\n     */\n    id?: string;\n    entryId: string;\n    modelId: string;\n}\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n    return `${createReadTypeName(model.modelId)}_${createReadTypeName(field.fieldId)}`;\n};\n\ninterface CreateListFilterParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFilterParams) => {\n    return `\n        ${field.fieldId}: RefFieldWhereInput\n    `;\n};\n\nconst createFilteringTypeDef = () => {\n    return `\n        input RefFieldWhereInput {\n            id: String\n            id_not: String\n            id_in: [String!]\n            id_not_in: [String]\n            entryId: String\n            entryId_not: String\n            entryId_in: [String!]\n            entryId_not_in: [String!]\n        }\n    `;\n};\n\nconst appendTypename = (entries: CmsEntry[], typename: string): CmsEntry[] => {\n    return entries.map(item => {\n        return {\n            ...item,\n            __typename: typename\n        };\n    });\n};\n/**\n * We cast settings.models as object to have modelId because internally we know that it is so.\n * Internal stuff so we are sure that settings.models contains what we require.\n */\nconst getFieldModels = (field: CmsModelField): Pick<CmsModel, \"modelId\">[] => {\n    if (!field.settings || Array.isArray(field.settings.models) === false) {\n        return [];\n    }\n    return field.settings.models as Pick<CmsModel, \"modelId\">[];\n};\n\nconst modelIdToTypeName = new Map();\n\nexport const createRefField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-ref\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"ref\",\n        isSortable: false,\n        isSearchable: true,\n        read: {\n            createTypeField({ model, field }) {\n                const models = field.settings?.models || [];\n                const gqlType =\n                    models.length > 1\n                        ? createUnionTypeName(model, field)\n                        : createReadTypeName(models[0].modelId);\n\n                const typeDefs =\n                    models.length > 1\n                        ? `union ${gqlType} = ${getFieldModels(field)\n                              .map(({ modelId }) => createReadTypeName(modelId))\n                              .join(\" | \")}`\n                        : \"\";\n\n                return {\n                    fields:\n                        field.fieldId +\n                        `(populate: Boolean = true): ${\n                            field.multipleValues ? `[${gqlType}!]` : gqlType\n                        }`,\n                    typeDefs\n                };\n            },\n            /**\n             * TS is complaining about mixed types for createResolver.\n             * TODO @ts-refactor @pavel Maybe we should have a single createResolver method?\n             */\n            // @ts-ignore\n            createResolver(params) {\n                const { field } = params;\n                // Create a map of model types and corresponding modelIds so resolvers don't need to perform the lookup.\n                const models = field.settings?.models || [];\n                for (const item of models) {\n                    modelIdToTypeName.set(item.modelId, createReadTypeName(item.modelId));\n                }\n\n                return async (parent, args, context: CmsContext) => {\n                    const { cms } = context;\n\n                    // Get field value for this entry\n                    const initialValue = parent[field.fieldId] as RefFieldValue | RefFieldValue[];\n\n                    if (!initialValue) {\n                        return null;\n                    }\n                    if (args.populate === false) {\n                        return initialValue;\n                    }\n\n                    if (field.multipleValues) {\n                        /**\n                         * We cast because value really can be array and single value.\n                         * At this point, we are 99% sure that it is an array (+ we check for it)\n                         */\n                        const value = initialValue as RefFieldValue[];\n                        if (Array.isArray(value) === false || value.length === 0) {\n                            return [];\n                        }\n\n                        const entriesByModel = value.reduce((collection, ref) => {\n                            if (!collection[ref.modelId]) {\n                                collection[ref.modelId] = [];\n                            } else if (collection[ref.modelId].includes(ref.entryId) === true) {\n                                return collection;\n                            }\n\n                            collection[ref.modelId].push(ref.entryId);\n\n                            return collection;\n                        }, {} as Record<string, string[]>);\n\n                        const getters = Object.keys(entriesByModel).map(async modelId => {\n                            const idList = entriesByModel[modelId];\n                            // Get model manager, to get access to CRUD methods\n                            const model = await cms.getModelManager(modelId);\n\n                            let entries: CmsEntry[];\n                            // `read` API works with `published` data\n                            if (cms.READ) {\n                                entries = await model.getPublishedByIds(idList);\n                            }\n                            // `preview` and `manage` with `latest` data\n                            else {\n                                entries = await model.getLatestByIds(idList);\n                            }\n\n                            return appendTypename(entries, modelIdToTypeName.get(modelId));\n                        });\n\n                        return await Promise.all(getters).then((results: any[]) =>\n                            results.reduce((result, item) => result.concat(item), [])\n                        );\n                    }\n\n                    const value = initialValue as RefFieldValue;\n\n                    // Get model manager, to get access to CRUD methods\n                    const model = await cms.getModelManager(value.modelId);\n\n                    let revisions: CmsEntry[];\n                    // `read` API works with `published` data\n                    if (cms.READ) {\n                        revisions = await model.getPublishedByIds([value.entryId]);\n                    }\n                    // `preview` API works with `latest` data\n                    else {\n                        revisions = await model.getLatestByIds([value.entryId]);\n                    }\n\n                    /**\n                     * If there are no revisions we must return null.\n                     */\n                    if (!revisions || revisions.length === 0) {\n                        return null;\n                    }\n                    return {\n                        ...revisions[0],\n                        __typename: modelIdToTypeName.get(value.modelId)\n                    };\n                };\n            },\n            createSchema() {\n                return {\n                    typeDefs: createFilteringTypeDef(),\n                    resolvers: {}\n                };\n            },\n            createListFilters\n        },\n        manage: {\n            createSchema() {\n                /**\n                 * `entryId` in `RefFieldInput` is deprecated, but we cannot mark it as such in GraphQL.\n                 * `entryId` is extracted at runtime from the `id` which contains both the `entryId` and revision number.\n                 * See: `packages/api-headless-cms/src/crud/contentEntry/referenceFieldsMapping.ts`\n                 */\n                return {\n                    typeDefs: /* GraphQL */ `\n                        type RefField {\n                            modelId: String!\n                            entryId: ID!\n                            id: ID!\n                        }\n\n                        input RefFieldInput {\n                            modelId: String!\n                            id: ID!\n                        }\n\n                        ${createFilteringTypeDef()}\n                    `,\n                    resolvers: {\n                        RefField: {\n                            entryId: (parent: RefFieldValue) => {\n                                const { id } = parseIdentifier(parent.entryId || parent.id);\n                                return id;\n                            },\n                            id: (parent: RefFieldValue) => {\n                                return parent.id || parent.entryId;\n                            }\n                        }\n                    }\n                };\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [RefField!]`;\n                }\n                return `${field.fieldId}: RefField`;\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, \"RefFieldInput\");\n            },\n            createListFilters\n        }\n    };\n};\n"],"mappings":"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"}

package/index.d.ts

@@ -1,10 +1,10 @@
 import { CreateGraphQLParams } from "./graphql";
-import { CrudParams } from "./crud";
+import { CrudParams } from "./context";
 import { entryFieldFromStorageTransform, entryFromStorageTransform, entryToStorageTransform } from "./utils/entryStorage";
 export declare type CreateHeadlessCmsGraphQLParams = CreateGraphQLParams;
-export declare const createHeadlessCmsGraphQL: (params?: CreateHeadlessCmsGraphQLParams) => (import("./plugins").CmsParametersPlugin | (import("@webiny/api").ContextPlugin<import("./types").CmsContext> | import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("./types").CmsContext> | import("@webiny/plugins/types").PluginCollection)[])[];
+export declare const createHeadlessCmsGraphQL: (params?: CreateHeadlessCmsGraphQLParams) => (import("./plugins").CmsParametersPlugin | import("@webiny/api").ContextPlugin<import("./types").CmsContext> | import("@webiny/plugins/types").PluginCollection | import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("./types").CmsContext>[])[];
 export declare type ContentContextParams = CrudParams;
-export declare const createHeadlessCmsContext: (params: ContentContextParams) => (import("./types").CmsModelFieldToGraphQLPlugin[] | import("./types").ModelManagerPlugin | import("@webiny/api").ContextPlugin<import("./types").CmsContext> | import("./plugins").StorageTransformPlugin<any, any> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[] | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[] | (import("./fieldConverters/CmsModelObjectFieldConverterPlugin").CmsModelObjectFieldConverterPlugin | import("./fieldConverters/CmsModelDefaultFieldConverterPlugin").CmsModelDefaultFieldConverterPlugin)[])[];
+export declare const createHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./plugins").StorageTransformPlugin<any, any, import("./types").CmsModelField> | import("@webiny/api").ContextPlugin<import("./types").CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[] | import("./plugins").StorageTransformPlugin<any, any, import("./types").CmsModelDynamicZoneField> | import("./types").CmsModelFieldToGraphQLPlugin<any>[] | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[] | (import("./fieldConverters/CmsModelObjectFieldConverterPlugin").CmsModelObjectFieldConverterPlugin | import("./fieldConverters/CmsModelDefaultFieldConverterPlugin").CmsModelDefaultFieldConverterPlugin | import("./fieldConverters/CmsModelDynamicZoneFieldConverterPlugin").CmsModelDynamicZoneFieldConverterPlugin)[])[];
 export * from "./graphqlFields";
 export * from "./plugins";
 export { entryToStorageTransform, entryFieldFromStorageTransform, entryFromStorageTransform };

package/index.js

@@ -36,8 +36,6 @@ var _upgrades = require("./upgrades");
 
 var _modelManager = require("./modelManager");
 
-var _crud = require("./crud");
-
 var _graphqlFields = require("./graphqlFields");
 
 Object.keys(_graphqlFields).forEach(function (key) {
@@ -58,6 +56,8 @@ var _default = require("./storage/default");
 
 var _object = require("./storage/object");
 
+var _dynamicZoneStorage = require("./graphqlFields/dynamicZone/dynamicZoneStorage");
+
 var _parameters = require("./parameters");
 
 var _context = require("./context");
@@ -89,7 +89,7 @@ const createHeadlessCmsGraphQL = (params = {}) => {
   /**
    * At this point we can create, or not create, CMS GraphQL Schema.
    */
-  (0, _graphql.createGraphQL)(params)];
+  ...(0, _graphql.createGraphQL)(params)];
 };
 
 exports.createHeadlessCmsGraphQL = createHeadlessCmsGraphQL;
@@ -99,11 +99,7 @@ const createHeadlessCmsContext = params => {
   /**
    * Context for all Lambdas - everything is loaded now.
    */
-  (0, _context.createContextPlugin)(), (0, _modelManager.createDefaultModelManager)(),
-  /**
-   *
-   */
-  (0, _crud.createCrud)(params), (0, _graphqlFields.createGraphQLFields)(), (0, _fieldConverters.createFieldConverters)(), (0, _validators.createValidators)(), (0, _default.createDefaultStorageTransform)(), (0, _object.createObjectStorageTransform)(), (0, _upgrades.createUpgrades)()];
+  (0, _context.createContextPlugin)(params), (0, _modelManager.createDefaultModelManager)(), (0, _graphqlFields.createGraphQLFields)(), (0, _fieldConverters.createFieldConverters)(), (0, _validators.createValidators)(), (0, _default.createDefaultStorageTransform)(), (0, _object.createObjectStorageTransform)(), (0, _dynamicZoneStorage.createDynamicZoneStorageTransform)(), (0, _upgrades.createUpgrades)()];
 };
 
 exports.createHeadlessCmsContext = createHeadlessCmsContext;