@webiny/api-headless-cms 0.0.0-unstable.990c3ab1b6 → 0.0.0-unstable.9bd236cf5e

package/graphqlFields/object.js

@@ -6,68 +6,65 @@ 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 _createTypeName = require("../utils/createTypeName");
-var _helpers = require("./helpers");
-const typeFromField = params => {
-  var _field$settings;
+var _createTypeFromFields = require("../utils/createTypeFromFields");
+const createChildTypeDefs = params => {
   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 fields = field.settings?.fields || [];
+  const typeName = createTypeName({
+    model,
+    field,
+    parents: field.settings?.parents
+  });
+  const filters = fields.map(child => {
+    const createListFilters = plugins[child.type][endpointType].createListFilters;
+    if (!createListFilters) {
+      return null;
+    }
+    const filters = createListFilters({
       model,
-      fieldTypePlugins
+      field: {
+        ...child,
+        settings: {
+          ...child.settings,
+          parents: (child.settings?.parents || []).concat([field.fieldId])
+        }
+      },
+      plugins
     });
-    if (!result) {
-      continue;
+    if (!filters) {
+      return null;
     }
-    const {
-      fields,
-      typeDefs
-    } = result;
-    typeFields.push(fields.replace(replace, `${fieldTypeName}_`));
-    if (typeDefs) {
-      nestedTypes.push(typeDefs.replace(replace, `${fieldTypeName}_`));
-    }
-  }
-  return {
-    fieldType: `${fieldTypeName}${typeSuffix}`,
-    typeDefs: /* GraphQL */`
-            ${nestedTypes.join("\n")}
-            
-            ${typeOfType} ${fieldTypeName}${typeSuffix} {
-                ${typeFields.join("\n")}
-            }
-        `
-  };
+    return filters;
+  }).filter(Boolean).join("\n");
+  return `input ${typeName}WhereInput {
+        ${filters || "_empty: String"}
+    }\n`;
+};
+const createTypeName = params => {
+  const {
+    model,
+    parents = [],
+    field
+  } = params;
+  return [model.singularApiName].concat(parents).concat([field.fieldId]).filter(Boolean).map(id => {
+    return (0, _upperFirst.default)(id);
+  }).join("_");
+};
+const createListFilters = ({
+  field,
+  model
+}) => {
+  const typeName = createTypeName({
+    model,
+    field,
+    parents: field.settings?.parents
+  });
+  return `${field.fieldId}: ${typeName}WhereInput`;
 };
 const createObjectField = () => {
   return {
@@ -76,17 +73,49 @@ const createObjectField = () => {
     fieldType: "object",
     isSortable: false,
     isSearchable: false,
+    validateChildFields: params => {
+      const {
+        field,
+        originalField,
+        validate
+      } = params;
+      validate({
+        fields: field.settings?.fields ?? [],
+        originalFields: originalField?.settings?.fields || []
+      });
+    },
+    getFieldAst: (field, converter) => {
+      const {
+        fields = [],
+        ...settings
+      } = field.settings;
+      return {
+        type: "field",
+        field: {
+          ...field,
+          settings
+        },
+        children: fields.map(field => converter.toAst(field))
+      };
+    },
     read: {
       createTypeField({
         field,
+        models,
         model,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
+          models,
           typeOfType: "type",
           model,
           type: "read",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: field.settings?.parents
+          }),
+          fields: field.settings?.fields || [],
           fieldTypePlugins
         });
         if (!result) {
@@ -96,9 +125,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}`
         };
       },
       createResolver({
@@ -106,8 +141,7 @@ const createObjectField = () => {
         createFieldResolvers,
         graphQLType
       }) {
-        var _field$settings2;
-        if (!((_field$settings2 = field.settings) !== null && _field$settings2 !== void 0 && _field$settings2.fields) || field.settings.fields.length === 0) {
+        if (!field.settings?.fields || field.settings.fields.length === 0) {
           return false;
         }
         const fieldType = `${graphQLType}_${(0, _upperFirst.default)(field.fieldId)}`;
@@ -119,19 +153,27 @@ const createObjectField = () => {
           resolver: null,
           typeResolvers: typeResolvers || {}
         };
-      }
+      },
+      createListFilters
     },
     manage: {
       createTypeField({
+        models,
         model,
         field,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
           typeOfType: "type",
+          models,
           model,
           type: "manage",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: field.settings?.parents
+          }),
+          fields: field.settings?.fields || [],
           fieldTypePlugins
         });
         if (!result) {
@@ -141,21 +183,34 @@ 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}\n${childTypeDefs}`
         };
       },
       createInputField({
+        models,
         model,
         field,
         fieldTypePlugins
       }) {
-        const result = typeFromField({
+        const result = (0, _createTypeFromFields.createTypeFromFields)({
           typeOfType: "input",
+          models,
           model,
           type: "manage",
-          field,
+          typeNamePrefix: createTypeName({
+            model,
+            field,
+            parents: field.settings?.parents
+          }),
+          fields: field.settings?.fields || [],
           fieldTypePlugins
         });
         if (!result) {
@@ -166,7 +221,7 @@ const createObjectField = () => {
           typeDefs
         } = result;
         return {
-          fields: (0, _helpers.attachRequiredFieldValue)(`${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`, field),
+          fields: `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,
           typeDefs
         };
       },
@@ -175,8 +230,7 @@ const createObjectField = () => {
         field,
         createFieldResolvers
       }) {
-        var _field$settings3;
-        if (!((_field$settings3 = field.settings) !== null && _field$settings3 !== void 0 && _field$settings3.fields) || field.settings.fields.length === 0) {
+        if (!field.settings?.fields || field.settings.fields.length === 0) {
           return false;
         }
         const fieldType = `${graphQLType}_${(0, _upperFirst.default)(field.fieldId)}`;
@@ -188,8 +242,11 @@ const createObjectField = () => {
           resolver: null,
           typeResolvers: typeResolvers || {}
         };
-      }
+      },
+      createListFilters
     }
   };
 };
-exports.createObjectField = createObjectField;
+exports.createObjectField = createObjectField;
+
+//# sourceMappingURL=object.js.map

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":["_upperFirst","_interopRequireDefault","require","_createTypeFromFields","createChildTypeDefs","params","field","plugins","model","endpointType","fields","settings","typeName","createTypeName","parents","filters","map","child","createListFilters","type","concat","fieldId","filter","Boolean","join","singularApiName","id","lodashUpperFirst","createObjectField","name","fieldType","isSortable","isSearchable","validateChildFields","originalField","validate","originalFields","getFieldAst","converter","children","toAst","read","createTypeField","models","fieldTypePlugins","result","createTypeFromFields","typeOfType","typeNamePrefix","typeDefs","childTypeDefs","multipleValues","createResolver","createFieldResolvers","graphQLType","length","upperFirst","typeResolvers","resolver","manage","createInputField","exports"],"sources":["object.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport lodashUpperFirst from \"lodash/upperFirst\";\nimport type {\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin,\n    CmsModelObjectField\n} from \"~/types\";\nimport { createTypeFromFields } from \"~/utils/createTypeFromFields\";\n\ninterface AttachTypeDefinitionsParams {\n    model: Pick<CmsModel, \"singularApiName\">;\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 || \"_empty: String\"}\n    }\\n`;\n};\n\ninterface CreateTypeNameParams {\n    model: Pick<CmsModel, \"singularApiName\">;\n    parents?: string[];\n    field: CmsModelField;\n}\nconst createTypeName = (params: CreateTypeNameParams): string => {\n    const { model, parents = [], field } = params;\n    return [model.singularApiName]\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: Pick<CmsModel, \"singularApiName\">;\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<CmsModelObjectField> => {\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        getFieldAst: (field, converter) => {\n            const { fields = [], ...settings } = field.settings;\n\n            return {\n                type: \"field\",\n                field: {\n                    ...field,\n                    settings\n                },\n                children: fields.map(field => converter.toAst(field))\n            };\n        },\n        read: {\n            createTypeField({ field, models, model, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    models,\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({ models, model, field, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    typeOfType: \"type\",\n                    models,\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}\\n${childTypeDefs}`\n                };\n            },\n            createInputField({ models, model, field, fieldTypePlugins }) {\n                const result = createTypeFromFields({\n                    typeOfType: \"input\",\n                    models,\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: `${field.fieldId}: ${\n                        field.multipleValues ? `[${fieldType}!]` : fieldType\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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","ignoreList":[]}

package/graphqlFields/ref.d.ts

@@ -1,2 +1,2 @@
-import { CmsModelFieldToGraphQLPlugin } from "../types";
+import type { CmsModelFieldToGraphQLPlugin } from "../types";
 export declare const createRefField: () => CmsModelFieldToGraphQLPlugin;

package/graphqlFields/ref.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRefField = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _createTypeName = require("../utils/createTypeName");
 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 `${model.singularApiName}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
 };
 const createListFilters = ({
   field
@@ -35,9 +35,10 @@ const createFilteringTypeDef = () => {
 };
 const appendTypename = (entries, typename) => {
   return entries.map(item => {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+    return {
+      ...item,
       __typename: typename
-    });
+    };
   });
 };
 /**
@@ -51,6 +52,23 @@ const getFieldModels = field => {
   return field.settings.models;
 };
 const modelIdToTypeName = new Map();
+const getModel = params => {
+  const {
+    models,
+    modelId
+  } = params;
+  const model = models.find(item => item.modelId === modelId);
+  if (model) {
+    return model;
+  }
+  throw new _error.default(`Could not find model with ID "${modelId}" in the list of models.`, "MODEL_NOT_FOUND", {
+    modelId
+  });
+};
+const getModelSingularApiName = params => {
+  const model = getModel(params);
+  return model.singularApiName;
+};
 const createRefField = () => {
   return {
     name: "cms-model-field-to-graphql-ref",
@@ -61,29 +79,43 @@ const createRefField = () => {
     read: {
       createTypeField({
         model,
-        field
+        field,
+        models
       }) {
-        var _field$settings;
-        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 fieldModels = field.settings?.models || [];
+        const gqlType = fieldModels.length > 1 ? createUnionTypeName(model, field) : getModelSingularApiName({
+          models,
+          modelId: fieldModels[0].modelId
+        });
+        const typeDefs = fieldModels.length > 1 ? `union ${gqlType} = ${getFieldModels(field).map(({
+          modelId
+        }) => getModelSingularApiName({
+          models,
+          modelId
+        })).join(" | ")}` : "";
+        return {
+          fields: field.fieldId + `(populate: Boolean = true): ${field.multipleValues ? `[${gqlType}!]` : gqlType}`,
+          typeDefs
+        };
       },
       /**
        * TS is complaining about mixed types for createResolver.
        * TODO @ts-refactor @pavel Maybe we should have a single createResolver method?
        */
-      // @ts-ignore
-      createResolver(params) {
-        var _field$settings2;
-        const {
-          field
-        } = params;
+      // @ts-expect-error
+      createResolver({
+        field,
+        models
+      }) {
         // Create a map of model types and corresponding modelIds so resolvers don't need to perform the lookup.
-        const models = ((_field$settings2 = field.settings) === null || _field$settings2 === void 0 ? void 0 : _field$settings2.models) || [];
-        for (const item of models) {
-          modelIdToTypeName.set(item.modelId, (0, _createTypeName.createReadTypeName)(item.modelId));
+        const fieldModels = field.settings?.models || [];
+        for (const item of fieldModels) {
+          modelIdToTypeName.set(item.modelId, getModelSingularApiName({
+            models,
+            modelId: item.modelId
+          }));
         }
-        return async (parent, _, context) => {
+        return async (parent, args, context) => {
           const {
             cms
           } = context;
@@ -93,16 +125,19 @@ const createRefField = () => {
           if (!initialValue) {
             return null;
           }
+          if (args.populate === false) {
+            return initialValue;
+          }
           if (field.multipleValues) {
             /**
              * We cast because value really can be array and single value.
              * At this point, we are 99% sure that it is an array (+ we check for it)
              */
-            const value = initialValue;
-            if (Array.isArray(value) === false || value.length === 0) {
+            const referenceFieldValues = initialValue;
+            if (Array.isArray(referenceFieldValues) === false || referenceFieldValues.length === 0) {
               return [];
             }
-            const entriesByModel = value.reduce((collection, ref) => {
+            const entriesByModel = referenceFieldValues.reduce((collection, ref) => {
               if (!collection[ref.modelId]) {
                 collection[ref.modelId] = [];
               } else if (collection[ref.modelId].includes(ref.entryId) === true) {
@@ -114,7 +149,7 @@ const createRefField = () => {
             const getters = Object.keys(entriesByModel).map(async modelId => {
               const idList = entriesByModel[modelId];
               // Get model manager, to get access to CRUD methods
-              const model = await cms.getModelManager(modelId);
+              const model = await cms.getEntryManager(modelId);
               let entries;
               // `read` API works with `published` data
               if (cms.READ) {
@@ -126,12 +161,23 @@ const createRefField = () => {
               }
               return appendTypename(entries, modelIdToTypeName.get(modelId));
             });
-            return await Promise.all(getters).then(results => results.reduce((result, item) => result.concat(item), []));
+            const references = await Promise.all(getters).then(results => {
+              return results.reduce((result, item) => {
+                return result.concat(item);
+              }, []);
+            });
+            /**
+             * We need to return the referenced entries in the same order they are in the ref field.
+             * Maybe implement user defined sorting in the future?
+             */
+            return referenceFieldValues.map(v => {
+              return references.find(ref => ref.entryId === v.entryId);
+            }).filter(Boolean);
           }
           const value = initialValue;
 
           // Get model manager, to get access to CRUD methods
-          const model = await cms.getModelManager(value.modelId);
+          const model = await cms.getEntryManager(value.modelId);
           let revisions;
           // `read` API works with `published` data
           if (cms.READ) {
@@ -148,39 +194,15 @@ const createRefField = () => {
           if (!revisions || revisions.length === 0) {
             return null;
           }
-          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, revisions[0]), {}, {
+          return {
+            ...revisions[0],
             __typename: modelIdToTypeName.get(value.modelId)
-          });
+          };
         };
       },
-      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: {}
         };
       },
@@ -189,23 +211,25 @@ 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: RevisionId!
+                        }
+
+                        ${createFilteringTypeDef()}
+                    `,
           resolvers: {
             RefField: {
               entryId: parent => {
@@ -238,4 +262,6 @@ const createRefField = () => {
     }
   };
 };
-exports.createRefField = createRefField;
+exports.createRefField = createRefField;
+
+//# sourceMappingURL=ref.js.map