@dxos/plugin-simple-layout 0.8.4-main.52d7546f51 → 0.8.4-main.6fa680abb7

package/dist/lib/browser/{url-handler-HTIUY6WL.mjs → url-handler-RBRONH7S.mjs}

@@ -1,13 +1,12 @@
 import {
   SimpleLayoutState
-} from "./chunk-7VLT3S46.mjs";
+} from "./chunk-MRR7PXSM.mjs";
 
 // src/capabilities/url-handler/url-handler.ts
 import * as Effect from "effect/Effect";
 import { Capabilities, Capability } from "@dxos/app-framework";
-import { LayoutOperation } from "@dxos/app-toolkit";
+import { LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from "@dxos/app-toolkit";
 import { log } from "@dxos/log";
-import { Node } from "@dxos/plugin-graph";
 import { isTauri } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-simple-layout/src/capabilities/url-handler/url-handler.ts";
 var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
@@ -17,19 +16,20 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
       pathname
     }, {
       F: __dxlog_file,
-      L: 31,
+      L: 30,
       S: this,
       C: (f, a) => f(...a)
     });
-    const [_, nextWorkspace, nextActive] = pathname.split("/");
-    const targetWorkspace = !nextWorkspace || nextWorkspace === "root" ? Node.RootId : nextWorkspace;
+    const qualifiedId = fromUrlPath(pathname);
+    const workspace = getWorkspaceFromPath(qualifiedId);
     invokeSync(LayoutOperation.SwitchWorkspace, {
-      subject: targetWorkspace
+      subject: workspace
     });
-    if (nextActive) {
+    const activeId = qualifiedId !== workspace ? qualifiedId : void 0;
+    if (activeId) {
       invokeSync(LayoutOperation.Open, {
         subject: [
-          nextActive
+          activeId
         ]
       });
     }
@@ -48,7 +48,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
             urls: launchUrls
           }, {
             F: __dxlog_file,
-            L: 62,
+            L: 56,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -61,7 +61,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
             urls
           }, {
             F: __dxlog_file,
-            L: 70,
+            L: 63,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -71,7 +71,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
         });
         log.info("[UrlHandler] Deep link listener initialized", void 0, {
           F: __dxlog_file,
-          L: 76,
+          L: 69,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -81,7 +81,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
           error
         }, {
           F: __dxlog_file,
-          L: 79,
+          L: 72,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -96,7 +96,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
     if (workspace !== lastWorkspace || active !== lastActive) {
       lastWorkspace = workspace;
       lastActive = active;
-      const path = pathFromState(workspace, active);
+      const path = active ? toUrlPath(active) : toUrlPath(workspace);
       if (window.location.pathname !== path) {
         history.pushState(null, "", `${path}${window.location.search}`);
       }
@@ -109,14 +109,13 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
   }));
 }));
 var isRedirectPath = (pathname) => pathname.startsWith("/redirect/");
