@webiny/handler-graphql 0.0.0-mt-2 → 0.0.0-unstable.085ff6572f

package/createGraphQLHandler.js

@@ -1,77 +1,93 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 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"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-const DEFAULT_HEADERS = {
-  "Content-Type": "application/json",
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Headers": "*",
-  "Access-Control-Allow-Methods": "OPTIONS,POST"
-};
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
+const createCacheKey = context => {
+  const plugins = (0, _createGraphQLSchema.getSchemaPlugins)(context);
+  // TODO: in the near future, we have to assign a fixed name to every GraphQLSchema plugin,
+  // to be able to create a reliable cache key.
+  return plugins.length.toString();
+};
+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;
+  let schema = undefined;
+  let cacheKey = undefined;
   const debug = (0, _boolean.boolean)(options.debug);
-  return [...(debug ? (0, _debugPlugins.default)() : []), {
-    type: "handler",
-    name: "handler-graphql",
-
-    async handle(context, next) {
-      const {
-        http
-      } = context;
-
-      if (!http) {
-        return next();
-      }
-
-      if (http.request.method === "OPTIONS") {
-        return http.response({
-          statusCode: 204,
-          headers: _objectSpread(_objectSpread({}, DEFAULT_HEADERS), {}, {
-            "Cache-Control": "public, max-age=" + DEFAULT_CACHE_MAX_AGE
-          })
-        });
+  const path = (options === null || options === void 0 ? void 0 : options.path) || "/graphql";
+  const route = new _handler.RoutePlugin(async ({
+    onPost,
+    onOptions,
+    context
+  }) => {
+    onOptions(path, async (_, reply) => {
+      return reply.status(204).headers({
+        "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`
+      }).send({}).hijack();
+    });
+    onPost(path, async (request, reply) => {
+      const contextCacheKey = createCacheKey(context);
+      if (!schema || cacheKey !== contextCacheKey) {
+        try {
+          schema = (0, _createGraphQLSchema.createGraphQLSchema)(context);
+          cacheKey = contextCacheKey;
+        } catch (ex) {
+          return reply.code(500).send(formatErrorPayload(ex));
+        }
       }
-
-      if (http.request.method !== "POST") {
-        return next();
+      let body;
+      try {
+        body = createRequestBody(request.body);
+      } catch (ex) {
+        console.error(`Error while creating the body request.`);
+        console.error(formatErrorPayload(ex));
+        throw ex;
       }
-
-      if (!schema) {
-        schema = (0, _createGraphQLSchema.createGraphQLSchema)(context);
+      try {
+        const result = await (0, _processRequestBody.default)(body, schema, context);
+        return reply.status(200).send(result);
+      } catch (ex) {
+        console.error(`Error while processing the body request.`);
+        console.error(formatErrorPayload(ex));
+        throw ex;
       }
-
-      const body = JSON.parse(http.request.body);
-      const result = await (0, _processRequestBody.default)(body, schema, context);
-      return http.response({
-        body: JSON.stringify(result),
-        statusCode: 200,
-        headers: DEFAULT_HEADERS
-      });
-    }
-
-  }];
+    });
+  });
+  route.name = "handler.graphql.route.default";
+  return [...(debug ? (0, _debugPlugins.default)() : []), {
+    type: "wcp-telemetry-tracker"
+  }, route];
 };
-
 exports.default = _default;

package/createGraphQLHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["DEFAULT_CACHE_MAX_AGE","createCacheKey","context","plugins","getSchemaPlugins","length","toString","createRequestBody","body","JSON","parse","formatErrorPayload","error","WebinyError","stringify","type","message","code","data","name","stack","options","schema","undefined","cacheKey","debug","boolean","path","route","RoutePlugin","onPost","onOptions","_","reply","status","headers","send","hijack","request","contextCacheKey","createGraphQLSchema","ex","console","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, getSchemaPlugins } from \"./createGraphQLSchema\";\nimport debugPlugins from \"./debugPlugins\";\nimport processRequestBody from \"./processRequestBody\";\nimport { Context } from \"@webiny/handler\";\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 GraphQLSchema plugin,\n    // to be able to create a reliable cache key.\n    return plugins.length.toString();\n};\n\nconst createRequestBody = (body: unknown): GraphQLRequestBody | GraphQLRequestBody[] => {\n    /**\n     * We are trusting that the body payload is correct.\n     * The `processRequestBody` will fail if it is not.\n     */\n    return typeof body === \"string\" ? JSON.parse(body) : body;\n};\n\nconst formatErrorPayload = (error: Error): string => {\n    if (error instanceof WebinyError) {\n        return JSON.stringify({\n            type: \"CoreGraphQLWebinyError\",\n            message: error.message,\n            code: error.code,\n            data: error.data\n        });\n    }\n\n    return JSON.stringify({\n        type: \"Error\",\n        name: error.name,\n        message: error.message,\n        stack: error.stack\n    });\n};\n\nexport default (options: HandlerGraphQLOptions = {}): PluginCollection => {\n    let schema: GraphQLSchema | undefined = undefined;\n    let cacheKey: string | undefined = undefined;\n\n    const debug = boolean(options.debug);\n\n    const path = options?.path || \"/graphql\";\n\n    const route = new RoutePlugin(async ({ onPost, onOptions, context }) => {\n        onOptions(path, async (_, reply) => {\n            return reply\n                .status(204)\n                .headers({\n                    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n                })\n                .send({})\n                .hijack();\n        });\n        onPost(path, async (request, reply) => {\n            const contextCacheKey = createCacheKey(context as Context);\n            if (!schema || cacheKey !== contextCacheKey) {\n                try {\n                    schema = createGraphQLSchema(context);\n                    cacheKey = contextCacheKey;\n                } catch (ex) {\n                    return reply.code(500).send(formatErrorPayload(ex));\n                }\n            }\n            let body: GraphQLRequestBody | GraphQLRequestBody[];\n            try {\n                body = createRequestBody(request.body);\n            } catch (ex) {\n                console.error(`Error while creating the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n            try {\n                const result = await processRequestBody(body, schema, context);\n                return reply.status(200).send(result);\n            } catch (ex) {\n                console.error(`Error while processing the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        });\n    });\n\n    route.name = \"handler.graphql.route.default\";\n\n    return [\n        ...(debug ? debugPlugins() : []),\n        {\n            type: \"wcp-telemetry-tracker\"\n        },\n        route\n    ];\n};\n"],"mappings":"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"}

package/createGraphQLSchema.d.ts

@@ -1,3 +1,4 @@
-import { Context } from "@webiny/handler/types";
-import { HttpContext } from "@webiny/handler-http/types";
-export declare const createGraphQLSchema: (context: Context<HttpContext>) => import("graphql").GraphQLSchema;
+import { GraphQLSchemaPlugin } from "./types";
+import { Context } from "@webiny/api/types";
+export declare const getSchemaPlugins: (context: Context) => GraphQLSchemaPlugin<Context>[];
+export declare const createGraphQLSchema: (context: Context) => import("graphql").GraphQLSchema;

package/createGraphQLSchema.js

@@ -1,26 +1,23 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createGraphQLSchema = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+exports.getSchemaPlugins = exports.createGraphQLSchema = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _schema = require("@graphql-tools/schema");
-
 var _builtInTypes = require("./builtInTypes");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
+const getSchemaPlugins = context => {
+  return context.plugins.byType("graphql-schema");
+};
+exports.getSchemaPlugins = getSchemaPlugins;
 const createGraphQLSchema = context => {
   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
@@ -33,33 +30,40 @@ 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 = [_objectSpread(_objectSpread({}, scalars.reduce((acc, s) => {
+  const resolvers = [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, scalars.reduce((acc, s) => {
     acc[s.name] = s;
     return acc;
   }, {})), {}, {
     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");
-
-  for (let i = 0; i < gqlPlugins.length; i++) {
-    const plugin = gqlPlugins[i];
+  const plugins = getSchemaPlugins(context);
+  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);
   }
-
   return (0, _schema.makeExecutableSchema)({
     typeDefs,
     resolvers,
     inheritResolversFromInterfaces: true
   });
 };
-
 exports.createGraphQLSchema = createGraphQLSchema;

package/createGraphQLSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getSchemaPlugins","context","plugins","byType","createGraphQLSchema","scalars","map","item","scalar","typeDefs","gql","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","Date","DateScalar","Time","TimeScalar","plugin","push","schema","makeExecutableSchema","inheritResolversFromInterfaces"],"sources":["createGraphQLSchema.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { GraphQLScalarPlugin, GraphQLSchemaPlugin } from \"./types\";\nimport { Context } from \"@webiny/api/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateScalar,\n    DateTimeScalar,\n    JsonScalar,\n    TimeScalar,\n    LongScalar\n} from \"./builtInTypes\";\nimport { GraphQLScalarType } from \"graphql/type/definition\";\n\nexport const getSchemaPlugins = (context: Context) => {\n    return context.plugins.byType<GraphQLSchemaPlugin>(\"graphql-schema\");\n};\n\nexport const createGraphQLSchema = (context: Context) => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    // TODO: once the API packages more closed, we'll have the opportunity\n    // TODO: to maybe import the @ps directive from `api-prerendering-service` package.\n    const typeDefs = [\n        gql`\n            type Query\n            type Mutation\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar Time\n\n            # This directive doesn't do anything on the GraphQL resolution level. It just serves\n            # as a way to tell the Prerendering Service whether the GraphQL query needs to be\n            # cached or not.\n            directive @ps(cache: Boolean) on QUERY\n        `\n    ];\n\n    const resolvers = [\n        {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            Date: DateScalar,\n            Time: TimeScalar\n        }\n    ];\n\n    const plugins = getSchemaPlugins(context);\n    for (const plugin of plugins) {\n        /**\n         * TODO @ts-refactor\n         * Figure out correct types on typeDefs and resolvers\n         */\n        // @ts-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,gBAAgB,GAAIC,OAAgB,IAAK;EAClD,OAAOA,OAAO,CAACC,OAAO,CAACC,MAAM,CAAsB,gBAAgB,CAAC;AACxE,CAAC;AAAC;AAEK,MAAMC,mBAAmB,GAAIH,OAAgB,IAAK;EACrD,MAAMI,OAAO,GAAGJ,OAAO,CAACC,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CG,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;;EAE7B;EACA;EACA,MAAMC,QAAQ,GAAG,CACb,IAAAC,mBAAG,CAAC;AACZ;AACA;AACA,cAAcL,OAAO,CAACC,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,CACJ;EAED,MAAMC,SAAS,GAAG,6DAEPR,OAAO,CAACS,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;IAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;IACf,OAAOD,GAAG;EACd,CAAC,EAAE,CAAC,CAAC,CAAC;IACNE,IAAI,EAAEC,wBAAU;IAChBC,IAAI,EAAEC,wBAAU;IAChBC,QAAQ,EAAEC,4BAAc;IACxBC,MAAM,EAAEC,0BAAY;IACpBC,GAAG,EAAEC,uBAAS;IACdC,QAAQ,EAAEC,4BAAc;IACxBC,IAAI,EAAEC,wBAAU;IAChBC,IAAI,EAAEC;EAAU,GAEvB;EAED,MAAM9B,OAAO,GAAGF,gBAAgB,CAACC,OAAO,CAAC;EACzC,KAAK,MAAMgC,MAAM,IAAI/B,OAAO,EAAE;IAC1B;AACR;AACA;AACA;IACQ;IACAO,QAAQ,CAACyB,IAAI,CAACD,MAAM,CAACE,MAAM,CAAC1B,QAAQ,CAAC;IACrC;IACAI,SAAS,CAACqB,IAAI,CAACD,MAAM,CAACE,MAAM,CAACtB,SAAS,CAAC;EAC3C;EAEA,OAAO,IAAAuB,4BAAoB,EAAC;IACxB3B,QAAQ;IACRI,SAAS;IACTwB,8BAA8B,EAAE;EACpC,CAAC,CAAC;AACN,CAAC;AAAC"}

package/debugPlugins.d.ts

@@ -1,12 +1,14 @@
-import { GraphQLAfterQueryPlugin, GraphQLBeforeQueryPlugin } from "./types";
-import { ContextInterface, ContextPlugin } from "@webiny/handler/types";
-interface DebugContext extends ContextInterface {
+import { GraphQLAfterQueryPlugin } from "./types";
+import { Context } from "@webiny/api/types";
+import { ContextPlugin } from "@webiny/api";
+interface Log {
+    method: string;
+    args: any;
+}
+interface DebugContext extends Context {
     debug: {
-        logs?: {
-            method: string;
-            args: any;
-        }[];
+        logs?: Log[];
     };
 }
-declare const _default: () => (ContextPlugin<DebugContext, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>> | GraphQLBeforeQueryPlugin<DebugContext> | GraphQLAfterQueryPlugin<DebugContext>)[];
+declare const _default: () => (ContextPlugin<DebugContext> | GraphQLAfterQueryPlugin<DebugContext>)[];
 export default _default;

package/debugPlugins.js

@@ -4,45 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _interceptConsole = require("./interceptConsole");
-
-var _default = () => [{
-  type: "context",
-
-  apply(context) {
-    context.debug = context.debug || {};
-    context.debug.logs = [];
-    (0, _interceptConsole.interceptConsole)((method, args) => {
-      context.debug.logs.push({
-        method,
-        args
-      });
-    });
+var _api = require("@webiny/api");
+var _default = () => [new _api.ContextPlugin(async context => {
+  if (!context.debug) {
+    context.debug = {};
   }
-
-}, {
-  type: "graphql-before-query",
-
-  apply({
-    context
-  }) {
-    // Empty logs
+  if (!context.debug.logs) {
     context.debug.logs = [];
   }
-
-}, {
+  (0, _interceptConsole.interceptConsole)((method, args) => {
+    context.debug.logs.push({
+      method,
+      args
+    });
+  });
+}), {
   type: "graphql-after-query",
-
   apply({
     result,
     context
   }) {
     result["extensions"] = {
-      console: context.debug.logs || []
+      console: [...(context.debug.logs || [])]
     };
+    if (context.debug.logs) {
+      context.debug.logs.length = 0;
+    }
   }
-
 }];
-
 exports.default = _default;

package/debugPlugins.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ContextPlugin","context","debug","logs","interceptConsole","method","args","push","type","apply","result","console","length"],"sources":["debugPlugins.ts"],"sourcesContent":["import { interceptConsole } from \"./interceptConsole\";\nimport { GraphQLAfterQueryPlugin } from \"./types\";\nimport { Context } from \"@webiny/api/types\";\nimport { ContextPlugin } from \"@webiny/api\";\n\ninterface Log {\n    method: string;\n    args: any;\n}\ninterface DebugContext extends Context {\n    debug: {\n        logs?: Log[];\n    };\n}\n\nexport default () => [\n    new ContextPlugin<DebugContext>(async context => {\n        if (!context.debug) {\n            context.debug = {};\n        }\n\n        if (!context.debug.logs) {\n            context.debug.logs = [];\n        }\n\n        interceptConsole((method, args) => {\n            (context.debug.logs as Log[]).push({ method, args });\n        });\n    }),\n    {\n        type: \"graphql-after-query\",\n        apply({ result, context }) {\n            result[\"extensions\"] = { console: [...(context.debug.logs || [])] };\n            if (context.debug.logs) {\n                context.debug.logs.length = 0;\n            }\n        }\n    } as GraphQLAfterQueryPlugin<DebugContext>\n];\n"],"mappings":";;;;;;AAAA;AAGA;AAA4C,eAY7B,MAAM,CACjB,IAAIA,kBAAa,CAAe,MAAMC,OAAO,IAAI;EAC7C,IAAI,CAACA,OAAO,CAACC,KAAK,EAAE;IAChBD,OAAO,CAACC,KAAK,GAAG,CAAC,CAAC;EACtB;EAEA,IAAI,CAACD,OAAO,CAACC,KAAK,CAACC,IAAI,EAAE;IACrBF,OAAO,CAACC,KAAK,CAACC,IAAI,GAAG,EAAE;EAC3B;EAEA,IAAAC,kCAAgB,EAAC,CAACC,MAAM,EAAEC,IAAI,KAAK;IAC9BL,OAAO,CAACC,KAAK,CAACC,IAAI,CAAWI,IAAI,CAAC;MAAEF,MAAM;MAAEC;IAAK,CAAC,CAAC;EACxD,CAAC,CAAC;AACN,CAAC,CAAC,EACF;EACIE,IAAI,EAAE,qBAAqB;EAC3BC,KAAK,CAAC;IAAEC,MAAM;IAAET;EAAQ,CAAC,EAAE;IACvBS,MAAM,CAAC,YAAY,CAAC,GAAG;MAAEC,OAAO,EAAE,CAAC,IAAIV,OAAO,CAACC,KAAK,CAACC,IAAI,IAAI,EAAE,CAAC;IAAE,CAAC;IACnE,IAAIF,OAAO,CAACC,KAAK,CAACC,IAAI,EAAE;MACpBF,OAAO,CAACC,KAAK,CAACC,IAAI,CAACS,MAAM,GAAG,CAAC;IACjC;EACJ;AACJ,CAAC,CACJ;AAAA"}

package/errors.d.ts

@@ -1,4 +1,4 @@
-import Error from "@webiny/error";
-export declare class NotFoundError extends Error {
+import WebinyError from "@webiny/error";
+export declare class NotFoundError extends WebinyError {
     constructor(message?: string);
 }

package/errors.js

@@ -1,19 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NotFoundError = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 class NotFoundError extends _error.default {
   constructor(message = "Not found.") {
     super(message, "NOT_FOUND");
   }
-
 }
-
 exports.NotFoundError = NotFoundError;

package/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["NotFoundError","WebinyError","constructor","message"],"sources":["errors.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\n\nexport class NotFoundError extends WebinyError {\n    constructor(message = \"Not found.\") {\n        super(message, \"NOT_FOUND\");\n    }\n}\n"],"mappings":";;;;;;;AAAA;AAEO,MAAMA,aAAa,SAASC,cAAW,CAAC;EAC3CC,WAAW,CAACC,OAAO,GAAG,YAAY,EAAE;IAChC,KAAK,CAACA,OAAO,EAAE,WAAW,CAAC;EAC/B;AACJ;AAAC"}

package/index.d.ts

@@ -1,9 +1,7 @@
 import { HandlerGraphQLOptions } from "./types";
-import { Context } from "@webiny/handler/types";
-import { GraphQLFieldResolver } from "./types";
 export * from "./errors";
 export * from "./responses";
+export * from "./plugins";
+export { default as processRequestBody } from "./processRequestBody";
 declare const _default: (options?: HandlerGraphQLOptions) => import("@webiny/plugins/types").PluginCollection[];
 export default _default;
-export declare const pipe: <TSource = any, TArgs = Record<string, any>, TContext = Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>(...fns: any[]) => (resolver: import("graphql").GraphQLFieldResolver<TSource, TContext, TArgs>) => any;
-export declare const compose: <TSource = any, TArgs = Record<string, any>, TContext = Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>(...fns: any[]) => (resolver: import("graphql").GraphQLFieldResolver<TSource, TContext, TArgs>) => any;

package/index.js

@@ -1,20 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  pipe: true,
-  compose: true
+  processRequestBody: true
 };
-exports.pipe = exports.default = exports.compose = void 0;
-
+exports.default = void 0;
+Object.defineProperty(exports, "processRequestBody", {
+  enumerable: true,
+  get: function () {
+    return _processRequestBody.default;
+  }
+});
 var _createGraphQLHandler = _interopRequireDefault(require("./createGraphQLHandler"));
-
 var _errors = require("./errors");
-
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -26,9 +27,7 @@ Object.keys(_errors).forEach(function (key) {
     }
   });
 });
-
 var _responses = require("./responses");
-
 Object.keys(_responses).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -40,15 +39,18 @@ Object.keys(_responses).forEach(function (key) {
     }
   });
 });
-
+var _plugins = require("./plugins");
+Object.keys(_plugins).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugins[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugins[key];
+    }
+  });
+});
+var _processRequestBody = _interopRequireDefault(require("./processRequestBody"));
 var _default = (options = {}) => [(0, _createGraphQLHandler.default)(options)];
