@putout/operator-match-files 3.2.2 → 3.4.0

package/README.md

@@ -96,15 +96,31 @@ You can even use file matchers:
 Matchers: `__filename = __name.__ext`
 
 ```js
-const {operator} = require('putout');
-const {matchFiles} = operator;
-const updateTSConfig = require('../update-tsconfig');
-
 module.exports = matchFiles({
     '__name.json -> __name.js': updateTSConfig,
 });
 ```
 
+### Options
+
+You can also pass `options`:
+
+```js
+module.exports = matchFiles({
+    '.eslintrc.json -> eslint.config.js': {
+        rules: {
+            'eslint/declare': {
+                type: 'esm',
+            },
+        },
+        plugins: [
+            ['eslint/convert-rc-to-flat', rcToFlat],
+            ['eslint/declare', declare],
+        ],
+    },
+});
+```
+
 ## License
 
 MIT

package/lib/match-files.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const {
-    join,
-    basename,
-    extname,
-} = require('node:path');
+const {join, extname} = require('node:path');
 
 const {parse, print} = require('@putout/engine-parser');
 const {transform} = require('putout/transform');
@@ -38,44 +34,44 @@ module.exports.matchFiles = (files) => {
     };
 };
 
-function fix(path, {inputFile, outputFilename, matchedJS, matchedAST, plugins}) {
-    transform(matchedAST, matchedJS, {
-        plugins,
-    });
+function fix(inputFile, {dirPath, mainPath, matchInputFilename, outputFilename, matchedJS, matchedAST, options}) {
+    transform(matchedAST, matchedJS, options);
     
     const matchedJSON = magicPrint(outputFilename, matchedAST);
+    const outputFile = getOutputFile(mainPath, {
+        dirPath,
+        matchInputFilename,
+        outputFilename,
+        inputFile,
+    });
     
-    writeFileContent(path, matchedJSON);
+    writeFileContent(outputFile, matchedJSON);
     
-    if (path !== inputFile)
+    if (inputFile !== outputFile)
         removeFile(inputFile);
 }
 
-const createScan = (files) => (path, {push, progress, options}) => {
+const createScan = (files) => (mainPath, {push, progress, options}) => {
     const allFiles = [];
-    const cwd = getFilename(path);
+    const cwd = getFilename(mainPath);
     
-    for (const [filename, plugin] of entries(files)) {
+    for (const [filename, rawOptions] of entries(files)) {
         const [matchInputFilename, outputFilename = matchInputFilename] = parseMatcher(filename, options);
-        const inputFiles = findFile(path, matchInputFilename);
+        const inputFiles = findFile(mainPath, matchInputFilename);
         
         for (const inputFile of inputFiles) {
             const dirPath = getParentDirectory(inputFile);
             const inputFilename = getFilename(inputFile);
-            const outputFile = getOutputFile(path, {
-                dirPath,
-                matchInputFilename,
-                outputFilename,
-                inputFile,
-            });
             
             if (ignores(cwd, inputFilename, options))
                 continue;
             
             allFiles.push({
-                plugin,
+                mainPath,
+                dirPath,
+                matchInputFilename,
+                rawOptions,
                 inputFile,
-                outputFile,
                 inputFilename,
                 outputFilename,
             });
@@ -84,7 +80,17 @@ const createScan = (files) => (path, {push, progress, options}) => {
     
     const n = allFiles.length;
     
-    for (const [i, {inputFile, outputFile, inputFilename, outputFilename, plugin}] of allFiles.entries()) {
+    for (const [i, current] of allFiles.entries()) {
+        const {
+            dirPath,
+            matchInputFilename,
+            inputFile,
+            inputFilename,
+            outputFilename,
+            rawOptions,
+            mainPath,
+        } = current;
+        
         progress({
             i,
             n,
@@ -93,25 +99,22 @@ const createScan = (files) => (path, {push, progress, options}) => {
         const fileContent = readFileContent(inputFile) || '{}';
         const [matchedJS, matchedAST] = magicParse(inputFilename, fileContent);
         
-        const name = `match-file: ${inputFilename}`;
-        const plugins = [
-            [name, plugin],
-        ];
-        
-        const places = findPlaces(matchedAST, matchedJS, {
-            plugins,
-        });
+        const options = parseOptions(inputFilename, rawOptions);
+        const places = findPlaces(matchedAST, matchedJS, options);
         
         if (!places.length)
             continue;
         
         const {message} = places[0];
         
-        push(outputFile, {
-            inputFile,
+        push(inputFile, {
+            dirPath,
+            mainPath,
+            matchInputFilename,
+            
             outputFilename,
             message,
-            plugins,
+            options,
             
             matchedAST,
             matchedJS,
@@ -169,15 +172,31 @@ function getOutputFile(path, {dirPath, matchInputFilename, outputFilename, input
 }
 
 function parseMatcher(matcher, options) {
-    for (const [name, value] of entries(options)) {
-        if (name === 'filename') {
-            const ext = extname(value);
-            const name = value.replace(ext, '');
-            
-            matcher = matcher.replaceAll(`__name`, name);
-            matcher = matcher.replaceAll(`__ext`, ext);
-        }
-    }
+    const {filename} = options;
+    
+    if (!filename)
+        return matcher.split(' -> ');
+    
+    const ext = extname(filename);
+    const shortName = filename.replace(ext, '');
+    
+    matcher = matcher.replaceAll(`__name`, shortName);
+    matcher = matcher.replaceAll(`__ext`, ext);
     
     return matcher.split(' -> ');
 }
+
+function parseOptions(inputFilename, rawOptions) {
+    if (rawOptions.plugins)
+        return rawOptions;
+    
+    const name = `match-file: ${inputFilename}`;
+    
+    const plugins = [
+        [name, rawOptions],
+    ];
+    
+    return {
+        plugins,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/operator-match-files",
-  "version": "3.2.2",
+  "version": "3.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout operator adds ability to match files to plugins",