putout 38.0.4 → 38.0.6

package/ChangeLog

@@ -1,3 +1,17 @@
+2025.02.04, v38.0.6
+
+feature:
+- 487a24e4e @putout/cli-process-file: add
+- 34c38b881 @putout/plugin-extract-keywords-from-variables: MemberExpression
+
+2025.02.03, v38.0.5
+
+feature:
+- f4cc6a711 putout: @putout/plugin-putout-config v8.0.0
+- ffeb3951a putout: @putout/plugin-esm v2.0.0
+- a08863ef9 @putout/plugin-esm: drop support of 🐊 < 38
+- 33e0c6129 @putout/plugin-esm: declare-imports-first: exclude not ESM
+
 2025.02.02, v38.0.4
 
 feature:

package/lib/cli/runner/runner.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const Report = require('@putout/engine-reporter/report');
+
+const initProcessFile = require('@putout/cli-process-file');
 const {runWriter} = require('./writer.js');
-const initProcessFile = require('../process-file.js');
 
 const report = Report();
 

package/lib/parse-options/apply-module-type-rules.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const merge = require('../merge');
+const {mergeOptions} = require('./merge-options');
 const {assign} = Object;
 
 module.exports = ({type}, options) => {
-    const rules = type === 'module' ? esm() : commonjs();
-    assign(options, merge(options, rules));
+    const config = type === 'module' ? esm() : commonjs();
+    assign(options, mergeOptions(options, config));
 };
 
 const commonjs = () => ({

package/lib/parse-options/index.js

@@ -10,9 +10,9 @@ const once = require('once');
 const tryCatch = require('try-catch');
 const escalade = require('escalade/sync');
 
-const parseMatch = require('./parse-match');
+const {parseMatch} = require('./parse-match');
 const defaultOptions = require('../../putout.json');
-const merge = require('../merge');
+const {mergeOptions} = require('./merge-options');
 const recursiveRead = require('./recursive-read');
 const applyModuleTypeRules = require('./apply-module-type-rules');
 const {validateOptions} = require('./validate-options');
@@ -47,9 +47,9 @@ module.exports = (info = {}, overrides = {}) => {
         options,
     ];
     
-    const mergedOptions = merge(...optionsList);
+    const mergedOptions = mergeOptions(...optionsList);
     
-    const mergedDefaultsMatch = merge(
+    const mergedDefaultsMatch = mergeOptions(
         mergedOptions,
         parseMatch(
             name,
@@ -58,7 +58,7 @@ module.exports = (info = {}, overrides = {}) => {
         options,
     );
     
-    const mergedMatch = merge(customOptions, options, parseMatch(name, options.match));
+    const mergedMatch = mergeOptions(customOptions, options, parseMatch(name, options.match));
     
     const resultOptionsList = [
         readCodeMods({
@@ -74,7 +74,7 @@ module.exports = (info = {}, overrides = {}) => {
         mergedMatch,
     ];
     
-    const finalMergedOptions = merge(...resultOptionsList);
+    const finalMergedOptions = mergeOptions(...resultOptionsList);
     
     validateOptions(finalMergedOptions);
     

package/lib/{merge.js → parse-options/merge-options.js}

@@ -34,7 +34,7 @@ const arrayUnion = (a, b) => {
 
 const arrayMerge = (a, b) => arrayUnion(b, a);
 
-module.exports = (...args) => {
+module.exports.mergeOptions = (...args) => {
     return deepmerge.all(args, {
         arrayMerge,
     });

package/lib/parse-options/parse-match.js

@@ -4,7 +4,7 @@ const picomatch = require('picomatch');
 
 const {keys, assign} = Object;
 
-module.exports = (name, match) => {
+module.exports.parseMatch = (name, match) => {
     if (!match || !name)
         return {};
     

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

@@ -3,8 +3,8 @@
 const {dirname} = require('node:path');
 const escalade = require('escalade/sync');
 
-const merge = require('../merge');
-const parseMatch = require('./parse-match');
+const {mergeOptions} = require('./merge-options');
+const {parseMatch} = require('./parse-match');
 
 module.exports = (name, configName, overrides) => {
     if (name === '<input>')
@@ -19,10 +19,10 @@ module.exports = (name, configName, overrides) => {
         customRequire,
     });
     
-    let mergedOptions = merge(...optionsList);
+    let mergedOptions = mergeOptions(...optionsList);
     
     for (const currentOptions of optionsList)
-        mergedOptions = merge(
+        mergedOptions = mergeOptions(
             mergedOptions,
             currentOptions,
             parseMatch(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "38.0.4",
+  "version": "38.0.6",
   "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",
@@ -11,8 +11,10 @@
       "require": "./lib/putout.js",
       "import": "./lib/putout.mjs"
     },
+    "./parse-error": "./lib/parse-error.js",
     "./parse-options": "./lib/parse-options/index.js",
-    "./process-file": "./lib/cli/process-file.js",
+    "./parse-match": "./lib/parse-options/parse-match.js",
+    "./merge-options": "./lib/parse-options/merge-options.js",
     "./exit-codes": "./lib/cli/exit-codes.mjs",
     "./exit-codes/cjs": "./lib/cli/exit-codes.js",
     "./cli": "./lib/cli/index.js",
@@ -54,6 +56,7 @@
     "@putout/cli-choose-formatter": "^4.0.0",
     "@putout/cli-keypress": "^2.0.0",
     "@putout/cli-match": "^2.0.0",
+    "@putout/cli-process-file": "^1.0.0",
     "@putout/cli-ruler": "^3.0.0",
     "@putout/cli-staged": "^1.0.0",
     "@putout/cli-validate-args": "^2.0.0",
@@ -139,7 +142,7 @@
     "@putout/plugin-parens": "^1.0.0",
     "@putout/plugin-promises": "^16.0.0",
     "@putout/plugin-putout": "^23.0.0",
-    "@putout/plugin-putout-config": "^7.0.1",
+    "@putout/plugin-putout-config": "^8.0.0",
     "@putout/plugin-regexp": "^9.0.0",
     "@putout/plugin-remove-console": "^6.0.0",
     "@putout/plugin-remove-constant-conditions": "^4.0.0",
@@ -207,7 +210,6 @@
     "nano-memoize": "^3.0.11",
     "once": "^1.4.0",
     "picomatch": "^4.0.2",
-    "samadhi": "^2.10.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.0",
     "wraptile": "^3.0.0",

package/lib/cli/printer/printer.mjs

@@ -1,61 +0,0 @@
-import deepMerge from 'deepmerge';
-
-const {isArray} = Array;
-const maybeArray = (a) => isArray(a) ? a : [a];
-
-const DefaultMarkdown = {
-    format: {
-        endOfFile: '',
-    },
-};
-
-const JSON = {
-    format: {
-        quote: '"',
-    },
-    semantics: {
-        trailingComma: false,
-    },
-};
-
-export const configurePrinter = (name, printerOptions) => {
-    const [printer = 'putout', options = {}] = maybeArray(printerOptions);
-    const ext = name
-        .split('.')
-        .pop();
-    
-    if (printer !== 'putout')
-        return printerOptions;
-    
-    const mergedOptions = deepMerge(parseOptions(ext), options);
-    
-    return [printer, mergedOptions];
-};
-
-function parseOptions(ext) {
-    if (ext === 'json')
-        return JSON;
-    
-    if (ext === 'yml{json}')
-        return JSON;
-    
-    if (ext === 'md{json}')
-        return {
-            format: {
-                ...DefaultMarkdown.format,
-                ...JSON.format,
-            },
-            semantics: {
-                ...DefaultMarkdown.semantics,
-                ...JSON.semantics,
-            },
-        };
-    
-    if (ext === 'md{js}')
-        return DefaultMarkdown;
-    
-    if (ext === 'md{ts}')
-        return DefaultMarkdown;
-    
-    return {};
-}

package/lib/cli/process-file.js

@@ -1,95 +0,0 @@
-'use strict';
-
-const tryToCatch = require('try-to-catch');
-const eslint = require('@putout/eslint');
-
-const {putoutAsync} = require('../..');
-const merge = require('../merge');
-const parseMatch = require('../parse-options/parse-match');
-
-const {simpleImport} = require('./simple-import');
-const parseError = require('../parse-error');
-
-const getMatchedOptions = (name, options) => {
-    if (!name.includes('{'))
-        return options;
-    
-    return merge(options, parseMatch(name, options.match));
-};
-
-module.exports = ({fix, fixCount, isFlow, logError, raw}) => async function processFile({name, source, startLine, options, again}) {
-    const {configurePrinter} = await import('./printer/printer.mjs');
-    const isTS = /\.tsx?$/.test(name) || /{tsx?}$/.test(name);
-    const {printer, ...matchedOptions} = getMatchedOptions(name, options);
-    
-    const [e, result] = await tryToCatch(putoutAsync, source, {
-        fix,
-        fixCount,
-        isTS,
-        isFlow,
-        ...matchedOptions,
-        printer: configurePrinter(name, printer),
-    });
-    
-    if (!again && e) {
-        raw && logError(e);
-        
-        const {lint} = await simpleImport('samadhi');
-        const [code, places] = await lint(source, {
-            startLine,
-            fix,
-            isTS,
-        });
-        
-        if (!fix && places.length)
-            return {
-                code,
-                places,
-            };
-        
-        if (fix && !places.length)
-            return await processFile({
-                again: true,
-                name,
-                source: code,
-                startLine,
-                options,
-            });
-    }
-    
-    const {code = source} = result || {};
-    const allPlaces = result ? result.places : parseError(e);
-    
-    const [newCode, newPlaces] = await eslint({
-        name,
-        code,
-        fix,
-    });
-    
-    allPlaces.push(...newPlaces);
-    
-    const places = formatPlaces(startLine, allPlaces);
-    
-    return {
-        places,
-        code: newCode,
-    };
-};
-
-function formatPlaces(line = 1, places) {
-    const newPlaces = [];
-    
-    for (const place of places) {
-        const {position} = place;
-        
-        newPlaces.push({
-            ...place,
-            position: {
-                ...position,
-                line: line + position.line,
-            },
-        });
-    }
-    
-    return newPlaces;
-}