V3

.changeset/@envelop_types-1487-dependencies.md

@@ -0,0 +1,7 @@
+---
+"@envelop/types": patch
+---
+
+dependencies updates: 
+
+- Removed dependency [`graphql@^14.0.0 || ^15.0.0 || ^16.0.0` ↗︎](https://www.npmjs.com/package/graphql/v/null) (from `peerDependencies`)

.eslintrc.json

@@ -29,6 +29,7 @@
       { "devDependencies": ["**/*.test.ts", "**/*.spec.ts", "**/test/**/*.ts"] }
     ]
   },
+
   "env": {
     "es6": true,
     "node": true
@@ -43,6 +44,38 @@
         "@typescript-eslint/no-unused-vars": "off",
         "import/no-extraneous-dependencies": "off"
       }
+    },
+    // Disallow `graphql-js` specific things to get re-introduced in agnostic packages.
+    {
+      "files": [
+        "packages/core/**",
+        "packages/types/**",
+        "packages/plugins/apollo-datasources/**",
+        "packages/plugins/auth0/**",
+        "packages/plugins/dataloader/**",
+        "packages/plugins/preload-assets/**",
+        "packages/plugins/statsd/**"
+      ],
+      "env": {
+        "jest": true
+      },
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "graphql",
+                "message": "You chose violence. Try to make it work without using GraphQL.js"
+              },
+              {
+                "name": "@graphql-tools/*",
+                "message": "You chose violence. Try to make it work without using `graphql-tools`"
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "ignorePatterns": ["dist", "node_modules", "dev-test", "website"]

packages/core/package.json

@@ -64,9 +64,6 @@
     "graphql": "16.3.0",
     "typescript": "4.7.4"
   },
-  "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
-  },
   "buildOptions": {
     "input": "./src/index.ts"
   },

packages/core/src/create.ts

@@ -1,18 +1,32 @@
-import { GetEnvelopedFn, ComposeContext, Plugin, ArbitraryObject } from '@envelop/types';
+import {
+  GetEnvelopedFn,
+  ComposeContext,
+  Plugin,
+  ArbitraryObject,
+  ExecuteFunction,
+  SubscribeFunction,
+  ParseFunction,
+  ValidateFunction,
+} from '@envelop/types';
 import { isPluginEnabled, PluginOrDisabledPlugin } from './enable-if.js';
 import { createEnvelopOrchestrator, EnvelopOrchestrator } from './orchestrator.js';
