@take-out/cli 0.4.3-1775691786096 → 0.4.3-1775848829010

package/dist/cjs/cli.cjs

@@ -3,13 +3,15 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
-    get: () => from[key],
-    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-  });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
@@ -19,28 +21,30 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // "default" to the CommonJS "module.exports" for node compatibility.
 isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
   value: mod,
-  enumerable: !0
+  enumerable: true
 }) : target, mod));
-var import_node_child_process = require("node:child_process"),
-  import_node_fs = require("node:fs"),
-  import_node_path = require("node:path"),
-  import_citty = require("citty");
+var import_node_child_process = require("node:child_process");
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
+var import_citty = require("citty");
 const import_meta = {};
 function isScriptCategory(name) {
-  const scriptsDir = (0, import_node_path.join)(process.cwd(), "scripts"),
-    categoryPath = (0, import_node_path.join)(scriptsDir, name);
+  const scriptsDir = (0, import_node_path.join)(process.cwd(), "scripts");
+  const categoryPath = (0, import_node_path.join)(scriptsDir, name);
   try {
     return (0, import_node_fs.existsSync)(categoryPath) && (0, import_node_fs.statSync)(categoryPath).isDirectory();
   } catch {
-    return !1;
+    return false;
   }
 }
 function findLocalScript(name) {
-  const scriptsDir = (0, import_node_path.join)(process.cwd(), "scripts"),
-    normalizedName = name.replace(/:/g, "/");
+  const scriptsDir = (0, import_node_path.join)(process.cwd(), "scripts");
+  const normalizedName = name.replace(/:/g, "/");
   for (const ext of [".ts", ".js", ""]) {
     const scriptPath = (0, import_node_path.join)(scriptsDir, `${normalizedName}${ext}`);
-    if ((0, import_node_fs.existsSync)(scriptPath)) return scriptPath;
+    if ((0, import_node_fs.existsSync)(scriptPath)) {
+      return scriptPath;
+    }
   }
   return null;
 }
