@jskit-ai/kernel 0.1.53 → 0.1.55

package/client/pageRedirects.d.ts

@@ -0,0 +1,5 @@
+export function redirectToChild(childTarget?: string): (to?: any) => {
+  path: string;
+  query: any;
+  hash: string;
+};

package/client/pageRedirects.js

@@ -0,0 +1,45 @@
+import { resolveLinkPath } from "../shared/support/linkPath.js";
+import { splitPathQueryAndHash } from "../shared/support/queryPath.js";
+
+function queryStringToObject(queryString = "") {
+  const normalizedQueryString = String(queryString || "").trim().replace(/^\?+/, "");
+  if (!normalizedQueryString) {
+    return undefined;
+  }
+
+  const params = new URLSearchParams(normalizedQueryString);
+  const query = {};
+
+  for (const [key, value] of params.entries()) {
+    if (!Object.prototype.hasOwnProperty.call(query, key)) {
+      query[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(query[key])) {
+      query[key].push(value);
+      continue;
+    }
+
+    query[key] = [query[key], value];
+  }
+
+  return query;
+}
+
+function redirectToChild(childTarget = "") {
+  const normalizedChildTarget = String(childTarget || "").trim();
+
+  return function redirectToChildRoute(to = {}) {
+    const resolvedTarget = resolveLinkPath(String(to?.path || "/"), normalizedChildTarget);
+    const { pathname, queryString, hash } = splitPathQueryAndHash(resolvedTarget);
+
+    return {
+      path: pathname || "/",
+      query: queryStringToObject(queryString) ?? to?.query,
+      hash: hash || String(to?.hash || "")
+    };
+  };
+}
+
+export { redirectToChild };

package/client/pageRedirects.test.js

@@ -0,0 +1,40 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { redirectToChild } from "./pageRedirects.js";
+
+test("redirectToChild resolves a child path and preserves incoming query and hash", () => {
+  const redirect = redirectToChild("general");
+
+  assert.deepEqual(redirect({
+    path: "/home/settings/",
+    query: {
+      tab: "profile"
+    },
+    hash: "#advanced"
+  }), {
+    path: "/home/settings/general",
+    query: {
+      tab: "profile"
+    },
+    hash: "#advanced"
+  });
+});
+
+test("redirectToChild uses child query and hash when the target declares them", () => {
+  const redirect = redirectToChild("general?tab=security&filter=a&filter=b#advanced");
+
+  assert.deepEqual(redirect({
+    path: "/home/settings",
+    query: {
+      stale: "value"
+    },
+    hash: "#old"
+  }), {
+    path: "/home/settings/general",
+    query: {
+      tab: "security",
+      filter: ["a", "b"]
+    },
+    hash: "#advanced"
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "type": "module",
   "dependencies": {
     "typebox": "^1.0.81"
@@ -14,6 +14,10 @@
       "types": "./client/index.d.ts",
       "default": "./client/index.js"
     },
+    "./client/pageRedirects": {
+      "types": "./client/pageRedirects.d.ts",
+      "default": "./client/pageRedirects.js"
+    },
     "./client/moduleBootstrap": "./client/moduleBootstrap.js",
     "./client/vite": "./client/vite/index.js",
     "./server/actions": "./server/actions/index.js",

package/server/support/shellOutlets.test.js

@@ -98,7 +98,7 @@ test("discoverShellOutletTargetsFromApp includes installed package placement out
       placements: {
         outlets: [
           {
-            target: "workspace-tools:primary-menu",
+            target: "admin-cog:primary-menu",
             defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item",
             source: "src/client/components/UsersWorkspaceToolsWidget.vue"
           }
@@ -113,10 +113,10 @@ test("discoverShellOutletTargetsFromApp includes installed package placement out
     const discovered = await discoverShellOutletTargetsFromApp({ appRoot });
     assert.deepEqual(
       discovered.targets.map((entry) => entry.id),
-      ["shell-layout:primary-menu", "workspace-tools:primary-menu"]
+      ["admin-cog:primary-menu", "shell-layout:primary-menu"]
     );
-    assert.deepEqual(discovered.targets[1], {
-      id: "workspace-tools:primary-menu",
+    assert.deepEqual(discovered.targets[0], {
+      id: "admin-cog:primary-menu",
       default: false,
       defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item",
       sourcePath: "package:@example/users-web:src/client/components/UsersWorkspaceToolsWidget.vue",
@@ -125,10 +125,10 @@ test("discoverShellOutletTargetsFromApp includes installed package placement out
 
     const target = await resolveShellOutletPlacementTargetFromApp({
       appRoot,
-      placement: "workspace-tools:primary-menu",
+      placement: "admin-cog:primary-menu",
       context: "ui-generator"
     });
-    assert.equal(target.id, "workspace-tools:primary-menu");
+    assert.equal(target.id, "admin-cog:primary-menu");
   });
 });
 
@@ -140,7 +140,7 @@ test("discoverShellOutletTargetsFromApp applies app config default-link override
       `export const config = {
   ui: {
     outletDefaults: {
-      "workspace-tools:primary-menu": {
+      "admin-cog:primary-menu": {
         linkComponentToken: "local.main.ui.surface-aware-menu-link-item"
       }
     }
@@ -178,7 +178,7 @@ test("discoverShellOutletTargetsFromApp applies app config default-link override
       placements: {
         outlets: [
           {
-            target: "workspace-tools:primary-menu",
+            target: "admin-cog:primary-menu",
             defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item"
           }
         ]