@sfmc-bds/cli 0.2.0-beta.0 → 0.2.0-beta.10

package/dist/world-packs.js

@@ -1,13 +1,8 @@
 import { confirm, isCancel, multiselect } from "@clack/prompts";
-import crypto from "node:crypto";
-import fs from "node:fs";
-import path from "node:path";
 import {
   bumpPackPatchVersion,
-  discoverPackRoots,
   disableInstalledPack,
   enableInstalledPack,
-  extractArchiveToTemp,
   findInstalledPackById,
   installPackDirectory,
   isPackArchive,
@@ -15,24 +10,29 @@ import {
   listWorldEnableListResult,
   readPackDependencyUuids,
   readPackManifestInfo,
+  resolvePackRoots,
   uninstallInstalledPack,
   worldPackParentDir
 } from "@sfmc-bds/bds-tools/world-packs";
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
 import { t } from "./i18n/index.js";
+import { pushLog } from "./logs.js";
 import { BP_NAME, RP_NAME, resolveBdsContext } from "./pack-lifecycle.js";
 import {
   bindPackSource,
   bindingLabelForUuid,
   checkPackUpdates,
   formatSourcesList,
+  getBinding,
+  packSourcesPath,
   probeSourceAfterInstall,
-  searchRemote
-} from "./pack-update/service.js";
-import { getBinding, removeBinding, packSourcesPath } from "./pack-update/bindings.js";
-import {
+  removeBinding,
   resolvePackTrashDir,
-  resolveUninstallTrashDir
-} from "./pack-update/config.js";
+  resolveUninstallTrashDir,
+  searchRemote
+} from "./pack-update/index.js";
 import { ROOT } from "./runtime.js";
 import { c } from "./theme.js";
 const PACKS_CMD_NAMES = ["packs", "addon"];
