@putout/engine-loader 16.2.1 → 16.3.0

package/lib/load/async-loader.js

@@ -2,42 +2,49 @@
 
 const process = require('node:process');
 const {join} = require('node:path');
-const once = require('once');
-const {nanomemoize} = require('nano-memoize');
+
+const {nanomemoize: _nanomemoize} = require('nano-memoize');
 const tryToCatch = require('try-to-catch');
-const {simpleImport} = require('./simple-import');
+const {simpleImport: _simpleImport} = require('./simple-import');
 
 const {assign} = Object;
 const stub = () => () => {};
 
-module.exports.createAsyncLoader = (type) => nanomemoize(async (name, load) => {
-    if (name === 'none')
-        return stub();
+module.exports.createAsyncLoader = (type, overrides = {}) => {
+    const {
+        simpleImport = _simpleImport,
+        nanomemoize = _nanomemoize,
+    } = overrides;
     
-    if (name.startsWith('import:')) {
-        const shortName = name.replace('import:', '');
+    return nanomemoize(async (name) => {
+        if (name === 'none')
+            return stub();
         
-        return await cleverLoad([
-            require.resolve(shortName),
-        ], load);
-    }
-    
-    const namesBase = [
-        `@putout/${type}-${name}`,
-        `putout-${type}-${name}`,
-    ];
-    
-    const namesFromPluginsDirs = namesBase.flatMap(buildPluginsDirs);
-    
-    const names = Array.from(new Set([
-        ...namesBase,
-        ...namesFromPluginsDirs,
-    ]));
-    
-    return await cleverLoad(names, load);
-});
+        if (name.startsWith('import:')) {
+            const shortName = name.replace('import:', '');
+            
+            return await cleverLoad([
+                require.resolve(shortName),
+            ], simpleImport);
+        }
+        
+        const namesBase = [
+            `@putout/${type}-${name}`,
+            `putout-${type}-${name}`,
+        ];
+        
+        const namesFromPluginsDirs = namesBase.flatMap(buildPluginsDirs);
+        
+        const names = Array.from(new Set([
+            ...namesBase,
+            ...namesFromPluginsDirs,
+        ]));
+        
+        return await cleverLoad(names, simpleImport);
+    });
+};
 
