@jskit-ai/users-web 0.1.168 → 0.1.170

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.168",
+  "version": "0.1.170",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -36,25 +36,23 @@
     "./client/crudHttpClient": "./src/client/composables/crud/crudHttpClientSupport.js",
     "./client/composables/useCrudListParentTitle": "./src/client/composables/useCrudListParentTitle.js",
     "./client/composables/useRealtimeQueryInvalidation": "./src/client/composables/useRealtimeQueryInvalidation.js",
-    "./client/composables/useSurfaceRouteContext": "./src/client/composables/useSurfaceRouteContext.js",
     "./client/composables/useView": "./src/client/composables/records/useView.js",
     "./client/composables/useCrudView": "./src/client/composables/records/useCrudView.js",
     "./client/composables/useCrudViewScreen": "./src/client/composables/useCrudViewScreen.js",
     "./client/composables/usePagedCollection": "./src/client/composables/usePagedCollection.js",
-    "./client/composables/usePaths": "./src/client/composables/usePaths.js",
     "./client/composables/runtime/useUiFeedback": "./src/client/composables/runtime/useUiFeedback.js",
     "./client/lib/httpClient": "./src/client/lib/httpClient.js",
     "./client/lib/permissions": "./src/client/lib/permissions.js",
     "./client/support/contractGuards": "./src/client/support/contractGuards.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-web": "0.1.150",
-    "@jskit-ai/http-runtime": "0.1.148",
-    "@jskit-ai/kernel": "0.1.150",
-    "@jskit-ai/realtime": "0.1.147",
-    "@jskit-ai/shell-web": "0.1.154",
-    "@jskit-ai/uploads-image-web": "0.1.125",
-    "@jskit-ai/users-core": "0.1.163",
+    "@jskit-ai/auth-web": "0.1.152",
+    "@jskit-ai/http-runtime": "0.1.150",
+    "@jskit-ai/kernel": "0.1.152",
+    "@jskit-ai/realtime": "0.1.149",
+    "@jskit-ai/shell-web": "0.1.156",
+    "@jskit-ai/uploads-image-web": "0.1.127",
+    "@jskit-ai/users-core": "0.1.165",
     "@mdi/js": "^7.4.47"
   },
   "peerDependencies": {
@@ -195,10 +193,6 @@
             "subpath": "./client/composables/usePagedCollection",
             "summary": "Exports paged collection query composable."
           },
