@webiny/handler-graphql 0.0.0-unstable.aad28a72ae → 0.0.0-unstable.ac6ebf63c6

package/builtInTypes/NumberScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["parseValue","value","String","match","WebinyError","undefined","isNaN","parseFloat","NumberScalar","GraphQLScalarType","name","description","serialize","ex","console","log","message","code","data","parseLiteral","ast","kind","Kind","INT","Number","FLOAT","Error"],"sources":["NumberScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport { Kind } from \"graphql/language\";\nimport WebinyError from \"@webiny/error\";\n\nconst parseValue = (value: any) => {\n    if (String(value).match(/^0x/) !== null) {\n        throw new WebinyError(\"Value sent must be a non-hex number.\", \"INVALID_VALUE\", {\n            value\n        });\n    } else if (typeof value === \"number\") {\n        return value;\n    } else if (value === null || value === undefined) {\n        return null;\n    } else if (isNaN(value) === true) {\n        throw new WebinyError(\"Value sent must be a number.\", \"INVALID_VALUE\", {\n            value\n        });\n    }\n    return parseFloat(value);\n};\n\nexport const NumberScalar = new GraphQLScalarType({\n    name: \"Number\",\n    description: \"A custom input type to be used with numbers. Supports Int and Float.\",\n    serialize: (value: any) => {\n        try {\n            return parseValue(value);\n        } catch (ex) {\n            console.log({\n                message: \"Value sent must be a number.\",\n                code: \"INVALID_VALUE\",\n                data: {\n                    value\n                }\n            });\n            return null;\n        }\n    },\n    parseValue,\n    parseLiteral: ast => {\n        const value = (ast as any).value;\n        if (ast.kind === Kind.INT) {\n            return Number(value);\n        } else if (ast.kind === Kind.FLOAT) {\n            return parseFloat(value);\n        }\n        throw new Error(`Expected type Number, found {${value}}`);\n    }\n});\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEA,MAAMA,UAAU,GAAIC,KAAD,IAAgB;EAC/B,IAAIC,MAAM,CAACD,KAAD,CAAN,CAAcE,KAAd,CAAoB,KAApB,MAA+B,IAAnC,EAAyC;IACrC,MAAM,IAAIC,cAAJ,CAAgB,sCAAhB,EAAwD,eAAxD,EAAyE;MAC3EH;IAD2E,CAAzE,CAAN;EAGH,CAJD,MAIO,IAAI,OAAOA,KAAP,KAAiB,QAArB,EAA+B;IAClC,OAAOA,KAAP;EACH,CAFM,MAEA,IAAIA,KAAK,KAAK,IAAV,IAAkBA,KAAK,KAAKI,SAAhC,EAA2C;IAC9C,OAAO,IAAP;EACH,CAFM,MAEA,IAAIC,KAAK,CAACL,KAAD,CAAL,KAAiB,IAArB,EAA2B;IAC9B,MAAM,IAAIG,cAAJ,CAAgB,8BAAhB,EAAgD,eAAhD,EAAiE;MACnEH;IADmE,CAAjE,CAAN;EAGH;;EACD,OAAOM,UAAU,CAACN,KAAD,CAAjB;AACH,CAfD;;AAiBO,MAAMO,YAAY,GAAG,IAAIC,0BAAJ,CAAsB;EAC9CC,IAAI,EAAE,QADwC;EAE9CC,WAAW,EAAE,sEAFiC;EAG9CC,SAAS,EAAGX,KAAD,IAAgB;IACvB,IAAI;MACA,OAAOD,UAAU,CAACC,KAAD,CAAjB;IACH,CAFD,CAEE,OAAOY,EAAP,EAAW;MACTC,OAAO,CAACC,GAAR,CAAY;QACRC,OAAO,EAAE,8BADD;QAERC,IAAI,EAAE,eAFE;QAGRC,IAAI,EAAE;UACFjB;QADE;MAHE,CAAZ;MAOA,OAAO,IAAP;IACH;EACJ,CAhB6C;EAiB9CD,UAjB8C;EAkB9CmB,YAAY,EAAEC,GAAG,IAAI;IACjB,MAAMnB,KAAK,GAAImB,GAAD,CAAanB,KAA3B;;IACA,IAAImB,GAAG,CAACC,IAAJ,KAAaC,cAAA,CAAKC,GAAtB,EAA2B;MACvB,OAAOC,MAAM,CAACvB,KAAD,CAAb;IACH,CAFD,MAEO,IAAImB,GAAG,CAACC,IAAJ,KAAaC,cAAA,CAAKG,KAAtB,EAA6B;MAChC,OAAOlB,UAAU,CAACN,KAAD,CAAjB;IACH;;IACD,MAAM,IAAIyB,KAAJ,CAAW,gCAA+BzB,KAAM,GAAhD,CAAN;EACH;AA1B6C,CAAtB,CAArB"}
+{"version":3,"names":["GraphQLScalarType","Kind","WebinyError","parseValue","value","String","match","undefined","isNaN","parseFloat","NumberScalar","name","description","serialize","console","log","message","code","data","parseLiteral","ast","kind","INT","Number","FLOAT","Error"],"sources":["NumberScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport { Kind } from \"graphql/language/index.js\";\nimport WebinyError from \"@webiny/error\";\n\nconst parseValue = (value: any) => {\n    if (String(value).match(/^0x/) !== null) {\n        throw new WebinyError(\"Value sent must be a non-hex number.\", \"INVALID_VALUE\", {\n            value\n        });\n    } else if (typeof value === \"number\") {\n        return value;\n    } else if (value === null || value === undefined) {\n        return null;\n    } else if (isNaN(value) === true) {\n        throw new WebinyError(\"Value sent must be a number.\", \"INVALID_VALUE\", {\n            value\n        });\n    }\n    return parseFloat(value);\n};\n\nexport const NumberScalar = new GraphQLScalarType({\n    name: \"Number\",\n    description: \"A custom input type to be used with numbers. Supports Int and Float.\",\n    serialize: (value: any) => {\n        try {\n            return parseValue(value);\n        } catch {\n            console.log({\n                message: \"Value sent must be a number.\",\n                code: \"INVALID_VALUE\",\n                data: {\n                    value\n                }\n            });\n            return null;\n        }\n    },\n    parseValue,\n    parseLiteral: ast => {\n        if (ast.kind === Kind.INT) {\n            return Number(ast.value);\n        } else if (ast.kind === Kind.FLOAT) {\n            return parseFloat(ast.value);\n        }\n        throw new Error(`Expected type Number, found {${ast.kind}}`);\n    }\n});\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,SAAS;AAC3C,SAASC,IAAI,QAAQ,2BAA2B;AAChD,OAAOC,WAAW,MAAM,eAAe;AAEvC,MAAMC,UAAU,GAAIC,KAAU,IAAK;EAC/B,IAAIC,MAAM,CAACD,KAAK,CAAC,CAACE,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;IACrC,MAAM,IAAIJ,WAAW,CAAC,sCAAsC,EAAE,eAAe,EAAE;MAC3EE;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAClC,OAAOA,KAAK;EAChB,CAAC,MAAM,IAAIA,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKG,SAAS,EAAE;IAC9C,OAAO,IAAI;EACf,CAAC,MAAM,IAAIC,KAAK,CAACJ,KAAK,CAAC,KAAK,IAAI,EAAE;IAC9B,MAAM,IAAIF,WAAW,CAAC,8BAA8B,EAAE,eAAe,EAAE;MACnEE;IACJ,CAAC,CAAC;EACN;EACA,OAAOK,UAAU,CAACL,KAAK,CAAC;AAC5B,CAAC;AAED,OAAO,MAAMM,YAAY,GAAG,IAAIV,iBAAiB,CAAC;EAC9CW,IAAI,EAAE,QAAQ;EACdC,WAAW,EAAE,sEAAsE;EACnFC,SAAS,EAAGT,KAAU,IAAK;IACvB,IAAI;MACA,OAAOD,UAAU,CAACC,KAAK,CAAC;IAC5B,CAAC,CAAC,MAAM;MACJU,OAAO,CAACC,GAAG,CAAC;QACRC,OAAO,EAAE,8BAA8B;QACvCC,IAAI,EAAE,eAAe;QACrBC,IAAI,EAAE;UACFd;QACJ;MACJ,CAAC,CAAC;MACF,OAAO,IAAI;IACf;EACJ,CAAC;EACDD,UAAU;EACVgB,YAAY,EAAEC,GAAG,IAAI;IACjB,IAAIA,GAAG,CAACC,IAAI,KAAKpB,IAAI,CAACqB,GAAG,EAAE;MACvB,OAAOC,MAAM,CAACH,GAAG,CAAChB,KAAK,CAAC;IAC5B,CAAC,MAAM,IAAIgB,GAAG,CAACC,IAAI,KAAKpB,IAAI,CAACuB,KAAK,EAAE;MAChC,OAAOf,UAAU,CAACW,GAAG,CAAChB,KAAK,CAAC;IAChC;IACA,MAAM,IAAIqB,KAAK,CAAC,gCAAgCL,GAAG,CAACC,IAAI,GAAG,CAAC;EAChE;AACJ,CAAC,CAAC","ignoreList":[]}

package/builtInTypes/RefInputScalar.d.ts

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

package/builtInTypes/RefInputScalar.js

@@ -1,65 +1,76 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.RefInput = void 0;
-
-var _graphql = require("graphql");
-
-const isMongoId = value => {
-  if (/^[0-9a-fA-F]{24}$/.test(value)) {
-    return value;
+import { GraphQLScalarType } from "graphql";
+const tests = [{
+  re: /^([0-9a-zA-Z_-]+)$/,
+  message: "Must be a string matching a-z, A-Z, 0-9, underscore (_) or dash(-)!"
+}, {
+  re: /^-/,
+  message: "Must not start with a dash (-)!"
+}, {
+  re: /-$/,
+  message: "Must not end with a dash (-)!"
+}, {
+  re: /^_/,
+  message: "Must not start with an underscore (_)!"
+}, {
+  re: /_$/,
+  message: "Must not end with an underscore (_)!"
+}];
+const isValidId = value => {
+  if (typeof value !== "string" || value.length < 1) {
+    throw new Error("Must be a string with at least 1 character!");
   }
-
-  throw new Error("Must be a valid Mongo ID!");
+  for (const test of tests) {
+    if (test.re.test(value) === null) {
+      throw new Error(test.message);
+    }
+  }
+  return value;
 };
-
-const RefInput = new _graphql.GraphQLScalarType({
+export const RefInputScalar = new GraphQLScalarType({
   name: "RefInput",
   description: "A custom input type to be used with references. Supports plain ID and `{ id: ID }` Object literal.",
+  /**
+   * We can set value as any because we are handling it.
+   */
   serialize: value => {
     if (!value || value.id === null) {
       return null;
     }
-
     return typeof value === "string" ? value : value.id;
   },
+  /**
+   * We can set value as any because we are handling it.
+   */
   parseValue: value => {
     if (!value || value.id === null) {
       return null;
     }
-
     if (typeof value === "string") {
-      return isMongoId(value);
+      return isValidId(value);
     }
-
     if ("id" in value) {
-      return isMongoId(value.id);
+      return isValidId(value.id);
     }
-
     throw new Error("Invalid RefInput value!");
   },
   parseLiteral: ast => {
     if (ast.kind === "StringValue") {
-      return isMongoId(ast.value);
+      return isValidId(ast.value);
     }
-
     if (ast.kind === "ObjectValue") {
       for (let i = 0; i < ast.fields.length; i++) {
         const {
           name,
           value
         } = ast.fields[i];
-
         if (name.value === "id") {
-          // @ts-ignore
-          return isMongoId(value.value);
+          // @ts-expect-error
+          return isValidId(value.value);
         }
       }
     }
-
     throw new Error("Invalid RefInput value!");
   }
 });
-exports.RefInput = RefInput;
+
+//# sourceMappingURL=RefInputScalar.js.map

package/builtInTypes/RefInputScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["isMongoId","value","test","Error","RefInput","GraphQLScalarType","name","description","serialize","id","parseValue","parseLiteral","ast","kind","i","fields","length"],"sources":["RefInputScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\n\nconst isMongoId = (value: any): string => {\n    if (/^[0-9a-fA-F]{24}$/.test(value)) {\n        return value;\n    }\n\n    throw new Error(\"Must be a valid Mongo ID!\");\n};\n\nexport const RefInput = new GraphQLScalarType({\n    name: \"RefInput\",\n    description:\n        \"A custom input type to be used with references. Supports plain ID and `{ id: ID }` Object literal.\",\n    serialize: value => {\n        if (!value || value.id === null) {\n            return null;\n        }\n\n        return typeof value === \"string\" ? value : value.id;\n    },\n    parseValue: value => {\n        if (!value || value.id === null) {\n            return null;\n        }\n\n        if (typeof value === \"string\") {\n            return isMongoId(value);\n        }\n\n        if (\"id\" in value) {\n            return isMongoId(value.id);\n        }\n\n        throw new Error(\"Invalid RefInput value!\");\n    },\n    parseLiteral: ast => {\n        if (ast.kind === \"StringValue\") {\n            return isMongoId(ast.value);\n        }\n\n        if (ast.kind === \"ObjectValue\") {\n            for (let i = 0; i < ast.fields.length; i++) {\n                const { name, value } = ast.fields[i];\n                if (name.value === \"id\") {\n                    // @ts-ignore\n                    return isMongoId(value.value);\n                }\n            }\n        }\n\n        throw new Error(\"Invalid RefInput value!\");\n    }\n});\n"],"mappings":";;;;;;;AAAA;;AAEA,MAAMA,SAAS,GAAIC,KAAD,IAAwB;EACtC,IAAI,oBAAoBC,IAApB,CAAyBD,KAAzB,CAAJ,EAAqC;IACjC,OAAOA,KAAP;EACH;;EAED,MAAM,IAAIE,KAAJ,CAAU,2BAAV,CAAN;AACH,CAND;;AAQO,MAAMC,QAAQ,GAAG,IAAIC,0BAAJ,CAAsB;EAC1CC,IAAI,EAAE,UADoC;EAE1CC,WAAW,EACP,oGAHsC;EAI1CC,SAAS,EAAEP,KAAK,IAAI;IAChB,IAAI,CAACA,KAAD,IAAUA,KAAK,CAACQ,EAAN,KAAa,IAA3B,EAAiC;MAC7B,OAAO,IAAP;IACH;;IAED,OAAO,OAAOR,KAAP,KAAiB,QAAjB,GAA4BA,KAA5B,GAAoCA,KAAK,CAACQ,EAAjD;EACH,CAVyC;EAW1CC,UAAU,EAAET,KAAK,IAAI;IACjB,IAAI,CAACA,KAAD,IAAUA,KAAK,CAACQ,EAAN,KAAa,IAA3B,EAAiC;MAC7B,OAAO,IAAP;IACH;;IAED,IAAI,OAAOR,KAAP,KAAiB,QAArB,EAA+B;MAC3B,OAAOD,SAAS,CAACC,KAAD,CAAhB;IACH;;IAED,IAAI,QAAQA,KAAZ,EAAmB;MACf,OAAOD,SAAS,CAACC,KAAK,CAACQ,EAAP,CAAhB;IACH;;IAED,MAAM,IAAIN,KAAJ,CAAU,yBAAV,CAAN;EACH,CAzByC;EA0B1CQ,YAAY,EAAEC,GAAG,IAAI;IACjB,IAAIA,GAAG,CAACC,IAAJ,KAAa,aAAjB,EAAgC;MAC5B,OAAOb,SAAS,CAACY,GAAG,CAACX,KAAL,CAAhB;IACH;;IAED,IAAIW,GAAG,CAACC,IAAJ,KAAa,aAAjB,EAAgC;MAC5B,KAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGF,GAAG,CAACG,MAAJ,CAAWC,MAA/B,EAAuCF,CAAC,EAAxC,EAA4C;QACxC,MAAM;UAAER,IAAF;UAAQL;QAAR,IAAkBW,GAAG,CAACG,MAAJ,CAAWD,CAAX,CAAxB;;QACA,IAAIR,IAAI,CAACL,KAAL,KAAe,IAAnB,EAAyB;UACrB;UACA,OAAOD,SAAS,CAACC,KAAK,CAACA,KAAP,CAAhB;QACH;MACJ;IACJ;;IAED,MAAM,IAAIE,KAAJ,CAAU,yBAAV,CAAN;EACH;AA1CyC,CAAtB,CAAjB"}
+{"version":3,"names":["GraphQLScalarType","tests","re","message","isValidId","value","length","Error","test","RefInputScalar","name","description","serialize","id","parseValue","parseLiteral","ast","kind","i","fields"],"sources":["RefInputScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\n\nconst tests = [\n    {\n        re: /^([0-9a-zA-Z_-]+)$/,\n        message: \"Must be a string matching a-z, A-Z, 0-9, underscore (_) or dash(-)!\"\n    },\n    {\n        re: /^-/,\n        message: \"Must not start with a dash (-)!\"\n    },\n    {\n        re: /-$/,\n        message: \"Must not end with a dash (-)!\"\n    },\n    {\n        re: /^_/,\n        message: \"Must not start with an underscore (_)!\"\n    },\n    {\n        re: /_$/,\n        message: \"Must not end with an underscore (_)!\"\n    }\n];\n\nconst isValidId = (value: any): string => {\n    if (typeof value !== \"string\" || value.length < 1) {\n        throw new Error(\"Must be a string with at least 1 character!\");\n    }\n    for (const test of tests) {\n        if (test.re.test(value) === null) {\n            throw new Error(test.message);\n        }\n    }\n    return value;\n};\n\nexport const RefInputScalar = new GraphQLScalarType({\n    name: \"RefInput\",\n    description:\n        \"A custom input type to be used with references. Supports plain ID and `{ id: ID }` Object literal.\",\n    /**\n     * We can set value as any because we are handling it.\n     */\n    serialize: (value: any) => {\n        if (!value || value.id === null) {\n            return null;\n        }\n\n        return typeof value === \"string\" ? value : value.id;\n    },\n    /**\n     * We can set value as any because we are handling it.\n     */\n    parseValue: (value: any) => {\n        if (!value || value.id === null) {\n            return null;\n        }\n\n        if (typeof value === \"string\") {\n            return isValidId(value);\n        }\n\n        if (\"id\" in value) {\n            return isValidId(value.id);\n        }\n\n        throw new Error(\"Invalid RefInput value!\");\n    },\n    parseLiteral: ast => {\n        if (ast.kind === \"StringValue\") {\n            return isValidId(ast.value);\n        }\n\n        if (ast.kind === \"ObjectValue\") {\n            for (let i = 0; i < ast.fields.length; i++) {\n                const { name, value } = ast.fields[i];\n                if (name.value === \"id\") {\n                    // @ts-expect-error\n                    return isValidId(value.value);\n                }\n            }\n        }\n\n        throw new Error(\"Invalid RefInput value!\");\n    }\n});\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,SAAS;AAE3C,MAAMC,KAAK,GAAG,CACV;EACIC,EAAE,EAAE,oBAAoB;EACxBC,OAAO,EAAE;AACb,CAAC,EACD;EACID,EAAE,EAAE,IAAI;EACRC,OAAO,EAAE;AACb,CAAC,EACD;EACID,EAAE,EAAE,IAAI;EACRC,OAAO,EAAE;AACb,CAAC,EACD;EACID,EAAE,EAAE,IAAI;EACRC,OAAO,EAAE;AACb,CAAC,EACD;EACID,EAAE,EAAE,IAAI;EACRC,OAAO,EAAE;AACb,CAAC,CACJ;AAED,MAAMC,SAAS,GAAIC,KAAU,IAAa;EACtC,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,CAACC,MAAM,GAAG,CAAC,EAAE;IAC/C,MAAM,IAAIC,KAAK,CAAC,6CAA6C,CAAC;EAClE;EACA,KAAK,MAAMC,IAAI,IAAIP,KAAK,EAAE;IACtB,IAAIO,IAAI,CAACN,EAAE,CAACM,IAAI,CAACH,KAAK,CAAC,KAAK,IAAI,EAAE;MAC9B,MAAM,IAAIE,KAAK,CAACC,IAAI,CAACL,OAAO,CAAC;IACjC;EACJ;EACA,OAAOE,KAAK;AAChB,CAAC;AAED,OAAO,MAAMI,cAAc,GAAG,IAAIT,iBAAiB,CAAC;EAChDU,IAAI,EAAE,UAAU;EAChBC,WAAW,EACP,oGAAoG;EACxG;AACJ;AACA;EACIC,SAAS,EAAGP,KAAU,IAAK;IACvB,IAAI,CAACA,KAAK,IAAIA,KAAK,CAACQ,EAAE,KAAK,IAAI,EAAE;MAC7B,OAAO,IAAI;IACf;IAEA,OAAO,OAAOR,KAAK,KAAK,QAAQ,GAAGA,KAAK,GAAGA,KAAK,CAACQ,EAAE;EACvD,CAAC;EACD;AACJ;AACA;EACIC,UAAU,EAAGT,KAAU,IAAK;IACxB,IAAI,CAACA,KAAK,IAAIA,KAAK,CAACQ,EAAE,KAAK,IAAI,EAAE;MAC7B,OAAO,IAAI;IACf;IAEA,IAAI,OAAOR,KAAK,KAAK,QAAQ,EAAE;MAC3B,OAAOD,SAAS,CAACC,KAAK,CAAC;IAC3B;IAEA,IAAI,IAAI,IAAIA,KAAK,EAAE;MACf,OAAOD,SAAS,CAACC,KAAK,CAACQ,EAAE,CAAC;IAC9B;IAEA,MAAM,IAAIN,KAAK,CAAC,yBAAyB,CAAC;EAC9C,CAAC;EACDQ,YAAY,EAAEC,GAAG,IAAI;IACjB,IAAIA,GAAG,CAACC,IAAI,KAAK,aAAa,EAAE;MAC5B,OAAOb,SAAS,CAACY,GAAG,CAACX,KAAK,CAAC;IAC/B;IAEA,IAAIW,GAAG,CAACC,IAAI,KAAK,aAAa,EAAE;MAC5B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,GAAG,CAACG,MAAM,CAACb,MAAM,EAAEY,CAAC,EAAE,EAAE;QACxC,MAAM;UAAER,IAAI;UAAEL;QAAM,CAAC,GAAGW,GAAG,CAACG,MAAM,CAACD,CAAC,CAAC;QACrC,IAAIR,IAAI,CAACL,KAAK,KAAK,IAAI,EAAE;UACrB;UACA,OAAOD,SAAS,CAACC,KAAK,CAACA,KAAK,CAAC;QACjC;MACJ;IACJ;IAEA,MAAM,IAAIE,KAAK,CAAC,yBAAyB,CAAC;EAC9C;AACJ,CAAC,CAAC","ignoreList":[]}

package/builtInTypes/TimeScalar.d.ts

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

package/builtInTypes/TimeScalar.js

@@ -1,56 +1,38 @@
-"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
     });
   }
-
   return {
     hours,
     minutes,
     seconds
   };
 };
-
 const convertToTime = value => {
   const {
     hours,
@@ -59,8 +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 = new _graphql.GraphQLScalarType({
+export const TimeScalar = new GraphQLScalarType({
   name: "Time",
   description: "A custom type to support time-only input.",
   // sending to client
@@ -68,4 +49,5 @@ const TimeScalar = new _graphql.GraphQLScalarType({
   // received from client
   parseValue: convertToTime
 });
-exports.TimeScalar = TimeScalar;
+
+//# sourceMappingURL=TimeScalar.js.map

package/builtInTypes/TimeScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["re","parseTime","value","match","WebinyError","parsed","split","map","Number","length","hours","minutes","seconds","convertToTime","String","padStart","TimeScalar","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;;AACA;;AAEA,MAAMA,EAAE,GAAG,uCAAX;;AAEA,MAAMC,SAAS,GAAIC,KAAD,IAAoB;EAClC,IAAI,CAACA,KAAD,IAAUA,KAAK,CAACC,KAAN,CAAYH,EAAZ,MAAoB,IAAlC,EAAwC;IACpC,MAAM,IAAII,cAAJ,CAAgB,gCAAhB,EAAkD,uBAAlD,EAA2E;MAAEF;IAAF,CAA3E,CAAN;EACH;;EACD,MAAMG,MAAM,GAAGH,KAAK,CAACI,KAAN,CAAY,GAAZ,EAAiBC,GAAjB,CAAqBC,MAArB,CAAf;;EACA,IAAIH,MAAM,CAACI,MAAP,GAAgB,CAApB,EAAuB;IACnB,MAAM,IAAIL,cAAJ,CAAiB,4BAAjB,EAA8C,uBAA9C,EAAuE;MAAEF;IAAF,CAAvE,CAAN;EACH;;EACD,MAAM,CAACQ,KAAD,EAAQC,OAAR,EAAiBC,OAAO,GAAG,CAA3B,IAAgCP,MAAtC;;EACA,IAAIK,KAAK,IAAI,EAAb,EAAiB;IACb,MAAM,IAAIN,cAAJ,CAAiB,qCAAjB,EAAuD,uBAAvD,EAAgF;MAClFF;IADkF,CAAhF,CAAN;EAGH,CAJD,MAIO,IAAIS,OAAO,IAAI,EAAf,EAAmB;IACtB,MAAM,IAAIP,cAAJ,CAAiB,uCAAjB,EAAyD,uBAAzD,EAAkF;MACpFF;IADoF,CAAlF,CAAN;EAGH,CAJM,MAIA,IAAIU,OAAO,IAAI,EAAf,EAAmB;IACtB,MAAM,IAAIR,cAAJ,CAAiB,uCAAjB,EAAyD,uBAAzD,EAAkF;MACpFF;IADoF,CAAlF,CAAN;EAGH;;EACD,OAAO;IACHQ,KADG;IAEHC,OAFG;IAGHC;EAHG,CAAP;AAKH,CA3BD;;AA6BA,MAAMC,aAAa,GAAIX,KAAD,IAA2B;EAC7C,MAAM;IAAEQ,KAAF;IAASC,OAAT;IAAkBC;EAAlB,IAA8BX,SAAS,CAACC,KAAD,CAA7C;EACA,OAAQ,GAAEY,MAAM,CAACJ,KAAD,CAAN,CAAcK,QAAd,CAAuB,CAAvB,EAA0B,GAA1B,CAA+B,IAAGD,MAAM,CAACH,OAAD,CAAN,CAAgBI,QAAhB,CAAyB,CAAzB,EAA4B,GAA5B,CAAiC,IAAGD,MAAM,CAClFF,OADkF,CAAN,CAE9EG,QAF8E,CAErE,CAFqE,EAElE,GAFkE,CAE7D,EAFnB;AAGH,CALD;;AAOO,MAAMC,UAAU,GAAG,IAAIC,0BAAJ,CAAsB;EAC5CC,IAAI,EAAE,MADsC;EAE5CC,WAAW,EAAE,2CAF+B;EAG5C;EACAC,SAAS,EAAEP,aAJiC;EAK5C;EACAQ,UAAU,EAAER;AANgC,CAAtB,CAAnB"}
+{"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,122 +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":[],"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":";;;;;;AAAA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
+{"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,55 +1,45 @@
-"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 = _interopRequireDefault(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
 
-/**
- * TODO Until we figure out how to better convert incoming body, we will leave it as any.
- */
+const createCacheKey = 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.
 
-const createRequestBody = body => {
-  return typeof body === "string" ? JSON.parse(body) : body;
+  // 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();
+  return [tenant ? `tenant:${tenant.id}` : null, plugins.length.toString()].filter(Boolean).join("#");
 };
-
 const formatErrorPayload = error => {
-  if (error instanceof _error.default) {
-    return {
+  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 {
+  return JSON.stringify({
+    type: "Error",
     name: error.name,
     message: error.message,
     stack: error.stack
-  };
+  });
 };
-
-var _default = (options = {}) => {
+export default (options = {}) => {
   let schema = undefined;
-  const debug = (0, _boolean.boolean)(options.debug);
-  const path = (options === null || options === void 0 ? void 0 : options.path) || "/graphql";
-  const route = new _handler.RoutePlugin(async ({
+  let cacheKey = undefined;
+  const debug = boolean(options.debug);
+  const path = options?.path || "/graphql";
+  const route = new RoutePlugin(async ({
     onPost,
     onOptions,
     context
@@ -57,26 +47,47 @@ var _default = (options = {}) => {
     onOptions(path, async (_, reply) => {
       return reply.status(204).headers({
         "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`
-      }).send({});
+      }).send({}).hijack();
     });
     onPost(path, async (request, reply) => {
-      if (!schema) {
+      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));
         }
       }
-
-      const body = createRequestBody(request.body);
-      const result = await (0, _processRequestBody.default)(body, schema, context);
-      return reply.status(200).send(result);
+      let body;
+      try {
+        body = createRequestBody(request.body);
+      } catch (ex) {
+        console.error(`Error while creating the body request.`);
+        console.error(formatErrorPayload(ex));
+        throw ex;
+      }
+      try {
+        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.`);
+        console.error(formatErrorPayload(ex));
+        throw ex;
+      }
     });
   });
   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":["DEFAULT_CACHE_MAX_AGE","createRequestBody","body","JSON","parse","formatErrorPayload","error","WebinyError","message","code","data","name","stack","options","schema","undefined","debug","boolean","path","route","RoutePlugin","onPost","onOptions","context","_","reply","status","headers","send","request","createGraphQLSchema","ex","result","processRequestBody","debugPlugins","type"],"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 { HandlerGraphQLOptions } from \"./types\";\nimport { createGraphQLSchema } from \"./createGraphQLSchema\";\nimport debugPlugins from \"./debugPlugins\";\nimport processRequestBody from \"./processRequestBody\";\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\n/**\n * TODO Until we figure out how to better convert incoming body, we will leave it as any.\n */\nconst createRequestBody = (body: any): any => {\n    return typeof body === \"string\" ? JSON.parse(body) : body;\n};\n\nconst formatErrorPayload = (error: Error) => {\n    if (error instanceof WebinyError) {\n        return {\n            message: error.message,\n            code: error.code,\n            data: error.data\n        };\n    }\n\n    return {\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\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        });\n        onPost(path, async (request, reply) => {\n            if (!schema) {\n                try {\n                    schema = createGraphQLSchema(context);\n                } catch (ex) {\n                    return reply.code(500).send(formatErrorPayload(ex));\n                }\n            }\n            const body = createRequestBody(request.body);\n            const result = await processRequestBody(body, schema, context);\n            return reply.status(200).send(result);\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":";;;;;;;;;AAAA;;AAEA;;AACA;;AAGA;;AACA;;AACA;;AAEA,MAAMA,qBAAqB,GAAG,QAA9B,C,CAAwC;;AAExC;AACA;AACA;;AACA,MAAMC,iBAAiB,GAAIC,IAAD,IAAoB;EAC1C,OAAO,OAAOA,IAAP,KAAgB,QAAhB,GAA2BC,IAAI,CAACC,KAAL,CAAWF,IAAX,CAA3B,GAA8CA,IAArD;AACH,CAFD;;AAIA,MAAMG,kBAAkB,GAAIC,KAAD,IAAkB;EACzC,IAAIA,KAAK,YAAYC,cAArB,EAAkC;IAC9B,OAAO;MACHC,OAAO,EAAEF,KAAK,CAACE,OADZ;MAEHC,IAAI,EAAEH,KAAK,CAACG,IAFT;MAGHC,IAAI,EAAEJ,KAAK,CAACI;IAHT,CAAP;EAKH;;EAED,OAAO;IACHC,IAAI,EAAEL,KAAK,CAACK,IADT;IAEHH,OAAO,EAAEF,KAAK,CAACE,OAFZ;IAGHI,KAAK,EAAEN,KAAK,CAACM;EAHV,CAAP;AAKH,CAdD;;eAgBe,CAACC,OAA8B,GAAG,EAAlC,KAA2D;EACtE,IAAIC,MAAiC,GAAGC,SAAxC;EAEA,MAAMC,KAAK,GAAG,IAAAC,gBAAA,EAAQJ,OAAO,CAACG,KAAhB,CAAd;EAEA,MAAME,IAAI,GAAG,CAAAL,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAEK,IAAT,KAAiB,UAA9B;EAEA,MAAMC,KAAK,GAAG,IAAIC,oBAAJ,CAAgB,OAAO;IAAEC,MAAF;IAAUC,SAAV;IAAqBC;EAArB,CAAP,KAA0C;IACpED,SAAS,CAACJ,IAAD,EAAO,OAAOM,CAAP,EAAUC,KAAV,KAAoB;MAChC,OAAOA,KAAK,CACPC,MADE,CACK,GADL,EAEFC,OAFE,CAEM;QACL,iBAAkB,mBAAkB3B,qBAAsB;MADrD,CAFN,EAKF4B,IALE,CAKG,EALH,CAAP;IAMH,CAPQ,CAAT;IAQAP,MAAM,CAACH,IAAD,EAAO,OAAOW,OAAP,EAAgBJ,KAAhB,KAA0B;MACnC,IAAI,CAACX,MAAL,EAAa;QACT,IAAI;UACAA,MAAM,GAAG,IAAAgB,wCAAA,EAAoBP,OAApB,CAAT;QACH,CAFD,CAEE,OAAOQ,EAAP,EAAW;UACT,OAAON,KAAK,CAAChB,IAAN,CAAW,GAAX,EAAgBmB,IAAhB,CAAqBvB,kBAAkB,CAAC0B,EAAD,CAAvC,CAAP;QACH;MACJ;;MACD,MAAM7B,IAAI,GAAGD,iBAAiB,CAAC4B,OAAO,CAAC3B,IAAT,CAA9B;MACA,MAAM8B,MAAM,GAAG,MAAM,IAAAC,2BAAA,EAAmB/B,IAAnB,EAAyBY,MAAzB,EAAiCS,OAAjC,CAArB;MACA,OAAOE,KAAK,CAACC,MAAN,CAAa,GAAb,EAAkBE,IAAlB,CAAuBI,MAAvB,CAAP;IACH,CAXK,CAAN;EAYH,CArBa,CAAd;EAuBAb,KAAK,CAACR,IAAN,GAAa,+BAAb;EAEA,OAAO,CACH,IAAIK,KAAK,GAAG,IAAAkB,qBAAA,GAAH,GAAoB,EAA7B,CADG,EAEH;IACIC,IAAI,EAAE;EADV,CAFG,EAKHhB,KALG,CAAP;AAOH,C"}
+{"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":[]}