@webiny/handler-graphql 6.0.0-beta.0 → 6.0.0-rc.1

package/builtInTypes/TimeScalar.js

@@ -1,36 +1,29 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TimeScalar = void 0;
-var _graphql = require("graphql");
-var _error = _interopRequireDefault(require("@webiny/error"));
+import { GraphQLScalarType } from "graphql";
+import WebinyError from "@webiny/error";
 const re = /^([0-9]{2}):([0-9]{2})(:([0-9]{2}))?$/;
 const parseTime = value => {
-  if (!value || value.match(re) === null) {
-    throw new _error.default("Value does not look like time.", "TIME_VALIDATION_ERROR", {
+  if (typeof value !== "string" || !value || value.match(re) === null) {
+    throw new WebinyError("Value does not look like time.", "TIME_VALIDATION_ERROR", {
       value
     });
   }
   const parsed = value.split(":").map(Number);
   if (parsed.length < 2) {
-    throw new _error.default(`Could not parse the value.`, "TIME_VALIDATION_ERROR", {
+    throw new WebinyError(`Could not parse the value.`, "TIME_VALIDATION_ERROR", {
       value
     });
   }
   const [hours, minutes, seconds = 0] = parsed;
   if (hours >= 24) {
-    throw new _error.default(`There cannot be more than 24 hours.`, "TIME_VALIDATION_ERROR", {
+    throw new WebinyError(`There cannot be more than 24 hours.`, "TIME_VALIDATION_ERROR", {
       value
     });
   } else if (minutes >= 60) {
-    throw new _error.default(`There cannot be more than 59 minutes.`, "TIME_VALIDATION_ERROR", {
+    throw new WebinyError(`There cannot be more than 59 minutes.`, "TIME_VALIDATION_ERROR", {
       value
     });
   } else if (seconds >= 60) {
-    throw new _error.default(`There cannot be more than 59 seconds.`, "TIME_VALIDATION_ERROR", {
+    throw new WebinyError(`There cannot be more than 59 seconds.`, "TIME_VALIDATION_ERROR", {
       value
     });
   }
@@ -48,7 +41,7 @@ const convertToTime = value => {
   } = parseTime(value);
   return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
 };
-const TimeScalar = exports.TimeScalar = new _graphql.GraphQLScalarType({
+export const TimeScalar = new GraphQLScalarType({
   name: "Time",
   description: "A custom type to support time-only input.",
   // sending to client

package/builtInTypes/TimeScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["_graphql","require","_error","_interopRequireDefault","re","parseTime","value","match","WebinyError","parsed","split","map","Number","length","hours","minutes","seconds","convertToTime","String","padStart","TimeScalar","exports","GraphQLScalarType","name","description","serialize","parseValue"],"sources":["TimeScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport WebinyError from \"@webiny/error\";\n\nconst re = /^([0-9]{2}):([0-9]{2})(:([0-9]{2}))?$/;\n\nconst parseTime = (value?: string) => {\n    if (!value || value.match(re) === null) {\n        throw new WebinyError(\"Value does not look like time.\", \"TIME_VALIDATION_ERROR\", { value });\n    }\n    const parsed = value.split(\":\").map(Number);\n    if (parsed.length < 2) {\n        throw new WebinyError(`Could not parse the value.`, \"TIME_VALIDATION_ERROR\", { value });\n    }\n    const [hours, minutes, seconds = 0] = parsed;\n    if (hours >= 24) {\n        throw new WebinyError(`There cannot be more than 24 hours.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    } else if (minutes >= 60) {\n        throw new WebinyError(`There cannot be more than 59 minutes.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    } else if (seconds >= 60) {\n        throw new WebinyError(`There cannot be more than 59 seconds.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    }\n    return {\n        hours,\n        minutes,\n        seconds\n    };\n};\n\nconst convertToTime = (value: string): string => {\n    const { hours, minutes, seconds } = parseTime(value);\n    return `${String(hours).padStart(2, \"0\")}:${String(minutes).padStart(2, \"0\")}:${String(\n        seconds\n    ).padStart(2, \"0\")}`;\n};\n\nexport const TimeScalar = new GraphQLScalarType({\n    name: \"Time\",\n    description: \"A custom type to support time-only input.\",\n    // sending to client\n    serialize: convertToTime,\n    // received from client\n    parseValue: convertToTime\n});\n"],"mappings":";;;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,MAAMG,EAAE,GAAG,uCAAuC;AAElD,MAAMC,SAAS,GAAIC,KAAc,IAAK;EAClC,IAAI,CAACA,KAAK,IAAIA,KAAK,CAACC,KAAK,CAACH,EAAE,CAAC,KAAK,IAAI,EAAE;IACpC,MAAM,IAAII,cAAW,CAAC,gCAAgC,EAAE,uBAAuB,EAAE;MAAEF;IAAM,CAAC,CAAC;EAC/F;EACA,MAAMG,MAAM,GAAGH,KAAK,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAC3C,IAAIH,MAAM,CAACI,MAAM,GAAG,CAAC,EAAE;IACnB,MAAM,IAAIL,cAAW,CAAE,4BAA2B,EAAE,uBAAuB,EAAE;MAAEF;IAAM,CAAC,CAAC;EAC3F;EACA,MAAM,CAACQ,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,CAAC,CAAC,GAAGP,MAAM;EAC5C,IAAIK,KAAK,IAAI,EAAE,EAAE;IACb,MAAM,IAAIN,cAAW,CAAE,qCAAoC,EAAE,uBAAuB,EAAE;MAClFF;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIS,OAAO,IAAI,EAAE,EAAE;IACtB,MAAM,IAAIP,cAAW,CAAE,uCAAsC,EAAE,uBAAuB,EAAE;MACpFF;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIU,OAAO,IAAI,EAAE,EAAE;IACtB,MAAM,IAAIR,cAAW,CAAE,uCAAsC,EAAE,uBAAuB,EAAE;MACpFF;IACJ,CAAC,CAAC;EACN;EACA,OAAO;IACHQ,KAAK;IACLC,OAAO;IACPC;EACJ,CAAC;AACL,CAAC;AAED,MAAMC,aAAa,GAAIX,KAAa,IAAa;EAC7C,MAAM;IAAEQ,KAAK;IAAEC,OAAO;IAAEC;EAAQ,CAAC,GAAGX,SAAS,CAACC,KAAK,CAAC;EACpD,OAAQ,GAAEY,MAAM,CAACJ,KAAK,CAAC,CAACK,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAE,IAAGD,MAAM,CAACH,OAAO,CAAC,CAACI,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAE,IAAGD,MAAM,CAClFF,OACJ,CAAC,CAACG,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAE,EAAC;AACxB,CAAC;AAEM,MAAMC,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG,IAAIE,0BAAiB,CAAC;EAC5CC,IAAI,EAAE,MAAM;EACZC,WAAW,EAAE,2CAA2C;EACxD;EACAC,SAAS,EAAER,aAAa;EACxB;EACAS,UAAU,EAAET;AAChB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["GraphQLScalarType","WebinyError","re","parseTime","value","match","parsed","split","map","Number","length","hours","minutes","seconds","convertToTime","String","padStart","TimeScalar","name","description","serialize","parseValue"],"sources":["TimeScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport WebinyError from \"@webiny/error\";\n\nconst re = /^([0-9]{2}):([0-9]{2})(:([0-9]{2}))?$/;\n\nconst parseTime = (value?: unknown) => {\n    if (typeof value !== \"string\" || !value || value.match(re) === null) {\n        throw new WebinyError(\"Value does not look like time.\", \"TIME_VALIDATION_ERROR\", { value });\n    }\n    const parsed = value.split(\":\").map(Number);\n    if (parsed.length < 2) {\n        throw new WebinyError(`Could not parse the value.`, \"TIME_VALIDATION_ERROR\", { value });\n    }\n    const [hours, minutes, seconds = 0] = parsed;\n    if (hours >= 24) {\n        throw new WebinyError(`There cannot be more than 24 hours.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    } else if (minutes >= 60) {\n        throw new WebinyError(`There cannot be more than 59 minutes.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    } else if (seconds >= 60) {\n        throw new WebinyError(`There cannot be more than 59 seconds.`, \"TIME_VALIDATION_ERROR\", {\n            value\n        });\n    }\n    return {\n        hours,\n        minutes,\n        seconds\n    };\n};\n\nconst convertToTime = (value: unknown): string => {\n    const { hours, minutes, seconds } = parseTime(value);\n    return `${String(hours).padStart(2, \"0\")}:${String(minutes).padStart(2, \"0\")}:${String(\n        seconds\n    ).padStart(2, \"0\")}`;\n};\n\nexport const TimeScalar = new GraphQLScalarType({\n    name: \"Time\",\n    description: \"A custom type to support time-only input.\",\n    // sending to client\n    serialize: convertToTime,\n    // received from client\n    parseValue: convertToTime\n});\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,SAAS;AAC3C,OAAOC,WAAW,MAAM,eAAe;AAEvC,MAAMC,EAAE,GAAG,uCAAuC;AAElD,MAAMC,SAAS,GAAIC,KAAe,IAAK;EACnC,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,CAACA,KAAK,IAAIA,KAAK,CAACC,KAAK,CAACH,EAAE,CAAC,KAAK,IAAI,EAAE;IACjE,MAAM,IAAID,WAAW,CAAC,gCAAgC,EAAE,uBAAuB,EAAE;MAAEG;IAAM,CAAC,CAAC;EAC/F;EACA,MAAME,MAAM,GAAGF,KAAK,CAACG,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAC3C,IAAIH,MAAM,CAACI,MAAM,GAAG,CAAC,EAAE;IACnB,MAAM,IAAIT,WAAW,CAAC,4BAA4B,EAAE,uBAAuB,EAAE;MAAEG;IAAM,CAAC,CAAC;EAC3F;EACA,MAAM,CAACO,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,CAAC,CAAC,GAAGP,MAAM;EAC5C,IAAIK,KAAK,IAAI,EAAE,EAAE;IACb,MAAM,IAAIV,WAAW,CAAC,qCAAqC,EAAE,uBAAuB,EAAE;MAClFG;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIQ,OAAO,IAAI,EAAE,EAAE;IACtB,MAAM,IAAIX,WAAW,CAAC,uCAAuC,EAAE,uBAAuB,EAAE;MACpFG;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIS,OAAO,IAAI,EAAE,EAAE;IACtB,MAAM,IAAIZ,WAAW,CAAC,uCAAuC,EAAE,uBAAuB,EAAE;MACpFG;IACJ,CAAC,CAAC;EACN;EACA,OAAO;IACHO,KAAK;IACLC,OAAO;IACPC;EACJ,CAAC;AACL,CAAC;AAED,MAAMC,aAAa,GAAIV,KAAc,IAAa;EAC9C,MAAM;IAAEO,KAAK;IAAEC,OAAO;IAAEC;EAAQ,CAAC,GAAGV,SAAS,CAACC,KAAK,CAAC;EACpD,OAAO,GAAGW,MAAM,CAACJ,KAAK,CAAC,CAACK,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAID,MAAM,CAACH,OAAO,CAAC,CAACI,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAID,MAAM,CAClFF,OACJ,CAAC,CAACG,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;AACxB,CAAC;AAED,OAAO,MAAMC,UAAU,GAAG,IAAIjB,iBAAiB,CAAC;EAC5CkB,IAAI,EAAE,MAAM;EACZC,WAAW,EAAE,2CAA2C;EACxD;EACAC,SAAS,EAAEN,aAAa;EACxB;EACAO,UAAU,EAAEP;AAChB,CAAC,CAAC","ignoreList":[]}

package/builtInTypes/index.d.ts

@@ -1,9 +1,10 @@
-export * from "./AnyScalar";
-export * from "./DateScalar";
-export * from "./DateTimeScalar";
-export * from "./DateTimeZScalar";
-export * from "./JsonScalar";
-export * from "./LongScalar";
-export * from "./NumberScalar";
-export * from "./RefInputScalar";
-export * from "./TimeScalar";
+export * from "./AnyScalar.js";
+export * from "./DateScalar.js";
+export * from "./DateTimeScalar.js";
+export * from "./DateTimeZScalar.js";
+export * from "./JsonScalar.js";
+export * from "./LongScalar.js";
+export * from "./NumberScalar.js";
+export * from "./RefInputScalar.js";
+export * from "./TimeScalar.js";
+export * from "./IconScalar.js";

package/builtInTypes/index.js

@@ -1,106 +1,12 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _AnyScalar = require("./AnyScalar");
-Object.keys(_AnyScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _AnyScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _AnyScalar[key];
-    }
-  });
-});
-var _DateScalar = require("./DateScalar");
-Object.keys(_DateScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DateScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _DateScalar[key];
-    }
-  });
-});
-var _DateTimeScalar = require("./DateTimeScalar");
-Object.keys(_DateTimeScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DateTimeScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _DateTimeScalar[key];
-    }
-  });
-});
-var _DateTimeZScalar = require("./DateTimeZScalar");
-Object.keys(_DateTimeZScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DateTimeZScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _DateTimeZScalar[key];
-    }
-  });
-});
-var _JsonScalar = require("./JsonScalar");
-Object.keys(_JsonScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _JsonScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _JsonScalar[key];
-    }
-  });
-});
-var _LongScalar = require("./LongScalar");
-Object.keys(_LongScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LongScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _LongScalar[key];
-    }
-  });
-});
-var _NumberScalar = require("./NumberScalar");
-Object.keys(_NumberScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _NumberScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _NumberScalar[key];
-    }
-  });
-});
-var _RefInputScalar = require("./RefInputScalar");
-Object.keys(_RefInputScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _RefInputScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _RefInputScalar[key];
-    }
-  });
-});
-var _TimeScalar = require("./TimeScalar");
-Object.keys(_TimeScalar).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _TimeScalar[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _TimeScalar[key];
-    }
-  });
-});
+export * from "./AnyScalar.js";
+export * from "./DateScalar.js";
+export * from "./DateTimeScalar.js";
+export * from "./DateTimeZScalar.js";
+export * from "./JsonScalar.js";
+export * from "./LongScalar.js";
+export * from "./NumberScalar.js";
+export * from "./RefInputScalar.js";
+export * from "./TimeScalar.js";
+export * from "./IconScalar.js";
 
 //# sourceMappingURL=index.js.map

