@loomweaver/shell 0.8.0-preview.1 → 0.8.0-preview.2

package/fesm2022/loomweaver-shell.mjs

@@ -71,9 +71,10 @@ function warnMenuTriggerConflict(item) {
     }
     if (menuOnActivate(item) && (item.command !== undefined || item.run !== undefined)) {
         warned.add(item.id);
+        const behaviour = item.command === undefined ? 'inline behaviour' : `command "${item.command}"`;
         console.warn(`Item "${item.id}" opens the menu "${item.menu}" on activation, so its ` +
-            `${item.command === undefined ? 'inline behaviour' : `command "${item.command}"`} is ` +
-            `never run from here. Reach it from a menu entry, a shortcut or the palette instead.`);
+            `${behaviour} is never run from here. Reach it from a menu entry, a shortcut ` +
+            `or the palette instead.`);
     }
 }
 
@@ -1448,6 +1449,30 @@ function healedPrimary(node, candidate) {
         ? candidate
         : collectLeafIds(node)[0];
 }
+function withoutTabs(node, drop) {
+    if (node.kind === 'leaf') {
+        const kept = node.tabs.filter((tab) => !drop(tab.path));
+        if (kept.length === node.tabs.length) {
+            return { node, dropped: [] };
+        }
+        const dropped = node.tabs
+            .filter((tab) => drop(tab.path))
+            .map((tab) => tab.path);
+        const active = node.active !== undefined && dropped.includes(node.active)
+            ? kept[0]?.path
+            : node.active;
+        return { node: { ...node, tabs: kept, active }, dropped };
+    }
+    const first = withoutTabs(node.first, drop);
+    const second = withoutTabs(node.second, drop);
+    if (first.dropped.length === 0 && second.dropped.length === 0) {
+        return { node, dropped: [] };
+    }
+    return {
+        node: { ...node, first: first.node, second: second.node },
+        dropped: [...first.dropped, ...second.dropped],
+    };
+}
 
 const DEFAULT_WORKSPACE_ID = 'default';
 function auditWorkspaceDefinitions(definitions, panelRegions) {
@@ -3878,6 +3903,24 @@ function viewTabViews(paneTabs, viewOf, meets, viewPanePrefix) {
     });
 }
 
