@putout/operator-match-files 3.2.1 → 3.3.0

package/lib/match-files.js

@@ -1,10 +1,7 @@
 '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');
 const {findPlaces} = require('putout/find-places');
@@ -37,44 +34,46 @@ module.exports.matchFiles = (files) => {
     };
 };
 
-function fix(path, {inputFile, outputFilename, matchedJS, matchedAST, plugins}) {
+function fix(inputFile, {dirPath, mainPath, matchInputFilename, outputFilename, matchedJS, matchedAST, plugins}) {
     transform(matchedAST, matchedJS, {
         plugins,
     });
     
     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)) {
         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({
+                mainPath,
+                dirPath,
+                matchInputFilename,
                 plugin,
                 inputFile,
-                outputFile,
                 inputFilename,
                 outputFilename,
             });
@@ -83,7 +82,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,
+            plugin,
+            mainPath,
+        } = current;
+        
         progress({
             i,
             n,
@@ -106,8 +115,11 @@ const createScan = (files) => (path, {push, progress, options}) => {
         
         const {message} = places[0];
         
-        push(outputFile, {
-            inputFile,
+        push(inputFile, {
+            dirPath,
+            mainPath,
+            matchInputFilename,
+            
             outputFilename,
             message,
             plugins,
@@ -168,15 +180,16 @@ function getOutputFile(path, {dirPath, matchInputFilename, outputFilename, input
 }
 
 function parseMatcher(matcher, options) {
-    for (const [name, value] of entries(options)) {
-        if (name === 'filename') {
-            const name = basename(value);
-            const ext = extname(value);
-            
-            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(' -> ');
 }

package/package.json

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