@makerx/graphql-core 1.5.0 → 2.1.0

package/README.md

@@ -119,26 +119,11 @@ const graphqlServer = createServer({
 
 ### logGraphQLOperation
 
-The `logGraphQLOperation` function will log:
+Logs a GraphQL operation in a consistent format with the option of including any additional data. Top level and result level log data with null or undefined values will be omitted for berevity.
 
-- `operationName`: the operation name, if supplied
-- `query`: the formatted graphql query or mutation, or 'IntrospectionQuery'
-- `variables`: the graphql request variables
-- `duration`: the duration of request processing
-- `errors`: the graphql response errors, if any
+Refer to the `GraphQLLogOperationInfo` type for the definition of input.
 
-Notes:
-
-- null or undefined values will be omitted
-- introspection queries will not be logged outside of production
-
-This function can be used across implementations, e.g. in a [GraphQL Envelop plugin](https://www.envelop.dev/docs/plugins) or [ApolloServer plugin](https://www.apollographql.com/docs/apollo-server/integrations/plugins/).
-
-### logGraphQLExecutionArgs
-
-The `logGraphQLExecutionArgs` will log `operationName`, `query` and `variables` params from the GraphQL `ExecutionArgs`.
-
-This can be used when logging from execution callbacks, e.g. graphql-ws Server [onOperation](https://the-guild.dev/graphql/ws/docs/interfaces/server.ServerOptions#onoperation) and [onNext](https://the-guild.dev/graphql/ws/docs/interfaces/server.ServerOptions#onnext).
+This function can be used across implementations, e.g. in a [GraphQL Envelop plugin](https://www.envelop.dev/docs/plugins) or [ApolloServer plugin](https://github.com/MakerXStudio/graphql-apollo-server/blob/main/src/plugins/graphql-operation-logging-plugin.ts).
 
 ## GraphQL subscriptions
 

package/logging.d.ts

@@ -1,21 +1,79 @@
 import { Logger } from '@makerx/node-common';
-import { ExecutionArgs, GraphQLFormattedError } from 'graphql';
-interface GraphQLLogOperationInfo {
-    started: number;
+import { ExecutionArgs, GraphQLFormattedError, OperationTypeNode } from 'graphql';
+import { ExecutionResult } from 'graphql-ws';
+type LogFunction = Logger['info'];
+export type LoggerLogFunctions<T extends Logger> = {
+    [Property in keyof T]: LogFunction;
+};
+/**
+ * Info for logging a GraphQL operation in a consistent format with the option of including any additional data.
+ */
+export interface GraphQLLogOperationInfo<TLogger extends Logger = Logger> extends Record<string, unknown> {
+    /**
+     * The message to log, defaults to 'GraphQL operation'.
+     */
+    message?: string;
+    /**
+     * The timestamp when the operation started, if supplied, the duration will be logged.
+     */
+    started?: number;
+    /**
+     * The type of GraphQL operation.
+     */
+    type?: OperationTypeNode | null;
+    /**
+     * The name of the GraphQL operation.
+     */
     operationName?: string | null;
+    /**
+     * The formatted GraphQL query.
+     */
     query?: string | null;
+    /**
+     * The GraphQL variables.
+     */
     variables?: Record<string, unknown> | null;
-    result: {
+    /**
+     * The result of the GraphQL operation.
+     * Generally, we don't log the data or extensions, just errors.
+     */
+    result?: {
         data?: Record<string, unknown> | null;
         errors?: readonly GraphQLFormattedError[] | null;
+        extensions?: Record<string, unknown> | null;
+        hasNext?: boolean;
     };
-    logger: Logger;
+    /**
+     * Whether the operation is an introspection query.
+     */
+    isIntrospectionQuery?: boolean;
+    /**
+     * Whether the operation is part of an incremental response.
+     */
+    isIncrementalResponse?: boolean;
+    /**
+     * Whether the operation is a subsequent payload of an incremental response.
+     */
+    isSubsequentPayload?: boolean;
+    /**
+     * The logger to use.
+     */
+    logger: TLogger;
+    /**
+     * The logger function to use, defaults to 'info'.
+     */
+    logLevel?: keyof LoggerLogFunctions<TLogger>;
 }
-export declare const logGraphQLOperation: ({ started, operationName, query, variables, result: { errors }, logger }: GraphQLLogOperationInfo) => void;
 /**
- * Logs `operationName`, `query` and `variables` params from the GraphQL `ExecutionArgs`.
- * If `args.contextValue` has a `logger` property, it will be used, otherwise the `logger` param will be used.
+ * Logs a GraphQL operation in a consistent format with the option of including any additional data.
+ * Top level and result entries with null or undefined values will be omitted.
  */
-export declare const logGraphQLExecutionArgs: (args: ExecutionArgs, message: string, logger?: Logger) => void;
+export declare const logGraphQLOperation: <TLogger extends Logger = Logger>({ message, started, type, operationName, query, variables, result, logger, logLevel, ...rest }: GraphQLLogOperationInfo<TLogger>) => void;
+export declare const logSubscriptionOperation: <TLogger extends Logger = Logger>({ args, result, message, logLevel, }: {
+    args: ExecutionArgs;
+    result?: ExecutionResult<Record<string, unknown>, Record<string, unknown>> | undefined;
+    message?: string | undefined;
+    logLevel?: keyof TLogger | undefined;
+}) => void;
 export {};
 //# sourceMappingURL=logging.d.ts.map

package/logging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAS,MAAM,SAAS,CAAA;AAKrE,UAAU,uBAAuB;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;IAC1C,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;QACrC,MAAM,CAAC,EAAE,SAAS,qBAAqB,EAAE,GAAG,IAAI,CAAA;KACjD,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,mBAAmB,6EAA8E,uBAAuB,SAgBpI,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,SAAU,aAAa,WAAW,MAAM,WAAW,MAAM,SAc5F,CAAA"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,iBAAiB,EAAS,MAAM,SAAS,CAAA;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;AACjC,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI;KAChD,QAAQ,IAAI,MAAM,CAAC,GAAG,WAAW;CACnC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACvG;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAC/B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;IAC1C;;;OAGG;IACH,MAAM,CAAC,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;QACrC,MAAM,CAAC,EAAE,SAAS,qBAAqB,EAAE,GAAG,IAAI,CAAA;QAChD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;QAC3C,OAAO,CAAC,EAAE,OAAO,CAAA;KAClB,CAAA;IACD;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B;;OAEG;IACH,MAAM,EAAE,OAAO,CAAA;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;CAC7C;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,6KA8B/B,CAAA;AAED,eAAO,MAAM,wBAAwB;UAM7B,aAAa;;;;UAqBpB,CAAA"}

package/logging.js

@@ -3,36 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logGraphQLExecutionArgs = exports.logGraphQLOperation = void 0;
+exports.logSubscriptionOperation = exports.logGraphQLOperation = void 0;
 const node_common_1 = require("@makerx/node-common");
 const graphql_1 = require("graphql");
 const lodash_omitby_1 = __importDefault(require("lodash.omitby"));
 const utils_1 = require("./utils");
-const logGraphQLOperation = ({ started, operationName, query, variables, result: { errors }, logger }) => {
+/**
+ * Logs a GraphQL operation in a consistent format with the option of including any additional data.
+ * Top level and result entries with null or undefined values will be omitted.
+ */
+const logGraphQLOperation = ({ message = 'GraphQL operation', started, type, operationName, query, variables, result, logger, logLevel = 'info', ...rest }) => {
     const isIntrospection = query && (0, utils_1.isIntrospectionQuery)(query);
     if (node_common_1.isLocalDev && isIntrospection)
         return;
-    logger.info('GraphQL operation', (0, lodash_omitby_1.default)({
+    logger[logLevel](message, (0, lodash_omitby_1.default)({
+        type,
         operationName,
-        query: isIntrospection ? 'IntrospectionQuery' : query,
+        query,
         variables: variables && Object.keys(variables).length > 0 ? variables : undefined,
-        duration: Date.now() - started,
-        errors,
+        duration: started ? Date.now() - started : undefined,
+        result: result ? (0, lodash_omitby_1.default)(result, utils_1.isNil) : undefined,
+        isIntrospectionQuery: isIntrospection || undefined,
+        ...(0, lodash_omitby_1.default)(rest, utils_1.isNil),
     }, utils_1.isNil));
 };
 exports.logGraphQLOperation = logGraphQLOperation;
-/**
- * Logs `operationName`, `query` and `variables` params from the GraphQL `ExecutionArgs`.
- * If `args.contextValue` has a `logger` property, it will be used, otherwise the `logger` param will be used.
- */
-const logGraphQLExecutionArgs = (args, message, logger) => {
+const logSubscriptionOperation = ({ args, result, message, logLevel, }) => {
+    const logger = args.contextValue.logger;
+    if (!logger)
+        return;
     const { operationName, variableValues, document } = args;
-    const contextLogger = args.contextValue.logger ?? logger;
-    contextLogger?.info(message, (0, lodash_omitby_1.default)({
+    const { data, ...resultWithoutData } = result ?? {};
+    (0, exports.logGraphQLOperation)({
+        message,
+        type: graphql_1.OperationTypeNode.SUBSCRIPTION,
         operationName,
         query: (0, graphql_1.print)(document),
         variables: variableValues,
-    }, utils_1.isNil));
+        result: resultWithoutData,
+        logger,
+        logLevel,
+    });
 };
-exports.logGraphQLExecutionArgs = logGraphQLExecutionArgs;
+exports.logSubscriptionOperation = logSubscriptionOperation;
 //# sourceMappingURL=logging.js.map

package/logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAwD;AACxD,qCAAqE;AACrE,kEAAkC;AAClC,mCAAqD;AAe9C,MAAM,mBAAmB,GAAG,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAA2B,EAAE,EAAE;IACvI,MAAM,eAAe,GAAG,KAAK,IAAI,IAAA,4BAAoB,EAAC,KAAK,CAAC,CAAA;IAC5D,IAAI,wBAAU,IAAI,eAAe;QAAE,OAAM;IACzC,MAAM,CAAC,IAAI,CACT,mBAAmB,EACnB,IAAA,uBAAM,EACJ;QACE,aAAa;QACb,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK;QACrD,SAAS,EAAE,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACjF,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;QAC9B,MAAM;KACP,EACD,aAAK,CACN,CACF,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,mBAAmB,uBAgB/B;AAED;;;GAGG;AACI,MAAM,uBAAuB,GAAG,CAAC,IAAmB,EAAE,OAAe,EAAE,MAAe,EAAE,EAAE;IAC/F,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACxD,MAAM,aAAa,GAAI,IAAI,CAAC,YAAwC,CAAC,MAAM,IAAI,MAAM,CAAA;IACrF,aAAa,EAAE,IAAI,CACjB,OAAO,EACP,IAAA,uBAAM,EACJ;QACE,aAAa;QACb,KAAK,EAAE,IAAA,eAAK,EAAC,QAAQ,CAAC;QACtB,SAAS,EAAE,cAAc;KAC1B,EACD,aAAK,CACN,CACF,CAAA;AACH,CAAC,CAAA;AAdY,QAAA,uBAAuB,2BAcnC"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAwD;AACxD,qCAAwF;AAExF,kEAAkC;AAElC,mCAAqD;AAmErD;;;GAGG;AACI,MAAM,mBAAmB,GAAG,CAAkC,EACnE,OAAO,GAAG,mBAAmB,EAC7B,OAAO,EACP,IAAI,EACJ,aAAa,EACb,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,GAAG,MAAM,EACjB,GAAG,IAAI,EAC0B,EAAE,EAAE;IACrC,MAAM,eAAe,GAAG,KAAK,IAAI,IAAA,4BAAoB,EAAC,KAAK,CAAC,CAAA;IAC5D,IAAI,wBAAU,IAAI,eAAe;QAAE,OAAM;IACzC,MAAM,CAAC,QAAwB,CAAC,CAC9B,OAAO,EACP,IAAA,uBAAM,EACJ;QACE,IAAI;QACJ,aAAa;QACb,KAAK;QACL,SAAS,EAAE,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACjF,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS;QACpD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,uBAAM,EAAC,MAAM,EAAE,aAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QAClD,oBAAoB,EAAE,eAAe,IAAI,SAAS;QAClD,GAAG,IAAA,uBAAM,EAAC,IAAI,EAAE,aAAK,CAAC;KACvB,EACD,aAAK,CACN,CACF,CAAA;AACH,CAAC,CAAA;AA9BY,QAAA,mBAAmB,uBA8B/B;AAEM,MAAM,wBAAwB,GAAG,CAAkC,EACxE,IAAI,EACJ,MAAM,EACN,OAAO,EACP,QAAQ,GAMT,EAAE,EAAE;IACH,MAAM,MAAM,GAAI,IAAI,CAAC,YAA+B,CAAC,MAAiB,CAAA;IACtE,IAAI,CAAC,MAAM;QAAE,OAAM;IAEnB,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,iBAAiB,EAAE,GAAG,MAAM,IAAI,EAAE,CAAA;IAEnD,IAAA,2BAAmB,EAAC;QAClB,OAAO;QACP,IAAI,EAAE,2BAAiB,CAAC,YAAY;QACpC,aAAa;QACb,KAAK,EAAE,IAAA,eAAK,EAAC,QAAQ,CAAC;QACtB,SAAS,EAAE,cAAc;QACzB,MAAM,EAAE,iBAAiB;QACzB,MAAM;QACN,QAAQ;KACT,CAAC,CAAA;AACJ,CAAC,CAAA;AA3BY,QAAA,wBAAwB,4BA2BpC"}

package/package.json

@@ -2,7 +2,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "name": "@makerx/graphql-core",
-  "version": "1.5.0",
+  "version": "2.1.0",
   "private": false,
   "description": "A set of core GraphQL utilities that MakerX uses to build GraphQL APIs",
   "author": "MakerX",

package/subscriptions/server.d.ts

@@ -4,11 +4,12 @@ import { GraphQLSchema } from 'graphql';
 import type { Server } from 'http';
 import { JwtPayload } from '../context';
 import { CreateSubscriptionContext } from './context';
-export declare function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext, logger, path, verifyToken, requireAuth, jwtClaimsToLog, }: {
+export declare function useSubscriptionsServer<TLogger extends Logger = Logger>({ schema, httpServer, createSubscriptionContext, logger, operationLogLevel, path, verifyToken, requireAuth, jwtClaimsToLog, }: {
     schema: GraphQLSchema;
     httpServer: Server;
     createSubscriptionContext: CreateSubscriptionContext;
-    logger: Logger;
+    logger: TLogger;
+    operationLogLevel?: keyof TLogger;
     path?: string;
     verifyToken?: (host: string, token: string) => Promise<JwtPayload>;
     requireAuth?: boolean;

package/subscriptions/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAIrD,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,UAAU,EACV,yBAAyB,EACzB,MAAM,EACN,IAAiB,EACjB,WAAW,EACX,WAAW,EACX,cAA+B,GAChC,EAAE;IACD,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,yBAAyB,EAAE,yBAAyB,CAAA;IACpD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAA;IAClE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAC1B,mCA+EA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAGrD,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,EACtE,MAAM,EACN,UAAU,EACV,yBAAyB,EACzB,MAAM,EACN,iBAA0B,EAC1B,IAAiB,EACjB,WAAW,EACX,WAAW,EACX,cAA+B,GAChC,EAAE;IACD,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,yBAAyB,EAAE,yBAAyB,CAAA;IACpD,MAAM,EAAE,OAAO,CAAA;IACf,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAA;IACjC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAA;IAClE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAC1B,mCA+EA"}

package/subscriptions/server.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSubscriptionsServer = void 0;
+const graphql_ws_1 = require("graphql-ws");
 const ws_1 = require("graphql-ws/lib/use/ws");
 const lodash_pick_1 = __importDefault(require("lodash.pick"));
 const ws_2 = require("ws");
 const logging_1 = require("../logging");
 const utils_1 = require("./utils");
-const graphql_ws_1 = require("graphql-ws");
-function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext, logger, path = '/graphql', verifyToken, requireAuth, jwtClaimsToLog = ['oid', 'iss'], }) {
+function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext, logger, operationLogLevel = 'info', path = '/graphql', verifyToken, requireAuth, jwtClaimsToLog = ['oid', 'iss'], }) {
     if (requireAuth && !verifyToken)
         throw new Error('verifyToken must be supplied when requireAuth is true');
     const wsServer = new ws_2.WebSocketServer({
@@ -80,10 +80,10 @@ function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext,
             });
         },
         onOperation(_ctx, _message, args) {
-            (0, logging_1.logGraphQLExecutionArgs)(args, 'GraphQL subscription operation');
+            (0, logging_1.logSubscriptionOperation)({ args, logLevel: operationLogLevel });
         },
-        onNext(_ctx, _message, args, _result) {
-            (0, logging_1.logGraphQLExecutionArgs)(args, 'GraphQL subscription result');
+        onNext(_ctx, _message, args, { data, ...result }) {
+            (0, logging_1.logSubscriptionOperation)({ args, logLevel: operationLogLevel, result });
         },
     }, wsServer);
 }

package/subscriptions/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":"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"}

package/testing.d.ts

@@ -2,6 +2,6 @@ import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
 import { ClientCredentialsConfig } from '@makerx/node-common';
 import { ApolloClientOptions } from '@apollo/client/core/ApolloClient';
 export * from '@apollo/client/core';
-export declare const createTestClient: (url: string, accessToken?: string, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
-export declare const createTestClientWithClientCredentials: (url: string, clientCredentialsConfig: ClientCredentialsConfig, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
+export declare const createTestClient: (fetch: WindowOrWorkerGlobalScope['fetch'], url: string, accessToken?: string, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
+export declare const createTestClientWithClientCredentials: (fetch: WindowOrWorkerGlobalScope['fetch'], url: string, clientCredentialsConfig: ClientCredentialsConfig, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
 //# sourceMappingURL=testing.d.ts.map

package/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE9G,OAAO,EAAuB,uBAAuB,EAA6B,MAAM,qBAAqB,CAAA;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAEtE,cAAc,qBAAqB,CAAA;AAsCnC,eAAO,MAAM,gBAAgB,QACtB,MAAM,gBACG,MAAM,YACV,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA;AAEJ,eAAO,MAAM,qCAAqC,QAC3C,MAAM,2BACc,uBAAuB,YACtC,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE9G,OAAO,EAAuB,uBAAuB,EAA6B,MAAM,qBAAqB,CAAA;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAEtE,cAAc,qBAAqB,CAAA;AAuCnC,eAAO,MAAM,gBAAgB,UACpB,yBAAyB,CAAC,OAAO,CAAC,OACpC,MAAM,gBACG,MAAM,YACV,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA;AAEJ,eAAO,MAAM,qCAAqC,UACzC,yBAAyB,CAAC,OAAO,CAAC,OACpC,MAAM,2BACc,uBAAuB,YACtC,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA"}

package/testing.js

@@ -48,11 +48,12 @@ const clientCredentialsLink = (clientCredentialsConfig) => {
         };
     });
 };
-const httpLink = (url) => (0, core_1.createHttpLink)({
+const httpLink = (url, fetch) => (0, core_1.createHttpLink)({
     uri: url,
+    fetch,
 });
-const createTestClient = (url, accessToken, options) => new core_1.ApolloClient({
-    link: (0, core_1.from)([bearerTokenLink(accessToken), httpLink(url)]),
+const createTestClient = (fetch, url, accessToken, options) => new core_1.ApolloClient({
+    link: (0, core_1.from)([bearerTokenLink(accessToken), httpLink(url, fetch)]),
     cache: new core_1.InMemoryCache(),
     defaultOptions: {
         query: {
@@ -62,8 +63,8 @@ const createTestClient = (url, accessToken, options) => new core_1.ApolloClient(
     ...options,
 });
 exports.createTestClient = createTestClient;
-const createTestClientWithClientCredentials = (url, clientCredentialsConfig, options) => new core_1.ApolloClient({
-    link: (0, core_1.from)([clientCredentialsLink(clientCredentialsConfig), httpLink(url)]),
+const createTestClientWithClientCredentials = (fetch, url, clientCredentialsConfig, options) => new core_1.ApolloClient({
+    link: (0, core_1.from)([clientCredentialsLink(clientCredentialsConfig), httpLink(url, fetch)]),
     cache: new core_1.InMemoryCache(),
     defaultOptions: {
         query: {

package/testing.js.map

@@ -1 +1 @@
-{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA8G;AAC9G,yDAAwD;AACxD,qDAA6G;AAG7G,sDAAmC;AAEnC,MAAM,eAAe,GAAG,CAAC,WAAoB,EAAE,EAAE,CAC/C,IAAA,oBAAU,EAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5B,IAAI,WAAW;QACb,OAAO;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAA;IACH,OAAO;QACL,OAAO;KACR,CAAA;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,qBAAqB,GAAG,CAAC,uBAAgD,EAAE,EAAE;IACjF,IAAI,OAAiD,CAAA;IACrD,OAAO,IAAA,oBAAU,EAAC,KAAK,IAAI,EAAE;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;QAC1E,IAAI,aAAa,GAAG,MAAM,OAAO,CAAA;QACjC,IAAI,aAAa,CAAC,SAAS,EAAE;YAC3B,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;YAC5D,aAAa,GAAG,MAAM,OAAO,CAAA;SAC9B;QACD,OAAO;YACL,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,aAAa,CAAC,YAAY,EAAE;aACtD;SACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAC/B,IAAA,qBAAc,EAAC;IACb,GAAG,EAAE,GAAG;CACT,CAAC,CAAA;AAEG,MAAM,gBAAgB,GAAG,CAC9B,GAAW,EACX,WAAoB,EACpB,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAdS,QAAA,gBAAgB,oBAczB;AAEG,MAAM,qCAAqC,GAAG,CACnD,GAAW,EACX,uBAAgD,EAChD,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3E,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAdS,QAAA,qCAAqC,yCAc9C"}
+{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA8G;AAC9G,yDAAwD;AACxD,qDAA6G;AAG7G,sDAAmC;AAEnC,MAAM,eAAe,GAAG,CAAC,WAAoB,EAAE,EAAE,CAC/C,IAAA,oBAAU,EAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5B,IAAI,WAAW;QACb,OAAO;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAA;IACH,OAAO;QACL,OAAO;KACR,CAAA;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,qBAAqB,GAAG,CAAC,uBAAgD,EAAE,EAAE;IACjF,IAAI,OAAiD,CAAA;IACrD,OAAO,IAAA,oBAAU,EAAC,KAAK,IAAI,EAAE;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;QAC1E,IAAI,aAAa,GAAG,MAAM,OAAO,CAAA;QACjC,IAAI,aAAa,CAAC,SAAS,EAAE;YAC3B,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;YAC5D,aAAa,GAAG,MAAM,OAAO,CAAA;SAC9B;QACD,OAAO;YACL,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,aAAa,CAAC,YAAY,EAAE;aACtD;SACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,KAAyC,EAAE,EAAE,CAC1E,IAAA,qBAAc,EAAC;IACb,GAAG,EAAE,GAAG;IACR,KAAK;CACN,CAAC,CAAA;AAEG,MAAM,gBAAgB,GAAG,CAC9B,KAAyC,EACzC,GAAW,EACX,WAAoB,EACpB,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAChE,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAfS,QAAA,gBAAgB,oBAezB;AAEG,MAAM,qCAAqC,GAAG,CACnD,KAAyC,EACzC,GAAW,EACX,uBAAgD,EAChD,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAClF,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAfS,QAAA,qCAAqC,yCAe9C"}