@@ -49,14 +53,16 @@ function isLocalScript(name) {
 }
 function findBuiltInScript(name) {
   try {
-    const resolved = import_meta.resolve("@take-out/scripts/package.json"),
-      packageJsonPath = new URL(resolved).pathname,
-      packageRoot = (0, import_node_path.join)(packageJsonPath, ".."),
-      srcPath = (0, import_node_path.join)(packageRoot, "src"),
-      normalizedName = name.replace(/:/g, "/");
+    const resolved = import_meta.resolve("@take-out/scripts/package.json");
+    const packageJsonPath = new URL(resolved).pathname;
+    const packageRoot = (0, import_node_path.join)(packageJsonPath, "..");
+    const srcPath = (0, import_node_path.join)(packageRoot, "src");
+    const normalizedName = name.replace(/:/g, "/");
     for (const ext of [".ts", ".js", ""]) {
       const scriptPath = (0, import_node_path.join)(srcPath, `${normalizedName}${ext}`);
-      if ((0, import_node_fs.existsSync)(scriptPath)) return scriptPath;
+      if ((0, import_node_fs.existsSync)(scriptPath)) {
+        return scriptPath;
+      }
     }
   } catch {}
   return null;
@@ -64,29 +70,40 @@ function findBuiltInScript(name) {
 function isBuiltInScript(name) {
   return findBuiltInScript(name) !== null;
 }
-const isShorthand = !0;
+const isShorthand = true;
 if (isShorthand) {
   const firstArg = process.argv[2];
-  if (firstArg && !["docs", "onboard", "run", "run-all", "script", "skills", "env:setup", "sync", "changed", "--help", "-h", "--version", "-v"].includes(firstArg)) {
+  const builtInCommands = ["docs", "onboard", "run", "run-all", "script", "skills", "env:setup", "sync", "changed", "--help", "-h", "--version", "-v"];
+  if (firstArg && !builtInCommands.includes(firstArg)) {
     let resolvedScriptName;
     if (isScriptCategory(firstArg)) {
-      const restArgs = process.argv.slice(3),
-        subScriptIdx = restArgs.findIndex(a => !a.startsWith("-"));
+      const restArgs = process.argv.slice(3);
+      const subScriptIdx = restArgs.findIndex(a => !a.startsWith("-"));
       if (subScriptIdx !== -1) {
         const subScript = restArgs[subScriptIdx];
-        resolvedScriptName = `${firstArg}/${subScript}`, process.argv.splice(3 + subScriptIdx, 1), process.argv[2] = resolvedScriptName;
+        resolvedScriptName = `${firstArg}/${subScript}`;
+        process.argv.splice(3 + subScriptIdx, 1);
+        process.argv[2] = resolvedScriptName;
       }
       process.argv.splice(2, 0, "run");
-    } else firstArg?.includes("/") || isLocalScript(firstArg) || isBuiltInScript(firstArg) ? (resolvedScriptName = firstArg, process.argv.splice(2, 0, "run")) : process.argv.splice(2, 0, "script");
+    } else if (firstArg?.includes("/")) {
+      resolvedScriptName = firstArg;
+      process.argv.splice(2, 0, "run");
+    } else if (isLocalScript(firstArg) || isBuiltInScript(firstArg)) {
+      resolvedScriptName = firstArg;
+      process.argv.splice(2, 0, "run");
+    } else {
+      process.argv.splice(2, 0, "script");
+    }
     const hasHelp = process.argv.includes("--help") || process.argv.includes("-h");
     if (resolvedScriptName && hasHelp) {
       const scriptPath = findLocalScript(resolvedScriptName) || findBuiltInScript(resolvedScriptName);
       if (scriptPath) {
-        const flagArgs = process.argv.slice(3).filter(a => a !== resolvedScriptName),
-          result = (0, import_node_child_process.spawnSync)("bun", [scriptPath, ...flagArgs], {
-            stdio: "inherit",
-            shell: !1
-          });
+        const flagArgs = process.argv.slice(3).filter(a => a !== resolvedScriptName);
+        const result = (0, import_node_child_process.spawnSync)("bun", [scriptPath, ...flagArgs], {
+          stdio: "inherit",
+          shell: false
+        });
         process.exit(result.status || 0);
       }
     }
@@ -110,7 +127,8 @@ const main = (0, import_citty.defineCommand)({
     changed: () => import("./commands/changed").then(m => m.changedCommand)
   },
   async run() {
-    if (!(process.argv.length > 2)) {
+    const hasArgs = process.argv.length > 2;
+    if (!hasArgs) {
       const {
         listAllScripts
       } = await import("./utils/script-listing");

package/dist/cjs/commands/changed.cjs

@@ -2,60 +2,64 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var changed_exports = {};
 __export(changed_exports, {
   changedCommand: () => changedCommand
 });
 module.exports = __toCommonJS(changed_exports);
-var import_node_child_process = require("node:child_process"),
-  import_node_fs = require("node:fs"),
-  import_node_path = require("node:path"),
-  import_citty = require("citty"),
-  import_picocolors = __toESM(require("picocolors"), 1);
-const UPSTREAM_REPO = "tamagui/takeout2",
-  UPSTREAM_REMOTE = "takeout-upstream",
-  TAKEOUT_FILE = ".takeout",
-  COMMIT_TYPE_ORDER = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci"];
+var import_node_child_process = require("node:child_process");
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
+var import_citty = require("citty");
+var import_picocolors = __toESM(require("picocolors"), 1);
+const UPSTREAM_REPO = "tamagui/takeout2";
+const UPSTREAM_REMOTE = "takeout-upstream";
+const TAKEOUT_FILE = ".takeout";
+const COMMIT_TYPE_ORDER = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci"];
 function readTakeoutConfig() {
   const configPath = (0, import_node_path.join)(process.cwd(), TAKEOUT_FILE);
-  if (!(0, import_node_fs.existsSync)(configPath)) return null;
+  if (!(0, import_node_fs.existsSync)(configPath)) {
+    return null;
+  }
   try {
-    const content = (0, import_node_fs.readFileSync)(configPath, "utf-8"),
-      config = {};
-    for (const line of content.split(`
-`)) {
+    const content = (0, import_node_fs.readFileSync)(configPath, "utf-8");
+    const config = {};
+    for (const line of content.split("\n")) {
       const trimmed = line.trim();
       if (trimmed.startsWith("#") || !trimmed) continue;
-      const [key, ...valueParts] = trimmed.split("="),
-        value = valueParts.join("=").trim();
-      key === "sha" && (config.sha = value), key === "date" && (config.date = value);
+      const [key, ...valueParts] = trimmed.split("=");
+      const value = valueParts.join("=").trim();
+      if (key === "sha") config.sha = value;
+      if (key === "date") config.date = value;
     }
     return config;
   } catch {
@@ -66,7 +70,9 @@ function parseConventionalCommit(message) {
   const match = message.match(/^(\w+)(?:\(([^)]+)\))?(!)?: (.+)$/);
   if (!match) return null;
   const [, type, scope, breaking, msg] = match;
-  return !type || !["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci", "build", "style"].includes(type) ? null : {
+  const validTypes = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci", "build", "style"];
+  if (!type || !validTypes.includes(type)) return null;
+  return {
     type,
     scope,
     message: msg || message,
@@ -75,35 +81,43 @@ function parseConventionalCommit(message) {
 }
 function ensureUpstreamRemote() {
   try {
-    return (0, import_node_child_process.execSync)("git remote", {
+    const remotes = (0, import_node_child_process.execSync)("git remote", {
       encoding: "utf-8"
-    }).includes(UPSTREAM_REMOTE) || (console.info(import_picocolors.default.dim(`  adding ${UPSTREAM_REMOTE} remote...`)), (0, import_node_child_process.execSync)(`git remote add ${UPSTREAM_REMOTE} git@github.com:${UPSTREAM_REPO}.git`, {
-      stdio: "pipe"
-    })), console.info(import_picocolors.default.dim(`  fetching from ${UPSTREAM_REMOTE}...`)), (0, import_node_child_process.execSync)(`git fetch ${UPSTREAM_REMOTE} --quiet`, {
+    });
+    if (!remotes.includes(UPSTREAM_REMOTE)) {
+      console.info(import_picocolors.default.dim(`  adding ${UPSTREAM_REMOTE} remote...`));
+      (0, import_node_child_process.execSync)(`git remote add ${UPSTREAM_REMOTE} git@github.com:${UPSTREAM_REPO}.git`, {
+        stdio: "pipe"
+      });
+    }
+    console.info(import_picocolors.default.dim(`  fetching from ${UPSTREAM_REMOTE}...`));
+    (0, import_node_child_process.execSync)(`git fetch ${UPSTREAM_REMOTE} --quiet`, {
       stdio: "pipe"
-    }), !0;
+    });
+    return true;
   } catch (err) {
-    return console.error(import_picocolors.default.red(`failed to setup upstream remote: ${err}`)), !1;
+    console.error(import_picocolors.default.red(`failed to setup upstream remote: ${err}`));
+    return false;
   }
 }
 function getCommitsBetween(fromSha, toRef) {
   const commits = [];
   try {
-    const lines = (0, import_node_child_process.execSync)(`git log ${fromSha}..${toRef} --pretty=format:"%H|%ad|%s" --date=short 2>/dev/null`, {
+    const result = (0, import_node_child_process.execSync)(`git log ${fromSha}..${toRef} --pretty=format:"%H|%ad|%s" --date=short 2>/dev/null`, {
       encoding: "utf-8",
-      maxBuffer: 10485760
-    }).trim().split(`
-`).filter(Boolean);
+      maxBuffer: 10 * 1024 * 1024
+    });
+    const lines = result.trim().split("\n").filter(Boolean);
     for (const line of lines) {
-      const [hash = "", date = "", ...messageParts] = line.split("|"),
-        message = messageParts.join("|"),
-        parsed = parseConventionalCommit(message);
+      const [hash = "", date = "", ...messageParts] = line.split("|");
+      const message = messageParts.join("|");
+      const parsed = parseConventionalCommit(message);
       commits.push({
         hash: hash.slice(0, 7),
         type: parsed?.type || "other",
         scope: parsed?.scope,
         message: parsed?.message || message,
-        breaking: parsed?.breaking || !1,
+        breaking: parsed?.breaking || false,
         date
       });
     }
@@ -118,53 +132,56 @@ function formatChangelog(commits) {
   const grouped = /* @__PURE__ */new Map();
   for (const commit of commits) {
     const existing = grouped.get(commit.type) || [];
-    existing.push(commit), grouped.set(commit.type, existing);
+    existing.push(commit);
+    grouped.set(commit.type, existing);
   }
   const sortedTypes = Array.from(grouped.keys()).sort((a, b) => {
-      const aIdx = COMMIT_TYPE_ORDER.indexOf(a),
-        bIdx = COMMIT_TYPE_ORDER.indexOf(b);
-      return (aIdx === -1 ? 999 : aIdx) - (bIdx === -1 ? 999 : bIdx);
-    }),
-    breakingChanges = commits.filter(c => c.breaking);
+    const aIdx = COMMIT_TYPE_ORDER.indexOf(a);
+    const bIdx = COMMIT_TYPE_ORDER.indexOf(b);
+    return (aIdx === -1 ? 999 : aIdx) - (bIdx === -1 ? 999 : bIdx);
+  });
+  const breakingChanges = commits.filter(c => c.breaking);
   if (breakingChanges.length > 0) {
-    console.info(), console.info(import_picocolors.default.red(import_picocolors.default.bold("  BREAKING CHANGES")));
+    console.info();
+    console.info(import_picocolors.default.red(import_picocolors.default.bold("  BREAKING CHANGES")));
     for (const commit of breakingChanges) {
       const scope = commit.scope ? import_picocolors.default.cyan(`(${commit.scope})`) : "";
       console.info(`    ${import_picocolors.default.red("!")} ${scope} ${commit.message} ${import_picocolors.default.dim(`(${commit.hash})`)}`);
     }
   }
   const typeLabels = {
-      feat: "Features",
-      fix: "Bug Fixes",
-      perf: "Performance",
-      refactor: "Refactoring",
-      docs: "Documentation",
-      chore: "Maintenance",
-      test: "Tests",
-      ci: "CI",
-      build: "Build",
-      style: "Style",
-      other: "Other"
-    },
-    typeColors = {
-      feat: import_picocolors.default.green,
-      fix: import_picocolors.default.yellow,
-      perf: import_picocolors.default.magenta,
-      refactor: import_picocolors.default.blue,
-      docs: import_picocolors.default.dim,
-      chore: import_picocolors.default.dim,
-      test: import_picocolors.default.dim,
-      ci: import_picocolors.default.dim,
-      build: import_picocolors.default.dim,
-      style: import_picocolors.default.dim,
-      other: import_picocolors.default.white
-    };
+    feat: "Features",
+    fix: "Bug Fixes",
+    perf: "Performance",
+    refactor: "Refactoring",
+    docs: "Documentation",
+    chore: "Maintenance",
+    test: "Tests",
+    ci: "CI",
+    build: "Build",
+    style: "Style",
+    other: "Other"
+  };
+  const typeColors = {
+    feat: import_picocolors.default.green,
+    fix: import_picocolors.default.yellow,
+    perf: import_picocolors.default.magenta,
+    refactor: import_picocolors.default.blue,
+    docs: import_picocolors.default.dim,
+    chore: import_picocolors.default.dim,
+    test: import_picocolors.default.dim,
+    ci: import_picocolors.default.dim,
+    build: import_picocolors.default.dim,
+    style: import_picocolors.default.dim,
+    other: import_picocolors.default.white
+  };
   for (const type of sortedTypes) {
     const typeCommits = grouped.get(type).filter(c => !c.breaking);
     if (typeCommits.length === 0) continue;
-    const label = typeLabels[type] || type,
-      color = typeColors[type] || import_picocolors.default.white;
-    console.info(), console.info(color(import_picocolors.default.bold(`  ${label}`)));
+    const label = typeLabels[type] || type;
+    const color = typeColors[type] || import_picocolors.default.white;
+    console.info();
+    console.info(color(import_picocolors.default.bold(`  ${label}`)));
     for (const commit of typeCommits) {
       const scope = commit.scope ? import_picocolors.default.cyan(`(${commit.scope}) `) : "";
       console.info(`    ${import_picocolors.default.dim("-")} ${scope}${commit.message} ${import_picocolors.default.dim(`(${commit.hash})`)}`);
@@ -189,24 +206,45 @@ const changedCommand = (0, import_citty.defineCommand)({
   async run({
     args
   }) {
-    console.info(), console.info(import_picocolors.default.bold(import_picocolors.default.cyan("Takeout Changes"))), console.info();
+    console.info();
+    console.info(import_picocolors.default.bold(import_picocolors.default.cyan("Takeout Changes")));
+    console.info();
     let fromSha = args.from;
     const config = readTakeoutConfig();
     if (!fromSha) {
       if (!config?.sha) {
-        console.info(import_picocolors.default.yellow("No .takeout file found with last sync SHA.")), console.info(), console.info(import_picocolors.default.dim("Either:")), console.info(import_picocolors.default.dim("  1. Create a .takeout file with: sha=<commit-sha>")), console.info(import_picocolors.default.dim("  2. Run with --from <sha> to specify starting point")), console.info(import_picocolors.default.dim("  3. Run `tko sync` to sync and create the file")), console.info();
+        console.info(import_picocolors.default.yellow("No .takeout file found with last sync SHA."));
+        console.info();
+        console.info(import_picocolors.default.dim("Either:"));
+        console.info(import_picocolors.default.dim("  1. Create a .takeout file with: sha=<commit-sha>"));
+        console.info(import_picocolors.default.dim("  2. Run with --from <sha> to specify starting point"));
+        console.info(import_picocolors.default.dim("  3. Run `tko sync` to sync and create the file"));
+        console.info();
         return;
       }
       fromSha = config.sha;
     }
-    if (!ensureUpstreamRemote()) return;
+    if (!ensureUpstreamRemote()) {
+      return;
+    }
     const toRef = args.to || `${UPSTREAM_REMOTE}/main`;
-    console.info(import_picocolors.default.dim(`  from: ${fromSha.slice(0, 7)}`)), console.info(import_picocolors.default.dim(`  to:   ${toRef}`)), config?.date && console.info(import_picocolors.default.dim(`  last sync: ${config.date}`));
+    console.info(import_picocolors.default.dim(`  from: ${fromSha.slice(0, 7)}`));
+    console.info(import_picocolors.default.dim(`  to:   ${toRef}`));
+    if (config?.date) {
+      console.info(import_picocolors.default.dim(`  last sync: ${config.date}`));
+    }
     const commits = getCommitsBetween(fromSha, toRef);
     if (commits.length === 0) {
-      console.info(), console.info(import_picocolors.default.green("\u2713 Already up to date with upstream!")), console.info();
+      console.info();
+      console.info(import_picocolors.default.green("\u2713 Already up to date with upstream!"));
+      console.info();
       return;
     }
-    console.info(), console.info(import_picocolors.default.bold(`${commits.length} commit${commits.length === 1 ? "" : "s"} since last sync:`)), formatChangelog(commits), console.info(), console.info(import_picocolors.default.dim("Run `tko sync` to sync these changes into your fork.")), console.info();
+    console.info();
+    console.info(import_picocolors.default.bold(`${commits.length} commit${commits.length === 1 ? "" : "s"} since last sync:`));
+    formatChangelog(commits);
+    console.info();
+    console.info(import_picocolors.default.dim("Run `tko sync` to sync these changes into your fork."));
+    console.info();
   }
 });