@@ -59,6 +59,9 @@ function restartHint() {
 function rejoinHint() {
   return t("packs.rejoinHint");
 }
+function logPack(text, level = "info") {
+  pushLog(text, "pack", level);
+}
 function isPacksCommand(cmd) {
   return !!cmd && PACKS_CMD_NAMES.includes(cmd);
 }
@@ -172,6 +175,23 @@ function formatUninstallPickLabel(pack) {
   const en = pack.enabled ? t("packs.list.on") : t("packs.list.off");
   return `[${kind}] ${pack.name}  ${pack.folderName}  ${en.trim()}  ${pack.uuid.slice(0, 8)}`;
 }
+function resolveUninstallTargets(packs, ids) {
+  const missing = [];
+  const byUuid = /* @__PURE__ */ new Map();
+  for (const id of ids) {
+    const pack = findInstalledPackById(packs, id);
+    if (!pack) {
+      missing.push(id);
+      continue;
+    }
+    byUuid.set(pack.uuid.toLowerCase(), pack);
+  }
+  if (missing.length) return { status: "not_found", missing };
+  const selected = [...byUuid.values()];
+  const blocked = selected.find((p) => isProtectedSfmcPack(p));
+  if (blocked) return { status: "protected", folder: blocked.folderName };
+  return { status: "ok", selected };
+}
 async function pickPacksForUninstall(packs) {
   const candidates = packs.filter((p) => !isProtectedSfmcPack(p));
   if (candidates.length === 0) return [];
@@ -215,8 +235,8 @@ async function uninstallPacksBatch(selected, allPacks, opts) {
       const extra = q.pairedOf ? ` ${c.dim(t("packs.uninstall.pairedOf", { folder: q.pairedOf }))}` : "";
       return `  [${kind}] ${q.pack.folderName}${extra}`;
     }).join("\n");
-    console.log(t("packs.uninstall.summary", { count: queue.length }));
-    console.log(preview);
+    logPack(t("packs.uninstall.summary", { count: queue.length }), "info");
+    logPack(preview, "info");
     const ans = await confirm({
       message: t("packs.uninstall.confirm", { count: String(queue.length) }),
       initialValue: false
@@ -238,21 +258,23 @@ async function uninstallPacksBatch(selected, allPacks, opts) {
   return lines.join("\n");
 }
 function printConflict(existing, incoming) {
-  console.log(c.yellow(t("packs.conflict")));
-  console.log(
+  logPack(c.yellow(t("packs.conflict")), "warn");
+  logPack(
     t("packs.conflict.existing", {
       name: existing.name,
       version: fmtVer(existing.version),
       uuid: existing.uuid,
       dir: existing.dir
-    })
+    }),
+    "info"
   );
-  console.log(
+  logPack(
     t("packs.conflict.incoming", {
       name: incoming.name,
       version: fmtVer(incoming.version),
       uuid: incoming.uuid
-    })
+    }),
+    "info"
   );
 }
 async function askOverwrite() {
@@ -265,7 +287,12 @@ async function askOverwrite() {
   return !!ans;
 }
 async function installOnePackRoot(opts) {
-  const info = readPackManifestInfo(opts.srcDir);
+  let info;
+  try {
+    info = readPackManifestInfo(opts.srcDir);
+  } catch {
+    return { ok: false, reason: t("packs.badManifest") };
+  }
   if (!info) {
     return { ok: false, reason: t("packs.badManifest") };
   }
@@ -283,18 +310,18 @@ async function installOnePackRoot(opts) {
     } else if (opts.interactive && process.stdin.isTTY) {
       force = await askOverwrite();
       if (!force) {
-        console.log(c.dim(t("packs.skippedNoOverwrite")));
+        logPack(c.dim(t("packs.skippedNoOverwrite")), "info");
         return { ok: false, skipped: true, reason: "conflict:skipped", info };
       }
     } else {
-      console.log(c.yellow(t("packs.conflictSkip", { name: info.name })));
+      logPack(c.yellow(t("packs.conflictSkip", { name: info.name })), "warn");
       return { ok: false, skipped: true, reason: "conflict:noninteractive", info };
     }
     result = await installPackDirectory({
       srcDir: opts.srcDir,
       destParent,
-      force: true,
-      ...opts.folderHint ? { folderName: opts.folderHint } : {}
+      force: true
+      /* 路径由同 uuid 决策锁定，不依赖 folderHint，避免旁路目录 */
     });
   }
   if (!result.ok || !result.info || !result.destDir) {
@@ -313,7 +340,7 @@ async function installOnePackRoot(opts) {
       ...opts.interactive !== void 0 ? { interactive: opts.interactive } : {}
     });
   } catch (e) {
-    console.log(c.yellow(`[packs] probe: ${e.message}`));
+    logPack(c.yellow(`probe: ${e.message}`), "warn");
   }
   return { ok: true, info: result.info };
 }
