putout 35.17.0 → 35.18.0

package/ChangeLog

@@ -1,12 +1,14 @@
+2024.04.29, v35.18.0
+
+feature:
+- 94b8e8908 putout: parse-options: rulesdir: exclude *.md
+- 2a817e8a5 @putout/operate: insertAfter: wrap ExpressionStatement when current path is Statement and node not
+
 2024.04.28, v35.17.0
 
 fix:
 - a87e7e06c @putout/plugin-nodejs: add-node-predynamic: Identifier
 - ca542fb12 @putout/eslint: no config found: Flat Config error -> RC error
-- 949e898c9 feature: @putout/plugin-nodejs: add-node-presimplify
-- 1551e9f04 feature: @putout/plugin-nodejs: add-node-predynamic import
-- 08acf9555 feature: @putout/plugin-nodejs: add-node-preadd require
-- 6744c616f feature: @putout/plugin-nodejs: add-node-prereport
 
 feature:
 - 9f76b2a51 putout: @putout/quick-lint v1.0.0

package/lib/parse-options/index.js

@@ -2,7 +2,7 @@
 
 const process = require('node:process');
 const {homedir} = require('node:os');
-const {readdirSync} = require('node:fs');
+const {readdirSync: _readdirSync} = require('node:fs');
 
 const {dirname, join} = require('node:path');
 
@@ -16,10 +16,11 @@ const merge = require('../merge');
 const recursiveRead = require('./recursive-read');
 const applyModuleTypeRules = require('./apply-module-type-rules');
 const {validateOptions} = require('./validate-options');
+const {readRules} = require('./read-rules');
 
 const home = homedir();
 
-module.exports = (info = {}) => {
+module.exports = (info = {}, overrides = {}) => {
     const {
         rulesdir,
         name = '',
@@ -29,6 +30,8 @@ module.exports = (info = {}) => {
         readCodeMods = _readCodeMods,
     } = info;
     
+    const {cwd = process.cwd(), readdirSync = _readdirSync} = overrides;
+    
     const [dir, customOptions] = readOptions(name);
     const homeOptions = readHomeOptions();
     const defaultMatch = parseMatch(name, defaultOptions.match);
@@ -54,12 +57,26 @@ module.exports = (info = {}) => {
     
     const mergedMatch = merge(customOptions, options, parseMatch(name, options.match));
     
-    const resultOptions = merge(readCodeMods(), readRules('./', rulesdir), mergedOptions, mergedDefaultsMatch, mergedMatch);
+    const resultOptionsList = [
+        readCodeMods({
+            cwd,
+            readdirSync,
+        }),
+        readRules('./', rulesdir, {
+            cwd,
+            readdirSync,
+        }),
+        mergedOptions,
+        mergedDefaultsMatch,
+        mergedMatch,
+    ];
+    
+    const finalMergedOptions = merge(...resultOptionsList);
     
-    validateOptions(resultOptions);
+    validateOptions(finalMergedOptions);
     
     return {
-        ...resultOptions,
+        ...finalMergedOptions,
         dir,
     };
 };
@@ -86,35 +103,6 @@ function _readOptions(name) {
     return ['', {}];
 }
 
-const isInclude = (a) => a[0] !== '.' && !/(^not-rule-.*|^node_modules$)/.test(a);
-
-function readRules(dirOpt, rulesDir) {
-    if (!rulesDir)
-        return {};
-    
-    let dir = join(dirOpt, rulesDir);
-    
-    if (!dir.startsWith('/'))
-        dir = join(process.cwd(), rulesDir);
-    
-    const [e, names] = tryCatch(readdirSync, dir);
-    
-    if (e)
-        return {};
-    
-    const plugins = [];
-    
-    for (const name of names.filter(isInclude)) {
-        const full = join(dir, name);
-        
-        plugins.push(`import:${full}`);
-    }
-    
-    return {
-        plugins,
-    };
-}
-
 const _readHomeOptions = once(() => {
     const name = join(home, '.putout.json');
     const [, data = {}] = tryCatch(require, name);
@@ -122,4 +110,7 @@ const _readHomeOptions = once(() => {
     return data;
 });
 
-const _readCodeMods = once(() => readRules(home, '.putout'));
+const _readCodeMods = once(({cwd, readdirSync}) => readRules(home, '.putout', {
+    cwd,
+    readdirSync,
+}));

package/lib/parse-options/read-rules.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const {join} = require('node:path');
+
+const tryCatch = require('try-catch');
+
+const isInclude = (a) => {
+    if (a[0] === '.')
+        return false;
+    
+    if (/(^not-rule-.*|^node_modules$)/.test(a))
+        return false;
+    
+    return !a.endsWith('.md');
+};
+
+module.exports.readRules = (dirOpt, rulesDir, overrides) => {
+    if (!rulesDir)
+        return {};
+    
+    const {cwd, readdirSync} = overrides;
+    
+    let dir = join(dirOpt, rulesDir);
+    
+    if (!dir.startsWith('/'))
+        dir = join(cwd, rulesDir);
+    
+    const [e, names] = tryCatch(readdirSync, dir);
+    
+    if (e)
+        return {};
+    
+    const plugins = [];
+    
+    for (const name of names.filter(isInclude)) {
+        const full = join(dir, name);
+        
+        plugins.push(`import:${full}`);
+    }
+    
+    return {
+        plugins,
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "35.17.0",
+  "version": "35.18.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in ESLint, Babel and support of js, jsx, typescript, flow, markdown, yaml and json",