package/builtInTypes/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AnyScalar","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_DateScalar","_DateTimeScalar","_DateTimeZScalar","_JsonScalar","_LongScalar","_NumberScalar","_RefInputScalar","_TimeScalar"],"sources":["index.ts"],"sourcesContent":["export * from \"./AnyScalar\";\nexport * from \"./DateScalar\";\nexport * from \"./DateTimeScalar\";\nexport * from \"./DateTimeZScalar\";\nexport * from \"./JsonScalar\";\nexport * from \"./LongScalar\";\nexport * from \"./NumberScalar\";\nexport * from \"./RefInputScalar\";\nexport * from \"./TimeScalar\";\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./AnyScalar.js\";\nexport * from \"./DateScalar.js\";\nexport * from \"./DateTimeScalar.js\";\nexport * from \"./DateTimeZScalar.js\";\nexport * from \"./JsonScalar.js\";\nexport * from \"./LongScalar.js\";\nexport * from \"./NumberScalar.js\";\nexport * from \"./RefInputScalar.js\";\nexport * from \"./TimeScalar.js\";\nexport * from \"./IconScalar.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/createGraphQLHandler.d.ts

@@ -1,4 +1,4 @@
-import { PluginCollection } from "@webiny/plugins/types";
-import { HandlerGraphQLOptions } from "./types";
-declare const _default: (options?: HandlerGraphQLOptions) => PluginCollection;
+import type { Plugin } from "@webiny/plugins/types.js";
+import type { HandlerGraphQLOptions } from "./types.js";
+declare const _default: (options?: HandlerGraphQLOptions) => Plugin[];
 export default _default;