+function syncActiveTab(sync, route, root, path) {
+    const { routes, paneTree } = sync;
+    sync.updateOpen((tabs) => {
+        const index = tabs.findIndex((tab) => tabRootOf(routes, tab.path) === root);
+        if (index !== -1) {
+            return withRefreshedPath(tabs, index, path);
+        }
+        const opened = autoOpenedTab(route, root, path);
+        return opened ? [...tabs, opened] : tabs;
+    });
+    const held = paneTree
+        .primaryTabs(CONTENT_DOCK)
+        .find((tab) => tabRootOf(routes, tab.path) === root);
+    if (held) {
+        paneTree.setActiveTab(CONTENT_DOCK, paneTree.primaryId(CONTENT_DOCK), held.path);
+    }
+}
+
 const TAB_ADDRESS_RESOLVER = new InjectionToken('TAB_ADDRESS_RESOLVER');
 /**
  * Overrides or extends how the host computes the address of a **following** tab
@@ -3927,6 +3970,7 @@ function paramPrefixes(pattern) {
 }
 
 const STORAGE_KEY$c = 'lw.shell.pane-trees';
+const WORKSPACES_KEY = 'lw.shell.workspaces';
 const HYDRATION_RETRY_MS = 500;
 function isDefault(entry) {
     return entry.node.kind === 'leaf' && entry.node.tabs.length === 0;
@@ -3950,6 +3994,24 @@ function parse$1(raw) {
         return {};
     }
 }
+function originsIn(raw) {
+    const origins = new Map();
+    if (!raw) {
+        return origins;
+    }
+    try {
+        for (const saved of JSON.parse(raw)) {
+            const entry = saved;
+            if (typeof entry.id === 'string' && typeof entry.origin === 'string') {
+                origins.set(entry.id, entry.origin);
+            }
+        }
+    }
+    catch {
+        return origins;
+    }
+    return origins;
+}
 function serializeDocks(docks) {
     const out = {};
     for (const [dock, entry] of Object.entries(docks)) {
@@ -3960,9 +4022,12 @@ function serializeDocks(docks) {
 class PaneTreeStorage {
     store = inject(WORKING_STATE_STORE);
     workspace = inject(ActiveWorkspaceService);
+    definitions = inject(WORKSPACE_DEFINITIONS, {
+        optional: true,
+    })?.flat();
     popout = isPopoutUrl(inject(DOCUMENT).location?.pathname ?? '');
     peek() {
-        return parse$1(this.store.peek?.(this.key()));
+        return this.settled(parse$1(this.store.peek?.(this.key())));
     }
     hydrate(apply, settled) {
         if (this.store.peek) {
@@ -3987,7 +4052,35 @@ class PaneTreeStorage {
         return serializeDocks(docks);
     }
     parsed(raw) {
-        return parse$1(raw);
+        return this.settled(parse$1(raw));
+    }
+    settled(docks) {
+        const declared = this.definitions ?? [];
+        const here = this.declaredHome();
+        if (declared.every((definition) => definition.id !== here)) {
+            return docks;
+        }
+        const claims = withoutConflicts(claimsOf(declared));
+        const out = {};
+        const dropped = [];
+        for (const [dock, entry] of Object.entries(docks)) {
+            const filtered = withoutTabs(entry.node, (path) => (claimFor(claims, path)?.workspaceId ?? here) !== here);
+            dropped.push(...filtered.dropped);
+            const repaired = { ...entry, node: filtered.node };
+            if (!isDefault(repaired)) {
+                out[dock] = repaired;
+            }
+        }
+        if (dropped.length > 0 && isDevMode()) {
+            console.warn(`Workspace "${this.workspace.id()}": stored content at ` +
+                `${dropped.map((path) => `"${path}"`).join(', ')} belongs to another ` +
+                `workspace that claims it — the tab is dropped rather than restored here.`);
+        }
+        return out;
+    }
+    declaredHome() {
+        const active = this.workspace.id();
+        return originsIn(this.store.peek?.(WORKSPACES_KEY)).get(active) ?? active;
     }
     key() {
         return this.workspace.scopedKey(STORAGE_KEY$c);
@@ -4659,7 +4752,11 @@ class OpenTabsService {
                     }
                     this.ownNavigation = null;
                 }
-                this.syncActiveTab(route, root, path);
+                syncActiveTab({
+                    routes: this.registry.contentRoutes(),
+                    paneTree: this.paneTree,
+                    updateOpen: (change) => this.updateOpen(change),
+                }, route, root, path);
                 if (root) {
                     this.stampActive(root);
                 }
@@ -4760,17 +4857,6 @@ class OpenTabsService {
         next.set(root, Date.now());
         this.lastActive.set(next);
     }
-    syncActiveTab(route, root, path) {
-        const routes = this.registry.contentRoutes();
-        this.updateOpen((tabs) => {
-            const index = tabs.findIndex((tab) => tabRootOf(routes, tab.path) === root);
-            if (index !== -1) {
-                return withRefreshedPath(tabs, index, path);
-            }
-            const opened = autoOpenedTab(route, root, path);
-            return opened ? [...tabs, opened] : tabs;
-        });
-    }
     strippable(routes, tab) {
         if (isHomePath(tab.path)) {
             return false;
@@ -5393,6 +5479,42 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImpor
             type: Service
         }] });
 
+const NOT_COMPOSED$1 = {
+    wouldSettle: () => false,
+    settle: async () => undefined,
+};
+const WORKSPACE_CLAIMS = new InjectionToken('lw.workspace-claims', { providedIn: 'root', factory: () => NOT_COMPOSED$1 });
+
+class ClaimOrdering {
+    injector = inject(Injector);
+    resolved = null;
+    ordered = Promise.resolve();
+    queued = 0;
+    run(path, work) {
+        if (this.queued === 0 && (path === null || !this.claims.wouldSettle(path))) {
+            work();
+            return;
+        }
+        this.queued += 1;
+        this.ordered = this.ordered
+            .then(() => (path === null ? undefined : this.claims.settle(path)))
+            .then(work)
+            .catch(() => undefined)
+            .then(() => {
+            this.queued -= 1;
+        });
+    }
+    get claims() {
+        this.resolved ??= this.injector.get(WORKSPACE_CLAIMS);
+        return this.resolved;
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: ClaimOrdering, deps: [], target: i0.ɵɵFactoryTarget.Service });
+    static ɵprov = i0.ɵɵngDeclareService({ minVersion: "22.0.0", version: "22.1.0", ngImport: i0, type: ClaimOrdering });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: ClaimOrdering, decorators: [{
+            type: Service
+        }] });
+
 /**
  * The **URL pane's** tab state: the tabs to show (facet tabs of `follows`
  * surfaces + opened ones), and the active tab — all derived from the URL plus the open set. The open
@@ -5409,6 +5531,7 @@ class ContentTabsService {
     reuse = inject(ContentReuseStrategy);
     features = inject(SHELL_FEATURES).content;
     paneTree = inject(PaneTreeService);
+    claimOrder = inject(ClaimOrdering);
     closeHooks = inject(TabCloseHooks);
     /**
      * The Quick-Open source for the command palette: every currently **open** tab across
@@ -5536,44 +5659,14 @@ class ContentTabsService {
      * mere title/sub-route refinement never promotes); promotion is explicit via {@link keep}.
      */
     open(input) {
-        const routes = this.registry.contentRoutes();
-        const path = normalizePath(input.path);
-        const root = tabRootOf(routes, path);
-        const previewSlot = (input.preview ?? false) && this.features.preview;
-        const existing = this.state.openTabRootedAt(routes, root);
-        this.closeHooks.set(root, input.onClose);
-        if (!existing && this.refineElsewhere(root, input)) {
-            return;
-        }
-        const stored = {
-            path: existing?.path ?? path,
-            title: input.title,
-            literalTitle: input.titleIsLiteral ?? false,
-            icon: input.icon,
-            onClose: input.onClose,
-            preview: existing ? existing.preview : previewSlot,
-            pinned: existing ? existing.pinned : false,
-            closable: existing ? existing.closable : true,
-        };
-        if (previewSlot && !existing) {
-            this.replacePreviewSlot(root, stored);
-        }
-        else {
-            this.state.updateOpen((tabs) => existing
-                ? tabs.map((tab) => tabRootOf(routes, tab.path) === root ? stored : tab)
-                : [...tabs, stored]);
-        }
-        this.navigateTo(stored.path);
+        this.claimOrder.run(normalizePath(input.path), () => this.openHere(input));
     }
     /**
      * Promotes the preview tab rooted at `path` to a permanent tab — the programmatic
      * "Keep Open" (`ctx.keepContentTab`, a double-click, or an edit). No-op if it is already permanent.
      */
     keep(path) {
-        const { routes, root } = this.state.rootFor(path);
-        this.state.updateOpen((tabs) => tabs.map((tab) => tabRootOf(routes, tab.path) === root && tab.preview
-            ? { ...tab, preview: false }
-            : tab));
+        this.claimOrder.run(null, () => this.keepHere(path));
     }
     /**
      * Pins the tab rooted at `path`: it moves to the front of the strip — after the tabs
@@ -5681,6 +5774,42 @@ class ContentTabsService {
         }
         return foundAnywhere;
     }
+    openHere(input) {
+        const routes = this.registry.contentRoutes();
+        const path = normalizePath(input.path);
+        const root = tabRootOf(routes, path);
+        const previewSlot = (input.preview ?? false) && this.features.preview;
+        const existing = this.state.openTabRootedAt(routes, root);
+        this.closeHooks.set(root, input.onClose);
+        if (!existing && this.refineElsewhere(root, input)) {
+            return;
+        }
+        const stored = {
+            path: existing?.path ?? path,
+            title: input.title,
+            literalTitle: input.titleIsLiteral ?? false,
+            icon: input.icon,
+            onClose: input.onClose,
+            preview: existing ? existing.preview : previewSlot,
+            pinned: existing ? existing.pinned : false,
+            closable: existing ? existing.closable : true,
+        };
+        if (previewSlot && !existing) {
+            this.replacePreviewSlot(root, stored);
+        }
+        else {
+            this.state.updateOpen((tabs) => existing
+                ? tabs.map((tab) => tabRootOf(routes, tab.path) === root ? stored : tab)
+                : [...tabs, stored]);
+        }
+        this.navigateTo(stored.path);
+    }
+    keepHere(path) {
+        const { routes, root } = this.state.rootFor(path);
+        this.state.updateOpen((tabs) => tabs.map((tab) => tabRootOf(routes, tab.path) === root && tab.preview
+            ? { ...tab, preview: false }
+            : tab));
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: ContentTabsService, deps: [], target: i0.ɵɵFactoryTarget.Service });
     static ɵprov = i0.ɵɵngDeclareService({ minVersion: "22.0.0", version: "22.1.0", ngImport: i0, type: ContentTabsService });
 }
@@ -6049,6 +6178,12 @@ function firstFree(candidates, taken) {
     return undefined;
 }
 
+function activeContentPath(paneTree) {
+    const primary = findLeaf(paneTree.tree(CONTENT_DOCK), paneTree.primaryId(CONTENT_DOCK));
+    const path = primary ? activeTab(primary)?.path : undefined;
+    return !path || path.startsWith(VIEW_PANE_PREFIX) ? '' : path;
+}
+
 const STORAGE_KEY$a = 'lw.shell.workspaces';
 const HIDDEN_VIEWS_KEY = 'lw.shell.hidden-views';
 const PANE_TREES_KEY = 'lw.shell.pane-trees';
@@ -6164,9 +6299,11 @@ class WorkspaceService {
         const baseline = await this.currentState();
         this.commit(this.list().map((w) => (w.id === id ? { ...w, baseline } : w)));
     }
+    wouldSettle(path) {
+        return this.settlementDestination(path) !== null;
+    }
     async settle(path) {
-        const here = this.active.id();
-        const destination = settlementFor(this.claims(), this.claimsOfWorkspace(here), here, path);
+        const destination = this.settlementDestination(path);
         if (destination !== null) {
             await this.switchTo(destination, { keepAddress: true });
         }
@@ -6192,14 +6329,14 @@ class WorkspaceService {
         }
         this.warnDeclarationGaps(id);
         if (options.keepAddress !== true) {
-            this.tabs.navigateTo(this.activeContentPath());
+            this.tabs.navigateTo(activeContentPath(this.paneTree));
         }
     }
     reset() {
         const id = this.active.id();
         this.applyState(this.baselineOf(id));
         this.warnDeclarationGaps(id);
-        this.tabs.navigateTo(this.activeContentPath());
+        this.tabs.navigateTo(activeContentPath(this.paneTree));
     }
     rename(id, name) {
         if (this.definitionOf(id) !== undefined) {
@@ -6308,7 +6445,7 @@ class WorkspaceService {
         this.applyState(this.baselineOf(id));
         this.warnDeclarationGaps(id);
         if (isHomePath(this.bootAddress.path)) {
-            this.tabs.navigateTo(this.activeContentPath());
+            this.tabs.navigateTo(activeContentPath(this.paneTree));
         }
     }
     applyState(state) {
@@ -6316,14 +6453,6 @@ class WorkspaceService {
             this.keyed[key].hydrate(state[key]);
         }
     }
-    activeContentPath() {
-        const primary = findLeaf(this.paneTree.tree(CONTENT_DOCK), this.paneTree.primaryId(CONTENT_DOCK));
-        const path = primary ? activeTab(primary)?.path : undefined;
-        if (!path || path.startsWith(VIEW_PANE_PREFIX)) {
-            return '';
-        }
-        return path;
-    }
     commit(next) {
         this.list.set(next);
         void this.store.set(STORAGE_KEY$a, JSON.stringify(next));
@@ -6331,6 +6460,10 @@ class WorkspaceService {
     layOutAdoptedWorkspaceWhenReady() {
         void this.active.ready.then(() => this.layOutAdoptedWorkspace());
     }
+    settlementDestination(path) {
+        const here = this.active.id();
+        return settlementFor(this.claims(), this.claimsOfWorkspace(here), here, path);
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: WorkspaceService, deps: [], target: i0.ɵɵFactoryTarget.Service });
     static ɵprov = i0.ɵɵngDeclareService({ minVersion: "22.0.0", version: "22.1.0", ngImport: i0, type: WorkspaceService });
 }
@@ -8901,7 +9034,7 @@ const SURFACE_PADDING = new InjectionToken('lw.surface-padding', {
     factory: () => 'none',
 });
 function effectivePadding(declared, fallback) {
-    return declared === undefined ? fallback === 'inset' : declared;
+    return declared ?? fallback === 'inset';
 }
 
 class ContentSecondaryPane {
@@ -11606,7 +11739,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImpor
 // GENERATED — do not edit by hand.
 // Written by tools/stamp-version.mjs from <Version> in Directory.Build.props.
 // Single source of truth: Directory.Build.props (bump via scripts/bump-version.sh).
-const APP_VERSION = '0.8.0-preview.1';
+const APP_VERSION = '0.8.0-preview.2';
 
 const PRERELEASE_IDENTIFIER = /^[0-9A-Za-z-]+$/;
 function isPreviewVersion(version) {
@@ -12077,7 +12210,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImpor
             type: Injectable
         }] });
 
-const NOT_COMPOSED$1 = {
+const NOT_COMPOSED = {
     invocable: () => [],
     invoke: () => Promise.resolve({
         outcome: 'refused',
@@ -12088,14 +12221,9 @@ const NOT_COMPOSED$1 = {
 };
 const COMMAND_INVOKER = new InjectionToken('lw.command-invoker', {
     providedIn: 'root',
-    factory: () => NOT_COMPOSED$1,
+    factory: () => NOT_COMPOSED,
 });
 
-const NOT_COMPOSED = {
-    settle: async () => undefined,
-};
-const WORKSPACE_CLAIMS = new InjectionToken('lw.workspace-claims', { providedIn: 'root', factory: () => NOT_COMPOSED });
-
 const MAX_ANSWER_DEPTH = 8;
 function checkArguments(declared, args) {
     if (args !== undefined && !isPlainObject(args)) {