@graphql-mesh/include 0.0.1-alpha-20240731134627-3296805fb396a7068c95cc1b16e82c4577219970 → 1.0.0-alpha-20240731125001-cbfa3d2b9c73d559c5290247c504e217b058639f

package/cjs/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.include = include;
 exports.registerTsconfigPaths = registerTsconfigPaths;
 const tslib_1 = require("tslib");
-// eslint-disable-next-line import/no-nodejs-modules
 const node_module_1 = tslib_1.__importDefault(require("node:module"));
 const get_tsconfig_1 = require("get-tsconfig");
 const jiti_1 = tslib_1.__importDefault(require("jiti"));
@@ -23,17 +22,30 @@ const jiti = (0, jiti_1.default)(
  * If the module at {@link path} is not found, `null` will be returned.
  */
 async function include(path) {
-    const module = await jiti.import(path, {});
-    if (!module) {
-        throw new Error('Included module is empty');
-    }
-    if (typeof module !== 'object') {
-        throw new Error(`Included module is not an object, is instead "${typeof module}"`);
+    try {
+        const module = await jiti.import(path, {});
+        if (!module) {
+            throw new Error('Included module is empty');
+        }
+        if (typeof module !== 'object') {
+            throw new Error(`Included module is not an object, is instead "${typeof module}"`);
+        }
+        if ('default' in module) {
+            return module.default;
+        }
+        return module;
     }
-    if ('default' in module) {
-        return module.default;
+    catch (err) {
+        // NOTE: we dont use the err.code because maybe the included module is importing another module that does not exist.
+        //       if we were to use the MODULE_NOT_FOUND code, then those includes will fail with an unclear error
+        if (String(err).includes(`Cannot find module '${path}'`)) {
+            //
+        }
+        else {
+            throw err;
+        }
     }
-    return module;
+    return null;
 }
 /**
  * Parses the closest `(t|j)sconfig.json` paths and augments Node's module
@@ -44,10 +56,8 @@ async function include(path) {
 function registerTsconfigPaths({ searchPath = process.cwd(), configName = process.env.MESH_INCLUDE_TSCONFIG_NAME || 'tsconfig.json', } = {}) {
     const tsconfig = (0, get_tsconfig_1.getTsconfig)(searchPath, configName);
     const pathsMatcher = (0, get_tsconfig_1.createPathsMatcher)(tsconfig);
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     const originalResolveFilename = node_module_1.default._resolveFilename;
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     node_module_1.default._resolveFilename = (...args) => {
         const [path, ...rest] = args;
@@ -73,7 +83,6 @@ function registerTsconfigPaths({ searchPath = process.cwd(), configName = proces
         }
     };
     return function unregisterTsconfigPaths() {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
         node_module_1.default._resolveFilename = originalResolveFilename;
     };

package/esm/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-nodejs-modules
 import Module from 'node:module';
 import { createPathsMatcher, getTsconfig } from 'get-tsconfig';
 import createJITI from 'jiti';
@@ -18,17 +17,30 @@ const jiti = createJITI(
  * If the module at {@link path} is not found, `null` will be returned.
  */
 export async function include(path) {
-    const module = await jiti.import(path, {});
-    if (!module) {
-        throw new Error('Included module is empty');
-    }
-    if (typeof module !== 'object') {
-        throw new Error(`Included module is not an object, is instead "${typeof module}"`);
+    try {
+        const module = await jiti.import(path, {});
+        if (!module) {
+            throw new Error('Included module is empty');
+        }
+        if (typeof module !== 'object') {
+            throw new Error(`Included module is not an object, is instead "${typeof module}"`);
+        }
+        if ('default' in module) {
+            return module.default;
+        }
+        return module;
     }
-    if ('default' in module) {
-        return module.default;
+    catch (err) {
+        // NOTE: we dont use the err.code because maybe the included module is importing another module that does not exist.
+        //       if we were to use the MODULE_NOT_FOUND code, then those includes will fail with an unclear error
+        if (String(err).includes(`Cannot find module '${path}'`)) {
+            //
+        }
+        else {
+            throw err;
+        }
     }
-    return module;
+    return null;
 }
 /**
  * Parses the closest `(t|j)sconfig.json` paths and augments Node's module
@@ -39,10 +51,8 @@ export async function include(path) {
 export function registerTsconfigPaths({ searchPath = process.cwd(), configName = process.env.MESH_INCLUDE_TSCONFIG_NAME || 'tsconfig.json', } = {}) {
     const tsconfig = getTsconfig(searchPath, configName);
     const pathsMatcher = createPathsMatcher(tsconfig);
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     const originalResolveFilename = Module._resolveFilename;
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     Module._resolveFilename = (...args) => {
         const [path, ...rest] = args;
@@ -68,7 +78,6 @@ export function registerTsconfigPaths({ searchPath = process.cwd(), configName =
         }
     };
     return function unregisterTsconfigPaths() {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
         Module._resolveFilename = originalResolveFilename;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/include",
-  "version": "0.0.1-alpha-20240731134627-3296805fb396a7068c95cc1b16e82c4577219970",
+  "version": "1.0.0-alpha-20240731125001-cbfa3d2b9c73d559c5290247c504e217b058639f",
   "sideEffects": false,
   "dependencies": {
     "dotenv": "^16.3.1",