@webiny/api-headless-cms 0.0.0-unstable.97a151f74d → 0.0.0-unstable.99666aeb00

package/graphql/schema/createManageSDL.js

@@ -4,70 +4,74 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createManageSDL = void 0;
-
-var _createTypeName = require("../../utils/createTypeName");
-
 var _renderListFilterFields = require("../../utils/renderListFilterFields");
-
 var _renderSortEnum = require("../../utils/renderSortEnum");
-
 var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
-
 var _renderInputFields = require("../../utils/renderInputFields");
-
 var _renderFields = require("../../utils/renderFields");
-
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
-
 const createManageSDL = ({
+  models,
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
+  const inputFields = (0, _renderInputFields.renderInputFields)({
+    models,
+    model,
+    fields: model.fields,
+    fieldTypePlugins
+  });
+  if (inputFields.length === 0) {
+    return "";
+  }
   const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
     model,
+    fields: model.fields,
     type: "manage",
     fieldTypePlugins
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fields: model.fields,
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
-    model,
-    fieldTypePlugins
-  });
-  const inputFields = (0, _renderInputFields.renderInputFields)({
-    model,
+    fields: model.fields,
     fieldTypePlugins
   });
   const fields = (0, _renderFields.renderFields)({
+    models,
     model,
+    fields: model.fields,
     type: "manage",
     fieldTypePlugins
   });
