@poe-platform/safe-bash 0.1.44 → 0.1.46

package/dist/safe-bash/browser.js

@@ -6216,6 +6216,15 @@ var ValueArena = class {
   }
   hold(value2) {
     this.assertOpen();
+    if (typeof value2 === "string") {
+      const payload2 = this.allocate(value2.length * 2, 0);
+      let released2 = false;
+      return { value: value2, release: () => {
+        if (released2) return;
+        released2 = true;
+        this.release(payload2);
+      } };
+    }
     const reference = this.allocate(32, 1);
     let payload;
     try {
@@ -6285,9 +6294,7 @@ var ValueScope = class {
   }
   hold(value2) {
     this.assertOpen();
-    if (typeof value2 === "string") return { value: value2, release() {
-    } };
-    this.#enrollment ??= this.arena.allocate(64, 1);
+    if (typeof value2 !== "string") this.#enrollment ??= this.arena.allocate(64, 1);
     const held = this.arena.hold(value2);
     const owner = { scope: this };
     const result = { value: value2, release: () => {
@@ -6304,7 +6311,7 @@ var ValueScope = class {
     const validate = () => {
       this.arena.assertRetained();
       const owner = this.#holds.get(held);
-      if (!owner || this.#closed || destination.#closed || this.arena !== destination.arena || !destination.#enrollment) throw new Error("Shell value restoration ownership is not prepared");
+      if (!owner || this.#closed || destination.#closed || this.arena !== destination.arena || typeof held.value !== "string" && !destination.#enrollment) throw new Error("Shell value restoration ownership is not prepared");
       return owner;
     };
     validate();
@@ -6336,18 +6343,18 @@ var ValueStore = class _ValueStore {
     return this.#values.get(name2)?.value ?? text;
   }
   publish(name2, value2, action) {
-    const held = typeof value2 === "string" ? void 0 : this.scope.hold(value2);
+    const held = this.scope.hold(value2);
     try {
       if (!action()) {
-        held?.release();
+        held.release();
         return false;
       }
     } catch (error) {
-      held?.release();
+      held.release();
       throw error;
     }
     this.invalidate(name2);
-    if (held) this.#values.set(name2, held);
+    this.#values.set(name2, held);
     return true;
   }
   invalidate(name2) {
@@ -6373,14 +6380,9 @@ var ValueStore = class _ValueStore {
     const staged = /* @__PURE__ */ new Map();
     try {
       for (const [name2, value2] of entries) {
-        if (typeof value2 !== "string") {
-          const held = this.scope.hold(value2);
-          staged.get(name2)?.release();
-          staged.set(name2, held);
-        } else {
-          staged.get(name2)?.release();
-          staged.delete(name2);
-        }
+        const held = this.scope.hold(value2);
+        staged.get(name2)?.release();
+        staged.set(name2, held);
       }
       action();
     } catch (error) {
@@ -8464,7 +8466,10 @@ function trackState(state, budget, scope) {
       await registered.scope.drainWork();
       await registered.owner?.close();
     });
-    scope.register(() => values.close());
+    scope.register(async () => {
+      await registered.scope.drainWork();
+      values.close();
+    });
     sessions.set(budget, session);
   }
   return new StateMonitor(state, session).proxy;
@@ -8498,7 +8503,10 @@ var StateMonitor = class {
     this.proxy = this.wrap(raw, "state");
     monitors.set(raw, this);
     monitors.set(this.proxy, this);
-    session.scope.register(() => this.closeValues());
+    session.scope.register(async () => {
+      await session.scope.drainWork();
+      this.closeValues();
+    });
   }
   raw;
   session;
@@ -9874,7 +9882,7 @@ function cloneGetoptsBinding(state) {
 function saveVariable(state, name2) {
   const monitor = stateMonitor(state);
   const value2 = monitor?.values.get(name2, state.variables[name2] ?? "");
-  const heldValue = value2 !== void 0 && typeof value2 !== "string" ? monitor.values.scope.hold(value2) : void 0;
+  const heldValue = state.variables[name2] !== void 0 && value2 !== void 0 ? monitor.values.scope.hold(value2) : void 0;
   return { value: state.variables[name2], ...heldValue ? { heldValue } : {}, exported: state.exported.has(name2), readOnly: state.readonlyVariables?.has(name2) ?? false, ...name2 === "OPTIND" ? { getopts: cloneGetoptsBinding(state) } : {} };
 }
 function publishVariable(state, name2, value2) {
@@ -10857,7 +10865,7 @@ var Runtime = class _Runtime {
         const tickets = publications.get(key);
         stateMonitor(state).publish(tickets, key, () => {
           void store.remove(key, tickets);
-          state.variables[key] = env[key];
+          publishVariable(state, key, env[key]);
         });
       }
     } finally {
@@ -11823,7 +11831,7 @@ var Runtime = class _Runtime {
               for (const [name2, saved] of previous) {
                 saved.value = variables[name2];
                 const value2 = stateMonitor(redirectState).values.get(name2, saved.value ?? "");
-                const held = typeof value2 === "string" ? void 0 : stateMonitor(state).values.scope.hold(value2);
+                const held = saved.value === void 0 ? void 0 : stateMonitor(state).values.scope.hold(value2);
                 saved.heldValue?.release();
                 if (held) saved.heldValue = held;
                 else delete saved.heldValue;
@@ -11981,7 +11989,7 @@ var Runtime = class _Runtime {
                 delete state.variables[key];
                 state.exported.delete(key);
               } else {
-                state.variables[key] = saved.overlay;
+                publishVariable(state, key, saved.overlay);
                 state.exported.add(key);
               }
               if (key === "OPTIND") this.reconcileGetopts(state, saved.value);
@@ -12007,7 +12015,7 @@ var Runtime = class _Runtime {
             delete state.variables[key];
             state.exported.delete(key);
           } else {
-            state.variables[key] = value2;
+            publishVariable(state, key, value2);
             state.exported.add(key);
           }
           if (key === "OPTIND") this.reconcileGetopts(state, previous.get(key).value);
@@ -12134,7 +12142,10 @@ var Runtime = class _Runtime {
             else await this.discardVariable(saved);
             return;
           }
-          if (saved.superseded || state.variables[key] !== saved.overlay) return;
+          if (saved.superseded || state.variables[key] !== saved.overlay) {
+            await this.discardVariable(saved);
+            return;
+          }
           await restoreVariable(state, key, saved);
         });
         await scope.cleanup(() => stateMonitor(state)?.closeOverlay(previous));
@@ -12832,14 +12843,18 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
     const sourceDepth = state.sourceDepth ?? 0;
     const monitor = stateMonitor(state);
     const restoration = monitor?.restoration(true);
+    let savedPositionals;
     try {
+      if (args.length) savedPositionals = monitor.positionals.clone();
       const owner = arrayStore(state)?.owner;
       if (owner) {
         owner.reserve({ metadata: 64 + args.length * 32, allocatedSlots: args.length, work: args.length + 4 });
         monitor.prepareCollection(args, "positional");
       }
       const entry = () => {
-        if (args.length) state.positional = args;
+        if (args.length) this.replacePositionals(state, getCommandArguments(context).values.slice(context.args.length - args.length), () => {
+          state.positional = args;
+        });
         state.sourceDepth = (state.sourceDepth ?? 0) + 1;
         state.depth++;
       };
@@ -12849,6 +12864,7 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
         tickets.release();
       } else entry();
     } catch (error) {
+      savedPositionals?.close();
       restoration?.close();
       throw error;
     }
@@ -12861,13 +12877,19 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
       const restore = () => {
         state.depth--;
         state.sourceDepth = sourceDepth;
-        if (args.length && (state.functionDepth > 0 || (state.positionalSetVersion ?? 0) === version)) {
-          state.positional = positional;
-          state.positionalSetVersion = version;
+        if (savedPositionals && (state.functionDepth > 0 || (state.positionalSetVersion ?? 0) === version)) {
+          monitor.positionals.restore(savedPositionals, () => {
+            state.positional = positional;
+            state.positionalSetVersion = version;
+          });
         }
       };
-      if (restoration) restoration.apply(restore);
-      else restore();
+      try {
+        if (restoration) restoration.apply(restore);
+        else restore();
+      } finally {
+        savedPositionals?.close();
+      }
     }
   }
   invoke(name2, args, options2 = {}, context, state, parent) {
@@ -12891,7 +12913,7 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
       for (const key of child.exported) delete child.variables[key];
       for (const [key, value2] of Object.entries(env)) {
         if (key.includes("\0") || key.includes("=") || typeof value2 !== "string" || value2.includes("\0")) throw new TypeError("Invalid invoke environment entry");
-        child.variables[key] = value2;
+        publishVariable(child, key, value2);
       }
       child.exported = new Set(Object.keys(env));
     }