@webiny/api-headless-cms 0.0.0-mt-3 → 0.0.0-unstable.3386f66516

package/{content/plugins → graphql}/schema/createManageSDL.js

@@ -5,23 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createManageSDL = void 0;
 
-var _createTypeName = require("../utils/createTypeName");
+var _createTypeName = require("../../utils/createTypeName");
 
-var _renderListFilterFields = require("../utils/renderListFilterFields");
+var _renderListFilterFields = require("../../utils/renderListFilterFields");
 
-var _renderSortEnum = require("../utils/renderSortEnum");
+var _renderSortEnum = require("../../utils/renderSortEnum");
 
-var _renderGetFilterFields = require("../utils/renderGetFilterFields");
+var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
 
-var _renderInputFields = require("../utils/renderInputFields");
+var _renderInputFields = require("../../utils/renderInputFields");
 
-var _renderFields = require("../utils/renderFields");
+var _renderFields = require("../../utils/renderFields");
 
-var _pluralizedTypeName = require("../utils/pluralizedTypeName");
+var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 
 const createManageSDL = ({
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
   const typeName = (0, _createTypeName.createTypeName)(model.modelId);
   const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
@@ -32,7 +33,8 @@ const createManageSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -47,12 +49,15 @@ const createManageSDL = ({
     type: "manage",
     fieldTypePlugins
   });
+
+  if (inputFields.length === 0) {
+    return "";
+  }
+
   return (
     /* GraphQL */
     `
-        """${model.description}"""
-        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
-
+        """${model.description || model.modelId}"""
         type ${mTypeName} {
             id: ID!
             entryId: String!
@@ -71,14 +76,19 @@ const createManageSDL = ({
             publishedOn: DateTime
             status: String
             """
-            CAUTION: this field is resolved by making an extra query to DB. 
-            RECOMMENDATION: Use it only with "get" queries (avoid in "list") 
+            CAUTION: this field is resolved by making an extra query to DB.
+            RECOMMENDATION: Use it only with "get" queries (avoid in "list")
             """
             revisions: [${mTypeName}]
             title: 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")}
 
         ${inputFields && `input ${mTypeName}Input {
@@ -91,7 +101,9 @@ const createManageSDL = ({
 
 
         ${listFilterFieldsRender && `input ${mTypeName}ListWhereInput {
-            ${listFilterFieldsRender}
+                ${listFilterFieldsRender}
+                AND: [${mTypeName}ListWhereInput!]
+                OR: [${mTypeName}ListWhereInput!]
         }`}
 
         type ${mTypeName}Response {
@@ -115,7 +127,7 @@ const createManageSDL = ({
         }`}
 
         extend type Query {
-            get${typeName}(revision: ID!): ${mTypeName}Response
+            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response
             
             get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse
             
@@ -139,12 +151,10 @@ const createManageSDL = ({
             delete${typeName}(revision: ID!): CmsDeleteResponse
 
             publish${typeName}(revision: ID!): ${mTypeName}Response
+        
+            republish${typeName}(revision: ID!): ${mTypeName}Response
 
             unpublish${typeName}(revision: ID!): ${mTypeName}Response
-            
-            request${typeName}Review(revision: ID!): ${mTypeName}Response
-            
-            request${typeName}Changes(revision: ID!): ${mTypeName}Response
         }
     `
   );

package/graphql/schema/createManageSDL.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createManageSDL","model","fieldTypePlugins","sorterPlugins","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\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateManageSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): 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, sorterPlugins });\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":"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"}

package/graphql/schema/createPreviewResolvers.d.ts

@@ -0,0 +1,12 @@
+import { CmsModel, CmsFieldTypePlugins, CmsContext } from "../../types";
+interface CreateReadResolversParams {
+    models: CmsModel[];
+    model: CmsModel;
+    context: CmsContext;
+    fieldTypePlugins: CmsFieldTypePlugins;
+}
+export interface CreateReadResolvers {
+    (params: CreateReadResolversParams): any;
+}
+export declare const createPreviewResolvers: CreateReadResolvers;
+export {};

package/graphql/schema/createPreviewResolvers.js

@@ -0,0 +1,58 @@
+"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,
+  fieldTypePlugins
+}) => {
+  if (model.fields.length === 0) {
+    return {
+      Query: {}
+    };
+  }
+
+  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
+  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
+  const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
+    endpointType: "read",
+    models,
+    model,
+    fieldTypePlugins
+  });
+  const fieldResolvers = createFieldResolvers({
+    graphQLType: rTypeName,
+    fields: model.fields,
+    isRoot: true
+  });
+  return (0, _objectSpread2.default)({
+    Query: {
+      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+        model
+      }),
+      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+        model
+      })
+    }
+  }, fieldResolvers);
+};
+
+exports.createPreviewResolvers = createPreviewResolvers;

