fscr 6.2.6 → 7.3.0

package/dist/lib/utils/helpers.js

@@ -1,6 +1,8 @@
+import fsOg from "fs";
 import fs from "fs-extra";
 import chalk from "chalk";
 import boxen from "boxen";
+
 const ONE_SIXTH = 1 / 6;
 const ONE_THIRD = 1 / 3;
 const TWO_THIRDS = 2 / 3;
@@ -15,30 +17,24 @@ const utils = {};
  removeFile(file);
  */
 utils.emptyDir = async f => {
-  try {
-    await fs.emptyDir(f);
-    // console.log(`${chalk.green.underline("Directory")} ${chalk.bold(f)} emptied!`);
-  } catch (err) {
-    console.error(err);
-  }
+    try {
+        await fs.emptyDir(f);
+        // console.log(`${chalk.green.underline("Directory")} ${chalk.bold(f)} emptied!`);
+    } catch (err) {
+        console.error(err);
+    }
 };
+
 const desiredMode = 0o2775;
 const defaultOptions = {
-  mode: desiredMode
+    mode: desiredMode
 };
 utils.ensureDir = async (directory, options = defaultOptions) => {
-  try {
-    await fs.ensureDir(directory, options);
-  } catch (err) {
-    console.error(err);
-  }
+    return await fsOg.existsSync(directory);
 };
+
 utils.ensureFile = async f => {
-  try {
-    await fs.ensureFile(f);
-  } catch (err) {
-    console.error(err);
-  }
+    return await fsOg.existsSync(f);
 };
 
 /**
@@ -50,8 +46,7 @@ utils.ensureFile = async f => {
  pathExists(file);
  */
 utils.pathExists = async f => {
-  const exists = await fs.pathExists(f);
-  return exists;
+    return await fsOs.existsSync(f);
 };
 
 /**
@@ -63,32 +58,34 @@ utils.pathExists = async f => {
  outputJson(file);
  */
 utils.readJson = async f => {
-  try {
-    const packageObj = await fs.readJson(f);
-    // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} read!`);
-    return packageObj;
-  } catch (err) {
-    console.error(err);
-    return {};
-  }
+    try {
+        const packageObj = await fs.readJson(f);
+        // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} read!`);
+        return packageObj;
+    } catch (err) {
+        console.error(err);
+        return {};
+    }
 };
+
 utils.readFile = async f => {
-  try {
-    let fl = await fs.readFileSync(f, "utf8");
-    return fl;
-  } catch (err) {
-    console.error(err);
-    return {};
-  }
+    try {
+        let fl = await fs.readFileSync(f, "utf8");
+        return fl;
+    } catch (err) {
+        console.error(err);
+        return {};
+    }
 };
+
 utils.removeFile = async f => {
-  try {
-    // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} removed!`);
-    return await fs.remove(f);
-  } catch (err) {
-    console.error(`File ${f} NOT REMOVED! ${err}`);
-    return false;
-  }
+    try {
+        // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} removed!`);
+        return await fs.remove(f);
+    } catch (err) {
+        console.error(`File ${f} NOT REMOVED! ${err}`);
+        return false;
+    }
 };
 
 /**
@@ -101,90 +98,104 @@ utils.removeFile = async f => {
  writeFile(file);
  */
 utils.writeFile = async (f, contents = "") => {
-  try {
-    return fs.writeFileSync(f, contents, "utf-8");
-    // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} written!`);
-  } catch (err) {
-    console.error(err);
-  }
+    try {
+        return fs.writeFileSync(f, contents, "utf-8");
+        // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} written!`);
+    } catch (err) {
+        console.error(err);
+    }
 };
+
 utils.writeJson = async (f, json = {}) => {
-  try {
-    await fs.writeJson(f, json);
-    // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} written!`);
-  } catch (err) {
-    console.error(err);
-  }
+    try {
+        await fs.writeJson(f, json);
+        // console.log(`${chalk.green.underline("File")} ${chalk.bold(f)} written!`);
+    } catch (err) {
+        console.error(err);
+    }
 };
+
 utils.chainAsync = fns => {
-  let curr = 0;
-  const last = fns[fns.length - 1];
-  const next = () => {
-    const fn = fns[curr++];
-    fn === last ? fn() : fn(next);
-  };
-  next();
+    let curr = 0;
+    const last = fns[fns.length - 1];
+    const next = () => {
+        const fn = fns[curr++];
+        fn === last ? fn() : fn(next);
+    };
+    next();
 };
