@webiny/handler-graphql 0.0.0-unstable.1e66d121db → 0.0.0-unstable.3386f66516

package/builtInTypes/AnyScalar.d.ts

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

package/builtInTypes/AnyScalar.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Any = void 0;
+exports.AnyScalar = void 0;
 
 var _graphql = require("graphql");
 
@@ -11,10 +11,10 @@ const returnValue = value => {
   return value;
 };
 
-const Any = new _graphql.GraphQLScalarType({
+const AnyScalar = new _graphql.GraphQLScalarType({
   name: "Any",
   description: `A scalar type that represents an ambiguous value.`,
   serialize: returnValue,
   parseValue: returnValue
 });
-exports.Any = Any;
+exports.AnyScalar = AnyScalar;

package/builtInTypes/AnyScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["returnValue","value","Any","GraphQLScalarType","name","description","serialize","parseValue"],"sources":["AnyScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\n\nconst returnValue = (value: any): any => {\n    return value;\n};\n\nexport const Any = new GraphQLScalarType({\n    name: \"Any\",\n    description: `A scalar type that represents an ambiguous value.`,\n    serialize: returnValue,\n    parseValue: returnValue\n});\n"],"mappings":";;;;;;;AAAA;;AAEA,MAAMA,WAAW,GAAIC,KAAD,IAAqB;EACrC,OAAOA,KAAP;AACH,CAFD;;AAIO,MAAMC,GAAG,GAAG,IAAIC,0BAAJ,CAAsB;EACrCC,IAAI,EAAE,KAD+B;EAErCC,WAAW,EAAG,mDAFuB;EAGrCC,SAAS,EAAEN,WAH0B;EAIrCO,UAAU,EAAEP;AAJyB,CAAtB,CAAZ"}
+{"version":3,"names":["returnValue","value","AnyScalar","GraphQLScalarType","name","description","serialize","parseValue"],"sources":["AnyScalar.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\n\nconst returnValue = (value: any): any => {\n    return value;\n};\n\nexport const AnyScalar = new GraphQLScalarType({\n    name: \"Any\",\n    description: `A scalar type that represents an ambiguous value.`,\n    serialize: returnValue,\n    parseValue: returnValue\n});\n"],"mappings":";;;;;;;AAAA;;AAEA,MAAMA,WAAW,GAAIC,KAAD,IAAqB;EACrC,OAAOA,KAAP;AACH,CAFD;;AAIO,MAAMC,SAAS,GAAG,IAAIC,0BAAJ,CAAsB;EAC3CC,IAAI,EAAE,KADqC;EAE3CC,WAAW,EAAG,mDAF6B;EAG3CC,SAAS,EAAEN,WAHgC;EAI3CO,UAAU,EAAEP;AAJ+B,CAAtB,CAAlB"}

package/builtInTypes/NumberScalar.d.ts

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

package/builtInTypes/NumberScalar.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Number = void 0;
+exports.NumberScalar = void 0;
 
 var _graphql = require("graphql");
 
@@ -31,7 +31,7 @@ const parseValue = value => {
   return parseFloat(value);
 };
 
-const Number = new _graphql.GraphQLScalarType({
+const NumberScalar = new _graphql.GraphQLScalarType({
   name: "Number",
   description: "A custom input type to be used with numbers. Supports Int and Float.",
   serialize: value => {
@@ -50,11 +50,15 @@ const Number = new _graphql.GraphQLScalarType({
   },
   parseValue,
   parseLiteral: ast => {
-    if (ast.kind === _language.Kind.INT || ast.kind === _language.Kind.FLOAT) {
-      return ast.value;
+    const value = ast.value;
+
+    if (ast.kind === _language.Kind.INT) {
+      return Number(value);
+    } else if (ast.kind === _language.Kind.FLOAT) {
+      return parseFloat(value);
     }
 
-    throw new Error(`Expected type Number, found {${ast.value}}`);
+    throw new Error(`Expected type Number, found {${value}}`);
   }
 });
-exports.Number = Number;
+exports.NumberScalar = NumberScalar;

package/builtInTypes/NumberScalar.js.map

@@ -1 +1 @@
-{"version":3,"names":["parseValue","value","String","match","WebinyError","undefined","isNaN","parseFloat","Number","GraphQLScalarType","name","description","serialize","ex","console","log","message","code","data","parseLiteral","ast","kind","Kind","INT","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 Number = 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: any) => {\n        if (ast.kind === Kind.INT || ast.kind === Kind.FLOAT) {\n            return ast.value;\n        }\n\n        throw new Error(`Expected type Number, found {${ast.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,MAAM,GAAG,IAAIC,0BAAJ,CAAsB;EACxCC,IAAI,EAAE,QADkC;EAExCC,WAAW,EAAE,sEAF2B;EAGxCC,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,CAhBuC;EAiBxCD,UAjBwC;EAkBxCmB,YAAY,EAAGC,GAAD,IAAc;IACxB,IAAIA,GAAG,CAACC,IAAJ,KAAaC,cAAA,CAAKC,GAAlB,IAAyBH,GAAG,CAACC,IAAJ,KAAaC,cAAA,CAAKE,KAA/C,EAAsD;MAClD,OAAOJ,GAAG,CAACnB,KAAX;IACH;;IAED,MAAM,IAAIwB,KAAJ,CAAW,gCAA+BL,GAAG,CAACnB,KAAM,GAApD,CAAN;EACH;AAxBuC,CAAtB,CAAf"}
+{"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"}

package/builtInTypes/RefInputScalar.d.ts

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

package/builtInTypes/RefInputScalar.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RefInput = void 0;
+exports.RefInputScalar = void 0;
 
 var _graphql = require("graphql");
 
@@ -15,7 +15,7 @@ const isMongoId = value => {
   throw new Error("Must be a valid Mongo ID!");
 };
 
-const RefInput = new _graphql.GraphQLScalarType({
+const RefInputScalar = new _graphql.GraphQLScalarType({
   name: "RefInput",
   description: "A custom input type to be used with references. Supports plain ID and `{ id: ID }` Object literal.",
   serialize: value => {
@@ -62,4 +62,4 @@ const RefInput = new _graphql.GraphQLScalarType({
     throw new Error("Invalid RefInput value!");
   }
 });
-exports.RefInput = RefInput;
+exports.RefInputScalar = RefInputScalar;

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":["isMongoId","value","test","Error","RefInputScalar","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 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    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,cAAc,GAAG,IAAIC,0BAAJ,CAAsB;EAChDC,IAAI,EAAE,UAD0C;EAEhDC,WAAW,EACP,oGAH4C;EAIhDC,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,CAV+C;EAWhDC,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,CAzB+C;EA0BhDQ,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;AA1C+C,CAAtB,CAAvB"}

package/createGraphQLHandler.d.ts

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

package/createGraphQLHandler.js

@@ -9,24 +9,44 @@ 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"));
 
-var _handler = require("@webiny/handler");
-
 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 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;
 };
 
+const formatErrorPayload = error => {
+  if (error instanceof _error.default) {
+    return JSON.stringify({
+      type: "CoreGraphQLWebinyError",
+      message: error.message,
+      code: error.code,
+      data: error.data
+    });
+  }
+
+  return JSON.stringify({
+    type: "Error",
+    name: error.name,
+    message: error.message,
+    stack: error.stack
+  });
+};
+
 var _default = (options = {}) => {
   let schema = undefined;
   const debug = (0, _boolean.boolean)(options.debug);
@@ -39,16 +59,35 @@ 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) {
-        schema = (0, _createGraphQLSchema.createGraphQLSchema)(context);
+        try {
+          schema = (0, _createGraphQLSchema.createGraphQLSchema)(context);
+        } 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.log(`Error while creating the body request.`);
+        console.log(formatErrorPayload(ex));
+        throw ex;
+      }
+
+      try {
+        const result = await (0, _processRequestBody.default)(body, schema, context);
+        return reply.status(200).send(result);
+      } catch (ex) {
+        console.log(`Error while processing the body request.`);
+        console.log(formatErrorPayload(ex));
+        throw ex;
+      }
     });
   });
   route.name = "handler.graphql.route.default";

package/createGraphQLHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_CACHE_MAX_AGE","createRequestBody","body","JSON","parse","options","schema","undefined","debug","boolean","path","route","RoutePlugin","onPost","onOptions","context","_","reply","status","headers","send","request","createGraphQLSchema","result","processRequestBody","name","debugPlugins","type"],"sources":["createGraphQLHandler.ts"],"sourcesContent":["import { boolean } from \"boolean\";\nimport { HandlerGraphQLOptions } from \"./types\";\nimport { createGraphQLSchema } from \"./createGraphQLSchema\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"./debugPlugins\";\nimport processRequestBody from \"./processRequestBody\";\nimport { GraphQLSchema } from \"graphql\";\nimport { RoutePlugin } from \"@webiny/handler\";\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\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                schema = createGraphQLSchema(context);\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;;AAEA;;AACA;;AAEA;;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;;eAIe,CAACG,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,mBAAkBnB,qBAAsB;MADrD,CAFN,EAKFoB,IALE,CAKG,EALH,CAAP;IAMH,CAPQ,CAAT;IAQAP,MAAM,CAACH,IAAD,EAAO,OAAOW,OAAP,EAAgBJ,KAAhB,KAA0B;MACnC,IAAI,CAACX,MAAL,EAAa;QACTA,MAAM,GAAG,IAAAgB,wCAAA,EAAoBP,OAApB,CAAT;MACH;;MACD,MAAMb,IAAI,GAAGD,iBAAiB,CAACoB,OAAO,CAACnB,IAAT,CAA9B;MACA,MAAMqB,MAAM,GAAG,MAAM,IAAAC,2BAAA,EAAmBtB,IAAnB,EAAyBI,MAAzB,EAAiCS,OAAjC,CAArB;MACA,OAAOE,KAAK,CAACC,MAAN,CAAa,GAAb,EAAkBE,IAAlB,CAAuBG,MAAvB,CAAP;IACH,CAPK,CAAN;EAQH,CAjBa,CAAd;EAmBAZ,KAAK,CAACc,IAAN,GAAa,+BAAb;EAEA,OAAO,CACH,IAAIjB,KAAK,GAAG,IAAAkB,qBAAA,GAAH,GAAoB,EAA7B,CADG,EAEH;IACIC,IAAI,EAAE;EADV,CAFG,EAKHhB,KALG,CAAP;AAOH,C"}
+{"version":3,"names":["DEFAULT_CACHE_MAX_AGE","createRequestBody","body","JSON","parse","formatErrorPayload","error","WebinyError","stringify","type","message","code","data","name","stack","options","schema","undefined","debug","boolean","path","route","RoutePlugin","onPost","onOptions","context","_","reply","status","headers","send","hijack","request","createGraphQLSchema","ex","console","log","result","processRequestBody","debugPlugins"],"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 { GraphQLRequestBody, 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\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\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            if (!schema) {\n                try {\n                    schema = createGraphQLSchema(context);\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.log(`Error while creating the body request.`);\n                console.log(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.log(`Error while processing the body request.`);\n                console.log(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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"}

package/createGraphQLSchema.js

@@ -16,7 +16,9 @@ var _schema = require("@graphql-tools/schema");
 var _builtInTypes = require("./builtInTypes");
 
 const createGraphQLSchema = context => {
-  const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
+  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)`
             type Query
             type Mutation
@@ -29,6 +31,11 @@ const createGraphQLSchema = context => {
             scalar Date
             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
         `];
   const resolvers = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, scalars.reduce((acc, s) => {
     acc[s.name] = s;
@@ -36,23 +43,21 @@ const createGraphQLSchema = context => {
   }, {})), {}, {
     JSON: _builtInTypes.JsonScalar,
     Long: _builtInTypes.LongScalar,
-    RefInput: _builtInTypes.RefInput,
-    Number: _builtInTypes.Number,
-    Any: _builtInTypes.Any,
+    RefInput: _builtInTypes.RefInputScalar,
+    Number: _builtInTypes.NumberScalar,
+    Any: _builtInTypes.AnyScalar,
     DateTime: _builtInTypes.DateTimeScalar,
     Date: _builtInTypes.DateScalar,
     Time: _builtInTypes.TimeScalar
   })];
-  const gqlPlugins = context.plugins.byType("graphql-schema");
+  const plugins = context.plugins.byType("graphql-schema");
 
-  for (let i = 0; i < gqlPlugins.length; i++) {
-    const plugin = gqlPlugins[i];
+  for (const plugin of plugins) {
     /**
      * TODO @ts-refactor
      * Figure out correct types on typeDefs and resolvers
      */
     // @ts-ignore
-
     typeDefs.push(plugin.schema.typeDefs); // @ts-ignore
 
     resolvers.push(plugin.schema.resolvers);

package/createGraphQLSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["createGraphQLSchema","context","scalars","plugins","byType","map","item","scalar","typeDefs","gql","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","Date","DateScalar","Time","TimeScalar","gqlPlugins","i","length","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    RefInput,\n    Number as NumberScalar,\n    Any as AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    JsonScalar,\n    TimeScalar,\n    LongScalar\n} from \"./builtInTypes\";\nimport { GraphQLScalarType } from \"graphql/type/definition\";\n\nexport const createGraphQLSchema = (context: Context) => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\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    ];\n\n    const resolvers = [\n        {\n            ...scalars.reduce((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {} as Record<string, GraphQLScalarType>),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            Date: DateScalar,\n            Time: TimeScalar\n        }\n    ];\n\n    const gqlPlugins = context.plugins.byType<GraphQLSchemaPlugin>(\"graphql-schema\");\n    for (let i = 0; i < gqlPlugins.length; i++) {\n        const plugin = gqlPlugins[i];\n        /**\n         * TODO @ts-refactor\n         * Figure out correct types on typeDefs and resolvers\n         */\n        // @ts-ignore\n        typeDefs.push(plugin.schema.typeDefs);\n        // @ts-ignore\n        resolvers.push(plugin.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers,\n        inheritResolversFromInterfaces: true\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAGA;;AAYO,MAAMA,mBAAmB,GAAIC,OAAD,IAAsB;EACrD,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAR,CACXC,MADW,CACiB,gBADjB,EAEXC,GAFW,CAEPC,IAAI,IAAIA,IAAI,CAACC,MAFN,CAAhB;EAIA,MAAMC,QAAQ,GAAG,CACb,IAAAC,mBAAA,CAAI;AACZ;AACA;AACA,cAAcP,OAAO,CAACG,GAAR,CAAYE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAA5C,EAA+CC,IAA/C,CAAoD,GAApD,CAAyD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAbqB,CAAjB;EAgBA,MAAMC,SAAS,GAAG,6DAEPV,OAAO,CAACW,MAAR,CAAe,CAACC,GAAD,EAAMC,CAAN,KAAY;IAC1BD,GAAG,CAACC,CAAC,CAACL,IAAH,CAAH,GAAcK,CAAd;IACA,OAAOD,GAAP;EACH,CAHE,EAGA,EAHA,CAFO;IAMVE,IAAI,EAAEC,wBANI;IAOVC,IAAI,EAAEC,wBAPI;IAQVC,QAAQ,EAARA,sBARU;IASVC,MAAM,EAAEC,oBATE;IAUVC,GAAG,EAAEC,iBAVK;IAWVC,QAAQ,EAAEC,4BAXA;IAYVC,IAAI,EAAEC,wBAZI;IAaVC,IAAI,EAAEC;EAbI,GAAlB;EAiBA,MAAMC,UAAU,GAAG9B,OAAO,CAACE,OAAR,CAAgBC,MAAhB,CAA4C,gBAA5C,CAAnB;;EACA,KAAK,IAAI4B,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGD,UAAU,CAACE,MAA/B,EAAuCD,CAAC,EAAxC,EAA4C;IACxC,MAAME,MAAM,GAAGH,UAAU,CAACC,CAAD,CAAzB;IACA;AACR;AACA;AACA;IACQ;;IACAxB,QAAQ,CAAC2B,IAAT,CAAcD,MAAM,CAACE,MAAP,CAAc5B,QAA5B,EAPwC,CAQxC;;IACAI,SAAS,CAACuB,IAAV,CAAeD,MAAM,CAACE,MAAP,CAAcxB,SAA7B;EACH;;EAED,OAAO,IAAAyB,4BAAA,EAAqB;IACxB7B,QADwB;IAExBI,SAFwB;IAGxB0B,8BAA8B,EAAE;EAHR,CAArB,CAAP;AAKH,CAxDM"}
+{"version":3,"names":["createGraphQLSchema","context","scalars","plugins","byType","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 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 = context.plugins.byType<GraphQLSchemaPlugin>(\"graphql-schema\");\n    for (const plugin of plugins) {\n        /**\n         * TODO @ts-refactor\n         * Figure out correct types on typeDefs and resolvers\n         */\n        // @ts-ignore\n        typeDefs.push(plugin.schema.typeDefs);\n        // @ts-ignore\n        resolvers.push(plugin.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers,\n        inheritResolversFromInterfaces: true\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAGA;;AAYO,MAAMA,mBAAmB,GAAIC,OAAD,IAAsB;EACrD,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAR,CACXC,MADW,CACiB,gBADjB,EAEXC,GAFW,CAEPC,IAAI,IAAIA,IAAI,CAACC,MAFN,CAAhB,CADqD,CAKrD;EACA;;EACA,MAAMC,QAAQ,GAAG,CACb,IAAAC,mBAAA,CAAI;AACZ;AACA;AACA,cAAcP,OAAO,CAACG,GAAR,CAAYE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAA5C,EAA+CC,IAA/C,CAAoD,GAApD,CAAyD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAlBqB,CAAjB;EAqBA,MAAMC,SAAS,GAAG,6DAEPV,OAAO,CAACW,MAAR,CAAkD,CAACC,GAAD,EAAMC,CAAN,KAAY;IAC7DD,GAAG,CAACC,CAAC,CAACL,IAAH,CAAH,GAAcK,CAAd;IACA,OAAOD,GAAP;EACH,CAHE,EAGA,EAHA,CAFO;IAMVE,IAAI,EAAEC,wBANI;IAOVC,IAAI,EAAEC,wBAPI;IAQVC,QAAQ,EAAEC,4BARA;IASVC,MAAM,EAAEC,0BATE;IAUVC,GAAG,EAAEC,uBAVK;IAWVC,QAAQ,EAAEC,4BAXA;IAYVC,IAAI,EAAEC,wBAZI;IAaVC,IAAI,EAAEC;EAbI,GAAlB;EAiBA,MAAM5B,OAAO,GAAGF,OAAO,CAACE,OAAR,CAAgBC,MAAhB,CAA4C,gBAA5C,CAAhB;;EACA,KAAK,MAAM4B,MAAX,IAAqB7B,OAArB,EAA8B;IAC1B;AACR;AACA;AACA;IACQ;IACAK,QAAQ,CAACyB,IAAT,CAAcD,MAAM,CAACE,MAAP,CAAc1B,QAA5B,EAN0B,CAO1B;;IACAI,SAAS,CAACqB,IAAV,CAAeD,MAAM,CAACE,MAAP,CAActB,SAA7B;EACH;;EAED,OAAO,IAAAuB,4BAAA,EAAqB;IACxB3B,QADwB;IAExBI,SAFwB;IAGxBwB,8BAA8B,EAAE;EAHR,CAArB,CAAP;AAKH,CA9DM"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-graphql",
-	"version": "0.0.0-unstable.1e66d121db",
+	"version": "0.0.0-unstable.3386f66516",
 	"main": "index.js",
 	"license": "MIT",
 	"repository": {
@@ -16,10 +16,10 @@
 	"dependencies": {
 		"@babel/runtime": "7.19.0",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api": "0.0.0-unstable.1e66d121db",
-		"@webiny/error": "0.0.0-unstable.1e66d121db",
-		"@webiny/handler": "0.0.0-unstable.1e66d121db",
-		"@webiny/plugins": "0.0.0-unstable.1e66d121db",
+		"@webiny/api": "0.0.0-unstable.3386f66516",
+		"@webiny/error": "0.0.0-unstable.3386f66516",
+		"@webiny/handler": "0.0.0-unstable.3386f66516",
+		"@webiny/plugins": "0.0.0-unstable.3386f66516",
 		"boolean": "3.2.0",
 		"graphql": "15.8.0",
 		"graphql-scalars": "1.12.0",
@@ -29,12 +29,13 @@
 		"@babel/cli": "^7.19.3",
 		"@babel/core": "^7.19.3",
 		"@babel/preset-env": "^7.19.4",
-		"@webiny/cli": "^0.0.0-unstable.1e66d121db",
-		"@webiny/handler-aws": "^0.0.0-unstable.1e66d121db",
-		"@webiny/project-utils": "^0.0.0-unstable.1e66d121db",
+		"@webiny/cli": "^0.0.0-unstable.3386f66516",
+		"@webiny/handler-aws": "^0.0.0-unstable.3386f66516",
+		"@webiny/project-utils": "^0.0.0-unstable.3386f66516",
 		"jest": "^28.1.0",
 		"jest-mock-console": "^1.0.0",
 		"rimraf": "^3.0.2",
+		"ttypescript": "^1.5.15",
 		"typescript": "4.7.4"
 	},
 	"publishConfig": {
@@ -45,5 +46,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "b670bf27c5039de1a2b0be764a09ba4cb94ad5e2"
+	"gitHead": "3386f66516b16fe54e2508243b91dfff1a0156f9"
 }

package/processRequestBody.js

@@ -31,14 +31,15 @@ const processRequestBody = async (body, schema, context) => {
 };
 
 var _default = async (requestBody, schema, context) => {
-  if (Array.isArray(requestBody) === true) {
-    const result = [];
+  if (Array.isArray(requestBody)) {
+    const results = [];
 
-    for (let i = 0; i < requestBody.length; i++) {
-      result.push(await processRequestBody(requestBody[i], schema, context));
+    for (const body of requestBody) {
+      const result = await processRequestBody(body, schema, context);
+      results.push(result);
     }
 
-    return result;
+    return results;
   }
 
   return await processRequestBody(requestBody, schema, context);

package/processRequestBody.js.map

@@ -1 +1 @@
-{"version":3,"names":["processRequestBody","body","schema","context","query","variables","operationName","plugins","byType","forEach","pl","apply","result","graphql","requestBody","Array","isArray","i","length","push"],"sources":["processRequestBody.ts"],"sourcesContent":["import { ExecutionResult, graphql, GraphQLSchema } from \"graphql\";\nimport { GraphQLAfterQueryPlugin, GraphQLBeforeQueryPlugin, GraphQLRequestBody } from \"./types\";\nimport { Context } from \"@webiny/api/types\";\n\nconst processRequestBody = async (\n    body: GraphQLRequestBody,\n    schema: GraphQLSchema,\n    context: Context\n) => {\n    const { query, variables, operationName } = body;\n\n    context.plugins\n        .byType<GraphQLBeforeQueryPlugin>(\"graphql-before-query\")\n        .forEach(pl => pl.apply({ body, schema, context }));\n\n    const result = await graphql(schema, query, {}, context, variables, operationName);\n\n    context.plugins.byType<GraphQLAfterQueryPlugin>(\"graphql-after-query\").forEach(pl => {\n        pl.apply({ result, body, schema, context });\n    });\n\n    return result;\n};\n\nexport default async (\n    requestBody: GraphQLRequestBody | GraphQLRequestBody[],\n    schema: GraphQLSchema,\n    context: Context\n): Promise<ExecutionResult[] | ExecutionResult> => {\n    if (Array.isArray(requestBody) === true) {\n        const result: ExecutionResult[] = [];\n        for (let i = 0; i < (requestBody as GraphQLRequestBody[]).length; i++) {\n            result.push(\n                await processRequestBody((requestBody as GraphQLRequestBody[])[i], schema, context)\n            );\n        }\n        return result;\n    }\n    return await processRequestBody(requestBody as GraphQLRequestBody, schema, context);\n};\n"],"mappings":";;;;;;;AAAA;;AAIA,MAAMA,kBAAkB,GAAG,OACvBC,IADuB,EAEvBC,MAFuB,EAGvBC,OAHuB,KAItB;EACD,MAAM;IAAEC,KAAF;IAASC,SAAT;IAAoBC;EAApB,IAAsCL,IAA5C;EAEAE,OAAO,CAACI,OAAR,CACKC,MADL,CACsC,sBADtC,EAEKC,OAFL,CAEaC,EAAE,IAAIA,EAAE,CAACC,KAAH,CAAS;IAAEV,IAAF;IAAQC,MAAR;IAAgBC;EAAhB,CAAT,CAFnB;EAIA,MAAMS,MAAM,GAAG,MAAM,IAAAC,gBAAA,EAAQX,MAAR,EAAgBE,KAAhB,EAAuB,EAAvB,EAA2BD,OAA3B,EAAoCE,SAApC,EAA+CC,aAA/C,CAArB;EAEAH,OAAO,CAACI,OAAR,CAAgBC,MAAhB,CAAgD,qBAAhD,EAAuEC,OAAvE,CAA+EC,EAAE,IAAI;IACjFA,EAAE,CAACC,KAAH,CAAS;MAAEC,MAAF;MAAUX,IAAV;MAAgBC,MAAhB;MAAwBC;IAAxB,CAAT;EACH,CAFD;EAIA,OAAOS,MAAP;AACH,CAlBD;;eAoBe,OACXE,WADW,EAEXZ,MAFW,EAGXC,OAHW,KAIoC;EAC/C,IAAIY,KAAK,CAACC,OAAN,CAAcF,WAAd,MAA+B,IAAnC,EAAyC;IACrC,MAAMF,MAAyB,GAAG,EAAlC;;IACA,KAAK,IAAIK,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAIH,WAAD,CAAsCI,MAA1D,EAAkED,CAAC,EAAnE,EAAuE;MACnEL,MAAM,CAACO,IAAP,CACI,MAAMnB,kBAAkB,CAAEc,WAAD,CAAsCG,CAAtC,CAAD,EAA2Cf,MAA3C,EAAmDC,OAAnD,CAD5B;IAGH;;IACD,OAAOS,MAAP;EACH;;EACD,OAAO,MAAMZ,kBAAkB,CAACc,WAAD,EAAoCZ,MAApC,EAA4CC,OAA5C,CAA/B;AACH,C"}
+{"version":3,"names":["processRequestBody","body","schema","context","query","variables","operationName","plugins","byType","forEach","pl","apply","result","graphql","requestBody","Array","isArray","results","push"],"sources":["processRequestBody.ts"],"sourcesContent":["import { ExecutionResult, graphql, GraphQLSchema } from \"graphql\";\nimport { GraphQLAfterQueryPlugin, GraphQLBeforeQueryPlugin, GraphQLRequestBody } from \"~/types\";\nimport { Context } from \"@webiny/api/types\";\n\nconst processRequestBody = async (\n    body: GraphQLRequestBody,\n    schema: GraphQLSchema,\n    context: Context\n) => {\n    const { query, variables, operationName } = body;\n\n    context.plugins\n        .byType<GraphQLBeforeQueryPlugin>(\"graphql-before-query\")\n        .forEach(pl => pl.apply({ body, schema, context }));\n\n    const result = await graphql(schema, query, {}, context, variables, operationName);\n\n    context.plugins.byType<GraphQLAfterQueryPlugin>(\"graphql-after-query\").forEach(pl => {\n        pl.apply({ result, body, schema, context });\n    });\n\n    return result;\n};\n\nexport default async (\n    requestBody: GraphQLRequestBody | GraphQLRequestBody[],\n    schema: GraphQLSchema,\n    context: Context\n): Promise<ExecutionResult[] | ExecutionResult> => {\n    if (Array.isArray(requestBody)) {\n        const results: ExecutionResult[] = [];\n        for (const body of requestBody) {\n            const result = await processRequestBody(body, schema, context);\n            results.push(result);\n        }\n        return results;\n    }\n    return await processRequestBody(requestBody, schema, context);\n};\n"],"mappings":";;;;;;;AAAA;;AAIA,MAAMA,kBAAkB,GAAG,OACvBC,IADuB,EAEvBC,MAFuB,EAGvBC,OAHuB,KAItB;EACD,MAAM;IAAEC,KAAF;IAASC,SAAT;IAAoBC;EAApB,IAAsCL,IAA5C;EAEAE,OAAO,CAACI,OAAR,CACKC,MADL,CACsC,sBADtC,EAEKC,OAFL,CAEaC,EAAE,IAAIA,EAAE,CAACC,KAAH,CAAS;IAAEV,IAAF;IAAQC,MAAR;IAAgBC;EAAhB,CAAT,CAFnB;EAIA,MAAMS,MAAM,GAAG,MAAM,IAAAC,gBAAA,EAAQX,MAAR,EAAgBE,KAAhB,EAAuB,EAAvB,EAA2BD,OAA3B,EAAoCE,SAApC,EAA+CC,aAA/C,CAArB;EAEAH,OAAO,CAACI,OAAR,CAAgBC,MAAhB,CAAgD,qBAAhD,EAAuEC,OAAvE,CAA+EC,EAAE,IAAI;IACjFA,EAAE,CAACC,KAAH,CAAS;MAAEC,MAAF;MAAUX,IAAV;MAAgBC,MAAhB;MAAwBC;IAAxB,CAAT;EACH,CAFD;EAIA,OAAOS,MAAP;AACH,CAlBD;;eAoBe,OACXE,WADW,EAEXZ,MAFW,EAGXC,OAHW,KAIoC;EAC/C,IAAIY,KAAK,CAACC,OAAN,CAAcF,WAAd,CAAJ,EAAgC;IAC5B,MAAMG,OAA0B,GAAG,EAAnC;;IACA,KAAK,MAAMhB,IAAX,IAAmBa,WAAnB,EAAgC;MAC5B,MAAMF,MAAM,GAAG,MAAMZ,kBAAkB,CAACC,IAAD,EAAOC,MAAP,EAAeC,OAAf,CAAvC;MACAc,OAAO,CAACC,IAAR,CAAaN,MAAb;IACH;;IACD,OAAOK,OAAP;EACH;;EACD,OAAO,MAAMjB,kBAAkB,CAACc,WAAD,EAAcZ,MAAd,EAAsBC,OAAtB,CAA/B;AACH,C"}