@mak-98/dirvi-app 0.11.0-beta.12 → 0.11.0-beta.14

package/dist/application/init-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-runtime.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAYhD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,cAAc,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAuI/C"}
+{"version":3,"file":"init-runtime.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAYhD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,cAAc,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAsK/C"}

package/dist/application/init-runtime.error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-runtime.error.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.error.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,oBAAoB,GAC5B,kBAAkB,GAClB,eAAe,GACf,eAAe,GACf,sBAAsB,GACtB,4BAA4B,GAC5B,gBAAgB,GAChB,+BAA+B,GAC/B,oBAAoB,GACpB,4BAA4B,GAC5B,oBAAoB,CAAC;AAEzB;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IAEvC,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAA1B,IAAI,EAAE,oBAAoB,EACnC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY;CAKzB;AAED,wEAAwE;AACxE,qBAAa,kCAAmC,SAAQ,gBAAgB;;CAOvE;AAED,gFAAgF;AAChF,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAG5C;AAED,+CAA+C;AAC/C,qBAAa,6BAA8B,SAAQ,gBAAgB;gBACrD,EAAE,EAAE,MAAM;CAMvB;AAED,wDAAwD;AACxD,qBAAa,mCAAoC,SAAQ,gBAAgB;gBAC3D,IAAI,EAAE,MAAM;CAMzB;AAED,kFAAkF;AAClF,qBAAa,4BAA6B,SAAQ,gBAAgB;;CAOjE;AAED,sFAAsF;AACtF,qBAAa,gCAAiC,SAAQ,gBAAgB;gBACxD,KAAK,EAAE,OAAO;CAO3B;AAED,+EAA+E;AAC/E,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,OAAO;CAO3B;AAED,6DAA6D;AAC7D,qBAAa,qBAAsB,SAAQ,gBAAgB;;CAO1D;AAED,8DAA8D;AAC9D,qBAAa,4BAA6B,SAAQ,gBAAgB;gBACpD,EAAE,EAAE,MAAM;CAMvB;AAED,iFAAiF;AACjF,qBAAa,yBAA0B,SAAQ,gBAAgB;gBACjD,OAAO,EAAE,MAAM;CAG5B"}
+{"version":3,"file":"init-runtime.error.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.error.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,oBAAoB,GAC5B,kBAAkB,GAClB,eAAe,GACf,eAAe,GACf,sBAAsB,GACtB,4BAA4B,GAC5B,gBAAgB,GAChB,+BAA+B,GAC/B,oBAAoB,GACpB,4BAA4B,GAC5B,oBAAoB,CAAC;AAEzB;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IAEvC,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAA1B,IAAI,EAAE,oBAAoB,EACnC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY;CAKzB;AAED,wEAAwE;AACxE,qBAAa,kCAAmC,SAAQ,gBAAgB;;CAOvE;AAED,gFAAgF;AAChF,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAG5C;AAED,+CAA+C;AAC/C,qBAAa,6BAA8B,SAAQ,gBAAgB;gBACrD,EAAE,EAAE,MAAM;CAMvB;AAED,wDAAwD;AACxD,qBAAa,mCAAoC,SAAQ,gBAAgB;gBAC3D,IAAI,EAAE,MAAM;CAMzB;AAED,kFAAkF;AAClF,qBAAa,4BAA6B,SAAQ,gBAAgB;;CAOjE;AAED,sFAAsF;AACtF,qBAAa,gCAAiC,SAAQ,gBAAgB;gBACxD,KAAK,EAAE,OAAO;CAO3B;AAED,+EAA+E;AAC/E,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,OAAO;CAO3B;AAED,6DAA6D;AAC7D,qBAAa,qBAAsB,SAAQ,gBAAgB;;CAS1D;AAED,8DAA8D;AAC9D,qBAAa,4BAA6B,SAAQ,gBAAgB;gBACpD,EAAE,EAAE,MAAM;CAMvB;AAED,iFAAiF;AACjF,qBAAa,yBAA0B,SAAQ,gBAAgB;gBACjD,OAAO,EAAE,MAAM;CAG5B"}

