@webiny/api-headless-cms 0.0.0-unstable.2af142b57e → 0.0.0-unstable.3bc8100a7f

package/graphql/scalars/RevisionIdScalarPlugin.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRevisionIdScalarPlugin = void 0;
+var _RevisionId = require("./RevisionId");
+const createRevisionIdScalarPlugin = () => {
+  const plugin = {
+    name: "headlessCms.graphql.revisionIdScalar",
+    type: "graphql-scalar",
+    scalar: _RevisionId.RevisionIdScalar
+  };
+  return [plugin];
+};
+exports.createRevisionIdScalarPlugin = createRevisionIdScalarPlugin;
+
+//# sourceMappingURL=RevisionIdScalarPlugin.js.map

package/graphql/scalars/RevisionIdScalarPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_RevisionId","require","createRevisionIdScalarPlugin","plugin","name","type","scalar","RevisionIdScalar","exports"],"sources":["RevisionIdScalarPlugin.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { RevisionIdScalar } from \"~/graphql/scalars/RevisionId\";\n\nexport const createRevisionIdScalarPlugin = (): GraphQLScalarPlugin[] => {\n    const plugin: GraphQLScalarPlugin = {\n        name: \"headlessCms.graphql.revisionIdScalar\",\n        type: \"graphql-scalar\",\n        scalar: RevisionIdScalar\n    };\n    return [plugin];\n};\n"],"mappings":";;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEO,MAAMC,4BAA4B,GAAGA,CAAA,KAA6B;EACrE,MAAMC,MAA2B,GAAG;IAChCC,IAAI,EAAE,sCAAsC;IAC5CC,IAAI,EAAE,gBAAgB;IACtBC,MAAM,EAAEC;EACZ,CAAC;EACD,OAAO,CAACJ,MAAM,CAAC;AACnB,CAAC;AAACK,OAAA,CAAAN,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/graphql/schema/baseContentSchema.d.ts

@@ -1,7 +1,7 @@
-import { CmsContext } from "../../types";
-import { CmsGraphQLSchemaPlugin } from "../../plugins";
+import type { CmsContext } from "../../types";
+import type { ICmsGraphQLSchemaPlugin } from "../../plugins";
 interface Params {
     context: CmsContext;
 }
-export declare const createBaseContentSchema: ({ context }: Params) => CmsGraphQLSchemaPlugin;
+export declare const createBaseContentSchema: ({ context }: Params) => ICmsGraphQLSchemaPlugin;
 export {};

package/graphql/schema/baseContentSchema.js

