@mak-98/dirvi-app 0.11.0-beta.5 → 0.11.0-beta.7

package/dist/domain/public-init-api.d.ts

@@ -1,23 +1,28 @@
 import { AppPackageReference } from './app-pack-ref.js';
 import { ConfigPatch } from './config.js';
-import { ShellApi } from './shell-api.js';
+import { DirviApi } from './ex-command.js';
 /**
- * The startup configuration API exposed to init.mjs as the global `dirvi`.
+ * The startup configuration API exposed to `init.mjs` as the global `dirvi`.
  *
- * This is intentionally a narrow facade. It is the public scripting boundary,
- * rather than an escape hatch into UI state or infrastructure implementations.
+ * These types describe the intended API for TypeScript consumers and provide
+ * editor guidance and compile-time checking. They do not validate values at
+ * runtime: `init.mjs` may be plain JavaScript and can pass values that do not
+ * match these types. The runtime must validate inputs at the scripting
+ * boundary before relying on them.
+ *
+ * This is intentionally a narrow facade; it is the public scripting boundary.
  */
 export type PublicInitApi = {
     readonly options: {
         set: (patch: ConfigPatch) => void;
     };
-    readonly apps: {
+    readonly app: {
         /**
          * Optionally selects the app initially opened by the shell.
          *
          * If omitted, the runtime falls back to the most recently registered app.
          */
-        initialAppId: (appId: string) => void;
+        initial: (appId: string) => void;
         /**
          * Registers an application made available by init.mjs.
          */
@@ -36,7 +41,7 @@ export type PublicInitApi = {
          * });
          * ```
          */
-        register: (name: string, execute: (shell: ShellApi) => void | Promise<void>) => void;
+        register: (name: string, execute: (api: DirviApi) => void | Promise<void>) => void;
     };
 };
 //# sourceMappingURL=public-init-api.d.ts.map

package/dist/domain/public-init-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public-init-api.d.ts","sourceRoot":"","sources":["../../src/domain/public-init-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,OAAO,EAAE;QAChB,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;KACnC,CAAC;IAEF,QAAQ,CAAC,IAAI,EAAE;QACb;;;;WAIG;QACH,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QACtC;;WAEG;QACH,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,KAAK,IAAI,CAAC;KACnE,CAAC;IAEF,QAAQ,CAAC,EAAE,EAAE;QACX;;;;;;;;;;;WAWG;QACH,QAAQ,EAAE,CACR,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAC/C,IAAI,CAAC;KACX,CAAC;CACH,CAAC"}
+{"version":3,"file":"public-init-api.d.ts","sourceRoot":"","sources":["../../src/domain/public-init-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,OAAO,EAAE;QAChB,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;KACnC,CAAC;IAEF,QAAQ,CAAC,GAAG,EAAE;QACZ;;;;WAIG;QACH,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QACjC;;WAEG;QACH,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,KAAK,IAAI,CAAC;KACnE,CAAC;IAEF,QAAQ,CAAC,EAAE,EAAE;QACX;;;;;;;;;;;WAWG;QACH,QAAQ,EAAE,CACR,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAC7C,IAAI,CAAC;KACX,CAAC;CACH,CAAC"}

package/dist/domain/shell-api.d.ts

@@ -1,4 +1,4 @@
-import type { AppInput } from './initialization.js';
+import type { AppInput } from './app-input.js';
 export type ShellApi = {
     readonly openApp: (appId: string, input: AppInput) => Promise<void>;
 };

package/dist/domain/shell-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-api.d.ts","sourceRoot":"","sources":["../../src/domain/shell-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC"}
+{"version":3,"file":"shell-api.d.ts","sourceRoot":"","sources":["../../src/domain/shell-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC"}

package/dist/domain/theme.d.ts

@@ -1,13 +1,7 @@
 import { z } from 'zod';
-/**
- * Named ANSI foreground colors supported by Dirvi themes.
- *
- * Renderers translate these symbolic names into their own color APIs. The CLI
- * renderer currently maps them to terminal colors; another renderer does not
- * need to depend on Chalk to interpret the same theme.
- */
+import type { Theme } from 'dirvi-apis';
+/** Named ANSI colors accepted by the theme schema. */
 export declare const basicColorNames: readonly ["black", "red", "green", "yellow", "blue", "cyan", "magenta", "white", "gray", "grey", "blackBright", "redBright", "greenBright", "yellowBright", "blueBright", "cyanBright", "magentaBright", "whiteBright"];
-export type BasicColorName = (typeof basicColorNames)[number];
 export declare const ColorConfigSchema: z.ZodObject<{
     hex: z.ZodOptional<z.ZodString>;
     ansi256: z.ZodOptional<z.ZodNumber>;
@@ -32,7 +26,6 @@ export declare const ColorConfigSchema: z.ZodObject<{
         whiteBright: "whiteBright";
     }>>;
 }, z.core.$strip>;
-export type ColorConfig = z.infer<typeof ColorConfigSchema>;
 export declare const ForegroundHighlightConfigSchema: z.ZodObject<{
     fg: z.ZodObject<{
         hex: z.ZodOptional<z.ZodString>;
@@ -161,10 +154,6 @@ export declare const ForegroundBackgroundHighlightConfigSchema: z.ZodObject<{
         }>>;
     }, z.core.$strip>;
 }, z.core.$strip>;
-export type ForegroundHighlightConfig = z.infer<typeof ForegroundHighlightConfigSchema>;
-export type OptionalForegroundHighlightConfig = z.infer<typeof OptionalForegroundHighlightConfigSchema>;
-export type BackgroundHighlightConfig = z.infer<typeof BackgroundHighlightConfigSchema>;
-export type ForegroundBackgroundHighlightConfig = z.infer<typeof ForegroundBackgroundHighlightConfigSchema>;
 export declare const ThemeSchema: z.ZodObject<{
     statusBar: z.ZodDefault<z.ZodObject<{
         command: z.ZodDefault<z.ZodObject<{
@@ -531,6 +520,5 @@ export declare const ThemeSchema: z.ZodObject<{
         }, z.core.$strip>>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-export type Theme = z.infer<typeof ThemeSchema>;
 export declare const defaultTheme: Theme;
 //# sourceMappingURL=theme.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/domain/theme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,yNAsBlB,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAI9D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;iBAc3B,CAAC;AAEJ,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAM5D,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAE1C,CAAC;AAEH,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;iBAElD,CAAC;AAEH,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAE1C,CAAC;AAEH,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGpD,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,+BAA+B,CACvC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,KAAK,CACrD,OAAO,uCAAuC,CAC/C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,+BAA+B,CACvC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,KAAK,CACvD,OAAO,yCAAyC,CACjD,CAAC;AA6FF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CtB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAC"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/domain/theme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAOV,KAAK,EACN,MAAM,YAAY,CAAC;AAMpB,sDAAsD;AACtD,eAAO,MAAM,eAAe,yNAsBkB,CAAC;AAU/C,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;iBAcM,CAAC;AAOrC,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAElD,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAE1D,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAElD,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGK,CAAC;AA6F5D,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CK,CAAC;AAE9B,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAC"}

package/dist/domain/theme.js

@@ -1,18 +1,8 @@
 import { z } from 'zod';
 // =============================================================================
-// Terminal colors
+// Colors: Schemas
 // =============================================================================
-const HexColorSchema = z.string().regex(/^#[0-9a-fA-F]{6}$/, {
-    message: 'Expected a #rrggbb color',
-});
-const Ansi256ColorSchema = z.number().int().min(0).max(255);
-/**
- * Named ANSI foreground colors supported by Dirvi themes.
- *
- * Renderers translate these symbolic names into their own color APIs. The CLI
- * renderer currently maps them to terminal colors; another renderer does not
- * need to depend on Chalk to interpret the same theme.
- */
+/** Named ANSI colors accepted by the theme schema. */
 export const basicColorNames = [
     'black',
     'red',
@@ -34,6 +24,10 @@ export const basicColorNames = [
     'magentaBright',
     'whiteBright',
 ];
+const HexColorSchema = z.string().regex(/^#[0-9a-fA-F]{6}$/, {
+    message: 'Expected a #rrggbb color',
+});
+const Ansi256ColorSchema = z.number().int().min(0).max(255);
 const BasicColorSchema = z.enum(basicColorNames);
 export const ColorConfigSchema = z
     .object({
@@ -47,9 +41,9 @@ export const ColorConfigSchema = z
     message: 'Expected at least one terminal color profile',
 });
 // =============================================================================
-// Highlights
+// Highlights: Schemas
 // =============================================================================
-// Note: these schemas are meant to be non-strict
+// These schemas are intentionally non-strict.
 export const ForegroundHighlightConfigSchema = z.object({
     fg: ColorConfigSchema,
 });
@@ -140,7 +134,7 @@ const themeDefaults = {
     },
 };
 // =============================================================================
-// Theme schema
+// Theme: Schema
 // =============================================================================
 export const ThemeSchema = z.object({
     statusBar: z

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export type { Theme } from './domain/theme.js';
 export type { Config } from './domain/config.js';
 export type { Initialization } from './domain/initialization.js';
 export type { PublicInitApi } from './domain/public-init-api.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,YAAY,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,YAAY,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,YAAY,EACV,cAAc,EACd,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,YAAY,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,YAAY,EACV,cAAc,EACd,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC"}

package/dist/ui/App.d.ts

@@ -1,14 +1,12 @@
 import type { AppApi, EffectToAction, IntentToEffect, Reducer, SerializableKey, State } from 'dirvi-lib';
-import type { Config } from '../domain/config.js';
 import type { AppScreenRenderer } from './app-screen-renderer.js';
-import { AppPackageReference } from '../domain/app-pack-ref.js';
 import { ShellApi } from '../domain/shell-api.js';
+import { Initialization } from '../domain/initialization.js';
 type AppProps<Id extends SerializableKey, Value, ViewKey = string> = {
     screenRenderer: AppScreenRenderer;
     shellApi: ShellApi;
     appApi: AppApi<Id, Value, ViewKey>;
-    config: Config;
-    registeredApps: ReadonlyMap<string, AppPackageReference>;
+    initialization: Initialization;
     initialState: State<Id, Value>;
     reducer: Reducer<Id, Value>;
     intentToEffect: IntentToEffect<Id, Value>;
@@ -17,6 +15,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, appApi, config, registeredApps, 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, appApi, initialization, 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":"AAUA,OAAO,KAAK,EACV,MAAM,EAEN,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMlD,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACzD,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,MAAM,EACN,MAAM,EACN,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,+BAmU9B"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EAEN,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAGnB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,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,MAAM,EACN,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,+BAoW9B"}

package/dist/ui/App.js

@@ -2,22 +2,21 @@ 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';
-function toError(error) {
-    return error instanceof Error ? error : new Error(String(error));
-}
-export function App({ screenRenderer, shellApi, appApi, config, registeredApps, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }) {
+export function App({ screenRenderer, shellApi, appApi, initialization, 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
     // see current state
     stateRef.current = state;
     const navEntry = useMemo(() => {
-        const navigation = appApi.navNodeApi.from(state.root, state.folds);
+        const root = appApi.stateApi.getRoot(state);
+        const folds = appApi.stateApi.getFolds(state);
+        const navigation = appApi.navMethods.from(root, folds);
         if (navigation === undefined) {
             throw new Error('Tree-surfer state root must be a loaded branch.');
         }
         return navigation;
-    }, [appApi.navNodeApi, state.root, state.folds]);
+    }, [appApi.navMethods, appApi.stateApi, state]);
     const [inputState, setInputState] = useState({
         inputMode: 'normal',
         normalBuffer: '',
@@ -34,7 +33,7 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
     const feedbackApi = useMemo(() => createFeedbackApi((nextFeedback) => {
         setFeedback(nextFeedback);
     }), []);
-    const view = useView(navEntry, state, appApi.navNodeApi, appApi.cursorApi, rowCount);
+    const view = useView(navEntry, state, appApi.stateApi, appApi.navMethods, appApi.stateApi.cursorApi, rowCount, appApi.presentNode);
     // ===========================================================================
     // Resync Subscriptions
     // ===========================================================================
@@ -43,7 +42,7 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
         const unsubscribe = appApi.subscribeToResync(() => {
             const oldState = stateRef.current;
             void appApi.stateApi
-                .resync(oldState, appApi.loadBranches)
+                .resync(oldState, appApi.loadChildren)
                 .then((newState) => {
                 if (!active) {
                     return;
@@ -72,11 +71,29 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
             return;
         }
         switch (effect.effectType) {
+            case 'userExCommand': {
+                setInputState({
+                    inputMode: 'normal',
+                    normalBuffer: '',
+                });
+                const command = initialization.exCommands.get(effect.name);
+                if (command === undefined) {
+                    feedbackApi.addMessage(`Command is no longer registered: ${effect.name}`, 'error');
+                    return;
+                }
+                void Promise.resolve()
+                    .then(() => command.execute({ shell: shellApi })) // TODO: Add args
+                    .catch((error) => {
+                    const appError = error instanceof Error ? error : new Error(String(error));
+                    feedbackApi.addMessage(`Command "${effect.name}" failed: ${appError.message}`, 'error');
+                });
+                return;
+            }
             case 'quit':
                 setExitStatus(effect.exitMessage);
                 return;
             case 'listApps': {
-                const appIds = [...registeredApps.keys()];
+                const appIds = [...initialization.app.registered.keys()];
                 const lines = appIds.map((id) => `${id}`);
                 setInputState({
                     inputMode: 'normal',
@@ -113,7 +130,7 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
                 return;
             case 'loadBranchEntries': {
                 void appApi
-                    .loadBranches(effect.path)
+                    .loadChildren(effect.path)
                     .then((entries) => {
                     dispatch({
                         kind: 'updateBranch',
@@ -132,7 +149,7 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
                 if (navigation === null) {
                     return;
                 }
-                const visibleLeavesPaths = appApi.navNodeApi.visibleLeavesPaths(navigation);
+                const visibleLeavesPaths = appApi.navMethods.visibleLeavesPaths(navigation);
                 stdout?.(JSON.stringify({
                     type: 'displayed-leaves-paths',
                     paths: visibleLeavesPaths,
@@ -192,11 +209,11 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
             }
             // TODO: Add descriptions with `...` truncation.
             case 'listFolds': {
-                const folds = state.folds;
-                const foldTrees = [...appApi.foldsApi.indexes(folds)].map((index) => ({
+                const folds = appApi.stateApi.getFolds(state);
+                const foldTrees = [...appApi.stateApi.foldsApi.indexes(folds)].map((index) => ({
                     index,
-                    info: appApi.foldsApi.getInfoAtIndex(folds, index),
-                    active: appApi.foldsApi.isActiveAtIndex(folds, index),
+                    info: appApi.stateApi.foldsApi.getInfoAtIndex(folds, index),
+                    active: appApi.stateApi.foldsApi.isActiveAtIndex(folds, index),
                 }));
                 const indexWidth = Math.max(...foldTrees.map(({ index }) => String(index).length));
                 const lines = foldTrees.map(({ index, info, active }) => {
@@ -211,11 +228,11 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
                 feedbackApi.addMessage(['Fold trees:', ...lines].join('\n'));
                 return;
             }
-            case 'unrecognizedCommand':
-                feedbackApi.addMessage(`Unrecognized command: ${effect.commandLine}`, 'error');
+            case 'emitError':
+                feedbackApi.addMessage(effect.message, 'error');
                 return;
         }
-    }, [appApi, effectToAction, feedbackApi, navEntry, state, stdout, registeredApps]);
+    }, [appApi, effectToAction, feedbackApi, navEntry, state, stdout, initialization.app.registered, shellApi, initialization.exCommands]);
     // ===========================================================================
     // Input hook
     // ===========================================================================
@@ -234,5 +251,5 @@ export function App({ screenRenderer, shellApi, appApi, config, registeredApps,
     // ===========================================================================
     // Render
     // ===========================================================================
-    return (_jsx(ScreenRenderer, { view: view, feedback: feedback, feedbackApi: feedbackApi, config: config, inputState: inputState, handleInput: handleInput, onRowsChange: handleRowsChange, exitStatus: exitStatus }));
+    return (_jsx(ScreenRenderer, { view: view, feedback: feedback, feedbackApi: feedbackApi, config: initialization.config, inputState: inputState, handleInput: handleInput, onRowsChange: handleRowsChange, exitStatus: exitStatus }));
 }

package/dist/ui/AppSetup.d.ts

@@ -1,4 +1,4 @@
-import type { AppApi, SerializableKey } from 'dirvi-lib';
+import { AppApi, SerializableKey } from 'dirvi-lib';
 import type { LoadingScreenRenderer } from './loading-screen-renderer.js';
 import type { AppScreenRenderer } from './app-screen-renderer.js';
 import { ShellApi } from '../domain/shell-api.js';

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,KAAK,EAAE,MAAM,EAAE,eAAe,EAAS,MAAM,WAAW,CAAC;AAOhE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,KAAK,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IAC1E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5E,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,SAAS,GACV,EAAE,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAwFrC"}
+{"version":3,"file":"AppSetup.d.ts","sourceRoot":"","sources":["../../src/ui/AppSetup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAqB,eAAe,EAAS,MAAM,WAAW,CAAC;AAO9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,KAAK,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IAC1E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,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,MAAM,EACN,MAAM,EACN,SAAS,GACV,EAAE,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BA4FrC"}

package/dist/ui/AppSetup.js

@@ -1,47 +1,53 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 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, appApi, stdout, clipboard, }) {
+    const [loadState, setLoadState] = useState();
     const [initialState, setInitialState] = useState();
-    const [config, setConfig] = useState(initialization.config);
     // Loading and setting initial state.
     useEffect(() => {
         let mounted = true;
-        appApi
-            .createRoot()
-            .then((root) => {
-            if (!mounted) {
-                return;
-            }
-            setInitialState({
-                root,
-                folds: appApi.foldsApi.create(appApi.rootId, {
+        setLoadState({ status: 'loading', appApi });
+        async function initialize() {
+            try {
+                const root = await appApi.loadRoot();
+                if (!mounted) {
+                    return;
+                }
+                const rootId = createTreeMethods().id(root);
+                const folds = appApi.stateApi.foldsApi.create(rootId, {
                     name: 'default',
                     description: null,
-                }),
-                cursor: [],
-            });
-        })
-            .catch((cause) => {
-            const nextError = cause instanceof Error ? cause : new Error(String(cause));
-            if (!mounted) {
-                return;
+                });
+                const initialState = appApi.stateApi.create(root, folds, { path: [] });
+                if (initialState === undefined) {
+                    throw new Error('Cannot create initial app state');
+                }
+                setLoadState({ status: 'ready', appApi, initialState });
+            }
+            catch (cause) {
+                if (!mounted) {
+                    return;
+                }
+                const error = cause instanceof Error ? cause : new Error(String(cause));
+                setLoadState({ status: 'error', appApi, error });
             }
-            throw nextError;
-        });
+        }
+        void initialize();
         return () => {
             mounted = false;
         };
     }, [appApi]);
     // --- Pure function deps ---
-    const reducer = useMemo(() => createReducer(appApi.treeNodeApi, appApi.foldsApi), [appApi.treeNodeApi, appApi.foldsApi]);
-    const intentToEffect = useMemo(() => createIntentToEffect(appApi.stateApi, appApi.cursorApi, appApi.treeNodeApi), [appApi.stateApi, appApi.cursorApi, appApi.treeNodeApi]);
-    const effectToAction = useMemo(() => createEffectToAction(appApi.foldsApi, appApi.cursorApi, appApi.navNodeApi), [appApi.navNodeApi, appApi.cursorApi, appApi.foldsApi]);
+    const reducer = useMemo(() => createReducer(appApi.stateApi, appApi.navMethods), [appApi.stateApi, appApi.navMethods]);
+    const intentToEffect = useMemo(() => createIntentToEffect(new Set(initialization.exCommands.keys()), appApi.stateApi), [appApi.stateApi, initialization.exCommands]);
+    const effectToAction = useMemo(() => createEffectToAction(appApi.stateApi, appApi.navMethods), [appApi.navMethods, appApi.stateApi]);
     // --- JSX ---
     const LoadingScreenRenderer = loadingScreenRenderer;
     if (initialState === undefined) {
         return _jsx(LoadingScreenRenderer, {});
     }
-    return (_jsx(App, { screenRenderer: appScreenRenderer, shellApi: shellApi, appApi: appApi, config: config, registeredApps: initialization.registeredApps, initialState: initialState, reducer: reducer, intentToEffect: intentToEffect, effectToAction: effectToAction, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) }));
+    return (_jsx(App, { screenRenderer: appScreenRenderer, shellApi: shellApi, appApi: appApi, initialization: initialization, initialState: initialState, reducer: reducer, intentToEffect: intentToEffect, effectToAction: effectToAction, ...(stdout === undefined ? {} : { stdout }), ...(clipboard === undefined ? {} : { clipboard }) }));
 }

package/dist/ui/Shell.js

@@ -18,7 +18,7 @@ export function Shell({ loadingScreenRenderer, appScreenRenderer, initialAppOpti
     const shellApi = useMemo(() => {
         return {
             openApp: async (appId, input) => {
-                const appReference = initialization.registeredApps.get(appId);
+                const appReference = initialization.app.registered.get(appId);
                 if (appReference === undefined) {
                     throw new Error(`App "${appId}" has not been registered.`);
                 }
@@ -29,20 +29,20 @@ export function Shell({ loadingScreenRenderer, appScreenRenderer, initialAppOpti
                 setAppApiApplicator(() => loadedAppApiApplicator);
             },
         };
-    }, [initialization.registeredApps, packageLoader]);
+    }, [packageLoader, initialization.app.registered]);
     useEffect(() => {
         void shellApi
-            .openApp(initialAppOptions.app ?? initialization.initialAppId, initialAppOptions.input)
+            .openApp(initialAppOptions.app ?? initialization.app.initial, initialAppOptions.input)
             .catch((error) => {
             setAppError(error instanceof Error ? error : new Error(String(error)));
         });
-    }, [initialAppOptions.input, initialization.initialAppId, shellApi]);
+    }, [initialAppOptions.input, initialization.app.initial, shellApi]);
     if (appError !== undefined) {
         throw appError;
     }
-    const initialAppReference = initialization.registeredApps.get(initialization.initialAppId);
+    const initialAppReference = initialization.app.registered.get(initialization.app.initial);
     if (initialAppReference === undefined) {
-        throw new Error(`Startup app "${initialization.initialAppId}" has not been registered.`);
+        throw new Error(`Startup app "${initialization.app.initial}" has not been registered.`);
     }
     if (appApiApplicator === undefined) {
         const LoadingScreenRenderer = loadingScreenRenderer;

package/dist/ui/color-resolver.d.ts

@@ -1,3 +1,3 @@
-import type { ColorConfig } from '../domain/theme.js';
+import type { ColorConfig } from 'dirvi-apis';
 export declare function colorConfigToInkColor(colorConfig: ColorConfig, colorDepth?: number): string;
 //# sourceMappingURL=color-resolver.d.ts.map

package/dist/ui/color-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color-resolver.d.ts","sourceRoot":"","sources":["../../src/ui/color-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAuBtD,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAuC,GAClD,MAAM,CA2BR"}
+{"version":3,"file":"color-resolver.d.ts","sourceRoot":"","sources":["../../src/ui/color-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAuB9C,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAuC,GAClD,MAAM,CA2BR"}

package/dist/ui/hooks/useView.d.ts

@@ -1,4 +1,4 @@
-import type { CursorApi, NavBranch, NavNodeApi, SerializableKey, State } from 'dirvi-lib';
+import type { CursorMethods, NavBranch, NavMethods, PresentNode, SerializableKey, State, StateApi } from 'dirvi-lib';
 import { View } from '../view.js';
-export declare function useView<Id extends SerializableKey, Value>(navNode: NavBranch<Id>, state: State<Id, Value>, navNodeApi: NavNodeApi<Id, Value>, cursorApi: CursorApi<Id>, rowCount: number): View;
+export declare function useView<Id extends SerializableKey, Value>(navNode: NavBranch<Id>, state: State<Id, Value>, stateApi: StateApi<Id, Value>, navNodeApi: NavMethods<Id, Value>, cursorMethods: CursorMethods<Id>, rowCount: number, presentNode: PresentNode<Id>): View;
 //# sourceMappingURL=useView.d.ts.map

package/dist/ui/hooks/useView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,SAAS,EACT,UAAU,EACV,eAAe,EACf,KAAK,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAgB,MAAM,YAAY,CAAC;AAMhD,wBAAgB,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACvD,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EACtB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,EACjC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,QAAQ,EAAE,MAAM,GACf,IAAI,CAwBN"}
+{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,UAAU,EAAE,WAAW,EACvB,eAAe,EACf,KAAK,EAAE,QAAQ,EAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAgB,MAAM,YAAY,CAAC;AAMhD,wBAAgB,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACvD,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EACtB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,EACjC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,EAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,GAC3B,IAAI,CAyBN"}

package/dist/ui/hooks/useView.js

@@ -3,15 +3,15 @@ import { View } from '../view.js';
 const STATUS_BAR_HEIGHT = 1;
 // Hooks that keeps Ref of the viewport's start, and returns View sliced to
 // only the rows that should be visible.
-export function useView(navNode, state, navNodeApi, cursorApi, rowCount) {
+export function useView(navNode, state, stateApi, navNodeApi, cursorMethods, rowCount, presentNode) {
     const viewportStartRef = useRef(0);
     const viewportHeight = Math.max(0, rowCount - STATUS_BAR_HEIGHT);
     if (viewportHeight === 0) {
         return { rows: [] };
     }
-    const rows = View.createRows(navNode, navNodeApi, state.cursor, cursorApi);
+    const rows = View.createRows(navNode, navNodeApi, stateApi.getCursor(state), cursorMethods, presentNode);
     viewportStartRef.current = viewportStart(rows, viewportHeight, viewportStartRef.current);
-    return View.create(navNode, navNodeApi, state.cursor, cursorApi, viewportHeight, viewportStartRef.current);
+    return View.create(navNode, navNodeApi, stateApi.getCursor(state), cursorMethods, viewportHeight, viewportStartRef.current, presentNode);
 }
 function viewportStart(rows, viewportHeight, currentViewportStart) {
     const scrollMargin = 3;

package/dist/ui/view.d.ts

@@ -1,23 +1,27 @@
-import type { Cursor, CursorApi, NavBranch, NavNodeApi, SerializableKey } from 'dirvi-lib';
+import type { Cursor, HighlightToken, NavBranch, NavMethods, PresentNode, SerializableKey, CursorMethods } from 'dirvi-lib';
 type ViewRowBase = {
     id: string;
     indent: number;
     content: string;
     cursor: boolean;
     selected: boolean;
+    highlight: HighlightToken;
 };
 export type ViewRow = (ViewRowBase & {
     type: 'leaf';
 }) | (ViewRowBase & {
     type: 'branch';
     foldedCount: number;
+}) | (ViewRowBase & {
+    type: 'fold';
+    foldedCount: number;
 });
 export type View = {
     rows: ViewRow[];
 };
 export declare const View: {
-    createRows<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Value>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>): ViewRow[];
-    create<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Value>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>, viewportHeight: number, viewportStart: number): View;
+    createRows<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavMethods<Id, Value>, cursor: Cursor<Id>, cursorMethods: CursorMethods<Id>, presentNode: PresentNode<Id>): ViewRow[];
+    create<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavMethods<Id, Value>, cursor: Cursor<Id>, cursorMethods: CursorMethods<Id>, viewportHeight: number, viewportStart: number, presentNode: PresentNode<Id>): View;
 };
 export {};
 //# sourceMappingURL=view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,SAAS,EAGT,UAAU,EACV,eAAe,EAChB,MAAM,WAAW,CAAC;AAEnB,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,OAAO,GACf,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEP,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;eACJ,EAAE,SAAS,eAAe,EAAE,KAAK,YAChC,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,GACvB,OAAO,EAAE;WAoBL,EAAE,SAAS,eAAe,EAAE,KAAK,YAC5B,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,kBACR,MAAM,iBACP,MAAM,GACpB,IAAI;CAOR,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,cAAc,EACd,SAAS,EAET,UAAU,EACV,WAAW,EACX,eAAe,EAAE,aAAa,EAC/B,MAAM,WAAW,CAAC;AAGnB,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GACf,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEP,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AASF,eAAO,MAAM,IAAI;eACJ,EAAE,SAAS,eAAe,EAAE,KAAK,YAChC,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,iBACH,aAAa,CAAC,EAAE,CAAC,eACnB,WAAW,CAAC,EAAE,CAAC,GAC3B,OAAO,EAAE;WAwCL,EAAE,SAAS,eAAe,EAAE,KAAK,YAC5B,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,iBACH,aAAa,CAAC,EAAE,CAAC,kBAChB,MAAM,iBACP,MAAM,eACR,WAAW,CAAC,EAAE,CAAC,GAC3B,IAAI;CAOR,CAAC"}