package/dist/application/init-runtime.error.js

@@ -57,7 +57,9 @@ export class InvalidAppPackageReferenceError extends InitRuntimeError {
 /** Initialization completed without registering any apps. */
 export class NoAppsRegisteredError extends InitRuntimeError {
     constructor() {
-        super('NO_APPS_REGISTERED', 'Initialization did not register any apps. Call dirvi.app.register(id, appReference) at least once in init.mjs.');
+        super('NO_APPS_REGISTERED', 'Initialization did not register any apps.' +
+            'Call dirvi.app.register(app) at least once in init.mjs.' +
+            'See /examples/ts-init/ for writing an init.mjs in TypeScript.');
     }
 }
 /** The explicitly selected startup app was not registered. */

package/dist/application/init-runtime.js

@@ -61,18 +61,45 @@ export function createInitRuntime() {
             },
         },
         app: {
-            register: (id, appReference) => {
+            register: (app) => {
                 ensureUnfinished();
-                validateNonEmptyString(id, 'App ID');
-                if (registeredApps.has(id)) {
-                    throw new DuplicateAppRegistrationError(id);
+                if (typeof app !== 'object' || app === null || Array.isArray(app)) {
+                    throw new InvalidInitializationValueError('App', 'must be an object');
                 }
+                const { id: appId, packRef, ex } = app;
+                validateNonEmptyString(appId, 'App ID');
+                if (registeredApps.has(appId)) {
+                    throw new DuplicateAppRegistrationError(appId);
+                }
+                let appReference;
                 try {
-                    registeredApps.set(id, AppPackageReferenceMethods.parse(appReference));
+                    appReference = AppPackageReferenceMethods.parse(packRef);
                 }
                 catch (cause) {
                     throw new InvalidAppPackageReferenceError(cause);
                 }
+                if (ex !== undefined && !Array.isArray(ex)) {
+                    throw new InvalidInitializationValueError('Ex commands', 'must be an array');
+                }
+                const appExCommands = new Map();
+                for (const exCommand of ex ?? []) {
+                    if (typeof exCommand !== 'object' ||
+                        exCommand === null ||
+                        Array.isArray(exCommand)) {
+                        throw new InvalidInitializationValueError('Ex command', 'must be an object');
+                    }
+                    const { command, execute } = exCommand;
+                    validateNonEmptyString(command, 'Ex command name');
+                    if (typeof execute !== 'function') {
+                        throw new InvalidExCommandHandlerError();
+                    }
+                    if (appExCommands.has(command)) {
+                        throw new DuplicateExCommandRegistrationError(command);
+                    }
+                    appExCommands.set(command, { name: command, execute });
+                }
+                registeredApps.set(appId, appReference);
+                exCommands.set(appId, appExCommands);
             },
             initial: (appId) => {
                 ensureUnfinished();
@@ -80,19 +107,6 @@ export function createInitRuntime() {
                 initialAppId = appId;
             },
         },
-        ex: {
-            register: (name, execute) => {
-                ensureUnfinished();
-                validateNonEmptyString(name, 'Ex command name');
-                if (typeof execute !== 'function') {
-                    throw new InvalidExCommandHandlerError();
-                }
-                if (exCommands.has(name)) {
-                    throw new DuplicateExCommandRegistrationError(name);
-                }
-                exCommands.set(name, { name, execute });
-            },
-        },
     };
     /**
      * === FINISH ================================================================
@@ -125,7 +139,7 @@ export function createInitRuntime() {
                 initial,
                 registered: new Map(registeredApps),
             },
-            exCommands: new Map(exCommands),
+            exCommands: new Map([...exCommands].map(([appId, commands]) => [appId, new Map(commands)])),
         };
     };
     return {

package/dist/domain/ex-command.d.ts

@@ -4,6 +4,6 @@ import { DirviApi } from 'dirvi-apis';
  */
 export type ExCommand = {
     readonly name: string;
-    readonly execute: (api: DirviApi) => void | Promise<void>;
+    readonly execute: (api: DirviApi, rawArgs: string | undefined) => void | Promise<void>;
 };
 //# sourceMappingURL=ex-command.d.ts.map

package/dist/domain/ex-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ex-command.d.ts","sourceRoot":"","sources":["../../src/domain/ex-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D,CAAC"}
+{"version":3,"file":"ex-command.d.ts","sourceRoot":"","sources":["../../src/domain/ex-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxF,CAAC"}

package/dist/domain/initialization.d.ts

@@ -17,7 +17,10 @@ export type Initialization = {
         /** App package references keyed by app ID. */
         registered: ReadonlyMap<string, AppPackageReference>;
     };
-    /** Ex commands registered by the initialization script, keyed by name. */
-    readonly exCommands: ReadonlyMap<string, ExCommand>;
+    /**
+     * Ex commands registered by the initialization script, keyed by appId and
+     * then command name.
+     * */
+    readonly exCommands: ReadonlyMap<string, ReadonlyMap<string, ExCommand>>;
 };
 //# sourceMappingURL=initialization.d.ts.map

package/dist/domain/initialization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialization.d.ts","sourceRoot":"","sources":["../../src/domain/initialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElC,wDAAwD;IACxD,QAAQ,CAAC,GAAG,EAAE;QACZ,wEAAwE;QACxE,OAAO,EAAE,MAAM,CAAC;QAEhB,8CAA8C;QAC9C,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;KACtD,CAAC;IAEF,0EAA0E;IAC1E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACrD,CAAC"}
+{"version":3,"file":"initialization.d.ts","sourceRoot":"","sources":["../../src/domain/initialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElC,wDAAwD;IACxD,QAAQ,CAAC,GAAG,EAAE;QACZ,wEAAwE;QACxE,OAAO,EAAE,MAAM,CAAC;QAEhB,8CAA8C;QAC9C,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;KACtD,CAAC;IAEF;;;SAGK;IACL,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;CAC1E,CAAC"}

package/dist/ui/App.d.ts

@@ -1,12 +1,13 @@
-import type { ShellApi } from 'dirvi-apis';
+import { Config, ShellApi } from 'dirvi-apis';
 import type { AppMethods, EffectToAction, IntentToEffect, Reducer, SerializableKey, State } from 'dirvi-lib';
 import type { AppScreenRenderer } from './app-screen-renderer.js';
-import type { Initialization } from '../domain/initialization.js';
+import { ExCommand } from '../domain/ex-command.js';
 type AppProps<Id extends SerializableKey, Value, ViewKey = string> = {
     screenRenderer: AppScreenRenderer;
     shellApi: ShellApi;
     appMethods: AppMethods<Id, Value, ViewKey>;
-    initialization: Initialization;
+    exCommands: ReadonlyMap<string, ExCommand>;
+    config: Readonly<Config>;
     initialState: State<Id, Value>;
     reducer: Reducer<Id, Value>;
     intentToEffect: IntentToEffect<Id, Value>;
@@ -15,6 +16,6 @@ type AppProps<Id extends SerializableKey, Value, ViewKey = string> = {
     clipboard?: (value: string) => void;
     onError?: (error: Error) => void;
 };
-export declare function App<Id extends SerializableKey, Value, ViewKey = string>({ screenRenderer, shellApi, appMethods, initialization, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }: AppProps<Id, Value, ViewKey>): import("react").JSX.Element;
+export declare function App<Id extends SerializableKey, Value, ViewKey = string>({ screenRenderer, shellApi, appMethods, exCommands, config, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }: AppProps<Id, Value, ViewKey>): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=App.d.ts.map

package/dist/ui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAwB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EACV,UAAU,EAEV,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAInB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3C,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EACvE,cAAc,EACd,QAAQ,EACR,UAAU,EACV,cAAc,EACd,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BA4V9B"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AASA,OAAO,EAAU,MAAM,EAAgB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EACV,UAAU,EAEV,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAInB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3C,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EACvE,cAAc,EACd,QAAQ,EACR,UAAU,EACV,UAAU,EACV,MAAM,EACN,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAyV9B"}

package/dist/ui/App.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState, } from 'react';
 import { createFeedbackApi, userInputToIntent } from 'dirvi-lib';
 import { useView } from './hooks/useView.js';
-export function App({ screenRenderer, shellApi, appMethods, initialization, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }) {
+export function App({ screenRenderer, shellApi, appMethods, exCommands, config, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }) {
     const ScreenRenderer = screenRenderer;
     const [state, dispatch] = useReducer(reducer, initialState);
     const stateRef = useRef(state); // Gives `subscribeToResync` callback a way to
@@ -91,13 +91,13 @@ export function App({ screenRenderer, shellApi, appMethods, initialization, init
             /** Execute a command, using shell API and app API. */
             case 'userExCommand': {
                 setInputState(clearInputState);
-                const command = initialization.exCommands.get(effect.name);
+                const command = exCommands.get(effect.name);
                 if (command === undefined) {
                     appApi.addMessage(`Command is no longer registered: ${effect.name}`, 'error');
                     return;
                 }
                 void Promise.resolve()
-                    .then(() => command.execute({ shell: shellApi, app: appApi })) // TODO: Add args
+                    .then(() => command.execute({ shell: shellApi, app: appApi }, effect.rawArgs))
                     .catch((error) => {
                     const appError = error instanceof Error ? error : new Error(String(error));
                     appApi.addMessage(`Command "${effect.name}" failed: ${appError.message}`, 'error');
@@ -108,10 +108,9 @@ export function App({ screenRenderer, shellApi, appMethods, initialization, init
                 shellApi.quit(effect.exitMessage);
                 return;
             case 'listApps': {
-                const appIds = [...initialization.app.registered.keys()];
-                const lines = appIds.map((id) => `${id}`);
+                const appIds = shellApi.listApps();
                 setInputState(clearInputState);
-                appApi.addMessage(['Apps:', ...lines].join('\n'));
+                appApi.addMessage(['Apps:', ...appIds].join('\n'));
                 return;
             }
             case 'switchApp':
@@ -226,7 +225,7 @@ export function App({ screenRenderer, shellApi, appMethods, initialization, init
                 appApi.addMessage(effect.message, 'error');
                 return;
         }
-    }, [appMethods, effectToAction, navEntry, state, shellApi, initialization.exCommands, initialization.app.registered, appApi, clearInputState]);
+    }, [appMethods, effectToAction, navEntry, state, shellApi, appApi, clearInputState, exCommands]);
     // ===========================================================================
     // Input hook
     // ===========================================================================
@@ -245,5 +244,5 @@ export function App({ screenRenderer, shellApi, appMethods, initialization, init
     // ===========================================================================
     // Render
     // ===========================================================================
-    return (_jsx(ScreenRenderer, { view: view, feedback: feedback, feedbackApi: feedbackApi, config: initialization.config, inputState: inputState, handleInput: handleInput, onRowsChange: handleRowsChange }));
+    return (_jsx(ScreenRenderer, { view: view, feedback: feedback, feedbackApi: feedbackApi, config: config, inputState: inputState, handleInput: handleInput, onRowsChange: handleRowsChange }));
 }

package/dist/ui/AppSetup.d.ts

@@ -6,12 +6,13 @@ import type { ShellApi } from 'dirvi-apis';
 type AppSetupProps<Id extends SerializableKey, Value, ViewKey = string> = {
     appScreenRenderer: AppScreenRenderer;
     loadingScreenRenderer: LoadingScreenRenderer;
+    appId: string;
     initialization: Initialization;
     shellApi: ShellApi;
     appMethods: AppMethods<Id, Value, ViewKey>;
     stdout?: (message: string) => void;
     clipboard?: (value: string) => void;
 };
-export declare function AppSetup<Id extends SerializableKey, Value, ViewKey = string>({ appScreenRenderer, loadingScreenRenderer, initialization, shellApi, appMethods, stdout, clipboard, }: AppSetupProps<Id, Value, ViewKey>): import("react").JSX.Element;
+export declare function AppSetup<Id extends SerializableKey, Value, ViewKey = string>({ appScreenRenderer, loadingScreenRenderer, appId, initialization, shellApi, appMethods, stdout, clipboard, }: AppSetupProps<Id, Value, ViewKey>): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=AppSetup.d.ts.map

package/dist/ui/AppSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppSetup.d.ts","sourceRoot":"","sources":["../../src/ui/AppSetup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,eAAe,EAAS,MAAM,WAAW,CAAC;AAOlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,KAAK,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACxE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAkBF,wBAAgB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5E,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,QAAQ,EACR,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAmGnC"}
+{"version":3,"file":"AppSetup.d.ts","sourceRoot":"","sources":["../../src/ui/AppSetup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,eAAe,EAAS,MAAM,WAAW,CAAC;AAOlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,KAAK,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACxE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAkBF,wBAAgB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5E,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,EACL,cAAc,EACd,QAAQ,EACR,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAwGnC"}

package/dist/ui/AppSetup.js

@@ -3,7 +3,9 @@ import { useEffect, useMemo, useState } from 'react';
 import { createTreeMethods } from 'dirvi-lib';
 import { createEffectToAction, createIntentToEffect, createReducer, } from 'dirvi-lib';
 import { App } from './App.js';
-export function AppSetup({ appScreenRenderer, loadingScreenRenderer, initialization, shellApi, appMethods, stdout, clipboard, }) {
+// TODO Later: configuration watched for changes
+const emptyExCommands = new Map();
+export function AppSetup({ appScreenRenderer, loadingScreenRenderer, appId, initialization, shellApi, appMethods, stdout, clipboard, }) {
     const [loadState, setLoadState] = useState();
     useEffect(() => {
         let mounted = true;
@@ -39,8 +41,9 @@ export function AppSetup({ appScreenRenderer, loadingScreenRenderer, initializat
         };
     }, [appMethods]);
     // --- Pure function deps ---
+    const exCommands = useMemo(() => initialization.exCommands.get(appId) ?? emptyExCommands, [initialization.exCommands, appId]);
     const reducer = useMemo(() => createReducer(appMethods.stateMethods, appMethods.navMethods), [appMethods.stateMethods, appMethods.navMethods]);
-    const intentToEffect = useMemo(() => createIntentToEffect(new Set(initialization.exCommands.keys()), appMethods.stateMethods), [appMethods.stateMethods, initialization.exCommands]);
+    const intentToEffect = useMemo(() => createIntentToEffect(new Set(exCommands.keys()), appMethods.stateMethods), [appMethods.stateMethods, exCommands]);
     const effectToAction = useMemo(() => createEffectToAction(appMethods.stateMethods, appMethods.navMethods), [appMethods.navMethods, appMethods.stateMethods]);
     // --- JSX ---
     const LoadingScreenRenderer = loadingScreenRenderer;
@@ -53,5 +56,5 @@ export function AppSetup({ appScreenRenderer, loadingScreenRenderer, initializat
     if (loadState.status === 'error') {
         throw loadState.error;
     }
-    return (_jsx(App, { screenRenderer: appScreenRenderer, shellApi: shellApi, appMethods: appMethods, initialization: initialization, initialState: loadState.initialState, reducer: reducer, intentToEffect: intentToEffect, effectToAction: effectToAction, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) }));
+    return (_jsx(App, { screenRenderer: appScreenRenderer, shellApi: shellApi, appMethods: appMethods, exCommands: exCommands, config: initialization.config, initialState: loadState.initialState, reducer: reducer, intentToEffect: intentToEffect, effectToAction: effectToAction, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) }));
 }

package/dist/ui/Shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Shell.d.ts","sourceRoot":"","sources":["../../src/ui/Shell.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAItE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IACtD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAE9C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEtC,sDAAsD;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,iDAAiD;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gDAAgD;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,wBAAgB,KAAK,CAAC,EACpB,MAAM,EACN,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,MAAM,EACN,SAAS,GACV,EAAE,aAAa,+BAuFf"}
+{"version":3,"file":"Shell.d.ts","sourceRoot":"","sources":["../../src/ui/Shell.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAItE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IACtD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAE9C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEtC,sDAAsD;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,iDAAiD;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gDAAgD;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,wBAAgB,KAAK,CAAC,EACpB,MAAM,EACN,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,MAAM,EACN,SAAS,GACV,EAAE,aAAa,+BA6Ff"}

package/dist/ui/Shell.js

@@ -6,13 +6,14 @@ import { createAppMethodsApplicator } from '../application/create-app-methods.js
  * Creates `ShellApi` and the `AppMethods` for a selected application.
  */
 export function Shell({ onQuit, loadingScreenRenderer, appScreenRenderer, initialAppOptions, initialization, packageLoader, stdout, clipboard, }) {
-    const [appMethodsApplicator, setAppMethodsApplicator] = useState(undefined);
+    const [loadedApp, setLoadedApp] = useState();
     const [appError, setAppError] = useState(undefined);
     /**
      * Create the Shell API, based on given {@link Initialization}.
      */
     const shellApi = useMemo(() => {
         return {
+            listApps: () => [...initialization.app.registered.keys()],
             loadApp: async (appId, input) => {
                 try {
                     const appReference = initialization.app.registered.get(appId);
@@ -25,7 +26,10 @@ export function Shell({ onQuit, loadingScreenRenderer, appScreenRenderer, initia
                     }
                     const appPlugin = await packageLoader.loadAppPlugin(appReference);
                     const loadedAppMethodsApplicator = createAppMethodsApplicator(appPlugin.createAppDefinitionApplicator(input));
-                    setAppMethodsApplicator(() => loadedAppMethodsApplicator);
+                    setLoadedApp({
+                        appId,
+                        appMethodsApplicator: loadedAppMethodsApplicator,
+                    });
                     return { kind: 'loaded' };
                 }
                 catch (error) {
@@ -61,9 +65,9 @@ export function Shell({ onQuit, loadingScreenRenderer, appScreenRenderer, initia
         throw appError;
     }
     // TODO Later: Loading messages
-    if (appMethodsApplicator === undefined) {
+    if (loadedApp === undefined) {
         const LoadingScreenRenderer = loadingScreenRenderer;
         return _jsx(LoadingScreenRenderer, {});
     }
-    return appMethodsApplicator((appMethods) => (_jsx(AppSetup, { appScreenRenderer: appScreenRenderer, loadingScreenRenderer: loadingScreenRenderer, initialization: initialization, shellApi: shellApi, appMethods: appMethods, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) })));
+    return loadedApp.appMethodsApplicator((appMethods) => (_jsx(AppSetup, { appScreenRenderer: appScreenRenderer, loadingScreenRenderer: loadingScreenRenderer, appId: loadedApp.appId, initialization: initialization, shellApi: shellApi, appMethods: appMethods, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mak-98/dirvi-app",
-  "version": "0.11.0-beta.12",
+  "version": "0.11.0-beta.14",
   "description": "Shared React application logic for dirvi hosts.",
   "type": "module",
   "license": "GPL-3.0-or-later",
@@ -16,8 +16,8 @@
     "dist"
   ],
   "dependencies": {
-    "dirvi-apis": "0.11.0-beta.12",
-    "dirvi-lib": "0.11.0-beta.12",
+    "dirvi-apis": "0.11.0-beta.14",
+    "dirvi-lib": "0.11.0-beta.14",
     "zod": "^4.4.3"
   },
   "peerDependencies": {