Exclude paths by starting glob with '^' or '!'

.npmignore

@@ -2,10 +2,9 @@ test/*
 src/*
 gfx/*
 rollup.config.js
-greenkeeper.json
 tmp/*
-package-lock.json
 .*/
 *.log
 *.txt
 *.file
+*.lock

README.md

@@ -319,6 +319,8 @@ _.oO(What should "sed" have looked like by now?)_
 
 ### Future ideas
 
+- Default to RegExmoji lax syntax
+- Support RegExmoji strict syntax
 - Add support to require hjson, jsonh, yaml, ini files directly
 - Test-run with info outputted about what will happen (sets -t and does not change anything)
 - Let search and replace be within the names of the files (ask for overwriting. -Y = no questions)

bin/ES6/cli.js

@@ -241,7 +241,7 @@ function unescapeString(str = '') {
     });
     let pipeInUse = false;
     let pipeData = '';
-    config.files = yargs.argv._;
+    config.globs = yargs.argv._;
     config.pipedData = null;
     config.showHelp = yargs.showHelp;
     config.pattern = pattern;

bin/ES6/engine.js

@@ -16,7 +16,7 @@ export function engine(config = { engine: 'V8' }) {
     if (handlePipedData(config)) {
         return doReplacement('Piped data', config, config.pipedData);
     }
-    config.files = globs.sync(config.files);
+    config.files = globs2paths(config.globs);
     if (!config.files.length) {
         return error(config.files.length + ' files found');
     }
@@ -68,7 +68,7 @@ export function engine(config = { engine: 'V8' }) {
             return;
         }
         // Release the memory while storing files
-        _data_rr = undefined;
+        _data_rr = '';
         debug('Write new content to: ' + _file_rr);
         // Write directly to the same file (if the process is killed all new and old data is lost)
         if (_config_rr.voidBackup) {
@@ -121,7 +121,7 @@ export function engine(config = { engine: 'V8' }) {
     }
     function handlePipedData(config) {
         step('Check Piped Data');
-        if (config.files.length) {
+        if (config.globs.length) {
             if (!config.replacementJs) {
                 chat('Piped data never used.');
             }
@@ -202,7 +202,7 @@ export function engine(config = { engine: 'V8' }) {
         if (config.literal) {
             pattern = pattern.replace(/[-\[\]{}()*+?.,\/\\^$|#\s]/g, '\\$&');
         }
-        let regex = null;
+        let regex;
         let flags = getFlags(config);
         switch (config.engine) {
             case 'V8':
@@ -339,3 +339,21 @@ function replacePlaceholders(str = '', conf) {
     }
     return str;
 }
+function globs2paths(_globs = []) {
+    const globsToInclude = [];
+    const globsToExclude = [];
+    _globs.filter(Boolean).forEach((glob) => {
+        if ('!' === glob[0] || '^' === glob[0]) {
+            globsToExclude.push(glob.slice(1));
+        }
+        else {
+            globsToInclude.push(glob);
+        }
+    });
+    let filesToInclude = globs.sync(globsToInclude);
+    if (globsToExclude.length) {
+        const filesToExclude = globs.sync(globsToExclude);
+        return filesToInclude.filter((el) => !filesToExclude.includes(el));
+    }
+    return filesToInclude;
+}

bin/rexreplace.cli.js

@@ -72,7 +72,7 @@
     var path = require('path');
     var globs = require('globs');
     var now = new Date();
-    var version = '7.0.7';
+    var version = '7.1.1';
     function engine(config) {
         if ( config === void 0 ) config = { engine: 'V8' };
 
@@ -87,7 +87,7 @@
         if (handlePipedData(config)) {
             return doReplacement('Piped data', config, config.pipedData);
         }
-        config.files = globs.sync(config.files);
+        config.files = globs2paths(config.globs);
         if (!config.files.length) {
             return error(config.files.length + ' files found');
         }
@@ -139,7 +139,7 @@
                 return;
             }
             // Release the memory while storing files
-            _data_rr = undefined;
+            _data_rr = '';
             debug('Write new content to: ' + _file_rr);
             // Write directly to the same file (if the process is killed all new and old data is lost)
             if (_config_rr.voidBackup) {
@@ -192,7 +192,7 @@
         }
         function handlePipedData(config) {
             step('Check Piped Data');
-            if (config.files.length) {
+            if (config.globs.length) {
                 if (!config.replacementJs) {
                     chat('Piped data never used.');
                 }
@@ -275,7 +275,7 @@
             if (config.literal) {
                 pattern = pattern.replace(/[-\[\]{}()*+?.,\/\\^$|#\s]/g, '\\$&');
             }
-            var regex = null;
+            var regex;
             var flags = getFlags(config);
             switch (config.engine) {
                 case 'V8':
@@ -418,6 +418,26 @@
         }
         return str;
     }
+    function globs2paths(_globs) {
+        if ( _globs === void 0 ) _globs = [];
+
+        var globsToInclude = [];
+        var globsToExclude = [];
+        _globs.filter(Boolean).forEach(function (glob) {
+            if ('!' === glob[0] || '^' === glob[0]) {
+                globsToExclude.push(glob.slice(1));
+            }
+            else {
+                globsToInclude.push(glob);
+            }
+        });
+        var filesToInclude = globs.sync(globsToInclude);
+        if (globsToExclude.length) {
+            var filesToExclude = globs.sync(globsToExclude);
+            return filesToInclude.filter(function (el) { return !filesToExclude.includes(el); });
+        }
+        return filesToInclude;
+    }
 
     var assign;
     var pattern, replacement;
@@ -625,7 +645,7 @@
         });
         var pipeInUse = false;
         var pipeData = '';
-        config.files = yargs.argv._;
+        config.globs = yargs.argv._;
         config.pipedData = null;
         config.showHelp = yargs.showHelp;
         config.pattern = pattern;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rexreplace",
-  "version": "7.0.7",
+  "version": "7.1.1",
   "description": "Smoothly search & replace in files from CLI.",
   "author": "Mathias Rangel Wulff",
   "funding": {
@@ -23,14 +23,14 @@
     "build": "yarn build-only",
     "build-only": "tsc src/cli --outDir bin/ES6 -t ES6 && rollup -c",
     "build-minify": "yarn build && yarn minify",
-    "minify": "echo '#!/usr/bin/env node' > bin/rexreplace.cli.min.js && google-closure-compiler --js=bin/rexreplace.cli.js --js_output_file=bin/rexreplace.cli.min.js",
+    "minify": "echo '#!/usr/bin/env node' > bin/rexreplace.cli.min.js && npx google-closure-compiler --js=bin/rexreplace.cli.js >> bin/rexreplace.cli.min.js",
     "prebuild": "rm -fr bin && yarn format",
     "test-js": "echo todo: async mocha",
     "test-minify": "yarn build-minify && yarn test-cli && yarn test-js",
     "test-cli": "npm uninstall -g rexreplace && npm -g install ./ && yarn test-cli-only",
     "test-cli-only": "bash test/cli/run.sh",
     "test-speed": "bash test/speed/run.sh",
-    "prepublishOnly": "yarn is-git-clean && git rebase origin && yarn test-minify && yarn load-options && yarn bump",
+    "prepublishOnly": "yarn is-git-clean && git fetch && git rebase origin/main && yarn test-minify && yarn load-options && yarn bump",
     "postpublish": "git push --tag && git push && (open https://github.com/mathiasrw/rexreplace/releases || 1)",
     "load-options": "rr -h | rr 'Options:(.+)Examples:' _ -ms | rr '\\n {26,}|\\n\\n *' ' ' | rr \"'\" '`'  | rr '^  (-.+?), (--[^ ]+) *' '`€1` | **`€2`** ' | rr '(^---- . ----).+?(## Good to know)' '€1 + nl + pipe + nl + nl + €2' readme.md -jsT",
     "test-format": "yarn prettier --list-different || (echo 'Please correct file formatting using `yarn format` and try again.' && exit 1)",
@@ -53,30 +53,31 @@
     "@rollup/plugin-commonjs": "20.0.0",
     "@rollup/plugin-node-resolve": "13.0.6",
     "@rollup/plugin-replace": "3.0.0",
-    "@types/node": "16.11.4",
+    "@types/node": "20.4.5",
     "assert": "^2.0.0",
-    "google-closure-compiler": "^20211006.0.0",
-    "magic-string": "^0.25.7",
-    "mocha": "9.1.3",
-    "prettier": "2.4.1",
+    "magic-string": "0.30.1",
+    "mocha": "10.2.0",
+    "prettier": "3.0.0",
     "rollup": "2.58.0",
     "rollup-plugin-closure-compiler-js": "^1.0.6",
     "rollup-plugin-filesize": "9.1.1",
     "rollup-plugin-hashbang": "2.2.2",
     "rollup-plugin-preserve-shebang": "1.0.1",
     "rollup-plugin-progress": "1.1.2",
     "rollup-plugin-typescript3": "1.1.3",
-    "typescript": "4.4.4",
+    "typescript": "5.1.6",
     "version-bump-prompt": "6.1.0",
-    "yarn": "1.22.17"
+    "yarn": "1.22.19"
   },
   "resolutions": {
-    "ansi-regex": "^5.0.1"
+    "ansi-regex": "^5.0.1",
+	"tough-cookie": "^4.1.3"
   },
   "directories": {
     "test": "test"
   },
   "dependencies": {
+    "ansi-regex": "6.0.1",
     "globs": "0.1.4",
     "yargs": "16.2.0"
   },

src/cli.ts

@@ -311,7 +311,7 @@ function unescapeString(str = '') {
 
 	let pipeInUse = false;
 	let pipeData = '';
-	config.files = yargs.argv._;
+	config.globs = yargs.argv._;
 	config.pipedData = null;
 	config.showHelp = yargs.showHelp;
 	config.pattern = pattern;

src/engine.ts

@@ -30,7 +30,7 @@ export function engine(config: any = {engine: 'V8'}) {
 		return doReplacement('Piped data', config, config.pipedData);
 	}
 
-	config.files = globs.sync(config.files);
+	config.files = globs2paths(config.globs);
 
 	if (!config.files.length) {
 		return error(config.files.length + ' files found');
@@ -95,7 +95,7 @@ export function engine(config: any = {engine: 'V8'}) {
 		}
 
 		// Release the memory while storing files
-		_data_rr = undefined;
+		_data_rr = '';
 
 		debug('Write new content to: ' + _file_rr);
 
@@ -155,7 +155,7 @@ export function engine(config: any = {engine: 'V8'}) {
 	function handlePipedData(config) {
 		step('Check Piped Data');
 
-		if (config.files.length) {
+		if (config.globs.length) {
 			if (!config.replacementJs) {
 				chat('Piped data never used.');
 			}
@@ -260,7 +260,7 @@ export function engine(config: any = {engine: 'V8'}) {
 			pattern = pattern.replace(/[-\[\]{}()*+?.,\/\\^$|#\s]/g, '\\$&');
 		}
 
-		let regex = null;
+		let regex;
 
 		let flags = getFlags(config);
 
@@ -629,3 +629,25 @@ function replacePlaceholders(str = '', conf: any) {
 
 	return str;
 }
+
+function globs2paths(_globs: string[] = []) {
+	const globsToInclude: string[] = [];
+	const globsToExclude: string[] = [];
+
+	_globs.filter(Boolean).forEach((glob) => {
+		if ('!' === glob[0] || '^' === glob[0]) {
+			globsToExclude.push(glob.slice(1));
+		} else {
+			globsToInclude.push(glob);
+		}
+	});
+
+	let filesToInclude = globs.sync(globsToInclude);
+
+	if (globsToExclude.length) {
+		const filesToExclude = globs.sync(globsToExclude);
+		return filesToInclude.filter((el) => !filesToExclude.includes(el));
+	}
+
+	return filesToInclude;
+}