@putout/engine-loader 17.0.1 → 17.0.2

package/lib/load/async-loader.js

@@ -4,9 +4,12 @@ import module from 'node:module';
 import tryToCatch from 'try-to-catch';
 import {simpleImport as _simpleImport} from './simple-import.js';
 
-const {createRequire} = module;
+const returns = (a) => () => a;
+const noop = () => {};
 
+const {createRequire = returns(noop)} = module;
 const require = createRequire(import.meta.url);
+
 const {assign} = Object;
 const stub = () => () => {};
 
@@ -22,9 +25,10 @@ export const createAsyncLoader = (type, overrides = {}) => {
         if (name.startsWith('import:')) {
             const shortName = name.replace('import:', '');
             
-            return await cleverLoad([
-                require.resolve(shortName),
-            ], simpleImport);
+            return await cleverLoad([require.resolve(shortName)], {
+                simpleImport,
+                require,
+            });
         }
         
         const namesBase = [
@@ -39,16 +43,21 @@ export const createAsyncLoader = (type, overrides = {}) => {
             ...namesFromPluginsDirs,
         ]));
         
-        return await cleverLoad(names, simpleImport);
+        return await cleverLoad(names, {
+            simpleImport,
+            require,
+        });
     };
 };
 
-async function cleverLoad(names, load) {
+async function cleverLoad(names, overrides) {
+    const {simpleImport, require} = overrides;
+    
     let e;
     let reporter;
     
     for (const name of names) {
-        [e, reporter] = await tryToCatch(load, name);
+        [e, reporter] = await tryToCatch(simpleImport, name);
         
         if (!e)
             return reporter;
@@ -56,7 +65,7 @@ async function cleverLoad(names, load) {
         if (e.code === 'ERR_UNSUPPORTED_DIR_IMPORT') {
             const fullName = require.resolve(name);
             
-            [e, reporter] = await tryToCatch(load, fullName);
+            [e, reporter] = await tryToCatch(simpleImport, fullName);
             
             if (!e)
                 return reporter;

package/lib/load/load.js

@@ -3,9 +3,11 @@ import module from 'node:module';
 import {join} from 'node:path';
 import tryCatch from 'try-catch';
 
-const {createRequire: _createRequire} = module;
+const returns = (a) => () => a;
+const noop = () => {};
+
+const {createRequire: _createRequire = returns(noop)} = module;
 
-const require = _createRequire(import.meta.url);
 const bigFirst = (a) => `${a[0].toUpperCase()}${a.slice(1)}`;
 
 const load = (type) => (overrides) => {
@@ -62,8 +64,15 @@ function getPath(namespace, type, name, overrides) {
 
 const {env} = process;
 
-const createCustomRequire = (createRequire) => createRequire(require.resolve(env.PUTOUT_YARN_PNP || 'putout'));
-const createPutoutRequire = (createRequire) => createRequire(require.resolve('putout'));
+const createCustomRequire = (createRequire) => {
+    const require = createRequire(import.meta.url);
+    return createRequire(require.resolve(env.PUTOUT_YARN_PNP || 'putout'));
+};
+
+const createPutoutRequire = (createRequire) => {
+    const require = createRequire(import.meta.url);
+    return createRequire(require.resolve('putout'));
+};
 
 // That's all for Yarn P'n'P
 //

package/lib/plugins/load-plugins.js

@@ -5,10 +5,10 @@ import {isEnabled} from '../rules/index.js';
 import {filterEnabledPlugins} from './filter-enabled-plugins.js';
 import {check, checkRule} from '../check/index.js';
 
-const {createRequire} = module;
-
-const require = createRequire(import.meta.url);
+const noop = () => {};
+const returns = (a) => () => a;
 
+const {createRequire = returns(noop)} = module;
 const {isArray} = Array;
 
 export const loadPlugins = (options) => {
@@ -91,6 +91,7 @@ function extendRules(rule, plugin) {
 // add support of esm.sh
 // https://github.com/esm-dev/esm.sh/issues/1045
 function loadOnePlugin({name, namespace}) {
+    const require = createRequire(import.meta.url);
     const {loadPlugin} = require('../load/load.js');
     
     return loadPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "17.0.1",
+  "version": "17.0.2",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",

package/rules/apply-import-module/fixture/apply-import-module-fix.js

@@ -1,6 +1,6 @@
 {
     import module from 'node:module';
 
-    const {createRequire} = module;
+    const {createRequire = returns(noop)} = module;
 }
 const require = createRequire(import.meta.url);

package/rules/apply-import-module/fixture/as-fix.js

@@ -1,6 +1,6 @@
 {
     import module from 'node:module';
 
-    const {createRequire: _createRequire} = module;
+    const {createRequire: _createRequire = returns(noop)} = module;
 }
 const require = createRequire(import.meta.url);

package/rules/apply-import-module/index.js

@@ -12,11 +12,11 @@ export const match = () => ({
 export const replace = () => ({
     'import {createRequire} from "node:module"': `{
         import module from "node:module";
-        const {createRequire} = module;
+        const {createRequire = returns(noop)} = module;
     }`,
     'import {createRequire as __a} from "node:module"': `{
         import module from "node:module";
-        const {createRequire: __a} = module;
+        const {createRequire: __a = returns(noop)} = module;
     }`,
 });