package/graphql/schema/createPreviewResolvers.js.map

@@ -0,0 +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"}

package/graphql/schema/createReadResolvers.d.ts

@@ -0,0 +1,12 @@
+import { CmsModel, CmsFieldTypePlugins, CmsContext } from "../../types";
+interface CreateReadResolversParams {
+    models: CmsModel[];
+    model: CmsModel;
+    context: CmsContext;
+    fieldTypePlugins: CmsFieldTypePlugins;
+}
+export interface CreateReadResolvers {
+    (params: CreateReadResolversParams): any;
+}
+export declare const createReadResolvers: CreateReadResolvers;
+export {};

package/graphql/schema/createReadResolvers.js

@@ -0,0 +1,63 @@
+"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,
+  fieldTypePlugins
+}) => {
+  if (model.fields.length === 0) {
+    return {
+      Query: {}
+    };
+  }
+
+  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
+  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
+  const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
+    endpointType: "read",
+    models,
+    model,
+    fieldTypePlugins
+  });
+  const fieldResolvers = createFieldResolvers({
+    graphQLType: rTypeName,
+    fields: model.fields,
+    isRoot: true
+  });
+  return (0, _objectSpread2.default)({
+    Query: {
+      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+        model
+      }),
+      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+        model
+      })
+    },
+    [rTypeName]: {
+      modelId: () => {
+        return model.modelId;
+      }
+    }
+  }, fieldResolvers);
+};
+
+exports.createReadResolvers = createReadResolvers;

package/graphql/schema/createReadResolvers.js.map

@@ -0,0 +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        [rTypeName]: {\n            modelId: () => {\n                return model.modelId;\n            }\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,CADX;IAKI,CAACQ,SAAD,GAAa;MACTD,OAAO,EAAE,MAAM;QACX,OAAOP,KAAK,CAACO,OAAb;MACH;IAHQ;EALjB,GAUOM,cAVP;AAYH,CAlCM"}

package/graphql/schema/createReadSDL.d.ts

@@ -0,0 +1,12 @@
+import { CmsModel, CmsFieldTypePlugins } from "../../types";
+import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
+interface CreateReadSDLParams {
+    model: CmsModel;
+    fieldTypePlugins: CmsFieldTypePlugins;
+    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];
+}
+interface CreateReadSDL {
+    (params: CreateReadSDLParams): string;
+}
+export declare const createReadSDL: CreateReadSDL;
+export {};

package/{content/plugins → graphql}/schema/createReadSDL.js

@@ -5,32 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createReadSDL = void 0;
 
-var _createTypeName = require("../utils/createTypeName");
+var _createTypeName = require("../../utils/createTypeName");
 
-var _renderListFilterFields = require("../utils/renderListFilterFields");
+var _renderListFilterFields = require("../../utils/renderListFilterFields");
 
-var _renderSortEnum = require("../utils/renderSortEnum");
+var _renderSortEnum = require("../../utils/renderSortEnum");
 
-var _renderFields = require("../utils/renderFields");
+var _renderFields = require("../../utils/renderFields");
 
-var _renderGetFilterFields = require("../utils/renderGetFilterFields");
+var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
 
