@franzzemen/brokenstock-shell 0.4.7 → 0.5.0

package/fesm2022/franzzemen-brokenstock-shell.mjs

@@ -2558,9 +2558,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.2", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
+/**
+ * Names the shell handles itself, ahead of the registry. A command taking one
+ * of these would be registered and then never reachable, so registration
+ * refuses them outright rather than leaving a command that silently never runs.
+ */
+const RESERVED_NAMES = ['clear', 'help'];
 class CommandRegistryService {
     constructor() {
         this.commands = new Map();
+        this.aliases = new Map();
         // Built-in shell commands registered ahead of app-provided commands so
         // an app cannot accidentally shadow them.
         this.register(inject(FaqCommand));
@@ -2569,8 +2576,47 @@ class CommandRegistryService {
             this.register(cmd);
         }
     }
+    /**
+     * Register a command and claim its names.
+     *
+     * ⭐ THROWS on a name already taken — real name or alternate. It used to be a
+     * bare `set`, which meant a clash silently overwrote whichever command
+     * registered first, and the constructor's "built-ins first so an app cannot
+     * shadow them" comment was not actually true of the map. A shadowed command
+     * is indistinguishable from a broken one, and this is the map dispatch reads,
+     * so the failure belongs at startup where it cannot be missed
+     * (scanner-command-speed.prd.md D4).
+     */
     register(command) {
+        this.#claim(command.name, `command '${command.name}'`);
         this.commands.set(command.name, command);
+        for (const alias of command.aliases ?? []) {
+            this.#claim(alias.name, `alias '${alias.name}' of '${command.name}'`);
+            this.aliases.set(alias.name, { command, prependArgs: alias.prependArgs ?? [] });
+        }
+    }
+    #claim(name, what) {
+        if (RESERVED_NAMES.includes(name)) {
+            throw new Error(`${what} collides with a reserved command name`);
+        }
+        if (this.commands.has(name) || this.aliases.has(name)) {
+            throw new Error(`${what} collides with a command name already registered`);
+        }
+    }
+    /**
+     * Resolve a word the user typed to the command it names — real name or
+     * alternate. `prependArgs` is empty except for an alternate that carries a
+     * subcommand.
+     *
+     * Use this wherever a TYPED word is being looked up. {@link get} deliberately
+     * stays blind to alternates so callers that mean "the command called X" keep
+     * meaning exactly that.
+     */
+    resolve(name) {
+        const command = this.commands.get(name);
+        if (command)
+            return { command, prependArgs: [] };
+        return this.aliases.get(name);
     }
     get(name) {
         return this.commands.get(name);
@@ -2586,11 +2632,15 @@ class CommandRegistryService {
         if (!prefix)
             return [];
         if (!isAuthenticated) {
-            const open = ['login', ...[...this.commands.values()].filter(c => c.requiresAuth === false).map(c => c.name)];
+            const open = ['login', ...[...this.commands.values()]
+                    .filter(c => c.requiresAuth === false)
+                    .flatMap(c => [c.name, ...(c.aliases ?? []).map(a => a.name)])];
             return open.filter(name => name.startsWith(prefix) && name !== prefix).sort();
         }
         const builtIns = ['clear', 'help'];
-        const registered = [...this.commands.values()].map(c => c.name);
+        // Alternate names are offered too: typing `sca` and being offered nothing
+        // is the exact failure that produced the ref/reference pair (D5).
+        const registered = [...this.commands.keys(), ...this.aliases.keys()];
         return [...builtIns, ...registered]
             .filter(name => name.startsWith(prefix) && name !== prefix)
             .sort();
@@ -2678,7 +2728,10 @@ class CommandService {
         const input = validation.data;
         const parts = tokenize(input);
         const command = parts[0].toLowerCase();
-        const def = this.registry.get(command);
+        // Resolved rather than looked up by name: a command typed under an
+        // alternate name must still get its own input sanitiser (a password line
+        // masked under `login` stays masked under any other word for it).
+        const def = this.registry.resolve(command)?.command;
         const displayInput = def?.sanitizeInput ? def.sanitizeInput(input) : input;
         const resultOrPromise = this.#dispatch(command, parts.slice(1));
         this.currentInput.set('');
@@ -2770,13 +2823,30 @@ class CommandService {
                 isHelp: true,
             };
         }
-        let def = this.registry.get(command);
+        /*
+         * Resolution, not a name lookup — `scan` and `scans` reach the scanner the
+         * same way `scanner` does. An alternate may also carry leading words
+         * (`scans NVDA` IS `scanner select NVDA`), which are inserted ahead of what
+         * the user typed.
+         *
+         * ⭐ `command` keeps the word the USER typed. Every message below
+         * interpolates it, and telling someone who typed `scan` that the arguments
+         * of 'scanner' are wrong reads as though something else ran. The two-word
+         * swap is the one deliberate exception, because there the typed first word
+         * really was an argument.
+         */
+        let resolved = this.registry.resolve(command);
+        if (resolved) {
+            args = [...resolved.prependArgs, ...args];
+        }
+        let def = resolved?.command;
         if (!def) {
             // Try swapping the first two tokens: "disable user foo" → "user disable foo"
             const swapped = args[0]?.toLowerCase();
-            if (swapped && this.registry.get(swapped)) {
-                def = this.registry.get(swapped);
-                args = [command, ...args.slice(1)];
+            const swappedResolved = swapped ? this.registry.resolve(swapped) : undefined;
+            if (swappedResolved) {
+                def = swappedResolved.command;
+                args = [...swappedResolved.prependArgs, command, ...args.slice(1)];
                 command = swapped;
             }
             else {
@@ -2814,7 +2884,7 @@ class CommandService {
             return { success: true, message: CLEAR_USAGE, timestamp: new Date(), isHelp: true };
         if (name === 'help')
             return { success: true, message: HELP_USAGE, timestamp: new Date(), isHelp: true };
-        const def = this.registry.get(name);
+        const def = this.registry.resolve(name)?.command;
         if (!def)
             return { success: false, message: `Unknown command: ${name}`, timestamp: new Date() };
         // Usage is still shown for a gated command — knowing how it works is how a
@@ -2970,11 +3040,11 @@ class MainContent {
         this.#shortcutService.helpVisible.set(false);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.2", ngImport: i0, type: MainContent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.1.2", type: MainContent, isStandalone: true, selector: "shell-main-content", ngImport: i0, template: "<div class=\"main-content\">\n  <div class=\"content-area\">\n    <router-outlet />\n  </div>\n  @if (shortcutHelpVisible() && activeShortcuts()) {\n    <div class=\"shortcut-overlay\" (click)=\"closeShortcutHelp()\">\n      <div class=\"shortcut-panel\" (click)=\"$event.stopPropagation()\">\n        <div class=\"shortcut-title text-secondary-info\">{{ activeShortcuts()!.groupId }} shortcuts</div>\n        @for (s of activeShortcuts()!.shortcuts; track s.key) {\n          <div class=\"shortcut-row\">\n            <kbd class=\"shortcut-key\">Alt+{{ formatKey(s.key) }}</kbd>\n            <span class=\"shortcut-desc text-text-primary\">{{ s.description }}</span>\n          </div>\n        }\n        <div class=\"shortcut-row shortcut-dismiss\">\n          <kbd class=\"shortcut-key\">Alt+?</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">or</span>\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">dismiss</span>\n        </div>\n      </div>\n    </div>\n  }\n  @if (isThinking()) {\n    <div class=\"thinking-overlay\">\n      <mat-spinner diameter=\"48\" />\n    </div>\n  }\n</div>\n", styles: [".main-content{position:relative;height:100%;overflow:hidden}.content-area{height:100%;overflow-y:auto;padding:16px}.shortcut-overlay{position:absolute;inset:0;z-index:15;display:flex;align-items:center;justify-content:center;background-color:#0a0e1480}.shortcut-panel{background-color:var(--color-terminal-bg);border:1px solid var(--color-surface-border);border-radius:6px;padding:14px 18px;font-size:.8rem;box-shadow:0 4px 16px #00000080;min-width:220px}.shortcut-title{font-size:.7rem;text-transform:uppercase;letter-spacing:.05em;margin-bottom:8px;font-weight:500}.shortcut-row{display:flex;align-items:center;gap:10px;padding:3px 0}.shortcut-row.shortcut-dismiss{margin-top:6px;border-top:1px solid var(--color-surface-border);padding-top:8px}.shortcut-key{font-family:Roboto Mono,monospace;font-size:.75rem;background-color:#ffffff14;border:1px solid var(--color-surface-border);border-radius:3px;padding:1px 6px;min-width:70px;text-align:center}.shortcut-desc{font-size:.78rem}.thinking-overlay{position:absolute;inset:0;z-index:20;background-color:#0a0e14b3;display:flex;align-items:center;justify-content:center;pointer-events:all;cursor:wait}\n"], dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name", "routerOutletData"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "ngmodule", type: MatProgressSpinnerModule }, { kind: "component", type: i1$1.MatProgressSpinner, selector: "mat-progress-spinner, mat-spinner", inputs: ["color", "mode", "value", "diameter", "strokeWidth"], exportAs: ["matProgressSpinner"] }], changeDetection: i0.ChangeDetectionStrategy.Eager }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.1.2", type: MainContent, isStandalone: true, selector: "shell-main-content", ngImport: i0, template: "<div class=\"main-content\">\n  <div class=\"content-area\">\n    <router-outlet />\n  </div>\n  @if (shortcutHelpVisible() && activeShortcuts()) {\n    <div class=\"shortcut-overlay\" (click)=\"closeShortcutHelp()\">\n      <div class=\"shortcut-panel\" (click)=\"$event.stopPropagation()\">\n        <div class=\"shortcut-title text-secondary-info\">{{ activeShortcuts()!.groupId }} shortcuts</div>\n        @for (s of activeShortcuts()!.shortcuts; track s.key) {\n          <div class=\"shortcut-row\">\n            <kbd class=\"shortcut-key\">Alt+{{ formatKey(s.key) }}</kbd>\n            <span class=\"shortcut-desc text-text-primary\">{{ s.description }}</span>\n          </div>\n        }\n        <!--\n          Esc is documented rather than added (scanner-command-speed.prd.md D24/E4).\n          It has always put the cursor in the command box, from anywhere and even\n          while typing in a field \u2014 it was simply never written down, which is why\n          it read as a missing feature. Worded for what it actually does: it also\n          closes this panel, and it does not check whether a dialog is open.\n        -->\n        <div class=\"shortcut-row\">\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-text-primary\">Put the cursor in the command box, from anywhere</span>\n        </div>\n        <div class=\"shortcut-row shortcut-dismiss\">\n          <kbd class=\"shortcut-key\">Alt+?</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">or</span>\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">dismiss</span>\n        </div>\n      </div>\n    </div>\n  }\n  @if (isThinking()) {\n    <div class=\"thinking-overlay\">\n      <mat-spinner diameter=\"48\" />\n    </div>\n  }\n</div>\n", styles: [".main-content{position:relative;height:100%;overflow:hidden}.content-area{height:100%;overflow-y:auto;padding:16px}.shortcut-overlay{position:absolute;inset:0;z-index:15;display:flex;align-items:center;justify-content:center;background-color:#0a0e1480}.shortcut-panel{background-color:var(--color-terminal-bg);border:1px solid var(--color-surface-border);border-radius:6px;padding:14px 18px;font-size:.8rem;box-shadow:0 4px 16px #00000080;min-width:220px}.shortcut-title{font-size:.7rem;text-transform:uppercase;letter-spacing:.05em;margin-bottom:8px;font-weight:500}.shortcut-row{display:flex;align-items:center;gap:10px;padding:3px 0}.shortcut-row.shortcut-dismiss{margin-top:6px;border-top:1px solid var(--color-surface-border);padding-top:8px}.shortcut-key{font-family:Roboto Mono,monospace;font-size:.75rem;background-color:#ffffff14;border:1px solid var(--color-surface-border);border-radius:3px;padding:1px 6px;min-width:70px;text-align:center}.shortcut-desc{font-size:.78rem}.thinking-overlay{position:absolute;inset:0;z-index:20;background-color:#0a0e14b3;display:flex;align-items:center;justify-content:center;pointer-events:all;cursor:wait}\n"], dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name", "routerOutletData"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "ngmodule", type: MatProgressSpinnerModule }, { kind: "component", type: i1$1.MatProgressSpinner, selector: "mat-progress-spinner, mat-spinner", inputs: ["color", "mode", "value", "diameter", "strokeWidth"], exportAs: ["matProgressSpinner"] }], changeDetection: i0.ChangeDetectionStrategy.Eager }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.2", ngImport: i0, type: MainContent, decorators: [{
             type: Component,
-            args: [{ selector: 'shell-main-content', imports: [RouterOutlet, MatProgressSpinnerModule], changeDetection: ChangeDetectionStrategy.Eager, template: "<div class=\"main-content\">\n  <div class=\"content-area\">\n    <router-outlet />\n  </div>\n  @if (shortcutHelpVisible() && activeShortcuts()) {\n    <div class=\"shortcut-overlay\" (click)=\"closeShortcutHelp()\">\n      <div class=\"shortcut-panel\" (click)=\"$event.stopPropagation()\">\n        <div class=\"shortcut-title text-secondary-info\">{{ activeShortcuts()!.groupId }} shortcuts</div>\n        @for (s of activeShortcuts()!.shortcuts; track s.key) {\n          <div class=\"shortcut-row\">\n            <kbd class=\"shortcut-key\">Alt+{{ formatKey(s.key) }}</kbd>\n            <span class=\"shortcut-desc text-text-primary\">{{ s.description }}</span>\n          </div>\n        }\n        <div class=\"shortcut-row shortcut-dismiss\">\n          <kbd class=\"shortcut-key\">Alt+?</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">or</span>\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">dismiss</span>\n        </div>\n      </div>\n    </div>\n  }\n  @if (isThinking()) {\n    <div class=\"thinking-overlay\">\n      <mat-spinner diameter=\"48\" />\n    </div>\n  }\n</div>\n", styles: [".main-content{position:relative;height:100%;overflow:hidden}.content-area{height:100%;overflow-y:auto;padding:16px}.shortcut-overlay{position:absolute;inset:0;z-index:15;display:flex;align-items:center;justify-content:center;background-color:#0a0e1480}.shortcut-panel{background-color:var(--color-terminal-bg);border:1px solid var(--color-surface-border);border-radius:6px;padding:14px 18px;font-size:.8rem;box-shadow:0 4px 16px #00000080;min-width:220px}.shortcut-title{font-size:.7rem;text-transform:uppercase;letter-spacing:.05em;margin-bottom:8px;font-weight:500}.shortcut-row{display:flex;align-items:center;gap:10px;padding:3px 0}.shortcut-row.shortcut-dismiss{margin-top:6px;border-top:1px solid var(--color-surface-border);padding-top:8px}.shortcut-key{font-family:Roboto Mono,monospace;font-size:.75rem;background-color:#ffffff14;border:1px solid var(--color-surface-border);border-radius:3px;padding:1px 6px;min-width:70px;text-align:center}.shortcut-desc{font-size:.78rem}.thinking-overlay{position:absolute;inset:0;z-index:20;background-color:#0a0e14b3;display:flex;align-items:center;justify-content:center;pointer-events:all;cursor:wait}\n"] }]
+            args: [{ selector: 'shell-main-content', imports: [RouterOutlet, MatProgressSpinnerModule], changeDetection: ChangeDetectionStrategy.Eager, template: "<div class=\"main-content\">\n  <div class=\"content-area\">\n    <router-outlet />\n  </div>\n  @if (shortcutHelpVisible() && activeShortcuts()) {\n    <div class=\"shortcut-overlay\" (click)=\"closeShortcutHelp()\">\n      <div class=\"shortcut-panel\" (click)=\"$event.stopPropagation()\">\n        <div class=\"shortcut-title text-secondary-info\">{{ activeShortcuts()!.groupId }} shortcuts</div>\n        @for (s of activeShortcuts()!.shortcuts; track s.key) {\n          <div class=\"shortcut-row\">\n            <kbd class=\"shortcut-key\">Alt+{{ formatKey(s.key) }}</kbd>\n            <span class=\"shortcut-desc text-text-primary\">{{ s.description }}</span>\n          </div>\n        }\n        <!--\n          Esc is documented rather than added (scanner-command-speed.prd.md D24/E4).\n          It has always put the cursor in the command box, from anywhere and even\n          while typing in a field \u2014 it was simply never written down, which is why\n          it read as a missing feature. Worded for what it actually does: it also\n          closes this panel, and it does not check whether a dialog is open.\n        -->\n        <div class=\"shortcut-row\">\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-text-primary\">Put the cursor in the command box, from anywhere</span>\n        </div>\n        <div class=\"shortcut-row shortcut-dismiss\">\n          <kbd class=\"shortcut-key\">Alt+?</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">or</span>\n          <kbd class=\"shortcut-key\">Esc</kbd>\n          <span class=\"shortcut-desc text-secondary-info\">dismiss</span>\n        </div>\n      </div>\n    </div>\n  }\n  @if (isThinking()) {\n    <div class=\"thinking-overlay\">\n      <mat-spinner diameter=\"48\" />\n    </div>\n  }\n</div>\n", styles: [".main-content{position:relative;height:100%;overflow:hidden}.content-area{height:100%;overflow-y:auto;padding:16px}.shortcut-overlay{position:absolute;inset:0;z-index:15;display:flex;align-items:center;justify-content:center;background-color:#0a0e1480}.shortcut-panel{background-color:var(--color-terminal-bg);border:1px solid var(--color-surface-border);border-radius:6px;padding:14px 18px;font-size:.8rem;box-shadow:0 4px 16px #00000080;min-width:220px}.shortcut-title{font-size:.7rem;text-transform:uppercase;letter-spacing:.05em;margin-bottom:8px;font-weight:500}.shortcut-row{display:flex;align-items:center;gap:10px;padding:3px 0}.shortcut-row.shortcut-dismiss{margin-top:6px;border-top:1px solid var(--color-surface-border);padding-top:8px}.shortcut-key{font-family:Roboto Mono,monospace;font-size:.75rem;background-color:#ffffff14;border:1px solid var(--color-surface-border);border-radius:3px;padding:1px 6px;min-width:70px;text-align:center}.shortcut-desc{font-size:.78rem}.thinking-overlay{position:absolute;inset:0;z-index:20;background-color:#0a0e14b3;display:flex;align-items:center;justify-content:center;pointer-events:all;cursor:wait}\n"] }]
         }] });
 
 class CommandTerminal {