@@ -1,18 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBaseContentSchema = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _builtInTypes = require("@webiny/handler-graphql/builtInTypes");
 var _plugins = require("../../plugins");
 const createBaseContentSchema = ({
   context
 }) => {
   const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
-  const plugin = new _plugins.CmsGraphQLSchemaPlugin({
+  const plugin = (0, _plugins.createCmsGraphQLSchemaPlugin)({
     typeDefs: /* GraphQL */`
             ${scalars.map(scalar => `scalar ${scalar.name}`).join(" ")}
             scalar JSON
@@ -31,27 +29,16 @@ const createBaseContentSchema = ({
                 _empty: String
             }
 
-            type CmsCreatedBy {
-                id: String
-                displayName: String
-                type: String
-            }
-
-            type CmsOwnedBy {
-                id: String
-                displayName: String
-                type: String
-            }
-
             enum CmsEntryStatusType {
                 latest
                 published
             }
         `,
-    resolvers: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, scalars.reduce((acc, s) => {
-      acc[s.name] = s;
-      return acc;
-    }, {})), {}, {
+    resolvers: {
+      ...scalars.reduce((acc, s) => {
+        acc[s.name] = s;
+        return acc;
+      }, {}),
       JSON: _builtInTypes.JsonScalar,
       Long: _builtInTypes.LongScalar,
       RefInput: _builtInTypes.RefInputScalar,
@@ -64,9 +51,11 @@ const createBaseContentSchema = ({
       Mutation: {
         _empty: () => "_empty"
       }
-    })
+    }
   });
   plugin.name = `headless-cms.graphql.schema.baseContentSchema`;
   return plugin;
 };
-exports.createBaseContentSchema = createBaseContentSchema;
+exports.createBaseContentSchema = createBaseContentSchema;
+
+//# sourceMappingURL=baseContentSchema.js.map

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsCreatedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsOwnedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;AAEA;AAYA;AAKO,MAAMA,uBAAuB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,8DACFX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;MAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;MACf,OAAOD,GAAG;IACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MAClB;IAAC;EAET,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC"}
+{"version":3,"names":["_builtInTypes","require","_plugins","createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","createCmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty","exports"],"sources":["baseContentSchema.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport type { CmsContext } from \"~/types\";\nimport {\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    DateTimeZScalar,\n    JsonScalar,\n    LongScalar,\n    NumberScalar,\n    RefInputScalar,\n    TimeScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport type { GraphQLScalarType } from \"graphql\";\nimport type { ICmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\n\nexport const createBaseContentSchema = ({ context }: Params): ICmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;AAEA,IAAAA,aAAA,GAAAC,OAAA;AAaA,IAAAC,QAAA,GAAAD,OAAA;AAMO,MAAME,uBAAuB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAA8B;EACrF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAAC,qCAA4B,EAAC;IACxCC,QAAQ,EAAE,aAAc;AAChC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAI,UAAUA,MAAM,CAACI,IAAI,EAAE,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;AACtE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACP,GAAGX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;QAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;QACf,OAAOD,GAAG;MACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAEA,CAAA,KAAM;MAClB;IACJ;EACJ,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAG,+CAA+C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC6B,OAAA,CAAArC,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/graphql/schema/baseSchema.d.ts

@@ -1,3 +1,2 @@
-import { CmsContext } from "../../types";
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-export declare const createBaseSchema: () => GraphQLSchemaPlugin<CmsContext>[];
+import { ContextPlugin } from "@webiny/api";
+export declare const createBaseSchema: () => ContextPlugin<import("@webiny/api/types").Context>;

package/graphql/schema/baseSchema.js

@@ -1,14 +1,42 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBaseSchema = void 0;
 var _plugins = require("../../plugins");
 var _handlerGraphql = require("@webiny/handler-graphql");
-const createBaseSchema = () => {
-  const cmsPlugin = new _plugins.CmsGraphQLSchemaPlugin({
+var _api = require("@webiny/api");
+var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
+const createSkipValidatorEnum = plugins => {
+  const validators = plugins.byType("cms-model-field-validator").reduce((collection, validator) => {
+    const name = (0, _camelCase.default)(validator.validator.name);
+    if (collection.includes(name)) {
+      return collection;
+    }
+    collection.push(name);
+    return collection;
+  }, []);
+  if (validators.length === 0) {
+    validators.push("_empty");
+  }
+  return /* GraphQL */`
+        enum SkipValidatorEnum {
+           ${validators.join("\n")}
+        }
+    `;
+};
+const createSchema = plugins => {
+  const skipValidatorEnum = createSkipValidatorEnum(plugins);
+  const cmsPlugin = (0, _plugins.createCmsGraphQLSchemaPlugin)({
     typeDefs: /* GraphQL */`
+            type CmsIdentity {
+                id: String
+                displayName: String
+                type: String
+            }
+
             type CmsError {
                 code: String
                 message: String
@@ -27,15 +55,80 @@ const createBaseSchema = () => {
                 totalCount: Int
             }
 
+            input CmsDeleteEntryOptions {
+                # force delete an entry that might have some records left behind in the database
+                # see CmsDeleteEntryOptions in types.ts
+                force: Boolean
+                # permanently delete an entry without moving it to the bin
+                permanently: Boolean
+            }
+
             type CmsDeleteResponse {
                 data: Boolean
                 error: CmsError
             }
 
+            type CmsDeleteMultipleDataResponse {
+                id: ID!
+            }
+
+            type CmsDeleteMultipleResponse {
+                data: [CmsDeleteMultipleDataResponse!]
+                error: CmsError
+            }
+
             type CmsBooleanResponse {
                 data: Boolean
                 error: CmsError
             }
+
+            # Advanced Content Organization
+            type WbyAcoLocation {
+                folderId: ID
+            }
+
+            input WbyAcoLocationInput {
+                folderId: ID!
+            }
+
+            input WbyAcoLocationWhereInput {
+                folderId: ID
+                folderId_in: [ID!]
+                folderId_not: ID
+                folderId_not_in: [ID!]
+            }
+
+            ${skipValidatorEnum}
+
+            input CreateCmsEntryOptionsInput {
+                skipValidators: [SkipValidatorEnum!]
+            }
+
+            input CreateRevisionCmsEntryOptionsInput {
+                skipValidators: [SkipValidatorEnum!]
+            }
+
+            input UpdateCmsEntryOptionsInput {
+                skipValidators: [SkipValidatorEnum!]
+            }
+
+            input CmsIdentityInput {
+                id: String!
+                displayName: String!
+                type: String!
+            }
+
+            type CmsEntryValidationResponseData {
+                error: String!
+                id: String!
+                fieldId: String!
+                parents: [String!]!
+            }
+
+            type CmsEntryValidationResponse {
+                data: [CmsEntryValidationResponseData!]
+                error: CmsError
+            }
         `,
     resolvers: {}
   });
@@ -50,4 +143,11 @@ const createBaseSchema = () => {
    */
   return [cmsPlugin, corePlugin];
 };
-exports.createBaseSchema = createBaseSchema;
+const createBaseSchema = () => {
+  return new _api.ContextPlugin(async context => {
+    context.plugins.register(...createSchema(context.plugins));
+  });
+};
+exports.createBaseSchema = createBaseSchema;
+
+//# sourceMappingURL=baseSchema.js.map

package/graphql/schema/baseSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBaseSchema","cmsPlugin","CmsGraphQLSchemaPlugin","typeDefs","resolvers","name","corePlugin","GraphQLSchemaPlugin","schema"],"sources":["baseSchema.ts"],"sourcesContent":["import { CmsContext } from \"~/types\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\n\nexport const createBaseSchema = (): GraphQLSchemaPlugin<CmsContext>[] => {\n    const cmsPlugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n"],"mappings":";;;;;;AACA;AACA;AAEO,MAAMA,gBAAgB,GAAG,MAAyC;EACrE,MAAMC,SAAS,GAAG,IAAIC,+BAAsB,CAAC;IACzCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE,CAAC;EAChB,CAAC,CAAC;EACFH,SAAS,CAACI,IAAI,GAAG,kCAAkC;EACnD,MAAMC,UAAU,GAAG,IAAIC,mCAAmB,CAAa;IACnDJ,QAAQ,EAAEF,SAAS,CAACO,MAAM,CAACL,QAAQ;IACnCC,SAAS,EAAEH,SAAS,CAACO,MAAM,CAACJ;EAChC,CAAC,CAAC;EACFE,UAAU,CAACD,IAAI,GAAG,uCAAuC;EACzD;AACJ;AACA;EACI,OAAO,CAACJ,SAAS,EAAEK,UAAU,CAAC;AAClC,CAAC;AAAC"}
+{"version":3,"names":["_plugins","require","_handlerGraphql","_api","_camelCase","_interopRequireDefault","createSkipValidatorEnum","plugins","validators","byType","reduce","collection","validator","name","camelCase","includes","push","length","join","createSchema","skipValidatorEnum","cmsPlugin","createCmsGraphQLSchemaPlugin","typeDefs","resolvers","corePlugin","GraphQLSchemaPlugin","schema","createBaseSchema","ContextPlugin","context","register","exports"],"sources":["baseSchema.ts"],"sourcesContent":["import type { CmsContext, CmsModelFieldValidatorPlugin } from \"~/types\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport type { IGraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport camelCase from \"lodash/camelCase\";\n\nconst createSkipValidatorEnum = (plugins: PluginsContainer) => {\n    const validators = plugins\n        .byType<CmsModelFieldValidatorPlugin>(\"cms-model-field-validator\")\n        .reduce<string[]>((collection, validator) => {\n            const name = camelCase(validator.validator.name);\n            if (collection.includes(name)) {\n                return collection;\n            }\n            collection.push(name);\n            return collection;\n        }, []);\n\n    if (validators.length === 0) {\n        validators.push(\"_empty\");\n    }\n    return /* GraphQL */ `\n        enum SkipValidatorEnum {\n           ${validators.join(\"\\n\")}\n        }\n    `;\n};\n\nconst createSchema = (plugins: PluginsContainer): IGraphQLSchemaPlugin<CmsContext>[] => {\n    const skipValidatorEnum = createSkipValidatorEnum(plugins);\n\n    const cmsPlugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            input CmsDeleteEntryOptions {\n                # force delete an entry that might have some records left behind in the database\n                # see CmsDeleteEntryOptions in types.ts\n                force: Boolean\n                # permanently delete an entry without moving it to the bin\n                permanently: Boolean\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsDeleteMultipleDataResponse {\n                id: ID!\n            }\n\n            type CmsDeleteMultipleResponse {\n                data: [CmsDeleteMultipleDataResponse!]\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            # Advanced Content Organization\n            type WbyAcoLocation {\n                folderId: ID\n            }\n\n            input WbyAcoLocationInput {\n                folderId: ID!\n            }\n\n            input WbyAcoLocationWhereInput {\n                folderId: ID\n                folderId_in: [ID!]\n                folderId_not: ID\n                folderId_not_in: [ID!]\n            }\n\n            ${skipValidatorEnum}\n\n            input CreateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CreateRevisionCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input UpdateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CmsIdentityInput {\n                id: String!\n                displayName: String!\n                type: String!\n            }\n\n            type CmsEntryValidationResponseData {\n                error: String!\n                id: String!\n                fieldId: String!\n                parents: [String!]!\n            }\n\n            type CmsEntryValidationResponse {\n                data: [CmsEntryValidationResponseData!]\n                error: CmsError\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n\nexport const createBaseSchema = () => {\n    return new ContextPlugin(async context => {\n        context.plugins.register(...createSchema(context.plugins));\n    });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAEA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAEA,MAAMK,uBAAuB,GAAIC,OAAyB,IAAK;EAC3D,MAAMC,UAAU,GAAGD,OAAO,CACrBE,MAAM,CAA+B,2BAA2B,CAAC,CACjEC,MAAM,CAAW,CAACC,UAAU,EAAEC,SAAS,KAAK;IACzC,MAAMC,IAAI,GAAG,IAAAC,kBAAS,EAACF,SAAS,CAACA,SAAS,CAACC,IAAI,CAAC;IAChD,IAAIF,UAAU,CAACI,QAAQ,CAACF,IAAI,CAAC,EAAE;MAC3B,OAAOF,UAAU;IACrB;IACAA,UAAU,CAACK,IAAI,CAACH,IAAI,CAAC;IACrB,OAAOF,UAAU;EACrB,CAAC,EAAE,EAAE,CAAC;EAEV,IAAIH,UAAU,CAACS,MAAM,KAAK,CAAC,EAAE;IACzBT,UAAU,CAACQ,IAAI,CAAC,QAAQ,CAAC;EAC7B;EACA,OAAO,aAAc;AACzB;AACA,aAAaR,UAAU,CAACU,IAAI,CAAC,IAAI,CAAC;AAClC;AACA,KAAK;AACL,CAAC;AAED,MAAMC,YAAY,GAAIZ,OAAyB,IAAyC;EACpF,MAAMa,iBAAiB,GAAGd,uBAAuB,CAACC,OAAO,CAAC;EAE1D,MAAMc,SAAS,GAAG,IAAAC,qCAA4B,EAAC;IAC3CC,QAAQ,EAAE,aAAc;AAChC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcH,iBAAiB;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDI,SAAS,EAAE,CAAC;EAChB,CAAC,CAAC;EACFH,SAAS,CAACR,IAAI,GAAG,kCAAkC;EACnD,MAAMY,UAAU,GAAG,IAAIC,mCAAmB,CAAa;IACnDH,QAAQ,EAAEF,SAAS,CAACM,MAAM,CAACJ,QAAQ;IACnCC,SAAS,EAAEH,SAAS,CAACM,MAAM,CAACH;EAChC,CAAC,CAAC;EACFC,UAAU,CAACZ,IAAI,GAAG,uCAAuC;EACzD;AACJ;AACA;EACI,OAAO,CAACQ,SAAS,EAAEI,UAAU,CAAC;AAClC,CAAC;AAEM,MAAMG,gBAAgB,GAAGA,CAAA,KAAM;EAClC,OAAO,IAAIC,kBAAa,CAAC,MAAMC,OAAO,IAAI;IACtCA,OAAO,CAACvB,OAAO,CAACwB,QAAQ,CAAC,GAAGZ,YAAY,CAACW,OAAO,CAACvB,OAAO,CAAC,CAAC;EAC9D,CAAC,CAAC;AACN,CAAC;AAACyB,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/graphql/schema/contentEntries.d.ts

@@ -1,7 +1,7 @@
-import { CmsContext } from "../../types";
-import { CmsGraphQLSchemaPlugin } from "../../plugins";
+import type { CmsContext } from "../../types";
+import type { ICmsGraphQLSchemaPlugin } from "../../plugins";
 interface Params {
     context: CmsContext;
 }
-export declare const createContentEntriesSchema: ({ context }: Params) => CmsGraphQLSchemaPlugin<CmsContext>;
+export declare const createContentEntriesSchema: ({ context }: Params) => ICmsGraphQLSchemaPlugin<CmsContext>;
 export {};

package/graphql/schema/contentEntries.js

@@ -5,11 +5,68 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createContentEntriesSchema = void 0;
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _apiSecurity = require("@webiny/api-security");
 var _getEntryTitle = require("../../utils/getEntryTitle");
 var _plugins = require("../../plugins");
-var _error = _interopRequireDefault(require("@webiny/error"));
+var _getEntryDescription = require("../../utils/getEntryDescription");
+var _getEntryImage = require("../../utils/getEntryImage");
+var _entryStorage = require("../../utils/entryStorage");
+var _constants = require("../../constants");
+const createDate = date => {
+  if (!date) {
+    return null;
+  }
+  try {
+    return new Date(date);
+  } catch {
+    return new Date();
+  }
+};
+const createCmsEntryRecord = (model, entry) => {
+  return {
+    id: entry.id,
+    entryId: entry.entryId,
+    model: {
+      modelId: model.modelId,
+      name: model.name
+    },
+    status: entry.status,
+    title: (0, _getEntryTitle.getEntryTitle)(model, entry),
+    description: (0, _getEntryDescription.getEntryDescription)(model, entry),
+    image: (0, _getEntryImage.getEntryImage)(model, entry),
+    /**
+     * Entry-level meta fields. 👇
+     */
+    createdOn: createDate(entry.createdOn),
+    modifiedOn: createDate(entry.modifiedOn),
+    savedOn: createDate(entry.savedOn),
+    createdBy: entry.createdBy,
+    savedBy: entry.savedBy,
+    modifiedBy: entry.modifiedBy,
+    firstPublishedOn: createDate(entry.firstPublishedOn),
+    lastPublishedOn: createDate(entry.lastPublishedOn),
+    firstPublishedBy: entry.firstPublishedBy,
+    lastPublishedBy: entry.lastPublishedBy,
+    /**
+     * Revision-level meta fields. 👇
+     */
+    revisionCreatedOn: createDate(entry.revisionCreatedOn),
+    revisionSavedOn: createDate(entry.revisionSavedOn),
+    revisionModifiedOn: createDate(entry.revisionModifiedOn),
+    revisionCreatedBy: entry.revisionCreatedBy,
+    revisionModifiedBy: entry.revisionModifiedBy,
+    revisionSavedBy: entry.revisionSavedBy,
+    revisionFirstPublishedOn: createDate(entry.revisionFirstPublishedOn),
+    revisionLastPublishedOn: createDate(entry.revisionLastPublishedOn),
+    revisionFirstPublishedBy: entry.revisionFirstPublishedBy,
+    revisionLastPublishedBy: entry.revisionLastPublishedBy,
+    wbyAco_location: {
+      folderId: entry.location?.folderId || null
+    }
+  };
+};
 const getFetchMethod = (type, context) => {
   if (!getContentEntriesMethods[type]) {
     throw new _error.default(`Unknown getContentEntries method "${type}". Could not fetch content entries.`, "UNKNOWN_METHOD_ERROR", {
@@ -25,15 +82,16 @@ const getFetchMethod = (type, context) => {
   }
   return context.cms[methodName];
 };
+
 /**
  * Function to get the list of content entries depending on latest, published or exact GraphQL queries.
  */
-var GetContentEntryMethods;
-(function (GetContentEntryMethods) {
+var GetContentEntryMethods = /*#__PURE__*/function (GetContentEntryMethods) {
   GetContentEntryMethods["getLatestEntriesByIds"] = "getLatestEntriesByIds";
   GetContentEntryMethods["getPublishedEntriesByIds"] = "getPublishedEntriesByIds";
   GetContentEntryMethods["getEntriesByIds"] = "getEntriesByIds";
-})(GetContentEntryMethods || (GetContentEntryMethods = {}));
+  return GetContentEntryMethods;
+}(GetContentEntryMethods || {});
 const getContentEntriesMethods = {
   latest: "getLatestEntriesByIds",
   published: "getPublishedEntriesByIds",
@@ -72,16 +130,7 @@ const getContentEntries = async params => {
     const entries = results.reduce((collection, items) => {
       return collection.concat(items.map(item => {
         const model = modelsMap[item.modelId];
-        return {
-          id: item.id,
-          entryId: item.entryId,
-          model: {
-            modelId: model.modelId,
-            name: model.name
-          },
-          status: item.status,
-          title: (0, _getEntryTitle.getEntryTitle)(model, item)
-        };
+        return createCmsEntryRecord(model, item);
       }));
     }, []).filter(Boolean);
     return new _handlerGraphql.Response(entries);
@@ -125,52 +174,86 @@ const getContentEntry = async params => {
   if (!entry) {
     return new _handlerGraphql.Response(null);
   }
-  return new _handlerGraphql.Response({
-    id: entry.id,
-    entryId: entry.entryId,
-    model: {
-      modelId: model.modelId,
-      name: model.name
-    },
-    status: entry.status,
-    title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-  });
+  return new _handlerGraphql.Response(createCmsEntryRecord(model, entry));
+};
+/**
+ * As we support description field, we need to transform the value from storage.
+ */
+const createResolveDescription = () => {
+  return async (parent, _, context) => {
+    const models = await context.cms.listModels();
+    const model = models.find(({
+      modelId
+    }) => {
+      return parent.model.modelId === modelId;
+    });
+    if (!model) {
+      return null;
+    }
+    const field = model.fields.find(f => f.fieldId === model.descriptionFieldId);
+    if (!field) {
+      return null;
+    }
+    const value = parent.description || parent[field.fieldId];
+    if (!value) {
+      return null;
+    }
+    return (0, _entryStorage.entryFieldFromStorageTransform)({
+      context,
+      model,
+      field,
+      value
+    });
+  };
 };
 const createContentEntriesSchema = ({
   context
 }) => {
   if (!context.cms.MANAGE) {
-    const plugin = new _plugins.CmsGraphQLSchemaPlugin({
+    const plugin = (0, _plugins.createCmsGraphQLSchemaPlugin)({
       typeDefs: "",
       resolvers: {}
     });
     plugin.name = `headless-cms.graphql.schema.${context.cms.type}.empty`;
     return plugin;
   }
-  const plugin = new _plugins.CmsGraphQLSchemaPlugin({
-    typeDefs: /* GraphQL */`
+  const onByMetaFields = _constants.ENTRY_META_FIELDS.map(field => {
+    const fieldType = (0, _constants.isDateTimeEntryMetaField)(field) ? "DateTime" : "CmsIdentity";
+    return `${field}: ${fieldType}`;
+  }).join("\n");
+  const plugin = (0, _plugins.createCmsGraphQLSchemaPlugin)({
+    // Had to remove /* GraphQL */ because prettier would not format the code correctly.
+    typeDefs: `
             type CmsModelMeta {
-                modelId: String
-                name: String
+                modelId: String!
+                name: String!
             }
 
             type CmsPublishedContentEntry {
                 id: ID!
                 entryId: String!
                 title: String
+                description: String
+                image: String
             }
 
             type CmsContentEntry {
                 id: ID!
                 entryId: String!
-                model: CmsModelMeta
-                status: String
-                title: String
+                model: CmsModelMeta!
+                status: String!
                 published: CmsPublishedContentEntry
+                title: String!
+                description: String
+                image: String
+                
+                ${onByMetaFields}
+            
+                wbyAco_location: WbyAcoLocation
             }
 
             type CmsContentEntriesResponse {
-                data: [CmsContentEntry]
+                data: [CmsContentEntry!]
                 error: CmsError
             }
 
@@ -191,20 +274,20 @@ const createContentEntriesSchema = ({
                     query: String
                     fields: [String!]
                     limit: Int
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
 
                 # Get content entry meta data
-                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
-                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
-                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
+                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
                 # Get content entries meta data
-                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
-                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
+                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
+                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
                 getPublishedContentEntries(
                     entries: [CmsModelEntryInput!]!
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
             }
         `,
     resolvers: {
@@ -224,15 +307,15 @@ const createContentEntriesSchema = ({
             if (!entry) {
               return null;
             }
-            return {
-              id: entry.id,
-              entryId: entry.entryId,
-              title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-            };
+            return createCmsEntryRecord(model, entry);
           } catch (ex) {
             return null;
           }
-        }
+        },
+        description: createResolveDescription()
+      },
+      CmsPublishedContentEntry: {
+        description: createResolveDescription()
       },
       Query: {
         async searchContentEntries(_, args, context) {
@@ -244,7 +327,7 @@ const createContentEntriesSchema = ({
           } = args;
           const models = await context.cms.listModels();
           const getters = models.filter(model => modelIds.includes(model.modelId)).map(async model => {
-            const modelManager = await context.cms.getModelManager(model.modelId);
+            const modelManager = await context.cms.getEntryManager(model.modelId);
             const where = {};
             const [items] = await modelManager.listLatest({
               limit,
@@ -253,23 +336,12 @@ const createContentEntriesSchema = ({
               fields: fields || []
             });
             return items.map(entry => {
-              return {
-                id: entry.id,
-                entryId: entry.entryId,
-                model: {
-                  modelId: model.modelId,
-                  name: model.name
-                },
-                status: entry.status,
-                title: (0, _getEntryTitle.getEntryTitle)(model, entry),
-                // We need `savedOn` to sort entries from latest to oldest
-                savedOn: entry.savedOn
-              };
+              return createCmsEntryRecord(model, entry);
             });
           });
           try {
             const entries = await Promise.all(getters).then(results => results.reduce((result, item) => result.concat(item), []));
-            return new _handlerGraphql.Response(entries.sort((a, b) => Date.parse(b.savedOn) - Date.parse(a.savedOn)).slice(0, limit));
+            return new _handlerGraphql.Response(entries.sort((a, b) => b.savedOn.getTime() - a.savedOn.getTime()).slice(0, limit));
           } catch (ex) {
             return new _handlerGraphql.ErrorResponse(ex);
           }
@@ -322,4 +394,6 @@ const createContentEntriesSchema = ({
   plugin.name = `headless-cms.graphql.schema.${context.cms.type}.content-entries`;
   return plugin;
 };
-exports.createContentEntriesSchema = createContentEntriesSchema;
+exports.createContentEntriesSchema = createContentEntriesSchema;
+
+//# sourceMappingURL=contentEntries.js.map