@jskit-ai/workspaces-web 0.1.19 → 0.1.21

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-web",
-  version: "0.1.19",
+  version: "0.1.21",
   kind: "runtime",
   description: "Workspace web module: workspace selector, tools widget, workspace surfaces, and members/settings UI.",
   dependsOn: [
@@ -56,6 +56,7 @@ export default Object.freeze({
           "workspaces.web.workspace-members.menu-item",
           "workspaces.web.members-admin.element",
           "workspaces.web.bootstrap-placement.runtime",
+          "workspaces.web.scope-support",
           "workspaces.web.account-settings.section.invites"
         ]
       }
@@ -147,8 +148,8 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/workspaces-core": "0.1.19",
-        "@jskit-ai/users-web": "0.1.58",
+        "@jskit-ai/workspaces-core": "0.1.21",
+        "@jskit-ai/users-web": "0.1.60",
         "vuetify": "^4.0.0"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-web",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -14,12 +14,12 @@
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.42",
-    "@jskit-ai/kernel": "0.1.43",
-    "@jskit-ai/shell-web": "0.1.42",
-    "@jskit-ai/users-core": "0.1.53",
-    "@jskit-ai/users-web": "0.1.58",
-    "@jskit-ai/workspaces-core": "0.1.19",
+    "@jskit-ai/http-runtime": "0.1.44",
+    "@jskit-ai/kernel": "0.1.45",
+    "@jskit-ai/shell-web": "0.1.44",
+    "@jskit-ai/users-core": "0.1.55",
+    "@jskit-ai/users-web": "0.1.60",
+    "@jskit-ai/workspaces-core": "0.1.21",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/composables/useWorkspaceRouteContext.js

@@ -1,26 +1,15 @@
 import { computed } from "vue";
-import {
-  extractWorkspaceSlugFromSurfacePathname
-} from "../lib/workspaceSurfacePaths.js";
 import { useSurfaceRouteContext } from "@jskit-ai/users-web/client/composables/useSurfaceRouteContext";
+import { readWorkspaceRouteScope } from "../support/workspaceScopeSupport.js";
 
 function useWorkspaceRouteContext() {
-  const { route, routePath, placementContext, mergePlacementContext, currentSurfaceId } = useSurfaceRouteContext();
+  const routeContext = useSurfaceRouteContext();
   const workspaceSlugFromRoute = computed(() => {
-    const workspaceSlug = extractWorkspaceSlugFromSurfacePathname(
-      placementContext.value,
-      currentSurfaceId.value,
-      routePath.value
-    );
-    return String(workspaceSlug || "").trim();
+    return readWorkspaceRouteScope(routeContext).workspaceSlug;
   });
 
   return Object.freeze({
-    route,
-    routePath,
-    placementContext,
-    mergePlacementContext,
-    currentSurfaceId,
+    ...routeContext,
     workspaceSlugFromRoute
   });
 }

package/src/client/providers/WorkspacesWebClientProvider.js

@@ -7,6 +7,10 @@ import UsersWorkspaceSettingsMenuItem from "../components/UsersWorkspaceSettings
 import UsersWorkspaceMembersMenuItem from "../components/UsersWorkspaceMembersMenuItem.vue";
 import MembersAdminClientElement from "../components/MembersAdminClientElement.vue";
 import { createBootstrapPlacementRuntime } from "../runtime/bootstrapPlacementRuntime.js";
+import {
+  WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY,
+  createWorkspaceScopeSupport
+} from "../support/workspaceScopeSupport.js";
 
 class WorkspacesWebClientProvider {
   static id = "workspaces.web.client";
@@ -24,6 +28,7 @@ class WorkspacesWebClientProvider {
     app.singleton("workspaces.web.workspace-members.menu-item", () => UsersWorkspaceMembersMenuItem);
     app.singleton("workspaces.web.members-admin.element", () => MembersAdminClientElement);
     app.singleton("workspaces.web.bootstrap-placement.runtime", (scope) => createBootstrapPlacementRuntime({ app: scope }));
+    app.singleton("workspaces.web.scope-support", () => createWorkspaceScopeSupport());
     app.singleton("workspaces.web.account-settings.section.invites", () =>
       Object.freeze({
         title: "Invites",
@@ -45,6 +50,20 @@ class WorkspacesWebClientProvider {
     if (runtime && typeof runtime.initialize === "function") {
       await runtime.initialize();
     }
+
+    if (!app.has("jskit.client.vue.app")) {
+      return;
+    }
+
+    const vueApp = app.make("jskit.client.vue.app");
+    if (!vueApp || typeof vueApp.provide !== "function") {
+      return;
+    }
+
+    vueApp.provide(
+      WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY,
+      app.make("workspaces.web.scope-support")
+    );
   }
 
   shutdown(app) {

package/src/client/support/workspaceScopeSupport.js

@@ -0,0 +1,48 @@
+import { getClientAppConfig } from "@jskit-ai/kernel/client";
+import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import {
+  extractWorkspaceSlugFromSurfacePathname
+} from "../lib/workspaceSurfacePaths.js";
+
+const WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY = "jskit.workspaces.web.scope-support";
+
+function unwrapRefValue(value) {
+  if (value && typeof value === "object" && Object.hasOwn(value, "value")) {
+    return value.value;
+  }
+
+  return value;
+}
+
+function readWorkspaceRouteScope(routeContext = {}) {
+  const placementContext = unwrapRefValue(routeContext?.placementContext);
+  const currentSurfaceId = normalizeText(unwrapRefValue(routeContext?.currentSurfaceId)).toLowerCase();
+  const routePath = normalizeText(unwrapRefValue(routeContext?.routePath));
+  const workspaceSlug = extractWorkspaceSlugFromSurfacePathname(
+    placementContext,
+    currentSurfaceId,
+    routePath
+  );
+
+  return Object.freeze({
+    workspaceSlug: String(workspaceSlug || "").trim()
+  });
+}
+
+function createWorkspaceScopeSupport() {
+  const appConfig = getClientAppConfig();
+  const tenancyMode = normalizeText(appConfig?.tenancyMode).toLowerCase();
+
+  return Object.freeze({
+    available: tenancyMode === "personal" || tenancyMode === "workspaces",
+    readRouteScope(routeContext = {}) {
+      return readWorkspaceRouteScope(routeContext);
+    }
+  });
+}
+
+export {
+  WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY,
+  createWorkspaceScopeSupport,
+  readWorkspaceRouteScope
+};

package/test/workspaceScopeSupport.test.js

@@ -0,0 +1,74 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  createWorkspaceScopeSupport,
+  readWorkspaceRouteScope
+} from "../src/client/support/workspaceScopeSupport.js";
+
+test("readWorkspaceRouteScope extracts workspace slug from the current dynamic surface path", () => {
+  const scope = readWorkspaceRouteScope({
+    placementContext: {
+      value: {
+        surfaceConfig: {
+          defaultSurfaceId: "app",
+          surfacesById: {
+            app: {
+              id: "app",
+              routeBase: "w/[workspaceSlug]",
+              requiresWorkspace: true
+            },
+            admin: {
+              id: "admin",
+              routeBase: "w/[workspaceSlug]/admin",
+              requiresWorkspace: true
+            }
+          }
+        }
+      }
+    },
+    currentSurfaceId: {
+      value: "admin"
+    },
+    routePath: {
+      value: "/w/acme/admin/settings"
+    }
+  });
+
+  assert.deepEqual(scope, {
+    workspaceSlug: "acme"
+  });
+});
+
+test("workspace scope support exposes the shared route-scope reader", () => {
+  const support = createWorkspaceScopeSupport();
+
+  assert.equal(typeof support.available, "boolean");
+  assert.equal(typeof support.readRouteScope, "function");
+  assert.deepEqual(
+    support.readRouteScope({
+      placementContext: {
+        value: {
+          surfaceConfig: {
+            defaultSurfaceId: "app",
+            surfacesById: {
+              app: {
+                id: "app",
+                routeBase: "w/[workspaceSlug]",
+                requiresWorkspace: true
+              }
+            }
+          }
+        }
+      },
+      currentSurfaceId: {
+        value: "app"
+      },
+      routePath: {
+        value: "/w/dogandgroom"
+      }
+    }),
+    {
+      workspaceSlug: "dogandgroom"
+    }
+  );
+});