-var _pluralizedTypeName = require("../utils/pluralizedTypeName");
+var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 
 const createReadSDL = ({
   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)({
     model,
-    type: "read",
+    type,
     fieldTypePlugins
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -38,16 +41,21 @@ const createReadSDL = ({
   });
   const fieldsRender = (0, _renderFields.renderFields)({
     model,
-    type: "read",
+    type,
     fieldTypePlugins
   });
+
+  if (fieldsRender.length === 0) {
+    return "";
+  }
+
+  const hasModelIdField = model.fields.some(f => f.fieldId === "modelId");
   return `
         """${model.description || ""}"""
-        ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
-        
         type ${rTypeName} {
             id: ID!
             entryId: String!
+            ${hasModelIdField ? "" : "modelId: String!"}
             createdOn: DateTime!
             savedOn: DateTime!
             createdBy: CmsCreatedBy!
@@ -55,13 +63,17 @@ const createReadSDL = ({
             ${fieldsRender.map(f => f.fields).join("\n")}
         }
         
+        ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
+        
         ${getFilterFieldsRender && `input ${rTypeName}GetWhereInput {
             ${getFilterFieldsRender}
         }`}
         
         
         ${listFilterFieldsRender && `input ${rTypeName}ListWhereInput {
-            ${listFilterFieldsRender}
+                ${listFilterFieldsRender}
+                AND: [${rTypeName}ListWhereInput!]
+                OR: [${rTypeName}ListWhereInput!]
         }`}
         
         

package/graphql/schema/createReadSDL.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createReadSDL","model","fieldTypePlugins","sorterPlugins","typeName","createTypeName","modelId","rTypeName","createReadTypeName","type","listFilterFieldsRender","renderListFilterFields","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","fieldsRender","renderFields","length","hasModelIdField","fields","some","f","fieldId","description","map","join","typeDefs","filter","Boolean","pluralizedTypeName"],"sources":["createReadSDL.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, ApiEndpoint } from \"~/types\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateReadSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\ninterface CreateReadSDL {\n    (params: CreateReadSDLParams): string;\n}\n\nexport const createReadSDL: CreateReadSDL = ({\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const type: ApiEndpoint = \"read\";\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({\n        model,\n        fieldTypePlugins,\n        sorterPlugins\n    });\n    const getFilterFieldsRender = renderGetFilterFields({\n        model,\n        fieldTypePlugins\n    });\n    const fieldsRender = renderFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    if (fieldsRender.length === 0) {\n        return \"\";\n    }\n\n    const hasModelIdField = model.fields.some(f => f.fieldId === \"modelId\");\n\n    return `\n        \"\"\"${model.description || \"\"}\"\"\"\n        type ${rTypeName} {\n            id: ID!\n            entryId: String!\n            ${hasModelIdField ? \"\" : \"modelId: String!\"}\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            ${fieldsRender.map(f => f.fields).join(\"\\n\")}\n        }\n        \n        ${fieldsRender\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n        \n        ${\n            getFilterFieldsRender &&\n            `input ${rTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n        \n        \n        ${\n            listFilterFieldsRender &&\n            `input ${rTypeName}ListWhereInput {\n                ${listFilterFieldsRender}\n                AND: [${rTypeName}ListWhereInput!]\n                OR: [${rTypeName}ListWhereInput!]\n        }`\n        }\n        \n        \n        ${\n            sortEnumRender &&\n            `enum ${rTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n        \n        type ${rTypeName}Response {\n            data: ${rTypeName}\n            error: CmsError\n        }\n        \n        type ${rTypeName}ListResponse {\n            data: [${rTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n        \n        extend type Query {\n            get${typeName}(where: ${rTypeName}GetWhereInput!): ${rTypeName}Response\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${rTypeName}ListWhereInput\n                sort: [${rTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${rTypeName}ListResponse\n        }\n    `;\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAYO,MAAMA,aAA4B,GAAG,CAAC;EACzCC,KADyC;EAEzCC,gBAFyC;EAGzCC;AAHyC,CAAD,KAI9B;EACV,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeJ,KAAK,CAACK,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,IAAiB,GAAG,MAA1B;EAEA,MAAMC,sBAAsB,GAAG,IAAAC,8CAAA,EAAuB;IAClDV,KADkD;IAElDQ,IAFkD;IAGlDP;EAHkD,CAAvB,CAA/B;EAMA,MAAMU,cAAc,GAAG,IAAAC,8BAAA,EAAe;IAClCZ,KADkC;IAElCC,gBAFkC;IAGlCC;EAHkC,CAAf,CAAvB;EAKA,MAAMW,qBAAqB,GAAG,IAAAC,4CAAA,EAAsB;IAChDd,KADgD;IAEhDC;EAFgD,CAAtB,CAA9B;EAIA,MAAMc,YAAY,GAAG,IAAAC,0BAAA,EAAa;IAC9BhB,KAD8B;IAE9BQ,IAF8B;IAG9BP;EAH8B,CAAb,CAArB;;EAMA,IAAIc,YAAY,CAACE,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO,EAAP;EACH;;EAED,MAAMC,eAAe,GAAGlB,KAAK,CAACmB,MAAN,CAAaC,IAAb,CAAkBC,CAAC,IAAIA,CAAC,CAACC,OAAF,KAAc,SAArC,CAAxB;EAEA,OAAQ;AACZ,aAAatB,KAAK,CAACuB,WAAN,IAAqB,EAAG;AACrC,eAAejB,SAAU;AACzB;AACA;AACA,cAAcY,eAAe,GAAG,EAAH,GAAQ,kBAAmB;AACxD;AACA;AACA;AACA;AACA,cAAcH,YAAY,CAACS,GAAb,CAAiBH,CAAC,IAAIA,CAAC,CAACF,MAAxB,EAAgCM,IAAhC,CAAqC,IAArC,CAA2C;AACzD;AACA;AACA,UAAUV,YAAY,CACTS,GADH,CACOH,CAAC,IAAIA,CAAC,CAACK,QADd,EAEGC,MAFH,CAEUC,OAFV,EAGGH,IAHH,CAGQ,IAHR,CAGc;AACxB;AACA,UACYZ,qBAAqB,IACpB,SAAQP,SAAU;AAC/B,cAAcO,qBAAsB;AACpC,UACS;AACT;AACA;AACA,UACYJ,sBAAsB,IACrB,SAAQH,SAAU;AAC/B,kBAAkBG,sBAAuB;AACzC,wBAAwBH,SAAU;AAClC,uBAAuBA,SAAU;AACjC,UACS;AACT;AACA;AACA,UACYK,cAAc,IACb,QAAOL,SAAU;AAC9B,cAAcK,cAAe;AAC7B,UACS;AACT;AACA,eAAeL,SAAU;AACzB,oBAAoBA,SAAU;AAC9B;AACA;AACA;AACA,eAAeA,SAAU;AACzB,qBAAqBA,SAAU;AAC/B;AACA;AACA;AACA;AACA;AACA,iBAAiBH,QAAS,WAAUG,SAAU,oBAAmBA,SAAU;AAC3E;AACA,kBAAkB,IAAAuB,sCAAA,EAAmB1B,QAAnB,CAA6B;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA,KAhEI;AAiEH,CAtGM"}

package/graphql/schema/resolvers/commonFieldResolvers.d.ts

@@ -0,0 +1,6 @@
+import { CmsEntry } from "../../../types";
+export declare const commonFieldResolvers: () => {
+    id: (entry: CmsEntry) => string | null;
+    createdBy: (entry: CmsEntry) => import("../../../types").CreatedBy;
+    ownedBy: (entry: CmsEntry) => import("../../../types").CreatedBy;
+};

package/graphql/schema/resolvers/commonFieldResolvers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["commonFieldResolvers","id","entry","createdBy","ownedBy"],"sources":["commonFieldResolvers.ts"],"sourcesContent":["import { CmsEntry } from \"~/types\";\n\nexport const commonFieldResolvers = () => ({\n    id: (entry: CmsEntry) => entry.id || null,\n    createdBy: (entry: CmsEntry) => entry.createdBy || null,\n    ownedBy: (entry: CmsEntry) => entry.ownedBy || null\n});\n"],"mappings":";;;;;;;AAEO,MAAMA,oBAAoB,GAAG,OAAO;EACvCC,EAAE,EAAGC,KAAD,IAAqBA,KAAK,CAACD,EAAN,IAAY,IADE;EAEvCE,SAAS,EAAGD,KAAD,IAAqBA,KAAK,CAACC,SAAN,IAAmB,IAFZ;EAGvCC,OAAO,EAAGF,KAAD,IAAqBA,KAAK,CAACE,OAAN,IAAiB;AAHR,CAAP,CAA7B"}

package/graphql/schema/resolvers/manage/resolveCreate.d.ts

@@ -0,0 +1,7 @@
+import { CmsEntryResolverFactory as ResolverFactory, CreateCmsEntryInput } from "../../../../types";
+interface ResolveCreateArgs {
+    data: CreateCmsEntryInput;
+}
+declare type ResolveCreate = ResolverFactory<any, ResolveCreateArgs>;
+export declare const resolveCreate: ResolveCreate;
+export {};

package/{content/plugins → graphql}/schema/resolvers/manage/resolveCreate.js

@@ -9,11 +9,9 @@ var _responses = require("@webiny/handler-graphql/responses");
 
 const resolveCreate = ({
   model
-}) => async (_, args, {
-  cms
-}) => {
+}) => async (_, args, context) => {
   try {
-    const entry = await cms.createEntry(model, args.data);
+    const entry = await context.cms.createEntry(model, args.data);
     return new _responses.Response(entry);
   } catch (e) {
     return new _responses.ErrorResponse(e);

package/graphql/schema/resolvers/manage/resolveCreate.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveCreate","model","_","args","context","entry","cms","createEntry","data","Response","e","ErrorResponse"],"sources":["resolveCreate.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory, CreateCmsEntryInput } from \"~/types\";\n\ninterface ResolveCreateArgs {\n    data: CreateCmsEntryInput;\n}\ntype ResolveCreate = ResolverFactory<any, ResolveCreateArgs>;\n\nexport const resolveCreate: ResolveCreate =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const entry = await context.cms.createEntry(model, args.data);\n\n            return new Response(entry);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"],"mappings":";;;;;;;AAAA;;AAQO,MAAMA,aAA4B,GACrC,CAAC;EAAEC;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;EAC7B,IAAI;IACA,MAAMC,KAAK,GAAG,MAAMD,OAAO,CAACE,GAAR,CAAYC,WAAZ,CAAwBN,KAAxB,EAA+BE,IAAI,CAACK,IAApC,CAApB;IAEA,OAAO,IAAIC,mBAAJ,CAAaJ,KAAb,CAAP;EACH,CAJD,CAIE,OAAOK,CAAP,EAAU;IACR,OAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;EACH;AACJ,CAVE"}