-async function cleverLoad(names, load = simpleImport) {
+async function cleverLoad(names, load) {
     let e;
     let reporter;
     
@@ -73,7 +80,7 @@ async function cleverLoad(names, load = simpleImport) {
     throw e;
 }
 
-const getPutoutLoadDir = once(() => process.env.PUTOUT_LOAD_DIR);
+const getPutoutLoadDir = () => process.env.PUTOUT_LOAD_DIR;
 
 function buildPluginsDirs(name) {
     const dir = getPutoutLoadDir();

package/lib/load/load.js

@@ -1,30 +1,30 @@
 'use strict';
 
 const process = require('node:process');
-const {createRequire} = require('node:module');
+const {createRequire: _createRequire} = require('node:module');
 const {join} = require('node:path');
 const tryCatch = require('try-catch');
-const once = require('once');
-const {assign} = Object;
 
 const bigFirst = (a) => `${a[0].toUpperCase()}${a.slice(1)}`;
 
-const load = (type) => ({name, namespace}) => {
-    const [pluginPath, customRequire] = getPath(namespace, type, name);
+const load = (type) => (overrides) => {
+    const {
+        name,
+        namespace,
+        getModulePath = _getModulePath,
+        createRequire = _createRequire,
+    } = overrides;
+    
+    const [pluginPath, customRequire] = getPath(namespace, type, name, {
+        getModulePath,
+        createRequire,
+    });
     
     if (!pluginPath)
         throw Error(`${bigFirst(type)} "${namespace}-${type}-${name}" could not be found!`);
     
     const [error, result] = tryCatch(customRequire, pluginPath);
     
-    /* c8 ignore start */
-    if (error?.code === 'ERR_REQUIRE_ESM')
-        assign(error, {
-            message: `☝️ Looks like '${name}' is ESM, use 'await putoutAsync()' instead`,
-            name,
-        });
-    
-    /* c8 ignore end */
     if (error)
         throw error;
     
@@ -34,27 +34,35 @@ const load = (type) => ({name, namespace}) => {
 module.exports.loadPlugin = load('plugin');
 module.exports.loadProcessor = load('processor');
 
-function getPath(namespace, type, name) {
+function getPath(namespace, type, name, overrides) {
+    const {getModulePath, createRequire} = overrides;
+    
     if (name.startsWith('import:'))
-        return getModulePath(name.replace('import:', ''));
+        return getModulePath(name.replace('import:', ''), {
+            createRequire,
+        });
     
-    let [path, customRequire] = getModulePath(`@${namespace}/${type}-${name}`);
+    let [path, customRequire] = getModulePath(`@${namespace}/${type}-${name}`, {
+        createRequire,
+    });
     
     if (!path)
-        [path, customRequire] = getModulePath(`${namespace}-${type}-${name}`);
+        [path, customRequire] = getModulePath(`${namespace}-${type}-${name}`, {
+            createRequire,
+        });
     
     if (!path)
-        [path, customRequire] = getModulePath(name);
+        [path, customRequire] = getModulePath(name, {
+            createRequire,
+        });
     
     return [path, customRequire];
 }
 
-const {
-    PUTOUT_YARN_PNP = 'putout',
-} = process.env;
+const {env} = process;
 
-const createCustomRequire = once(() => createRequire(require.resolve(PUTOUT_YARN_PNP)));
-const createPutoutRequire = once(() => createRequire(require.resolve('putout')));
+const createCustomRequire = (createRequire) => createRequire(require.resolve(env.PUTOUT_YARN_PNP || 'putout'));
+const createPutoutRequire = (createRequire) => createRequire(require.resolve('putout'));
 
 // That's all for Yarn P'n'P
 //
@@ -63,11 +71,12 @@ const createPutoutRequire = once(() => createRequire(require.resolve('putout')))
 // - declared in module that want to extend 🐊Putout;
 //
 // https://yarnpkg.com/advanced/rulebook#modules-shouldnt-hardcode-node_modules-paths-to-access-other-modules
-function getModulePath(name, {again = false} = {}) {
+function _getModulePath(name, overrides = {}) {
+    const {again = false, createRequire} = overrides;
     let path;
     
-    const customRequire = createCustomRequire();
-    const putoutRequire = createPutoutRequire();
+    const customRequire = createCustomRequire(createRequire);
+    const putoutRequire = createPutoutRequire(createRequire);
     
     [, path] = tryCatch(putoutRequire.resolve, name);
     
@@ -77,14 +86,15 @@ function getModulePath(name, {again = false} = {}) {
     [, path] = tryCatch(customRequire.resolve, name);
     
     if (!path && !again)
-        return getModulePath(buildPluginsDir(name), {
+        return _getModulePath(buildPluginsDir(name), {
             again: true,
+            createRequire,
         });
     
     return [path, customRequire];
 }
 
-const getPutoutLoadDir = once(() => process.env.PUTOUT_LOAD_DIR);
+const getPutoutLoadDir = () => process.env.PUTOUT_LOAD_DIR;
 
 function buildPluginsDir(name) {
     const dir = getPutoutLoadDir();

package/lib/processors/load-processors-async.js

@@ -1,17 +1,19 @@
 'use strict';
 
 const {createAsyncLoader} = require('../load/async-loader');
-
 const parseProcessorNames = require('../processors/parse-processor-names');
 
 const {check} = require('../check');
 
-module.exports.loadProcessorsAsync = async (options, load) => {
+module.exports.loadProcessorsAsync = async (options, simpleImport) => {
     check(options);
     
     const {processors = []} = options;
     const parsedProcessors = parseProcessorNames(processors);
-    const loadProcessor = createAsyncLoader('processor');
+    
+    const loadProcessor = createAsyncLoader('processor', {
+        simpleImport,
+    });
     
     const list = [];
     
@@ -21,7 +23,7 @@ module.exports.loadProcessorsAsync = async (options, load) => {
             continue;
         }
         
-        list.push(loadProcessor(name, load));
+        list.push(loadProcessor(name));
     }
     
     return await Promise.all(list);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "16.2.1",
+  "version": "16.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
@@ -26,7 +26,6 @@
   "dependencies": {
     "diff-match-patch": "^1.0.4",
     "nano-memoize": "^3.0.11",
-    "once": "^1.4.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.1"
   },
@@ -42,19 +41,17 @@
     "@putout/eslint-flat": "^3.0.0",
     "@putout/formatter-progress": "*",
     "@putout/plugin-apply-nullish-coalescing": "*",
-    "@putout/plugin-convert-commonjs-to-esm": "*",
     "@putout/plugin-nodejs": "*",
     "@putout/plugin-remove-debugger": "*",
     "@putout/processor-javascript": "*",
     "@putout/processor-markdown": "*",
     "c8": "^10.0.0",
-    "eslint": "^9.0.0",
+    "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^28.0.0",
+    "eslint-plugin-putout": "^29.0.0",
     "estrace": "^6.0.0",
     "just-camel-case": "^6.2.0",
     "madrun": "^11.0.0",
-    "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
     "putout": "*",