-
-exports.default = _default;
-
-const pipe = (...fns) => resolver => fns.reduce((v, f) => f(v), resolver);
-
-exports.pipe = pipe;
-
-const compose = (...fns) => resolver => fns.reduceRight((v, f) => f(v), resolver);
-
-exports.compose = compose;
+exports.default = _default;

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["options","createGraphQLHandler"],"sources":["index.ts"],"sourcesContent":["import { HandlerGraphQLOptions } from \"./types\";\nimport createGraphQLHandler from \"./createGraphQLHandler\";\n\nexport * from \"./errors\";\nexport * from \"./responses\";\nexport * from \"./plugins\";\nexport { default as processRequestBody } from \"./processRequestBody\";\n\nexport default (options: HandlerGraphQLOptions = {}) => [createGraphQLHandler(options)];\n"],"mappings":";;;;;;;;;;;;;;;;AACA;AAEA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAqE,eAEtD,CAACA,OAA8B,GAAG,CAAC,CAAC,KAAK,CAAC,IAAAC,6BAAoB,EAACD,OAAO,CAAC,CAAC;AAAA"}

package/interceptConsole.d.ts

@@ -1 +1,5 @@
-export declare const interceptConsole: (callback: any) => void;
+interface InterceptConsoleCallable {
+    (method: string, args: any[]): void;
+}
+export declare const interceptConsole: (callback: InterceptConsoleCallable) => void;
+export {};