-          {
-            "subpath": "./client/composables/usePaths",
-            "summary": "Exports surface route path resolver composable."
-          },
           {
             "subpath": "./client/lib/httpClient",
             "summary": "Exports the shared users-web HTTP client with credentials and CSRF behavior."
@@ -363,12 +357,12 @@
       "dependencies": {
         "runtime": {
           "@mdi/js": "^7.4.47",
-          "@jskit-ai/http-runtime": "0.1.148",
-          "@jskit-ai/realtime": "0.1.147",
-          "@jskit-ai/kernel": "0.1.150",
-          "@jskit-ai/shell-web": "0.1.154",
-          "@jskit-ai/uploads-image-web": "0.1.125",
-          "@jskit-ai/users-core": "0.1.163"
+          "@jskit-ai/http-runtime": "0.1.150",
+          "@jskit-ai/realtime": "0.1.149",
+          "@jskit-ai/kernel": "0.1.152",
+          "@jskit-ai/shell-web": "0.1.156",
+          "@jskit-ai/uploads-image-web": "0.1.127",
+          "@jskit-ai/users-core": "0.1.165"
         },
         "dev": {}
       },

package/src/client/composables/crud/crudJsonApiTransportSupport.js

@@ -113,7 +113,7 @@ function inferCrudJsonApiTransport(resource = null, { mode = "", operationName =
 function resolveCrudJsonApiTransport(transport = null, resource = null, options = {}) {
   if (transport != null) {
     throw new TypeError(
-      "CRUD hooks no longer accept explicit transport. Derive JSON:API transport from the shared resource instead."
+      "CRUD hooks do not accept explicit transport. Derive JSON:API transport from the shared resource."
     );
   }
 

package/src/client/composables/support/resourceLoadStateHelpers.js

@@ -77,12 +77,8 @@ function normalizeRequestRecoveryMethod(value = "") {
   return normalizeText(value).toUpperCase();
 }
 
-function isRequestRecoveryMetaDisabled(sourceJskitMeta = {}, sourceMeta = {}) {
-  return Boolean(
-    sourceJskitMeta.requestRecovery === false ||
-      sourceMeta.jskitRequestRecovery === false ||
-      sourceMeta.requestRecovery === false
-  );
+function isRequestRecoveryMetaDisabled(sourceJskitMeta = {}) {
+  return sourceJskitMeta.requestRecovery === false;
 }
 
 function hasUsableMetaValue(source = {}, key = "") {
@@ -161,37 +157,20 @@ function buildRequestRecoveryMeta(requestRecovery = null, defaults = {}) {
   return Object.keys(jskit).length > 0 ? { jskit } : {};
 }
 
-function hasRequestRecoveryMetaValue(sourceJskitMeta = {}, sourceMeta = {}, key = "") {
-  const suffix = String(key || "").trim();
-  if (!suffix) {
-    return false;
-  }
-
-  const jskitKey = `requestRecovery${suffix}`;
-  const legacyJskitKey = `jskitRequestRecovery${suffix}`;
-  const legacyKey = `requestRecovery${suffix}`;
-
-  return Boolean(
-    hasUsableMetaValue(sourceJskitMeta, jskitKey) ||
-      hasUsableMetaValue(sourceMeta, legacyJskitKey) ||
-      hasUsableMetaValue(sourceMeta, legacyKey)
-  );
-}
-
 function resolveRequestRecoveryDefaults(queryOptions = null, defaults = {}) {
   const sourceOptions = normalizePlainObject(queryOptions);
   const sourceMeta = normalizePlainObject(sourceOptions.meta);
   const sourceJskitMeta = normalizePlainObject(sourceMeta.jskit);
   const fallback = normalizePlainObject(defaults);
-  if (isRequestRecoveryMetaDisabled(sourceJskitMeta, sourceMeta)) {
+  if (isRequestRecoveryMetaDisabled(sourceJskitMeta)) {
     return {};
   }
 
-  const hasExplicitLabel = hasRequestRecoveryMetaValue(sourceJskitMeta, sourceMeta, "Label");
-  const hasExplicitSource = hasRequestRecoveryMetaValue(sourceJskitMeta, sourceMeta, "Source");
-  const hasExplicitDedupeKey = hasRequestRecoveryMetaValue(sourceJskitMeta, sourceMeta, "DedupeKey");
-  const hasExplicitDedupeWindowMs = hasRequestRecoveryMetaValue(sourceJskitMeta, sourceMeta, "DedupeWindowMs");
-  const hasExplicitMethod = hasRequestRecoveryMetaValue(sourceJskitMeta, sourceMeta, "Method");
+  const hasExplicitLabel = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryLabel");
+  const hasExplicitSource = hasUsableMetaValue(sourceJskitMeta, "requestRecoverySource");
+  const hasExplicitDedupeKey = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryDedupeKey");
+  const hasExplicitDedupeWindowMs = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryDedupeWindowMs");
+  const hasExplicitMethod = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryMethod");
 
   return {
     ...fallback,

package/src/client/composables/useScopeRuntime.js

@@ -4,8 +4,8 @@ import {
   ROUTE_VISIBILITY_WORKSPACE
 } from "@jskit-ai/kernel/shared/support/visibility";
 import { useAccess } from "./useAccess.js";
-import { useSurfaceRouteContext } from "./useSurfaceRouteContext.js";
-import { usePaths } from "./usePaths.js";
+import { usePaths } from "@jskit-ai/shell-web/client/navigation/usePaths";
+import { useSurfaceRouteContext } from "@jskit-ai/shell-web/client/navigation/useSurfaceRouteContext";
 import { resolveSurfaceDefinitionFromPlacementContext } from "@jskit-ai/shell-web/client/placement";
 import {
   asPlainObject,

package/test/crudJsonApiTransportSupport.test.js

@@ -174,6 +174,6 @@ test("resolveCrudJsonApiTransport rejects explicit CRUD transport overrides", ()
           mode: "view"
         }
       ),
-    /no longer accept explicit transport/
+    /do not accept explicit transport/
   );
 });

package/test/exportsContract.test.js

@@ -30,7 +30,6 @@ test("users-web exports are explicit and aligned with production/template usage"
       "./client/composables/useCommand",
       "./client/composables/useEndpointResource",
       "./client/composables/useList",
-      "./client/composables/usePaths",
       "./client/composables/useView",
       "./client/composables/useCrudAddEdit",
       "./client/composables/useCrudAddEditScreen",

package/src/client/composables/usePaths.js

@@ -1,120 +0,0 @@
-import { computed, unref } from "vue";
-import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveScopedApiBasePath } from "@jskit-ai/kernel/shared/surface";
-import { resolveSurfaceDefinitionFromPlacementContext } from "@jskit-ai/shell-web/client/placement";
-import { useShellLinkResolver } from "@jskit-ai/shell-web/client/navigation/linkResolver";
-import { useSurfaceRouteContext } from "./useSurfaceRouteContext.js";
-
-function normalizePathSuffix(value = "") {
-  const raw = normalizeText(unref(value));
-  if (!raw) {
-    return "";
-  }
-
-  return raw.startsWith("/") ? raw : `/${raw}`;
-}
-
-function resolveSurfaceId(value, fallback = "") {
-  const normalized = normalizeText(unref(value)).toLowerCase();
-  if (normalized && normalized !== "*") {
-    return normalized;
-  }
-
-  const normalizedFallback = normalizeText(unref(fallback)).toLowerCase();
-  if (normalizedFallback && normalizedFallback !== "*") {
-    return normalizedFallback;
-  }
-
-  return "";
-}
-
-function resolveDefaultSurfaceIdFromPlacementContext(placementContext = null) {
-  return resolveSurfaceId(placementContext?.surfaceConfig?.defaultSurfaceId, "");
-}
-
-function normalizeRouteParams(params = null) {
-  if (!params || typeof params !== "object" || Array.isArray(params)) {
-    return {};
-  }
-
-  const output = {};
-  for (const [rawKey, rawValue] of Object.entries(params)) {
-    const key = normalizeText(rawKey);
-    if (!key) {
-      continue;
-    }
-
-    const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
-    const normalizedValue = normalizeText(value);
-    if (!normalizedValue) {
-      continue;
-    }
-    output[key] = normalizedValue;
-  }
-  return output;
-}
-
-function resolveRouteParams(baseParams = {}, overrideParams = null) {
-  return {
-    ...normalizeRouteParams(baseParams),
-    ...normalizeRouteParams(overrideParams)
-  };
-}
-
-function usePaths({ routeContext: sourceRouteContext = null } = {}) {
-  const routeContext = sourceRouteContext || useSurfaceRouteContext();
-  const shellLinkResolver = useShellLinkResolver();
-  const routeParams = computed(() => normalizeRouteParams(routeContext.route?.params));
-
-  function page(relativePath = "/", options = {}) {
-    const source = options && typeof options === "object" && !Array.isArray(options) ? options : {};
-    const surface =
-      resolveSurfaceId(source.surface, routeContext.currentSurfaceId.value) ||
-      resolveDefaultSurfaceIdFromPlacementContext(routeContext.placementContext.value);
-    if (!surface) {
-      return "";
-    }
-    return shellLinkResolver.resolve(relativePath, {
-      surface,
-      explicitTo: source.explicitTo,
-      surfaceRelativePath: source.surfaceRelativePath,
-      params: resolveRouteParams(routeParams.value, source.params),
-      strictParams: source.strictParams !== false
-    });
-  }
-
-  function api(relativePath = "", options = {}) {
-    const source = options && typeof options === "object" && !Array.isArray(options) ? options : {};
-    const surface =
-      resolveSurfaceId(source.surface, routeContext.currentSurfaceId.value) ||
-      resolveDefaultSurfaceIdFromPlacementContext(routeContext.placementContext.value);
-    const suffix = normalizePathSuffix(relativePath);
-
-    if (!suffix) {
-      throw new TypeError("usePaths().api(relativePath) requires a non-empty relativePath.");
-    }
-
-    const routeBase = resolveSurfaceDefinitionFromPlacementContext(
-      routeContext.placementContext.value,
-      surface
-    )?.routeBase || "/";
-
-    return resolveScopedApiBasePath({
-      routeBase,
-      relativePath: suffix,
-      params: resolveRouteParams(routeParams.value, source.params),
-      strictParams: source.strictParams !== false
-    });
-  }
-
-  return Object.freeze({
-    route: routeContext.route,
-    placementContext: routeContext.placementContext,
-    currentSurfaceId: routeContext.currentSurfaceId,
-    routeParams,
-    page,
-    api
-  });
-}
-
-export { usePaths };

package/src/client/composables/useSurfaceRouteContext.js

@@ -1,25 +0,0 @@
-import { computed } from "vue";
-import { useRoute } from "vue-router";
-import {
-  resolveRuntimePathname,
-  resolveSurfaceIdFromPlacementPathname,
-  useWebPlacementContext
-} from "@jskit-ai/shell-web/client/placement";
-
-function useSurfaceRouteContext() {
-  const route = useRoute();
-  const { context: placementContext, mergeContext: mergePlacementContext } = useWebPlacementContext();
-  const routePath = computed(() => resolveRuntimePathname(route?.path));
-
-  const currentSurfaceId = computed(() => resolveSurfaceIdFromPlacementPathname(placementContext.value, routePath.value));
-
-  return Object.freeze({
-    route,
-    routePath,
-    placementContext,
-    mergePlacementContext,
-    currentSurfaceId
-  });
-}
-
-export { useSurfaceRouteContext };