@webiny/api-headless-cms 6.0.0-beta.0 → 6.0.0-rc.1

package/graphql/getSchema.js

@@ -1,24 +1,15 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getSchema = void 0;
-var _codeFrame = _interopRequireDefault(require("code-frame"));
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _generateSchema = require("./generateSchema");
-var _generateCacheId = require("./getSchema/generateCacheId");
-var _generateCacheKey = require("./getSchema/generateCacheKey");
-// @ts-expect-error `code-frame` has no types
-
+import { codeFrameColumns } from "@babel/code-frame";
+import WebinyError from "@webiny/error";
+import { generateSchema } from "./generateSchema.js";
+import { generateCacheId } from "./getSchema/generateCacheId.js";
+import { generateCacheKey } from "./getSchema/generateCacheKey.js";
 const schemaList = new Map();
 
 /**
  * Gets an existing schema or rewrites existing one or creates a completely new one
- * depending on the schemaId created from type and locale parameters
+ * depending on the schemaId created from type
  */
-const getSchema = async params => {
+export const getSchema = async params => {
   const {
     context
   } = params;
@@ -28,12 +19,13 @@ const getSchema = async params => {
    * Private models are hidden in the GraphQL, so filter them out.
    */
   const models = await context.security.withoutAuthorization(async () => {
-    return (await context.cms.listModels()).filter(model => {
-      return model.isPrivate !== true;
+    return await context.cms.listModels({
+      includePrivate: false,
+      includePlugins: true
     });
   });
-  const cacheId = (0, _generateCacheId.generateCacheId)(params);
-  const cacheKey = await (0, _generateCacheKey.generateCacheKey)({
+  const cacheId = generateCacheId(params);
+  const cacheKey = await generateCacheKey({
     ...params,
     models
   });
@@ -42,7 +34,7 @@ const getSchema = async params => {
     return cachedSchema.schema;
   }
   try {
-    const schema = await (0, _generateSchema.generateSchema)({
+    const schema = await generateSchema({
       ...params,
       models
     });
@@ -53,7 +45,7 @@ const getSchema = async params => {
     return schema;
   } catch (err) {
     if (!Array.isArray(err.locations)) {
-      throw new _error.default({
+      throw new WebinyError({
         message: err.message,
         code: err.code || "INVALID_GRAPHQL_SCHEMA_LOCATIONS",
         data: {
@@ -63,17 +55,19 @@ const getSchema = async params => {
       });
     }
     const [location] = err.locations;
-    throw new _error.default({
+    throw new WebinyError({
       code: "INVALID_GRAPHQL_SCHEMA",
       message: err.message,
       data: {
-        invalidSegment: (0, _codeFrame.default)(err.source.body, location.line, location.column, {
-          frameSize: 15
+        invalidSegment: codeFrameColumns(err.source.body, {
+          start: {
+            line: location.line,
+            column: location.column
+          }
         })
       }
     });
   }
 };
-exports.getSchema = getSchema;
 
 //# sourceMappingURL=getSchema.js.map

package/graphql/getSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_codeFrame","_interopRequireDefault","require","_error","_generateSchema","_generateCacheId","_generateCacheKey","schemaList","Map","getSchema","params","context","models","security","withoutAuthorization","cms","listModels","filter","model","isPrivate","cacheId","generateCacheId","cacheKey","generateCacheKey","cachedSchema","get","key","schema","generateSchema","set","err","Array","isArray","locations","WebinyError","message","code","data","endpoint","type","location","invalidSegment","codeFrame","source","body","line","column","frameSize","exports"],"sources":["getSchema.ts"],"sourcesContent":["// @ts-expect-error `code-frame` has no types\nimport codeFrame from \"code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { generateSchema } from \"./generateSchema\";\nimport { ApiEndpoint, CmsContext } from \"~/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { GraphQLSchema } from \"graphql\";\nimport { generateCacheId } from \"./getSchema/generateCacheId\";\nimport { generateCacheKey } from \"./getSchema/generateCacheKey\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n    getLocale: () => I18NLocale;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type and locale parameters\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const models = await context.security.withoutAuthorization(async () => {\n        return (await context.cms.listModels()).filter(model => {\n            return model.isPrivate !== true;\n        });\n    });\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.cms.type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrame(err.source.body, location.line, location.column, {\n                    frameSize: 15\n                })\n            }\n        });\n    }\n};\n"],"mappings":";;;;;;;AACA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AAKA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AATA;;AAuBA,MAAMK,UAAU,GAAG,IAAIC,GAAG,CAAsB,CAAC;;AAEjD;AACA;AACA;AACA;AACO,MAAMC,SAAS,GAAG,MAAOC,MAAuB,IAA6B;EAChF,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;;EAE1B;AACJ;AACA;AACA;EACI,MAAME,MAAM,GAAG,MAAMD,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;IACnE,OAAO,CAAC,MAAMH,OAAO,CAACI,GAAG,CAACC,UAAU,CAAC,CAAC,EAAEC,MAAM,CAACC,KAAK,IAAI;MACpD,OAAOA,KAAK,CAACC,SAAS,KAAK,IAAI;IACnC,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAG,IAAAC,gCAAe,EAACX,MAAM,CAAC;EAEvC,MAAMY,QAAQ,GAAG,MAAM,IAAAC,kCAAgB,EAAC;IAAE,GAAGb,MAAM;IAAEE;EAAO,CAAC,CAAC;EAC9D,MAAMY,YAAY,GAAGjB,UAAU,CAACkB,GAAG,CAACL,OAAO,CAAC;EAC5C,IAAII,YAAY,EAAEE,GAAG,KAAKJ,QAAQ,EAAE;IAChC,OAAOE,YAAY,CAACG,MAAM;EAC9B;EAEA,IAAI;IACA,MAAMA,MAAM,GAAG,MAAM,IAAAC,8BAAc,EAAC;MAChC,GAAGlB,MAAM;MACTE;IACJ,CAAC,CAAC;IACFL,UAAU,CAACsB,GAAG,CAACT,OAAO,EAAE;MACpBM,GAAG,EAAEJ,QAAQ;MACbK;IACJ,CAAC,CAAC;IACF,OAAOA,MAAM;EACjB,CAAC,CAAC,OAAOG,GAAG,EAAE;IACV,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,GAAG,CAACG,SAAS,CAAC,EAAE;MAC/B,MAAM,IAAIC,cAAW,CAAC;QAClBC,OAAO,EAAEL,GAAG,CAACK,OAAO;QACpBC,IAAI,EAAEN,GAAG,CAACM,IAAI,IAAI,kCAAkC;QACpDC,IAAI,EAAE;UACF,IAAIP,GAAG,CAACO,IAAI,IAAI,CAAC,CAAC,CAAC;UACnBC,QAAQ,EAAE3B,OAAO,CAACI,GAAG,CAACwB;QAC1B;MACJ,CAAC,CAAC;IACN;IACA,MAAM,CAACC,QAAQ,CAAC,GAAGV,GAAG,CAACG,SAAS;IAEhC,MAAM,IAAIC,cAAW,CAAC;MAClBE,IAAI,EAAE,wBAAwB;MAC9BD,OAAO,EAAEL,GAAG,CAACK,OAAO;MACpBE,IAAI,EAAE;QACFI,cAAc,EAAE,IAAAC,kBAAS,EAACZ,GAAG,CAACa,MAAM,CAACC,IAAI,EAAEJ,QAAQ,CAACK,IAAI,EAAEL,QAAQ,CAACM,MAAM,EAAE;UACvEC,SAAS,EAAE;QACf,CAAC;MACL;IACJ,CAAC,CAAC;EACN;AACJ,CAAC;AAACC,OAAA,CAAAvC,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"names":["codeFrameColumns","WebinyError","generateSchema","generateCacheId","generateCacheKey","schemaList","Map","getSchema","params","context","models","security","withoutAuthorization","cms","listModels","includePrivate","includePlugins","cacheId","cacheKey","cachedSchema","get","key","schema","set","err","Array","isArray","locations","message","code","data","endpoint","type","location","invalidSegment","source","body","start","line","column"],"sources":["getSchema.ts"],"sourcesContent":["import { codeFrameColumns } from \"@babel/code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { generateSchema } from \"./generateSchema.js\";\nimport type { ApiEndpoint, CmsContext } from \"~/types/index.js\";\nimport type { GraphQLSchema } from \"graphql\";\nimport { generateCacheId } from \"./getSchema/generateCacheId.js\";\nimport { generateCacheKey } from \"./getSchema/generateCacheKey.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const models = await context.security.withoutAuthorization(async () => {\n        return await context.cms.listModels({\n            includePrivate: false,\n            includePlugins: true\n        });\n    });\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.cms.type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrameColumns(err.source.body, {\n                    start: {\n                        line: location.line,\n                        column: location.column\n                    }\n                })\n            }\n        });\n    }\n};\n"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,mBAAmB;AACpD,OAAOC,WAAW,MAAM,eAAe;AACvC,SAASC,cAAc;AAGvB,SAASC,eAAe;AACxB,SAASC,gBAAgB;AAczB,MAAMC,UAAU,GAAG,IAAIC,GAAG,CAAsB,CAAC;;AAEjD;AACA;AACA;AACA;AACA,OAAO,MAAMC,SAAS,GAAG,MAAOC,MAAuB,IAA6B;EAChF,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;;EAE1B;AACJ;AACA;AACA;EACI,MAAME,MAAM,GAAG,MAAMD,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;IACnE,OAAO,MAAMH,OAAO,CAACI,GAAG,CAACC,UAAU,CAAC;MAChCC,cAAc,EAAE,KAAK;MACrBC,cAAc,EAAE;IACpB,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAGd,eAAe,CAACK,MAAM,CAAC;EAEvC,MAAMU,QAAQ,GAAG,MAAMd,gBAAgB,CAAC;IAAE,GAAGI,MAAM;IAAEE;EAAO,CAAC,CAAC;EAC9D,MAAMS,YAAY,GAAGd,UAAU,CAACe,GAAG,CAACH,OAAO,CAAC;EAC5C,IAAIE,YAAY,EAAEE,GAAG,KAAKH,QAAQ,EAAE;IAChC,OAAOC,YAAY,CAACG,MAAM;EAC9B;EAEA,IAAI;IACA,MAAMA,MAAM,GAAG,MAAMpB,cAAc,CAAC;MAChC,GAAGM,MAAM;MACTE;IACJ,CAAC,CAAC;IACFL,UAAU,CAACkB,GAAG,CAACN,OAAO,EAAE;MACpBI,GAAG,EAAEH,QAAQ;MACbI;IACJ,CAAC,CAAC;IACF,OAAOA,MAAM;EACjB,CAAC,CAAC,OAAOE,GAAG,EAAE;IACV,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,GAAG,CAACG,SAAS,CAAC,EAAE;MAC/B,MAAM,IAAI1B,WAAW,CAAC;QAClB2B,OAAO,EAAEJ,GAAG,CAACI,OAAO;QACpBC,IAAI,EAAEL,GAAG,CAACK,IAAI,IAAI,kCAAkC;QACpDC,IAAI,EAAE;UACF,IAAIN,GAAG,CAACM,IAAI,IAAI,CAAC,CAAC,CAAC;UACnBC,QAAQ,EAAEtB,OAAO,CAACI,GAAG,CAACmB;QAC1B;MACJ,CAAC,CAAC;IACN;IACA,MAAM,CAACC,QAAQ,CAAC,GAAGT,GAAG,CAACG,SAAS;IAEhC,MAAM,IAAI1B,WAAW,CAAC;MAClB4B,IAAI,EAAE,wBAAwB;MAC9BD,OAAO,EAAEJ,GAAG,CAACI,OAAO;MACpBE,IAAI,EAAE;QACFI,cAAc,EAAElC,gBAAgB,CAACwB,GAAG,CAACW,MAAM,CAACC,IAAI,EAAE;UAC9CC,KAAK,EAAE;YACHC,IAAI,EAAEL,QAAQ,CAACK,IAAI;YACnBC,MAAM,EAAEN,QAAQ,CAACM;UACrB;QACJ,CAAC;MACL;IACJ,CAAC,CAAC;EACN;AACJ,CAAC","ignoreList":[]}

package/graphql/graphQLHandlerFactory.d.ts

@@ -1,5 +1,5 @@
-import { PluginCollection } from "@webiny/plugins/types";
+import type { Plugin } from "@webiny/plugins/types.js";
 export interface GraphQLHandlerFactoryParams {
     debug?: boolean;
 }
-export declare const graphQLHandlerFactory: ({ debug }: GraphQLHandlerFactoryParams) => PluginCollection;
+export declare const graphQLHandlerFactory: ({ debug }: GraphQLHandlerFactoryParams) => Plugin[];

package/graphql/graphQLHandlerFactory.js

@@ -1,37 +1,30 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.graphQLHandlerFactory = void 0;
-var _debugPlugins = _interopRequireDefault(require("@webiny/handler-graphql/debugPlugins"));
-var _handler = require("@webiny/handler");
-var _handleRequest = require("./handleRequest");
-const cmsRoutes = new _handler.RoutePlugin(({
+import debugPlugins from "@webiny/handler-graphql/debugPlugins.js";
+import { RoutePlugin } from "@webiny/handler";
+import { handleRequest } from "./handleRequest.js";
+const cmsRoutes = new RoutePlugin(({
   onPost,
   onOptions,
   context
 }) => {
-  onPost("/cms/:type(^manage|preview|read$)/:locale", async (request, reply) => {
-    return (0, _handleRequest.handleRequest)({
+  // We no longer use `:locale` but we keep it for now to support external systems created wth v5.
+  onPost("/cms/:type(^manage|preview|read$)/:locale?", async (request, reply) => {
+    return handleRequest({
       context,
       request,
       reply
     });
   });
-  onOptions("/cms/:type(^manage|preview|read$)/:locale", async (_, reply) => {
+  onOptions("/cms/:type(^manage|preview|read$)/:locale?", async (_, reply) => {
     return reply.status(204).send({}).hijack();
   });
 });
 cmsRoutes.name = "headless-cms.graphql.route.default";
-const graphQLHandlerFactory = ({
+export const graphQLHandlerFactory = ({
   debug
 }) => {
-  return [...(debug ? (0, _debugPlugins.default)() : []), cmsRoutes, {
+  return [...(debug ? debugPlugins() : []), cmsRoutes, {
     type: "wcp-telemetry-tracker"
   }];
 };
-exports.graphQLHandlerFactory = graphQLHandlerFactory;
 
 //# sourceMappingURL=graphQLHandlerFactory.js.map

package/graphql/graphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"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 { 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,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,KAAuB;EAC/F,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":[]}
+{"version":3,"names":["debugPlugins","RoutePlugin","handleRequest","cmsRoutes","onPost","onOptions","context","request","reply","_","status","send","hijack","name","graphQLHandlerFactory","debug","type"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import debugPlugins from \"@webiny/handler-graphql/debugPlugins.js\";\nimport type { CmsContext } from \"~/types/index.js\";\nimport type { Plugin } from \"@webiny/plugins/types.js\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport { handleRequest } from \"./handleRequest.js\";\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    // We no longer use `:locale` but we keep it for now to support external systems created wth v5.\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,OAAOA,YAAY,MAAM,yCAAyC;AAGlE,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,aAAa;AAMtB,MAAMC,SAAS,GAAG,IAAIF,WAAW,CAAa,CAAC;EAAEG,MAAM;EAAEC,SAAS;EAAEC;AAAQ,CAAC,KAAK;EAC9E;EACAF,MAAM,CAAC,4CAA4C,EAAE,OAAOG,OAAO,EAAEC,KAAK,KAAK;IAC3E,OAAON,aAAa,CAAC;MAAEI,OAAO;MAAEC,OAAO;MAAEC;IAAM,CAAC,CAAC;EACrD,CAAC,CAAC;EAEFH,SAAS,CAAC,4CAA4C,EAAE,OAAOI,CAAC,EAAED,KAAK,KAAK;IACxE,OAAOA,KAAK,CAACE,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,CAAC,CAAC,CAAC,CAACC,MAAM,CAAC,CAAC;EAC9C,CAAC,CAAC;AACN,CAAC,CAAC;AAEFT,SAAS,CAACU,IAAI,GAAG,oCAAoC;AAErD,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAmC,CAAC,KAAe;EACvF,OAAO,CACH,IAAIA,KAAK,GAAGf,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,EAChCG,SAAS,EACT;IACIa,IAAI,EAAE;EACV,CAAC,CACJ;AACL,CAAC","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/index.js";
+import type { Reply, Request } from "@webiny/handler/types.js";
 export interface HandleRequestParams {
     context: CmsContext;
     request: Request;

package/graphql/handleRequest.js

@@ -1,22 +1,16 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handleRequest = void 0;
-var _checkEndpointAccess = require("./checkEndpointAccess");
-var _createRequestBody = require("./createRequestBody");
-var _formatErrorPayload = require("./formatErrorPayload");
-var _getSchema = require("./getSchema");
-var _handlerGraphql = require("@webiny/handler-graphql");
-const handleRequest = async params => {
+import { checkEndpointAccess } from "./checkEndpointAccess.js";
+import { formatErrorPayload } from "./formatErrorPayload.js";
+import { getSchema } from "./getSchema.js";
+import { processRequestBody } from "@webiny/handler-graphql";
+import { createRequestBody } from "@webiny/handler-graphql/createRequestBody.js";
+export const handleRequest = async params => {
   const {
     context,
     request,
     reply
   } = params;
   try {
-    await (0, _checkEndpointAccess.checkEndpointAccess)(context);
+    await checkEndpointAccess(context);
   } catch (ex) {
     return reply.code(401).send({
       data: null,
@@ -31,29 +25,25 @@ const handleRequest = async params => {
   const getTenant = () => {
     return context.tenancy.getCurrentTenant();
   };
-  const getLocale = () => {
-    return context.cms.getLocale();
-  };
   const schema = await context.benchmark.measure("headlessCms.graphql.getSchema", async () => {
     try {
-      return await (0, _getSchema.getSchema)({
+      return await getSchema({
         context,
         getTenant,
-        getLocale,
         type: context.cms.type
       });
     } catch (ex) {
       console.error(`Error while generating the schema.`);
-      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      console.error(formatErrorPayload(ex));
       throw ex;
     }
   });
   const body = await context.benchmark.measure("headlessCms.graphql.createRequestBody", async () => {
     try {
-      return (0, _createRequestBody.createRequestBody)(request.body);
+      return createRequestBody(request.body);
     } catch (ex) {
       console.error(`Error while creating the body request.`);
-      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      console.error(formatErrorPayload(ex));
       throw ex;
     }
   });
@@ -65,15 +55,21 @@ const handleRequest = async params => {
   let result = null;
   await context.benchmark.measure("headlessCms.graphql.processRequestBody", async () => {
     try {
-      result = await (0, _handlerGraphql.processRequestBody)(body, schema, context);
+      result = await processRequestBody(body, schema, context);
     } catch (ex) {
       console.error(`Error while processing the body request.`);
-      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      console.error(formatErrorPayload(ex));
       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;
 
 //# sourceMappingURL=handleRequest.js.map

package/graphql/handleRequest.js.map

@@ -1 +1 @@
-{"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","exports"],"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 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    return reply.code(200).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,CAAE,oCAAmC,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,CAAE,wCAAuC,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,CAAE,0CAAyC,CAAC;MACzDa,OAAO,CAACb,KAAK,CAAC,IAAAc,sCAAkB,EAAClB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAACmB,MAAM,CAAC;AACvC,CAAC;AAACE,OAAA,CAAA7B,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["checkEndpointAccess","formatErrorPayload","getSchema","processRequestBody","createRequestBody","handleRequest","params","context","request","reply","ex","code","send","data","error","message","stack","getTenant","tenancy","getCurrentTenant","schema","benchmark","measure","type","cms","console","body","result","sent","warn"],"sources":["handleRequest.ts"],"sourcesContent":["import type { ApiEndpoint, CmsContext } from \"~/types/index.js\";\nimport { checkEndpointAccess } from \"./checkEndpointAccess.js\";\nimport { formatErrorPayload } from \"./formatErrorPayload.js\";\nimport { getSchema } from \"./getSchema.js\";\nimport type { Reply, Request } from \"@webiny/handler/types.js\";\nimport { processRequestBody } from \"@webiny/handler-graphql\";\nimport type { ExecutionResult } from \"graphql\";\nimport { createRequestBody } from \"@webiny/handler-graphql/createRequestBody.js\";\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 schema = await context.benchmark.measure(\"headlessCms.graphql.getSchema\", async () => {\n        try {\n            return await getSchema({\n                context,\n                getTenant,\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,SAASA,mBAAmB;AAC5B,SAASC,kBAAkB;AAC3B,SAASC,SAAS;AAElB,SAASC,kBAAkB,QAAQ,yBAAyB;AAE5D,SAASC,iBAAiB,QAAQ,8CAA8C;AAYhF,OAAO,MAAMC,aAA4B,GAAG,MAAMC,MAAM,IAAI;EACxD,MAAM;IAAEC,OAAO;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAC1C,IAAI;IACA,MAAMN,mBAAmB,CAACO,OAAO,CAAC;EACtC,CAAC,CAAC,OAAOG,EAAE,EAAE;IACT,OAAOD,KAAK,CAACE,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,OAAOV,OAAO,CAACW,OAAO,CAACC,gBAAgB,CAAC,CAAC;EAC7C,CAAC;EAED,MAAMC,MAAM,GAAG,MAAMb,OAAO,CAACc,SAAS,CAACC,OAAO,CAAC,+BAA+B,EAAE,YAAY;IACxF,IAAI;MACA,OAAO,MAAMpB,SAAS,CAAC;QACnBK,OAAO;QACPU,SAAS;QACTM,IAAI,EAAEhB,OAAO,CAACiB,GAAG,CAACD;MACtB,CAAC,CAAC;IACN,CAAC,CAAC,OAAOb,EAAE,EAAE;MACTe,OAAO,CAACX,KAAK,CAAC,oCAAoC,CAAC;MACnDW,OAAO,CAACX,KAAK,CAACb,kBAAkB,CAACS,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,MAAMgB,IAAI,GAAG,MAAMnB,OAAO,CAACc,SAAS,CAACC,OAAO,CACxC,uCAAuC,EACvC,YAAY;IACR,IAAI;MACA,OAAOlB,iBAAiB,CAACI,OAAO,CAACkB,IAAI,CAAC;IAC1C,CAAC,CAAC,OAAOhB,EAAE,EAAE;MACTe,OAAO,CAACX,KAAK,CAAC,wCAAwC,CAAC;MACvDW,OAAO,CAACX,KAAK,CAACb,kBAAkB,CAACS,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CACJ,CAAC;;EAED;AACJ;AACA;AACA;EACI,IAAIiB,MAAkD,GAAG,IAAI;EAE7D,MAAMpB,OAAO,CAACc,SAAS,CAACC,OAAO,CAAC,wCAAwC,EAAE,YAAY;IAClF,IAAI;MACAK,MAAM,GAAG,MAAMxB,kBAAkB,CAACuB,IAAI,EAAEN,MAAM,EAAEb,OAAO,CAAC;IAC5D,CAAC,CAAC,OAAOG,EAAE,EAAE;MACTe,OAAO,CAACX,KAAK,CAAC,0CAA0C,CAAC;MACzDW,OAAO,CAACX,KAAK,CAACb,kBAAkB,CAACS,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EACF;AACJ;AACA;EACI,IAAID,KAAK,CAACmB,IAAI,EAAE;IACZH,OAAO,CAACI,IAAI,CAAC,gEAAgE,CAAC;IAC9E,OAAOpB,KAAK;EAChB;EAEA,OAAOA,KAAK,CAACG,IAAI,CAACe,MAAM,CAAC;AAC7B,CAAC","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/handler-graphql").GraphQLSchemaPlugin<import("../types").CmsContext> | import("@webiny/plugins/types").PluginCollection | import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context>)[];
+import type { Plugin } from "@webiny/plugins/types.js";
+import type { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory.js";
+export type CreateGraphQLParams = GraphQLHandlerFactoryParams;
+export declare const createGraphQL: (params: CreateGraphQLParams) => Plugin[];

package/graphql/index.js

@@ -1,15 +1,8 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGraphQL = void 0;
-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)];
+import { graphQLHandlerFactory } from "./graphQLHandlerFactory.js";
+import { createBaseSchema } from "./schema/baseSchema.js";
+import { createCmsSchema } from "./schema/cms/index.js";
+export const createGraphQL = params => {
+  return [createBaseSchema(), createCmsSchema(), ...graphQLHandlerFactory(params)];
 };
-exports.createGraphQL = createGraphQL;
 
 //# sourceMappingURL=index.js.map

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_system","require","_graphQLHandlerFactory","_baseSchema","createGraphQL","params","createBaseSchema","createSystemSchemaPlugin","graphQLHandlerFactory","exports"],"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,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAGO,MAAMG,aAAa,GAAIC,MAA2B,IAAK;EAC1D,OAAO,CAAC,IAAAC,4BAAgB,EAAC,CAAC,EAAE,IAAAC,gCAAwB,EAAC,CAAC,EAAE,IAAAC,4CAAqB,EAACH,MAAM,CAAC,CAAC;AAC1F,CAAC;AAACI,OAAA,CAAAL,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["graphQLHandlerFactory","createBaseSchema","createCmsSchema","createGraphQL","params"],"sources":["index.ts"],"sourcesContent":["import type { Plugin } from \"@webiny/plugins/types.js\";\nimport type { GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory.js\";\nimport { graphQLHandlerFactory } from \"./graphQLHandlerFactory.js\";\nimport { createBaseSchema } from \"~/graphql/schema/baseSchema.js\";\nimport { createCmsSchema } from \"~/graphql/schema/cms/index.js\";\n\nexport type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams): Plugin[] => {\n    return [createBaseSchema(), createCmsSchema(), ...graphQLHandlerFactory(params)];\n};\n"],"mappings":"AAEA,SAASA,qBAAqB;AAC9B,SAASC,gBAAgB;AACzB,SAASC,eAAe;AAGxB,OAAO,MAAMC,aAAa,GAAIC,MAA2B,IAAe;EACpE,OAAO,CAACH,gBAAgB,CAAC,CAAC,EAAEC,eAAe,CAAC,CAAC,EAAE,GAAGF,qBAAqB,CAACI,MAAM,CAAC,CAAC;AACpF,CAAC","ignoreList":[]}

package/graphql/scalars/RevisionId.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from "graphql";
-export declare const RevisionIdScalar: GraphQLScalarType;
+export declare const RevisionIdScalar: GraphQLScalarType<string | null, string | null>;

package/graphql/scalars/RevisionId.js

@@ -1,12 +1,6 @@
-"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({
+import { GraphQLScalarType } from "graphql";
+import { parseIdentifier } from "@webiny/utils";
+export const RevisionIdScalar = new GraphQLScalarType({
   name: "RevisionId",
   description: "A Headless CMS Reference field input type.",
   parseValue: value => {
@@ -15,7 +9,7 @@ const RevisionIdScalar = exports.RevisionIdScalar = new _graphql.GraphQLScalarTy
     } else if (typeof value !== "string") {
       throw new Error("RevisionId value must be a string!");
     }
-    const result = (0, _utils.parseIdentifier)(value);
+    const result = parseIdentifier(value);
     if (!result.version) {
       throw new Error(`RevisionId value must be a valid Revision ID property! Example: "abcdef#0001"`);
     }

package/graphql/scalars/RevisionId.js.map

@@ -1 +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,CACV,+EACL,CAAC;IACL;IACA,OAAOD,KAAK;EAChB;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["GraphQLScalarType","parseIdentifier","RevisionIdScalar","name","description","parseValue","value","Error","result","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,SAASA,iBAAiB,QAAQ,SAAS;AAC3C,SAASC,eAAe,QAAQ,eAAe;AAE/C,OAAO,MAAMC,gBAAgB,GAAG,IAAIF,iBAAiB,CAAC;EAClDG,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,GAAGP,eAAe,CAACK,KAAK,CAAC;IACrC,IAAI,CAACE,MAAM,CAACC,OAAO,EAAE;MACjB,MAAM,IAAIF,KAAK,CACX,+EACJ,CAAC;IACL;IACA,OAAOD,KAAK;EAChB;AACJ,CAAC,CAAC","ignoreList":[]}

package/graphql/scalars/RevisionIdScalarPlugin.d.ts

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

package/graphql/scalars/RevisionIdScalarPlugin.js

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

package/graphql/scalars/RevisionIdScalarPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_RevisionId","require","createRevisionIdScalarPlugin","plugin","name","type","scalar","RevisionIdScalar","exports"],"sources":["RevisionIdScalarPlugin.ts"],"sourcesContent":["import { 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":[]}
+{"version":3,"names":["RevisionIdScalar","createRevisionIdScalarPlugin","plugin","name","type","scalar"],"sources":["RevisionIdScalarPlugin.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types.js\";\nimport { RevisionIdScalar } from \"~/graphql/scalars/RevisionId.js\";\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,SAASA,gBAAgB;AAEzB,OAAO,MAAMC,4BAA4B,GAAGA,CAAA,KAA6B;EACrE,MAAMC,MAA2B,GAAG;IAChCC,IAAI,EAAE,sCAAsC;IAC5CC,IAAI,EAAE,gBAAgB;IACtBC,MAAM,EAAEL;EACZ,CAAC;EACD,OAAO,CAACE,MAAM,CAAC;AACnB,CAAC","ignoreList":[]}

package/graphql/schema/baseContentSchema.d.ts

@@ -1,5 +1,5 @@
-import { CmsContext } from "../../types";
-import { ICmsGraphQLSchemaPlugin } from "../../plugins";
+import type { CmsContext } from "../../types/index.js";
+import type { ICmsGraphQLSchemaPlugin } from "../../plugins/index.js";
 interface Params {
     context: CmsContext;
 }

package/graphql/schema/baseContentSchema.js

@@ -1,16 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBaseContentSchema = void 0;
-var _builtInTypes = require("@webiny/handler-graphql/builtInTypes");
-var _plugins = require("../../plugins");
-const createBaseContentSchema = ({
+import { AnyScalar, DateScalar, DateTimeScalar, DateTimeZScalar, JsonScalar, LongScalar, NumberScalar, RefInputScalar, TimeScalar, IconScalar } from "@webiny/handler-graphql/builtInTypes/index.js";
+import { createCmsGraphQLSchemaPlugin } from "../../plugins/index.js";
+export const createBaseContentSchema = ({
   context
 }) => {
   const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
-  const plugin = (0, _plugins.createCmsGraphQLSchemaPlugin)({
+  const plugin = createCmsGraphQLSchemaPlugin({
     typeDefs: /* GraphQL */`
             ${scalars.map(scalar => `scalar ${scalar.name}`).join(" ")}
             scalar JSON
@@ -22,6 +16,7 @@ const createBaseContentSchema = ({
             scalar DateTime
             scalar DateTimeZ
             scalar Time
+            scalar Icon
 
             type Query
 
@@ -39,15 +34,16 @@ const createBaseContentSchema = ({
         acc[s.name] = s;
         return acc;
       }, {}),
-      JSON: _builtInTypes.JsonScalar,
-      Long: _builtInTypes.LongScalar,
-      RefInput: _builtInTypes.RefInputScalar,
-      Number: _builtInTypes.NumberScalar,
-      Any: _builtInTypes.AnyScalar,
-      DateTime: _builtInTypes.DateTimeScalar,
-      DateTimeZ: _builtInTypes.DateTimeZScalar,
-      Date: _builtInTypes.DateScalar,
-      Time: _builtInTypes.TimeScalar,
+      JSON: JsonScalar,
+      Long: LongScalar,
+      RefInput: RefInputScalar,
+      Number: NumberScalar,
+      Any: AnyScalar,
+      DateTime: DateTimeScalar,
+      DateTimeZ: DateTimeZScalar,
+      Date: DateScalar,
+      Time: TimeScalar,
+      Icon: IconScalar,
       Mutation: {
         _empty: () => "_empty"
       }
@@ -56,6 +52,5 @@ const createBaseContentSchema = ({
   plugin.name = `headless-cms.graphql.schema.baseContentSchema`;
   return plugin;
 };
-exports.createBaseContentSchema = createBaseContentSchema;
 
 //# sourceMappingURL=baseContentSchema.js.map

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"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 { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { 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 { GraphQLScalarType } from \"graphql\";\nimport { createCmsGraphQLSchemaPlugin, ICmsGraphQLSchemaPlugin } 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;AAYA,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,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,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,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC6B,OAAA,CAAArC,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["AnyScalar","DateScalar","DateTimeScalar","DateTimeZScalar","JsonScalar","LongScalar","NumberScalar","RefInputScalar","TimeScalar","IconScalar","createCmsGraphQLSchemaPlugin","createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","Long","RefInput","Number","Any","DateTime","DateTimeZ","Date","Time","Icon","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import type { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types.js\";\nimport type { CmsContext } from \"~/types/index.js\";\nimport {\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    DateTimeZScalar,\n    JsonScalar,\n    LongScalar,\n    NumberScalar,\n    RefInputScalar,\n    TimeScalar,\n    IconScalar\n} from \"@webiny/handler-graphql/builtInTypes/index.js\";\nimport type { GraphQLScalarType } from \"graphql\";\nimport type { ICmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\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            scalar Icon\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            Icon: IconScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":"AAEA,SACIA,SAAS,EACTC,UAAU,EACVC,cAAc,EACdC,eAAe,EACfC,UAAU,EACVC,UAAU,EACVC,YAAY,EACZC,cAAc,EACdC,UAAU,EACVC,UAAU,QACP,+CAA+C;AAGtD,SAASC,4BAA4B;AAMrC,OAAO,MAAMC,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,GAAGT,4BAA4B,CAAC;IACxCU,QAAQ,EAAE,aAAc;AAChC,cAAcP,OAAO,CAACG,GAAG,CAACE,MAAM,IAAI,UAAUA,MAAM,CAACG,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;AACA,SAAS;IACDC,SAAS,EAAE;MACP,GAAGV,OAAO,CAACW,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,EAAEvB,UAAU;MAChBwB,IAAI,EAAEvB,UAAU;MAChBwB,QAAQ,EAAEtB,cAAc;MACxBuB,MAAM,EAAExB,YAAY;MACpByB,GAAG,EAAE/B,SAAS;MACdgC,QAAQ,EAAE9B,cAAc;MACxB+B,SAAS,EAAE9B,eAAe;MAC1B+B,IAAI,EAAEjC,UAAU;MAChBkC,IAAI,EAAE3B,UAAU;MAChB4B,IAAI,EAAE3B,UAAU;MAChB4B,QAAQ,EAAE;QACNC,MAAM,EAAEA,CAAA,KAAM;MAClB;IACJ;EACJ,CAAC,CAAC;EACFnB,MAAM,CAACE,IAAI,GAAG,+CAA+C;EAE7D,OAAOF,MAAM;AACjB,CAAC","ignoreList":[]}