@putout/engine-loader 4.11.0 → 4.12.0

package/lib/load.js

@@ -7,46 +7,60 @@ const once = require('once');
 
 const wrapPlugin = require('./wrap-plugin');
 
-// yarn PnP API
-// https://yarnpkg.com/advanced/rulebook#modules-shouldnt-hardcode-node_modules-paths-to-access-other-modules
-const {PUTOUT_YARN_PNP = 'putout'} = process.env;
-const createCustomRequire = once(() => createRequire(require.resolve(PUTOUT_YARN_PNP)));
-
 const bigFirst = (a) => `${a[0].toUpperCase()}${a.slice(1)}`;
 
-const getModulePath = (name) => {
-    const customRequire = createCustomRequire();
+const load = (type) => ({name, namespace}) => {
+    if (namespace !== 'putout')
+        return wrapPlugin(name, namespace);
+    
+    const [pluginPath, customRequire] = getPath(namespace, type, name);
     
-    const [, path] = tryCatch(customRequire.resolve, name);
-    return path;
+    if (!pluginPath)
+        throw Error(`${bigFirst(type)} "${namespace}-${type}-${name}" could not be found!`);
+    
+    return customRequire(pluginPath);
 };
 
+module.exports.loadPlugin = load('plugin');
+module.exports.loadProcessor = load('processor');
+
 function getPath(namespace, type, name) {
-    let path = getModulePath(`@${namespace}/${type}-${name}`);
+    let [path, customRequire] = getModulePath(`@${namespace}/${type}-${name}`);
     
     if (!path)
-        path = getModulePath(`${namespace}-${type}-${name}`);
+        [path, customRequire] = getModulePath(`${namespace}-${type}-${name}`);
     
     if (!path)
-        path = getModulePath(name);
+        [path, customRequire] = getModulePath(name);
     
-    return path;
+    return [path, customRequire];
 }
 
-const load = (type) => ({name, namespace}) => {
-    if (namespace !== 'putout')
-        return wrapPlugin(name, namespace);
+const {PUTOUT_YARN_PNP = 'putout'} = process.env;
+
+const createCustomRequire = once(() => createRequire(require.resolve(PUTOUT_YARN_PNP)));
+const createPutoutRequire = once(() => createRequire(require.resolve('putout')));
+
+// That's all for Yarn P'n'P
+//
+// We need to create a couple version of require for plugins, formatters and processors:
+// - declared in 🐊Putout package.json;
+// - 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) {
+    let path;
     
-    const pluginPath = getPath(namespace, type, name);
+    const customRequire = createCustomRequire();
+    const putoutRequire = createPutoutRequire();
     
-    if (!pluginPath)
-        throw Error(`${bigFirst(type)} "${namespace}-${type}-${name}" could not be found!`);
+    [, path] = tryCatch(putoutRequire.resolve, name);
     
-    const customRequire = createCustomRequire();
+    if (path)
+        return [path, putoutRequire];
     
-    return customRequire(pluginPath);
-};
-
-module.exports.loadPlugin = load('plugin');
-module.exports.loadProcessor = load('processor');
+    [, path] = tryCatch(customRequire.resolve, name);
+    
+    return [path, customRequire];
+}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "4.11.0",
+  "version": "4.12.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/engine-loader",