package/createGraphQLHandler.js

@@ -1,46 +1,30 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _boolean = require("boolean");
-var _handler = require("@webiny/handler");
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _createGraphQLSchema = require("./createGraphQLSchema");
-var _debugPlugins = _interopRequireDefault(require("./debugPlugins"));
-var _processRequestBody = require("./processRequestBody");
+import { boolean } from "boolean";
+import { RoutePlugin } from "@webiny/handler";
+import WebinyError from "@webiny/error";
+import { createGraphQLSchema, getSchemaPlugins } from "./createGraphQLSchema.js";
+import debugPlugins from "./debugPlugins.js";
+import { processRequestBody } from "./processRequestBody.js";
+import { createRequestBody } from "./createRequestBody.js";
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
 const createCacheKey = context => {
-  const plugins = (0, _createGraphQLSchema.getSchemaPlugins)(context);
+  const plugins = getSchemaPlugins(context);
   // TODO: in the near future, we have to assign a fixed name to every
   // TODO: GraphQLSchema plugin, to be able to create a reliable cache key.
 
   // TODO: `getCurrentTenant` should be injected as a parameter.
   // @ts-expect-error TODO: We should not be accessing `context` like this here.
   const tenant = context.tenancy?.getCurrentTenant();
-
-  // TODO: `getContentLocale` should be injected as a parameter.
-  // @ts-expect-error TODO: We should not be accessing `context` like this here.
-  const contentLocale = context.i18n?.getContentLocale();
-  return [tenant ? `tenant:${tenant.id}` : null, contentLocale ? `locale:${contentLocale.code}` : null, plugins.length.toString()].filter(Boolean).join("#");
-};
-const createRequestBody = body => {
-  /**
-   * We are trusting that the body payload is correct.
-   * The `processRequestBody` will fail if it is not.
-   */
-  return typeof body === "string" ? JSON.parse(body) : body;
+  return [tenant ? `tenant:${tenant.id}` : null, plugins.length.toString()].filter(Boolean).join("#");
 };
 const formatErrorPayload = error => {
-  if (error instanceof _error.default) {
+  if (error instanceof WebinyError) {
     return JSON.stringify({
       type: "CoreGraphQLWebinyError",
       message: error.message,
       code: error.code,
-      data: error.data
+      data: error.data,
+      stack: error.stack
     });
   }
   return JSON.stringify({
@@ -50,12 +34,12 @@ const formatErrorPayload = error => {
     stack: error.stack
   });
 };
-var _default = (options = {}) => {
+export default (options = {}) => {
   let schema = undefined;
   let cacheKey = undefined;
-  const debug = (0, _boolean.boolean)(options.debug);
+  const debug = boolean(options.debug);
   const path = options?.path || "/graphql";
-  const route = new _handler.RoutePlugin(async ({
+  const route = new RoutePlugin(async ({
     onPost,
     onOptions,
     context
@@ -69,7 +53,7 @@ var _default = (options = {}) => {
       const contextCacheKey = createCacheKey(context);
       if (!schema || cacheKey !== contextCacheKey) {
         try {
-          schema = (0, _createGraphQLSchema.createGraphQLSchema)(context);
+          schema = await createGraphQLSchema(context);
           cacheKey = contextCacheKey;
         } catch (ex) {
           return reply.code(500).send(formatErrorPayload(ex));
@@ -84,7 +68,14 @@ var _default = (options = {}) => {
         throw ex;
       }
       try {
-        const result = await (0, _processRequestBody.processRequestBody)(body, schema, context);
+        const result = await processRequestBody(body, schema, context);
+        /**
+         * IMPORTANT! Do not send anything if reply was already sent.
+         */
+        if (reply.sent) {
+          console.warn("Reply already sent, cannot send the result (handler-graphql).");
+          return reply;
+        }
         return reply.status(200).send(result);
       } catch (ex) {
         console.error(`Error while processing the body request.`);
@@ -94,10 +85,9 @@ var _default = (options = {}) => {
     });
   });
   route.name = "handler.graphql.route.default";
-  return [...(debug ? (0, _debugPlugins.default)() : []), {
+  return [...(debug ? debugPlugins() : []), {
     type: "wcp-telemetry-tracker"
   }, route];
 };
-exports.default = _default;
 
 //# sourceMappingURL=createGraphQLHandler.js.map

package/createGraphQLHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["_boolean","require","_handler","_error","_interopRequireDefault","_createGraphQLSchema","_debugPlugins","_processRequestBody","DEFAULT_CACHE_MAX_AGE","createCacheKey","context","plugins","getSchemaPlugins","tenant","tenancy","getCurrentTenant","contentLocale","i18n","getContentLocale","id","code","length","toString","filter","Boolean","join","createRequestBody","body","JSON","parse","formatErrorPayload","error","WebinyError","stringify","type","message","data","name","stack","_default","options","schema","undefined","cacheKey","debug","boolean","path","route","RoutePlugin","onPost","onOptions","_","reply","status","headers","send","hijack","request","contextCacheKey","createGraphQLSchema","ex","console","result","processRequestBody","debugPlugins","exports","default"],"sources":["createGraphQLHandler.ts"],"sourcesContent":["import { boolean } from \"boolean\";\nimport { GraphQLSchema } from \"graphql\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport WebinyError from \"@webiny/error\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport { Context } from \"@webiny/handler\";\nimport { GraphQLRequestBody, HandlerGraphQLOptions } from \"./types\";\nimport { createGraphQLSchema, getSchemaPlugins } from \"./createGraphQLSchema\";\nimport debugPlugins from \"./debugPlugins\";\nimport { processRequestBody } from \"./processRequestBody\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\nconst createCacheKey = (context: Context) => {\n    const plugins = getSchemaPlugins(context);\n    // TODO: in the near future, we have to assign a fixed name to every\n    // TODO: GraphQLSchema plugin, to be able to create a reliable cache key.\n\n    // TODO: `getCurrentTenant` should be injected as a parameter.\n    // @ts-expect-error TODO: We should not be accessing `context` like this here.\n    const tenant = context.tenancy?.getCurrentTenant();\n\n    // TODO: `getContentLocale` should be injected as a parameter.\n    // @ts-expect-error TODO: We should not be accessing `context` like this here.\n    const contentLocale = context.i18n?.getContentLocale();\n\n    return [\n        tenant ? `tenant:${tenant.id}` : null,\n        contentLocale ? `locale:${contentLocale.code}` : null,\n        plugins.length.toString()\n    ]\n        .filter(Boolean)\n        .join(\"#\");\n};\n\nconst createRequestBody = (body: unknown): GraphQLRequestBody | GraphQLRequestBody[] => {\n    /**\n     * We are trusting that the body payload is correct.\n     * The `processRequestBody` will fail if it is not.\n     */\n    return typeof body === \"string\" ? JSON.parse(body) : body;\n};\n\nconst formatErrorPayload = (error: Error): string => {\n    if (error instanceof WebinyError) {\n        return JSON.stringify({\n            type: \"CoreGraphQLWebinyError\",\n            message: error.message,\n            code: error.code,\n            data: error.data\n        });\n    }\n\n    return JSON.stringify({\n        type: \"Error\",\n        name: error.name,\n        message: error.message,\n        stack: error.stack\n    });\n};\n\nexport default (options: HandlerGraphQLOptions = {}): PluginCollection => {\n    let schema: GraphQLSchema | undefined = undefined;\n    let cacheKey: string | undefined = undefined;\n\n    const debug = boolean(options.debug);\n\n    const path = options?.path || \"/graphql\";\n\n    const route = new RoutePlugin(async ({ onPost, onOptions, context }) => {\n        onOptions(path, async (_, reply) => {\n            return reply\n                .status(204)\n                .headers({\n                    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n                })\n                .send({})\n                .hijack();\n        });\n        onPost(path, async (request, reply) => {\n            const contextCacheKey = createCacheKey(context as Context);\n            if (!schema || cacheKey !== contextCacheKey) {\n                try {\n                    schema = createGraphQLSchema(context);\n                    cacheKey = contextCacheKey;\n                } catch (ex) {\n                    return reply.code(500).send(formatErrorPayload(ex));\n                }\n            }\n            let body: GraphQLRequestBody | GraphQLRequestBody[];\n            try {\n                body = 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            try {\n                const result = await processRequestBody(body, schema, context);\n                return reply.status(200).send(result);\n            } catch (ex) {\n                console.error(`Error while processing the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        });\n    });\n\n    route.name = \"handler.graphql.route.default\";\n\n    return [\n        ...(debug ? debugPlugins() : []),\n        {\n            type: \"wcp-telemetry-tracker\"\n        },\n        route\n    ];\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["boolean","RoutePlugin","WebinyError","createGraphQLSchema","getSchemaPlugins","debugPlugins","processRequestBody","createRequestBody","DEFAULT_CACHE_MAX_AGE","createCacheKey","context","plugins","tenant","tenancy","getCurrentTenant","id","length","toString","filter","Boolean","join","formatErrorPayload","error","JSON","stringify","type","message","code","data","stack","name","options","schema","undefined","cacheKey","debug","path","route","onPost","onOptions","_","reply","status","headers","send","hijack","request","contextCacheKey","ex","body","console","result","sent","warn"],"sources":["createGraphQLHandler.ts"],"sourcesContent":["import { boolean } from \"boolean\";\nimport type { GraphQLSchema } from \"graphql\";\nimport type { Context } from \"@webiny/handler\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport WebinyError from \"@webiny/error\";\nimport type { Plugin } from \"@webiny/plugins/types.js\";\nimport type { GraphQLRequestBody, HandlerGraphQLOptions } from \"./types.js\";\nimport { createGraphQLSchema, getSchemaPlugins } from \"./createGraphQLSchema.js\";\nimport debugPlugins from \"./debugPlugins.js\";\nimport { processRequestBody } from \"./processRequestBody.js\";\nimport { createRequestBody } from \"~/createRequestBody.js\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\nconst createCacheKey = (context: Context) => {\n    const plugins = getSchemaPlugins(context);\n    // TODO: in the near future, we have to assign a fixed name to every\n    // TODO: GraphQLSchema plugin, to be able to create a reliable cache key.\n\n    // TODO: `getCurrentTenant` should be injected as a parameter.\n    // @ts-expect-error TODO: We should not be accessing `context` like this here.\n    const tenant = context.tenancy?.getCurrentTenant();\n\n    return [tenant ? `tenant:${tenant.id}` : null, plugins.length.toString()]\n        .filter(Boolean)\n        .join(\"#\");\n};\n\nconst formatErrorPayload = (error: Error): string => {\n    if (error instanceof WebinyError) {\n        return JSON.stringify({\n            type: \"CoreGraphQLWebinyError\",\n            message: error.message,\n            code: error.code,\n            data: error.data,\n            stack: error.stack\n        });\n    }\n\n    return JSON.stringify({\n        type: \"Error\",\n        name: error.name,\n        message: error.message,\n        stack: error.stack\n    });\n};\n\nexport default (options: HandlerGraphQLOptions = {}): Plugin[] => {\n    let schema: GraphQLSchema | undefined = undefined;\n    let cacheKey: string | undefined = undefined;\n\n    const debug = boolean(options.debug);\n\n    const path = options?.path || \"/graphql\";\n\n    const route = new RoutePlugin(async ({ onPost, onOptions, context }) => {\n        onOptions(path, async (_, reply) => {\n            return reply\n                .status(204)\n                .headers({\n                    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n                })\n                .send({})\n                .hijack();\n        });\n        onPost(path, async (request, reply) => {\n            const contextCacheKey = createCacheKey(context as Context);\n            if (!schema || cacheKey !== contextCacheKey) {\n                try {\n                    schema = await createGraphQLSchema(context);\n                    cacheKey = contextCacheKey;\n                } catch (ex) {\n                    return reply.code(500).send(formatErrorPayload(ex));\n                }\n            }\n            let body: GraphQLRequestBody | GraphQLRequestBody[];\n            try {\n                body = 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            try {\n                const result = await processRequestBody(body, schema, context);\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 (handler-graphql).\");\n                    return reply;\n                }\n                return reply.status(200).send(result);\n            } catch (ex) {\n                console.error(`Error while processing the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        });\n    });\n\n    route.name = \"handler.graphql.route.default\";\n\n    return [\n        ...(debug ? debugPlugins() : []),\n        {\n            type: \"wcp-telemetry-tracker\"\n        },\n        route\n    ];\n};\n"],"mappings":"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","ignoreList":[]}

package/createGraphQLSchema.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLSchemaPlugin } from "./types";
-import { Context } from "@webiny/api/types";
-export declare const getSchemaPlugins: (context: Context) => GraphQLSchemaPlugin<Context>[];
-export declare const createGraphQLSchema: (context: Context) => import("graphql").GraphQLSchema;
+import type { Context } from "@webiny/api/types.js";
+import type { GraphQLSchemaPlugin } from "./plugins/index.js";
+export declare const getSchemaPlugins: (context: Context) => import("@webiny/plugins/PluginsContainer.js").WithName<GraphQLSchemaPlugin<Context>>[];
+export declare const createGraphQLSchema: (context: Context) => Promise<import("graphql").GraphQLSchema>;

package/createGraphQLSchema.js

@@ -1,28 +1,28 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getSchemaPlugins = exports.createGraphQLSchema = void 0;
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _schema = require("@graphql-tools/schema");
-var _builtInTypes = require("./builtInTypes");
-const getSchemaPlugins = context => {
-  return context.plugins.byType("graphql-schema");
+import gql from "graphql-tag";
+import { makeExecutableSchema } from "@graphql-tools/schema";
+import { mergeResolvers } from "@graphql-tools/merge";
+import { RefInputScalar, NumberScalar, AnyScalar, DateScalar, DateTimeScalar, JsonScalar, TimeScalar, LongScalar, IconScalar } from "./builtInTypes/index.js";
+import { ResolverDecoration } from "./ResolverDecoration.js";
+import { GraphQLSchemaComposer } from "./features/GraphQLSchemaBuilder/abstractions.js";
+import { GraphQLSchemaComposerFeature } from "./features/GraphQLSchemaBuilder/feature.js";
+export const getSchemaPlugins = context => {
+  return context.plugins.byType("graphql-schema").filter(pl => {
+    if (typeof pl.isApplicable === "function") {
+      return pl.isApplicable(context);
+    }
+    return true;
+  });
 };
-exports.getSchemaPlugins = getSchemaPlugins;
-const createGraphQLSchema = context => {
+export const createGraphQLSchema = async context => {
+  GraphQLSchemaComposerFeature.register(context.container);
   const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
-
-  // TODO: once the API packages more closed, we'll have the opportunity
-  // TODO: to maybe import the @ps directive from `api-prerendering-service` package.
-  const typeDefs = [(0, _graphqlTag.default)`
+  const typeDefs = [gql`
             type Query
             type Mutation
             ${scalars.map(scalar => `scalar ${scalar.name}`).join(" ")}
             scalar JSON
             scalar Long
+            scalar Icon
             scalar RefInput
             scalar Number
             scalar Any
@@ -30,42 +30,69 @@ const createGraphQLSchema = context => {
             scalar DateTime
             scalar Time
 
-            # This directive doesn't do anything on the GraphQL resolution level. It just serves
-            # as a way to tell the Prerendering Service whether the GraphQL query needs to be
-            # cached or not.
-            directive @ps(cache: Boolean) on QUERY
+            type Error {
+                code: String
+                message: String
+                data: JSON
+                stack: String
+            }
+
+            type BooleanResponse {
+                data: Boolean
+                error: Error
+            }
         `];
   const resolvers = [{
     ...scalars.reduce((acc, s) => {
       acc[s.name] = s;
       return acc;
     }, {}),
-    JSON: _builtInTypes.JsonScalar,
-    Long: _builtInTypes.LongScalar,
-    RefInput: _builtInTypes.RefInputScalar,
-    Number: _builtInTypes.NumberScalar,
-    Any: _builtInTypes.AnyScalar,
-    DateTime: _builtInTypes.DateTimeScalar,
-    Date: _builtInTypes.DateScalar,
-    Time: _builtInTypes.TimeScalar
+    JSON: JsonScalar,
+    Long: LongScalar,
+    RefInput: RefInputScalar,
+    Number: NumberScalar,
+    Any: AnyScalar,
+    DateTime: DateTimeScalar,
+    Date: DateScalar,
+    Time: TimeScalar,
+    Icon: IconScalar
   }];
+  const resolverDecoration = new ResolverDecoration();
+
+  // Process legacy plugins
   const plugins = getSchemaPlugins(context);
   for (const plugin of plugins) {
-    /**
-     * TODO @ts-refactor
-     * Figure out correct types on typeDefs and resolvers
-     */
-    // @ts-expect-error
-    typeDefs.push(plugin.schema.typeDefs);
-    // @ts-expect-error
-    resolvers.push(plugin.schema.resolvers);
+    const schema = plugin.schema;
+    if (schema.typeDefs) {
+      typeDefs.push(schema.typeDefs);
+    }
+    if (schema.resolvers) {
+      resolvers.push(schema.resolvers);
+    }
+    if (schema.resolverDecorators) {
+      resolverDecoration.addDecorators(schema.resolverDecorators);
+    }
   }
-  return (0, _schema.makeExecutableSchema)({
+
+  // Process new DI implementations
+  const graphQLSchemaComposer = context.container.resolve(GraphQLSchemaComposer);
+  const schema = await graphQLSchemaComposer.build();
+  if (schema.typeDefs) {
+    typeDefs.push(schema.typeDefs);
+  }
+  if (schema.resolvers) {
+    resolvers.push(schema.resolvers);
+  }
+  if (schema.resolverDecorators) {
+    resolverDecoration.addDecorators(schema.resolverDecorators);
+  }
+
+  // Create executable schema
+  return makeExecutableSchema({
     typeDefs,
-    resolvers,
+    resolvers: resolverDecoration.decorateResolvers(mergeResolvers(resolvers)),
     inheritResolversFromInterfaces: true
   });
 };
-exports.createGraphQLSchema = createGraphQLSchema;
 
 //# sourceMappingURL=createGraphQLSchema.js.map

package/createGraphQLSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_graphqlTag","_interopRequireDefault","require","_schema","_builtInTypes","getSchemaPlugins","context","plugins","byType","exports","createGraphQLSchema","scalars","map","item","scalar","typeDefs","gql","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","Date","DateScalar","Time","TimeScalar","plugin","push","schema","makeExecutableSchema","inheritResolversFromInterfaces"],"sources":["createGraphQLSchema.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { GraphQLScalarPlugin, GraphQLSchemaPlugin } from \"./types\";\nimport { Context } from \"@webiny/api/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    JsonScalar,\n    TimeScalar,\n    LongScalar\n} from \"./builtInTypes\";\nimport { GraphQLScalarType } from \"graphql/type/definition\";\n\nexport const getSchemaPlugins = (context: Context) => {\n    return context.plugins.byType<GraphQLSchemaPlugin>(\"graphql-schema\");\n};\n\nexport const createGraphQLSchema = (context: Context) => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    // TODO: once the API packages more closed, we'll have the opportunity\n    // TODO: to maybe import the @ps directive from `api-prerendering-service` package.\n    const typeDefs = [\n        gql`\n            type Query\n            type Mutation\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 Time\n\n            # This directive doesn't do anything on the GraphQL resolution level. It just serves\n            # as a way to tell the Prerendering Service whether the GraphQL query needs to be\n            # cached or not.\n            directive @ps(cache: Boolean) on QUERY\n        `\n    ];\n\n    const resolvers = [\n        {\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            Date: DateScalar,\n            Time: TimeScalar\n        }\n    ];\n\n    const plugins = getSchemaPlugins(context);\n    for (const plugin of plugins) {\n        /**\n         * TODO @ts-refactor\n         * Figure out correct types on typeDefs and resolvers\n         */\n        // @ts-expect-error\n        typeDefs.push(plugin.schema.typeDefs);\n        // @ts-expect-error\n        resolvers.push(plugin.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers,\n        inheritResolversFromInterfaces: true\n    });\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAGA,IAAAE,aAAA,GAAAF,OAAA;AAYO,MAAMG,gBAAgB,GAAIC,OAAgB,IAAK;EAClD,OAAOA,OAAO,CAACC,OAAO,CAACC,MAAM,CAAsB,gBAAgB,CAAC;AACxE,CAAC;AAACC,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA;AAEK,MAAMK,mBAAmB,GAAIJ,OAAgB,IAAK;EACrD,MAAMK,OAAO,GAAGL,OAAO,CAACC,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CI,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;;EAE7B;EACA;EACA,MAAMC,QAAQ,GAAG,CACb,IAAAC,mBAAG,CAAC;AACZ;AACA;AACA,cAAcL,OAAO,CAACC,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,CACJ;EAED,MAAMC,SAAS,GAAG,CACd;IACI,GAAGR,OAAO,CAACS,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;IACNE,IAAI,EAAEC,wBAAU;IAChBC,IAAI,EAAEC,wBAAU;IAChBC,QAAQ,EAAEC,4BAAc;IACxBC,MAAM,EAAEC,0BAAY;IACpBC,GAAG,EAAEC,uBAAS;IACdC,QAAQ,EAAEC,4BAAc;IACxBC,IAAI,EAAEC,wBAAU;IAChBC,IAAI,EAAEC;EACV,CAAC,CACJ;EAED,MAAM/B,OAAO,GAAGF,gBAAgB,CAACC,OAAO,CAAC;EACzC,KAAK,MAAMiC,MAAM,IAAIhC,OAAO,EAAE;IAC1B;AACR;AACA;AACA;IACQ;IACAQ,QAAQ,CAACyB,IAAI,CAACD,MAAM,CAACE,MAAM,CAAC1B,QAAQ,CAAC;IACrC;IACAI,SAAS,CAACqB,IAAI,CAACD,MAAM,CAACE,MAAM,CAACtB,SAAS,CAAC;EAC3C;EAEA,OAAO,IAAAuB,4BAAoB,EAAC;IACxB3B,QAAQ;IACRI,SAAS;IACTwB,8BAA8B,EAAE;EACpC,CAAC,CAAC;AACN,CAAC;AAAClC,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["gql","makeExecutableSchema","mergeResolvers","RefInputScalar","NumberScalar","AnyScalar","DateScalar","DateTimeScalar","JsonScalar","TimeScalar","LongScalar","IconScalar","ResolverDecoration","GraphQLSchemaComposer","GraphQLSchemaComposerFeature","getSchemaPlugins","context","plugins","byType","filter","pl","isApplicable","createGraphQLSchema","register","container","scalars","map","item","scalar","typeDefs","name","join","resolvers","reduce","acc","s","JSON","Long","RefInput","Number","Any","DateTime","Date","Time","Icon","resolverDecoration","plugin","schema","push","resolverDecorators","addDecorators","graphQLSchemaComposer","resolve","build","decorateResolvers","inheritResolversFromInterfaces"],"sources":["createGraphQLSchema.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { mergeResolvers } from \"@graphql-tools/merge\";\nimport type { GraphQLScalarType } from \"graphql/type/definition.js\";\nimport type { GraphQLScalarPlugin, Resolvers, TypeDefs } from \"./types.js\";\nimport type { Context } from \"@webiny/api/types.js\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    JsonScalar,\n    TimeScalar,\n    LongScalar,\n    IconScalar\n} from \"./builtInTypes/index.js\";\nimport { ResolverDecoration } from \"./ResolverDecoration.js\";\nimport type { GraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport { GraphQLSchemaComposer } from \"~/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { GraphQLSchemaComposerFeature } from \"~/features/GraphQLSchemaBuilder/feature.js\";\n\nexport const getSchemaPlugins = (context: Context) => {\n    return context.plugins.byType<GraphQLSchemaPlugin>(\"graphql-schema\").filter(pl => {\n        if (typeof pl.isApplicable === \"function\") {\n            return pl.isApplicable(context);\n        }\n        return true;\n    });\n};\n\nexport const createGraphQLSchema = async (context: Context) => {\n    GraphQLSchemaComposerFeature.register(context.container);\n\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const typeDefs: TypeDefs[] = [\n        gql`\n            type Query\n            type Mutation\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar Icon\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar Time\n\n            type Error {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type BooleanResponse {\n                data: Boolean\n                error: Error\n            }\n        `\n    ];\n\n    const resolvers: Resolvers<any>[] = [\n        {\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            Date: DateScalar,\n            Time: TimeScalar,\n            Icon: IconScalar\n        }\n    ];\n\n    const resolverDecoration = new ResolverDecoration();\n\n    // Process legacy plugins\n    const plugins = getSchemaPlugins(context);\n\n    for (const plugin of plugins) {\n        const schema = plugin.schema;\n        if (schema.typeDefs) {\n            typeDefs.push(schema.typeDefs);\n        }\n        if (schema.resolvers) {\n            resolvers.push(schema.resolvers);\n        }\n        if (schema.resolverDecorators) {\n            resolverDecoration.addDecorators(schema.resolverDecorators);\n        }\n    }\n\n    // Process new DI implementations\n    const graphQLSchemaComposer = context.container.resolve(GraphQLSchemaComposer);\n    const schema = await graphQLSchemaComposer.build();\n\n    if (schema.typeDefs) {\n        typeDefs.push(schema.typeDefs);\n    }\n    if (schema.resolvers) {\n        resolvers.push(schema.resolvers);\n    }\n    if (schema.resolverDecorators) {\n        resolverDecoration.addDecorators(schema.resolverDecorators);\n    }\n\n    // Create executable schema\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers: resolverDecoration.decorateResolvers(mergeResolvers(resolvers)),\n        inheritResolversFromInterfaces: true\n    });\n};\n"],"mappings":"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","ignoreList":[]}

package/createRequestBody.d.ts

@@ -0,0 +1,2 @@
+import type { GraphQLRequestBody } from "./types.js";
+export declare const createRequestBody: (input: unknown) => GraphQLRequestBody | GraphQLRequestBody[];

package/createRequestBody.js

@@ -0,0 +1,26 @@
+import zod from "zod";
+import { WebinyError } from "@webiny/error";
+import { createZodError } from "@webiny/utils/createZodError.js";
+const requestBodySchema = zod.object({
+  query: zod.string(),
+  variables: zod.record(zod.any()).nullish().optional(),
+  operationName: zod.string().nullish().optional().transform(value => {
+    return value || undefined;
+  })
+}).passthrough();
+const schema = zod.union([requestBodySchema, zod.array(requestBodySchema)]);
+export const createRequestBody = input => {
+  const body = typeof input === "string" ? JSON.parse(input) : input;
+  const result = schema.safeParse(body);
+  if (!result.success) {
+    const error = createZodError(result.error);
+    throw new WebinyError({
+      message: "Invalid GraphQL request! Check your query and variables.",
+      code: "GRAPHQL_REQUEST_INVALID",
+      data: error.data
+    });
+  }
+  return result.data;
+};
+
+//# sourceMappingURL=createRequestBody.js.map

package/createRequestBody.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["zod","WebinyError","createZodError","requestBodySchema","object","query","string","variables","record","any","nullish","optional","operationName","transform","value","undefined","passthrough","schema","union","array","createRequestBody","input","body","JSON","parse","result","safeParse","success","error","message","code","data"],"sources":["createRequestBody.ts"],"sourcesContent":["import zod from \"zod\";\nimport { WebinyError } from \"@webiny/error\";\nimport { createZodError } from \"@webiny/utils/createZodError.js\";\nimport type { GraphQLRequestBody } from \"~/types.js\";\n\nconst requestBodySchema = zod\n    .object({\n        query: zod.string(),\n        variables: zod.record(zod.any()).nullish().optional(),\n        operationName: zod\n            .string()\n            .nullish()\n            .optional()\n            .transform(value => {\n                return value || undefined;\n            })\n    })\n    .passthrough();\n\nconst schema = zod.union([requestBodySchema, zod.array(requestBodySchema)]);\n\nexport const createRequestBody = (input: unknown): GraphQLRequestBody | GraphQLRequestBody[] => {\n    const body = typeof input === \"string\" ? JSON.parse(input) : input;\n\n    const result = schema.safeParse(body);\n    if (!result.success) {\n        const error = createZodError(result.error);\n        throw new WebinyError({\n            message: \"Invalid GraphQL request! Check your query and variables.\",\n            code: \"GRAPHQL_REQUEST_INVALID\",\n            data: error.data\n        });\n    }\n    return result.data;\n};\n"],"mappings":"AAAA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,WAAW,QAAQ,eAAe;AAC3C,SAASC,cAAc,QAAQ,iCAAiC;AAGhE,MAAMC,iBAAiB,GAAGH,GAAG,CACxBI,MAAM,CAAC;EACJC,KAAK,EAAEL,GAAG,CAACM,MAAM,CAAC,CAAC;EACnBC,SAAS,EAAEP,GAAG,CAACQ,MAAM,CAACR,GAAG,CAACS,GAAG,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;EACrDC,aAAa,EAAEZ,GAAG,CACbM,MAAM,CAAC,CAAC,CACRI,OAAO,CAAC,CAAC,CACTC,QAAQ,CAAC,CAAC,CACVE,SAAS,CAACC,KAAK,IAAI;IAChB,OAAOA,KAAK,IAAIC,SAAS;EAC7B,CAAC;AACT,CAAC,CAAC,CACDC,WAAW,CAAC,CAAC;AAElB,MAAMC,MAAM,GAAGjB,GAAG,CAACkB,KAAK,CAAC,CAACf,iBAAiB,EAAEH,GAAG,CAACmB,KAAK,CAAChB,iBAAiB,CAAC,CAAC,CAAC;AAE3E,OAAO,MAAMiB,iBAAiB,GAAIC,KAAc,IAAgD;EAC5F,MAAMC,IAAI,GAAG,OAAOD,KAAK,KAAK,QAAQ,GAAGE,IAAI,CAACC,KAAK,CAACH,KAAK,CAAC,GAAGA,KAAK;EAElE,MAAMI,MAAM,GAAGR,MAAM,CAACS,SAAS,CAACJ,IAAI,CAAC;EACrC,IAAI,CAACG,MAAM,CAACE,OAAO,EAAE;IACjB,MAAMC,KAAK,GAAG1B,cAAc,CAACuB,MAAM,CAACG,KAAK,CAAC;IAC1C,MAAM,IAAI3B,WAAW,CAAC;MAClB4B,OAAO,EAAE,0DAA0D;MACnEC,IAAI,EAAE,yBAAyB;MAC/BC,IAAI,EAAEH,KAAK,CAACG;IAChB,CAAC,CAAC;EACN;EACA,OAAON,MAAM,CAACM,IAAI;AACtB,CAAC","ignoreList":[]}