package/graphql/schema/resolvers/manage/resolveCreateFrom.d.ts

@@ -0,0 +1,8 @@
+import { CmsEntryResolverFactory as ResolverFactory, CreateFromCmsEntryInput } from "../../../../types";
+interface ResolveCreateFromArgs {
+    revision: string;
+    data: CreateFromCmsEntryInput;
+}
+declare type ResolveCreateFrom = ResolverFactory<any, ResolveCreateFromArgs>;
+export declare const resolveCreateFrom: ResolveCreateFrom;
+export {};

package/{content/plugins → graphql}/schema/resolvers/manage/resolveCreateFrom.js

@@ -9,11 +9,9 @@ var _responses = require("@webiny/handler-graphql/responses");
 
 const resolveCreateFrom = ({
   model
-}) => async (_, args, {
-  cms
-}) => {
+}) => async (_, args, context) => {
   try {
-    const newRevision = await cms.createEntryRevisionFrom(model, args.revision, args.data || {});
+    const newRevision = await context.cms.createEntryRevisionFrom(model, args.revision, args.data || {});
     return new _responses.Response(newRevision);
   } catch (e) {
     return new _responses.ErrorResponse(e);

package/graphql/schema/resolvers/manage/resolveCreateFrom.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveCreateFrom","model","_","args","context","newRevision","cms","createEntryRevisionFrom","revision","data","Response","e","ErrorResponse"],"sources":["resolveCreateFrom.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory, CreateFromCmsEntryInput } from \"~/types\";\n\ninterface ResolveCreateFromArgs {\n    revision: string;\n    data: CreateFromCmsEntryInput;\n}\ntype ResolveCreateFrom = ResolverFactory<any, ResolveCreateFromArgs>;\n\nexport const resolveCreateFrom: ResolveCreateFrom =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const newRevision = await context.cms.createEntryRevisionFrom(\n                model,\n                args.revision,\n                args.data || {}\n            );\n            return new Response(newRevision);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"],"mappings":";;;;;;;AAAA;;AASO,MAAMA,iBAAoC,GAC7C,CAAC;EAAEC;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;EAC7B,IAAI;IACA,MAAMC,WAAW,GAAG,MAAMD,OAAO,CAACE,GAAR,CAAYC,uBAAZ,CACtBN,KADsB,EAEtBE,IAAI,CAACK,QAFiB,EAGtBL,IAAI,CAACM,IAAL,IAAa,EAHS,CAA1B;IAKA,OAAO,IAAIC,mBAAJ,CAAaL,WAAb,CAAP;EACH,CAPD,CAOE,OAAOM,CAAP,EAAU;IACR,OAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;EACH;AACJ,CAbE"}

