@create-node-app/core 0.3.12 → 0.3.14

package/dist/index.js

@@ -2954,6 +2954,11 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+function pathspec(...paths) {
+  const key = new String(paths);
+  cache.set(key, paths);
+  return key;
+}
 function isPathSpec(path4) {
   return path4 instanceof String && cache.has(path4);
 }
@@ -3096,6 +3101,12 @@ function pick(source, properties) {
 function delay(duration = 0) {
   return new Promise((done) => setTimeout(done, duration));
 }
+function orVoid(input) {
+  if (input === false) {
+    return void 0;
+  }
+  return input;
+}
 var NULL;
 var NOOP;
 var objectToString;
@@ -3352,6 +3363,7 @@ __export2(utils_exports, {
   isUserFunction: () => isUserFunction,
   last: () => last,
   objectToString: () => objectToString,
+  orVoid: () => orVoid,
   parseStringResponse: () => parseStringResponse,
   pick: () => pick,
   prefixedArray: () => prefixedArray,
@@ -3786,6 +3798,28 @@ var init_config = __esm({
     })(GitConfigScope || {});
   }
 });
+function isDiffNameStatus(input) {
+  return diffNameStatus.has(input);
+}
+var DiffNameStatus;
+var diffNameStatus;
+var init_diff_name_status = __esm({
+  "src/lib/tasks/diff-name-status.ts"() {
+    DiffNameStatus = /* @__PURE__ */ ((DiffNameStatus2) => {
+      DiffNameStatus2["ADDED"] = "A";
+      DiffNameStatus2["COPIED"] = "C";
+      DiffNameStatus2["DELETED"] = "D";
+      DiffNameStatus2["MODIFIED"] = "M";
+      DiffNameStatus2["RENAMED"] = "R";
+      DiffNameStatus2["CHANGED"] = "T";
+      DiffNameStatus2["UNMERGED"] = "U";
+      DiffNameStatus2["UNKNOWN"] = "X";
+      DiffNameStatus2["BROKEN"] = "B";
+      return DiffNameStatus2;
+    })(DiffNameStatus || {});
+    diffNameStatus = new Set(Object.values(DiffNameStatus));
+  }
+});
 function grepQueryBuilder(...params) {
   return new GrepQuery().param(...params);
 }
@@ -4402,6 +4436,19 @@ var init_commit = __esm({
     init_task();
   }
 });
