binary-collections 2.0.11 → 2.0.13

package/lib/submodule-install.mjs

@@ -2,7 +2,7 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_utils
-} from "./chunk-Z6JLYU2J.mjs";
+} from "./chunk-6RK5UCTP.mjs";
 import {
   __commonJS,
   __filename,
@@ -17,7 +17,7 @@ var require_submodule_install = __commonJS({
     var { spawnSync } = __require("child_process");
     var color = __require("ansi-colors");
     var fs = __require("fs");
-    var path = __require("path");
+    var path = __require("upath");
     var dotenv = __require("dotenv");
     var envPath = path.resolve(process.cwd(), ".env");
     if (fs.existsSync(envPath)) dotenv.config({ path: envPath, override: true, quiet: true });
@@ -37,7 +37,7 @@ var require_submodule_install = __commonJS({
       console.log();
       process.exit(0);
     }
-    var ACCESS_TOKEN = process.env.GITHUB_TOKEN || process.env.ACCESS_TOKEN;
+    var ACCESS_TOKEN = process.env.ACCESS_TOKEN || process.env.GITHUB_TOKEN;
     var ROOT = runGit(["rev-parse", "--show-toplevel"]).trim();
     var REPO_PATH = ROOT;
     if (args.cwd) {
@@ -54,15 +54,19 @@ var require_submodule_install = __commonJS({
     VISITED_SUBMODULES.push(CURRENT_PATH);
     process.env.VISITED_SUBMODULES = VISITED_SUBMODULES.join(path.delimiter);
     console.log(`Installing submodules at ${ROOT}`);
-    var submoduleList = runGit([
-      "-C",
-      REPO_PATH,
-      "config",
-      "-f",
-      ".gitmodules",
-      "--get-regexp",
-      "^submodule\\..*\\.path$"
-    ]).split("\n").filter(Boolean);
+    var ROOT_GITMODULES = path.join(REPO_PATH, ".gitmodules");
+    if (!fs.existsSync(ROOT_GITMODULES) || fs.statSync(ROOT_GITMODULES).size === 0) {
+      console.log(`No valid .gitmodules found at ${ROOT_GITMODULES}. Skipping submodule processing.`);
+      process.exit(0);
+    }
+    var submoduleList = [];
+    try {
+      const output = runGit(["-C", REPO_PATH, "config", "-f", ".gitmodules", "--get-regexp", "^submodule\\..*\\.path$"]);
+      submoduleList = output.split("\n").filter(Boolean);
+    } catch (err) {
+      console.log("No submodules found or .gitmodules invalid. Skipping.", err);
+      process.exit(0);
+    }
     for (const line of submoduleList) {
       const [KEY, MODULE_PATH] = line.trim().split(/\s+/);
       const RELATIVE_MODULE_PATH = path.join(ROOT, MODULE_PATH);
@@ -71,11 +75,14 @@ var require_submodule_install = __commonJS({
         fs.rmSync(RELATIVE_MODULE_PATH, { recursive: true, force: true });
       }
       const NAME = KEY.match(/^submodule\.(.*)\.path$/)[1];
-      const URL = runGit(["config", "-f", ".gitmodules", "--get", `submodule.${NAME}.url`]).trim();
-      let BRANCH = "master";
+      const URL = runGit(["-C", REPO_PATH, "config", "-f", ".gitmodules", "--get", `submodule.${NAME}.url`]).trim();
+      let BRANCH;
       try {
-        BRANCH = runGit(["config", "-f", ".gitmodules", "--get", `submodule.${NAME}.branch`]).trim();
-      } catch {
+        BRANCH = runGit(["-C", REPO_PATH, "config", "-f", ".gitmodules", "--get", `submodule.${NAME}.branch`]).trim();
+        if (!BRANCH) BRANCH = "master";
+      } catch (err) {
+        console.log(`Error occurred while fetching branch for submodule ${NAME}:`, err);
+        BRANCH = "master";
       }
       console.log(`Submodule: ${color.cyan(NAME)}`);
       console.log(`  Location: ${color.magenta(MODULE_PATH)}`);
@@ -91,19 +98,27 @@ var require_submodule_install = __commonJS({
         continue;
       }
       if (!fs.existsSync(RELATIVE_MODULE_PATH)) {
-        console.warn(`Submodule directory ${RELATIVE_MODULE_PATH} does not exist after add. Attempting manual clone...`);
+        console.warn(`Submodule directory missing. Attempting manual clone...`);
         try {
           runGit(["clone", "--branch", BRANCH, URL, RELATIVE_MODULE_PATH]);
         } catch (e) {
-          console.error(`Manual clone failed for ${RELATIVE_MODULE_PATH}: ${e.message}`);
+          console.error(`Manual clone failed: ${e.message}`);
           continue;
         }
         if (!fs.existsSync(RELATIVE_MODULE_PATH)) {
-          console.error(`Submodule directory ${RELATIVE_MODULE_PATH} still does not exist after manual clone. Skipping.`);
+          console.error(`Still missing after clone: ${RELATIVE_MODULE_PATH}`);
           continue;
         }
       }
       const GIT_MODULES = path.join(RELATIVE_MODULE_PATH, ".gitmodules");
+      if (!fs.existsSync(GIT_MODULES)) {
+        console.log(`No .gitmodules in ${RELATIVE_MODULE_PATH}. Skipping nested processing.`);
+        continue;
+      }
+      if (fs.statSync(GIT_MODULES).size === 0) {
+        console.log(`Empty .gitmodules in ${RELATIVE_MODULE_PATH}. Skipping nested processing.`);
+        continue;
+      }
       if (ACCESS_TOKEN) {
         let URL_WITH_TOKEN;
         let repoInfo;
@@ -118,27 +133,25 @@ var require_submodule_install = __commonJS({
           repoInfo = urlObj.pathname.substring(1);
           URL_WITH_TOKEN = `${urlObj.protocol}//${ACCESS_TOKEN}@${urlObj.host}${urlObj.pathname}`;
         }
-        if (URL_WITH_TOKEN && URL_WITH_TOKEN.length > 0) {
-          console.log(`Apply token for ${repoInfo} at ${MODULE_PATH} branch ${BRANCH}`);
+        if (URL_WITH_TOKEN) {
+          console.log(`Apply token for ${repoInfo} at ${MODULE_PATH}`);
           runGit(["-C", RELATIVE_MODULE_PATH, "remote", "set-url", "origin", URL_WITH_TOKEN]);
         }
       }
       runGit(["-C", RELATIVE_MODULE_PATH, "fetch", "--all"]);
       runGit(["-C", RELATIVE_MODULE_PATH, "pull", "origin", BRANCH, "-X", "theirs"]);
-      if (fs.existsSync(GIT_MODULES)) {
-        console.log(`${MODULE_PATH} has submodules`);
-        const env = Object.assign({}, process.env, {
-          VISITED_SUBMODULES: process.env.VISITED_SUBMODULES + path.delimiter + path.resolve(RELATIVE_MODULE_PATH)
-        });
-        const result = spawnSync("node", [__filename, "-cwd", RELATIVE_MODULE_PATH], {
-          stdio: "inherit",
-          env,
-          cwd: RELATIVE_MODULE_PATH
-        });
-        if (result.status !== 0) {
-          console.error(`Recursive submodule failed for ${RELATIVE_MODULE_PATH}`);
-          process.exit(result.status);
-        }
+      console.log(`${MODULE_PATH} has submodules`);
+      const env = Object.assign({}, process.env, {
+        VISITED_SUBMODULES: process.env.VISITED_SUBMODULES + path.delimiter + path.resolve(RELATIVE_MODULE_PATH)
+      });
+      const result = spawnSync("node", [__filename, "-cwd", RELATIVE_MODULE_PATH], {
+        stdio: "inherit",
+        env,
+        cwd: RELATIVE_MODULE_PATH
+      });
+      if (result.status !== 0) {
+        console.error(`Recursive submodule failed for ${RELATIVE_MODULE_PATH}`);
+        process.exit(result.status);
       }
     }
     runGit(["-C", REPO_PATH, "submodule", "update", "--init", "--recursive"]);

package/lib/submodule-remove-cli.cjs

@@ -34,6 +34,173 @@ var init_cjs_shims = __esm({
   }
 });
 
+// src/utils/index.cjs
+var require_utils = __commonJS({
+  "src/utils/index.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var fs2 = require("fs");
+    var path2 = require("upath");
+    var minimistLib = require("minimist");
+    var argv = minimistLib(process.argv.slice(2));
+    var { exec } = require("child_process");
+    var { promisify } = require("util");
+    var execAsync = promisify(exec);
+    async function parseGitRemotes() {
+      try {
+        const { stdout } = await execAsync("git remote -v");
+        const lines = stdout.split("\n");
+        const remotes = {};
+        lines.forEach((line) => {
+          const [name, url] = line.split("	");
+          if (name && url) {
+            const [repoUrl] = url.split(" ");
+            try {
+              const parsedUrl = new URL(repoUrl);
+              const pathParts = parsedUrl.pathname.split("/").filter(Boolean);
+              if (parsedUrl.hostname === "github.com" && pathParts.length === 2) {
+                let repoPath = pathParts.join("/");
+                if (repoPath.endsWith(".git")) {
+                  repoPath = repoPath.slice(0, -4);
+                }
+                remotes[name] = repoPath;
+              }
+            } catch (e) {
+              console.error("URL Parsing Error:", e.message);
+            }
+          }
+        });
+        return remotes;
+      } catch (error) {
+        console.error("Error:", error.message);
+        return {};
+      }
+    }
+    module2.exports.parseGitRemotes = parseGitRemotes;
+    function getArgs2(opts) {
+      if (opts) {
+        return minimistLib(process.argv.slice(2), opts);
+      }
+      return argv;
+    }
+    module2.exports.getArgs = getArgs2;
+    function del(fullPath) {
+      try {
+        if (!fs2.existsSync(fullPath)) return;
+        const stat = fs2.lstatSync(fullPath);
+        if (stat.isSymbolicLink()) {
+          try {
+            fs2.unlinkSync(fullPath);
+            console.log("deleted symlink", fullPath);
+          } catch (e) {
+            console.log("failed delete symlink", fullPath, e && e.message);
+          }
+          return;
+        }
+        if (stat.isDirectory()) {
+          const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
+          for (let i = 0; i < subdir.length; i++) {
+            del(subdir[i]);
+          }
+          try {
+            fs2.rmdirSync(fullPath);
+            console.log("deleted", fullPath);
+          } catch (_e) {
+            try {
+              fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              console.log("deleted", fullPath);
+            } catch (ee) {
+              console.log("failed delete", fullPath, ee && ee.message);
+            }
+          }
+          return;
+        }
+        try {
+          fs2.unlinkSync(fullPath);
+          console.log("deleted", fullPath);
+        } catch (_e) {
+          try {
+            fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+            console.log("deleted", fullPath);
+          } catch (ee) {
+            console.log("failed delete", fullPath, ee && ee.message);
+          }
+        }
+      } catch (err) {
+        console.log("failed delete", fullPath, err && err.message);
+      }
+    }
+    module2.exports.del = del;
+    function delStream(globStream) {
+      globStream.stream().on("data", (result) => {
+        const fullPath = path2.resolve(process.cwd(), result);
+        try {
+          if (fs2.existsSync(fullPath)) {
+            const stat = fs2.lstatSync(fullPath);
+            if (stat.isSymbolicLink()) {
+              try {
+                fs2.unlinkSync(fullPath);
+                console.log("deleted symlink", fullPath);
+              } catch (e) {
+                console.log("failed delete symlink", fullPath, e && e.message);
+              }
+              return;
+            }
+            if (stat.isDirectory()) {
+              const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
+              for (let i = 0; i < subdir.length; i++) {
+                del(subdir[i]);
+              }
+            }
+          }
+          del(fullPath);
+        } catch (err) {
+          console.log("failed processing", fullPath, err && err.message);
+        }
+      });
+    }
+    module2.exports.delStream = delStream;
+    function getFileTreeString(hashArray) {
+      const tree = {};
+      const hashMap = {};
+      for (const entry of hashArray) {
+        const [filePath, hash] = entry.split(" ");
+        hashMap[filePath] = hash;
+        const parts = filePath.split("/");
+        let current = tree;
+        for (let i = 0; i < parts.length; i++) {
+          const part = parts[i];
+          if (i === parts.length - 1) {
+            current[part] = null;
+          } else {
+            current[part] = current[part] || {};
+            current = current[part];
+          }
+        }
+      }
+      function printNode(node, prefix = "", parentPath = "") {
+        const keys = Object.keys(node).sort();
+        let lines = [];
+        keys.forEach((key, idx) => {
+          const isLast = idx === keys.length - 1;
+          const branch = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
+          const currentPath = parentPath ? parentPath + "/" + key : key;
+          if (node[key] === null) {
+            lines.push(prefix + branch + key + " [" + (hashMap[currentPath] || "") + "]");
+          } else {
+            lines.push(prefix + branch + key + "/");
+            lines = lines.concat(printNode(node[key], prefix + (isLast ? "    " : "\u2502   "), currentPath));
+          }
+        });
+        return lines;
+      }
+      return printNode(tree, "", "").join("\n");
+    }
+    module2.exports.getFileTreeString = getFileTreeString;
+    var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    module2.exports.delay = delay;
+  }
+});
+
 // src/submodule-remove.cjs
 var require_submodule_remove = __commonJS({
   "src/submodule-remove.cjs"(exports2, module2) {
@@ -89,18 +256,17 @@ var require_submodule_remove = __commonJS({
 // src/submodule-remove-cli.js
 init_cjs_shims();
 var import_fs_extra = __toESM(require("fs-extra"), 1);
-var import_minimist = __toESM(require("minimist"), 1);
+var import_utils = __toESM(require_utils(), 1);
 var import_upath = __toESM(require("upath"), 1);
 var import_submodule_remove = __toESM(require_submodule_remove(), 1);
-var args = (0, import_minimist.default)(process.argv.slice(2));
+var args = (0, import_utils.getArgs)();
 var submodulePath = args._[0];
 if (!submodulePath) {
   console.error("Usage: node submodule-remove.cjs <submodule-path>");
   process.exit(1);
 }
 if (!import_fs_extra.default.existsSync(import_upath.default.resolve(submodulePath))) {
-  console.error(`Error: The path "${submodulePath}" does not exist.`);
-  process.exit(1);
+  console.warn(`Error: The path "${submodulePath}" does not exist, continue deinitialization and cleanup steps.`);
 }
 (async () => {
   await (0, import_submodule_remove.default)(submodulePath);

package/lib/submodule-remove-cli.js

@@ -13,18 +13,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const minimist_1 = __importDefault(require("minimist"));
+const index_cjs_1 = require("./utils/index.cjs");
 const upath_1 = __importDefault(require("upath"));
 const submodule_remove_cjs_1 = __importDefault(require("./submodule-remove.cjs"));
-const args = (0, minimist_1.default)(process.argv.slice(2));
+const args = (0, index_cjs_1.getArgs)();
 const submodulePath = args._[0];
 if (!submodulePath) {
-    console.error("Usage: node submodule-remove.cjs <submodule-path>");
+    console.error('Usage: node submodule-remove.cjs <submodule-path>');
     process.exit(1);
 }
 if (!fs_extra_1.default.existsSync(upath_1.default.resolve(submodulePath))) {
-    console.error(`Error: The path "${submodulePath}" does not exist.`);
-    process.exit(1);
+    console.warn(`Error: The path "${submodulePath}" does not exist, continue deinitialization and cleanup steps.`);
+    // process.exit(1);
 }
 (() => __awaiter(void 0, void 0, void 0, function* () {
     yield (0, submodule_remove_cjs_1.default)(submodulePath);

package/lib/submodule-remove-cli.mjs

@@ -2,6 +2,9 @@ import { createRequire } from 'module'; const require = createRequire(import.met
 import {
   require_submodule_remove
 } from "./chunk-BZWVHODJ.mjs";
+import {
+  require_utils
+} from "./chunk-6RK5UCTP.mjs";
 import {
   __toESM,
   init_esm_shims
@@ -9,19 +12,18 @@ import {
 
 // src/submodule-remove-cli.js
 init_esm_shims();
+var import_utils = __toESM(require_utils(), 1);
 var import_submodule_remove = __toESM(require_submodule_remove(), 1);
 import fs from "fs-extra";
-import minimist from "minimist";
 import path from "upath";
-var args = minimist(process.argv.slice(2));
+var args = (0, import_utils.getArgs)();
 var submodulePath = args._[0];
 if (!submodulePath) {
   console.error("Usage: node submodule-remove.cjs <submodule-path>");
   process.exit(1);
 }
 if (!fs.existsSync(path.resolve(submodulePath))) {
-  console.error(`Error: The path "${submodulePath}" does not exist.`);
-  process.exit(1);
+  console.warn(`Error: The path "${submodulePath}" does not exist, continue deinitialization and cleanup steps.`);
 }
 (async () => {
   await (0, import_submodule_remove.default)(submodulePath);

package/lib/utils/chatgpt.cjs

@@ -147,7 +147,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(
@@ -163,18 +166,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 = [