@graphql-mesh/config 0.38.0-alpha-27bc4843f.0 → 1.0.0-alpha-4b3f4b8da.0

package/index.js

@@ -142,7 +142,7 @@ async function resolveDocuments(documentsConfig, cwd) {
         cwd,
     });
 }
-async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefixes) {
+async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefixes, initialLoggerPrefix = '🕸️  Mesh') {
     if (typeof loggerConfig === 'string') {
         const { moduleName, resolved: logger } = await getPackage({
             name: loggerConfig,
@@ -157,81 +157,14 @@ async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefi
             code: '',
         };
     }
-    const logger = new utils$1.DefaultLogger('🕸️  Mesh');
+    const logger = new utils$1.DefaultLogger(initialLoggerPrefix);
     return {
         logger,
         importCode: `import { DefaultLogger } from '@graphql-mesh/utils';`,
-        code: `const logger = new DefaultLogger('🕸️  Mesh');`,
+        code: `const logger = new DefaultLogger(${JSON.stringify(initialLoggerPrefix)});`,
     };
 }
 
-function parseObject(ast) {
-    const value = Object.create(null);
-    ast.fields.forEach(field => {
-        // eslint-disable-next-line no-use-before-define
-        value[field.name.value] = parseLiteral(field.value);
-    });
-    return value;
-}
-function parseLiteral(ast) {
-    switch (ast.kind) {
-        case graphql.Kind.STRING:
-        case graphql.Kind.BOOLEAN:
-            return ast.value;
-        case graphql.Kind.INT:
-        case graphql.Kind.FLOAT:
-            return parseFloat(ast.value);
-        case graphql.Kind.OBJECT:
-            return parseObject(ast);
-        case graphql.Kind.LIST:
-            return ast.values.map(n => parseLiteral(n));
-        case graphql.Kind.NULL:
-            return null;
-    }
-}
-function getAdditionalResolversFromTypeDefs(additionalTypeDefs) {
-    const additionalResolversFromTypeDefs = [];
-    function handleFieldNode(targetTypeName, fieldNode) {
-        var _a;
-        if ((_a = fieldNode.directives) === null || _a === void 0 ? void 0 : _a.length) {
-            const resolveToDef = fieldNode.directives.find(d => d.name.value === 'resolveTo');
-            if (resolveToDef != null) {
-                const resolveToArgumentMap = {};
-                for (const resolveToArg of resolveToDef.arguments) {
-                    const resolveToArgName = resolveToArg.name.value;
-                    resolveToArgumentMap[resolveToArgName] = parseLiteral(resolveToArg.value);
-                }
-                additionalResolversFromTypeDefs.push({
-                    targetTypeName,
-                    targetFieldName: fieldNode.name.value,
-                    ...resolveToArgumentMap,
-                });
-            }
-        }
-    }
-    additionalTypeDefs === null || additionalTypeDefs === void 0 ? void 0 : additionalTypeDefs.forEach(typeDefs => {
-        graphql.visit(typeDefs, {
-            ObjectTypeDefinition(objectNode) {
-                var _a;
-                (_a = objectNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(objectNode.name.value, fieldNode));
-            },
-            ObjectTypeExtension(objectNode) {
-                var _a;
-                (_a = objectNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(objectNode.name.value, fieldNode));
-            },
-            InterfaceTypeDefinition(interfaceNode) {
-                var _a;
-                (_a = interfaceNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(interfaceNode.name.value, fieldNode));
-            },
-            InterfaceTypeExtension(interfaceNode) {
-                var _a;
-                (_a = interfaceNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(interfaceNode.name.value, fieldNode));
-            },
-        });
-    });
-    return additionalResolversFromTypeDefs;
-}
-
 const ENVELOP_CORE_PLUGINS_MAP = {
     maskedErrors: {
         moduleName: '@envelop/core',
@@ -246,7 +179,7 @@ const ENVELOP_CORE_PLUGINS_MAP = {
 };
 function getDefaultMeshStore(dir, importFn, artifactsDir) {
     var _a;
-    const isProd = ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'production';
+    const isProd = ((_a = crossHelpers.process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'production';
     const storeStorageAdapter = isProd
         ? new store.FsStoreStorageAdapter({
             cwd: dir,
@@ -269,7 +202,7 @@ function getDefaultMeshStore(dir, importFn, artifactsDir) {
 async function processConfig(config, options) {
     var _a, _b, _c;
     if (config.skipSSLValidation) {
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+        crossHelpers.process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
     }
     const importCodes = [
         `import type { GetMeshOptions } from '@graphql-mesh/runtime';`,
@@ -295,7 +228,7 @@ async function processConfig(config, options) {
     codes.push(cacheCode);
     const sourcesStore = rootStore.child('sources');
     codes.push(`const sourcesStore = rootStore.child('sources');`);
-    const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes);
+    const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes, options === null || options === void 0 ? void 0 : options.initialLoggerPrefix);
     importCodes.push(loggerImportCode);
     codes.push(loggerCode);
     codes.push(`const sources = [];`);
@@ -535,38 +468,6 @@ async function processConfig(config, options) {
             codes.push(`const additionalResolvers = [] as any[]`);
         }
     }
-    if (additionalTypeDefs === null || additionalTypeDefs === void 0 ? void 0 : additionalTypeDefs.length) {
-        const additionalResolversConfigFromTypeDefs = getAdditionalResolversFromTypeDefs(additionalTypeDefs);
-        if (additionalResolversConfigFromTypeDefs === null || additionalResolversConfigFromTypeDefs === void 0 ? void 0 : additionalResolversConfigFromTypeDefs.length) {
-            const resolveToDirectiveDefinition = /* GraphQL */ `
-        scalar ResolveToSourceArgs
-        directive @resolveTo(
-          requiredSelectionSet: String
-          sourceName: String!
-          sourceTypeName: String!
-          sourceFieldName: String!
-          sourceSelectionSet: String
-          sourceArgs: ResolveToSourceArgs
-          result: String
-          resultType: String
-        ) on FIELD_DEFINITION
-      `;
-            const resolvedAdditionalResolvers = await utils$1.resolveAdditionalResolvers(dir, additionalResolversConfigFromTypeDefs, importFn, pubsub);
-            additionalTypeDefs.unshift(graphql.parse(resolveToDirectiveDefinition));
-            additionalResolvers.push(...resolvedAdditionalResolvers);
-            if (options.generateCode && resolvedAdditionalResolvers.length) {
-                importCodes.push(`import { resolveAdditionalResolvers } from '@graphql-mesh/utils';`);
-                codes.push(`additionalTypeDefs.unshift(parse(/* GraphQL */\`${resolveToDirectiveDefinition}\`))`);
-                codes.push(`const additionalResolversFromTypeDefs = await resolveAdditionalResolvers(
-          baseDir,
-          ${JSON.stringify(additionalResolversConfigFromTypeDefs)},
-          importFn,
-          pubsub
-        );`);
-                codes.push(`additionalResolvers.push(additionalResolversFromTypeDefs)`);
-            }
-        }
-    }
     if (config.additionalEnvelopPlugins) {
         importCodes.push(`import importedAdditionalEnvelopPlugins from '${crossHelpers.path
             .join('..', config.additionalEnvelopPlugins)

package/index.mjs

@@ -1,5 +1,5 @@
-import { path } from '@graphql-mesh/cross-helpers';
-import { visit, Kind, print, parse, concatAST } from 'graphql';
+import { path, process } from '@graphql-mesh/cross-helpers';
+import { print, concatAST, visit } from 'graphql';
 import { printSchemaWithDirectives } from '@graphql-tools/utils';
 import { paramCase } from 'param-case';
 import { loadTypedefs, loadDocuments } from '@graphql-tools/load';
@@ -138,7 +138,7 @@ async function resolveDocuments(documentsConfig, cwd) {
         cwd,
     });
 }
-async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefixes) {
+async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefixes, initialLoggerPrefix = '🕸️  Mesh') {
     if (typeof loggerConfig === 'string') {
         const { moduleName, resolved: logger } = await getPackage({
             name: loggerConfig,
@@ -153,81 +153,14 @@ async function resolveLogger(loggerConfig, importFn, cwd, additionalPackagePrefi
             code: '',
         };
     }
-    const logger = new DefaultLogger('🕸️  Mesh');
+    const logger = new DefaultLogger(initialLoggerPrefix);
     return {
         logger,
         importCode: `import { DefaultLogger } from '@graphql-mesh/utils';`,
-        code: `const logger = new DefaultLogger('🕸️  Mesh');`,
+        code: `const logger = new DefaultLogger(${JSON.stringify(initialLoggerPrefix)});`,
     };
 }
 
-function parseObject(ast) {
-    const value = Object.create(null);
-    ast.fields.forEach(field => {
-        // eslint-disable-next-line no-use-before-define
-        value[field.name.value] = parseLiteral(field.value);
-    });
-    return value;
-}
-function parseLiteral(ast) {
-    switch (ast.kind) {
-        case Kind.STRING:
-        case Kind.BOOLEAN:
-            return ast.value;
-        case Kind.INT:
-        case Kind.FLOAT:
-            return parseFloat(ast.value);
-        case Kind.OBJECT:
-            return parseObject(ast);
-        case Kind.LIST:
-            return ast.values.map(n => parseLiteral(n));
-        case Kind.NULL:
-            return null;
-    }
-}
-function getAdditionalResolversFromTypeDefs(additionalTypeDefs) {
-    const additionalResolversFromTypeDefs = [];
-    function handleFieldNode(targetTypeName, fieldNode) {
-        var _a;
-        if ((_a = fieldNode.directives) === null || _a === void 0 ? void 0 : _a.length) {
-            const resolveToDef = fieldNode.directives.find(d => d.name.value === 'resolveTo');
-            if (resolveToDef != null) {
-                const resolveToArgumentMap = {};
-                for (const resolveToArg of resolveToDef.arguments) {
-                    const resolveToArgName = resolveToArg.name.value;
-                    resolveToArgumentMap[resolveToArgName] = parseLiteral(resolveToArg.value);
-                }
-                additionalResolversFromTypeDefs.push({
-                    targetTypeName,
-                    targetFieldName: fieldNode.name.value,
-                    ...resolveToArgumentMap,
-                });
-            }
-        }
-    }
-    additionalTypeDefs === null || additionalTypeDefs === void 0 ? void 0 : additionalTypeDefs.forEach(typeDefs => {
-        visit(typeDefs, {
-            ObjectTypeDefinition(objectNode) {
-                var _a;
-                (_a = objectNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(objectNode.name.value, fieldNode));
-            },
-            ObjectTypeExtension(objectNode) {
-                var _a;
-                (_a = objectNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(objectNode.name.value, fieldNode));
-            },
-            InterfaceTypeDefinition(interfaceNode) {
-                var _a;
-                (_a = interfaceNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(interfaceNode.name.value, fieldNode));
-            },
-            InterfaceTypeExtension(interfaceNode) {
-                var _a;
-                (_a = interfaceNode.fields) === null || _a === void 0 ? void 0 : _a.forEach(fieldNode => handleFieldNode(interfaceNode.name.value, fieldNode));
-            },
-        });
-    });
-    return additionalResolversFromTypeDefs;
-}
-
 const ENVELOP_CORE_PLUGINS_MAP = {
     maskedErrors: {
         moduleName: '@envelop/core',
@@ -291,7 +224,7 @@ async function processConfig(config, options) {
     codes.push(cacheCode);
     const sourcesStore = rootStore.child('sources');
     codes.push(`const sourcesStore = rootStore.child('sources');`);
-    const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes);
+    const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes, options === null || options === void 0 ? void 0 : options.initialLoggerPrefix);
     importCodes.push(loggerImportCode);
     codes.push(loggerCode);
     codes.push(`const sources = [];`);
@@ -531,38 +464,6 @@ async function processConfig(config, options) {
             codes.push(`const additionalResolvers = [] as any[]`);
         }
     }
-    if (additionalTypeDefs === null || additionalTypeDefs === void 0 ? void 0 : additionalTypeDefs.length) {
-        const additionalResolversConfigFromTypeDefs = getAdditionalResolversFromTypeDefs(additionalTypeDefs);
-        if (additionalResolversConfigFromTypeDefs === null || additionalResolversConfigFromTypeDefs === void 0 ? void 0 : additionalResolversConfigFromTypeDefs.length) {
-            const resolveToDirectiveDefinition = /* GraphQL */ `
-        scalar ResolveToSourceArgs
-        directive @resolveTo(
-          requiredSelectionSet: String
-          sourceName: String!
-          sourceTypeName: String!
-          sourceFieldName: String!
-          sourceSelectionSet: String
-          sourceArgs: ResolveToSourceArgs
-          result: String
-          resultType: String
-        ) on FIELD_DEFINITION
-      `;
-            const resolvedAdditionalResolvers = await resolveAdditionalResolvers(dir, additionalResolversConfigFromTypeDefs, importFn, pubsub);
-            additionalTypeDefs.unshift(parse(resolveToDirectiveDefinition));
-            additionalResolvers.push(...resolvedAdditionalResolvers);
-            if (options.generateCode && resolvedAdditionalResolvers.length) {
-                importCodes.push(`import { resolveAdditionalResolvers } from '@graphql-mesh/utils';`);
-                codes.push(`additionalTypeDefs.unshift(parse(/* GraphQL */\`${resolveToDirectiveDefinition}\`))`);
-                codes.push(`const additionalResolversFromTypeDefs = await resolveAdditionalResolvers(
-          baseDir,
-          ${JSON.stringify(additionalResolversConfigFromTypeDefs)},
-          importFn,
-          pubsub
-        );`);
-                codes.push(`additionalResolvers.push(additionalResolversFromTypeDefs)`);
-            }
-        }
-    }
     if (config.additionalEnvelopPlugins) {
         importCodes.push(`import importedAdditionalEnvelopPlugins from '${path
             .join('..', config.additionalEnvelopPlugins)

package/package.json

@@ -1,30 +1,28 @@
 {
   "name": "@graphql-mesh/config",
-  "version": "0.38.0-alpha-27bc4843f.0",
+  "version": "1.0.0-alpha-4b3f4b8da.0",
   "sideEffects": false,
   "peerDependencies": {
+    "@graphql-mesh/runtime": "0.36.0-alpha-4b3f4b8da.0",
     "graphql": "*"
   },
   "dependencies": {
-    "@envelop/core": "2.3.2",
-    "@graphql-mesh/cache-localforage": "0.6.7",
-    "@graphql-mesh/cross-helpers": "0.1.5",
-    "@graphql-mesh/merger-bare": "0.13.49",
-    "@graphql-mesh/merger-stitching": "0.15.51",
-    "@graphql-mesh/runtime": "0.35.1",
-    "@graphql-mesh/store": "0.8.10",
-    "@graphql-mesh/types": "0.73.1",
-    "@graphql-mesh/utils": "0.35.1",
-    "@graphql-tools/code-file-loader": "7.2.17",
-    "@graphql-tools/graphql-file-loader": "7.3.14",
-    "@graphql-tools/load": "7.5.13",
-    "@graphql-tools/merge": "8.2.13",
-    "@graphql-tools/utils": "8.6.12",
+    "@envelop/core": "2.3.3",
+    "@graphql-mesh/cache-localforage": "0.6.10-alpha-4b3f4b8da.0",
+    "@graphql-mesh/cross-helpers": "0.1.6",
+    "@graphql-mesh/merger-bare": "0.13.52-alpha-4b3f4b8da.0",
+    "@graphql-mesh/merger-stitching": "0.15.54-alpha-4b3f4b8da.0",
+    "@graphql-mesh/store": "0.8.13-alpha-4b3f4b8da.0",
+    "@graphql-mesh/types": "0.74.0-alpha-4b3f4b8da.0",
+    "@graphql-mesh/utils": "0.35.4-alpha-4b3f4b8da.0",
+    "@graphql-tools/code-file-loader": "7.2.18",
+    "@graphql-tools/graphql-file-loader": "7.3.15",
+    "@graphql-tools/load": "7.5.14",
+    "@graphql-tools/utils": "8.6.13",
     "camel-case": "4.1.2",
-    "fetchache": "0.1.2",
     "param-case": "3.0.4",
     "pascal-case": "3.1.2",
-    "tslib": "^2.3.1"
+    "tslib": "^2.4.0"
   },
   "repository": {
     "type": "git",

package/process.d.ts

@@ -1,7 +1,6 @@
-import { MeshResolvedSource } from '@graphql-mesh/runtime';
-import { ImportFn, Logger, MeshMerger, MeshPubSub, MeshTransform, YamlConfig } from '@graphql-mesh/types';
+import type { MeshResolvedSource } from '@graphql-mesh/runtime';
+import { ImportFn, Logger, MeshMerger, MeshPubSub, MeshTransform, YamlConfig, KeyValueCache } from '@graphql-mesh/types';
 import { IResolvers, Source } from '@graphql-tools/utils';
-import { KeyValueCache } from 'fetchache';
 import { DocumentNode } from 'graphql';
 import { MeshStore } from '@graphql-mesh/store';
 import { envelop } from '@envelop/core';
@@ -14,10 +13,11 @@ export declare type ConfigProcessOptions = {
     artifactsDir?: string;
     additionalPackagePrefixes?: string[];
     generateCode?: boolean;
+    initialLoggerPrefix?: string;
 };
 declare type EnvelopPlugins = Parameters<typeof envelop>[0]['plugins'];
 export declare type ProcessedConfig = {
-    sources: MeshResolvedSource<any>[];
+    sources: MeshResolvedSource[];
     transforms: MeshTransform[];
     additionalTypeDefs: DocumentNode[];
     additionalResolvers: IResolvers[];

package/utils.d.ts

@@ -25,7 +25,7 @@ export declare function resolvePubSub(pubsubYamlConfig: YamlConfig.Config['pubsu
     pubsub: MeshPubSub;
 }>;
 export declare function resolveDocuments(documentsConfig: YamlConfig.Config['documents'], cwd: string): Promise<Source[]>;
-export declare function resolveLogger(loggerConfig: YamlConfig.Config['logger'], importFn: ImportFn, cwd: string, additionalPackagePrefixes: string[]): Promise<{
+export declare function resolveLogger(loggerConfig: YamlConfig.Config['logger'], importFn: ImportFn, cwd: string, additionalPackagePrefixes: string[], initialLoggerPrefix?: string): Promise<{
     importCode: string;
     code: string;
     logger: Logger;

package/getAdditionalResolversFromTypeDefs.d.ts

@@ -1,2 +0,0 @@
-import { DocumentNode } from 'graphql';
-export declare function getAdditionalResolversFromTypeDefs(additionalTypeDefs: DocumentNode[]): (string | import("../../types/src/config").AdditionalStitchingResolverObject | import("../../types/src/config").AdditionalStitchingBatchResolverObject | import("../../types/src/config").AdditionalSubscriptionObject)[];