@webiny/api-headless-cms 0.0.0-unstable.99666aeb00 → 0.0.0-unstable.9bd236cf5e

package/graphql/graphQLHandlerFactory.js

@@ -32,4 +32,6 @@ const graphQLHandlerFactory = ({
     type: "wcp-telemetry-tracker"
   }];
 };
-exports.graphQLHandlerFactory = graphQLHandlerFactory;
+exports.graphQLHandlerFactory = graphQLHandlerFactory;
+
+//# sourceMappingURL=graphQLHandlerFactory.js.map

package/graphql/graphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["cmsRoutes","RoutePlugin","onPost","onOptions","context","request","reply","handleRequest","_","status","send","hijack","name","graphQLHandlerFactory","debug","debugPlugins","type"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport { CmsContext } from \"~/types\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport { handleRequest } from \"./handleRequest\";\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        return handleRequest({ context, request, reply });\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.status(204).send({}).hijack();\n    });\n});\n\ncmsRoutes.name = \"headless-cms.graphql.route.default\";\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":";;;;;;;AAAA;AAGA;AACA;AAMA,MAAMA,SAAS,GAAG,IAAIC,oBAAW,CAAa,CAAC;EAAEC,MAAM;EAAEC,SAAS;EAAEC;AAAQ,CAAC,KAAK;EAC9EF,MAAM,CAAC,2CAA2C,EAAE,OAAOG,OAAO,EAAEC,KAAK,KAAK;IAC1E,OAAO,IAAAC,4BAAa,EAAC;MAAEH,OAAO;MAAEC,OAAO;MAAEC;IAAM,CAAC,CAAC;EACrD,CAAC,CAAC;EAEFH,SAAS,CAAC,2CAA2C,EAAE,OAAOK,CAAC,EAAEF,KAAK,KAAK;IACvE,OAAOA,KAAK,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,CAAC,CAAC,CAAC,CAACC,MAAM,EAAE;EAC9C,CAAC,CAAC;AACN,CAAC,CAAC;AAEFX,SAAS,CAACY,IAAI,GAAG,oCAAoC;AAE9C,MAAMC,qBAAqB,GAAG,CAAC;EAAEC;AAAmC,CAAC,KAAuB;EAC/F,OAAO,CACH,IAAIA,KAAK,GAAG,IAAAC,qBAAY,GAAE,GAAG,EAAE,CAAC,EAChCf,SAAS,EACT;IACIgB,IAAI,EAAE;EACV,CAAC,CACJ;AACL,CAAC;AAAC"}
+{"version":3,"names":["_debugPlugins","_interopRequireDefault","require","_handler","_handleRequest","cmsRoutes","RoutePlugin","onPost","onOptions","context","request","reply","handleRequest","_","status","send","hijack","name","graphQLHandlerFactory","debug","debugPlugins","type","exports"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport type { CmsContext } from \"~/types\";\nimport type { Plugin } from \"@webiny/plugins/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport { handleRequest } from \"./handleRequest\";\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        return handleRequest({ context, request, reply });\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.status(204).send({}).hijack();\n    });\n});\n\ncmsRoutes.name = \"headless-cms.graphql.route.default\";\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): Plugin[] => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,aAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAMA,MAAMG,SAAS,GAAG,IAAIC,oBAAW,CAAa,CAAC;EAAEC,MAAM;EAAEC,SAAS;EAAEC;AAAQ,CAAC,KAAK;EAC9EF,MAAM,CAAC,2CAA2C,EAAE,OAAOG,OAAO,EAAEC,KAAK,KAAK;IAC1E,OAAO,IAAAC,4BAAa,EAAC;MAAEH,OAAO;MAAEC,OAAO;MAAEC;IAAM,CAAC,CAAC;EACrD,CAAC,CAAC;EAEFH,SAAS,CAAC,2CAA2C,EAAE,OAAOK,CAAC,EAAEF,KAAK,KAAK;IACvE,OAAOA,KAAK,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,CAAC,CAAC,CAAC,CAACC,MAAM,CAAC,CAAC;EAC9C,CAAC,CAAC;AACN,CAAC,CAAC;AAEFX,SAAS,CAACY,IAAI,GAAG,oCAAoC;AAE9C,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAmC,CAAC,KAAe;EACvF,OAAO,CACH,IAAIA,KAAK,GAAG,IAAAC,qBAAY,EAAC,CAAC,GAAG,EAAE,CAAC,EAChCf,SAAS,EACT;IACIgB,IAAI,EAAE;EACV,CAAC,CACJ;AACL,CAAC;AAACC,OAAA,CAAAJ,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/graphql/handleRequest.d.ts

@@ -1,5 +1,5 @@
-import { CmsContext } from "../types";
-import { Reply, Request } from "@webiny/handler/types";
+import type { CmsContext } from "../types";
+import type { Reply, Request } from "@webiny/handler/types";
 export interface HandleRequestParams {
     context: CmsContext;
     request: Request;

package/graphql/handleRequest.js

@@ -34,15 +34,11 @@ const handleRequest = async params => {
   const getLocale = () => {
     return context.cms.getLocale();
   };
-  const getLastModifiedTime = async () => {
-    return context.cms.getModelLastChange();
-  };
   const schema = await context.benchmark.measure("headlessCms.graphql.getSchema", async () => {
     try {
       return await (0, _getSchema.getSchema)({
         context,
         getTenant,
-        getLastModifiedTime,
         getLocale,
         type: context.cms.type
       });
@@ -76,6 +72,15 @@ const handleRequest = async params => {
       throw ex;
     }
   });
-  return reply.code(200).send(result);
+  /**
+   * IMPORTANT! Do not send anything if reply was already sent.
+   */
+  if (reply.sent) {
+    console.warn("Reply already sent, cannot send the result (api-headless-cms).");
+    return reply;
+  }
+  return reply.send(result);
 };
-exports.handleRequest = handleRequest;
+exports.handleRequest = handleRequest;
+
+//# sourceMappingURL=handleRequest.js.map

package/graphql/handleRequest.js.map

@@ -1 +1 @@
-{"version":3,"names":["handleRequest","params","context","request","reply","checkEndpointAccess","ex","code","send","data","error","message","stack","getTenant","tenancy","getCurrentTenant","getLocale","cms","getLastModifiedTime","getModelLastChange","schema","benchmark","measure","getSchema","type","console","formatErrorPayload","body","createRequestBody","result","processRequestBody"],"sources":["handleRequest.ts"],"sourcesContent":["import { ApiEndpoint, CmsContext } from \"~/types\";\nimport { checkEndpointAccess } from \"./checkEndpointAccess\";\nimport { createRequestBody } from \"./createRequestBody\";\nimport { formatErrorPayload } from \"./formatErrorPayload\";\nimport { getSchema } from \"./getSchema\";\nimport { Reply, Request } from \"@webiny/handler/types\";\nimport { processRequestBody } from \"@webiny/handler-graphql\";\nimport { ExecutionResult } from \"graphql\";\n\nexport interface HandleRequestParams {\n    context: CmsContext;\n    request: Request;\n    reply: Reply;\n}\n\nexport interface HandleRequest {\n    (params: HandleRequestParams): Promise<Reply>;\n}\n\nexport const handleRequest: HandleRequest = async params => {\n    const { context, request, reply } = params;\n    try {\n        await checkEndpointAccess(context);\n    } catch (ex) {\n        return reply.code(401).send({\n            data: null,\n            error: {\n                message: ex.message || \"Not authorized!\",\n                code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                data: ex.data || null,\n                stack: null\n            }\n        });\n    }\n\n    const getTenant = () => {\n        return context.tenancy.getCurrentTenant();\n    };\n\n    const getLocale = () => {\n        return context.cms.getLocale();\n    };\n\n    const getLastModifiedTime = async () => {\n        return context.cms.getModelLastChange();\n    };\n\n    const schema = await context.benchmark.measure(\"headlessCms.graphql.getSchema\", async () => {\n        try {\n            return await getSchema({\n                context,\n                getTenant,\n                getLastModifiedTime,\n                getLocale,\n                type: context.cms.type as ApiEndpoint\n            });\n        } catch (ex) {\n            console.error(`Error while generating the schema.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    const body = await context.benchmark.measure(\n        \"headlessCms.graphql.createRequestBody\",\n        async () => {\n            try {\n                return createRequestBody(request.body);\n            } catch (ex) {\n                console.error(`Error while creating the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        }\n    );\n\n    /**\n     * We need to store the processRequestBody result in a variable and output it after the measurement.\n     * Otherwise, the measurement will not be shown in the output.\n     */\n    let result: ExecutionResult[] | ExecutionResult | null = null;\n\n    await context.benchmark.measure(\"headlessCms.graphql.processRequestBody\", async () => {\n        try {\n            result = await processRequestBody(body, schema, context);\n        } catch (ex) {\n            console.error(`Error while processing the body request.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    return reply.code(200).send(result);\n};\n"],"mappings":";;;;;;AACA;AACA;AACA;AACA;AAEA;AAaO,MAAMA,aAA4B,GAAG,MAAMC,MAAM,IAAI;EACxD,MAAM;IAAEC,OAAO;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAC1C,IAAI;IACA,MAAM,IAAAI,wCAAmB,EAACH,OAAO,CAAC;EACtC,CAAC,CAAC,OAAOI,EAAE,EAAE;IACT,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC;MACxBC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAEL,EAAE,CAACK,OAAO,IAAI,iBAAiB;QACxCJ,IAAI,EAAED,EAAE,CAACC,IAAI,IAAI,yBAAyB;QAC1CE,IAAI,EAAEH,EAAE,CAACG,IAAI,IAAI,IAAI;QACrBG,KAAK,EAAE;MACX;IACJ,CAAC,CAAC;EACN;EAEA,MAAMC,SAAS,GAAG,MAAM;IACpB,OAAOX,OAAO,CAACY,OAAO,CAACC,gBAAgB,EAAE;EAC7C,CAAC;EAED,MAAMC,SAAS,GAAG,MAAM;IACpB,OAAOd,OAAO,CAACe,GAAG,CAACD,SAAS,EAAE;EAClC,CAAC;EAED,MAAME,mBAAmB,GAAG,YAAY;IACpC,OAAOhB,OAAO,CAACe,GAAG,CAACE,kBAAkB,EAAE;EAC3C,CAAC;EAED,MAAMC,MAAM,GAAG,MAAMlB,OAAO,CAACmB,SAAS,CAACC,OAAO,CAAC,+BAA+B,EAAE,YAAY;IACxF,IAAI;MACA,OAAO,MAAM,IAAAC,oBAAS,EAAC;QACnBrB,OAAO;QACPW,SAAS;QACTK,mBAAmB;QACnBF,SAAS;QACTQ,IAAI,EAAEtB,OAAO,CAACe,GAAG,CAACO;MACtB,CAAC,CAAC;IACN,CAAC,CAAC,OAAOlB,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,oCAAmC,CAAC;MACnDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,MAAMqB,IAAI,GAAG,MAAMzB,OAAO,CAACmB,SAAS,CAACC,OAAO,CACxC,uCAAuC,EACvC,YAAY;IACR,IAAI;MACA,OAAO,IAAAM,oCAAiB,EAACzB,OAAO,CAACwB,IAAI,CAAC;IAC1C,CAAC,CAAC,OAAOrB,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,wCAAuC,CAAC;MACvDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CACJ;;EAED;AACJ;AACA;AACA;EACI,IAAIuB,MAAkD,GAAG,IAAI;EAE7D,MAAM3B,OAAO,CAACmB,SAAS,CAACC,OAAO,CAAC,wCAAwC,EAAE,YAAY;IAClF,IAAI;MACAO,MAAM,GAAG,MAAM,IAAAC,kCAAkB,EAACH,IAAI,EAAEP,MAAM,EAAElB,OAAO,CAAC;IAC5D,CAAC,CAAC,OAAOI,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,0CAAyC,CAAC;MACzDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAACqB,MAAM,CAAC;AACvC,CAAC;AAAC"}
+{"version":3,"names":["_checkEndpointAccess","require","_createRequestBody","_formatErrorPayload","_getSchema","_handlerGraphql","handleRequest","params","context","request","reply","checkEndpointAccess","ex","code","send","data","error","message","stack","getTenant","tenancy","getCurrentTenant","getLocale","cms","schema","benchmark","measure","getSchema","type","console","formatErrorPayload","body","createRequestBody","result","processRequestBody","sent","warn","exports"],"sources":["handleRequest.ts"],"sourcesContent":["import type { ApiEndpoint, CmsContext } from \"~/types\";\nimport { checkEndpointAccess } from \"./checkEndpointAccess\";\nimport { createRequestBody } from \"./createRequestBody\";\nimport { formatErrorPayload } from \"./formatErrorPayload\";\nimport { getSchema } from \"./getSchema\";\nimport type { Reply, Request } from \"@webiny/handler/types\";\nimport { processRequestBody } from \"@webiny/handler-graphql\";\nimport type { ExecutionResult } from \"graphql\";\n\nexport interface HandleRequestParams {\n    context: CmsContext;\n    request: Request;\n    reply: Reply;\n}\n\nexport interface HandleRequest {\n    (params: HandleRequestParams): Promise<Reply>;\n}\n\nexport const handleRequest: HandleRequest = async params => {\n    const { context, request, reply } = params;\n    try {\n        await checkEndpointAccess(context);\n    } catch (ex) {\n        return reply.code(401).send({\n            data: null,\n            error: {\n                message: ex.message || \"Not authorized!\",\n                code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                data: ex.data || null,\n                stack: null\n            }\n        });\n    }\n\n    const getTenant = () => {\n        return context.tenancy.getCurrentTenant();\n    };\n\n    const getLocale = () => {\n        return context.cms.getLocale();\n    };\n\n    const schema = await context.benchmark.measure(\"headlessCms.graphql.getSchema\", async () => {\n        try {\n            return await getSchema({\n                context,\n                getTenant,\n                getLocale,\n                type: context.cms.type as ApiEndpoint\n            });\n        } catch (ex) {\n            console.error(`Error while generating the schema.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    const body = await context.benchmark.measure(\n        \"headlessCms.graphql.createRequestBody\",\n        async () => {\n            try {\n                return createRequestBody(request.body);\n            } catch (ex) {\n                console.error(`Error while creating the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        }\n    );\n\n    /**\n     * We need to store the processRequestBody result in a variable and output it after the measurement.\n     * Otherwise, the measurement will not be shown in the output.\n     */\n    let result: ExecutionResult[] | ExecutionResult | null = null;\n\n    await context.benchmark.measure(\"headlessCms.graphql.processRequestBody\", async () => {\n        try {\n            result = await processRequestBody(body, schema, context);\n        } catch (ex) {\n            console.error(`Error while processing the body request.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n    /**\n     * IMPORTANT! Do not send anything if reply was already sent.\n     */\n    if (reply.sent) {\n        console.warn(\"Reply already sent, cannot send the result (api-headless-cms).\");\n        return reply;\n    }\n\n    return reply.send(result);\n};\n"],"mappings":";;;;;;AACA,IAAAA,oBAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEA,IAAAI,eAAA,GAAAJ,OAAA;AAaO,MAAMK,aAA4B,GAAG,MAAMC,MAAM,IAAI;EACxD,MAAM;IAAEC,OAAO;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAC1C,IAAI;IACA,MAAM,IAAAI,wCAAmB,EAACH,OAAO,CAAC;EACtC,CAAC,CAAC,OAAOI,EAAE,EAAE;IACT,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC;MACxBC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAEL,EAAE,CAACK,OAAO,IAAI,iBAAiB;QACxCJ,IAAI,EAAED,EAAE,CAACC,IAAI,IAAI,yBAAyB;QAC1CE,IAAI,EAAEH,EAAE,CAACG,IAAI,IAAI,IAAI;QACrBG,KAAK,EAAE;MACX;IACJ,CAAC,CAAC;EACN;EAEA,MAAMC,SAAS,GAAGA,CAAA,KAAM;IACpB,OAAOX,OAAO,CAACY,OAAO,CAACC,gBAAgB,CAAC,CAAC;EAC7C,CAAC;EAED,MAAMC,SAAS,GAAGA,CAAA,KAAM;IACpB,OAAOd,OAAO,CAACe,GAAG,CAACD,SAAS,CAAC,CAAC;EAClC,CAAC;EAED,MAAME,MAAM,GAAG,MAAMhB,OAAO,CAACiB,SAAS,CAACC,OAAO,CAAC,+BAA+B,EAAE,YAAY;IACxF,IAAI;MACA,OAAO,MAAM,IAAAC,oBAAS,EAAC;QACnBnB,OAAO;QACPW,SAAS;QACTG,SAAS;QACTM,IAAI,EAAEpB,OAAO,CAACe,GAAG,CAACK;MACtB,CAAC,CAAC;IACN,CAAC,CAAC,OAAOhB,EAAE,EAAE;MACTiB,OAAO,CAACb,KAAK,CAAC,oCAAoC,CAAC;MACnDa,OAAO,CAACb,KAAK,CAAC,IAAAc,sCAAkB,EAAClB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,MAAMmB,IAAI,GAAG,MAAMvB,OAAO,CAACiB,SAAS,CAACC,OAAO,CACxC,uCAAuC,EACvC,YAAY;IACR,IAAI;MACA,OAAO,IAAAM,oCAAiB,EAACvB,OAAO,CAACsB,IAAI,CAAC;IAC1C,CAAC,CAAC,OAAOnB,EAAE,EAAE;MACTiB,OAAO,CAACb,KAAK,CAAC,wCAAwC,CAAC;MACvDa,OAAO,CAACb,KAAK,CAAC,IAAAc,sCAAkB,EAAClB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CACJ,CAAC;;EAED;AACJ;AACA;AACA;EACI,IAAIqB,MAAkD,GAAG,IAAI;EAE7D,MAAMzB,OAAO,CAACiB,SAAS,CAACC,OAAO,CAAC,wCAAwC,EAAE,YAAY;IAClF,IAAI;MACAO,MAAM,GAAG,MAAM,IAAAC,kCAAkB,EAACH,IAAI,EAAEP,MAAM,EAAEhB,OAAO,CAAC;IAC5D,CAAC,CAAC,OAAOI,EAAE,EAAE;MACTiB,OAAO,CAACb,KAAK,CAAC,0CAA0C,CAAC;MACzDa,OAAO,CAACb,KAAK,CAAC,IAAAc,sCAAkB,EAAClB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EACF;AACJ;AACA;EACI,IAAIF,KAAK,CAACyB,IAAI,EAAE;IACZN,OAAO,CAACO,IAAI,CAAC,gEAAgE,CAAC;IAC9E,OAAO1B,KAAK;EAChB;EAEA,OAAOA,KAAK,CAACI,IAAI,CAACmB,MAAM,CAAC;AAC7B,CAAC;AAACI,OAAA,CAAA/B,aAAA,GAAAA,aAAA","ignoreList":[]}

package/graphql/index.d.ts

@@ -1,3 +1,4 @@
-import { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory";
-export declare type CreateGraphQLParams = GraphQLHandlerFactoryParams;
-export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/plugins/types").PluginCollection | import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("../types").CmsContext>)[];
+import type { Plugin } from "@webiny/plugins/types";
+import type { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory";
+export type CreateGraphQLParams = GraphQLHandlerFactoryParams;
+export declare const createGraphQL: (params: CreateGraphQLParams) => Plugin[];

package/graphql/index.js

@@ -8,6 +8,8 @@ var _system = require("./system");
 var _graphQLHandlerFactory = require("./graphQLHandlerFactory");
 var _baseSchema = require("./schema/baseSchema");
 const createGraphQL = params => {
-  return [...(0, _baseSchema.createBaseSchema)(), (0, _system.createSystemSchemaPlugin)(), (0, _graphQLHandlerFactory.graphQLHandlerFactory)(params)];
+  return [(0, _baseSchema.createBaseSchema)(), (0, _system.createSystemSchemaPlugin)(), ...(0, _graphQLHandlerFactory.graphQLHandlerFactory)(params)];
 };
-exports.createGraphQL = createGraphQL;
+exports.createGraphQL = createGraphQL;
+
+//# sourceMappingURL=index.js.map

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createGraphQL","params","createBaseSchema","createSystemSchemaPlugin","graphQLHandlerFactory"],"sources":["index.ts"],"sourcesContent":["import { createSystemSchemaPlugin } from \"./system\";\nimport { graphQLHandlerFactory, GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory\";\nimport { createBaseSchema } from \"~/graphql/schema/baseSchema\";\n\nexport type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams) => {\n    return [...createBaseSchema(), createSystemSchemaPlugin(), graphQLHandlerFactory(params)];\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAGO,MAAMA,aAAa,GAAIC,MAA2B,IAAK;EAC1D,OAAO,CAAC,GAAG,IAAAC,4BAAgB,GAAE,EAAE,IAAAC,gCAAwB,GAAE,EAAE,IAAAC,4CAAqB,EAACH,MAAM,CAAC,CAAC;AAC7F,CAAC;AAAC"}
+{"version":3,"names":["_system","require","_graphQLHandlerFactory","_baseSchema","createGraphQL","params","createBaseSchema","createSystemSchemaPlugin","graphQLHandlerFactory","exports"],"sources":["index.ts"],"sourcesContent":["import type { Plugin } from \"@webiny/plugins/types\";\nimport { createSystemSchemaPlugin } from \"./system\";\nimport type { GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory\";\nimport { graphQLHandlerFactory } from \"./graphQLHandlerFactory\";\nimport { createBaseSchema } from \"~/graphql/schema/baseSchema\";\n\nexport type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams): Plugin[] => {\n    return [createBaseSchema(), createSystemSchemaPlugin(), ...graphQLHandlerFactory(params)];\n};\n"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAGO,MAAMG,aAAa,GAAIC,MAA2B,IAAe;EACpE,OAAO,CAAC,IAAAC,4BAAgB,EAAC,CAAC,EAAE,IAAAC,gCAAwB,EAAC,CAAC,EAAE,GAAG,IAAAC,4CAAqB,EAACH,MAAM,CAAC,CAAC;AAC7F,CAAC;AAACI,OAAA,CAAAL,aAAA,GAAAA,aAAA","ignoreList":[]}

package/graphql/scalars/RevisionId.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from "graphql";
+export declare const RevisionIdScalar: GraphQLScalarType;

package/graphql/scalars/RevisionId.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RevisionIdScalar = void 0;
+var _graphql = require("graphql");
+var _utils = require("@webiny/utils");
+const RevisionIdScalar = exports.RevisionIdScalar = new _graphql.GraphQLScalarType({
+  name: "RevisionId",
+  description: "A Headless CMS Reference field input type.",
+  parseValue: value => {
+    if (!value) {
+      return null;
+    } else if (typeof value !== "string") {
+      throw new Error("RevisionId value must be a string!");
+    }
+    const result = (0, _utils.parseIdentifier)(value);
+    if (!result.version) {
+      throw new Error(`RevisionId value must be a valid Revision ID property! Example: "abcdef#0001"`);
+    }
+    return value;
+  }
+});
+
+//# sourceMappingURL=RevisionId.js.map

package/graphql/scalars/RevisionId.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_graphql","require","_utils","RevisionIdScalar","exports","GraphQLScalarType","name","description","parseValue","value","Error","result","parseIdentifier","version"],"sources":["RevisionId.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport const RevisionIdScalar = new GraphQLScalarType({\n    name: \"RevisionId\",\n    description: \"A Headless CMS Reference field input type.\",\n    parseValue: value => {\n        if (!value) {\n            return null;\n        } else if (typeof value !== \"string\") {\n            throw new Error(\"RevisionId value must be a string!\");\n        }\n\n        const result = parseIdentifier(value);\n        if (!result.version) {\n            throw new Error(\n                `RevisionId value must be a valid Revision ID property! Example: \"abcdef#0001\"`\n            );\n        }\n        return value;\n    }\n});\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEO,MAAME,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAG,IAAIE,0BAAiB,CAAC;EAClDC,IAAI,EAAE,YAAY;EAClBC,WAAW,EAAE,4CAA4C;EACzDC,UAAU,EAAEC,KAAK,IAAI;IACjB,IAAI,CAACA,KAAK,EAAE;MACR,OAAO,IAAI;IACf,CAAC,MAAM,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAClC,MAAM,IAAIC,KAAK,CAAC,oCAAoC,CAAC;IACzD;IAEA,MAAMC,MAAM,GAAG,IAAAC,sBAAe,EAACH,KAAK,CAAC;IACrC,IAAI,CAACE,MAAM,CAACE,OAAO,EAAE;MACjB,MAAM,IAAIH,KAAK,CACX,+EACJ,CAAC;IACL;IACA,OAAOD,KAAK;EAChB;AACJ,CAAC,CAAC","ignoreList":[]}

package/graphql/scalars/RevisionIdScalarPlugin.d.ts

@@ -0,0 +1,2 @@
+import type { GraphQLScalarPlugin } from "@webiny/handler-graphql/types";
+export declare const createRevisionIdScalarPlugin: () => GraphQLScalarPlugin[];

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,21 +29,16 @@ const createBaseContentSchema = ({
                 _empty: String
             }
 
-            type CmsIdentity {
-                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,
@@ -58,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 CmsIdentity {\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,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
@@ -31,6 +59,8 @@ const createBaseSchema = () => {
                 # 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 {
@@ -67,6 +97,38 @@ const createBaseSchema = () => {
                 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: {}
   });
@@ -81,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            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            }\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        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;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,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

@@ -13,14 +13,18 @@ var _plugins = require("../../plugins");
 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();
+  } catch {
+    return new Date();
+  }
 };
 const createCmsEntryRecord = (model, entry) => {
-  var _entry$location;
   return {
     id: entry.id,
     entryId: entry.entryId,
@@ -32,12 +36,34 @@ const createCmsEntryRecord = (model, entry) => {
     title: (0, _getEntryTitle.getEntryTitle)(model, entry),
     description: (0, _getEntryDescription.getEntryDescription)(model, entry),
     image: (0, _getEntryImage.getEntryImage)(model, entry),
-    createdBy: entry.createdBy,
-    modifiedBy: entry.modifiedBy,
+    /**
+     * 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 = entry.location) === null || _entry$location === void 0 ? void 0 : _entry$location.folderId) || null
+      folderId: entry.location?.folderId || null
     }
   };
 };
@@ -56,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",
@@ -183,15 +210,20 @@ 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!
@@ -210,15 +242,13 @@ const createContentEntriesSchema = ({
                 entryId: String!
                 model: CmsModelMeta!
                 status: String!
+                published: CmsPublishedContentEntry
                 title: String!
                 description: String
                 image: String
-                createdBy: CmsIdentity!
-                ownedBy: CmsIdentity!
-                modifiedBy: CmsIdentity
-                published: CmsPublishedContentEntry
-                createdOn: DateTime!
-                savedOn: DateTime!
+                
+                ${onByMetaFields}
+            
                 wbyAco_location: WbyAcoLocation
             }
 
@@ -297,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,
@@ -364,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