Release v0.1.1

dpilafian · dpilafian · commit d8a3fbec8159 · 2022-10-08T19:25:21.000-07:00
diff --git a/dist/files-replace.d.ts b/dist/files-replace.d.ts
@@ -1,11 +1,12 @@
-//! files-replace v0.1.0 ~~ https://github.com/center-key/files-replace ~~ MIT License
+//! files-replace v0.1.1 ~~ https://github.com/center-key/files-replace ~~ MIT License
 
 export declare type Settings = {
     cd: string;
     concat: string | null;
     extensions: string[];
     filename: string | null;
     find: string | null;
+    regex: RegExp | null;
     replacement: string | null;
     pkg: false;
 };
diff --git a/dist/files-replace.js b/dist/files-replace.js
@@ -1,4 +1,4 @@
-//! files-replace v0.1.0 ~~ https://github.com/center-key/files-replace ~~ MIT License
+//! files-replace v0.1.1 ~~ https://github.com/center-key/files-replace ~~ MIT License
 
 import { isBinary } from 'istextorbinary';
 import { Liquid } from 'liquidjs';
@@ -24,6 +24,7 @@ const filesReplace = {
             concat: null,
             extensions: [],
             find: null,
+            regex: null,
             replacement: null,
             pkg: false,
         };
@@ -33,7 +34,7 @@ const filesReplace = {
         const source = util.normalizeFolder(startFolder + sourceFolder);
         const target = util.normalizeFolder(startFolder + targetFolder);
         const concatFile = settings.concat ? path.join(target, settings.concat) : null;
-        const missingFind = !settings.find && !!settings.replacement;
+        const missingFind = !settings.find && !settings.regex && !!settings.replacement;
         if (targetFolder)
             fs.mkdirSync(target, { recursive: true });
         const errorMessage = !sourceFolder ? 'Must specify the source folder path.' :
@@ -42,7 +43,7 @@ const filesReplace = {
                     !fs.existsSync(target) ? 'Target folder cannot be created: ' + target :
                         !fs.statSync(source).isDirectory() ? 'Source is not a folder: ' + source :
                             !fs.statSync(target).isDirectory() ? 'Target is not a folder: ' + target :
-                                missingFind ? 'Must specify search text with --find' :
+                                missingFind ? 'Must specify search text with --find or --regex' :
                                     null;
         if (errorMessage)
             throw Error('[files-replace] ' + errorMessage);
@@ -61,10 +62,11 @@ const filesReplace = {
         engine.registerFilter('version-major', versionFormatter(1));
         const pkg = settings.pkg ? util.readPackageJson() : null;
         const processFile = (file, index) => {
+            const content = fs.readFileSync(file.origin, 'utf-8');
             const newStr = settings.replacement ?? '';
-            const text = fs.readFileSync(file.origin, 'utf-8');
-            const updated = settings.find ? text.replaceAll(settings.find, newStr) : text;
-            const final = settings.pkg ? engine.parseAndRenderSync(updated, { pkg }) : updated;
+            const out1 = settings.find ? content.replaceAll(settings.find, newStr) : content;
+            const out2 = settings.regex ? out1.replace(settings.regex, newStr) : out1;
+            const final = settings.pkg ? engine.parseAndRenderSync(out2, { pkg }) : out2;
             fs.mkdirSync(path.dirname(file.dest), { recursive: true });
             if (settings.concat && index > 0)
                 fs.appendFileSync(file.dest, final);
diff --git a/dist/files-replace.umd.cjs b/dist/files-replace.umd.cjs
@@ -1,4 +1,4 @@
-//! files-replace v0.1.0 ~~ https://github.com/center-key/files-replace ~~ MIT License
+//! files-replace v0.1.1 ~~ https://github.com/center-key/files-replace ~~ MIT License
 
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -39,6 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 concat: null,
                 extensions: [],
                 find: null,
+                regex: null,
                 replacement: null,
                 pkg: false,
             };
@@ -48,7 +49,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             const source = util.normalizeFolder(startFolder + sourceFolder);
             const target = util.normalizeFolder(startFolder + targetFolder);
             const concatFile = settings.concat ? path_1.default.join(target, settings.concat) : null;
-            const missingFind = !settings.find && !!settings.replacement;
+            const missingFind = !settings.find && !settings.regex && !!settings.replacement;
             if (targetFolder)
                 fs_1.default.mkdirSync(target, { recursive: true });
             const errorMessage = !sourceFolder ? 'Must specify the source folder path.' :
@@ -57,7 +58,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         !fs_1.default.existsSync(target) ? 'Target folder cannot be created: ' + target :
                             !fs_1.default.statSync(source).isDirectory() ? 'Source is not a folder: ' + source :
                                 !fs_1.default.statSync(target).isDirectory() ? 'Target is not a folder: ' + target :
-                                    missingFind ? 'Must specify search text with --find' :
+                                    missingFind ? 'Must specify search text with --find or --regex' :
                                         null;
             if (errorMessage)
                 throw Error('[files-replace] ' + errorMessage);
@@ -76,10 +77,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             engine.registerFilter('version-major', versionFormatter(1));
             const pkg = settings.pkg ? util.readPackageJson() : null;
             const processFile = (file, index) => {
+                const content = fs_1.default.readFileSync(file.origin, 'utf-8');
                 const newStr = settings.replacement ?? '';
-                const text = fs_1.default.readFileSync(file.origin, 'utf-8');
-                const updated = settings.find ? text.replaceAll(settings.find, newStr) : text;
-                const final = settings.pkg ? engine.parseAndRenderSync(updated, { pkg }) : updated;
+                const out1 = settings.find ? content.replaceAll(settings.find, newStr) : content;
+                const out2 = settings.regex ? out1.replace(settings.regex, newStr) : out1;
+                const final = settings.pkg ? engine.parseAndRenderSync(out2, { pkg }) : out2;
                 fs_1.default.mkdirSync(path_1.default.dirname(file.dest), { recursive: true });
                 if (settings.concat && index > 0)
                     fs_1.default.appendFileSync(file.dest, final);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "files-replace",
-   "version": "0.1.0",
+   "version": "0.1.1",
    "description": "Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)",
    "license": "MIT",
    "type": "module",
diff --git a/spec/fixtures/target/mock1.html b/spec/fixtures/target/mock1.html
@@ -12,7 +12,7 @@ <h1>🔍🔍🔍 files-replace 🔍🔍🔍</h1>
       <h2>Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)</h2>
       <p>I, for one, welcome our new A.I. overlords.</p>
       <ul>
-         <li>Release: v0.1.0</li>
+         <li>Release: v0.1.1</li>
          <li>Minor:   v0.1</li>
          <li>Major:   v0</li>
       </ul>
diff --git a/spec/fixtures/target/mock1.js b/spec/fixtures/target/mock1.js
@@ -5,7 +5,7 @@ let π = 3.14;
 let τ = 2 * π;
 
 const info = {
-   banner:      '🔍🔍🔍 files-replace v0.1.0 🔍🔍🔍',
+   banner:      '🔍🔍🔍 files-replace v0.1.1 🔍🔍🔍',
    description: 'Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)',
    list1:       'A.I., A.I., A.I.',
    list2:       'A.I., iNsEcT, INSECT, A.I.',
diff --git a/spec/fixtures/target/subfolder/mock2.html b/spec/fixtures/target/subfolder/mock2.html
@@ -12,7 +12,7 @@ <h1>🔍🔍🔍 files-replace 🔍🔍🔍</h1>
       <h2>Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)</h2>
       <p>I, for one, welcome our new A.I. overlords.</p>
       <ul>
-         <li>Release: v0.1.0</li>
+         <li>Release: v0.1.1</li>
          <li>Minor:   v0.1</li>
          <li>Major:   v0</li>
       </ul>
diff --git a/spec/fixtures/target/subfolder/mock2.js b/spec/fixtures/target/subfolder/mock2.js
@@ -5,7 +5,7 @@ let π = 3.14;
 let τ = 2 * π;
 
 const info = {
-   banner:      '🔍🔍🔍 files-replace v0.1.0 🔍🔍🔍',
+   banner:      '🔍🔍🔍 files-replace v0.1.1 🔍🔍🔍',
    description: 'Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)',
    list1:       'A.I., A.I., A.I.',
    list2:       'A.I., iNsEcT, INSECT, A.I.',

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "files-replace",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.1.1",`
`4`	`4`	`"description": "Find and replace strings or template outputs in text files (CLI tool designed for use in npm scripts)",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "module",`