fscr 6.2.2 → 6.2.6

package/dist/index.js

@@ -92,32 +92,49 @@ const runCmd = async (app, argsList = []) => {
       script,
       lang
     } = taskData;
-    let pars = script.split(" ");
-    let type = pars[0];
-    let env = {};
-    if (pars[0].includes("=")) {
-      let envs = type.split("=");
-      env[envs[0]] = envs[1];
-      type = pars[1];
-      pars.shift();
-      pars.shift();
-      script = pars.join(" ");
+    if (lang === "javascript") {
+      // For JavaScript, use the script as-is without parsing
+      await runCLICommand({
+        task: {
+          name: task
+        },
+        script: {
+          lang: lang,
+          env: {},
+          type: "node",
+          full: script,
+          rest: []
+        }
+      });
     } else {
-      pars.shift();
-      script = pars.join(" ");
-    }
-    await runCLICommand({
-      task: {
-        name: task
-      },
-      script: {
-        lang: lang,
-        env: env,
-        type: type,
-        full: script,
-        rest: script.split(" ")
+      // For bash scripts, parse command and environment variables
+      let pars = script.split(" ");
+      let type = pars[0];
+      let env = {};
+      if (pars[0].includes("=")) {
+        let envs = type.split("=");
+        env[envs[0]] = envs[1];
+        type = pars[1];
+        pars.shift();
+        pars.shift();
+        script = pars.join(" ");
+      } else {
+        pars.shift();
+        script = pars.join(" ");
       }
-    });
+      await runCLICommand({
+        task: {
+          name: task
+        },
+        script: {
+          lang: lang,
+          env: env,
+          type: type,
+          full: script,
+          rest: script.split(" ")
+        }
+      });
+    }
   }).example(`${taskName("$0 run start:web")}`, `${textDescription("Run task 'start:web'")}`)
 
   /**
@@ -133,7 +150,8 @@ const runCmd = async (app, argsList = []) => {
    * bump --
    */.command("bump", "Bump package.json and beautify it!", () => {}, async function (argv) {
     let type = argv.type;
-    await bump(type);
+    let skipGit = argv.skipGit;
+    await bump(type, skipGit === "true");
   }).example(`${taskName("$0 bump")}`, `${textDescription("BUMPED AND PRETTY!")}`)
 
   /**

package/dist/lib/git/pub.js

@@ -1,25 +1,11 @@
 import inquirer from "inquirer";
 import chalk from "chalk";
-import boxen from "boxen";
 import path from "path";
 import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-import runTask from "./taskRunner.js";
 import { readJson } from "../utils/helpers.js";
 import simple from "simple-git";
-// pub();
-const newBranch = async name => {
-  await simple().checkoutLocalBranch(name);
-};
-async function pub() {
-  // runTask("sh " + path.join(__dirname, "publish.sh") + " --")
-  // .then(async () => {
-  // })
-  // .catch(e => {
-  //     console.warn("-- Console ERR", e);
-  // });
-}
 import validateNotInDev from "./validateNotDev.js";
 (async () => {
   await validateNotInDev();

package/dist/lib/release/bump.js

@@ -11,7 +11,7 @@ if (!fs.existsSync(packagePath)) {
   console.error("Cannot find package.json file in the current directory");
   process.exit(1);
 }
-const bump = async (typeParam = null) => {
+const bump = async (typeParam = null, skipGit = false) => {
   let type = "patch";
   if (!typeParam) {
     type = await prompt({
@@ -22,11 +22,14 @@ const bump = async (typeParam = null) => {
   } else {
     type = typeParam;
   }
-  let gitTag = await prompt({
-    type: "confirm",
-    message: chalk.green.bold.underline("Add git tag?"),
-    default: false
-  });
+  let gitTag = false;
+  if (!skipGit) {
+    gitTag = await prompt({
+      type: "confirm",
+      message: chalk.green.bold.underline("Add git tag?"),
+      default: false
+    });
+  }
   await runAsync(`yarn version --${type} ${gitTag ? "--no-git-tag-version" : ""} --no-commit-hooks`);
   const packageJson = await fs.readFileSync(packagePath);
   const {

package/dist/lib/running/runParallel.js

@@ -12,33 +12,51 @@ const runParallel = async (tasks, FcScripts) => {
           script,
           lang
         } = taskData;
-        let pars = script.split(" ");
-        let type = pars[0];
-        let env = {};
-        if (pars[0].includes("=")) {
-          let envs = type.split("=");
-          env[envs[0]] = envs[1];
-          type = pars[1];
-          pars.shift();
-          pars.shift();
-          script = pars.join(" ");
+        if (lang === "javascript") {
+          // For JavaScript, use the script as-is without parsing
+          await runCLICommand({
+            task: {
+              name: taskName
+            },
+            script: {
+              lang: lang,
+              env: {},
+              type: "node",
+              full: script,
+              rest: []
+            }
+          });
+          resolve();
         } else {
-          pars.shift();
-          script = pars.join(" ");
-        }
-        await runCLICommand({
-          task: {
-            name: taskName
-          },
-          script: {
-            lang: lang,
-            env: env,
-            type: type,
-            full: script,
-            rest: script.split(" ")
+          // For bash scripts, parse command and environment variables
+          let pars = script.split(" ");
+          let type = pars[0];
+          let env = {};
+          if (pars[0].includes("=")) {
+            let envs = type.split("=");
+            env[envs[0]] = envs[1];
+            type = pars[1];
+            pars.shift();
+            pars.shift();
+            script = pars.join(" ");
+          } else {
+            pars.shift();
+            script = pars.join(" ");
           }
-        });
-        resolve();
+          await runCLICommand({
+            task: {
+              name: taskName
+            },
+            script: {
+              lang: lang,
+              env: env,
+              type: type,
+              full: script,
+              rest: script.split(" ")
+            }
+          });
+          resolve();
+        }
       }
     });
   });

package/dist/lib/running/runSequence.js

@@ -11,32 +11,49 @@ const runSequence = async (tasks, FcScripts) => {
         script,
         lang
       } = taskData;
-      let pars = script.split(" ");
-      let type = pars[0];
-      let env = {};
-      if (pars[0].includes("=")) {
-        let envs = type.split("=");
-        env[envs[0]] = envs[1];
-        type = pars[1];
-        pars.shift();
-        pars.shift();
-        script = pars.join(" ");
+      if (lang === "javascript") {
+        // For JavaScript, use the script as-is without parsing
+        await runCLICommand({
+          task: {
+            name: taskName
+          },
+          script: {
+            lang: lang,
+            env: {},
+            type: "node",
+            full: script,
+            rest: []
+          }
+        });
       } else {
-        pars.shift();
-        script = pars.join(" ");
-      }
-      await runCLICommand({
-        task: {
-          name: taskName
-        },
-        script: {
-          lang: lang,
-          env: env,
-          type: type,
-          full: script,
-          rest: script.split(" ")
+        // For bash scripts, parse command and environment variables
+        let pars = script.split(" ");
+        let type = pars[0];
+        let env = {};
+        if (pars[0].includes("=")) {
+          let envs = type.split("=");
+          env[envs[0]] = envs[1];
+          type = pars[1];
+          pars.shift();
+          pars.shift();
+          script = pars.join(" ");
+        } else {
+          pars.shift();
+          script = pars.join(" ");
         }
-      });
+        await runCLICommand({
+          task: {
+            name: taskName
+          },
+          script: {
+            lang: lang,
+            env: env,
+            type: type,
+            full: script,
+            rest: script.split(" ")
+          }
+        });
+      }
     }
   }
 };

package/dist/lib/taskList.js

@@ -2,6 +2,7 @@ import inquirer from "inquirer";
 const separator = "   ~   ";
 import termSize from "term-size";
 import chalk from "chalk";
+import { clear } from "./utils/index.js";
 const convertBold = e => {
   let reg = /(\*\*|^\*\*)(?=\S)([\s\S]*?\S)\*\*(?![\*\*\S])/g;
   let boldMatches = e.match(reg);
@@ -26,68 +27,75 @@ const convertBoldArray = arr => {
 };
 const taskList = async (FcScripts, recentTasks) => {
   return new Promise(resolve => {
-    let choiceCategories = [...recentTasks.map(cat => {
-      return {
-        name: `${chalk.bold.underline.green(cat)}`,
-        value: {
-          type: "task",
-          name: cat
-        }
-      };
-    }), {
-      name: "-------------",
-      value: null
-    }, ...FcScripts.categories.map(cat => {
-      return {
-        name: `${chalk.bold.underline.green(cat.name)} ${separator} ${convertBold(cat.description)}`,
-        value: {
-          type: "category",
-          name: cat.name
-        }
-      };
-    })];
-    const {
-      rows
-    } = termSize();
-    //=> {columns: 143, rows: 24}
-    inquirer.prompt([{
-      type: "list",
-      name: "category",
-      message: "What category do you want to run?",
-      pageSize: rows - 1,
-      choices: choiceCategories
-    }]).then(({
-      category
-    }) => {
-      let sepInd = choiceCategories.indexOf("-------------");
-      let chosenInd = choiceCategories.indexOf(category);
-      if (category === null) {
-        console.log("Can't select divider");
-      } else if (category.type === "task") {
-        let taskToRun = category.name.split(separator)[0].trim();
-        resolve(taskToRun);
-      } else {
-        let categoryName = category.name.split(separator)[0];
-        let catObj = FcScripts.categories.findIndex(e => e.name === category.name);
-        catObj = FcScripts.categories[catObj];
-        let taskNames = Object.keys(catObj.tasks).map(taskName => {
-          let task = catObj.tasks[taskName];
-          return `${taskName} ${task.description ? separator + task.description.replace(/\n/g, " ").trim() : ""}`;
-        });
-        taskNames = convertBoldArray(taskNames);
-        inquirer.prompt([{
-          type: "list",
-          name: "taskToRun",
-          message: "Which task do you want to run",
-          choices: taskNames
-        }]).then(({
-          taskToRun
-        }) => {
-          taskToRun = taskToRun.split(separator)[0].trim();
+    const promptUser = () => {
+      let choiceCategories = [...recentTasks.map(cat => {
+        return {
+          name: `${chalk.bold.underline.green(cat)}`,
+          value: {
+            type: "task",
+            name: cat
+          }
+        };
+      }), {
+        name: "-------------",
+        value: null
+      }, ...FcScripts.categories.map(cat => {
+        return {
+          name: `${chalk.bold.underline.green(cat.name)} ${separator} ${convertBold(cat.description)}`,
+          value: {
+            type: "category",
+            name: cat.name
+          }
+        };
+      })];
+      const {
+        rows
+      } = termSize();
+      //=> {columns: 143, rows: 24}
+      inquirer.prompt([{
+        type: "list",
+        name: "category",
+        message: "What category do you want to run?",
+        pageSize: rows - 1,
+        choices: choiceCategories
+      }]).then(({
+        category
+      }) => {
+        let sepInd = choiceCategories.indexOf("-------------");
+        let chosenInd = choiceCategories.indexOf(category);
+        if (category === null) {
+          // Ignore divider selection and prompt again
+          clear();
+          promptUser();
+        } else if (category.type === "task") {
+          let taskToRun = category.name.split(separator)[0].trim();
           resolve(taskToRun);
-        });
-      }
-    });
+        } else {
+          let categoryName = category.name.split(separator)[0];
+          let catObj = FcScripts.categories.findIndex(e => e.name === category.name);
+          catObj = FcScripts.categories[catObj];
+          let taskNames = Object.keys(catObj.tasks).map(taskName => {
+            let task = catObj.tasks[taskName];
+            return `${taskName} ${task.description ? separator + task.description.replace(/\n/g, " ").trim() : ""}`;
+          });
+          taskNames = convertBoldArray(taskNames);
+          inquirer.prompt([{
+            type: "list",
+            name: "taskToRun",
+            message: "Which task do you want to run",
+            choices: taskNames
+          }]).then(({
+            taskToRun
+          }) => {
+            taskToRun = taskToRun.split(separator)[0].trim();
+            resolve(taskToRun);
+          });
+        }
+      });
+    };
+
+    // Start the prompt
+    promptUser();
   });
 };
 export default taskList;

package/dist/lib/test-files/consoleSample.js

@@ -0,0 +1,13 @@
+import chalk from "chalk";
+import yargs from "yargs";
+const argv = yargs(process.argv.slice(2)).argv;
+(async function () {
+  console.log(`${chalk.green("PRE --- TEST 52")} ${process.argv.slice(2)} ${JSON.stringify(argv)}`);
+  await new Promise(resolve => {
+    setTimeout(() => {
+      console.log(`${chalk.green("ATTT --- TEST 52")}`);
+      resolve();
+    }, 3500);
+  });
+  console.log(`${chalk.green("POST --- TEST 52")}`);
+})();

package/dist/lib/test-files/inputSample.js

@@ -0,0 +1,17 @@
+import chalk from "chalk";
+import inquirer from "inquirer";
+(async function () {
+  console.log(`${chalk.green("PRE INPUT")}\n`);
+  inquirer.prompt([{
+    type: "list",
+    name: "category",
+    message: "What category do you want to run?",
+    choices: [1, 2, 3, 4, 5]
+  }]).then(({
+    category
+  }) => {
+    console.log(`${chalk.green("CHOSEN ", category)}`);
+  });
+  console.log(`${chalk.green("POST INPUT")}`);
+  console.log("NODEENV", process.env.INPUT);
+})();

package/dist/lib/test-files/testConsole.js

@@ -0,0 +1 @@
+console.log("TEST CONSOLE OUTPUT");

package/dist/lib/test-files/testInput.js

@@ -0,0 +1,2 @@
+const input = process.env.INPUT || 'default';
+console.log(`INPUT: ${input}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fscr",
-    "version": "6.2.2",
+    "version": "6.2.6",
     "description": "Runs the fscripts.md file",
     "type": "module",
     "main": "./dist/index.js",
@@ -10,7 +10,8 @@
         "build:index": "babel index.js --ignore 'node_modules' --out-file dist/index.js",
         "build:lib": "babel lib --ignore 'node_modules' --out-dir dist/lib --copy-files",
         "fsr": "node dist/index.js",
-        "release": "run-s release:bump release:clean release:build",
+        "release": "run-s release:test release:bump release:clean release:build",
+        "release:test": "vitest run",
         "release:build": "run-p build:index build:lib",
         "release:bump": "yarn fsr bump",
         "release:clean": "rimraf dist",
@@ -21,6 +22,9 @@
         "start:build": "babel-node index.js --ignore 'node_modules'",
         "start:run": "node dist/index.js",
         "start:watch": "nodemon --watch lib --watch index.js --ext js --exec babel-node index.js --ignore 'node_modules' -I",
+        "test": "vitest run",
+        "test:watch": "vitest",
+        "test:ui": "vitest --ui",
         "docs": "npx cli-docs-generator --cli=./bin",
         "test1": "echo 'yolo' && sleep 2 && echo 1",
         "test2": "echo '2yolo' && sleep 2 && echo 22"
@@ -64,9 +68,8 @@
         "git-release-notes": "^5.0.0",
         "git-state": "^4.1.0",
         "github-basic": "^6.0.0",
-        "ink": "^6.3.1",
-        "ink-box": "^2.0.0",
-        "ink-select-input": "^6.2.0",
+        "ink": "^5.2.1",
+        "ink-select-input": "^4.2.2",
         "inquirer": "^12.9.6",
         "is-builtin-module": "^5.0.0",
         "json-colorz": "^0.2.7",
@@ -77,7 +80,7 @@
         "moment-mini": "^2.24.0",
         "open": "^10.2.0",
         "pretty-ms": "^9.3.0",
-        "react": "^19.2.0",
+        "react": "^18.3.1",
         "require-from-string": "^2.0.2",
         "server-destroy": "^1.0.1",
         "set-value": "^4.1.0",
@@ -98,6 +101,7 @@
         "@babel/preset-env": "^7.9.0",
         "@babel/preset-react": "^7.9.1",
         "babel-plugin-module-resolver": "^5.0.2",
+        "execa": "8.0.1",
         "fancy-log": "^2.0.0",
         "fkill-cli": "^8.0.0",
         "ink-tab": "^5.2.0",
@@ -114,8 +118,10 @@
         "remarkable": "^2.0.0",
         "rexrex": "^1.3.0",
         "rimraf": "^6.0.1",
+        "strip-ansi": "^7.1.2",
         "terminal-tree": "^0.0.3",
         "underscore.string": "^3.3.5",
+        "vitest": "^3.2.4",
         "yargs": "^18.0.0"
     },
     "peerDependencies": {

package/dist/lib/codemod/arrow.js

@@ -1,13 +0,0 @@
-let bbt = $("<div id='btt'>DOWNLOAD LINKS</div>");
-$("body").append(`<style>#btt { position:fixed; z-index:8999999; bottom:0;left:0; background:rgba(0,0,0,0.6); padding:10px; color:white;}</style>`);
-bbt.on("click", function () {
-  let linkszz = $(".c-dl-links a");
-  let dwlinks = [];
-  linkszz.each(function () {
-    if ($(this).attr("href").startsWith("https://rapidga")) {
-      dwlinks.push($(this).attr("href"));
-    }
-  });
-  window.navigator.clipboard.writeText(JSON.stringify(dwlinks));
-});
-$("body").append(bbt);

package/dist/lib/codemod/arrow2.js

@@ -1,67 +0,0 @@
-module.exports = (file, api, options) => {
-  const j = api.jscodeshift;
-  const printOptions = options.printOptions || {
-    quote: 'single'
-  };
-  const root = j(file.source);
-  const ARGUMENTS = 'arguments';
-  const ARGS = 'args';
-  const createArrowFunctionExpression = (fn, args) => j.arrowFunctionExpression((fn.params || []).concat(j.restElement(args)), fn.body, fn.generator);
-  const filterMemberExpressions = path => path.parent.value.type !== "MemberExpression";
-  const filterArrowFunctions = path => {
-    while (path.parent) {
-      switch (path.value.type) {
-        case 'ArrowFunctionExpression':
-          if (j(path).find(j.Identifier, {
-            name: ARGS
-          }).size()) {
-            console.error(file.path + ': arrow function uses "' + ARGS + '" already. ' + 'Please rename this identifier first.');
-            return false;
-          }
-          return true;
-        case 'FunctionExpression':
-        case 'MethodDeclaration':
-        case 'Function':
-        case 'FunctionDeclaration':
-          return false;
-        default:
-          break;
-      }
-      path = path.parent;
-    }
-    return false;
-  };
-  const updateArgumentsCalls = path => {
-    var afPath = path;
-    while (afPath.parent) {
-      if (afPath.value.type == 'ArrowFunctionExpression') {
-        break;
-      }
-      afPath = afPath.parent;
-    }
-    const {
-      value: fn
-    } = afPath;
-    const {
-      params
-    } = fn;
-    const param = params[params.length - 1];
-    var args;
-    if (param && param.type == 'RestElement') {
-      params.pop();
-      args = param.argument;
-    } else {
-      args = j.identifier(ARGS);
-    }
-    j(afPath).replaceWith(createArrowFunctionExpression(fn, args));
-    if (params.length) {
-      j(path).replaceWith(j.arrayExpression(params.concat(j.spreadElement(args))));
-    } else {
-      j(path).replaceWith(args);
-    }
-  };
-  const didTransform = root.find(j.Identifier, {
-    name: ARGUMENTS
-  }).filter(filterMemberExpressions).filter(filterArrowFunctions).forEach(updateArgumentsCalls).size() > 0;
-  return didTransform ? root.toSource(printOptions) : null;
-};

package/dist/lib/codemod/funcs.js

@@ -1,25 +0,0 @@
-export default (fileInfo, api) => {
-  const j = api.jscodeshift;
-  return j(fileInfo.source).find(j.FunctionExpression).forEach(path => {
-    console.warn("-- Console oa", path.value);
-  }).toSource();
-  // return j(fileInfo.source)
-  //     .find(j.CallExpression, {
-  //         callee: {
-  //             type: "MemberExpression",
-  //             object: { type: "Identifier", name: "function" }
-  //         }
-  //     })
-  //     .remove()
-  //     .toSource();
-  // return api
-  //     .jscodeshift(fileInfo.source)
-  //     .find(j.CallExpression, {
-  //         callee: {
-  //             type: "MemberExpression",
-  //             object: { type: "Identifier", name: "function" }
-  //         }
-  //     })
-  //     .renameTo("zebra")
-  //     .toSource();
-};

package/dist/lib/codemod/removeConsole.js

@@ -1,12 +0,0 @@
-export default (fileInfo, api) => {
-  const j = api.jscodeshift;
-  return j(fileInfo.source).find(j.CallExpression, {
-    callee: {
-      type: "MemberExpression",
-      object: {
-        type: "Identifier",
-        name: "console"
-      }
-    }
-  }).remove().toSource();
-};