@poe-platform/safe-bash 0.1.528 → 0.1.529

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

@@ -5,7 +5,7 @@ import { ACCESS_MODES, FsError, composeMiddleware, createBytePipe, pipeBytes, re
 import { concatShellValues, shellValueByteLength, shellValueBytes, shellValueFromBytes, shellValueText } from "../contracts/value.js";
 import { createCommandArguments, getCommandArguments } from "../contracts/command.js";
 import { ValueArena } from "./value-state.js";
-import { compoundEntryWords, HereDocumentSyntaxError, hereDocumentWords, parseShellInputUnit, parseShellUnit } from "./parser.js";
+import { parseArraySubscript, compoundEntryWords, HereDocumentSyntaxError, hereDocumentWords, parseShellInputUnit, parseShellUnit } from "./parser.js";
 import { SourceLineIndex } from "./source-line-index.js";
 import { ShellLimitError, ShellSyntaxError } from "./types.js";
 import { scopeFileSystem } from "@poe-platform/safe-fs/core";
@@ -59,7 +59,7 @@ export const defaultLimits = {
     pipeHighWaterMark: 64 * 1024,
 };
 const shellBuiltinNames = new Set([
-    ":", "true", "false", "pwd", "cd", "set", "shift", "export", "local", "unset", "read", "mapfile", "readarray",
+    ":", "true", "false", "pwd", "cd", "set", "shift", "export", "local", "unset", "read", "declare", "mapfile", "readarray",
     "exit", "return", "break", "continue", "command", "builtin", "type", "readonly", "echo", "printf", "test", "[", ".", "source", "eval", "getopts", "let", "pushd", "dirs", "popd", "shopt",
 ]);
 const implementedBuiltins = new Set([...shellBuiltinNames].filter(name => !["echo", "printf", "test", "["].includes(name)));
@@ -1437,7 +1437,7 @@ export class Runtime {
     }
     variable(state, name) {
         const binding = arrayStore(state)?.get(name);
-        return binding ? binding.get(0) : state.variables[name];
+        return binding ? binding.get(binding.associative ? binding.keys.get("30")?.index ?? -1 : 0) : state.variables[name];
     }
     requireParameter(value, name, state, io, line) {
         if (state.nounset && value === undefined)
@@ -1593,7 +1593,7 @@ export class Runtime {
                     await operation.ledger.checkpoint(this.signal, 2);
                 }
                 if (typeof index === "number")
-                    staged.values.get(index)?.slot.release();
+                    staged.remove(index);
                 staged.maximum = maximum;
             }
             this.signal.throwIfAborted();
@@ -1652,12 +1652,13 @@ export class Runtime {
             if (!current)
                 throw new ArrayFailure("stale binding");
             staged = await current.copy(this.signal);
-            const previous = current.values.get(0)?.text.rawValue ?? current.get(0) ?? "";
+            const index = staged.associative ? (await staged.keyIndex("0", operation, this.signal, true)) : 0;
+            const previous = current.values.get(index)?.text.rawValue ?? current.get(index) ?? "";
             const value = !append ? expanded : typeof previous === "string" && typeof expanded === "string"
                 ? await this.arrayJoin(operation, [previous, expanded], "") : concatShellValues([previous, expanded], valueAllocation);
             const token = await valueToken(staged.owner, value, this.signal);
             try {
-                staged.insert(0, token);
+                staged.insert(index, token);
             }
             catch (error) {
                 token.release();
@@ -1707,11 +1708,35 @@ export class Runtime {
         await owner.ledger.checkpoint(this.signal);
         return result;
     }
+    async arrayIndex(binding, index, state, io, owner, create = false) {
+        if (!binding?.associative) {
+            const selected = index.source === undefined ? index : literalIndex(index.source, 0, this.budget.parsing);
+            const number = numericIndex(selected);
+            if (number === undefined)
+                throw new ArrayFailure("index outside 0..2147483647");
+            return number;
+        }
+        const word = index.word ?? parseArraySubscript(index.source ?? index.decimal, this.budget.parsing, byteLocale(state.variables), state.depth);
+        const fields = await this.valueWord(word, state, io, false);
+        const value = fields.length === 1 ? fields[0] : concatShellValues(fields, io[valueScope]);
+        if (shellValueByteLength(value) === 0) {
+            await this.diagnostic(io, "associative array: bad array subscript");
+            if (create)
+                throw completedExit(1);
+            return undefined;
+        }
+        return binding.keyIndex(value, owner, this.signal, create);
+    }
     async arrayAssignment(assignment, state, io) {
         const name = assignment.name;
         this.signal.throwIfAborted();
-        if (state.readonlyVariables?.has(name))
+        if (state.readonlyVariables?.has(name)) {
+            if (arrayStore(state)?.get(name)?.associative) {
+                await this.diagnostic(io, `${name}: readonly variable`);
+                throw completedExit(1);
+            }
             throw new ArrayFailure("readonly binding");
+        }
         if (controlNames.has(name))
             throw new ArrayFailure("control binding cannot be indexed");
         if (state.exported.has(name))
@@ -1723,11 +1748,13 @@ export class Runtime {
         try {
             const watch = await store.watch(name, operation, this.signal);
             const current = store.get(name);
+            if (current?.associative && assignment.kind === "compound" && assignment.entries.length)
+                throw new ArrayFailure("nonempty associative compound assignment is unsupported");
             const initialMaximum = current?.maximum ?? (state.variables[name] === undefined ? -1 : 0);
             let planned = assignment.append && assignment.kind === "compound" ? initialMaximum + 1 : 0;
             if (assignment.kind === "element") {
                 operation.reserve({ work: assignment.index.decimal.length + 1 }).release();
-                if (numericIndex(assignment.index) === undefined)
+                if (!current?.associative && numericIndex(literalIndex(assignment.index.source ?? assignment.index.decimal, 0, this.budget.parsing)) === undefined)
                     throw new ArrayFailure("index outside 0..2147483647");
             }
             else
@@ -1761,7 +1788,7 @@ export class Runtime {
             const tickets = operation.reserve({ generation: true, version: true, epoch: true, work: 8 });
             const prepared = await store.prepareName(name, operation, this.signal);
             const preserve = assignment.kind === "element" || assignment.append;
-            staged = preserve && current ? await current.copy(this.signal) : IndexedBinding.create(store.owner);
+            staged = preserve && current ? await current.copy(this.signal) : IndexedBinding.create(store.owner, current?.associative);
             if (preserve && !current && state.variables[name] !== undefined) {
                 const token = await valueToken(staged.owner, stateMonitor(state)?.values.get(name, state.variables[name]) ?? state.variables[name], this.signal);
                 try {
@@ -1790,7 +1817,7 @@ export class Runtime {
             const join = async (values) => values.every(value => typeof value === "string")
                 ? this.arrayJoin(operation, values, "") : concatShellValues(values, io[valueScope]);
             if (assignment.kind === "element") {
-                const index = numericIndex(assignment.index);
+                const index = (await this.arrayIndex(staged, assignment.index, state, io, operation, true));
                 const fields = await this.valueWord(assignment.value, state, io, false);
                 let value = await join(fields);
                 if (assignment.append)
@@ -4812,6 +4839,8 @@ export class Runtime {
         let releaseHolding;
         try {
             const options = await mapfileOptions(context, work, allocation);
+            if (arrayStore(state)?.get(options.name)?.associative)
+                throw new MapfileUsageError(`${options.name}: not an indexed array`, 1);
             if (state.readonlyVariables?.has(options.name))
                 throw new MapfileUsageError(`${options.name}: readonly variable`, 1);
             if (controlNames.has(options.name) || state.exported.has(options.name))
@@ -5019,9 +5048,16 @@ export class Runtime {
             this.replacePositionals(state, this.positionalValues(state).slice(count));
             return 0;
         }
-        if (command === "export" || command === "local" || command === "readonly") {
+        if (command === "export" || command === "local" || command === "readonly" || command === "declare") {
+            const associativeDeclaration = command === "declare";
             const declarationArgs = [...args];
-            let indexedLocal = false;
+            let indexedLocal = associativeDeclaration;
+            if (associativeDeclaration) {
+                if (declarationArgs.shift() !== "-A" || !declarationArgs.length) {
+                    await this.diagnostic(context, "declare: only -A NAME is supported");
+                    return 2;
+                }
+            }
             if (command === "local") {
                 const options = localDeclarationOptions(declarationArgs, this.signal);
                 if (options.error !== undefined) {
@@ -5084,13 +5120,13 @@ export class Runtime {
                     status = 1;
                     continue;
                 }
-                if (command === "local" && indexedLocal) {
+                if ((command === "local" || associativeDeclaration) && indexedLocal) {
                     if (controlNames.has(name))
                         throw new ArrayFailure("control binding cannot be indexed");
                     if (state.exported.has(name))
                         throw new ArrayFailure("exported binding cannot be indexed");
-                    const existingLocal = locals.get(name);
-                    const saved = existingLocal ? undefined : assignments.get(name) ?? saveVariable(state, name);
+                    const existingLocal = locals?.get(name);
+                    const saved = !locals || existingLocal ? undefined : assignments.get(name) ?? saveVariable(state, name);
                     let operation;
                     let holding;
                     let shadow;
@@ -5115,12 +5151,15 @@ export class Runtime {
                         const tickets = operation.reserve({ generation: true, version: true, epoch: true, work: 8 });
                         const prepared = await store.prepareName(name, operation, this.signal);
                         const current = store.get(name);
-                        shadow = !saved && current ? await current.copy(this.signal) : IndexedBinding.create(store.owner);
+                        if (!saved && current && current.associative !== associativeDeclaration)
+                            throw new ArrayFailure("cannot convert array kind");
+                        shadow = !saved && current ? await current.copy(this.signal) : IndexedBinding.create(store.owner, associativeDeclaration);
                         const value = match[2] ?? (!saved && !current && Object.hasOwn(state.variables, name) ? state.variables[name] : undefined);
                         if (value !== undefined) {
-                            const token = await textToken(shadow.owner, value, this.signal);
+                            const retained = associativeDeclaration && match[2] === undefined ? stateMonitor(state).values.get(name, value) : value;
+                            const token = await valueToken(shadow.owner, retained, this.signal);
                             try {
-                                shadow.insert(0, token);
+                                shadow.insert(associativeDeclaration ? (await shadow.keyIndex("0", operation, this.signal, true)) : 0, token);
                             }
                             catch (error) {
                                 token.release();
@@ -5295,7 +5334,8 @@ export class Runtime {
         }
         if (command === "unset") {
             let status = 0;
-            for (const name of args) {
+            for (let argument = 0; argument < args.length; argument++) {
+                const name = args[argument];
                 const selected = /^([a-zA-Z_][a-zA-Z_0-9]*)\[(.*)\]$/su.exec(name);
                 if (selected) {
                     const base = selected[1];
@@ -5305,7 +5345,16 @@ export class Runtime {
                         status = 1;
                         continue;
                     }
-                    if (selector === "@" || selector === "*")
+                    const binding = arrayStore(state)?.get(base);
+                    if (binding?.associative) {
+                        const original = getCommandArguments(context).values[argument];
+                        const index = typeof original === "string"
+                            ? await this.arrayIndex(binding, { decimal: selector, source: selector }, state, context, binding.owner)
+                            : await binding.keyIndex(shellValueFromBytes(shellValueBytes(original, context[valueScope]).subarray(base.length + 1, shellValueByteLength(original) - 1), context[valueScope]), binding.owner, this.signal);
+                        if (index !== undefined)
+                            await this.unsetIndexed(state, base, index);
+                    }
+                    else if (selector === "@" || selector === "*")
                         await this.unsetIndexed(state, base, "members");
                     else {
                         let index;
@@ -5566,7 +5615,7 @@ export class Runtime {
         if (part.kind === "variable" && part.transform) {
             const selector = getArraySelector(part);
             if (selector?.kind === "members" || part.name === "@" || part.name === "*") {
-                const members = selector ? await this.arrayMembers(part.name, state, io) : this.positionalValues(state);
+                const members = selector ? await this.arrayMembers(part.name, state, io, part.keys) : this.positionalValues(state);
                 const ifs = state.variables.IFS ?? " ";
                 const separator = ifs.length ? String.fromCodePoint(ifs.codePointAt(0)) : "";
                 const fragments = [];
@@ -5612,7 +5661,20 @@ export class Runtime {
         const binding = part.kind === "variable" ? arrayStore(state)?.get(part.name) : undefined;
         const holding = binding ? requireArrays(state).owner.hold() : undefined;
         const selector = getArraySelector(part);
-        const index = selector?.kind === "element" ? numericIndex(selector.index) : 0;
+        if (selector?.kind === "element" && binding?.associative) {
+            try {
+                const index = await this.arrayIndex(binding, selector.index, state, io, binding.owner);
+                const token = index === undefined ? undefined : binding.values.get(index)?.text;
+                this.requireParameter(token?.value, part.kind === "variable" ? part.name : "", state, io);
+                if (part.kind === "variable" && part.length)
+                    return this.parameterLength(token?.value ?? "");
+                return token?.rawValue ? shellValueFromBytes(shellValueBytes(token.rawValue, io[valueScope]), io[valueScope]) : token?.value ?? "";
+            }
+            finally {
+                holding?.release();
+            }
+        }
+        const index = selector?.kind === "element" ? numericIndex(selector.index) : binding?.associative ? binding.keys.get("30")?.index : 0;
         const token = index === undefined || selector?.kind === "members" ? undefined : binding?.values.get(index)?.text;
         token?.retain();
         try {
@@ -5747,7 +5809,7 @@ export class Runtime {
             }
             if (part.length)
                 return String(binding?.values.size ?? (state.variables[part.name] === undefined ? 0 : 1));
-            const values = await this.arrayMembers(part.name, state, io);
+            const values = await this.arrayMembers(part.name, state, io, part.keys);
             const separator = Array.from(state.variables.IFS ?? " ")[0] ?? "";
             if (values.every(value => typeof value === "string"))
                 return this.arrayJoin(store.owner, values, separator);
@@ -6229,7 +6291,7 @@ export class Runtime {
                     }
                 }
                 else if (part.kind === "variable" && split && (selector?.kind === "members" && !part.length && (!part.quoted || selector.separator === "@") || part.transform && part.name === "@")) {
-                    const members = selector?.kind === "members" ? await this.arrayMembers(part.name, state, io) : this.positionalValues(state);
+                    const members = selector?.kind === "members" ? await this.arrayMembers(part.name, state, io, part.keys) : this.positionalValues(state);
                     for (let position = 0; position < members.length; position++) {
                         if (position > 0)
                             addField();
@@ -6404,7 +6466,7 @@ export class Runtime {
                 allocation.hold(value);
         return createCommandArguments(values, allocation);
     }
-    async arrayMembers(name, state, io) {
+    async arrayMembers(name, state, io, keys = false) {
         const store = requireArrays(state);
         const holding = store.owner.hold();
         try {
@@ -6416,7 +6478,7 @@ export class Runtime {
                     return [];
                 store.owner.reserve({ metadata: 32, allocatedSlots: 1, work: 3 });
                 await textToken(store.owner, value, this.signal);
-                return [value];
+                return [keys ? "0" : value];
             }
             binding.retain();
             try {
@@ -6424,7 +6486,7 @@ export class Runtime {
                 const values = [];
                 for (const index of indices) {
                     store.owner.reserve({ metadata: 32, allocatedSlots: 1, work: 4 });
-                    const token = binding.values.get(index).text;
+                    const token = keys ? binding.associative ? binding.keys.get(binding.keyByIndex.get(index)).text : await textToken(store.owner, String(index), this.signal) : binding.values.get(index).text;
                     const value = token.rawValue === undefined ? token.value : shellValueFromBytes(shellValueBytes(token.rawValue, io[valueScope]), io[valueScope]);
                     if (typeof value === "string")
                         await textToken(store.owner, value, this.signal);