+function first_commit_default() {
+  return {
+    firstCommit() {
+      return this._runTask(straightThroughStringTask(["rev-list", "--max-parents=0", "HEAD"], true), trailingFunctionArgument(arguments));
+    }
+  };
+}
+var init_first_commit = __esm({
+  "src/lib/tasks/first-commit.ts"() {
+    init_utils();
+    init_task();
+  }
+});
 function hashObjectTask(filePath, write) {
   const commands = ["hash-object", filePath];
   if (write) {
@@ -4518,6 +4565,7 @@ var init_parse_diff_summary = __esm({
   "src/lib/parsers/parse-diff-summary.ts"() {
     init_log_format();
     init_DiffSummary();
+    init_diff_name_status();
     init_utils();
     statParser = [
       new LineParser(/(.+)\s+\|\s+(\d+)(\s+[+\-]+)?$/, (result, [file, changes, alterations = ""]) => {
@@ -4583,11 +4631,12 @@ var init_parse_diff_summary = __esm({
       })
     ];
     nameStatusParser = [
-      new LineParser(/([ACDMRTUXB])\s*(.+)$/, (result, [_status, file]) => {
+      new LineParser(/([ACDMRTUXB])([0-9]{0,3})\t(.[^\t]*)(\t(.[^\t]*))?$/, (result, [status, _similarity, from, _to, to]) => {
         result.changed++;
         result.files.push({
-          file,
+          file: to != null ? to : from,
           changes: 0,
+          status: orVoid(isDiffNameStatus(status) && status),
           insertions: 0,
           deletions: 0,
           binary: false
@@ -4735,7 +4784,7 @@ function parseLogOptions(opt = {}, customArgs = []) {
     suffix.push(`${opt.from || ""}${rangeOperator}${opt.to || ""}`);
   }
   if (filterString(opt.file)) {
-    suffix.push("--follow", opt.file);
+    command.push("--follow", pathspec(opt.file));
   }
   appendTaskOptions(userOptions(opt), command);
   return {
@@ -4772,6 +4821,7 @@ var excludeOptions;
 var init_log = __esm({
   "src/lib/tasks/log.ts"() {
     init_log_format();
+    init_pathspec();
     init_parse_list_log_summary();
     init_utils();
     init_task();
@@ -5431,6 +5481,7 @@ var init_simple_git_api = __esm({
     init_checkout();
     init_commit();
     init_config();
+    init_first_commit();
     init_grep();
     init_hash_object();
     init_init();
@@ -5504,7 +5555,7 @@ var init_simple_git_api = __esm({
         return this._runTask(statusTask(getTrailingOptions(arguments)), trailingFunctionArgument(arguments));
       }
     };
-    Object.assign(SimpleGitApi.prototype, checkout_default(), commit_default(), config_default(), grep_default(), log_default(), show_default(), version_default());
+    Object.assign(SimpleGitApi.prototype, checkout_default(), commit_default(), config_default(), first_commit_default(), grep_default(), log_default(), show_default(), version_default());
   }
 });
 var scheduler_exports = {};
@@ -6450,6 +6501,7 @@ init_task_configuration_error();
 init_check_is_repo();
 init_clean();
 init_config();
+init_diff_name_status();
 init_grep();
 init_reset();
 function abortPlugin(signal) {
@@ -7299,7 +7351,8 @@ var batchedWriteFiles = async (operations) => {
     try {
       makeDirectory((0, import_path3.dirname)(operation.path));
       await writeFileAsync(operation.path, operation.content, {
-        flag: operation.flag
+        flag: operation.flag,
+        mode: operation.mode
       });
       if (operation.verbose) {
         console.log(import_chalk2.default.green(`Added "${operation.path}" successfully`));
@@ -7318,12 +7371,14 @@ var batchedAppendFiles = async (operations) => {
   const batchedPromises = operations.map(async (operation) => {
     try {
       const content = await (0, import_util.promisify)(import_fs4.default.readFile)(operation.src, "utf8");
+      const fileMode = (await (0, import_util.promisify)(import_fs4.default.stat)(operation.src)).mode;
       await batchedWriteFiles([
         {
           path: operation.dest,
           content,
           flag: "a+",
-          verbose: operation.verbose
+          verbose: operation.verbose,
+          mode: fileMode
         }
       ]);
     } catch (err) {
@@ -7386,10 +7441,9 @@ var templateLoader = ({
   const operations = [];
   try {
     const flag = mode.includes("append") ? "a+" : "w";
-    const file = await (0, import_util.promisify)(import_fs4.default.readFile)(
-      `${templateDir}/${path4}`,
-      "utf8"
-    );
+    const filePath = `${templateDir}/${path4}`;
+    const file = await (0, import_util.promisify)(import_fs4.default.readFile)(filePath, "utf8");
+    const fileMode = (await (0, import_util.promisify)(import_fs4.default.stat)(filePath)).mode;
     const newFile = import_underscore.default.template(file);
     const newPath = path4.replace(/.template$/, "").replace(/.append$/, "").replace(/.if-(npm|yarn|pnpm)$/, "").replace(SRC_PATH_PATTERN, getSrcDirPattern(srcDir));
     operations.push({
@@ -7402,7 +7456,8 @@ var templateLoader = ({
         ...customOptions
       }),
       flag,
-      verbose
+      verbose,
+      mode: fileMode
     });
   } catch (err) {
     if (verbose) {
@@ -7779,7 +7834,7 @@ var createApp = async ({
   console.log();
   const useYarn = customOptions.packageManager === "yarn" && shouldUseYarn();
   const usePnpm = customOptions.packageManager === "pnpm" && shouldUsePnpm();
-  const runCommand = useYarn ? "yarn" : "npm run";
+  const runCommand = useYarn ? "yarn" : usePnpm ? "pnpm run" : "npm run";
   const installCommand = useYarn ? "yarn" : usePnpm ? "pnpm install" : "npm install";
   const { packageJson, dependencies, devDependencies } = await loadPackages({
     templatesOrExtensions,

package/dist/index.mjs

@@ -2947,6 +2947,11 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+function pathspec(...paths) {
+  const key = new String(paths);
+  cache.set(key, paths);
+  return key;
+}
 function isPathSpec(path4) {
   return path4 instanceof String && cache.has(path4);
 }
@@ -3089,6 +3094,12 @@ function pick(source, properties) {
 function delay(duration = 0) {
   return new Promise((done) => setTimeout(done, duration));
 }
+function orVoid(input) {
+  if (input === false) {
+    return void 0;
+  }
+  return input;
+}
 var NULL;
 var NOOP;
 var objectToString;
@@ -3345,6 +3356,7 @@ __export(utils_exports, {
   isUserFunction: () => isUserFunction,
   last: () => last,
   objectToString: () => objectToString,
+  orVoid: () => orVoid,
   parseStringResponse: () => parseStringResponse,
   pick: () => pick,
   prefixedArray: () => prefixedArray,
@@ -3779,6 +3791,28 @@ var init_config = __esm({
     })(GitConfigScope || {});
   }
 });
+function isDiffNameStatus(input) {
+  return diffNameStatus.has(input);
+}
+var DiffNameStatus;
+var diffNameStatus;
+var init_diff_name_status = __esm({
+  "src/lib/tasks/diff-name-status.ts"() {
+    DiffNameStatus = /* @__PURE__ */ ((DiffNameStatus2) => {
+      DiffNameStatus2["ADDED"] = "A";
+      DiffNameStatus2["COPIED"] = "C";
+      DiffNameStatus2["DELETED"] = "D";
+      DiffNameStatus2["MODIFIED"] = "M";
+      DiffNameStatus2["RENAMED"] = "R";
+      DiffNameStatus2["CHANGED"] = "T";
+      DiffNameStatus2["UNMERGED"] = "U";
+      DiffNameStatus2["UNKNOWN"] = "X";
+      DiffNameStatus2["BROKEN"] = "B";
+      return DiffNameStatus2;
+    })(DiffNameStatus || {});
+    diffNameStatus = new Set(Object.values(DiffNameStatus));
+  }
+});
 function grepQueryBuilder(...params) {
   return new GrepQuery().param(...params);
 }
@@ -4395,6 +4429,19 @@ var init_commit = __esm({
     init_task();
   }
 });
+function first_commit_default() {
+  return {
+    firstCommit() {
+      return this._runTask(straightThroughStringTask(["rev-list", "--max-parents=0", "HEAD"], true), trailingFunctionArgument(arguments));
+    }
+  };
+}
+var init_first_commit = __esm({
+  "src/lib/tasks/first-commit.ts"() {
+    init_utils();
+    init_task();
+  }
+});
 function hashObjectTask(filePath, write) {
   const commands = ["hash-object", filePath];
   if (write) {
@@ -4511,6 +4558,7 @@ var init_parse_diff_summary = __esm({
   "src/lib/parsers/parse-diff-summary.ts"() {
     init_log_format();
     init_DiffSummary();
+    init_diff_name_status();
     init_utils();
     statParser = [
       new LineParser(/(.+)\s+\|\s+(\d+)(\s+[+\-]+)?$/, (result, [file, changes, alterations = ""]) => {
@@ -4576,11 +4624,12 @@ var init_parse_diff_summary = __esm({
       })
     ];
     nameStatusParser = [
-      new LineParser(/([ACDMRTUXB])\s*(.+)$/, (result, [_status, file]) => {
+      new LineParser(/([ACDMRTUXB])([0-9]{0,3})\t(.[^\t]*)(\t(.[^\t]*))?$/, (result, [status, _similarity, from, _to, to]) => {
         result.changed++;
         result.files.push({
-          file,
+          file: to != null ? to : from,
           changes: 0,
+          status: orVoid(isDiffNameStatus(status) && status),
           insertions: 0,
           deletions: 0,
           binary: false
@@ -4728,7 +4777,7 @@ function parseLogOptions(opt = {}, customArgs = []) {
     suffix.push(`${opt.from || ""}${rangeOperator}${opt.to || ""}`);
   }
   if (filterString(opt.file)) {
-    suffix.push("--follow", opt.file);
+    command.push("--follow", pathspec(opt.file));
   }
   appendTaskOptions(userOptions(opt), command);
   return {
@@ -4765,6 +4814,7 @@ var excludeOptions;
 var init_log = __esm({
   "src/lib/tasks/log.ts"() {
     init_log_format();
+    init_pathspec();
     init_parse_list_log_summary();
     init_utils();
     init_task();
@@ -5424,6 +5474,7 @@ var init_simple_git_api = __esm({
     init_checkout();
     init_commit();
     init_config();
+    init_first_commit();
     init_grep();
     init_hash_object();
     init_init();
@@ -5497,7 +5548,7 @@ var init_simple_git_api = __esm({
         return this._runTask(statusTask(getTrailingOptions(arguments)), trailingFunctionArgument(arguments));
       }
     };
-    Object.assign(SimpleGitApi.prototype, checkout_default(), commit_default(), config_default(), grep_default(), log_default(), show_default(), version_default());
+    Object.assign(SimpleGitApi.prototype, checkout_default(), commit_default(), config_default(), first_commit_default(), grep_default(), log_default(), show_default(), version_default());
   }
 });
 var scheduler_exports = {};
@@ -6443,6 +6494,7 @@ init_task_configuration_error();
 init_check_is_repo();
 init_clean();
 init_config();
+init_diff_name_status();
 init_grep();
 init_reset();
 function abortPlugin(signal) {
@@ -7292,7 +7344,8 @@ var batchedWriteFiles = async (operations) => {
     try {
       makeDirectory(dirname(operation.path));
       await writeFileAsync(operation.path, operation.content, {
-        flag: operation.flag
+        flag: operation.flag,
+        mode: operation.mode
       });
       if (operation.verbose) {
         console.log(chalk2.green(`Added "${operation.path}" successfully`));
@@ -7311,12 +7364,14 @@ var batchedAppendFiles = async (operations) => {
   const batchedPromises = operations.map(async (operation) => {
     try {
       const content = await promisify(fs3.readFile)(operation.src, "utf8");
+      const fileMode = (await promisify(fs3.stat)(operation.src)).mode;
       await batchedWriteFiles([
         {
           path: operation.dest,
           content,
           flag: "a+",
-          verbose: operation.verbose
+          verbose: operation.verbose,
+          mode: fileMode
         }
       ]);
     } catch (err) {
@@ -7379,10 +7434,9 @@ var templateLoader = ({
   const operations = [];
   try {
     const flag = mode.includes("append") ? "a+" : "w";
-    const file = await promisify(fs3.readFile)(
-      `${templateDir}/${path4}`,
-      "utf8"
-    );
+    const filePath = `${templateDir}/${path4}`;
+    const file = await promisify(fs3.readFile)(filePath, "utf8");
+    const fileMode = (await promisify(fs3.stat)(filePath)).mode;
     const newFile = _.template(file);
     const newPath = path4.replace(/.template$/, "").replace(/.append$/, "").replace(/.if-(npm|yarn|pnpm)$/, "").replace(SRC_PATH_PATTERN, getSrcDirPattern(srcDir));
     operations.push({
@@ -7395,7 +7449,8 @@ var templateLoader = ({
         ...customOptions
       }),
       flag,
-      verbose
+      verbose,
+      mode: fileMode
     });
   } catch (err) {
     if (verbose) {
@@ -7772,7 +7827,7 @@ var createApp = async ({
   console.log();
   const useYarn = customOptions.packageManager === "yarn" && shouldUseYarn();
   const usePnpm = customOptions.packageManager === "pnpm" && shouldUsePnpm();
-  const runCommand = useYarn ? "yarn" : "npm run";
+  const runCommand = useYarn ? "yarn" : usePnpm ? "pnpm run" : "npm run";
   const installCommand = useYarn ? "yarn" : usePnpm ? "pnpm install" : "npm install";
   const { packageJson, dependencies, devDependencies } = await loadPackages({
     templatesOrExtensions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@create-node-app/core",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -27,11 +27,11 @@
     "@types/download": "^8.0.2",
     "@types/envinfo": "^7.8.1",
     "@types/fs-extra": "^11.0.2",
-    "@types/lodash.merge": "^4.6.7",
+    "@types/lodash.merge": "^4.6.9",
     "@types/node": "^18.14.6",
     "@types/underscore": "^1.11.4",
     "eslint": "^7.32.0",
-    "simple-git": "^3.19.1",
+    "simple-git": "^3.22.0",
     "tsconfig": "*",
     "typescript": "^4.5.2"
   },
@@ -40,7 +40,7 @@
     "commander": "^7.0.0",
     "cross-spawn": "^6.0.5",
     "debug": "^4.2.0",
-    "download": "^8.0.0",
+    "download": "^3.3.0",
     "envinfo": "^7.10.0",
     "lodash.merge": "^4.6.2",
     "readdirp": "^3.4.0",