package/graphql/schema/resolvers/manage/resolveDelete.d.ts

@@ -0,0 +1,7 @@
+import { CmsEntryResolverFactory as ResolverFactory } from "../../../../types";
+interface ResolveDeleteArgs {
+    revision: string;
+}
+declare type ResolveDelete = ResolverFactory<any, ResolveDeleteArgs>;
+export declare const resolveDelete: ResolveDelete;
+export {};

package/{content/plugins → graphql}/schema/resolvers/manage/resolveDelete.js

@@ -7,18 +7,20 @@ exports.resolveDelete = void 0;
 
 var _responses = require("@webiny/handler-graphql/responses");
 
+var _utils = require("@webiny/utils");
+
 const resolveDelete = ({
   model
-}) => async (_, {
-  revision
-}, {
-  cms
-}) => {
+}) => async (_, args, context) => {
   try {
-    if (revision.includes("#")) {
-      await cms.deleteEntryRevision(model, revision);
+    const {
+      version
+    } = (0, _utils.parseIdentifier)(args.revision);
+
+    if (version) {
+      await context.cms.deleteEntryRevision(model, args.revision);
     } else {
-      await cms.deleteEntry(model, revision);
+      await context.cms.deleteEntry(model, args.revision);
     }
 
     return new _responses.Response(true);

package/graphql/schema/resolvers/manage/resolveDelete.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveDelete","model","_","args","context","version","parseIdentifier","revision","cms","deleteEntryRevision","deleteEntry","Response","e","ErrorResponse"],"sources":["resolveDelete.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory } from \"~/types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\ninterface ResolveDeleteArgs {\n    revision: string;\n}\ntype ResolveDelete = ResolverFactory<any, ResolveDeleteArgs>;\n\nexport const resolveDelete: ResolveDelete =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const { version } = parseIdentifier(args.revision);\n            if (version) {\n                await context.cms.deleteEntryRevision(model, args.revision);\n            } else {\n                await context.cms.deleteEntry(model, args.revision);\n            }\n\n            return new Response(true);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"],"mappings":";;;;;;;AAAA;;AAEA;;AAOO,MAAMA,aAA4B,GACrC,CAAC;EAAEC;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;EAC7B,IAAI;IACA,MAAM;MAAEC;IAAF,IAAc,IAAAC,sBAAA,EAAgBH,IAAI,CAACI,QAArB,CAApB;;IACA,IAAIF,OAAJ,EAAa;MACT,MAAMD,OAAO,CAACI,GAAR,CAAYC,mBAAZ,CAAgCR,KAAhC,EAAuCE,IAAI,CAACI,QAA5C,CAAN;IACH,CAFD,MAEO;MACH,MAAMH,OAAO,CAACI,GAAR,CAAYE,WAAZ,CAAwBT,KAAxB,EAA+BE,IAAI,CAACI,QAApC,CAAN;IACH;;IAED,OAAO,IAAII,mBAAJ,CAAa,IAAb,CAAP;EACH,CATD,CASE,OAAOC,CAAP,EAAU;IACR,OAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;EACH;AACJ,CAfE"}

