@graphql-mesh/cli 0.92.8-alpha-20240731132658-fac1161fec2605ac689485b79d6b571fd3cabea2 → 1.0.0-alpha-20240731125001-cbfa3d2b9c73d559c5290247c504e217b058639f

package/cjs/config.js

@@ -7,9 +7,9 @@ const ajv_1 = tslib_1.__importDefault(require("ajv"));
 const cosmiconfig_1 = require("cosmiconfig");
 const config_1 = require("@graphql-mesh/config");
 const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
+const include_1 = require("@graphql-mesh/include");
 const types_1 = require("@graphql-mesh/types");
 const utils_1 = require("@graphql-mesh/utils");
-const defaultImportFn_js_1 = require("./defaultImportFn.js");
 function validateConfig(config, filepath, initialLoggerPrefix, throwOnInvalidConfig = false) {
     if (types_1.jsonSchema) {
         const ajv = new ajv_1.default({
@@ -44,7 +44,7 @@ function validateConfig(config, filepath, initialLoggerPrefix, throwOnInvalidCon
     }
 }
 async function findAndParseConfig(options) {
-    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix = '🕸️  Mesh', importFn = defaultImportFn_js_1.defaultImportFn, ...restOptions } = options || {};
+    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix = '🕸️  Mesh', importFn = include_1.include, ...restOptions } = options || {};
     const dir = cross_helpers_1.path.isAbsolute(configDir) ? configDir : cross_helpers_1.path.join(cross_helpers_1.process.cwd(), configDir);
     const explorer = (0, cosmiconfig_1.cosmiconfig)(configName, {
         searchPlaces: [
@@ -76,7 +76,7 @@ async function findAndParseConfig(options) {
     validateConfig(config, results.filepath, initialLoggerPrefix, restOptions.throwOnInvalidConfig);
     return (0, config_1.processConfig)(config, { dir, initialLoggerPrefix, importFn, ...restOptions });
 }
-function customLoader(ext, importFn = defaultImportFn_js_1.defaultImportFn, initialLoggerPrefix = '🕸️  Mesh') {
+function customLoader(ext, importFn = include_1.include, initialLoggerPrefix = '🕸️  Mesh') {
     const logger = new utils_1.DefaultLogger(initialLoggerPrefix).child('config');
     function loader(filepath, content) {
         if (cross_helpers_1.process.env) {

package/cjs/index.js

@@ -7,6 +7,7 @@ const dotenv_1 = require("dotenv");
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
+const include_1 = require("@graphql-mesh/include");
 const runtime_1 = require("@graphql-mesh/runtime");
 const store_1 = require("@graphql-mesh/store");
 const utils_1 = require("@graphql-mesh/utils");
@@ -17,7 +18,6 @@ const ts_artifacts_js_1 = require("./commands/ts-artifacts.js");
 Object.defineProperty(exports, "generateTsArtifacts", { enumerable: true, get: function () { return ts_artifacts_js_1.generateTsArtifacts; } });
 const config_js_1 = require("./config.js");
 Object.defineProperty(exports, "findAndParseConfig", { enumerable: true, get: function () { return config_js_1.findAndParseConfig; } });
-const defaultImportFn_js_1 = require("./defaultImportFn.js");
 const handleFatalError_js_1 = require("./handleFatalError.js");
 Object.defineProperty(exports, "handleFatalError", { enumerable: true, get: function () { return handleFatalError_js_1.handleFatalError; } });
 exports.DEFAULT_CLI_PARAMS = {
@@ -49,7 +49,7 @@ async function graphqlMesh(cliParams = exports.DEFAULT_CLI_PARAMS, args = (0, he
         coerce: (externalModules) => Promise.all(externalModules.map(moduleName => {
             const localModulePath = cross_helpers_1.path.resolve(baseDir, moduleName);
             const islocalModule = cross_helpers_1.fs.existsSync(localModulePath);
-            return (0, defaultImportFn_js_1.defaultImportFn)(islocalModule ? localModulePath : moduleName);
+            return (0, include_1.include)(islocalModule ? localModulePath : moduleName);
         })),
     })
         .option('dir', {
@@ -186,7 +186,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             }
             cross_helpers_1.process.env.NODE_ENV = 'production';
             const mainModule = cross_helpers_1.path.join(builtMeshArtifactsPath, 'index');
-            const builtMeshArtifacts = await (0, defaultImportFn_js_1.defaultImportFn)(mainModule);
+            const builtMeshArtifacts = await (0, include_1.include)(mainModule);
             const rawServeConfig = builtMeshArtifacts.rawServeConfig;
             const meshOptions = await builtMeshArtifacts.getMeshOptions();
             logger = meshOptions.logger;
@@ -212,7 +212,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             }
             const store = new store_1.MeshStore(cliParams.artifactsDir, new store_1.FsStoreStorageAdapter({
                 cwd: baseDir,
-                importFn: defaultImportFn_js_1.defaultImportFn,
+                importFn: include_1.include,
                 fileType: 'ts',
             }), {
                 readonly: false,
@@ -222,7 +222,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             const meshConfig = await (0, config_js_1.findAndParseConfig)({
                 dir: baseDir,
                 store,
-                importFn: defaultImportFn_js_1.defaultImportFn,
+                importFn: include_1.include,
                 ignoreAdditionalResolvers: true,
                 artifactsDir: cliParams.artifactsDir,
                 configName: cliParams.configName,
@@ -260,7 +260,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             const importedModulesSet = new Set();
             const importPromises = [];
             const importFn = (moduleId, noCache) => {
-                const importPromise = (0, defaultImportFn_js_1.defaultImportFn)(moduleId)
+                const importPromise = (0, include_1.include)(moduleId)
                     .catch(e => {
                     if (e.message.includes('getter')) {
                         return e;

package/esm/config.js

@@ -2,9 +2,9 @@ import Ajv from 'ajv';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 import { processConfig } from '@graphql-mesh/config';
 import { path, process } from '@graphql-mesh/cross-helpers';
+import { include } from '@graphql-mesh/include';
 import { jsonSchema } from '@graphql-mesh/types';
 import { DefaultLogger, loadYaml } from '@graphql-mesh/utils';
-import { defaultImportFn } from './defaultImportFn.js';
 export function validateConfig(config, filepath, initialLoggerPrefix, throwOnInvalidConfig = false) {
     if (jsonSchema) {
         const ajv = new Ajv({
@@ -39,7 +39,7 @@ export function validateConfig(config, filepath, initialLoggerPrefix, throwOnInv
     }
 }
 export async function findAndParseConfig(options) {
-    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix = '🕸️  Mesh', importFn = defaultImportFn, ...restOptions } = options || {};
+    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix = '🕸️  Mesh', importFn = include, ...restOptions } = options || {};
     const dir = path.isAbsolute(configDir) ? configDir : path.join(process.cwd(), configDir);
     const explorer = cosmiconfig(configName, {
         searchPlaces: [
@@ -71,7 +71,7 @@ export async function findAndParseConfig(options) {
     validateConfig(config, results.filepath, initialLoggerPrefix, restOptions.throwOnInvalidConfig);
     return processConfig(config, { dir, initialLoggerPrefix, importFn, ...restOptions });
 }
-function customLoader(ext, importFn = defaultImportFn, initialLoggerPrefix = '🕸️  Mesh') {
+function customLoader(ext, importFn = include, initialLoggerPrefix = '🕸️  Mesh') {
     const logger = new DefaultLogger(initialLoggerPrefix).child('config');
     function loader(filepath, content) {
         if (process.env) {

package/esm/index.js

@@ -2,6 +2,7 @@ import { config as dotEnvRegister } from 'dotenv';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { fs, path as pathModule, process } from '@graphql-mesh/cross-helpers';
+import { include } from '@graphql-mesh/include';
 import { getMesh } from '@graphql-mesh/runtime';
 import { FsStoreStorageAdapter, MeshStore } from '@graphql-mesh/store';
 import { DefaultLogger, pathExists, registerTerminateHandler, rmdirs, writeFile, } from '@graphql-mesh/utils';
@@ -9,7 +10,6 @@ import { printSchemaWithDirectives } from '@graphql-tools/utils';
 import { serveMesh } from './commands/serve/serve.js';
 import { generateTsArtifacts } from './commands/ts-artifacts.js';
 import { findAndParseConfig } from './config.js';
-import { defaultImportFn } from './defaultImportFn.js';
 import { handleFatalError } from './handleFatalError.js';
 export { generateTsArtifacts, serveMesh, findAndParseConfig, handleFatalError };
 export const DEFAULT_CLI_PARAMS = {
@@ -41,7 +41,7 @@ export async function graphqlMesh(cliParams = DEFAULT_CLI_PARAMS, args = hideBin
         coerce: (externalModules) => Promise.all(externalModules.map(moduleName => {
             const localModulePath = pathModule.resolve(baseDir, moduleName);
             const islocalModule = fs.existsSync(localModulePath);
-            return defaultImportFn(islocalModule ? localModulePath : moduleName);
+            return include(islocalModule ? localModulePath : moduleName);
         })),
     })
         .option('dir', {
@@ -178,7 +178,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             }
             process.env.NODE_ENV = 'production';
             const mainModule = pathModule.join(builtMeshArtifactsPath, 'index');
-            const builtMeshArtifacts = await defaultImportFn(mainModule);
+            const builtMeshArtifacts = await include(mainModule);
             const rawServeConfig = builtMeshArtifacts.rawServeConfig;
             const meshOptions = await builtMeshArtifacts.getMeshOptions();
             logger = meshOptions.logger;
@@ -204,7 +204,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             }
             const store = new MeshStore(cliParams.artifactsDir, new FsStoreStorageAdapter({
                 cwd: baseDir,
-                importFn: defaultImportFn,
+                importFn: include,
                 fileType: 'ts',
             }), {
                 readonly: false,
@@ -214,7 +214,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             const meshConfig = await findAndParseConfig({
                 dir: baseDir,
                 store,
-                importFn: defaultImportFn,
+                importFn: include,
                 ignoreAdditionalResolvers: true,
                 artifactsDir: cliParams.artifactsDir,
                 configName: cliParams.configName,
@@ -252,7 +252,7 @@ export function createBuiltMeshHTTPHandler<TServerContext = {}>(): MeshHTTPHandl
             const importedModulesSet = new Set();
             const importPromises = [];
             const importFn = (moduleId, noCache) => {
-                const importPromise = defaultImportFn(moduleId)
+                const importPromise = include(moduleId)
                     .catch(e => {
                     if (e.message.includes('getter')) {
                         return e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/cli",
-  "version": "0.92.8-alpha-20240731132658-fac1161fec2605ac689485b79d6b571fd3cabea2",
+  "version": "1.0.0-alpha-20240731125001-cbfa3d2b9c73d559c5290247c504e217b058639f",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -14,7 +14,8 @@
     "@graphql-codegen/typescript-resolvers": "^4.0.0",
     "@graphql-mesh/config": "^0.101.6",
     "@graphql-mesh/cross-helpers": "^0.4.4",
-    "@graphql-mesh/http": "0.100.7-alpha-20240731132658-fac1161fec2605ac689485b79d6b571fd3cabea2",
+    "@graphql-mesh/http": "^0.100.6",
+    "@graphql-mesh/include": "1.0.0-alpha-20240731125001-cbfa3d2b9c73d559c5290247c504e217b058639f",
     "@graphql-mesh/runtime": "^0.100.6",
     "@graphql-mesh/store": "^0.99.5",
     "@graphql-mesh/types": "^0.99.5",
@@ -26,7 +27,6 @@
     "dotenv": "^16.0.3",
     "graphql-import-node": "^0.0.5",
     "graphql-ws": "^5.12.1",
-    "jiti": "^1.21.6",
     "json-bigint-patch": "^0.0.8",
     "json5": "^2.2.3",
     "mkdirp": "^3.0.0",

package/cjs/defaultImportFn.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultImportFn = void 0;
-const tslib_1 = require("tslib");
-const jiti_1 = tslib_1.__importDefault(require("jiti"));
-let jiti;
-function getOrCreateImportFn() {
-    if (!jiti) {
-        // we instantiate on demand because sometimes jiti is not used
-        jiti = (0, jiti_1.default)(__filename);
-    }
-    return id => jiti.import(id, {});
-}
-const defaultImportFn = async (id) => {
-    let module = await getOrCreateImportFn()(id);
-    if (module.default != null) {
-        module = module.default;
-    }
-    if (typeof module === 'object' && module != null) {
-        const prototypeOfObject = Object.getPrototypeOf(module);
-        if (prototypeOfObject == null || prototypeOfObject === Object.prototype) {
-            const normalizedVal = {};
-            for (const key in module) {
-                normalizedVal[key] = module[key];
-            }
-            return normalizedVal;
-        }
-    }
-    return module;
-};
-exports.defaultImportFn = defaultImportFn;

package/esm/defaultImportFn.js

@@ -1,26 +0,0 @@
-import createJITI from 'jiti';
-let jiti;
-function getOrCreateImportFn() {
-    if (!jiti) {
-        // we instantiate on demand because sometimes jiti is not used
-        jiti = createJITI(__filename);
-    }
-    return id => jiti.import(id, {});
-}
-export const defaultImportFn = async (id) => {
-    let module = await getOrCreateImportFn()(id);
-    if (module.default != null) {
-        module = module.default;
-    }
-    if (typeof module === 'object' && module != null) {
-        const prototypeOfObject = Object.getPrototypeOf(module);
-        if (prototypeOfObject == null || prototypeOfObject === Object.prototype) {
-            const normalizedVal = {};
-            for (const key in module) {
-                normalizedVal[key] = module[key];
-            }
-            return normalizedVal;
-        }
-    }
-    return module;
-};

package/typings/defaultImportFn.d.cts

@@ -1,2 +0,0 @@
-import type { ImportFn } from '@graphql-mesh/types';
-export declare const defaultImportFn: ImportFn;

package/typings/defaultImportFn.d.ts

@@ -1,2 +0,0 @@
-import type { ImportFn } from '@graphql-mesh/types';
-export declare const defaultImportFn: ImportFn;