+
 utils.appendToFile = async (f, contents = "") => {
-  try {
-    await fs.appendFileSync(f, contents);
-  } catch (err) {
-    console.error(err);
-  }
-};
-utils.boxInform = async (msg, secondary = "", padding = 0, margin = {
-  left: 2,
-  top: 0,
-  bottom: 0,
-  right: 0
-}) => {
-  console.log(boxen(chalk.hex("#717877")(msg) + "\n" + chalk.bold.underline.hex("#438b34")(secondary) + chalk.hex("#717877")(" "), {
-    padding,
-    margin,
-    borderStyle: {
-      topLeft: chalk.hex("#5a596d")("╔"),
-      topRight: chalk.hex("#5a596d")("╗"),
-      bottomLeft: chalk.hex("#5a596d")("╚"),
-      bottomRight: chalk.hex("#5a596d")("╝"),
-      horizontal: chalk.hex("#5a596d")("═"),
-      vertical: chalk.hex("#5a596d")("║")
-    },
-    //"round",
-    align: "center" //,
-  }));
+    try {
+        await fs.appendFileSync(f, contents);
+    } catch (err) {
+        console.error(err);
+    }
 };
+
+utils.boxInform = async (
+    msg,
+    secondary = "",
+    padding = 0,
+    margin = {left: 2, top: 0, bottom: 0, right: 0}
+) => {
+    console.log(
+        boxen(
+            chalk.hex("#717877")(msg) +
+            "\n" +
+            chalk.bold.underline.hex("#438b34")(secondary) +
+            chalk.hex("#717877")(" "),
+            {
+                padding,
+                margin,
+                borderStyle: {
+                    topLeft: chalk.hex("#5a596d")("╔"),
+                    topRight: chalk.hex("#5a596d")("╗"),
+                    bottomLeft: chalk.hex("#5a596d")("╚"),
+                    bottomRight: chalk.hex("#5a596d")("╝"),
+                    horizontal: chalk.hex("#5a596d")("═"),
+                    vertical: chalk.hex("#5a596d")("║")
+                }, //"round",
+                align: "center" //,
+            }
+        )
+    );
+};
+
 const hue2rgb = (p, q, t) => {
-  if (t < 0) {
-    t += 1;
-  }
-  if (t > 1) {
-    t -= 1;
-  }
-  if (t < ONE_SIXTH) {
-    return p + (q - p) * 6 * t;
-  }
-  if (t < 0.5) {
-    return q;
-  }
-  if (t < TWO_THIRDS) {
-    return p + (q - p) * (TWO_THIRDS - t) * 6;
-  }
-  return p;
+    if (t < 0) {
+        t += 1;
+    }
+    if (t > 1) {
+        t -= 1;
+    }
+    if (t < ONE_SIXTH) {
+        return p + (q - p) * 6 * t;
+    }
+    if (t < 0.5) {
+        return q;
+    }
+    if (t < TWO_THIRDS) {
+        return p + (q - p) * (TWO_THIRDS - t) * 6;
+    }
+    return p;
 };
+
 const hsl2rgb = (h, s, l) => {
-  if (s === 0) {
-    return new Array(3).fill(l);
-  }
-  const q = l < 0.5 ? l * s + l : l + s - l * s;
-  const p = 2 * l - q;
-  return [hue2rgb(p, q, h + ONE_THIRD), hue2rgb(p, q, h), hue2rgb(p, q, h - ONE_THIRD)];
+    if (s === 0) {
+        return new Array(3).fill(l);
+    }
+    const q = l < 0.5 ? l * s + l : l + s - l * s;
+    const p = 2 * l - q;
+    return [hue2rgb(p, q, h + ONE_THIRD), hue2rgb(p, q, h), hue2rgb(p, q, h - ONE_THIRD)];
 };
+
 utils.rainbowGradient = (len, saturation = 1, lightness = 0.5) => {
-  const gradient = [];
-  for (let x = 0; x < len; x++) {
-    gradient.push(hsl2rgb(x / len, saturation, lightness).map(c => Math.round(c * 255)));
-  }
-  return gradient;
+    const gradient = [];
+    for (let x = 0; x < len; x++) {
+        gradient.push(hsl2rgb(x / len, saturation, lightness).map(c => Math.round(c * 255)));
+    }
+    return gradient;
 };
 
 /**
@@ -192,37 +203,37 @@ utils.rainbowGradient = (len, saturation = 1, lightness = 0.5) => {
  * @type {Date}
  */
 utils.timestamp = () => {
-  // Create a date object with the current time
-  let now = new Date();
-
-  // Create an array with the current hour, minute and second
-  let time = [now.getHours(), now.getMinutes(), now.getSeconds()];
-  time = time.map(e => {
-    if (e < 10) {
-      return (e + "").padStart(2, "0");
-    } else {
-      return e;
-    }
-  });
-  // Return the formatted string
-  return time.join(":");
+    // Create a date object with the current time
+    let now = new Date();
+
+    // Create an array with the current hour, minute and second
+    let time = [now.getHours(), now.getMinutes(), now.getSeconds()];
+    time = time.map(e => {
+        if (e < 10) {
+            return (e + "").padStart(2, "0");
+        } else {
+            return e;
+        }
+    });
+    // Return the formatted string
+    return time.join(":");
 };
 
 // utils.emptyDir = async () => {};
 export default utils;
 export const {
-  emptyDir,
-  ensureDir,
-  ensureFile,
-  pathExists,
-  readJson,
-  readFile,
-  removeFile,
-  writeFile,
-  writeJson,
-  chainAsync,
-  appendToFile,
-  boxInform,
-  rainbowGradient,
-  timestamp
-} = utils;
+    emptyDir,
+    ensureDir,
+    ensureFile,
+    pathExists,
+    readJson,
+    readFile,
+    removeFile,
+    writeFile,
+    writeJson,
+    chainAsync,
+    appendToFile,
+    boxInform,
+    rainbowGradient,
+    timestamp
+} = utils;