package/graphql/schema/resolvers/manage/resolveGet.d.ts

@@ -0,0 +1,7 @@
+import { CmsEntryResolverFactory as ResolverFactory } from "../../../../types";
+interface ResolveGetArgs {
+    revision: string;
+}
+declare type ResolveGet = ResolverFactory<any, ResolveGetArgs>;
+export declare const resolveGet: ResolveGet;
+export {};

package/graphql/schema/resolvers/manage/resolveGet.js

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveGet = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _responses = require("@webiny/handler-graphql/responses");
+
+var _utils = require("@webiny/utils");
+
+const possibleTypes = ["published", "latest"];
+
+const getValuesFromArgs = args => {
+  const {
+    status,
+    revision,
+    entryId
+  } = args || {};
+
+  if (!revision && !entryId) {
+    throw new _error.default("You must pass a 'revision' or an 'entryId' argument.", "GRAPHQL_ARGS_ERROR", (0, _objectSpread2.default)({}, args || {}));
+  } else if (revision && entryId) {
+    throw new _error.default("Cannot have both of GraphQL query arguments: revision and entryId. Must have only one.", "GRAPHQL_ARGS_ERROR", (0, _objectSpread2.default)({}, args));
+  }
+
+  if (status && possibleTypes.includes(status) === false) {
+    throw new _error.default(`Status can only be one of the following values: ${possibleTypes.join(" | ")}.`, "GRAPHQL_ARGS_ERROR", (0, _objectSpread2.default)({}, args));
+  }
+  /**
+   * In case we are searching for latest or published but we do not have entryId, we need to set it.
+   * OR if version was not passed we will find latest or published, depending on status sent.
+   */
+
+
+  if (status || !revision) {
+    const {
+      id
+    } = (0, _utils.parseIdentifier)(entryId || revision);
+    return {
+      published: status === "published",
+      entryId: id
+    };
+  }
+
+  return {
+    revision
+  };
+};
+
+const resolveGet = ({
+  model
+}) => async (_, args, context) => {
+  try {
+    const {
+      entryId,
+      published,
+      revision
+    } = getValuesFromArgs(args);
+
+    if (entryId) {
+      const result = published ? await context.cms.getPublishedEntriesByIds(model, [entryId]) : await context.cms.getLatestEntriesByIds(model, [entryId]);
+      return new _responses.Response(result.shift() || null);
+    }
+
+    const entry = await context.cms.getEntryById(model, revision);
+    return new _responses.Response(entry);
+  } catch (e) {
+    return new _responses.ErrorResponse(e);
+  }
+};
+
+exports.resolveGet = resolveGet;

