binary-collections 2.0.10 → 2.0.12

package/lib/submodule-install.cjs

@@ -68,31 +68,78 @@ var require_utils = __commonJS({
     }
     module2.exports.getArgs = getArgs2;
     function del(fullPath) {
-      if (fs2.statSync(fullPath).isDirectory()) {
-        const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
-        for (let i = 0; i < subdir.length; i++) {
-          del(subdir[i]);
+      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;
         }
-      } else {
         try {
-          fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+          fs2.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (_) {
-          console.log("failed delete", 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);
-        if (fs2.statSync(fullPath).isDirectory()) {
-          const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
-          for (let i = 0; i < subdir.length; i++) {
-            del(subdir[i]);
+        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);
         }
-        del(fullPath);
       });
     }
     module2.exports.delStream = delStream;
@@ -146,7 +193,7 @@ var fs = require("fs");
 var path = require("path");
 var dotenv = require("dotenv");
 var envPath = path.resolve(process.cwd(), ".env");
-if (fs.existsSync(envPath)) dotenv.config({ path: envPath });
+if (fs.existsSync(envPath)) dotenv.config({ path: envPath, override: true, quiet: true });
 var { getArgs } = require_utils();
 var args = getArgs();
 var positional = args._ || [];
@@ -180,15 +227,19 @@ if (VISITED_SUBMODULES.includes(CURRENT_PATH)) {
 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);
@@ -197,11 +248,14 @@ for (const line of submoduleList) {
     fs.rmSync(RELATIVE_MODULE_PATH, { recursive: true, force: true });
   }
   const NAME = KEY.match(/^submodule\.(.*)\.path$/)[1];
-  const URL2 = runGit(["config", "-f", ".gitmodules", "--get", `submodule.${NAME}.url`]).trim();
-  let BRANCH = "master";
+  const URL2 = 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)}`);
@@ -217,21 +271,29 @@ for (const line of submoduleList) {
     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, URL2, 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 URL_WITH_TOKEN;
     let repoInfo;
     if (URL2.includes("github.com")) {
       repoInfo = URL2.replace("https://github.com/", "");
@@ -244,27 +306,25 @@ for (const line of submoduleList) {
       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-install.mjs

@@ -2,7 +2,7 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_utils
-} from "./chunk-V3N3JEUF.mjs";
+} from "./chunk-5RTXZVCW.mjs";
 import {
   __commonJS,
   __filename,
@@ -20,7 +20,7 @@ var require_submodule_install = __commonJS({
     var path = __require("path");
     var dotenv = __require("dotenv");
     var envPath = path.resolve(process.cwd(), ".env");
-    if (fs.existsSync(envPath)) dotenv.config({ path: envPath });
+    if (fs.existsSync(envPath)) dotenv.config({ path: envPath, override: true, quiet: true });
     var { getArgs } = require_utils();
     var args = getArgs();
     var positional = args._ || [];
@@ -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,21 +98,29 @@ 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 URL_WITH_TOKEN;
         let repoInfo;
         if (URL.includes("github.com")) {
           repoInfo = URL.replace("https://github.com/", "");
@@ -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

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -41,7 +42,10 @@ var require_submodule_remove = __commonJS({
     var path2 = require("upath");
     var fs2 = require("fs-extra");
     var dotenv = require("dotenv");
-    dotenv.config({ path: path2.resolve(process.cwd(), ".env") });
+    var envPath = path2.resolve(process.cwd(), ".env");
+    if (fs2.existsSync(envPath)) {
+      dotenv.config({ path: envPath, override: true, quiet: true });
+    }
     async function removeSubmodule2(submodulePath2) {
       try {
         await spawnAsync("git", ["submodule", "deinit", "-f", submodulePath2], { stdio: "inherit" });
@@ -95,8 +99,7 @@ if (!submodulePath) {
   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

@@ -19,12 +19,12 @@ const submodule_remove_cjs_1 = __importDefault(require("./submodule-remove.cjs")
 const args = (0, minimist_1.default)(process.argv.slice(2));
 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

@@ -1,7 +1,7 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_submodule_remove
-} from "./chunk-6HHJRKFB.mjs";
+} from "./chunk-BZWVHODJ.mjs";
 import {
   __toESM,
   init_esm_shims
@@ -20,8 +20,7 @@ if (!submodulePath) {
   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/submodule-remove.cjs

@@ -3,7 +3,10 @@ var { spawnAsync } = require("cross-spawn");
 var path = require("upath");
 var fs = require("fs-extra");
 var dotenv = require("dotenv");
-dotenv.config({ path: path.resolve(process.cwd(), ".env") });
+var envPath = path.resolve(process.cwd(), ".env");
+if (fs.existsSync(envPath)) {
+  dotenv.config({ path: envPath, override: true, quiet: true });
+}
 async function removeSubmodule(submodulePath) {
   try {
     await spawnAsync("git", ["submodule", "deinit", "-f", submodulePath], { stdio: "inherit" });

package/lib/submodule-remove.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_submodule_remove
-} from "./chunk-6HHJRKFB.mjs";
+} from "./chunk-BZWVHODJ.mjs";
 import "./chunk-QQ4A6DLD.mjs";
 export default require_submodule_remove();