-var pathFromState = (workspace, active) => workspace === Node.RootId ? active ? `/${Node.RootId}/${active}` : "/" : active ? `/${workspace}/${active}` : `/${workspace}`;
 var handleNavigation = (navigate) => () => navigate(window.location.pathname);
 var handleDeepLink = (urlString, navigate) => {
   log.info("[UrlHandler] Deep link received", {
     url: urlString
   }, {
     F: __dxlog_file,
-    L: 146,
+    L: 122,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -127,7 +126,7 @@ var handleDeepLink = (urlString, navigate) => {
         pathname: url.pathname
       }, {
         F: __dxlog_file,
-        L: 150,
+        L: 126,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -140,7 +139,7 @@ var handleDeepLink = (urlString, navigate) => {
       error
     }, {
       F: __dxlog_file,
-      L: 155,
+      L: 131,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -149,4 +148,4 @@ var handleDeepLink = (urlString, navigate) => {
 export {
   url_handler_default as default
 };
-//# sourceMappingURL=url-handler-HTIUY6WL.mjs.map
+//# sourceMappingURL=url-handler-RBRONH7S.mjs.map

package/dist/lib/browser/url-handler-RBRONH7S.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/url-handler/url-handler.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from '@dxos/app-toolkit';\nimport { log } from '@dxos/log';\nimport { isTauri } from '@dxos/util';\n\nimport { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '../../types';\n\n/**\n * URL handler for simple layout that syncs browser URL with layout state.\n * URL paths map directly to qualified graph IDs with the leading `root` segment stripped.\n * Root is represented as `/`.\n *\n * On mobile Tauri, also listens for deep links via the deep-link plugin.\n */\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const { invokeSync } = yield* Capability.get(Capabilities.OperationInvoker);\n\n    /**\n     * Handle navigation from a pathname.\n     * Restores the qualified graph ID and dispatches layout operations.\n     */\n    const handlePathNavigation = (pathname: string) => {\n      log.info('[UrlHandler] Navigating to path', { pathname });\n\n      const qualifiedId = fromUrlPath(pathname);\n      const workspace = getWorkspaceFromPath(qualifiedId);\n\n      invokeSync(LayoutOperation.SwitchWorkspace, { subject: workspace });\n\n      const activeId = qualifiedId !== workspace ? qualifiedId : undefined;\n      if (activeId) {\n        invokeSync(LayoutOperation.Open, { subject: [activeId] });\n      }\n    };\n\n    const onNavigation = handleNavigation(handlePathNavigation);\n\n    yield* Effect.sync(() => onNavigation());\n    window.addEventListener('popstate', onNavigation);\n\n    let unlistenDeepLink: (() => void) | undefined;\n    if (isTauri()) {\n      yield* Effect.tryPromise({\n        try: async () => {\n          const { getCurrent, onOpenUrl } = await import('@tauri-apps/plugin-deep-link');\n\n          const launchUrls = await getCurrent();\n          if (launchUrls && launchUrls.length > 0) {\n            log.info('[UrlHandler] App launched with deep links', { urls: launchUrls });\n            for (const url of launchUrls) {\n              handleDeepLink(url, handlePathNavigation);\n            }\n          }\n\n          unlistenDeepLink = await onOpenUrl((urls) => {\n            log.info('[UrlHandler] Deep links received', { urls });\n            for (const url of urls) {\n              handleDeepLink(url, handlePathNavigation);\n            }\n          });\n\n          log.info('[UrlHandler] Deep link listener initialized');\n        },\n        catch: (error) => {\n          log.warn('[UrlHandler] Failed to initialize deep link listener', { error });\n          return error;\n        },\n      }).pipe(Effect.catchAll(() => Effect.void));\n    }\n\n    let lastWorkspace: string | undefined;\n    let lastActive: string | undefined;\n    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {\n      const { workspace, active } = state;\n\n      if (workspace !== lastWorkspace || active !== lastActive) {\n        lastWorkspace = workspace;\n        lastActive = active;\n\n        const path = active ? toUrlPath(active) : toUrlPath(workspace);\n        if (window.location.pathname !== path) {\n          history.pushState(null, '', `${path}${window.location.search}`);\n        }\n      }\n    });\n\n    return Capability.contributes(Capabilities.Null, null, () =>\n      Effect.sync(() => {\n        window.removeEventListener('popstate', onNavigation);\n        unsubscribe();\n        unlistenDeepLink?.();\n      }),\n    );\n  }),\n);\n\n/**\n * Check if a path is a special redirect path that shouldn't be navigated to.\n * These paths are handled by other systems (e.g., OAuth).\n */\nconst isRedirectPath = (pathname: string): boolean => pathname.startsWith('/redirect/');\n\n/**\n * Returns a handler for navigation events (initial load and popstate) that navigates to current pathname.\n */\nconst handleNavigation =\n  (navigate: (pathname: string) => void): (() => void) =>\n  () =>\n    navigate(window.location.pathname);\n\n/**\n * Handle deep link URL from Tauri. Parses the URL and calls navigate unless it's a redirect path.\n */\nconst handleDeepLink = (urlString: string, navigate: (pathname: string) => void): void => {\n  log.info('[UrlHandler] Deep link received', { url: urlString });\n  try {\n    const url = new URL(urlString);\n    if (isRedirectPath(url.pathname)) {\n      log.info('[UrlHandler] Skipping redirect path (handled elsewhere)', { pathname: url.pathname });\n      return;\n    }\n    navigate(url.pathname);\n  } catch (error) {\n    log.warn('[UrlHandler] Failed to parse deep link URL', { urlString, error });\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["Effect", "Capabilities", "Capability", "LayoutOperation", "fromUrlPath", "getWorkspaceFromPath", "toUrlPath", "log", "isTauri", "Capability", "makeModule", "fnUntraced", "invokeSync", "get", "Capabilities", "OperationInvoker", "handlePathNavigation", "pathname", "log", "info", "qualifiedId", "fromUrlPath", "workspace", "getWorkspaceFromPath", "LayoutOperation", "SwitchWorkspace", "subject", "activeId", "undefined", "Open", "onNavigation", "handleNavigation", "sync", "window", "addEventListener", "unlistenDeepLink", "isTauri", "tryPromise", "try", "getCurrent", "onOpenUrl", "launchUrls", "length", "urls", "url", "handleDeepLink", "catch", "error", "warn", "pipe", "catchAll", "void", "lastWorkspace", "lastActive", "unsubscribe", "subscribeAtom", "SimpleLayoutStateCapability", "state", "active", "path", "toUrlPath", "location", "history", "pushState", "search", "contributes", "Null", "removeEventListener", "isRedirectPath", "startsWith", "navigate", "urlString", "URL"]
+}