-import { traceOrchestrator } from './traced-orchestrator.js';
 
 export function envelop<PluginsType extends Plugin<any>[]>(options: {
   plugins: Array<PluginOrDisabledPlugin>;
   enableInternalTracing?: boolean;
+  parse: ParseFunction;
+  execute: ExecuteFunction;
+  validate: ValidateFunction;
+  subscribe: SubscribeFunction;
 }): GetEnvelopedFn<ComposeContext<PluginsType>> {
   const plugins = options.plugins.filter(isPluginEnabled);
-  let orchestrator = createEnvelopOrchestrator<ComposeContext<PluginsType>>(plugins);
-
-  if (options.enableInternalTracing) {
-    orchestrator = traceOrchestrator(orchestrator);
-  }
+  const orchestrator = createEnvelopOrchestrator<ComposeContext<PluginsType>>({
+    plugins,
+    parse: options.parse,
+    execute: options.execute,
+    validate: options.validate,
+    subscribe: options.subscribe,
+  });
 
   const getEnveloped = <TInitialContext extends ArbitraryObject>(
     initialContext: TInitialContext = {} as TInitialContext

packages/core/src/index.ts

@@ -3,11 +3,9 @@ export * from './create.js';
 export * from './utils.js';
 export * from './plugins/use-envelop.js';
 export * from './plugins/use-logger.js';
-export * from './plugins/use-timing.js';
 export * from './plugins/use-schema.js';
 export * from './plugins/use-error-handler.js';
 export * from './plugins/use-extend-context.js';
 export * from './plugins/use-payload-formatter.js';
-export * from './plugins/use-masked-errors.js';
-export * from './plugins/use-immediate-introspection.js';
 export * from './enable-if.js';
+export { resolversHooksSymbol } from './orchestrator.js';

packages/core/src/orchestrator.ts

@@ -28,20 +28,10 @@ import {
   SubscribeErrorHook,
   DefaultContext,
   Maybe,
-} from '@envelop/types';
-import {
-  DocumentNode,
-  execute,
+  ParseFunction,
+  ValidateFunction,
   ExecutionResult,
-  GraphQLError,
-  GraphQLSchema,
-  parse,
-  specifiedRules,
-  subscribe,
-  validate,
-  ValidationRule,
-} from 'graphql';
-import { prepareTracedSchema, resolversHooksSymbol } from './traced-schema.js';
+} from '@envelop/types';
 import {
   errorAsyncIterator,
   finalAsyncIterator,
@@ -61,13 +51,26 @@ export type EnvelopOrchestrator<
   execute: ReturnType<GetEnvelopedFn<PluginsContext>>['execute'];
   subscribe: ReturnType<GetEnvelopedFn<PluginsContext>>['subscribe'];
   contextFactory: EnvelopContextFnWrapper<ReturnType<GetEnvelopedFn<PluginsContext>>['contextFactory'], PluginsContext>;
-  getCurrentSchema: () => Maybe<GraphQLSchema>;
+  getCurrentSchema: () => Maybe<any>;
+};
+
+type EnvelopOrchestratorOptions = {
+  plugins: Plugin[];
+  parse: ParseFunction;
+  execute: ExecuteFunction;
+  subscribe: SubscribeFunction;
+  validate: ValidateFunction;
 };
+export const resolversHooksSymbol = Symbol('RESOLVERS_HOOKS');
 
-export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>(
-  plugins: Plugin[]
-): EnvelopOrchestrator<any, PluginsContext> {
-  let schema: GraphQLSchema | undefined | null = null;
+export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>({
+  plugins,
+  parse,
+  execute,
+  subscribe,
+  validate,
+}: EnvelopOrchestratorOptions): EnvelopOrchestrator<any, PluginsContext> {
+  let schema: any | undefined | null = null;
   let initDone = false;
   const onResolversHandlers: OnResolverCalledHook[] = [];
   for (const plugin of plugins) {
@@ -79,9 +82,9 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
   // Define the initial method for replacing the GraphQL schema, this is needed in order
   // to allow setting the schema from the onPluginInit callback. We also need to make sure
   // here not to call the same plugin that initiated the schema switch.
-  const replaceSchema = (newSchema: GraphQLSchema, ignorePluginIndex = -1) => {
+  const replaceSchema = (newSchema: any, ignorePluginIndex = -1) => {
     if (onResolversHandlers.length) {
-      prepareTracedSchema(newSchema);
+      // prepareTracedSchema(newSchema);
     }
     schema = newSchema;
 
@@ -152,7 +155,7 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
 
   const customParse: EnvelopContextFnWrapper<typeof parse, any> = beforeCallbacks.parse.length
     ? initialContext => (source, parseOptions) => {
-        let result: DocumentNode | Error | null = null;
+        let result: any | Error | null = null;
         let parseFn: typeof parse = parse;
         const context = initialContext;
         const afterCalls: AfterParseHook<any>[] = [];
@@ -211,9 +214,9 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
 
   const customValidate: EnvelopContextFnWrapper<typeof validate, any> = beforeCallbacks.validate.length
     ? initialContext => (schema, documentAST, rules, typeInfo, validationOptions) => {
-        let actualRules: undefined | ValidationRule[] = rules ? [...rules] : undefined;
+        let actualRules: undefined | any[] = rules ? [...rules] : undefined;
         let validateFn = validate;
-        let result: null | readonly GraphQLError[] = null;
+        let result: null | readonly any[] = null;
         const context = initialContext;
 
         const afterCalls: AfterValidateHook<any>[] = [];
@@ -234,7 +237,10 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
             validateFn,
             addValidationRule: rule => {
               if (!actualRules) {
-                actualRules = [...specifiedRules];
+                // Ideally we should provide default validation rules here.
+                // eslint-disable-next-line no-console
+                console.warn('No default validation rules provided.');
+                actualRules = [];
               }
 
               actualRules.push(rule);
@@ -254,6 +260,10 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
           result = validateFn(schema, documentAST, actualRules, typeInfo, validationOptions);
         }
 
+        if (!result) {
+          return;
+        }
+
         const valid = result.length === 0;
 
         for (const afterCb of afterCalls) {
@@ -384,6 +394,9 @@ export function createEnvelopOrchestrator<PluginsContext extends DefaultContext>
             // Can be removed once we drop support for GraphQL.js 15
           });
         }
+        if (!result) {
+          return;
+        }
 
         const onNextHandler: OnSubscribeResultResultOnNextHook<PluginsContext>[] = [];
         const onEndHandler: OnSubscribeResultResultOnEndHook[] = [];

packages/core/src/plugins/use-error-handler.ts

@@ -1,8 +1,7 @@
-import { Plugin, DefaultContext, TypedExecutionArgs } from '@envelop/types';
-import { ExecutionResult, GraphQLError } from 'graphql';
+import { Plugin, DefaultContext, TypedExecutionArgs, ExecutionResult } from '@envelop/types';
 import { handleStreamOrSingleExecutionResult } from '../utils.js';
 
-export type ErrorHandler = (errors: readonly GraphQLError[], context: Readonly<DefaultContext>) => void;
+export type ErrorHandler = (errors: readonly Error[] | any[], context: Readonly<DefaultContext>) => void;
 
 type ErrorHandlerCallback<ContextType> = {
   result: ExecutionResult;

packages/core/src/plugins/use-payload-formatter.ts

@@ -1,6 +1,5 @@
-import { Plugin, TypedExecutionArgs } from '@envelop/types';
+import { Plugin, TypedExecutionArgs, ExecutionResult } from '@envelop/types';
 import { handleStreamOrSingleExecutionResult } from '../utils.js';
-import { ExecutionResult } from 'graphql';
 
 export type FormatterFunction = (
   result: ExecutionResult<any, any>,