@poe-platform/safe-bash 0.1.619 → 0.1.620

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

@@ -27437,18 +27437,23 @@ function parseArguments(context2, limits) {
   checkPath(archive, limits);
   return { list: list && !pipe, pipe, overwrite, destination: destination2, archive, patterns: patterns2 };
 }
-function tokenize2(pattern) {
+function tokenize2(pattern, noWild, stopAtDirectories) {
   const characters = Array.from(pattern);
   const tokens2 = [];
   for (let index = 0; index < characters.length; index++) {
     const character = characters[index];
-    if (character === "*") {
-      if (tokens2.at(-1)?.kind !== "star") tokens2.push({ kind: "star" });
+    if (character === "*" && !noWild) {
+      let count2 = 1;
+      while (characters[index + 1] === "*") {
+        count2++;
+        index++;
+      }
+      tokens2.push({ kind: "star", crossDirectories: !stopAtDirectories || count2 > 1 });
     } else if (character === "?") tokens2.push({ kind: "any" });
-    else if (character === "\\") {
+    else if (character === "\\" && !noWild) {
       const escaped3 = characters[++index];
       tokens2.push(escaped3 === void 0 ? { kind: "never" } : { kind: "literal", value: escaped3 });
-    } else if (character === "[") {
+    } else if (character === "[" && !noWild) {
       const negative = characters[index + 1] === "!" || characters[index + 1] === "^";
       if (negative) index++;
       const ranges = [];
@@ -27474,35 +27479,43 @@ function tokenize2(pattern) {
   return tokens2;
 }
 var Selection = class {
-  constructor(patterns2, limits, signal) {
+  constructor(patterns2, limits, signal, options2 = {}) {
     this.limits = limits;
     this.signal = signal;
-    this.patterns = patterns2.map(tokenize2);
+    this.options = options2;
+    this.patterns = patterns2.map((pattern) => tokenize2(pattern, options2.noWild === true, options2.stopAtDirectories === true));
+    this.tailComponents = patterns2.map((pattern) => pattern.split("/").length);
+    this.emptyTailMatch = patterns2.map((pattern) => !options2.noWild && (pattern === "*" || options2.stopAtDirectories === true && pattern === "**"));
   }
   limits;
   signal;
+  options;
   work = 0;
   patterns;
+  tailComponents;
+  emptyTailMatch;
   matched = /* @__PURE__ */ new Set();
   step() {
     if (++this.work > this.limits.maxPatternSteps) fail("pattern work limit exceeded");
   }
   async matches(name2, firstMatchOnly = false) {
     if (!this.patterns.length) return true;
-    const characters = Array.from(name2);
+    const fullCharacters = Array.from(name2);
     let selected = false;
     for (let pattern = 0; pattern < this.patterns.length; pattern++) {
       this.step();
+      const characters = this.options.trailingComponents ? Array.from(name2.split("/").slice(-this.tailComponents[pattern]).join("/")) : fullCharacters;
+      if (this.options.trailingComponents && !characters.length && !this.emptyTailMatch[pattern]) continue;
       let states = new Uint8Array(characters.length + 1);
       states[0] = 1;
       for (const token of this.patterns[pattern]) {
         const next = new Uint8Array(states.length);
         for (let index = 0; index < states.length; index++) {
           this.step();
-          if (token.kind === "star") next[index] = states[index] || (index > 0 ? next[index - 1] : 0);
+          if (token.kind === "star") next[index] = states[index] || (index > 0 && (token.crossDirectories || characters[index - 1] !== "/") ? next[index - 1] : 0);
           else if (states[index] && index < characters.length) {
             const character = characters[index];
-            let match = token.kind === "any" || token.kind === "literal" && token.value === character;
+            let match = token.kind === "any" && (!this.options.stopAtDirectories || character !== "/") || token.kind === "literal" && token.value === character;
             if (token.kind === "class") {
               let inRange = false;
               for (const [first, last] of token.ranges) {
@@ -27603,7 +27616,10 @@ var longOptions = {
   "compress-9": "9",
   "force-zip64": "fz",
   "strip-extra": "X",
-  "force-descriptors": "fd"
+  "force-descriptors": "fd",
+  "no-wild": "nw",
+  "wild-stop-dirs": "ws",
+  "recurse-patterns": "R"
 };
 var reservedOptions = [
   "adjust-sfx",
@@ -27635,12 +27651,10 @@ var reservedOptions = [
   "license",
   "move",
   "must-match",
-  "no-wild",
   "latest-time",
   "output-file",
   "paths",
   "password",
-  "recurse-patterns",
   "regex",
   "split-size",
   "split-pause",
@@ -27656,7 +27670,6 @@ var reservedOptions = [
   "copy-entries",
   "verbose",
   "version",
-  "wild-stop-dirs",
   "archive-comment"
 ];
 function normalizeZipOption(argument2) {
@@ -27702,6 +27715,9 @@ async function parse12(scope, limits) {
   let archive;
   let action = "add";
   let recursive = false;
+  let recursivePatterns = false;
+  let noWild = false;
+  let stopAtDirectories = false;
   let quiet = false;
   let junkPaths = false;
   let omitDirectories = false;
@@ -27729,8 +27745,11 @@ async function parse12(scope, limits) {
     } else if (!literal && argument2.startsWith("-") && argument2 !== "-") {
       for (let offset = 1; offset < argument2.length; offset++) {
         const flag = argument2[offset];
-        if (flag === "r") recursive = true;
-        else if (flag === "f" && argument2[offset + 1] === "d") {
+        if (flag === "r" || flag === "R") {
+          if (flag === "r") recursive = true;
+          else recursivePatterns = true;
+          if (recursive && recursivePatterns) throw new ZipFailure(16, "Invalid command arguments", "do not specify both -r and -R");
+        } else if (flag === "f" && argument2[offset + 1] === "d") {
           if (argument2[offset + 2] === "-") throw new ZipFailure(16, "Invalid command arguments", "option fd is not negatable");
           descriptors = true;
           offset++;
@@ -27741,6 +27760,11 @@ async function parse12(scope, limits) {
           const next = flag === "d" ? "delete" : flag === "u" ? "update" : "freshen";
           if (action !== "add" && action !== next) throw new ZipFailure(16, "Invalid command arguments", "specify just one action");
           action = next;
+        } else if (flag === "n" && argument2[offset + 1] === "w" || flag === "w" && argument2[offset + 1] === "s") {
+          if (argument2[offset + 2] === "-") throw new ZipFailure(16, "Invalid command arguments", "wildcard control is not negatable");
+          if (flag === "n") noWild = true;
+          else stopAtDirectories = true;
+          offset++;
         } else if (flag === "q") quiet = true;
         else if (flag === "j") junkPaths = true;
         else if (flag === "X") {
@@ -27835,7 +27859,8 @@ async function parse12(scope, limits) {
       start = end + 1;
     }
   }
-  return { action, archive, recursive, quiet, junkPaths, omitDirectories, storeLinks, test, descriptors, zip64, metadata: metadata3, includes, excludes, level, method, suffixes, operands: [...names, ...operands], firstOperand };
+  if (recursivePatterns && !names.length && !operands.length) throw new ZipFailure(16, "Invalid command arguments", "nothing to select from");
+  return { action, archive, recursive, recursivePatterns, noWild, stopAtDirectories, quiet, junkPaths, omitDirectories, storeLinks, test, 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");
@@ -27907,7 +27932,8 @@ async function prepare(scope, parsed, budget) {
 `);
   const selected = /* @__PURE__ */ new Map();
   const deleted = /* @__PURE__ */ new Set();
-  const selection = new Selection([...parsed.includes, ...parsed.excludes], limits, context2.signal);
+  const selection = new Selection([...parsed.includes, ...parsed.excludes], limits, context2.signal, { noWild: parsed.noWild, stopAtDirectories: parsed.stopAtDirectories });
+  const recursiveSelection = parsed.recursivePatterns ? new Selection(parsed.operands, limits, context2.signal, { noWild: parsed.noWild, stopAtDirectories: parsed.stopAtDirectories, trailingComponents: true }) : void 0;
   const ancestors = [];
   let visits = 0;
   let work = 0;
@@ -27968,7 +27994,7 @@ async function prepare(scope, parsed, budget) {
     if (existing2 && !hasIdentity(stat)) fail("cannot exclude archive aliases when source backing identity is unknown");
     const directory2 = stat.type === "directory";
     if (directory2 && name2 && !name2.endsWith("/")) name2 += "/";
-    const included = await filterName(name2, selection, parsed.includes.length);
+    const included = await filterName(name2, selection, parsed.includes.length) && (!recursiveSelection || await recursiveSelection.matches(name2, true));
     const sourceName = name2;
     if (parsed.junkPaths) name2 = directory2 ? "" : name2.slice(name2.lastIndexOf("/") + 1);
     const prior = old.get(name2);
@@ -27999,7 +28025,7 @@ async function prepare(scope, parsed, budget) {
         await encodeSelected(source2, name2, bytes4, { modified: new Date(stat.mtimeMs), mode: stat.mode, directory: directory2, symlink });
       }
     }
-    if (directory2 && parsed.recursive) {
+    if (directory2 && (parsed.recursive || parsed.recursivePatterns)) {
       if (ancestors.some((ancestor) => ancestor.path === canonical || sameIdentity2(ancestor.stat, stat))) fail(`directory cycle while archiving: ${source2}`);
       ancestors.push({ path: canonical, stat });
       try {
@@ -28019,8 +28045,8 @@ async function prepare(scope, parsed, budget) {
     if (!parsed.quiet && parsed.recursive) 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.operands, limits, context2.signal);
-    if (parsed.operands.length) {
+    const operands = new Selection(parsed.recursivePatterns ? [] : parsed.operands, limits, context2.signal, { noWild: parsed.noWild, stopAtDirectories: parsed.stopAtDirectories });
+    if (parsed.operands.length && !parsed.recursivePatterns) {
       for (const entry of archive.entries) {
         if (await operands.matches(entry.name) && await filterName(entry.name, selection, parsed.includes.length)) deleted.add(entry.name);
       }
@@ -28033,10 +28059,11 @@ async function prepare(scope, parsed, budget) {
     }
   } else {
     const operands = parsed.operands.length || parsed.action === "add" ? parsed.operands : archive.entries.map((entry) => entry.name);
-    for (const operand of operands) await visit(operand, memberName(operand, limits), 0);
+    if (parsed.recursivePatterns) await visit(".", "", 0);
+    else for (const operand of operands) await visit(operand, memberName(operand, limits), 0);
   }
   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.includes.length)) {
+  if (!selected.size && !deleted.size && (parsed.action === "delete" || parsed.recursivePatterns || !parsed.includes.length)) {
     const detail = parsed.action !== "delete" && parsed.recursive && parsed.firstOperand >= 0 ? `try: zip ${context2.args.slice(0, parsed.firstOperand).join(" ")} . -i ${context2.args.slice(parsed.firstOperand).join(" ")}` : parsed.archive;
     throw new ZipFailure(12, "Nothing to do!", detail);
   }