-
-  if (inputFields.length === 0) {
-    return "";
-  }
-
-  return (
-    /* GraphQL */
-    `
-        """${model.description || model.modelId}"""
-        type ${mTypeName} {
+  const {
+    singularApiName: singularName,
+    pluralApiName: pluralName
+  } = model;
+  const inputGraphQLFields = inputFields.map(f => f.fields).join("\n");
+  /**
+   * TODO check for 5.38.0
+   */
+  return (/* GraphQL */`
+        """${model.description || singularName}"""
+        type ${singularName} {
             id: ID!
             entryId: String!
             createdOn: DateTime!
             savedOn: DateTime!
-            createdBy: CmsCreatedBy!
-            ownedBy: CmsOwnedBy!
-            meta: ${mTypeName}Meta
+            createdBy: CmsIdentity!
+            ownedBy: CmsIdentity!
+            modifiedBy: CmsIdentity
+            meta: ${singularName}Meta
             ${fields.map(f => f.fields).join("\n")}
+            # Advanced Content Organization - make required in 5.38.0
+            wbyAco_location: WbyAcoLocation
         }
 
-        type ${mTypeName}Meta {
+        type ${singularName}Meta {
             modelId: String
             version: Int
             locked: Boolean
@@ -77,85 +81,100 @@ const createManageSDL = ({
             CAUTION: this field is resolved by making an extra query to DB.
             RECOMMENDATION: Use it only with "get" queries (avoid in "list")
             """
-            revisions: [${mTypeName}]
+            revisions: [${singularName}!]
             title: String
+            description: String
+            image: String
             """
             Custom meta data stored in the root of the entry object.
             """
             data: JSON
         }
 
-        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
-        
-        ${inputFields.map(f => f.typeDefs).filter(Boolean).join("\n")}
+        ${fields.map(f => f.typeDefs).join("\n")}
 
-        ${inputFields && `input ${mTypeName}Input {
-            ${inputFields.map(f => f.fields).join("\n")}
-        }`}
+        ${inputFields.map(f => f.typeDefs).join("\n")}
+        
+        input ${singularName}Input {
+            id: ID
+            wbyAco_location: WbyAcoLocationInput
+            ${inputGraphQLFields}
+        }
 
-        ${getFilterFieldsRender && `input ${mTypeName}GetWhereInput {
+        input ${singularName}GetWhereInput {
             ${getFilterFieldsRender}
-        }`}
+        }
 
+        input ${singularName}ListWhereInput {
+            wbyAco_location: WbyAcoLocationWhereInput
+            ${listFilterFieldsRender}
+            AND: [${singularName}ListWhereInput!]
+            OR: [${singularName}ListWhereInput!]
+        }
 
-        ${listFilterFieldsRender && `input ${mTypeName}ListWhereInput {
-                ${listFilterFieldsRender}
-                AND: [${mTypeName}ListWhereInput!]
-                OR: [${mTypeName}ListWhereInput!]
-        }`}
 
-        type ${mTypeName}Response {
-            data: ${mTypeName}
+        type ${singularName}Response {
+            data: ${singularName}
             error: CmsError
         }
         
-        type ${mTypeName}ArrayResponse {
-            data: [${mTypeName}]
+        type ${singularName}MoveResponse {
+            data: Boolean
+            error: CmsError
+        }
+
+        type ${singularName}ArrayResponse {
+            data: [${singularName}]
             error: CmsError
         }
 
-        type ${mTypeName}ListResponse {
-            data: [${mTypeName}]
+        type ${singularName}ListResponse {
+            data: [${singularName}]
             meta: CmsListMeta
             error: CmsError
         }
 
-        ${sortEnumRender && `enum ${mTypeName}ListSorter {
+
+        enum ${singularName}ListSorter {
             ${sortEnumRender}
-        }`}
+        }
 
         extend type Query {
-            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response
-            
-            get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse
-            
-            get${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}ByIds(revisions: [ID!]!): ${mTypeName}ArrayResponse
-
-            list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}(
-                where: ${mTypeName}ListWhereInput
-                sort: [${mTypeName}ListSorter]
+            get${singularName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${singularName}Response
+    
+            get${singularName}Revisions(id: ID!): ${singularName}ArrayResponse
+    
+            get${pluralName}ByIds(revisions: [ID!]!): ${singularName}ArrayResponse
+    
+            list${pluralName} (
+                where: ${singularName}ListWhereInput
+                sort: [${singularName}ListSorter]
                 limit: Int
                 after: String
-            ): ${mTypeName}ListResponse
+                search: String
+            ): ${singularName}ListResponse
         }
 
-        extend type Mutation{
-            create${typeName}(data: ${mTypeName}Input!): ${mTypeName}Response
+        extend type Mutation {
+            create${singularName}(data: ${singularName}Input!): ${singularName}Response
 
-            create${typeName}From(revision: ID!, data: ${mTypeName}Input): ${mTypeName}Response
-
-            update${typeName}(revision: ID!, data: ${mTypeName}Input!): ${mTypeName}Response
+            create${singularName}From(revision: ID!, data: ${singularName}Input): ${singularName}Response
+    
+            update${singularName}(revision: ID!, data: ${singularName}Input!): ${singularName}Response
+            
+            move${singularName}(revision: ID!, folderId: ID!): ${singularName}MoveResponse
 
-            delete${typeName}(revision: ID!): CmsDeleteResponse
+            delete${singularName}(revision: ID!, options: CmsDeleteEntryOptions): CmsDeleteResponse
 
-            publish${typeName}(revision: ID!): ${mTypeName}Response
-        
-            republish${typeName}(revision: ID!): ${mTypeName}Response
-
-            unpublish${typeName}(revision: ID!): ${mTypeName}Response
+            deleteMultiple${pluralName}(entries: [ID!]!): CmsDeleteMultipleResponse!
+    
+            publish${singularName}(revision: ID!): ${singularName}Response
+    
+            republish${singularName}(revision: ID!): ${singularName}Response
+    
+            unpublish${singularName}(revision: ID!): ${singularName}Response
         }
     `
   );
 };
-
 exports.createManageSDL = createManageSDL;

package/graphql/schema/createManageSDL.js.map

@@ -1 +1 @@
-{"version":3,"names":["createManageSDL","model","fieldTypePlugins","typeName","createTypeName","modelId","mTypeName","createManageTypeName","listFilterFieldsRender","renderListFilterFields","type","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","inputFields","renderInputFields","fields","renderFields","length","description","map","f","join","typeDefs","filter","Boolean","pluralizedTypeName"],"sources":["createManageSDL.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel } from \"~/types\";\nimport { createManageTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { renderInputFields } from \"~/utils/renderInputFields\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateManageSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({ model, fieldTypePlugins }): string => {\n    const typeName = createTypeName(model.modelId);\n    const mTypeName = createManageTypeName(typeName);\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type: \"manage\",\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({ model, fieldTypePlugins });\n    const getFilterFieldsRender = renderGetFilterFields({ model, fieldTypePlugins });\n    const inputFields = renderInputFields({ model, fieldTypePlugins });\n    const fields = renderFields({ model, type: \"manage\", fieldTypePlugins });\n\n    if (inputFields.length === 0) {\n        return \"\";\n    }\n\n    return /* GraphQL */ `\n        \"\"\"${model.description || model.modelId}\"\"\"\n        type ${mTypeName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            meta: ${mTypeName}Meta\n            ${fields.map(f => f.fields).join(\"\\n\")}\n        }\n\n        type ${mTypeName}Meta {\n            modelId: String\n            version: Int\n            locked: Boolean\n            publishedOn: DateTime\n            status: String\n            \"\"\"\n            CAUTION: this field is resolved by making an extra query to DB.\n            RECOMMENDATION: Use it only with \"get\" queries (avoid in \"list\")\n            \"\"\"\n            revisions: [${mTypeName}]\n            title: String\n            \"\"\"\n            Custom meta data stored in the root of the entry object.\n            \"\"\"\n            data: JSON\n        }\n\n        ${fields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n        \n        ${inputFields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n\n        ${\n            inputFields &&\n            `input ${mTypeName}Input {\n            ${inputFields.map(f => f.fields).join(\"\\n\")}\n        }`\n        }\n\n        ${\n            getFilterFieldsRender &&\n            `input ${mTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n\n\n        ${\n            listFilterFieldsRender &&\n            `input ${mTypeName}ListWhereInput {\n                ${listFilterFieldsRender}\n                AND: [${mTypeName}ListWhereInput!]\n                OR: [${mTypeName}ListWhereInput!]\n        }`\n        }\n\n        type ${mTypeName}Response {\n            data: ${mTypeName}\n            error: CmsError\n        }\n        \n        type ${mTypeName}ArrayResponse {\n            data: [${mTypeName}]\n            error: CmsError\n        }\n\n        type ${mTypeName}ListResponse {\n            data: [${mTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n\n        ${\n            sortEnumRender &&\n            `enum ${mTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n\n        extend type Query {\n            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response\n            \n            get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse\n            \n            get${pluralizedTypeName(typeName)}ByIds(revisions: [ID!]!): ${mTypeName}ArrayResponse\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${mTypeName}ListWhereInput\n                sort: [${mTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${mTypeName}ListResponse\n        }\n\n        extend type Mutation{\n            create${typeName}(data: ${mTypeName}Input!): ${mTypeName}Response\n\n            create${typeName}From(revision: ID!, data: ${mTypeName}Input): ${mTypeName}Response\n\n            update${typeName}(revision: ID!, data: ${mTypeName}Input!): ${mTypeName}Response\n\n            delete${typeName}(revision: ID!): CmsDeleteResponse\n\n            publish${typeName}(revision: ID!): ${mTypeName}Response\n        \n            republish${typeName}(revision: ID!): ${mTypeName}Response\n\n            unpublish${typeName}(revision: ID!): ${mTypeName}Response\n        }\n    `;\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAUO,MAAMA,eAAgC,GAAG,CAAC;EAAEC,KAAF;EAASC;AAAT,CAAD,KAAyC;EACrF,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeH,KAAK,CAACI,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,oCAAA,EAAqBJ,QAArB,CAAlB;EAEA,MAAMK,sBAAsB,GAAG,IAAAC,8CAAA,EAAuB;IAClDR,KADkD;IAElDS,IAAI,EAAE,QAF4C;IAGlDR;EAHkD,CAAvB,CAA/B;EAMA,MAAMS,cAAc,GAAG,IAAAC,8BAAA,EAAe;IAAEX,KAAF;IAASC;EAAT,CAAf,CAAvB;EACA,MAAMW,qBAAqB,GAAG,IAAAC,4CAAA,EAAsB;IAAEb,KAAF;IAASC;EAAT,CAAtB,CAA9B;EACA,MAAMa,WAAW,GAAG,IAAAC,oCAAA,EAAkB;IAAEf,KAAF;IAASC;EAAT,CAAlB,CAApB;EACA,MAAMe,MAAM,GAAG,IAAAC,0BAAA,EAAa;IAAEjB,KAAF;IAASS,IAAI,EAAE,QAAf;IAAyBR;EAAzB,CAAb,CAAf;;EAEA,IAAIa,WAAW,CAACI,MAAZ,KAAuB,CAA3B,EAA8B;IAC1B,OAAO,EAAP;EACH;;EAED;IAAO;IAAe;AAC1B,aAAalB,KAAK,CAACmB,WAAN,IAAqBnB,KAAK,CAACI,OAAQ;AAChD,eAAeC,SAAU;AACzB;AACA;AACA;AACA;AACA;AACA;AACA,oBAAoBA,SAAU;AAC9B,cAAcW,MAAM,CAACI,GAAP,CAAWC,CAAC,IAAIA,CAAC,CAACL,MAAlB,EAA0BM,IAA1B,CAA+B,IAA/B,CAAqC;AACnD;AACA;AACA,eAAejB,SAAU;AACzB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0BA,SAAU;AACpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,UAAUW,MAAM,CACHI,GADH,CACOC,CAAC,IAAIA,CAAC,CAACE,QADd,EAEGC,MAFH,CAEUC,OAFV,EAGGH,IAHH,CAGQ,IAHR,CAGc;AACxB;AACA,UAAUR,WAAW,CACRM,GADH,CACOC,CAAC,IAAIA,CAAC,CAACE,QADd,EAEGC,MAFH,CAEUC,OAFV,EAGGH,IAHH,CAGQ,IAHR,CAGc;AACxB;AACA,UACYR,WAAW,IACV,SAAQT,SAAU;AAC/B,cAAcS,WAAW,CAACM,GAAZ,CAAgBC,CAAC,IAAIA,CAAC,CAACL,MAAvB,EAA+BM,IAA/B,CAAoC,IAApC,CAA0C;AACxD,UACS;AACT;AACA,UACYV,qBAAqB,IACpB,SAAQP,SAAU;AAC/B,cAAcO,qBAAsB;AACpC,UACS;AACT;AACA;AACA,UACYL,sBAAsB,IACrB,SAAQF,SAAU;AAC/B,kBAAkBE,sBAAuB;AACzC,wBAAwBF,SAAU;AAClC,uBAAuBA,SAAU;AACjC,UACS;AACT;AACA,eAAeA,SAAU;AACzB,oBAAoBA,SAAU;AAC9B;AACA;AACA;AACA,eAAeA,SAAU;AACzB,qBAAqBA,SAAU;AAC/B;AACA;AACA;AACA,eAAeA,SAAU;AACzB,qBAAqBA,SAAU;AAC/B;AACA;AACA;AACA;AACA,UACYK,cAAc,IACb,QAAOL,SAAU;AAC9B,cAAcK,cAAe;AAC7B,UACS;AACT;AACA;AACA,iBAAiBR,QAAS,4DAA2DG,SAAU;AAC/F;AACA,iBAAiBH,QAAS,uBAAsBG,SAAU;AAC1D;AACA,iBAAiB,IAAAqB,sCAAA,EAAmBxB,QAAnB,CAA6B,6BAA4BG,SAAU;AACpF;AACA,kBAAkB,IAAAqB,sCAAA,EAAmBxB,QAAnB,CAA6B;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA;AACA;AACA,oBAAoBH,QAAS,UAASG,SAAU,YAAWA,SAAU;AACrE;AACA,oBAAoBH,QAAS,6BAA4BG,SAAU,WAAUA,SAAU;AACvF;AACA,oBAAoBH,QAAS,yBAAwBG,SAAU,YAAWA,SAAU;AACpF;AACA,oBAAoBH,QAAS;AAC7B;AACA,qBAAqBA,QAAS,oBAAmBG,SAAU;AAC3D;AACA,uBAAuBH,QAAS,oBAAmBG,SAAU;AAC7D;AACA,uBAAuBH,QAAS,oBAAmBG,SAAU;AAC7D;AACA;EAtHI;AAuHH,CA1IM"}
+{"version":3,"names":["createManageSDL","models","model","fieldTypePlugins","sorterPlugins","inputFields","renderInputFields","fields","length","listFilterFieldsRender","renderListFilterFields","type","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","renderFields","singularApiName","singularName","pluralApiName","pluralName","inputGraphQLFields","map","f","join","description","typeDefs"],"sources":["createManageSDL.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel } from \"~/types\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { renderInputFields } from \"~/utils/renderInputFields\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateManageSDLParams {\n    models: CmsModel[];\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\n\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({\n    models,\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    const inputFields = renderInputFields({\n        models,\n        model,\n        fields: model.fields,\n        fieldTypePlugins\n    });\n    if (inputFields.length === 0) {\n        return \"\";\n    }\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        fields: model.fields,\n        type: \"manage\",\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({\n        model,\n        fields: model.fields,\n        fieldTypePlugins,\n        sorterPlugins\n    });\n    const getFilterFieldsRender = renderGetFilterFields({\n        fields: model.fields,\n        fieldTypePlugins\n    });\n\n    const fields = renderFields({\n        models,\n        model,\n        fields: model.fields,\n        type: \"manage\",\n        fieldTypePlugins\n    });\n\n    const { singularApiName: singularName, pluralApiName: pluralName } = model;\n\n    const inputGraphQLFields = inputFields.map(f => f.fields).join(\"\\n\");\n    /**\n     * TODO check for 5.38.0\n     */\n    return /* GraphQL */ `\n        \"\"\"${model.description || singularName}\"\"\"\n        type ${singularName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsIdentity!\n            ownedBy: CmsIdentity!\n            modifiedBy: CmsIdentity\n            meta: ${singularName}Meta\n            ${fields.map(f => f.fields).join(\"\\n\")}\n            # Advanced Content Organization - make required in 5.38.0\n            wbyAco_location: WbyAcoLocation\n        }\n\n        type ${singularName}Meta {\n            modelId: String\n            version: Int\n            locked: Boolean\n            publishedOn: DateTime\n            status: String\n            \"\"\"\n            CAUTION: this field is resolved by making an extra query to DB.\n            RECOMMENDATION: Use it only with \"get\" queries (avoid in \"list\")\n            \"\"\"\n            revisions: [${singularName}!]\n            title: String\n            description: String\n            image: String\n            \"\"\"\n            Custom meta data stored in the root of the entry object.\n            \"\"\"\n            data: JSON\n        }\n\n        ${fields.map(f => f.typeDefs).join(\"\\n\")}\n\n        ${inputFields.map(f => f.typeDefs).join(\"\\n\")}\n        \n        input ${singularName}Input {\n            id: ID\n            wbyAco_location: WbyAcoLocationInput\n            ${inputGraphQLFields}\n        }\n\n        input ${singularName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }\n\n        input ${singularName}ListWhereInput {\n            wbyAco_location: WbyAcoLocationWhereInput\n            ${listFilterFieldsRender}\n            AND: [${singularName}ListWhereInput!]\n            OR: [${singularName}ListWhereInput!]\n        }\n\n\n        type ${singularName}Response {\n            data: ${singularName}\n            error: CmsError\n        }\n        \n        type ${singularName}MoveResponse {\n            data: Boolean\n            error: CmsError\n        }\n\n        type ${singularName}ArrayResponse {\n            data: [${singularName}]\n            error: CmsError\n        }\n\n        type ${singularName}ListResponse {\n            data: [${singularName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n\n\n        enum ${singularName}ListSorter {\n            ${sortEnumRender}\n        }\n\n        extend type Query {\n            get${singularName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${singularName}Response\n    \n            get${singularName}Revisions(id: ID!): ${singularName}ArrayResponse\n    \n            get${pluralName}ByIds(revisions: [ID!]!): ${singularName}ArrayResponse\n    \n            list${pluralName} (\n                where: ${singularName}ListWhereInput\n                sort: [${singularName}ListSorter]\n                limit: Int\n                after: String\n                search: String\n            ): ${singularName}ListResponse\n        }\n\n        extend type Mutation {\n            create${singularName}(data: ${singularName}Input!): ${singularName}Response\n\n            create${singularName}From(revision: ID!, data: ${singularName}Input): ${singularName}Response\n    \n            update${singularName}(revision: ID!, data: ${singularName}Input!): ${singularName}Response\n            \n            move${singularName}(revision: ID!, folderId: ID!): ${singularName}MoveResponse\n\n            delete${singularName}(revision: ID!, options: CmsDeleteEntryOptions): CmsDeleteResponse\n\n            deleteMultiple${pluralName}(entries: [ID!]!): CmsDeleteMultipleResponse!\n    \n            publish${singularName}(revision: ID!): ${singularName}Response\n    \n            republish${singularName}(revision: ID!): ${singularName}Response\n    \n            unpublish${singularName}(revision: ID!): ${singularName}Response\n        }\n    `;\n};\n"],"mappings":";;;;;;AACA;AACA;AACA;AACA;AACA;AAcO,MAAMA,eAAgC,GAAG,CAAC;EAC7CC,MAAM;EACNC,KAAK;EACLC,gBAAgB;EAChBC;AACJ,CAAC,KAAa;EACV,MAAMC,WAAW,GAAG,IAAAC,oCAAiB,EAAC;IAClCL,MAAM;IACNC,KAAK;IACLK,MAAM,EAAEL,KAAK,CAACK,MAAM;IACpBJ;EACJ,CAAC,CAAC;EACF,IAAIE,WAAW,CAACG,MAAM,KAAK,CAAC,EAAE;IAC1B,OAAO,EAAE;EACb;EACA,MAAMC,sBAAsB,GAAG,IAAAC,8CAAsB,EAAC;IAClDR,KAAK;IACLK,MAAM,EAAEL,KAAK,CAACK,MAAM;IACpBI,IAAI,EAAE,QAAQ;IACdR;EACJ,CAAC,CAAC;EAEF,MAAMS,cAAc,GAAG,IAAAC,8BAAc,EAAC;IAClCX,KAAK;IACLK,MAAM,EAAEL,KAAK,CAACK,MAAM;IACpBJ,gBAAgB;IAChBC;EACJ,CAAC,CAAC;EACF,MAAMU,qBAAqB,GAAG,IAAAC,4CAAqB,EAAC;IAChDR,MAAM,EAAEL,KAAK,CAACK,MAAM;IACpBJ;EACJ,CAAC,CAAC;EAEF,MAAMI,MAAM,GAAG,IAAAS,0BAAY,EAAC;IACxBf,MAAM;IACNC,KAAK;IACLK,MAAM,EAAEL,KAAK,CAACK,MAAM;IACpBI,IAAI,EAAE,QAAQ;IACdR;EACJ,CAAC,CAAC;EAEF,MAAM;IAAEc,eAAe,EAAEC,YAAY;IAAEC,aAAa,EAAEC;EAAW,CAAC,GAAGlB,KAAK;EAE1E,MAAMmB,kBAAkB,GAAGhB,WAAW,CAACiB,GAAG,CAACC,CAAC,IAAIA,CAAC,CAAChB,MAAM,CAAC,CAACiB,IAAI,CAAC,IAAI,CAAC;EACpE;AACJ;AACA;EACI,OAAO,cAAe;AAC1B,aAAatB,KAAK,CAACuB,WAAW,IAAIP,YAAa;AAC/C,eAAeA,YAAa;AAC5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,oBAAoBA,YAAa;AACjC,cAAcX,MAAM,CAACe,GAAG,CAACC,CAAC,IAAIA,CAAC,CAAChB,MAAM,CAAC,CAACiB,IAAI,CAAC,IAAI,CAAE;AACnD;AACA;AACA;AACA;AACA,eAAeN,YAAa;AAC5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0BA,YAAa;AACvC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,UAAUX,MAAM,CAACe,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACG,QAAQ,CAAC,CAACF,IAAI,CAAC,IAAI,CAAE;AACjD;AACA,UAAUnB,WAAW,CAACiB,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACG,QAAQ,CAAC,CAACF,IAAI,CAAC,IAAI,CAAE;AACtD;AACA,gBAAgBN,YAAa;AAC7B;AACA;AACA,cAAcG,kBAAmB;AACjC;AACA;AACA,gBAAgBH,YAAa;AAC7B,cAAcJ,qBAAsB;AACpC;AACA;AACA,gBAAgBI,YAAa;AAC7B;AACA,cAAcT,sBAAuB;AACrC,oBAAoBS,YAAa;AACjC,mBAAmBA,YAAa;AAChC;AACA;AACA;AACA,eAAeA,YAAa;AAC5B,oBAAoBA,YAAa;AACjC;AACA;AACA;AACA,eAAeA,YAAa;AAC5B;AACA;AACA;AACA;AACA,eAAeA,YAAa;AAC5B,qBAAqBA,YAAa;AAClC;AACA;AACA;AACA,eAAeA,YAAa;AAC5B,qBAAqBA,YAAa;AAClC;AACA;AACA;AACA;AACA;AACA,eAAeA,YAAa;AAC5B,cAAcN,cAAe;AAC7B;AACA;AACA;AACA,iBAAiBM,YAAa,4DAA2DA,YAAa;AACtG;AACA,iBAAiBA,YAAa,uBAAsBA,YAAa;AACjE;AACA,iBAAiBE,UAAW,6BAA4BF,YAAa;AACrE;AACA,kBAAkBE,UAAW;AAC7B,yBAAyBF,YAAa;AACtC,yBAAyBA,YAAa;AACtC;AACA;AACA;AACA,iBAAiBA,YAAa;AAC9B;AACA;AACA;AACA,oBAAoBA,YAAa,UAASA,YAAa,YAAWA,YAAa;AAC/E;AACA,oBAAoBA,YAAa,6BAA4BA,YAAa,WAAUA,YAAa;AACjG;AACA,oBAAoBA,YAAa,yBAAwBA,YAAa,YAAWA,YAAa;AAC9F;AACA,kBAAkBA,YAAa,mCAAkCA,YAAa;AAC9E;AACA,oBAAoBA,YAAa;AACjC;AACA,4BAA4BE,UAAW;AACvC;AACA,qBAAqBF,YAAa,oBAAmBA,YAAa;AAClE;AACA,uBAAuBA,YAAa,oBAAmBA,YAAa;AACpE;AACA,uBAAuBA,YAAa,oBAAmBA,YAAa;AACpE;AACA;EAAK;AACL,CAAC;AAAC"}

package/graphql/schema/createPreviewResolvers.js

@@ -1,24 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createPreviewResolvers = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _resolveGet = require("./resolvers/preview/resolveGet");
-
 var _resolveList = require("./resolvers/preview/resolveList");
-
 var _createFieldResolvers = require("./createFieldResolvers");
-
-var _createTypeName = require("../../utils/createTypeName");
-
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
-
 const createPreviewResolvers = ({
   models,
   model,
@@ -29,9 +19,6 @@ const createPreviewResolvers = ({
       Query: {}
     };
   }
-
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
     endpointType: "read",
     models,
@@ -39,20 +26,19 @@ const createPreviewResolvers = ({
     fieldTypePlugins
   });
   const fieldResolvers = createFieldResolvers({
-    graphQLType: rTypeName,
+    graphQLType: model.singularApiName,
     fields: model.fields,
     isRoot: true
   });
   return (0, _objectSpread2.default)({
     Query: {
-      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+      [`get${model.singularApiName}`]: (0, _resolveGet.resolveGet)({
         model
       }),
-      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+      [`list${model.pluralApiName}`]: (0, _resolveList.resolveList)({
         model
       })
     }
   }, fieldResolvers);
 };
-
 exports.createPreviewResolvers = createPreviewResolvers;

package/graphql/schema/createPreviewResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["createPreviewResolvers","models","model","fieldTypePlugins","fields","length","Query","typeName","createTypeName","modelId","rTypeName","createReadTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","resolveGet","pluralizedTypeName","resolveList"],"sources":["createPreviewResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/preview/resolveGet\";\nimport { resolveList } from \"./resolvers/preview/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createPreviewResolvers: CreateReadResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: rTypeName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${typeName}`]: resolveGet({ model }),\n            [`list${pluralizedTypeName(typeName)}`]: resolveList({ model })\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAaO,MAAMA,sBAA2C,GAAG,CAAC;EACxDC,MADwD;EAExDC,KAFwD;EAGxDC;AAHwD,CAAD,KAIrD;EACF,IAAID,KAAK,CAACE,MAAN,CAAaC,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO;MACHC,KAAK,EAAE;IADJ,CAAP;EAGH;;EACD,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeN,KAAK,CAACO,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,oBAAoB,GAAG,IAAAC,iDAAA,EAA4B;IACrDC,YAAY,EAAE,MADuC;IAErDb,MAFqD;IAGrDC,KAHqD;IAIrDC;EAJqD,CAA5B,CAA7B;EAOA,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAD2B;IAExCN,MAAM,EAAEF,KAAK,CAACE,MAF0B;IAGxCa,MAAM,EAAE;EAHgC,CAAD,CAA3C;EAMA;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAhB,GAAoB,IAAAW,sBAAA,EAAW;QAAEhB;MAAF,CAAX,CADjB;MAEH,CAAE,OAAM,IAAAiB,sCAAA,EAAmBZ,QAAnB,CAA6B,EAArC,GAAyC,IAAAa,wBAAA,EAAY;QAAElB;MAAF,CAAZ;IAFtC;EADX,GAKOa,cALP;AAOH,CAjCM"}
+{"version":3,"names":["createPreviewResolvers","models","model","fieldTypePlugins","fields","length","Query","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","singularApiName","isRoot","resolveGet","pluralApiName","resolveList"],"sources":["createPreviewResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/preview/resolveGet\";\nimport { resolveList } from \"./resolvers/preview/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createPreviewResolvers: CreateReadResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: model.singularApiName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${model.singularApiName}`]: resolveGet({ model }),\n            [`list${model.pluralApiName}`]: resolveList({ model })\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;AACA;AACA;AACA;AAcO,MAAMA,sBAA2C,GAAG,CAAC;EACxDC,MAAM;EACNC,KAAK;EACLC;AACJ,CAAC,KAAK;EACF,IAAID,KAAK,CAACE,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO;MACHC,KAAK,EAAE,CAAC;IACZ,CAAC;EACL;EAEA,MAAMC,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBR,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMO,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAET,KAAK,CAACU,eAAe;IAClCR,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBS,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIP,KAAK,EAAE;MACH,CAAE,MAAKJ,KAAK,CAACU,eAAgB,EAAC,GAAG,IAAAE,sBAAU,EAAC;QAAEZ;MAAM,CAAC,CAAC;MACtD,CAAE,OAAMA,KAAK,CAACa,aAAc,EAAC,GAAG,IAAAC,wBAAW,EAAC;QAAEd;MAAM,CAAC;IACzD;EAAC,GACEQ,cAAc;AAEzB,CAAC;AAAC"}

package/graphql/schema/createReadResolvers.js

@@ -1,24 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createReadResolvers = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _resolveGet = require("./resolvers/read/resolveGet");
-
 var _resolveList = require("./resolvers/read/resolveList");
-
 var _createFieldResolvers = require("./createFieldResolvers");
-
-var _createTypeName = require("../../utils/createTypeName");
-
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
-
 const createReadResolvers = ({
   models,
   model,
@@ -29,9 +19,6 @@ const createReadResolvers = ({
       Query: {}
     };
   }
-
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
     endpointType: "read",
     models,
@@ -39,20 +26,24 @@ const createReadResolvers = ({
     fieldTypePlugins
   });
   const fieldResolvers = createFieldResolvers({
-    graphQLType: rTypeName,
+    graphQLType: model.singularApiName,
     fields: model.fields,
     isRoot: true
   });
   return (0, _objectSpread2.default)({
     Query: {
-      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+      [`get${model.singularApiName}`]: (0, _resolveGet.resolveGet)({
         model
       }),
-      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+      [`list${model.pluralApiName}`]: (0, _resolveList.resolveList)({
         model
       })
+    },
+    [model.singularApiName]: {
+      modelId: () => {
+        return model.modelId;
+      }
     }
   }, fieldResolvers);
 };
-
 exports.createReadResolvers = createReadResolvers;

package/graphql/schema/createReadResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["createReadResolvers","models","model","fieldTypePlugins","fields","length","Query","typeName","createTypeName","modelId","rTypeName","createReadTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","resolveGet","pluralizedTypeName","resolveList"],"sources":["createReadResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/read/resolveGet\";\nimport { resolveList } from \"./resolvers/read/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createReadResolvers: CreateReadResolvers = ({ models, model, fieldTypePlugins }) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: rTypeName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${typeName}`]: resolveGet({ model }),\n            [`list${pluralizedTypeName(typeName)}`]: resolveList({ model })\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAaO,MAAMA,mBAAwC,GAAG,CAAC;EAAEC,MAAF;EAAUC,KAAV;EAAiBC;AAAjB,CAAD,KAAyC;EAC7F,IAAID,KAAK,CAACE,MAAN,CAAaC,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO;MACHC,KAAK,EAAE;IADJ,CAAP;EAGH;;EACD,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeN,KAAK,CAACO,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,oBAAoB,GAAG,IAAAC,iDAAA,EAA4B;IACrDC,YAAY,EAAE,MADuC;IAErDb,MAFqD;IAGrDC,KAHqD;IAIrDC;EAJqD,CAA5B,CAA7B;EAOA,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAD2B;IAExCN,MAAM,EAAEF,KAAK,CAACE,MAF0B;IAGxCa,MAAM,EAAE;EAHgC,CAAD,CAA3C;EAMA;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAhB,GAAoB,IAAAW,sBAAA,EAAW;QAAEhB;MAAF,CAAX,CADjB;MAEH,CAAE,OAAM,IAAAiB,sCAAA,EAAmBZ,QAAnB,CAA6B,EAArC,GAAyC,IAAAa,wBAAA,EAAY;QAAElB;MAAF,CAAZ;IAFtC;EADX,GAKOa,cALP;AAOH,CA7BM"}
+{"version":3,"names":["createReadResolvers","models","model","fieldTypePlugins","fields","length","Query","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","singularApiName","isRoot","resolveGet","pluralApiName","resolveList","modelId"],"sources":["createReadResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/read/resolveGet\";\nimport { resolveList } from \"./resolvers/read/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createReadResolvers: CreateReadResolvers = ({ models, model, fieldTypePlugins }) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: model.singularApiName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${model.singularApiName}`]: resolveGet({ model }),\n            [`list${model.pluralApiName}`]: resolveList({ model })\n        },\n        [model.singularApiName]: {\n            modelId: () => {\n                return model.modelId;\n            }\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;AACA;AACA;AACA;AAcO,MAAMA,mBAAwC,GAAG,CAAC;EAAEC,MAAM;EAAEC,KAAK;EAAEC;AAAiB,CAAC,KAAK;EAC7F,IAAID,KAAK,CAACE,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO;MACHC,KAAK,EAAE,CAAC;IACZ,CAAC;EACL;EAEA,MAAMC,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBR,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMO,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAET,KAAK,CAACU,eAAe;IAClCR,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBS,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIP,KAAK,EAAE;MACH,CAAE,MAAKJ,KAAK,CAACU,eAAgB,EAAC,GAAG,IAAAE,sBAAU,EAAC;QAAEZ;MAAM,CAAC,CAAC;MACtD,CAAE,OAAMA,KAAK,CAACa,aAAc,EAAC,GAAG,IAAAC,wBAAW,EAAC;QAAEd;MAAM,CAAC;IACzD,CAAC;IACD,CAACA,KAAK,CAACU,eAAe,GAAG;MACrBK,OAAO,EAAE,MAAM;QACX,OAAOf,KAAK,CAACe,OAAO;MACxB;IACJ;EAAC,GACEP,cAAc;AAEzB,CAAC;AAAC"}

package/graphql/schema/createReadSDL.d.ts

@@ -1,7 +1,10 @@
 import { CmsModel, CmsFieldTypePlugins } from "../../types";
+import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
 interface CreateReadSDLParams {
+    models: CmsModel[];
     model: CmsModel;
     fieldTypePlugins: CmsFieldTypePlugins;
+    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];
 }
 interface CreateReadSDL {
     (params: CreateReadSDLParams): string;

package/graphql/schema/createReadSDL.js

@@ -4,101 +4,101 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createReadSDL = void 0;
-
-var _createTypeName = require("../../utils/createTypeName");
-
 var _renderListFilterFields = require("../../utils/renderListFilterFields");
-
 var _renderSortEnum = require("../../utils/renderSortEnum");
-
 var _renderFields = require("../../utils/renderFields");
-
 var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
-
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
-
 const createReadSDL = ({
+  models,
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const type = "read";
-  const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
+  const fieldsRender = (0, _renderFields.renderFields)({
+    models,
     model,
+    fields: model.fields,
     type,
     fieldTypePlugins
   });
-  const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
+  if (fieldsRender.length === 0) {
+    return "";
+  }
+  const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
     model,
+    fields: model.fields,
+    type,
     fieldTypePlugins
   });
-  const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
+  const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fields: model.fields,
+    fieldTypePlugins,
+    sorterPlugins
   });
-  const fieldsRender = (0, _renderFields.renderFields)({
-    model,
-    type,
+  const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
+    fields: model.fields,
     fieldTypePlugins
   });
-
-  if (fieldsRender.length === 0) {
-    return "";
-  }
-
+  const hasModelIdField = model.fields.some(f => f.fieldId === "modelId");
+  const {
+    singularApiName: singularName,
+    pluralApiName: pluralName
+  } = model;
   return `
-        """${model.description || ""}"""
-        type ${rTypeName} {
+        """${model.description || singularName}"""
+        type ${singularName} {
             id: ID!
             entryId: String!
+            ${hasModelIdField ? "" : "modelId: String!"}
             createdOn: DateTime!
             savedOn: DateTime!
-            createdBy: CmsCreatedBy!
-            ownedBy: CmsOwnedBy!
+            createdBy: CmsIdentity!
+            ownedBy: CmsIdentity!
             ${fieldsRender.map(f => f.fields).join("\n")}
         }
         
         ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
         
-        ${getFilterFieldsRender && `input ${rTypeName}GetWhereInput {
+        input ${singularName}GetWhereInput {
             ${getFilterFieldsRender}
-        }`}
+        }
         
         
-        ${listFilterFieldsRender && `input ${rTypeName}ListWhereInput {
-                ${listFilterFieldsRender}
-                AND: [${rTypeName}ListWhereInput!]
-                OR: [${rTypeName}ListWhereInput!]
-        }`}
+        input ${singularName}ListWhereInput {
+            ${listFilterFieldsRender}
+            AND: [${singularName}ListWhereInput!]
+            OR: [${singularName}ListWhereInput!]
+        }
         
         
-        ${sortEnumRender && `enum ${rTypeName}ListSorter {
+        enum ${singularName}ListSorter {
             ${sortEnumRender}
-        }`}
+        }
         
-        type ${rTypeName}Response {
-            data: ${rTypeName}
+        type ${singularName}Response {
+            data: ${singularName}
             error: CmsError
         }
         
-        type ${rTypeName}ListResponse {
-            data: [${rTypeName}]
+        type ${singularName}ListResponse {
+            data: [${singularName}]
             meta: CmsListMeta
             error: CmsError
         }
         
         extend type Query {
-            get${typeName}(where: ${rTypeName}GetWhereInput!): ${rTypeName}Response
+            get${singularName}(where: ${singularName}GetWhereInput!): ${singularName}Response
 
-            list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}(
-                where: ${rTypeName}ListWhereInput
-                sort: [${rTypeName}ListSorter]
+            list${pluralName}(
+                where: ${singularName}ListWhereInput
+                sort: [${singularName}ListSorter]
                 limit: Int
                 after: String
-            ): ${rTypeName}ListResponse
+                search: String
+            ): ${singularName}ListResponse
         }
     `;
 };
-
 exports.createReadSDL = createReadSDL;