find-cli 1.6.2 → 1.6.3

package/bin/action/find.js

@@ -17,8 +17,6 @@ function findAction(string, dryRun, format, quietly, interactive) {
         ],
         rule = null,
         lines = [],
-        anchored = false,
-        directory = false,
         linesTotal = 0,
         filesTotal = 0,
         directoriesTotal = 0,
@@ -31,8 +29,6 @@ function findAction(string, dryRun, format, quietly, interactive) {
           interactive,
           rule,
           lines,
-          anchored,
-          directory,
           linesTotal,
           filesTotal,
           directoriesTotal,

package/bin/isIgnored/asynchronous.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const rulePromptOperation = require("../operation/prompt/rule"),
+const pathRulePromptOperation = require("../operation/prompt/pathRule"),
       updatePathRulesOperation = require("../operation/updatePatRules"),
       ignoreOrPermitPathPromptOperation = require("../operation/prompt/ignoreOrPermitPath");
 
@@ -33,31 +33,25 @@ module.exports = {
 function asynchronousIsPathIgnored(path, directory, context, callback) {
   const operations = [
           ignoreOrPermitPathPromptOperation,
-          rulePromptOperation,
+          pathRulePromptOperation,
           updatePathRulesOperation
         ],
-        rule = null,
-        dryRun = false,
-        anchored = true,
-        interactive = true,
+        pathRule = null,
         pathIgnored = null;
 
   Object.assign(context, {
     path,
     directory,
-    rule,
-    dryRun,
-    anchored,
-    interactive,
+    pathRule,
     pathIgnored
   });
 
   executeOperations(operations, (completed) => {
     const { pathIgnored } = context;
 
-    delete context.rule;
     delete context.path;
     delete context.directory;
+    delete context.pathRule;
     delete context.pathIgnored;
 
     callback(pathIgnored);

package/bin/operation/find.js

@@ -19,7 +19,11 @@ function findOperation(proceed, abort, context) {
         synchronous = findInEntries(entryPaths, (pathIgnored) => {
           if (pathIgnored === null) {
             abort();
+
+            return;
           }
+
+          proceed();
         }, context);
 
   if (synchronous) {

package/bin/operation/prompt/pathRule.js

@@ -0,0 +1,51 @@
+"use strict";
+
+const { shellUtilities } = require("necessary");
+
+const { validateGlobStringOrPattern } = require("../../utilities/validate"),
+      { GLOB_STRING_OR_REGEX_DESCRIPTION } = require("../../descriptions"),
+      { ruleFromStringAnchoredAndDirectory } = require("../../utilities/rule"),
+      { INVALID_GLOB_REGEX_OR_STRING_MESSAGE } = require("../../messages");
+
+const { prompt } = shellUtilities;
+
+function pathRulePromptOperation(proceed, abort, context) {
+  const { path, directory } = context,
+        anchored = true,
+        description = GLOB_STRING_OR_REGEX_DESCRIPTION,
+        errorMessage = INVALID_GLOB_REGEX_OR_STRING_MESSAGE,
+        initialAnswer = path,  ///
+        validationFunction = (answer) => {
+          const valid = validateGlobStringOrPattern(answer, anchored, directory);
+
+          return valid;
+        },
+        options = {
+          description,
+          errorMessage,
+          initialAnswer,
+          validationFunction
+        };
+
+  prompt(options, (answer) => {
+    const valid = (answer !== null);
+
+    if(!valid) {
+      abort();
+
+      return;
+    }
+
+    const string = answer,  ///
+          rule = ruleFromStringAnchoredAndDirectory(string, anchored, directory),
+          pathRule = rule;  ///
+
+    Object.assign(context, {
+      pathRule
+    });
+
+    proceed();
+  });
+}
+
+module.exports = pathRulePromptOperation;

package/bin/operation/rule.js

@@ -19,7 +19,9 @@ function ruleOperation(proceed, abort, context) {
     return;
   }
 
-  const { string, anchored, directory } = context,
+  const { string } = context,
+        anchored = true,
+        directory = false,
         rule = ruleFromStringAnchoredAndDirectory(string, anchored, directory);
 
   if (rule === null) {

package/bin/operation/updatePatRules.js

@@ -6,28 +6,28 @@ const { updateIgnoredFilePathRules,
         updatePermittedDirectoryPathRules } = require("../configuration");
 
 function updatePathRulesOperation(proceed, abort, context) {
-  const { rule, directory, pathIgnored } = context;
+  const { pathRule, directory, pathIgnored } = context;
 
   pathIgnored ?
-    addIgnoreRule(rule, directory, context) :
-      addPermitRule(rule, directory, context);
+    addIgnoreRule(pathRule, directory, context) :
+      addPermitRule(pathRule, directory, context);
 
   proceed();
 }
 
 module.exports = updatePathRulesOperation;
 
-function addIgnoreRule(rule, directory, context) {
+function addIgnoreRule(pathRule, directory, context) {
   if (directory) {
     const { ignoredDirectoryPathRules } = context,
-          ignoredDirectoryPathRule = rule;  ///
+          ignoredDirectoryPathRule = pathRule;  ///
 
     ignoredDirectoryPathRules.push(ignoredDirectoryPathRule);
 
     updateIgnoredDirectoryPathRules(ignoredDirectoryPathRules);
   } else {
     const { ignoredFilePathRules } = context,
-          ignoredFilePathRule = rule;  ///
+          ignoredFilePathRule = pathRule;  ///
 
     ignoredFilePathRules.push(ignoredFilePathRule);
 
@@ -35,17 +35,17 @@ function addIgnoreRule(rule, directory, context) {
   }
 }
 
-function addPermitRule(rule, directory, context) {
+function addPermitRule(pathRule, directory, context) {
   if (directory) {
     const { permittedDirectoryPathRules } = context,
-          permittedDirectoryPathRule = rule;  ///
+          permittedDirectoryPathRule = pathRule;  ///
 
     permittedDirectoryPathRules.push(permittedDirectoryPathRule);
 
     updatePermittedDirectoryPathRules(permittedDirectoryPathRules);
   } else {
     const { permittedFilePathRules } = context,
-          permittedFilePathRule = rule;  ///
+          permittedFilePathRule = pathRule;  ///
 
     permittedFilePathRules.push(permittedFilePathRule);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "find-cli",
   "author": "James Smith",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/find-cli",
   "description": "An alternative to grep.",