@putout/engine-loader 9.2.0 → 10.0.0

package/README.md

@@ -34,7 +34,7 @@ module.exports.rules = {
 
 ## Env Variables
 
-When you need to get things working with Yarn PnP, and using custom `plugins` `formatters` or `processers`, add env variable
+When you need to get things working with Yarn PnP, and using custom `plugins` `formatters` or `processors`, add env variable
 `PUTOUT_YARN_PNP` with name of a package that contains dependencies you need.
 
 ## API
@@ -117,13 +117,12 @@ Gives ability to create loader for `processor` or `formatter`.
 const {createAsyncLoader} = require('@putout/engine-loader');
 const {loadProcessor} = createAsyncLoader('processor');
 
+// load @putout/processor-markdown
 await loadProcessors('markdown');
-// loads @putout/processor-markdown
-
+// load @putout/processor-json using custom loader
 await loadProcess('json', () => {
     return Promise.resolve(`will be called instead of 'import'`);
 });
-// loads @putout/processor-json using custom loader
 ```
 
 ## License

package/lib/async-loader.js

@@ -10,10 +10,7 @@ module.exports.createAsyncLoader = (type) => async (name, load) => {
     if (name === 'none')
         return stub();
     
-    const [e, reporter] = await cleverLoad([
-        `@putout/${type}-${name}`,
-        `putout-${type}-${name}`,
-    ], load);
+    const [e, reporter] = await cleverLoad([`@putout/${type}-${name}`, `putout-${type}-${name}`], load);
     
     if (e)
         throw e;
@@ -47,4 +44,3 @@ async function cleverLoad(names, load = simpleImport) {
     
     return [e];
 }
-

package/lib/build-paths.js

@@ -3,7 +3,10 @@
 const addNodeModules = (a) => `${a}/node_modules`;
 
 module.exports = (path) => {
-    const names = path.split('/').slice(1);
+    const names = path
+        .split('/')
+        .slice(1);
+    
     const result = [''];
     
     let current = '';
@@ -13,7 +16,5 @@ module.exports = (path) => {
         result.push(current);
     }
     
-    return result
-        .map(addNodeModules);
+    return result.map(addNodeModules);
 };
-

package/lib/get-positions-by-diff.js

@@ -66,4 +66,3 @@ function diffLineMode(text1, text2) {
     
     return diffs;
 }
-

package/lib/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const memo = require('nano-memoize');
+const {nanomemoize} = require('nano-memoize');
 
 const isEnabled = require('./is-enabled');
 const {loadPlugin} = require('./load');
@@ -15,15 +15,13 @@ const {babelPlugin} = require('./wrap-plugin');
 const isString = (a) => typeof a === 'string';
 
 const defaultOptions = () => Object.create(null);
+
 const mergeRules = ([rule, plugin], rules) => {
     for (const currentRule of rules) {
         if (currentRule.rule !== rule)
             continue;
         
-        const {
-            msg,
-            options,
-        } = currentRule;
+        const {msg, options} = currentRule;
         
         return {
             rule,
@@ -41,12 +39,10 @@ const mergeRules = ([rule, plugin], rules) => {
     };
 };
 
-module.exports.loadProcessorsAsync = memo(async (options, load) => {
+module.exports.loadProcessorsAsync = nanomemoize(async (options, load) => {
     check(options);
     
-    const {
-        processors = [],
-    } = options;
+    const {processors = []} = options;
     
     const parsedProcessors = parseProcessorNames(processors);
     const loadProcessor = createAsyncLoader('processor');
@@ -72,15 +68,13 @@ module.exports.babelPlugin = babelPlugin;
 module.exports.loadPlugins = (options) => {
     check(options);
     
-    const {
-        pluginNames = [],
-        rules = {},
-    } = options;
+    const {pluginNames = [], rules = {}} = options;
     
     const cookedRules = parseRules(rules);
     const loadedRules = getLoadedRules(cookedRules);
     
     const items = parsePluginNames(pluginNames);
+    
     const plugins = loadPlugins({
         items,
         loadedRules,
@@ -102,7 +96,10 @@ module.exports.loadPlugins = (options) => {
         if (!isEnabled(name, cookedRules))
             continue;
         
-        result.push(mergeRules([name, plugin], cookedRules));
+        result.push(mergeRules(
+            [name, plugin],
+            cookedRules,
+        ));
     }
     
     return result;
@@ -127,15 +124,9 @@ function splitRule(rule) {
     const name = rule.replace('babel/', '');
     
     if (rule.startsWith('babel'))
-        return [
-            name,
-            'babel',
-        ];
+        return [name, 'babel'];
     
-    return [
-        name,
-        'putout',
-    ];
+    return [name, 'putout'];
 }
 
 function loadPlugins({items, loadedRules}) {
@@ -154,7 +145,10 @@ function loadPlugins({items, loadedRules}) {
             namespace,
         });
         
-        validatePlugin({plugin, rule});
+        validatePlugin({
+            plugin,
+            rule,
+        });
         
         const {rules} = plugin;
         
@@ -163,10 +157,7 @@ function loadPlugins({items, loadedRules}) {
             continue;
         }
         
-        plugins.push([
-            rule,
-            plugin,
-        ]);
+        plugins.push([rule, plugin]);
     }
     
     return plugins;
@@ -177,10 +168,7 @@ function extendRules(rule, plugin) {
     const entries = Object.entries(plugin);
     
     for (const [name, plugin] of entries) {
-        result.push([
-            `${rule}/${name}`,
-            plugin,
-        ]);
+        result.push([`${rule}/${name}`, plugin]);
     }
     
     return result;
@@ -195,4 +183,3 @@ function checkRule(rule) {
     if (!isString(rule))
         throw Error(`☝️ Looks like plugin name type is not 'string', but: '${typeof rule}'`);
 }
-

package/lib/is-enabled.js

@@ -13,4 +13,3 @@ module.exports = (name, rules) => {
     
     return true;
 };
-

package/lib/load.js

@@ -63,4 +63,3 @@ function getModulePath(name) {
     
     return [path, customRequire];
 }
-

package/lib/parse-plugin-names.js

@@ -24,4 +24,3 @@ module.exports = (plugins) => {
     
     return result;
 };
-

package/lib/parse-processor-names.js

@@ -34,4 +34,3 @@ module.exports = (plugins) => {
     
     return result;
 };
-

package/lib/parse-rules.js

@@ -78,11 +78,7 @@ function parseArray(rule, args) {
         };
     }
     
-    const [
-        ,
-        msg = '',
-        options = defaultOptions(),
-    ] = args;
+    const [, msg = '', options = defaultOptions()] = args;
     
     if (args.length === 2 && !isStr(msg)) {
         return {
@@ -144,4 +140,3 @@ function parseSubrules(rules) {
     
     return newRules;
 }
-

package/lib/simple-import.js

@@ -5,4 +5,3 @@ module.exports.simpleImport = async (url) => {
     const result = await import(url);
     return result.default || result;
 };
-

package/lib/transforms/babel.js

@@ -20,4 +20,3 @@ module.exports = (ast, code, name) => {
     
     return ast;
 };
-

package/lib/validate-plugin.js

@@ -20,4 +20,3 @@ module.exports = ({plugin, rule}) => {
     
     throw Error(`☝️ Cannot determine type of plugin '${rule}'. Here is list of supported plugins: https://git.io/JqcMn`);
 };
