@poe-platform/safe-bash 0.1.434 → 0.1.436

package/dist/safe-bash/shell/runtime.js

@@ -24,7 +24,7 @@ import { outputFailure } from "../contracts/io.js";
 import { executionCommands } from "../commands/execution.js";
 import { formatPrintf, printfCommand } from "../commands/basic.js";
 import { UsageError } from "../commands/internal.js";
-import { cloneGetoptsState, createGetoptsState, GetoptsError, scanGetopts, withGetoptsIndex } from "./getopts.js";
+import { cloneGetoptsState, createGetoptsInput, createGetoptsState, GetoptsError, getoptsInputAllocationSize, scanGetopts, withGetoptsIndex } from "./getopts.js";
 import { activateChildCancellation, prepareChildCancellation, selectRuntimeCancellationOutcome, subscribeCancellation, } from "./cancellation.js";
 import { getArrayAssignment, getArraySelector, copyArraySelector, numericIndex, literalIndex, isQuoteMarker } from "./arrays/syntax.js";
 import { ArrayFailure, ArrayOwner, exactSum } from "./arrays/ledger.js";
@@ -899,6 +899,7 @@ class InvocationCancellationOwner {
     #failures;
     #outcomes;
     #publicPromise;
+    #retireCleanup;
     #resolveFinalized;
     #admissionOpen = true;
     #boundary;
@@ -914,7 +915,7 @@ class InvocationCancellationOwner {
         this.#outcomes = outcomes;
         this.#publicPromise = publicPromise;
         this.finalized = new Promise(resolve => { this.#resolveFinalized = resolve; });
-        parent.register(async () => {
+        this.#retireCleanup = parent.register(async () => {
             this.requestClose();
             await this.finalized;
         });
@@ -990,6 +991,7 @@ class InvocationCancellationOwner {
             this.#outcomes.discard(this.#record);
             this.#closeBoundary();
             this.#resolveFinalized();
+            this.#retireCleanup();
         }
     }
     async #finishOnce(barrier, captured) {
@@ -1004,6 +1006,7 @@ class InvocationCancellationOwner {
         }
         finally {
             this.#resolveFinalized();
+            this.#retireCleanup();
         }
     }
     #closeBoundary() {
@@ -2525,11 +2528,18 @@ export class Runtime {
                                 this.outputFiles.delete(path);
                         };
                         let target;
+                        let outputScope;
                         try {
-                            target = await openFileOutput({ fs: this.fs, signal: this.signal, registerCleanup: cleanup => io[invocationScope].register(cleanup) }, path, append ? "a" : "w", random ? incremental : undefined);
+                            outputScope = io[invocationScope].child();
+                            target = await openFileOutput({ fs: this.fs, signal: this.signal, registerCleanup: cleanup => { outputScope.register(cleanup); } }, path, append ? "a" : "w", random ? incremental : undefined);
                         }
                         catch (error) {
-                            release();
+                            try {
+                                await outputScope?.close();
+                            }
+                            finally {
+                                release();
+                            }
                             throw error;
                         }
                         outputs.add(async (completion) => {
@@ -2550,7 +2560,12 @@ export class Runtime {
                                 }
                             }
                             finally {
-                                release();
+                                try {
+                                    await outputScope?.close();
+                                }
+                                finally {
+                                    release();
+                                }
                             }
                         });
                         const output = this.budget.sink(target.sink, this.signal);
@@ -2807,7 +2822,7 @@ export class Runtime {
         const context = {
             ...publicIO, command: name, args: argumentValues.args, argumentValues, env, cwd: state.cwd, fs: this.fs, signal: this.commandSignal,
             executionScope: this.budget.executionScope,
-            registerCleanup: (cleanup) => scope.register(cleanup),
+            registerCleanup: (cleanup) => { scope.register(cleanup); },
             invoke: (name, args, options) => {
                 const invocation = this.invoke(name, args, options, context, state, scope);
                 void invocation.catch(() => undefined);
@@ -3467,7 +3482,7 @@ export class Runtime {
                 env: Object.assign(Object.create(null), incoming.env),
                 stdin: input ?? incoming.stdin,
                 stdout: this.budget.sink(incoming.stdout, runtime.signal), stderr: this.budget.sink(incoming.stderr, runtime.signal),
-                signal: this.commandSignal, registerCleanup: cleanup => scope.register(cleanup),
+                signal: this.commandSignal, registerCleanup: cleanup => { scope.register(cleanup); },
                 invoke: (name, args, options) => {
                     const invocation = invocationOverride.current ? invocationOverride.current(name, args, options) : runtime.invoke(name, args, options, context, child, scope);
                     void invocation.catch(() => undefined);
@@ -4127,30 +4142,57 @@ export class Runtime {
         }
         const optstring = context.args[offset];
         const name = context.args[offset + 1];
-        const args = context.args.length > offset + 2 ? context.args.slice(offset + 2) : state.positional;
-        if (args.length > fields)
+        const explicit = context.args.length > offset + 2;
+        const monitor = explicit ? undefined : stateMonitor(state);
+        const revision = monitor?.positionalRevision;
+        const supplied = explicit ? context.args.slice(offset + 2) : state.positional;
+        if (supplied.length > fields)
             this.budget.fail("maxExpansionFields");
-        for (let index = 0; index < args.length; index++) {
-            this.signal.throwIfAborted();
-            admit(args[index]);
-            if ((index + 1) % 128 === 0)
-                await checkpoint();
-        }
-        const maxBytes = saturatedProduct(bytes, saturatedSum(args.length, 1));
-        const maxSteps = saturatedSum(saturatedProduct(maxBytes, 2), saturatedSum(args.length, 2));
-        state.getopts ??= cloneGetoptsBinding(state);
+        const maxBytes = saturatedProduct(bytes, saturatedSum(supplied.length, 1));
+        const maxSteps = saturatedSum(saturatedProduct(maxBytes, 2), saturatedSum(supplied.length, 2));
+        const work = { maxArguments: fields, maxBytes, maxSteps, yieldEvery: 128, signal: this.signal, checkpoint };
+        let input = monitor?.getoptsInput;
+        let allocation;
         let result;
         try {
-            result = await scanGetopts(state.getopts.cursor, optstring, args, {
-                reportErrors: state.variables.OPTERR === undefined || state.variables.OPTERR === "" || decimalIndex(state.variables.OPTERR) !== 0,
-                work: { maxArguments: fields, maxBytes, maxSteps, yieldEvery: 128, signal: this.signal, checkpoint },
-            });
-        }
-        catch (error) {
+            if (!input && monitor) {
+                const size = getoptsInputAllocationSize(supplied.length);
+                const arena = this.budget.values;
+                const usage = arena.usage;
+                if (size.bytes + 64 <= arena.maximumBytes - usage.bytes && size.slots + 1 <= arena.maximumSlots - usage.slots) {
+                    allocation = arena.scope();
+                    input = await createGetoptsInput(supplied, allocation, work);
+                }
+            }
+            const args = input?.args ?? supplied;
+            if (!input || allocation)
+                for (let index = 0; index < args.length; index++) {
+                    this.signal.throwIfAborted();
+                    admit(args[index]);
+                    if ((index + 1) % 128 === 0)
+                        await checkpoint();
+                }
+            state.getopts ??= cloneGetoptsBinding(state);
+            try {
+                result = await scanGetopts(state.getopts.cursor, optstring, input ?? args, {
+                    reportErrors: state.variables.OPTERR === undefined || state.variables.OPTERR === "" || decimalIndex(state.variables.OPTERR) !== 0,
+                    work,
+                });
+            }
+            catch (error) {
+                this.signal.throwIfAborted();
+                if (error instanceof GetoptsError && (error.code === "NON_ASCII_OPTION" || error.code === "INVALID_INPUT"))
+                    throw new CommandFailure(`getopts: ${error.message}`, 2);
+                throw error;
+            }
             this.signal.throwIfAborted();
-            if (error instanceof GetoptsError && (error.code === "NON_ASCII_OPTION" || error.code === "INVALID_INPUT"))
-                throw new CommandFailure(`getopts: ${error.message}`, 2);
-            throw error;
+            if (monitor && monitor.positionalRevision !== revision)
+                throw new CommandFailure("getopts: positional arguments changed during validation", 2);
+            if (allocation && monitor.retainGetoptsInput(revision, input, allocation))
+                allocation = undefined;
+        }
+        finally {
+            allocation?.close();
         }
         this.signal.throwIfAborted();
         state.getopts.cursor = result.state;