@jskit-ai/shell-web 0.1.9 → 0.1.10

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/shell-web",
-  version: "0.1.9",
+  version: "0.1.10",
   description: "Web shell layout runtime with outlet-based placement contributions.",
   dependsOn: [],
   capabilities: {
@@ -85,7 +85,7 @@ export default Object.freeze({
     dependencies: {
       runtime: {
         "@tanstack/vue-query": "^5.90.5",
-        "@jskit-ai/kernel": "0.1.9",
+        "@jskit-ai/kernel": "0.1.10",
         "vuetify": "^4.0.0"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/shell-web",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@tanstack/vue-query": "^5.90.5",
-    "@jskit-ai/kernel": "0.1.9",
+    "@jskit-ai/kernel": "0.1.10",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/components/useShellLayout.js

@@ -14,40 +14,49 @@ const DEFAULT_MENU_FALLBACK = Object.freeze({
   icon: "$menu"
 });
 
-function normalizeAction(action, fallback) {
-  const source = normalizeObject(action);
+function normalizeLabeledItem(item, fallback, buildItem) {
+  const source = normalizeObject(item);
   const fallbackSource = normalizeObject(fallback);
   const label = String(source.label || fallbackSource.label || "").trim();
   if (!label) {
     return null;
   }
 
-  return {
-    label,
-    to: String(source.to || fallbackSource.to || "").trim(),
-    variant: String(source.variant || fallbackSource.variant || "text").trim(),
-    color: String(source.color || fallbackSource.color || "secondary").trim()
-  };
-}
-
-function normalizeMenuItem(item, fallback) {
-  const source = normalizeObject(item);
-  const fallbackSource = normalizeObject(fallback);
-  const label = String(source.label || fallbackSource.label || "").trim();
-  if (!label) {
+  if (typeof buildItem !== "function") {
     return null;
   }
 
-  return {
-    label,
-    to: String(source.to || fallbackSource.to || "").trim() || "/",
-    icon: String(source.icon || fallbackSource.icon || "$menu").trim() || "$menu"
-  };
+  return buildItem({
+    source,
+    fallbackSource,
+    label
+  });
+}
+
+function normalizeAction(action, fallback) {
+  return normalizeLabeledItem(action, fallback, ({ source, fallbackSource, label }) => {
+    return {
+      label,
+      to: String(source.to || fallbackSource.to || "").trim(),
+      variant: String(source.variant || fallbackSource.variant || "text").trim(),
+      color: String(source.color || fallbackSource.color || "secondary").trim()
+    };
+  });
+}
+
+function normalizeMenuItem(item, fallback) {
+  return normalizeLabeledItem(item, fallback, ({ source, fallbackSource, label }) => {
+    return {
+      label,
+      to: String(source.to || fallbackSource.to || "").trim() || "/",
+      icon: String(source.icon || fallbackSource.icon || "$menu").trim() || "$menu"
+    };
+  });
 }
 
 function normalizeActionList(actions) {
-  const source = Array.isArray(actions) ? actions : [];
-  return source
+  const sourceActions = Array.isArray(actions) ? actions : [];
+  return sourceActions
     .map((item) => normalizeAction(item, DEFAULT_ACTION_FALLBACK))
     .filter(Boolean);
 }

package/src/client/error/normalize.js

@@ -1,14 +1,15 @@
-import { isRecord } from "@jskit-ai/kernel/shared/support/normalize";
+import {
+  isRecord,
+  normalizeText as normalizeKernelText
+} from "@jskit-ai/kernel/shared/support/normalize";
 
 const ERROR_CHANNELS = Object.freeze(["snackbar", "banner", "dialog", "silent"]);
 const ERROR_SEVERITIES = Object.freeze(["info", "success", "warning", "error", "critical"]);
 
 function normalizeText(value, fallback = "") {
-  const normalized = String(value || "").trim();
-  if (normalized) {
-    return normalized;
-  }
-  return String(fallback || "").trim();
+  return normalizeKernelText(value, {
+    fallback: String(fallback || "").trim()
+  });
 }
 
 function normalizeChannel(value, fallback = "") {

package/src/client/error/runtime.js

@@ -6,6 +6,7 @@ import {
   normalizeSeverity,
   normalizeText
 } from "./normalize.js";
+import { createListenerSubscription } from "@jskit-ai/kernel/shared/support/listenerSet";
 import { createDefaultErrorPolicy } from "./policy.js";
 
 function createRuntimeLogger(logger = null) {
@@ -108,6 +109,7 @@ function createErrorRuntime({
   const runtimeLogger = createRuntimeLogger(logger);
   const byPresenterId = new Map();
   const listeners = new Set();
+  const subscribe = createListenerSubscription(listeners);
   const dedupeWindowByKey = new Map();
   let activePolicy = typeof policy === "function" ? policy : createDefaultErrorPolicy();
   let activeAppDefaultPresenterId = normalizeText(defaultPresenterId);
@@ -177,17 +179,6 @@ function createErrorRuntime({
     return activeAppDefaultPresenterId;
   }
 
-  function subscribe(listener) {
-    if (typeof listener !== "function") {
-      return () => {};
-    }
-
-    listeners.add(listener);
-    return () => {
-      listeners.delete(listener);
-    };
-  }
-
   function notify(event = {}) {
     const payload = Object.freeze({ ...event });
     for (const listener of listeners) {

package/src/client/error/store.js

@@ -3,6 +3,7 @@ import {
   normalizeSeverity,
   normalizeText
 } from "./normalize.js";
+import { createListenerSubscription } from "@jskit-ai/kernel/shared/support/listenerSet";
 
 const PRESENTATION_CHANNELS = Object.freeze(["snackbar", "banner", "dialog"]);
 const SINGLETON_CHANNELS = new Set(["banner"]);
@@ -33,6 +34,7 @@ function createErrorPresentationStore({
   now = () => Date.now()
 } = {}) {
   const listeners = new Set();
+  const subscribe = createListenerSubscription(listeners);
   const channelState = createEmptyChannelState();
   let sequence = 0;
   let revision = 0;
@@ -66,17 +68,6 @@ function createErrorPresentationStore({
     }
   }
 
-  function subscribe(listener) {
-    if (typeof listener !== "function") {
-      return () => {};
-    }
-
-    listeners.add(listener);
-    return () => {
-      listeners.delete(listener);
-    };
-  }
-
   function present(channel, payload = {}) {
     const normalizedChannel = String(channel || "").trim();
     const entries = getChannelEntries(normalizedChannel);

package/src/client/placement/runtime.js

@@ -3,6 +3,7 @@ import {
   WEB_PLACEMENT_SURFACE_ANY
 } from "./tokens.js";
 import { DEFAULT_DEBUG_DEPTH, explodePayload } from "./debug.js";
+import { createListenerSubscription } from "@jskit-ai/kernel/shared/support/listenerSet";
 import { isRecord } from "@jskit-ai/kernel/shared/support/normalize";
 import {
   isRenderableComponent,
@@ -227,6 +228,7 @@ function createWebPlacementRuntime({ app, logger = null } = {}) {
   const invalidComponentTokens = new Set();
   const failedTokens = new Set();
   const listeners = new Set();
+  const subscribe = createListenerSubscription(listeners);
   let placementDefinitions = Object.freeze([]);
   let sharedContext = Object.freeze({});
   let revision = 0;
@@ -300,16 +302,6 @@ function createWebPlacementRuntime({ app, logger = null } = {}) {
     return sharedContext;
   }
 
-  function subscribe(listener) {
-    if (typeof listener !== "function") {
-      return () => {};
-    }
-    listeners.add(listener);
-    return () => {
-      listeners.delete(listener);
-    };
-  }
-
   function getRevision() {
     return revision;
   }

package/src/client/providers/ShellWebClientProvider.js

@@ -9,6 +9,7 @@ import {
   shouldRetryTransientQueryFailure,
   transientQueryRetryDelay
 } from "@jskit-ai/kernel/shared/support";
+import { createProviderLogger as createSharedProviderLogger } from "@jskit-ai/kernel/shared/support/providerLogger";
 import { QueryClient, VueQueryPlugin } from "@tanstack/vue-query";
 import {
   createDefaultErrorPolicy
@@ -60,25 +61,6 @@ function createShellWebQueryClient() {
   });
 }
 
-function createProviderLogger(app) {
-  return Object.freeze({
-    warn: (...args) => {
-      if (isRecord(app) && typeof app.warn === "function") {
-        app.warn(...args);
-        return;
-      }
-      console.warn(...args);
-    },
-    error: (...args) => {
-      if (isRecord(app) && typeof app.error === "function") {
-        app.error(...args);
-        return;
-      }
-      console.error(...args);
-    }
-  });
-}
-
 function isMissingDynamicModule(error, moduleSpecifier) {
   const message = String(error?.message || error || "");
   return (
@@ -270,7 +252,7 @@ class ShellWebClientProvider {
       throw new Error("ShellWebClientProvider requires application singleton().");
     }
 
-    const logger = createProviderLogger(app);
+    const logger = createSharedProviderLogger(isRecord(app) ? app : null);
     app.singleton(WEB_PLACEMENT_RUNTIME_CLIENT_TOKEN, () => createWebPlacementRuntime({ app, logger }));
     app.singleton(SHELL_WEB_QUERY_CLIENT_TOKEN, () => createShellWebQueryClient());
     app.singleton(SHELL_WEB_ERROR_PRESENTATION_STORE_CLIENT_TOKEN, () => createErrorPresentationStore());
@@ -291,7 +273,7 @@ class ShellWebClientProvider {
       throw new Error("ShellWebClientProvider requires application make()/has().");
     }
 
-    const logger = createProviderLogger(app);
+    const logger = createSharedProviderLogger(isRecord(app) ? app : null);
     const placementRuntime = app.make(WEB_PLACEMENT_RUNTIME_CLIENT_TOKEN);
     if (placementRuntime && typeof placementRuntime.replacePlacements === "function") {
       const placements = await loadAppPlacementDefinitions(logger);