-

package/lib/validate-rules.js

@@ -5,7 +5,9 @@ const parse = (rule) => {
         return rule;
     
     if (rule.includes('/'))
-        return rule.split('/').shift();
+        return rule
+            .split('/')
+            .shift();
     
     return rule;
 };
@@ -32,4 +34,3 @@ module.exports = ({items, rules}) => {
             throw Error(`No plugin found for a rule: "${rule}"`);
     }
 };
-

package/lib/wrap-plugin.js

@@ -7,9 +7,9 @@ const getPositions = require('./get-positions-by-diff');
 
 const babelTransform = require('./transforms/babel');
 
-const getMessage = (a) => a
-    .replace(/@babel\/plugin-|babel-plugin-/, '')
-    .replaceAll('-', ' ');
+const BABEL_REG = /@babel\/plugin-|babel-plugin-/;
+
+const getMessage = (a) => a.replace(BABEL_REG, '').replaceAll('-', ' ');
 
 const getModulePath = (name) => {
     const [, path] = tryCatch(require.resolve, name);
@@ -32,11 +32,16 @@ module.exports = (name, namespace) => {
 const getPlugin = ({name, transform, message}) => ({
     report: () => message,
     fix: () => {},
-    
     find(ast, {push}) {
-        const oldCode = print(ast);
+        const oldCode = print(ast, {
+            printer: 'putout',
+        });
+        
         transform(ast, oldCode, name);
-        const newCode = print(ast);
+        
+        const newCode = print(ast, {
+            printer: 'putout',
+        });
         
         if (newCode === oldCode)
             return;
@@ -75,4 +80,3 @@ function getBabelPluginName(name) {
     
     return `babel-plugin-${name}`;
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "9.2.0",
+  "version": "10.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@babel/core": "^7.12.3",
-    "@putout/engine-parser": "^6.1.0",
+    "@putout/engine-parser": "^7.1.0",
     "diff-match-patch": "^1.0.4",
-    "nano-memoize": "^2.0.0",
+    "nano-memoize": "^3.0.11",
     "once": "^1.4.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.1"
@@ -49,10 +49,10 @@
     "@putout/processor-markdown": "*",
     "babel-plugin-angularjs-annotate": "https://github.com/putoutjs/babel-plugin-angularjs-annotate",
     "babel-plugin-transform-inline-consecutive-adds": "^0.4.3",
-    "c8": "^7.5.0",
+    "c8": "^8.0.0",
     "eslint": "^8.0.1",
-    "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-putout": "^17.0.0",
+    "eslint-plugin-n": "^16.0.0",
+    "eslint-plugin-putout": "^18.0.0",
     "estrace": "*",
     "just-camel-case": "^4.0.2",
     "lerna": "^6.0.1",