fscr 6.2.3 → 7.3.0

package/dist/lib/encryption/encryption.js

@@ -1,135 +1,175 @@
 import chalk from "chalk";
+import fcFilepicker from "fc-filepick";
 import inquirer from "inquirer";
-import { encrypt, decrypt } from "../utils/encryption.js";
-import { appendToFile, ensureFile, writeFile, boxInform, readJson, readFile } from "../utils/helpers.js";
+import {decrypt, encrypt} from "../utils/encryption.js";
+import {appendToFile, boxInform, ensureFile, readFile, readJson, writeFile} from "../utils/helpers.js";
 import path from "path";
+
 const scriptsDir = process.cwd();
 const rootDir = path.join(scriptsDir, "./");
 const packagePath = path.join(rootDir, "package.json");
 const igPath = path.join(rootDir, ".gitignore");
-const encrypted = {
-  encryptedFiles: []
-};
+const encrypted = {encryptedFiles: []};
 
 // prettier-ignore
-encrypted.encrypt = async (pass, encryptedFile, decryptedFile) => {
-  let willEncrypt = true;
-  let sureSure = await ensureFile(encryptedFile);
-  if (sureSure) {
-    console.log(`${chalk.bold.red("FILE ALREADY EXISTS ARE YOU SURE?")}`);
-    willEncrypt = await new Promise(resolve => {
-      inquirer.prompt([{
-        type: "confirm",
-        message: chalk.bold.hex("#38be18")(`Sure? (y/n): `),
-        name: "sure"
-      }]).then(({
-        sure
-      }) => {
-        resolve(sure);
-      });
-    });
-  }
-  if (willEncrypt) {
-    let toEncrypt = await readFile(decryptedFile);
-    const ciphertext = encrypt(toEncrypt, pass);
-    await writeFile(encryptedFile, ciphertext.toString());
-  }
+encrypted.encrypt = async (pass = null, encryptedFile = null, decryptedFile = null) => {
+    if (pass === null) {
+        pass = await encrypted.getPass();
+    }
+    if (decryptedFile === null) {
+        decryptedFile = await fcFilepicker.default({type: "file"});
+        decryptedFile = path.join(scriptsDir, decryptedFile.split("/").pop());
+        encryptedFile = `${decryptedFile}.encrypted`;
+    }
+    let willEncrypt = true;
+    let sureSure = await ensureFile(encryptedFile);
+    if (sureSure) {
+        console.log(`${chalk.bold.red("FILE ALREADY EXISTS ARE YOU SURE?")}`
+        );
+        willEncrypt = await new Promise(resolve => {
+            inquirer
+                .prompt([
+                    {
+                        type: "confirm",
+                        message: chalk.bold.hex("#38be18")(
+                            `Sure? (y/n): `
+                        ),
+                        name: "sure"
+                    }
+                ])
+                .then(({sure}) => {
+                    resolve(sure);
+                });
+        });
+    }
+    if (willEncrypt) {
+        let toEncrypt = await readFile(decryptedFile);
+        const ciphertext = encrypt(toEncrypt, pass);
+        await writeFile(encryptedFile, ciphertext.toString());
+    }
+
 };
 // prettier-ignore
-encrypted.decrypt = async (pass, encryptedFileLocation, decryptedFileLocation) => {
-  // let encryptedFileLocation = path.join(rootDir,"."+encryptedFile);
-  // let decryptedFileLocation = path.join(rootDir,encryptedFile);
-  let willEncrypt = true;
-  let sureSure = await ensureFile(decryptedFileLocation);
-  if (sureSure) {
-    console.log(`${chalk.bold.red("FILE ALREADY EXISTS ARE YOU SURE?")}`);
-    willEncrypt = await new Promise(resolve => {
-      inquirer.prompt([{
-        type: "confirm",
-        message: chalk.bold.hex("#38be18")(`Sure wanna override file ${decryptedFileLocation}? (y/n): `),
-        name: "sure"
-      }]).then(({
-        sure
-      }) => {
-        resolve(sure);
-      });
-    });
-  }
-  if (willEncrypt) {
-    let toDecrypt = await readFile(encryptedFileLocation);
-    const decryptedData = decrypt(toDecrypt, pass);
-    await writeFile(decryptedFileLocation, decryptedData);
-    console.warn(`${chalk.bold.green.underline("DECRYPTED FILE:")} ${chalk.bold.dim(path.join(scriptsDir, decryptedFileLocation))}`);
-  }
+encrypted.decrypt = async (pass = null, encryptedFileLocation = null, decryptedFileLocation = null) => {
+    // let encryptedFileLocation = path.join(rootDir,"."+encryptedFile);
+    // let decryptedFileLocation = path.join(rootDir,encryptedFile);
+    if (pass === null) {
+        pass = await encrypted.getPass();
+    }
+    if (encryptedFileLocation === null) {
+        encryptedFileLocation = await fcFilepicker.default({type: "file"});
+        encryptedFileLocation = path.join(scriptsDir, encryptedFileLocation.split("/").pop());
+        decryptedFileLocation = encryptedFileLocation.replace(".encrypted", "");
+    }
+    let willEncrypt = true;
+    let sureSure = await ensureFile(decryptedFileLocation);
+    if (sureSure) {
+        console.log(
+            `${chalk.bold.red("FILE ALREADY EXISTS ARE YOU SURE?")}`
+        );
+        willEncrypt = await new Promise(resolve => {
+            inquirer
+                .prompt([
+                    {
+                        type: "confirm",
+                        message: chalk.bold.hex("#38be18")(
+                            `Sure wanna override file ${decryptedFileLocation}? (y/n): `
+                        ),
+                        name: "sure"
+                    }
+                ])
+                .then(({sure}) => {
+                    resolve(sure);
+                });
+        });
+    }
+    if (willEncrypt) {
+        let toDecrypt = await readFile(encryptedFileLocation);
+        const decryptedData = decrypt(toDecrypt, pass);
+        await writeFile(decryptedFileLocation, decryptedData);
+        console.warn(
+            `${chalk.bold.green.underline("DECRYPTED FILE:")} ${chalk.bold.dim(path.join(scriptsDir, decryptedFileLocation))}`
+        );
+    }
+
 };
+
 encrypted.init = async () => {
-  try {
-    let pass = await encrypted.getPass();
-    let toEncrypt = await encrypted.toEncrypt();
-    encrypted.packageJson = await readJson(packagePath);
-    encrypted.ignore = await readFile(igPath);
-    encrypted.ignoredFiles = encrypted.ignore.split("\n");
-    if (encrypted.packageJson.fscripts) {
-      if (encrypted.packageJson.fscripts.encryptedFiles) {
-        encrypted.encryptedFiles = encrypted.packageJson.fscripts.encryptedFiles;
-        let filesToAdd = "\n";
-        for (const e of encrypted.encryptedFiles) {
-          if (encrypted.ignoredFiles.indexOf(e) === -1) {
-            filesToAdd += e + "\n";
-          }
-          let file = e + "";
-          let fileSplit = file.split("/");
-          let name = fileSplit.pop();
-          let encryptedFile = fileSplit.slice();
-          let decryptedFile = fileSplit.slice();
-          encryptedFile.push("." + name);
-          encryptedFile = path.join(rootDir, encryptedFile.join("/"));
-          decryptedFile.push(name);
-          decryptedFile = path.join(rootDir, decryptedFile.join("/"));
-          if (toEncrypt) {
-            await encrypted.encrypted(pass, encryptedFile, decryptedFile);
-          } else {
-            await encrypted.decrypt(pass, encryptedFile, decryptedFile);
-          }
-        }
-        if (filesToAdd.trim().length > 0) {
-          await appendToFile(igPath, filesToAdd + "\n");
-          boxInform(" Added files to .gitignore: ", filesToAdd);
+    try {
+        let pass = await encrypted.getPass();
+        let toEncrypt = await encrypted.toEncrypt();
+        encrypted.packageJson = await readJson(packagePath);
+        encrypted.ignore = await readFile(igPath);
+        encrypted.ignoredFiles = encrypted.ignore.split("\n");
+        if (encrypted.packageJson.fscripts) {
+            if (encrypted.packageJson.fscripts.encryptedFiles) {
+                encrypted.encryptedFiles = encrypted.packageJson.fscripts.encryptedFiles;
+                let filesToAdd = "\n";
+                for (const e of encrypted.encryptedFiles) {
+                    if (encrypted.ignoredFiles.indexOf(e) === -1) {
+                        filesToAdd += e + "\n";
+                    }
+                    let file = e + "";
+                    let fileSplit = file.split("/");
+                    let name = fileSplit.pop();
+                    let encryptedFile = fileSplit.slice();
+                    let decryptedFile = fileSplit.slice();
+                    encryptedFile.push("." + name);
+                    encryptedFile = path.join(rootDir, encryptedFile.join("/"));
+                    decryptedFile.push(name);
+                    decryptedFile = path.join(rootDir, decryptedFile.join("/"));
+
+                    if (toEncrypt) {
+                        await encrypted.encrypt(pass, encryptedFile, decryptedFile);
+                    } else {
+                        await encrypted.decrypt(pass, encryptedFile, decryptedFile);
+                    }
+                }
+
+                if (filesToAdd.trim().length > 0) {
+                    await appendToFile(igPath, filesToAdd + "\n");
+                    boxInform(" Added files to .gitignore: ", filesToAdd);
+                }
+            }
         }
-      }
+    } catch (err) {
+        console.error(err);
     }
-  } catch (err) {
-    console.error(err);
-  }
 };
+
 encrypted.getPass = async () => {
-  return await new Promise(resolve => {
-    inquirer.prompt([{
-      type: "password",
-      mask: chalk.underline(" ●"),
-      message: chalk.bold.hex("#38be18")(`Enter a SECRET key (same as pass app) : `),
-      name: "pass"
-    }]).then(({
-      pass
-    }) => {
-      resolve(pass);
+    return await new Promise((resolve) => {
+        inquirer
+            .prompt([
+                {
+                    type: "password",
+                    mask: chalk.underline(" ●"),
+                    message: chalk.bold.hex("#38be18")(
+                        `Enter a SECRET key (same as pass app) : `
+                    ),
+                    name: "pass"
+                }
+            ])
+            .then(({pass}) => {
+                resolve(pass);
+            });
     });
-  });
 };
 encrypted.toEncrypt = async () => {
-  return await new Promise(resolve => {
-    inquirer.prompt([{
-      type: "list",
-      message: chalk.bold.hex("#38be18")("Which direction?"),
-      choices: ["encrypt", "decrypt"],
-      name: "encryptDecrypt"
-    }]).then(async ({
-      encryptDecrypt
-    }) => {
-      resolve(encryptDecrypt === "encrypt");
+    return await new Promise((resolve) => {
+        inquirer
+            .prompt([
+                {
+                    type: "list",
+                    message: chalk.bold.hex("#38be18")("Which direction?"),
+                    choices: ["encrypt", "decrypt"],
+                    name: "encryptDecrypt"
+                }
+            ])
+            .then(async ({encryptDecrypt}) => {
+                resolve(encryptDecrypt === "encrypt");
+            });
     });
-  });
 };
-export default {
-  ...encrypted
-};
+
+export default {...encrypted};

package/dist/lib/generators/generateFScripts.js

@@ -4,22 +4,25 @@ import { appendToFile, writeFile, boxInform, readJson, readFile } from "../utils
 import path from "path";
 const projectDir = process.cwd();
 const packagePath = path.join(projectDir, "package.json");
-const gen = {
-  scripts: []
-};
+
+const gen = { scripts: [] };
 let mdfile = `# First category of scripts
 
 Welcome to your new amazing fscripts.md file. It replaces the headaches of npm scripts! But so much more.
 `;
+
 gen.init = async () => {
-  try {
-    gen.packageJson = await readJson(packagePath);
-    Object.keys(gen.packageJson.scripts).forEach(scriptName => {
-      mdfile += `\n## ${scriptName}\n\n${gen.packageJson.scripts[scriptName]}\n\n\`\`\`bash\n${gen.packageJson.scripts[scriptName]}\n\`\`\`\n\n`;
-    });
-    await writeFile("./sample.fscripts.md", mdfile);
-  } catch (err) {
-    console.error(err);
-  }
+    try {
+        gen.packageJson = await readJson(packagePath);
+        Object.keys(gen.packageJson.scripts).forEach(scriptName => {
+            mdfile += `\n## ${scriptName}\n\n${
+                gen.packageJson.scripts[scriptName]
+            }\n\n\`\`\`bash\n${gen.packageJson.scripts[scriptName]}\n\`\`\`\n\n`;
+        });
+        await writeFile("./sample.fscripts.md", mdfile);
+    } catch (err) {
+        console.error(err);
+    }
 };
-export default gen.init;
+
+export default gen.init;

package/dist/lib/generators/generateToc.js

@@ -3,30 +3,39 @@ import chalk from "chalk";
 import fs from "fs";
 import tocPkg from "markdown-toc";
 const toc = tocPkg.default || tocPkg;
+
 import { writeFile } from "../utils/helpers.js";
 // const projectDir = process.cwd();
 
 const generateToc = async (fileToLoad = "fscripts.md") => {
-  const filepath = path.resolve(process.cwd(), fileToLoad);
-  if (!fs.existsSync(filepath)) {
-    console.warn(`${chalk.bold.red("You're missing the fscripts.md file!")}
-${chalk.green("Please run 'fsr generate' to get started!")}`);
-    process.exit(0);
-    return null;
-  }
-  const data = fs.readFileSync(filepath, "utf-8");
-  if (data) {
+    const filepath = path.resolve(process.cwd(), fileToLoad);
+
+    if (!fs.existsSync(filepath)) {
+        console.warn(
+            `${chalk.bold.red("You're missing the fscripts.md file!")}
+${chalk.green("Please run 'fsr generate' to get started!")}`
+        );
+        process.exit(0);
+        return null;
+    }
+
+    const data = fs.readFileSync(filepath, "utf-8");
     console.warn(`${chalk.bold.green("Located fscripts.md file!")}`);
+
     let newFile = ``;
     let tocSplit = data.split("<!-- end toc -->");
     let mdContent = "";
     if (tocSplit.length === 2) {
-      mdContent = tocSplit[1];
+        mdContent = tocSplit[1];
     } else {
-      mdContent = data;
+        mdContent = data;
     }
-    newFile = toc(mdContent).content + "\n<!-- end toc -->\n\n" + mdContent.trim();
+
+    // Generate TOC even for empty files
+    const tocContent = data === "" ? "" : toc(mdContent).content;
+    newFile = tocContent + "\n<!-- end toc -->\n\n" + mdContent.trim();
+
     await writeFile(fileToLoad, newFile);
-  }
 };
-export default generateToc;
+
+export default generateToc;

package/dist/lib/generators/index.js

@@ -1,2 +1,2 @@
 export { default as generateToc } from "./generateToc.js";
-export { default as generateFScripts } from "./generateFScripts.js";
+export { default as generateFScripts } from "./generateFScripts.js";

package/dist/lib/git/pub.js

@@ -1,42 +1,38 @@
 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();
-  await new Promise(resolve => {
-    let pack = readJson(path.resolve(__dirname + "package.json"));
-    inquirer.prompt([{
-      type: "input",
-      message: chalk.bold.hex("#38be18")(`What's new this version ${pack.version}: `),
-      name: "commitmsg"
-    }]).then(async ({
-      commitmsg
-    }) => {
-      simple().add("./*").commit(`VERSION ${pack.version}\n${commitmsg}`).push(["-u"], () => console.log("done")).addTag(`${pack.version}`, () => console.warn("")).pushTags("origin", () => {
-        console.warn("-- Console 3", 3);
-        resolve();
-      });
-      // await require("simple-git")()
+    await validateNotInDev();
+    await new Promise(resolve => {
+        let pack = readJson(path.resolve(__dirname + "package.json"));
+
+        inquirer
+        .prompt([
+            {
+                type: "input",
+                message: chalk.bold.hex("#38be18")(`What's new this version ${pack.version}: `),
+                name: "commitmsg"
+            }
+        ])
+        .then(async ({ commitmsg }) => {
+            simple()
+            .add("./*")
+            .commit(`VERSION ${pack.version}\n${commitmsg}`)
+            .push(["-u"], () => console.log("done"))
+            .addTag(`${pack.version}`, () => console.warn(""))
+            .pushTags("origin", () => {
+                console.warn("-- Console 3", 3);
+                resolve();
+            });
+            // await require("simple-git")()
+        });
     });
-  });
-})();
+})();

package/dist/lib/git/taskRunner.js

@@ -5,76 +5,86 @@ import prettyMs from "pretty-ms";
 import spawn from "cross-spawn";
 import boxen from "boxen";
 import helpers from "../utils/helpers.js";
+
 const runTask = async (name, conf = false) => {
-  let output;
-  let startTime = Date.now();
-  let input = name.slice(-1) === "-";
-  let task = {};
-  let tasks = [];
-  if (conf !== false) {
-    conf.set("tasks." + name + ".lastRan", startTime);
-    await conf.updateConfigFile();
-    tasks = conf.get("tasks");
-  }
-  let command = conf === false ? name : tasks[name].file ? "node " + tasks[name].file : tasks[name].script;
-  console.clear();
-  console.log(input ? chalk.hex("#4b5150")(" Running: ") + chalk.bold.underline.hex("#438b34")(name) : boxen(chalk.hex("#717877")(" Running: ") + chalk.bold.underline.hex("#438b34")(name) + chalk.hex("#717877")(" "), {
-    padding: 0,
-    margin: {
-      left: 2,
-      top: 0,
-      bottom: 0,
-      right: 0
-    },
-    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",
-    // dimBorder: true,
-    align: "center" //,
-    // float: "center"
-  }));
-  try {
-    let pars = command.split(" ");
-    output = spawn(pars[0], pars.slice(1, pars.length), {
-      cwd: tryPath,
-      env: {
-        ...process.env,
-        ...{
-          FORCE_COLOR: true
-        }
-      },
-      stdio: input ? "inherit" : "pipe"
-    });
-    if (!input) {
-      output.stdout.on("data", code => {
-        code = code + "";
-        console.log(`${chalk.bgHex("#181c24").hex("#8c91a7")(moment().format("HH:MM:SS") + ":")} ${code}`.trim());
-      });
-      output.stderr.on("data", code => {
-        code = code + "";
-        console.log(`${chalk.bgHex("#181c24").hex("#a72e32")(moment().format("HH:MM:SS") + "ERR :")} ${code}`.trim());
-      });
+    let output;
+    let startTime = Date.now();
+    let input = name.slice(-1) === "-";
+    let task = {};
+    let tasks = [];
+    if (conf !== false) {
+        conf.set("tasks." + name + ".lastRan", startTime);
+        await conf.updateConfigFile();
+        tasks = conf.get("tasks");
     }
-    return new Promise((resolve, reject) => {
-      output.on("close", code => {
-        if (code === 0) {
-          let elapsed = Date.now() - startTime;
-          console.log(`${chalk.bold.green("Finished in " + prettyMs(elapsed), code)}`);
-          resolve();
-        } else {
-          // console.log(`${chalk.bold.green("Finished in " + prettyMs(elapsed), code)}`);
-          reject(`task exited with code ${code}`);
+    let command =
+        conf === false ? name : tasks[name].file ? "node " + tasks[name].file : tasks[name].script;
+    console.clear();
+    console.log(
+        input
+            ? chalk.hex("#4b5150")(" Running: ") + chalk.bold.underline.hex("#438b34")(name)
+            : boxen(
+                  chalk.hex("#717877")(" Running: ") +
+                      chalk.bold.underline.hex("#438b34")(name) +
+                      chalk.hex("#717877")(" "),
+                  {
+                      padding: 0,
+                      margin: { left: 2, top: 0, bottom: 0, right: 0 },
+                      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",
+                      // dimBorder: true,
+                      align: "center" //,
+                      // float: "center"
+                  }
+              )
+    );
+    try {
+        let pars = command.split(" ");
+
+        output = spawn(pars[0], pars.slice(1, pars.length), {
+            cwd: tryPath,
+            env: { ...process.env, ...{ FORCE_COLOR: true } },
+            stdio: input ? "inherit" : "pipe"
+        });
+        if (!input) {
+            output.stdout.on("data", code => {
+                code = code + "";
+                console.log(
+                    `${chalk.bgHex("#181c24").hex("#8c91a7")(
+                        moment().format("HH:MM:SS") + ":"
+                    )} ${code}`.trim()
+                );
+            });
+            output.stderr.on("data", code => {
+                code = code + "";
+                console.log(
+                    `${chalk.bgHex("#181c24").hex("#a72e32")(
+                        moment().format("HH:MM:SS") + "ERR :"
+                    )} ${code}`.trim()
+                );
+            });
         }
-      });
-    });
-  } catch (error) {
-    console.log(`${chalk.red.bold(error)}`);
-  }
+        return new Promise((resolve, reject) => {
+            output.on("close", code => {
+                if (code === 0) {
+                    let elapsed = Date.now() - startTime;
+                    console.log(`${chalk.bold.green("Finished in " + prettyMs(elapsed), code)}`);
+                    resolve();
+                } else {
+                    // console.log(`${chalk.bold.green("Finished in " + prettyMs(elapsed), code)}`);
+                    reject(`task exited with code ${code}`);
+                }
+            });
+        });
+    } catch (error) {
+        console.log(`${chalk.red.bold(error)}`);
+    }
 };
-export default runTask;
+
+export default runTask;