@poe-platform/safe-bash 0.1.622 → 0.1.623

package/dist/safe-bash/core.browser.js

@@ -25649,7 +25649,7 @@ var Budget14 = class {
     if (this.members % 128 === 0) await yieldTurn(this.context.signal);
   }
   async output(value2, stderr = false) {
-    const bytes3 = import_buffer.Buffer.from(value2);
+    const bytes3 = typeof value2 === "string" ? import_buffer.Buffer.from(value2, "utf8") : import_buffer.Buffer.from(value2);
     if (bytes3.length > this.limits.maxTextBytes - this.textBytes) fail("text output limit exceeded");
     this.textBytes += bytes3.length;
     await writeBytes(stderr ? this.context.stderr : this.context.stdout, bytes3, this.context.signal);
@@ -26637,6 +26637,7 @@ var longOptions = {
   update: "u",
   freshen: "f",
   filesync: "FS",
+  "archive-comment": "z",
   delete: "d",
   include: "i",
   exclude: "x",
@@ -26706,8 +26707,7 @@ var reservedOptions = [
   "show-options",
   "unzip-command",
   "verbose",
-  "version",
-  "archive-comment"
+  "version"
 ];
 function normalizeZipOption(argument2) {
   if (!argument2.startsWith("--") || argument2 === "--") return argument2;
@@ -26822,6 +26822,41 @@ function zipEnvironmentArguments(env, argv, limits) {
   return [...defaults, ...argv];
 }
 
+// packages/safe-bash/src/commands/archive/zip/comments.ts
+init_platform();
+async function readZipComment(source2, limits, signal) {
+  const parts = [];
+  const line = [];
+  let length = 0;
+  let bytes3 = 0;
+  let pulls = 0;
+  const append = () => {
+    const zero2 = line.indexOf(0);
+    const text3 = line.slice(0, zero2 < 0 ? void 0 : zero2);
+    line.length = 0;
+    if (text3.length === 2 && text3[0] === 46 && text3[1] === 10) return false;
+    if (text3.at(-1) === 10) text3.pop();
+    const separator = length || !text3.length ? 2 : 0;
+    if (text3.length + separator > Math.min(limits.maxTextBytes, 65535) - length) fail("ZIP archive comment byte limit exceeded");
+    if (separator) parts.push(import_buffer.Buffer.from("\r\n"));
+    if (text3.length) parts.push(Uint8Array.from(text3));
+    length += separator + text3.length;
+    return true;
+  };
+  for await (const chunk of readBytes(source2, signal)) {
+    if (++pulls > limits.maxPatternSteps) fail("ZIP comment input work limit exceeded");
+    for (const byte of chunk) {
+      if (++bytes3 > limits.maxFilesFromBytes) fail("ZIP comment input byte limit exceeded");
+      line.push(byte);
+      if ((byte === 10 || line.length === 65535) && !append()) return import_buffer.Buffer.concat(parts, length);
+      if (bytes3 % 4096 === 0) await yieldTurn(signal);
+    }
+    if (pulls % 64 === 0) await yieldTurn(signal);
+  }
+  if (line.length) append();
+  return import_buffer.Buffer.concat(parts, length);
+}
+
 // packages/safe-bash/src/commands/archive/zip-format.ts
 init_platform();
 
@@ -27667,23 +27702,30 @@ function tokenize2(pattern, noWild, stopAtDirectories) {
       const negative = characters[index + 1] === "!" || characters[index + 1] === "^";
       if (negative) index++;
       const ranges = [];
-      let closed = false;
-      while (++index < characters.length) {
-        let first = characters[index];
-        if (first === "]") {
-          closed = true;
-          break;
-        }
-        if (first === "\\") first = characters[++index] ?? "";
-        let last = first;
-        if (characters[index + 1] === "-" && characters[index + 2] && characters[index + 2] !== "]") {
-          index += 2;
-          last = characters[index];
-          if (last === "\\") last = characters[++index] ?? "";
+      const start = index + 1;
+      let closing = start;
+      let escaped3 = false;
+      for (; closing < characters.length; closing++) {
+        const current = characters[closing];
+        if (escaped3) escaped3 = false;
+        else if (current === "\\") escaped3 = true;
+        else if (current === "]") break;
+      }
+      let first;
+      escaped3 = characters[start] === "-";
+      for (let position = start; position < closing; position++) {
+        const current = characters[position];
+        if (!escaped3 && current === "\\") escaped3 = true;
+        else if (!escaped3 && current === "-") first = characters[position - 1].codePointAt(0);
+        else {
+          const last = current.codePointAt(0);
+          if (characters[position + 1] !== "-") ranges.push([first ?? last, last]);
+          first = void 0;
+          escaped3 = false;
         }
-        ranges.push([first.codePointAt(0) ?? -1, last.codePointAt(0) ?? -1]);
       }
-      tokens2.push(closed ? { kind: "class", ranges, negative } : { kind: "never" });
+      index = closing;
+      tokens2.push(closing < characters.length ? { kind: "class", ranges, negative } : { kind: "never" });
     } else tokens2.push({ kind: "literal", value: character });
   }
   return tokens2;
@@ -27824,6 +27866,7 @@ async function parse12(scope, limits) {
   let test = false;
   let mustMatch = false;
   let filesync = false;
+  let archiveComment = false;
   let fromDate;
   let beforeDate;
   let descriptors = false;
@@ -27877,6 +27920,7 @@ async function parse12(scope, limits) {
           filesync = true;
           offset++;
         } else if (flag === "q") quiet = true;
+        else if (flag === "z") archiveComment = true;
         else if (flag === "j") junkPaths = true;
         else if (flag === "X") {
           metadata3 = argument2[offset + 1] === "-" ? "all" : "strip";
@@ -27995,7 +28039,7 @@ async function parse12(scope, limits) {
   }
   if (recursivePatterns && !names.length && !operands.length) throw new ZipFailure(16, "Invalid command arguments", "nothing to select from");
   if (filesync && action !== "add") throw new ZipFailure(16, "Invalid command arguments", "can't use -d, -f, -u, -U, or -g with filesync -FS\n");
-  return { args, action, archive, output: output2, recursive, recursivePatterns, noWild, stopAtDirectories, quiet, junkPaths, omitDirectories, storeLinks, test, mustMatch, filesync, fromDate, beforeDate, descriptors, zip64, metadata: metadata3, includes, excludes, level, method, suffixes, operands: [...names, ...operands], firstOperand };
+  return { args, action, archive, output: output2, recursive, recursivePatterns, noWild, stopAtDirectories, quiet, junkPaths, omitDirectories, storeLinks, test, mustMatch, filesync, archiveComment, fromDate, beforeDate, descriptors, zip64, metadata: metadata3, includes, excludes, level, method, suffixes, operands: [...names, ...operands], firstOperand };
 }
 function memberName(path, limits) {
   if (path.startsWith("//") && !path.startsWith("///")) fail("UNC source paths are unsupported");
@@ -28233,6 +28277,8 @@ async function prepare(scope, parsed, budget) {
       }
     }
   };
+  const editComment = parsed.archiveComment && parsed.action !== "delete" && parsed.action !== "copy";
+  if (parsed.archiveComment && parsed.action === "copy" && !parsed.quiet) await budget.output("	zip warning: can't set method, move, recurse, or comments with copy mode.\n");
   if (parsed.action === "copy") {
     const operands = new Selection(parsed.operands, limits, context2.signal, { noWild: parsed.noWild, stopAtDirectories: parsed.stopAtDirectories });
     for (const entry of archive.entries) {
@@ -28242,7 +28288,7 @@ async function prepare(scope, parsed, budget) {
       }
     }
   } else if (parsed.action === "delete") {
-    if (!parsed.quiet && parsed.recursive) await budget.output("	zip warning: invalid option(s) used with -d; ignored.\n");
+    if (!parsed.quiet && (parsed.recursive || parsed.archiveComment)) await budget.output("	zip warning: invalid option(s) used with -d; ignored.\n");
     if (!parsed.quiet && !archive.entries.length) await budget.output(`	zip warning: ${parsed.archive} not found or empty
 `);
     const operands = new Selection(parsed.recursivePatterns ? [] : parsed.operands, limits, context2.signal, { noWild: parsed.noWild, stopAtDirectories: parsed.stopAtDirectories });
@@ -28275,8 +28321,8 @@ async function prepare(scope, parsed, budget) {
       return { kind: "current" };
     }
   }
-  if (!selected.size && (parsed.action === "freshen" || parsed.action === "update" && (existing2 || !parsed.includes.length))) return void 0;
-  if (!selected.size && !deleted.size && (parsed.action === "delete" || parsed.action === "copy" || parsed.recursivePatterns || parsed.fromDate !== void 0 || parsed.beforeDate !== void 0 || !parsed.includes.length)) {
+  if (!selected.size && !(editComment && archive.entries.length) && (parsed.action === "freshen" || parsed.action === "update" && (existing2 || !parsed.includes.length))) return void 0;
+  if (!selected.size && !deleted.size && !(editComment && archive.entries.length) && (parsed.action === "delete" || parsed.action === "copy" || parsed.recursivePatterns || parsed.fromDate !== void 0 || parsed.beforeDate !== void 0 || !parsed.includes.length)) {
     const detail = parsed.action !== "delete" && parsed.recursive && parsed.firstOperand >= 0 ? `try: zip ${parsed.args.slice(0, parsed.firstOperand).join(" ")} . -i ${parsed.args.slice(parsed.firstOperand).join(" ")}` : parsed.archive;
     throw new ZipFailure(12, "Nothing to do!", detail);
   }
@@ -28326,8 +28372,23 @@ async function prepare(scope, parsed, budget) {
     append(entry, false);
   }
   if (!entries2.length) queue("	zip warning: zip file empty\n");
-  if (!publication) return { kind: "stream", archive: { entries: entries2, comment: archive.comment }, progress };
-  const bytes3 = await writeZipArchive({ entries: entries2, comment: archive.comment }, limits, context2.signal, false, parsed.zip64 === true);
+  let comment2 = archive.comment;
+  if (editComment) {
+    for (const message3 of progress) await budget.output(message3);
+    progress.length = 0;
+    progressBytes = 0;
+    if (!parsed.quiet) {
+      if (comment2.length) {
+        await budget.output("current zip file comment is:\n");
+        await budget.output(comment2);
+        if (comment2.at(-1) !== 10) await budget.output("\n");
+      }
+      await budget.output("enter new zip file comment (end with .):\n");
+    }
+    comment2 = await readZipComment(scope.stdin, limits, context2.signal);
+  }
+  if (!publication) return { kind: "stream", archive: { entries: entries2, comment: comment2 }, progress };
+  const bytes3 = await writeZipArchive({ entries: entries2, comment: comment2 }, limits, context2.signal, false, parsed.zip64 === true);
   if (parsed.test && parsed.archive !== "-") {
     for (const message3 of progress) await budget.output(message3);
     progress.length = 0;