package/dist/lib/utils/index.js

@@ -1,2 +1,2 @@
 export * from "./helpers.js";
-export { default as clear } from "./clear.js";
+export { default as clear } from "./clear.js";

package/dist/lib/utils/prompt.js

@@ -1,34 +1,29 @@
 import enquirerPkg from "enquirer";
-const {
-  prompt
-} = enquirerPkg;
+const { prompt } = enquirerPkg;
 import chalk from "chalk";
+
 const promptQuestion = async (extended = {}, message = `name it:`) => {
-  if (extended.type === "list") {
-    extended.type = "select";
-  }
-  if (extended.message) {
-    message = extended.message;
-  }
-  if (extended.choices && extended.choices[0].value) {
-    extended.choices = extended.choices.map(e => {
-      return {
-        message: e.name,
-        value: e.value
-      };
+    if (extended.type === "list") {
+        extended.type = "select";
+    }
+    if (extended.message) {
+        message = extended.message;
+    }
+    if (extended.choices && extended.choices[0].value) {
+        extended.choices = extended.choices.map(e => {
+            return { message: e.name, value: e.value };
+        });
+    }
+    if (extended.pageSize) {
+        extended.limit = extended.pageSize;
+    }
+    const { answer } = await prompt({
+        type: "input",
+        message: `${chalk.green.bold.underline(message)}`,
+        name: `answer`,
+        ...extended
     });
-  }
-  if (extended.pageSize) {
-    extended.limit = extended.pageSize;
-  }
-  const {
-    answer
-  } = await prompt({
-    type: "input",
-    message: `${chalk.green.bold.underline(message)}`,
-    name: `answer`,
-    ...extended
-  });
-  return answer;
+    return answer;
 };
-export default promptQuestion;
+
+export default promptQuestion;

package/package.json

@@ -1,33 +1,25 @@
 {
     "name": "fscr",
-    "version": "6.2.6",
+    "version": "7.3.0",
     "description": "Runs the fscripts.md file",
     "type": "module",
     "main": "./dist/index.js",
     "scripts": {
-        "prebuild": "rimraf dist/*",
-        "build": "run-p build:index build:lib",
-        "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",
+        "build": "rimraf dist && mkdir -p dist/lib && cp -r lib/. dist/lib && cp index.js dist/index.js",
         "fsr": "node dist/index.js",
-        "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",
-        "release:combined": "np --any-branch",
+        "release": "yarn fsr bump && yarn build",
         "release:publish": "node lib/release/publish.js",
         "start": "run-s build start:run",
-        "start:basic": "babel-node index.js",
-        "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",
+        "watch": "nodemon --watch lib --watch index.js --ext js --exec \"mkdir -p dist/lib && cp -r lib/. dist/lib && cp index.js dist/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"
+        "test:coverage": "vitest run --coverage",
+        "test:unit": "vitest run tests/unit",
+        "test:integration": "vitest run tests/integration",
+        "test:e2e": "vitest run tests/e2e",
+        "test:performance": "vitest run tests/performance"
     },
     "fscripts": {
         "encryptedFiles": [
@@ -51,11 +43,9 @@
         "bin"
     ],
     "bin": {
-        "fscr": "./bin",
         "fsr": "./bin"
     },
     "dependencies": {
-        "@babel/runtime": "^7.9.2",
         "better-md-2-json": "^1.0.6",
         "boxen": "^8.0.1",
         "chalk": "^4.1.2",
@@ -91,18 +81,10 @@
         "term-size": "^4.0.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.8.4",
-        "@babel/core": "^7.9.0",
-        "@babel/node": "^7.8.7",
-        "@babel/plugin-proposal-decorators": "^7.8.3",
-        "@babel/plugin-proposal-export-default-from": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.1",
-        "babel-plugin-module-resolver": "^5.0.2",
+        "@vitest/coverage-v8": "^3.2.4",
         "execa": "8.0.1",
         "fancy-log": "^2.0.0",
+        "fc-filepick": "^1.3.0",
         "fkill-cli": "^8.0.0",
         "ink-tab": "^5.2.0",
         "ink-table": "^3.1.0",