package/graphql/schema/resolvers/manage/resolveGet.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["possibleTypes","getValuesFromArgs","args","status","revision","entryId","WebinyError","includes","join","id","parseIdentifier","published","resolveGet","model","_","context","result","cms","getPublishedEntriesByIds","getLatestEntriesByIds","Response","shift","entry","getEntryById","e","ErrorResponse"],"sources":["resolveGet.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ErrorResponse, Response } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory } from \"~/types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\ninterface ResolveGetArgs {\n    revision: string;\n}\n\ntype ResolveGet = ResolverFactory<any, ResolveGetArgs>;\n\ninterface ValuesFromArgsParams {\n    status?: \"published\" | \"latest\";\n    entryId?: string;\n    revision: string;\n}\ninterface ArgsValues {\n    published?: boolean;\n    entryId?: string;\n    revision?: string;\n}\n\nconst possibleTypes = [\"published\", \"latest\"];\n\nconst getValuesFromArgs = (args?: ValuesFromArgsParams): ArgsValues => {\n    const { status, revision, entryId } = args || {};\n    if (!revision && !entryId) {\n        throw new WebinyError(\n            \"You must pass a 'revision' or an 'entryId' argument.\",\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...(args || {})\n            }\n        );\n    } else if (revision && entryId) {\n        throw new WebinyError(\n            \"Cannot have both of GraphQL query arguments: revision and entryId. Must have only one.\",\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...args\n            }\n        );\n    }\n    if (status && possibleTypes.includes(status) === false) {\n        throw new WebinyError(\n            `Status can only be one of the following values: ${possibleTypes.join(\" | \")}.`,\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...args\n            }\n        );\n    }\n    /**\n     * In case we are searching for latest or published but we do not have entryId, we need to set it.\n     * OR if version was not passed we will find latest or published, depending on status sent.\n     */\n    if (status || !revision) {\n        const { id } = parseIdentifier(entryId || revision);\n        return {\n            published: status === \"published\",\n            entryId: id\n        };\n    }\n    return {\n        revision\n    };\n};\n\nexport const resolveGet: ResolveGet =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const { entryId, published, revision } = getValuesFromArgs(args);\n\n            if (entryId) {\n                const result = published\n                    ? await context.cms.getPublishedEntriesByIds(model, [entryId])\n                    : await context.cms.getLatestEntriesByIds(model, [entryId]);\n                return new Response(result.shift() || null);\n            }\n\n            const entry = await context.cms.getEntryById(model, revision as string);\n\n            return new Response(entry);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAEA;;AAmBA,MAAMA,aAAa,GAAG,CAAC,WAAD,EAAc,QAAd,CAAtB;;AAEA,MAAMC,iBAAiB,GAAIC,IAAD,IAA6C;EACnE,MAAM;IAAEC,MAAF;IAAUC,QAAV;IAAoBC;EAApB,IAAgCH,IAAI,IAAI,EAA9C;;EACA,IAAI,CAACE,QAAD,IAAa,CAACC,OAAlB,EAA2B;IACvB,MAAM,IAAIC,cAAJ,CACF,sDADE,EAEF,oBAFE,kCAIMJ,IAAI,IAAI,EAJd,EAAN;EAOH,CARD,MAQO,IAAIE,QAAQ,IAAIC,OAAhB,EAAyB;IAC5B,MAAM,IAAIC,cAAJ,CACF,wFADE,EAEF,oBAFE,kCAIKJ,IAJL,EAAN;EAOH;;EACD,IAAIC,MAAM,IAAIH,aAAa,CAACO,QAAd,CAAuBJ,MAAvB,MAAmC,KAAjD,EAAwD;IACpD,MAAM,IAAIG,cAAJ,CACD,mDAAkDN,aAAa,CAACQ,IAAd,CAAmB,KAAnB,CAA0B,GAD3E,EAEF,oBAFE,kCAIKN,IAJL,EAAN;EAOH;EACD;AACJ;AACA;AACA;;;EACI,IAAIC,MAAM,IAAI,CAACC,QAAf,EAAyB;IACrB,MAAM;MAAEK;IAAF,IAAS,IAAAC,sBAAA,EAAgBL,OAAO,IAAID,QAA3B,CAAf;IACA,OAAO;MACHO,SAAS,EAAER,MAAM,KAAK,WADnB;MAEHE,OAAO,EAAEI;IAFN,CAAP;EAIH;;EACD,OAAO;IACHL;EADG,CAAP;AAGH,CA1CD;;AA4CO,MAAMQ,UAAsB,GAC/B,CAAC;EAAEC;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUZ,IAAV,EAAqBa,OAArB,KAAiC;EAC7B,IAAI;IACA,MAAM;MAAEV,OAAF;MAAWM,SAAX;MAAsBP;IAAtB,IAAmCH,iBAAiB,CAACC,IAAD,CAA1D;;IAEA,IAAIG,OAAJ,EAAa;MACT,MAAMW,MAAM,GAAGL,SAAS,GAClB,MAAMI,OAAO,CAACE,GAAR,CAAYC,wBAAZ,CAAqCL,KAArC,EAA4C,CAACR,OAAD,CAA5C,CADY,GAElB,MAAMU,OAAO,CAACE,GAAR,CAAYE,qBAAZ,CAAkCN,KAAlC,EAAyC,CAACR,OAAD,CAAzC,CAFZ;MAGA,OAAO,IAAIe,mBAAJ,CAAaJ,MAAM,CAACK,KAAP,MAAkB,IAA/B,CAAP;IACH;;IAED,MAAMC,KAAK,GAAG,MAAMP,OAAO,CAACE,GAAR,CAAYM,YAAZ,CAAyBV,KAAzB,EAAgCT,QAAhC,CAApB;IAEA,OAAO,IAAIgB,mBAAJ,CAAaE,KAAb,CAAP;EACH,CAbD,CAaE,OAAOE,CAAP,EAAU;IACR,OAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;EACH;AACJ,CAnBE"}