@jbrowse/app-core 4.3.0 → 5.0.0-beta.10

package/esm/JBrowseModel/index.d.ts

@@ -1,117 +1,147 @@
-import type { PluginDefinition } from '@jbrowse/core/PluginLoader';
 import type PluginManager from '@jbrowse/core/PluginManager';
 import type { BaseAssemblyConfigSchema } from '@jbrowse/core/assemblyManager';
-import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
+import type { AnyConfiguration, AnyConfigurationModel, ConfigurationSchemaDefinition } from '@jbrowse/core/configuration';
+import type { PluginDefinition } from '@jbrowse/core/pluginDefinitions';
 import type RpcManager from '@jbrowse/core/rpc/RpcManager';
-export declare function JBrowseModelF({ pluginManager, assemblyConfigSchema, }: {
-    adminMode?: boolean;
+export declare function JBrowseModelF({ pluginManager, assemblyConfigSchema, extraConfigSlots, }: {
     pluginManager: PluginManager;
     assemblyConfigSchema: BaseAssemblyConfigSchema;
-}): import("@jbrowse/mobx-state-tree").IModelType<{
+    extraConfigSlots?: ConfigurationSchemaDefinition;
+}): import("@jbrowse/mobx-state-tree").ISnapshotProcessor<import("@jbrowse/mobx-state-tree").IModelType<{
     configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        rpc: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            defaultDriver: {
-                type: string;
-                description: string;
+        readonly rpc: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly defaultDriver: {
+                type: "string";
+            } & {
                 defaultValue: string;
             };
-            drivers: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").IMapType<import("@jbrowse/mobx-state-tree").ITypeUnion<import("@jbrowse/mobx-state-tree").ModelCreationType<import("@jbrowse/mobx-state-tree/dist/internal").ExtractCFromProps<Record<string, any>>> | undefined, import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>, ({} & Partial<import("@jbrowse/mobx-state-tree/dist/internal").ExtractCFromProps<Record<string, any>>> & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject) | undefined>>, [undefined]>;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-        highResolutionScaling: {
-            type: string;
-            defaultValue: number;
-        };
-        formatDetails: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            feature: {
-                type: string;
-                description: string;
-                defaultValue: {};
-                contextVariable: string[];
+            readonly workerCount: {
+                type: "number";
+            } & {
+                defaultValue: number;
             };
-            subfeatures: {
-                type: string;
-                description: string;
-                defaultValue: {};
-                contextVariable: string[];
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly formatDetails: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly feature: {
+                type: "frozen";
+            } & {
+                defaultValue: unknown;
             };
-            depth: {
-                type: string;
-                defaultValue: number;
-                description: string;
+            readonly subfeatures: {
+                type: "frozen";
+            } & {
+                defaultValue: unknown;
             };
-            maxDepth: {
-                type: string;
-                defaultValue: number;
-                description: string;
+            readonly depth: {
+                type: "maybeNumber";
             };
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-        formatAbout: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            config: {
-                type: string;
-                description: string;
-                defaultValue: {};
-                contextVariable: string[];
+            readonly maxDepth: {
+                type: "maybeNumber";
             };
-            hideUris: {
-                type: string;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly formatAbout: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly config: {
+                type: "frozen";
+            } & {
+                defaultValue: unknown;
+            };
+            readonly hideUris: {
+                type: "boolean";
+            } & {
                 defaultValue: boolean;
             };
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-        shareURL: {
-            type: string;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly shareURL: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        disableAnalytics: {
-            type: string;
+        readonly disableAnalytics: {
+            type: "boolean";
+        } & {
             defaultValue: boolean;
         };
-        hierarchical: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            sort: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-                trackNames: {
-                    type: string;
+        readonly hierarchical: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly sort: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+                readonly trackNames: {
+                    type: "boolean";
+                } & {
                     defaultValue: boolean;
                 };
-                categories: {
-                    type: string;
+                readonly categories: {
+                    type: "boolean";
+                } & {
                     defaultValue: boolean;
                 };
-            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-            defaultFolderCategories: {
-                type: string;
-                description: string;
-                defaultValue: never[];
+            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+            readonly defaultFolderCategories: {
+                type: "stringArray";
+            } & {
+                defaultValue: unknown;
             };
-            defaultCollapsed: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-                categoryNames: {
-                    type: string;
-                    defaultValue: never[];
+            readonly defaultCollapsed: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+                readonly categoryNames: {
+                    type: "stringArray";
+                } & {
+                    defaultValue: unknown;
                 };
-                topLevelCategories: {
-                    type: string;
+                readonly topLevelCategories: {
+                    type: "boolean";
+                } & {
                     defaultValue: boolean;
                 };
-                subCategories: {
-                    type: string;
+                readonly subCategories: {
+                    type: "boolean";
+                } & {
                     defaultValue: boolean;
                 };
-            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
-        theme: {
-            type: string;
-            defaultValue: {};
+            }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly preferences: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly animationMode: {
+                type: "stringEnum";
+            } & {
+                model: import("@jbrowse/mobx-state-tree").ISimpleType<"disabled" | "enabled" | "system">;
+            } & {
+                defaultValue: string;
+            };
+            readonly scrollZoom: {
+                type: "boolean";
+            } & {
+                defaultValue: boolean;
+            };
+            readonly numberGrouping: {
+                type: "boolean";
+            } & {
+                defaultValue: boolean;
+            };
+            readonly useWorkspaces: {
+                type: "boolean";
+            } & {
+                defaultValue: boolean;
+            };
+            readonly developerMode: {
+                type: "boolean";
+            } & {
+                defaultValue: boolean;
+            };
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly theme: {
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
-        extraThemes: {
-            type: string;
-            defaultValue: {};
+        readonly extraThemes: {
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
-        logoPath: {
-            type: string;
-            defaultValue: {
-                uri: string;
-                locationType: string;
-            };
+        readonly logoPath: {
+            type: "fileLocation";
+        } & {
+            defaultValue: unknown;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
     plugins: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IType<PluginDefinition, PluginDefinition, PluginDefinition>>;
     assemblies: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>;
     tracks: import("@jbrowse/mobx-state-tree").IType<{
@@ -124,42 +154,90 @@ export declare function JBrowseModelF({ pluginManager, assemblyConfigSchema, }:
         [key: string]: unknown;
         trackId: string;
     }[]>;
-    internetAccounts: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IAnyModelType>;
-    aggregateTextSearchAdapters: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IAnyModelType>;
-    connections: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IAnyModelType>;
+    internetAccounts: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/PluginManager").PluggableConfigSchemaType>;
+    aggregateTextSearchAdapters: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/PluginManager").PluggableConfigSchemaType>;
+    connections: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/PluginManager").PluggableConfigSchemaType>;
     defaultSession: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").IType<any, any, any>, [undefined]>;
     preConfiguredSessions: import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/mobx-state-tree").IType<any, any, any>>;
 }, {
+    /**
+     * #getter
+     */
     readonly assemblyNames: string[];
+    /**
+     * #getter
+     */
     readonly rpcManager: RpcManager;
 } & {
-    addAssemblyConf(conf: AnyConfigurationModel): ({
-        [x: string]: any;
-    } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & {
-        setSubschema(slotName: string, data: Record<string, unknown>): Record<string, unknown> | ({
-            [x: string]: any;
-        } & import("@jbrowse/mobx-state-tree/dist/internal").NonEmptyObject & any & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>);
-    } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>) | undefined;
+    /**
+     * #action
+     */
+    addAssemblyConf(conf: AnyConfigurationModel): (import("@jbrowse/core/configuration").ConfigNodeProps<any> & import("@jbrowse/core/configuration").ConfigNodeActions & import("@jbrowse/core/configuration").ConfigNodeBrand<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>) | undefined;
+    /**
+     * #action
+     */
     removeAssemblyConf(assemblyName: string): void;
-    addTrackConf(trackConf: {
+    /**
+     * #action
+     */
+    addTrackConf(loose: {
         trackId: string;
-        type: string;
+        type?: string;
     }): {
         [key: string]: unknown;
         trackId: string;
     } | undefined;
-    addConnectionConf(connectionConf: AnyConfigurationModel): any;
+    /**
+     * #action
+     * Adds to the config's own `connections`, which every visitor to this
+     * instance loads. Takes a snapshot as readily as a built config model —
+     * the array coerces — since callers hand it plain JSON (a session spec's
+     * `sessionConnections`, the CLI's add-connection output).
+     */
+    addConnectionConf(connectionConf: AnyConfiguration): (import("@jbrowse/core/configuration").PluggableConfigNode & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/PluginManager").PluggableConfigSchemaType>) | undefined;
+    /**
+     * #action
+     */
     deleteConnectionConf(configuration: AnyConfigurationModel): boolean;
+    /**
+     * #action
+     */
     deleteTrackConf(trackConf: AnyConfigurationModel | {
         trackId: string;
     }): void;
+    /**
+     * #action
+     * Updates an existing track configuration. Used to sync editable configs
+     * back to the frozen tracks array. A trackId the array repeats replaces
+     * its last entry, the one the session resolves it to.
+     */
     updateTrackConf(trackConf: {
         trackId: string;
         [key: string]: unknown;
     }): void;
+    /**
+     * #action
+     */
     addPlugin(pluginDefinition: PluginDefinition): void;
+    /**
+     * #action
+     * Removes the entry the loaded copy came from — the version-pinned
+     * definition, or the bare store ref that resolved to it. Not every entry
+     * sharing a name or a ref, so the update flow's remove-then-add swaps one
+     * version for another; `holdsPluginVersion` argues both halves.
+     */
     removePlugin(pluginDefinition: PluginDefinition): void;
+    /**
+     * #action
+     * takes the live session or a plain session snapshot
+     */
     setDefaultSessionConf(sessionConf: AnyConfigurationModel): void;
-    addInternetAccountConf(internetAccountConf: AnyConfigurationModel): any;
+    /**
+     * #action
+     */
+    addInternetAccountConf(internetAccountConf: AnyConfigurationModel): (import("@jbrowse/core/configuration").PluggableConfigNode & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/PluginManager").PluggableConfigSchemaType>) | undefined;
+    /**
+     * #action
+     */
     deleteInternetAccountConf(configuration: AnyConfigurationModel): boolean;
-}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;
+}, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>, Record<string, unknown>, import("@jbrowse/mobx-state-tree")._NotCustomized>;

package/esm/JBrowseModel/index.js

@@ -1,107 +1,208 @@
 import { readConfObject } from '@jbrowse/core/configuration';
-import { cast, getParent, getSnapshot } from '@jbrowse/mobx-state-tree';
+import { migrateRetiredDisplays } from '@jbrowse/core/pluggableElementTypes/models';
+import { holdsPluginVersion } from '@jbrowse/core/pluginDefinitions';
+import { expandLooseSearchIndex } from '@jbrowse/core/util/expandLooseSearchIndex';
+import { expandLooseTrackConfig } from '@jbrowse/core/util/tracks';
+import { cast, getParent, getSnapshot, isStateTreeNode, types, } from '@jbrowse/mobx-state-tree';
 import { toJS } from 'mobx';
-import { JBrowseConfigF } from "../JBrowseConfig/index.js";
-export function JBrowseModelF({ pluginManager, assemblyConfigSchema, }) {
-    return JBrowseConfigF({ pluginManager, assemblyConfigSchema })
+import { JBrowseConfigF } from '../JBrowseConfig/index.js';
+/**
+ * #stateModel AppCoreJBrowseModel
+ * #category root
+ * built on the [JBrowseRootConfig](/docs/config/jbrowserootconfig) config model —
+ * config models are MST trees themselves, which is why this state model is
+ * allowed to build on one. Generally found on a property named rootModel.jbrowse
+ */
+// A config with exactly one assembly is what every loose track and search index
+// is on, so `assemblyNames` may be left off; with several, each has to say.
+function expandLooseTracks(snapshot, pluginManager) {
+    const { tracks, assemblies, aggregateTextSearchAdapters: indexes } = snapshot;
+    const only = Array.isArray(assemblies) && assemblies.length === 1
+        ? assemblies[0].name
+        : undefined;
+    const expandedTracks = Array.isArray(tracks)
+        ? tracks.map(t => {
+            const track = expandLooseTrackConfig(t, pluginManager, only);
+            return track && typeof track === 'object'
+                ? migrateRetiredDisplays(pluginManager, track)
+                : track;
+        })
+        : tracks;
+    const expandedIndexes = Array.isArray(indexes)
+        ? indexes.map(i => expandLooseSearchIndex(i, only ? [only] : undefined))
+        : indexes;
+    const same = (a, b) => !Array.isArray(a) || a.every((x, i) => x === b[i]);
+    return same(expandedTracks, tracks) && same(expandedIndexes, indexes)
+        ? snapshot
+        : {
+            ...snapshot,
+            ...(expandedTracks ? { tracks: expandedTracks } : {}),
+            ...(expandedIndexes
+                ? { aggregateTextSearchAdapters: expandedIndexes }
+                : {}),
+        };
+}
+export function JBrowseModelF({ pluginManager, assemblyConfigSchema, extraConfigSlots, }) {
+    const model = JBrowseConfigF({
+        pluginManager,
+        assemblyConfigSchema,
+        extraConfigSlots,
+    })
         .views(self => ({
+        /**
+         * #getter
+         */
         get assemblyNames() {
             return self.assemblies.map(assembly => readConfObject(assembly, 'name'));
         },
+        /**
+         * #getter
+         */
         get rpcManager() {
             return getParent(self).rpcManager;
         },
     }))
         .actions(self => ({
+        /**
+         * #action
+         */
         addAssemblyConf(conf) {
             const { name } = conf;
             if (!name) {
                 throw new Error('Can\'t add assembly with no "name"');
             }
-            if (self.assemblyNames.includes(name)) {
+            if (self.assemblies.some(a => a.name === name || a.aliases.includes(name))) {
                 throw new Error(`Can't add assembly with name "${name}", an assembly with that name already exists`);
             }
-            const length = self.assemblies.push({
-                ...conf,
-                sequence: {
-                    type: 'ReferenceSequenceTrack',
-                    trackId: `${name}-${Date.now()}`,
-                    ...conf.sequence,
-                },
-            });
+            const length = self.assemblies.push(conf);
             return self.assemblies[length - 1];
         },
+        /**
+         * #action
+         */
         removeAssemblyConf(assemblyName) {
             const toRemove = self.assemblies.find(a => a.name === assemblyName);
             if (toRemove) {
                 self.assemblies.remove(toRemove);
             }
         },
-        addTrackConf(trackConf) {
+        /**
+         * #action
+         */
+        addTrackConf(loose) {
+            const trackConf = expandLooseTrackConfig(loose, pluginManager);
             const { type } = trackConf;
             if (!type) {
-                throw new Error(`unknown track type ${type}`);
+                throw new Error(`track type not specified for "${trackConf.trackId}"`);
             }
             self.tracks = [...self.tracks, trackConf];
             return self.tracks.at(-1);
         },
+        /**
+         * #action
+         * Adds to the config's own `connections`, which every visitor to this
+         * instance loads. Takes a snapshot as readily as a built config model —
+         * the array coerces — since callers hand it plain JSON (a session spec's
+         * `sessionConnections`, the CLI's add-connection output).
+         */
         addConnectionConf(connectionConf) {
             const { type } = connectionConf;
             if (!type) {
-                throw new Error(`unknown connection type ${type}`);
+                throw new Error('connection type not specified');
             }
             const length = self.connections.push(connectionConf);
             return self.connections[length - 1];
         },
+        /**
+         * #action
+         */
         deleteConnectionConf(configuration) {
-            const elt = self.connections.find(conn => conn.id === configuration.id);
-            return self.connections.remove(elt);
+            // key on connectionId: the connection schema's explicitIdentifier means
+            // `.id` is undefined on every entry, so an id-based find always matched
+            // the first connection and deleted the wrong one
+            const elt = self.connections.find(conn => conn.connectionId === configuration.connectionId);
+            return elt ? self.connections.remove(elt) : false;
         },
+        /**
+         * #action
+         */
         deleteTrackConf(trackConf) {
             const trackId = trackConf.trackId;
             self.tracks = self.tracks.filter(t => t.trackId !== trackId);
         },
+        /**
+         * #action
+         * Updates an existing track configuration. Used to sync editable configs
+         * back to the frozen tracks array. A trackId the array repeats replaces
+         * its last entry, the one the session resolves it to.
+         */
         updateTrackConf(trackConf) {
             const { trackId } = trackConf;
-            const idx = self.tracks.findIndex(t => t.trackId === trackId);
+            const idx = self.tracks.findLastIndex(t => t.trackId === trackId);
             if (idx !== -1) {
                 const newTracks = [...self.tracks];
                 newTracks[idx] = trackConf;
                 self.tracks = newTracks;
             }
         },
+        /**
+         * #action
+         */
         addPlugin(pluginDefinition) {
             self.plugins.push(pluginDefinition);
-            const rootModel = getParent(self);
-            rootModel.setPluginsUpdated(true);
+            getParent(self).setPluginsUpdated();
         },
+        /**
+         * #action
+         * Removes the entry the loaded copy came from — the version-pinned
+         * definition, or the bare store ref that resolved to it. Not every entry
+         * sharing a name or a ref, so the update flow's remove-then-add swaps one
+         * version for another; `holdsPluginVersion` argues both halves.
+         */
         removePlugin(pluginDefinition) {
-            self.plugins = cast(self.plugins.filter(plugin => plugin.url !== pluginDefinition.url ||
-                plugin.umdUrl !== pluginDefinition.umdUrl ||
-                plugin.cjsUrl !== pluginDefinition.cjsUrl ||
-                plugin.esmUrl !== pluginDefinition.esmUrl));
-            getParent(self).setPluginsUpdated(true);
+            self.plugins = cast(self.plugins.filter(plugin => !holdsPluginVersion(plugin, pluginDefinition)));
+            getParent(self).setPluginsUpdated();
         },
+        /**
+         * #action
+         * takes the live session or a plain session snapshot
+         */
         setDefaultSessionConf(sessionConf) {
-            const newDefault = getParent(self).session.name === sessionConf.name
+            const newDefault = isStateTreeNode(sessionConf)
                 ? getSnapshot(sessionConf)
                 : toJS(sessionConf);
             if (!newDefault.name) {
-                throw new Error(`unable to set default session to ${newDefault.name}`);
+                throw new Error('default session must have a name');
             }
             self.defaultSession = cast(newDefault);
         },
+        /**
+         * #action
+         */
         addInternetAccountConf(internetAccountConf) {
             const { type } = internetAccountConf;
             if (!type) {
-                throw new Error(`unknown internetAccount type ${type}`);
+                throw new Error('internet account type not specified');
             }
             const length = self.internetAccounts.push(internetAccountConf);
             return self.internetAccounts[length - 1];
         },
+        /**
+         * #action
+         */
         deleteInternetAccountConf(configuration) {
-            const elt = self.internetAccounts.find(a => a.id === configuration.id);
-            return self.internetAccounts.remove(elt);
+            // key on internetAccountId, not the undefined `.id` (see
+            // deleteConnectionConf) so the correct account is removed
+            const elt = self.internetAccounts.find(a => a.internetAccountId === configuration.internetAccountId);
+            return elt ? self.internetAccounts.remove(elt) : false;
         },
     }));
+    // `tracks` stays frozen (ADR-032), so the loose `{ trackId, uri }` form is
+    // expanded and a retired display type loaded as its successor here, where
+    // the track selector and the trackId index read them, and never by a schema.
+    return types.snapshotProcessor(model, {
+        preProcessor(snapshot) {
+            return expandLooseTracks(snapshot, pluginManager);
+        },
+    });
 }

package/esm/JbApi/index.d.ts

@@ -0,0 +1,2 @@
+export { createJbApi, ensureReExports, safeJson, sessionOf, undeliveredNotifications, waitReady, } from './jbApi.ts';
+export type { JbApi } from './jbApi.ts';

package/esm/JbApi/index.js

@@ -0,0 +1 @@
+export { createJbApi, ensureReExports, safeJson, sessionOf, undeliveredNotifications, waitReady, } from './jbApi.js';