binary-collections 2.0.11 → 2.0.13

package/lib/git-diff.cjs

@@ -42,12 +42,108 @@ var init_cjs_shims = __esm({
   }
 });
 
-// src/binary-collections-config.cjs
-var require_binary_collections_config = __commonJS({
-  "src/binary-collections-config.cjs"(exports2, module2) {
+// src/utils/findEnvFiles.cjs
+var require_findEnvFiles = __commonJS({
+  "src/utils/findEnvFiles.cjs"(exports2, module2) {
     init_cjs_shims();
+    var fs3 = require("fs");
     var path3 = require("path");
-    require("dotenv").config({ path: path3.join(process.cwd(), ".env"), quiet: true, override: true });
+    var glob = require("glob");
+    var DEFAULT_IGNORES = [
+      "**/node_modules/**",
+      "**/.git/**",
+      "**/.yarn/**",
+      "**/.pnpm/**",
+      "**/dist/**",
+      "**/build/**",
+      "**/coverage/**",
+      "**/vendor/**",
+      "**/tmp/**",
+      "**/.cache/**",
+      "**/assets/**",
+      "**/logs/**",
+      "**/output/**",
+      "**/public/**",
+      "**/static/**",
+      "**/temp/**",
+      "**/backup/**",
+      "**/backups/**",
+      "**/examples/**",
+      "**/docs/**",
+      "**/tests/**",
+      "**/__tests__/**",
+      "**/spec/**",
+      "**/__specs__/**",
+      "**/scripts/**",
+      "**/bin/**",
+      "**/hooks/**",
+      "**/config/**",
+      "**/configs/**",
+      "**/settings/**",
+      "**/.vscode/**",
+      "**/.idea/**"
+    ];
+    function findEnvFiles(startDir = process.cwd(), filter) {
+      const found = /* @__PURE__ */ new Set();
+      function addFile(file) {
+        const normalized = path3.normalize(file);
+        if (typeof filter === "function" && !filter(normalized)) {
+          return;
+        }
+        found.add(normalized);
+      }
+      let current = path3.resolve(startDir);
+      while (true) {
+        const envPath = path3.join(current, ".env");
+        if (fs3.existsSync(envPath)) {
+          addFile(envPath);
+        }
+        const parent = path3.dirname(current);
+        if (parent === current) {
+          break;
+        }
+        current = parent;
+      }
+      const files = glob.globSync("**/.env*", {
+        cwd: startDir,
+        absolute: true,
+        nodir: true,
+        ignore: DEFAULT_IGNORES
+      });
+      for (const file of files) {
+        addFile(file);
+      }
+      return [...found];
+    }
+    function findEnvWithToken(startDir = process.cwd(), tokenName = "GITHUB_TOKEN") {
+      const envFiles = findEnvFiles(startDir);
+      return envFiles.find((file) => {
+        try {
+          const content = fs3.readFileSync(file, "utf-8");
+          const regex = new RegExp(`^\\s*${tokenName}\\s*=`, "m");
+          return regex.test(content);
+        } catch (err) {
+          console.warn(`Failed to read ${file}: ${err instanceof Error ? err.message : String(err)}`);
+          return false;
+        }
+      });
+    }
+    module2.exports = {
+      DEFAULT_IGNORES,
+      findEnvFiles,
+      findEnvWithToken,
+      default: findEnvFiles
+    };
+  }
+});
+
+// src/binary-collections/config.cjs
+var require_config = __commonJS({
+  "src/binary-collections/config.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var path3 = require("upath");
+    var { findEnvWithToken } = require_findEnvFiles();
+    require("dotenv").config({ path: findEnvWithToken(), quiet: true, overwrite: true });
     function getTempDir() {
       return process.env.TEMP_DIR || path3.join(process.cwd(), "tmp");
     }
@@ -69,9 +165,9 @@ var require_utils = __commonJS({
     init_cjs_shims();
     var fs3 = require("fs");
     var path3 = require("upath");
-    var argv = require("minimist")(process.argv.slice(2));
+    var minimistLib = require("minimist");
+    var argv = minimistLib(process.argv.slice(2));
     var { exec } = require("child_process");
-    var { URL: URL2 } = require("url");
     var { promisify } = require("util");
     var execAsync = promisify(exec);
     async function parseGitRemotes() {
@@ -84,7 +180,7 @@ var require_utils = __commonJS({
           if (name && url) {
             const [repoUrl] = url.split(" ");
             try {
-              const parsedUrl = new URL2(repoUrl);
+              const parsedUrl = new URL(repoUrl);
               const pathParts = parsedUrl.pathname.split("/").filter(Boolean);
               if (parsedUrl.hostname === "github.com" && pathParts.length === 2) {
                 let repoPath = pathParts.join("/");
@@ -105,15 +201,10 @@ var require_utils = __commonJS({
       }
     }
     module2.exports.parseGitRemotes = parseGitRemotes;
-    function joinPathPreserveDriveLetter(...segments) {
-      let fullPath = require("path").join(...segments);
-      if (/^[a-z]:\\/.test(fullPath)) {
-        fullPath = fullPath.charAt(0).toUpperCase() + fullPath.slice(1);
+    function getArgs2(opts) {
+      if (opts) {
+        return minimistLib(process.argv.slice(2), opts);
       }
-      return fullPath;
-    }
-    module2.exports.joinPathPreserveDriveLetter = joinPathPreserveDriveLetter;
-    function getArgs2() {
       return argv;
     }
     module2.exports.getArgs = getArgs2;
@@ -138,7 +229,7 @@ var require_utils = __commonJS({
           try {
             fs3.rmdirSync(fullPath);
             console.log("deleted", fullPath);
-          } catch (e) {
+          } catch (_e) {
             try {
               fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
               console.log("deleted", fullPath);
@@ -151,7 +242,7 @@ var require_utils = __commonJS({
         try {
           fs3.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (e) {
+        } catch (_e) {
           try {
             fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
             console.log("deleted", fullPath);
@@ -249,11 +340,13 @@ __export(git_diff_exports, {
 });
 module.exports = __toCommonJS(git_diff_exports);
 init_cjs_shims();
+var import_ansi_colors = __toESM(require("ansi-colors"), 1);
 var import_child_process = require("child_process");
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
+var import_sbg_utility = require("sbg-utility");
 var import_upath2 = __toESM(require("upath"), 1);
 var import_url = require("url");
-var import_binary_collections_config = __toESM(require_binary_collections_config(), 1);
+var import_config = __toESM(require_config(), 1);
 
 // src/utils/chatgpt.js
 init_cjs_shims();
@@ -372,7 +465,10 @@ async function writeQuestion(page, question) {
 async function clickSubmitButton(page) {
   console.log("Attempting to click the submit button...");
   try {
-    const userMessageCountBefore = await page.$$eval('[data-message-author-role="user"]', (elements) => elements.length);
+    const userMessageCountBefore = await page.$$eval(
+      '[data-message-author-role="user"]',
+      (elements) => elements.length
+    );
     const waitForSubmit = async (timeout = 5e3) => {
       try {
         await page.waitForFunction(
@@ -388,18 +484,21 @@ async function clickSubmitButton(page) {
         return false;
       }
     };
-    await page.waitForFunction(() => {
-      const candidates = [
-        document.querySelector('[data-testid="fruitjuice-send-button"]'),
-        document.querySelector("#composer-submit-button"),
-        document.querySelector('[data-testid="send-button"]')
-      ].filter(Boolean);
-      return candidates.some((button) => {
-        const isDisabled = button.disabled || button.getAttribute("aria-disabled") === "true";
-        const isVisible = button.offsetParent !== null;
-        return !isDisabled && isVisible;
-      });
-    }, { timeout: 5e3 }).catch(() => {
+    await page.waitForFunction(
+      () => {
+        const candidates = [
+          document.querySelector('[data-testid="fruitjuice-send-button"]'),
+          document.querySelector("#composer-submit-button"),
+          document.querySelector('[data-testid="send-button"]')
+        ].filter(Boolean);
+        return candidates.some((button) => {
+          const isDisabled = button.disabled || button.getAttribute("aria-disabled") === "true";
+          const isVisible = button.offsetParent !== null;
+          return !isDisabled && isVisible;
+        });
+      },
+      { timeout: 5e3 }
+    ).catch(() => {
     });
     const buttonDetails = await page.evaluate(() => {
       const selectors = [
@@ -765,22 +864,26 @@ async function runChatGpt(chatgptOptions = {}) {
 var import_utils = __toESM(require_utils(), 1);
 var __filename2 = (0, import_url.fileURLToPath)(importMetaUrl);
 var __dirname = import_upath2.default.dirname(__filename2);
-var DIFF_OUTPUT = (0, import_binary_collections_config.getTempPath)("git-diff.txt");
-var GPT_DIFF_OUTPUT = (0, import_binary_collections_config.getTempPath)("gpt-question.txt");
+var args = (0, import_utils.getArgs)();
+var positional = args._ || [];
+var FILENAME = (0, import_sbg_utility.md5)((positional[0] || "default") + JSON.stringify(args));
+var DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/${FILENAME}.txt`);
+var GPT_DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/gpt-${FILENAME}.txt`);
 var CACHE_DIR = import_upath2.default.dirname(DIFF_OUTPUT);
 var DIFF_OUTPUT_RELATIVE = import_upath2.default.relative(process.cwd(), DIFF_OUTPUT);
 var GPT_DIFF_OUTPUT_RELATIVE = import_upath2.default.relative(process.cwd(), GPT_DIFF_OUTPUT);
-if (!import_fs_extra2.default.existsSync(CACHE_DIR)) {
-  import_fs_extra2.default.mkdirSync(CACHE_DIR, { recursive: true });
-}
+import_fs_extra2.default.ensureDirSync(CACHE_DIR, { mode: 493 });
 function showHelp() {
-  console.log("\u{1F4DD} Git Diff Helper");
-  console.log("\u{1F4C4} Usage:");
-  console.log("  \u{1F4C2} git-diff FILE             Show staged diff of specified file");
-  console.log("  \u{1F4C2} git-diff --staged-only    Show staged diff of all files");
-  console.log("  \u{1F4C2} git-diff -s | -S          Same as --staged-only");
-  console.log("  \u{1F4C2} git-diff --ai             Run ChatGPT automation for commit message");
-  console.log("  \u{1F4C2} git-diff --help | -h      Show this help message");
+  console.log("\u{1F4CB} Git Diff Helper");
+  console.log("Usage:");
+  console.log("  git-diff FILE             Show staged diff of specified file");
+  console.log("  git-diff --staged-only    Show staged diff of all files");
+  console.log("  git-diff -s | -S          Same as --staged-only");
+  console.log("  git-diff --unstaged FILE  Show unstaged diff of specified file");
+  console.log("  git-diff --unstaged       Show unstaged diff of all files");
+  console.log("  git-diff -u               Same as --unstaged");
+  console.log("  git-diff --ai             Run ChatGPT automation for commit message");
+  console.log("  git-diff --help | -h      Show this help message");
   console.log("");
   console.log(`\u{1F4BE} Output is saved to: ${DIFF_OUTPUT_RELATIVE}`);
   console.log(`\u{1F916} GPT prompt is saved to: ${GPT_DIFF_OUTPUT_RELATIVE}`);
@@ -788,22 +891,22 @@ function showHelp() {
 }
 function runGitDiff(command, successMessage, errorMessage) {
   try {
-    console.log(`\u{1F50D} [i] Running command: ${command}`);
+    console.log(`\u2139\uFE0F  Running command: ${command}`);
     const result = (0, import_child_process.execSync)(command, {
       encoding: "utf8",
       maxBuffer: 1024 * 1024 * 10
       // 10MB buffer to handle large diffs
     });
     if (!result || result.trim() === "") {
-      console.log(`\u2139\uFE0F [i] No changes found for the specified criteria`);
-      import_fs_extra2.default.writeFileSync(DIFF_OUTPUT, "# No changes found\n");
+      console.log(`\u2139\uFE0F  No changes found for the specified criteria`);
+      (0, import_sbg_utility.writefile)(DIFF_OUTPUT, "# No changes found\n");
       console.log(`\u2705 Empty diff saved to "${DIFF_OUTPUT_RELATIVE}"`);
-      return;
+      return false;
     }
-    import_fs_extra2.default.writeFileSync(DIFF_OUTPUT, result);
-    import_fs_extra2.default.writeFileSync(
+    (0, import_sbg_utility.writefile)(DIFF_OUTPUT, result);
+    (0, import_sbg_utility.writefile)(
       GPT_DIFF_OUTPUT,
-      `Hello, ChatGPT!
+      `Hello!
 Can you create a conventional commit message by diff content below:
 
 \`\`\`${result}
@@ -814,45 +917,149 @@ Give me result as codeblock with language "text" only.
 Thank you!`
     );
     console.log(`\u2705 ${successMessage}`);
-    console.log(`\u{1F4BE} GPT diff prompt saved to "${GPT_DIFF_OUTPUT_RELATIVE}"`);
+    console.log(`\u{1F4BE} GPT diff prompt saved to "${import_ansi_colors.default.green(GPT_DIFF_OUTPUT_RELATIVE)}"`);
+    return true;
   } catch (error) {
     console.error(`\u274C ${errorMessage}`);
-    console.error(`\u{1F4DD} Command: ${command}`);
-    console.error(`\u26A0\uFE0F Error: ${error.message}`);
+    console.error(`\u274C Command: ${command}`);
+    console.error(`\u274C Error: ${error.message}`);
     if (error.message.includes("not a git repository")) {
-      console.error("\u{1F6A7} Make sure you are in a git repository");
+      console.error("\u274C Make sure you are in a git repository");
     }
     process.exit(1);
   }
 }
+function getUntrackedDiff() {
+  try {
+    const untrackedStr = (0, import_child_process.execSync)("git ls-files --others --exclude-standard", {
+      encoding: "utf8",
+      maxBuffer: 1024 * 1024 * 10
+    }).trim();
+    if (!untrackedStr) return "";
+    const untrackedFiles = untrackedStr.split("\n").filter(function(f) {
+      return f;
+    });
+    if (untrackedFiles.length === 0) return "";
+    var result = "\n# Untracked files:\n";
+    for (var i = 0; i < untrackedFiles.length; i++) {
+      var file = untrackedFiles[i];
+      if (!import_fs_extra2.default.existsSync(file)) continue;
+      var stat = import_fs_extra2.default.statSync(file);
+      if (!stat.isFile()) continue;
+      var content;
+      try {
+        content = import_fs_extra2.default.readFileSync(file, "utf8");
+      } catch (_a) {
+        continue;
+      }
+      var lines = content.split("\n");
+      if (lines.length > 0 && lines[lines.length - 1] === "") {
+        lines.pop();
+      }
+      result += "diff --git a/" + file + " b/" + file + "\n";
+      result += "new file mode 100644\n";
+      result += "index 0000000..0000000\n";
+      result += "--- /dev/null\n";
+      result += "+++ b/" + file + "\n";
+      result += "@@ -0,0 +1," + (lines.length || 0) + " @@\n";
+      for (var j = 0; j < lines.length; j++) {
+        result += "+" + lines[j] + "\n";
+      }
+    }
+    return result;
+  } catch (_b) {
+    return "";
+  }
+}
+function fileHasChanges(file, mode) {
+  const command = mode === "staged" ? `git diff --cached --quiet -- "${file}"` : `git diff --quiet -- "${file}"`;
+  try {
+    (0, import_child_process.execSync)(command, { stdio: "ignore" });
+    return false;
+  } catch (error) {
+    if (error.status === 1) {
+      return true;
+    }
+    throw error;
+  }
+}
 async function mainGitDiff() {
-  const args = (0, import_utils.getArgs)();
-  const positional = args._ || [];
   if (args.help || args.h) {
     showHelp();
   }
+  const useUnstaged = args.unstaged || args.u;
+  const fileFromFlag = typeof args.unstaged === "string" ? args.unstaged : typeof args.u === "string" ? args.u : null;
+  let hasDiff = false;
   if (args["staged-only"] || args.s || args.S) {
-    runGitDiff(
+    hasDiff = runGitDiff(
       "git --no-pager diff --staged",
-      `Full staged diff saved to "${DIFF_OUTPUT_RELATIVE}"`,
+      `Full staged diff saved to "${import_ansi_colors.default.green(DIFF_OUTPUT_RELATIVE)}"`,
       "Failed to save staged diff"
     );
   } else {
-    const file = positional[0];
+    const file = positional[0] || fileFromFlag;
     if (!file) {
-      runGitDiff(
+      const fullDiffModeLabel = useUnstaged ? "unstaged" : "unstaged";
+      hasDiff = runGitDiff(
         "git --no-pager diff",
-        `Full staged diff saved to "${DIFF_OUTPUT_RELATIVE}"`,
+        `Full ${fullDiffModeLabel} diff saved to "${import_ansi_colors.default.green(DIFF_OUTPUT_RELATIVE)}"`,
         "Failed to save all diff's"
       );
+      const untrackedDiff = getUntrackedDiff();
+      if (untrackedDiff) {
+        const UNTRACKED_DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/untracked-${FILENAME}.txt`);
+        const UNTRACKED_GPT_DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/gpt-untracked-${FILENAME}.txt`);
+        const UNTRACKED_DIFF_OUTPUT_RELATIVE = import_upath2.default.relative(process.cwd(), UNTRACKED_DIFF_OUTPUT);
+        (0, import_sbg_utility.writefile)(UNTRACKED_DIFF_OUTPUT, untrackedDiff);
+        (0, import_sbg_utility.writefile)(
+          UNTRACKED_GPT_DIFF_OUTPUT,
+          `Hello!
+Can you create a conventional commit message by diff content below:
+
+\`\`\`${untrackedDiff}
+\`\`\`
+
+Give me result as codeblock with language "text" only.
+
+Thank you!`
+        );
+        console.log(`\u2705 Untracked file diff saved to "${import_ansi_colors.default.green(UNTRACKED_DIFF_OUTPUT_RELATIVE)}"`);
+        console.log(
+          `\u{1F4BE} AI diff prompt saved to "${import_ansi_colors.default.green(import_upath2.default.relative(process.cwd(), UNTRACKED_GPT_DIFF_OUTPUT))}"`
+        );
+        hasDiff = true;
+      }
     } else {
-      runGitDiff(
-        `git --no-pager diff --cached -- "${file}"`,
-        `Staged diff of "${file}" saved to "${DIFF_OUTPUT_RELATIVE}"`,
-        `Failed to generate diff for "${file}"`
+      let fileDiffMode = useUnstaged ? "unstaged" : "staged";
+      if (!useUnstaged && !fileHasChanges(file, "staged") && fileHasChanges(file, "unstaged")) {
+        fileDiffMode = "unstaged";
+      }
+      hasDiff = runGitDiff(
+        fileDiffMode === "unstaged" ? `git --no-pager diff -- "${file}"` : `git --no-pager diff --cached -- "${file}"`,
+        `${fileDiffMode[0].toUpperCase() + fileDiffMode.slice(1)} diff of "${file}" saved to "${import_ansi_colors.default.green(
+          DIFF_OUTPUT_RELATIVE
+        )}"`,
+        `Failed to generate ${fileDiffMode} diff for "${file}"`
       );
     }
   }
+  if (hasDiff) {
+    const opencodePrompt = [
+      "",
+      "\u{1F916} OpenCode Prompt Helper",
+      "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+      "",
+      "\u{1F4C4} App Prompt:",
+      `   Generate a conventional commit message from diff file: ${DIFF_OUTPUT}`,
+      "",
+      "\u{1F4BB} CLI Command:",
+      `   opencode run "Generate a conventional commit message from diff file ${DIFF_OUTPUT}"`,
+      ""
+    ];
+    const opencodePromptPath = (0, import_config.getTempPath)(`git-diff/opencode-${FILENAME}.txt`);
+    (0, import_sbg_utility.writefile)(opencodePromptPath, opencodePrompt.join("\n"));
+    console.log(`\u2705 OpenCode prompt saved to "${import_ansi_colors.default.green(import_upath2.default.relative(process.cwd(), opencodePromptPath))}"`);
+  }
   if (args.ai) {
     try {
       await runChatGpt({ headless: true, questionFile: GPT_DIFF_OUTPUT });
@@ -861,7 +1068,7 @@ async function mainGitDiff() {
       console.error("\u{1F4A1} Try running with visible browser mode or check if Chrome is installed");
     }
   } else {
-    console.log("\u{1F4A1} Tip: Use --ai flag to generate commit message with ChatGPT");
+    console.log("\u{1F4A1} Use --ai flag to generate commit message with ChatGPT");
   }
 }
 var git_diff_default = runGitDiff;

package/lib/git-diff.d.ts

@@ -10,6 +10,7 @@ export default runGitDiff;
  * @param {string} command - The git command to execute (e.g., "git --no-pager diff --staged")
  * @param {string} successMessage - Message to display when the command executes successfully
  * @param {string} errorMessage - Message to display when the command fails
+ * @returns {boolean} True when diff content exists, false when no changes were found
  *
  * @throws {Error} Exits the process with code 1 if the git command fails
  *
@@ -29,7 +30,7 @@ export default runGitDiff;
  *   'Failed to generate file diff'
  * );
  */
-declare function runGitDiff(command: string, successMessage: string, errorMessage: string): void;
+declare function runGitDiff(command: string, successMessage: string, errorMessage: string): boolean;
 export const CACHE_DIR: string;
 export const DIFF_OUTPUT: string;
 export const DIFF_OUTPUT_RELATIVE: string;