package/interceptConsole.js

@@ -7,33 +7,31 @@ exports.interceptConsole = void 0;
 const consoleMethods = ["assert", "debug", "dir", "error", "group", "groupCollapsed", "groupEnd", "info", "log", "table", "warn"];
 const originalMethods = {};
 const skipOriginal = ["table"];
-
 const restoreOriginalMethods = () => {
   for (const method of consoleMethods) {
+    // @ts-ignore
     console[method] = originalMethods[method];
   }
 };
-
 const interceptConsole = callback => {
+  // @ts-ignore
   if (console["__WEBINY__"] === true) {
     restoreOriginalMethods();
   }
 
+  // @ts-ignore
   console["__WEBINY__"] = true;
-
   for (const method of consoleMethods) {
+    // @ts-ignore
     originalMethods[method] = console[method];
-
+    // @ts-ignore
     console[method] = (...args) => {
       callback(method, args);
-
       if (skipOriginal.includes(method)) {
         return;
       }
-
       originalMethods[method](...args);
     };
   }
 };
-
 exports.interceptConsole = interceptConsole;

package/interceptConsole.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["consoleMethods","originalMethods","skipOriginal","restoreOriginalMethods","method","console","interceptConsole","callback","args","includes"],"sources":["interceptConsole.ts"],"sourcesContent":["const consoleMethods = [\n    \"assert\",\n    \"debug\",\n    \"dir\",\n    \"error\",\n    \"group\",\n    \"groupCollapsed\",\n    \"groupEnd\",\n    \"info\",\n    \"log\",\n    \"table\",\n    \"warn\"\n];\n\nconst originalMethods: Record<string, any> = {};\nconst skipOriginal: string[] = [\"table\"];\n\nconst restoreOriginalMethods = () => {\n    for (const method of consoleMethods) {\n        // @ts-ignore\n        console[method] = originalMethods[method];\n    }\n};\n\ninterface InterceptConsoleCallable {\n    (method: string, args: any[]): void;\n}\n\nexport const interceptConsole = (callback: InterceptConsoleCallable) => {\n    // @ts-ignore\n    if (console[\"__WEBINY__\"] === true) {\n        restoreOriginalMethods();\n    }\n\n    // @ts-ignore\n    console[\"__WEBINY__\"] = true;\n\n    for (const method of consoleMethods) {\n        // @ts-ignore\n        originalMethods[method] = console[method];\n        // @ts-ignore\n        console[method] = (...args) => {\n            callback(method, args);\n            if (skipOriginal.includes(method)) {\n                return;\n            }\n            originalMethods[method](...args);\n        };\n    }\n};\n"],"mappings":";;;;;;AAAA,MAAMA,cAAc,GAAG,CACnB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,CACT;AAED,MAAMC,eAAoC,GAAG,CAAC,CAAC;AAC/C,MAAMC,YAAsB,GAAG,CAAC,OAAO,CAAC;AAExC,MAAMC,sBAAsB,GAAG,MAAM;EACjC,KAAK,MAAMC,MAAM,IAAIJ,cAAc,EAAE;IACjC;IACAK,OAAO,CAACD,MAAM,CAAC,GAAGH,eAAe,CAACG,MAAM,CAAC;EAC7C;AACJ,CAAC;AAMM,MAAME,gBAAgB,GAAIC,QAAkC,IAAK;EACpE;EACA,IAAIF,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;IAChCF,sBAAsB,EAAE;EAC5B;;EAEA;EACAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI;EAE5B,KAAK,MAAMD,MAAM,IAAIJ,cAAc,EAAE;IACjC;IACAC,eAAe,CAACG,MAAM,CAAC,GAAGC,OAAO,CAACD,MAAM,CAAC;IACzC;IACAC,OAAO,CAACD,MAAM,CAAC,GAAG,CAAC,GAAGI,IAAI,KAAK;MAC3BD,QAAQ,CAACH,MAAM,EAAEI,IAAI,CAAC;MACtB,IAAIN,YAAY,CAACO,QAAQ,CAACL,MAAM,CAAC,EAAE;QAC/B;MACJ;MACAH,eAAe,CAACG,MAAM,CAAC,CAAC,GAAGI,IAAI,CAAC;IACpC,CAAC;EACL;AACJ,CAAC;AAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-graphql",
-	"version": "0.0.0-mt-2",
+	"version": "0.0.0-unstable.085ff6572f",
 	"main": "index.js",
 	"license": "MIT",
 	"repository": {
@@ -14,28 +14,29 @@
 		"Adrian Smijulj <adrian@webiny.com>"
 	],
 	"dependencies": {
-		"@babel/runtime": "7.15.4",
+		"@babel/runtime": "7.20.13",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/error": "0.0.0-mt-2",
-		"@webiny/handler": "0.0.0-mt-2",
-		"@webiny/handler-http": "0.0.0-mt-2",
-		"@webiny/plugins": "0.0.0-mt-2",
-		"boolean": "3.1.4",
-		"graphql": "14.7.0",
+		"@webiny/api": "0.0.0-unstable.085ff6572f",
+		"@webiny/error": "0.0.0-unstable.085ff6572f",
+		"@webiny/handler": "0.0.0-unstable.085ff6572f",
+		"@webiny/plugins": "0.0.0-unstable.085ff6572f",
+		"boolean": "3.2.0",
+		"graphql": "15.8.0",
 		"graphql-scalars": "1.12.0",
-		"graphql-tag": "2.12.5"
+		"graphql-tag": "2.12.6"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@webiny/cli": "^0.0.0-mt-2",
-		"@webiny/handler-args": "^0.0.0-mt-2",
-		"@webiny/project-utils": "^0.0.0-mt-2",
-		"jest": "^26.6.3",
-		"jest-mock-console": "^1.0.0",
-		"rimraf": "^3.0.2",
-		"typescript": "^4.1.3"
+		"@babel/cli": "7.20.7",
+		"@babel/core": "7.20.12",
+		"@babel/preset-env": "7.20.2",
+		"@webiny/cli": "0.0.0-unstable.085ff6572f",
+		"@webiny/handler-aws": "0.0.0-unstable.085ff6572f",
+		"@webiny/project-utils": "0.0.0-unstable.085ff6572f",
+		"jest": "29.5.0",
+		"jest-mock-console": "1.3.0",
+		"rimraf": "3.0.2",
+		"ttypescript": "1.5.15",
+		"typescript": "4.7.4"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -45,5 +46,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "3c0dcfb3c22c9f83107fdb97b25014cd03d9db7d"
+	"gitHead": "085ff6572f6bb6a76d218088b06d9f4ef92bbea7"
 }

package/plugins/GraphQLSchemaPlugin.d.ts

@@ -1,12 +1,12 @@
 import { Plugin } from "@webiny/plugins";
 import { GraphQLSchemaDefinition, Resolvers, Types } from "../types";
-import { Context } from "@webiny/handler/types";
+import { Context } from "@webiny/api/types";
 export interface GraphQLSchemaPluginConfig<TContext> {
     typeDefs?: Types;
     resolvers?: Resolvers<TContext>;
 }
 export declare class GraphQLSchemaPlugin<TContext = Context> extends Plugin {
-    static readonly type = "graphql-schema";
+    static readonly type: string;
     private config;
     constructor(config: GraphQLSchemaPluginConfig<TContext>);
     get schema(): GraphQLSchemaDefinition<TContext>;