@@ -340,7 +367,7 @@ async function scanAndInstallInbox(opts) {
   try {
     ({ bdsRoot, levelName } = resolveBdsContext());
   } catch (e) {
-    console.log(c.yellow(t("packs.inboxSkip", { message: e.message })));
+    logPack(c.yellow(t("packs.inboxSkip", { message: e.message })), "warn");
     return { installed: 0, skipped: 0, failed: candidates.length };
   }
   const interactive = opts?.interactive ?? !!process.stdin.isTTY;
@@ -350,12 +377,12 @@ async function scanAndInstallInbox(opts) {
   let installed = 0;
   let skipped = 0;
   let failed = 0;
-  console.log(c.dim(t("packs.inboxFound", { count: candidates.length, level: levelName })));
+  logPack(c.dim(t("packs.inboxFound", { count: candidates.length, level: levelName })));
   for (const src of candidates) {
     const base = path.basename(src);
     const fp = sourceFingerprint(src);
     if (state.installed[fp] && !force) {
-      console.log(c.dim(t("packs.alreadyDone", { name: base })));
+      logPack(c.dim(t("packs.alreadyDone", { name: base })));
       skipped++;
       if (!dryRun) {
         try {
@@ -365,38 +392,37 @@ async function scanAndInstallInbox(opts) {
       }
       continue;
     }
-    let tempDir = null;
+    let disposeRoots = null;
     try {
       let roots = [];
-      if (fs.statSync(src).isDirectory()) {
-        roots = discoverPackRoots(src, { maxDepth: 2 });
-      } else if (isPackArchive(src)) {
-        if (dryRun) {
-          console.log(c.dim(t("packs.dryRunExtract", { name: base })));
+      if (fs.statSync(src).isDirectory() || isPackArchive(src)) {
+        if (dryRun && isPackArchive(src) && fs.statSync(src).isFile()) {
+          logPack(c.dim(t("packs.dryRunExtract", { name: base })));
           skipped++;
           continue;
         }
-        tempDir = await extractArchiveToTemp(src);
-        roots = discoverPackRoots(tempDir, { maxDepth: 2 });
+        const resolved = await resolvePackRoots(src);
+        disposeRoots = resolved.dispose;
+        roots = resolved.roots;
       } else {
         failed++;
         if (!dryRun) moveTo(src, failedDir(), base);
         continue;
       }
       if (roots.length === 0) {
-        console.log(c.red(t("packs.noPackRoot", { name: base })));
+        logPack(c.red(t("packs.noPackRoot", { name: base })), "error");
         failed++;
-        if (!dryRun && !tempDir) moveTo(src, failedDir(), `${base}-no-root`);
+        if (!dryRun && fs.statSync(src).isDirectory()) moveTo(src, failedDir(), `${base}-no-root`);
         continue;
       }
       if (dryRun) {
         for (const r of roots) {
-          const info = readPackManifestInfo(r);
-          console.log(
-            c.dim(
-              `[packs] dry-run: ${base} \u2192 ${info?.kind ?? "?"} ${info?.name ?? path.basename(r)}`
-            )
-          );
+          try {
+            const info = readPackManifestInfo(r);
+            logPack(c.dim(`dry-run: ${base} \u2192 ${info?.kind ?? "?"} ${info?.name ?? path.basename(r)}`), "info");
+          } catch {
+            logPack(c.red(t("packs.badManifest")), "error");
+          }
         }
         skipped++;
         continue;
@@ -418,22 +444,21 @@ async function scanAndInstallInbox(opts) {
         if (r.ok && r.info) {
           okCount++;
           lastUuid = r.info.uuid;
-          console.log(
+          logPack(
             c.green(
               t("packs.installedEnabled", {
                 kind: r.info.kind === "resource" ? "RP" : "BP",
                 name: r.info.name,
                 version: fmtVer(r.info.version)
               })
-            )
+            ),
+            "success"
           );
         } else if (r.skipped) {
           skipCount++;
         } else {
           failCount++;
-          console.log(
-            c.red(t("packs.installFailed", { name: path.basename(root), reason: r.reason ?? "?" }))
-          );
+          logPack(c.red(t("packs.installFailed", { name: path.basename(root), reason: r.reason ?? "?" })), "error");
         }
       }
       installed += okCount > 0 ? 1 : 0;
@@ -443,12 +468,12 @@ async function scanAndInstallInbox(opts) {
         state.installed[fp] = { uuid: lastUuid, at: (/* @__PURE__ */ new Date()).toISOString(), folderName: base };
         writeState(state);
         moveTo(src, doneDir(), base);
-        console.log(c.yellow(`[packs] ${restartHint()}`));
+        logPack(c.yellow(`${restartHint()}`), "warn");
       } else if (failCount > 0 && skipCount === 0) {
         moveTo(src, failedDir(), base);
       }
     } catch (e) {
-      console.log(c.red(`[packs] ${base}: ${e.message}`));
+      logPack(c.red(`${base}: ${e.message}`), "error");
       failed++;
       if (!dryRun && fs.existsSync(src)) {
         try {
@@ -457,12 +482,7 @@ async function scanAndInstallInbox(opts) {
         }
       }
     } finally {
-      if (tempDir) {
-        try {
-          fs.rmSync(tempDir, { recursive: true, force: true });
-        } catch {
-        }
-      }
+      if (disposeRoots) disposeRoots();
     }
   }
   return { installed, skipped, failed };
@@ -489,9 +509,7 @@ function formatPackList(packs) {
     for (const p of bp) {
       const en = p.enabled ? c.green(t("packs.list.on")) : c.dim(t("packs.list.off"));
       const src = bindingLabelForUuid(p.uuid);
-      lines.push(
-        `  [${en}] ${p.folderName}  ${p.name}  v${fmtVer(p.version)}  ${c.dim(p.uuid)}  ${c.dim(src)}`
-      );
+      lines.push(`  [${en}] ${p.folderName}  ${p.name}  v${fmtVer(p.version)}  ${c.dim(p.uuid)}  ${c.dim(src)}`);
     }
   }
   if (rp.length) {
@@ -662,28 +680,15 @@ async function dispatchPacksCommand(sub, args) {
           if (picked === null) return c.dim(t("packs.uninstall.cancelled"));
           if (picked.length === 0) return c.yellow(t("packs.uninstall.none"));
           selected = picked;
-        } else if (ids.length === 1) {
-          const pack = findInstalledPackById(packs, ids[0]);
-          if (!pack) return c.red(t("packs.notFound", { id: ids[0] }));
-          if (isProtectedSfmcPack(pack)) {
-            return c.red(t("packs.uninstall.protected", { folder: pack.folderName }));
-          }
-          selected = [pack];
         } else {
-          const missing = [];
-          const byUuid = /* @__PURE__ */ new Map();
-          for (const id of ids) {
-            const pack = findInstalledPackById(packs, id);
-            if (!pack) {
-              missing.push(id);
-              continue;
-            }
-            byUuid.set(pack.uuid.toLowerCase(), pack);
+          const resolved = resolveUninstallTargets(packs, ids);
+          if (resolved.status === "not_found") {
+            return c.red(t("packs.notFound", { id: resolved.missing.join(", ") }));
           }
-          if (missing.length) {
-            return c.red(t("packs.notFound", { id: missing.join(", ") }));
+          if (resolved.status === "protected") {
+            return c.red(t("packs.uninstall.protected", { folder: resolved.folder }));
           }
-          selected = [...byUuid.values()];
+          selected = resolved.selected;
         }
         return await uninstallPacksBatch(selected, packs, {
           bdsRoot,
@@ -744,17 +749,14 @@ async function dispatchPacksCommand(sub, args) {
         const abs = path.resolve(target);
         if (!fs.existsSync(abs)) return c.red(t("packs.pathMissing", { path: abs }));
         const { bdsRoot, levelName } = resolveBdsContext();
-        let tempDir = null;
+        let disposeRoots = null;
         try {
-          let roots;
-          if (fs.statSync(abs).isDirectory()) {
-            roots = discoverPackRoots(abs, { maxDepth: 2 });
-          } else if (isPackArchive(abs)) {
-            tempDir = await extractArchiveToTemp(abs);
-            roots = discoverPackRoots(tempDir, { maxDepth: 2 });
-          } else {
+          if (!fs.statSync(abs).isDirectory() && !isPackArchive(abs)) {
             return c.red(t("packs.notArchive"));
           }
+          const resolved = await resolvePackRoots(abs);
+          disposeRoots = resolved.dispose;
+          const roots = resolved.roots;
           if (roots.length === 0) return c.red(t("packs.noManifestRoot"));
           const lines = [];
           for (const root of roots) {
@@ -790,7 +792,7 @@ async function dispatchPacksCommand(sub, args) {
           lines.push(c.yellow(restartHint()));
           return lines.join("\n");
         } finally {
-          if (tempDir) fs.rmSync(tempDir, { recursive: true, force: true });
+          if (disposeRoots) disposeRoots();
         }
       }
       case "scan": {
@@ -867,6 +869,7 @@ export {
   isProtectedSfmcPack,
   packsInboxDir,
   packsUsage,
+  resolveUninstallTargets,
   scanAndInstallInbox
 };
 //# sourceMappingURL=world-packs.js.map