@jskit-ai/users-web 0.1.36 → 0.1.38

package/package.descriptor.mjs

@@ -1,12 +1,13 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-web",
-  version: "0.1.36",
+  version: "0.1.38",
   kind: "runtime",
   description: "Users web module: workspace selector shell element plus workspace/profile/members UI elements.",
   dependsOn: [
     "@jskit-ai/http-runtime",
     "@jskit-ai/shell-web",
+    "@jskit-ai/uploads-image-web",
     "@jskit-ai/users-core"
   ],
   capabilities: {
@@ -32,17 +33,6 @@ export default Object.freeze({
     }
   },
   metadata: {
-    client: {
-      optimizeDeps: {
-        include: [
-          "@uppy/core",
-          "@uppy/dashboard",
-          "@uppy/image-editor",
-          "@uppy/compressor",
-          "@uppy/xhr-upload"
-        ]
-      }
-    },
     apiSummary: {
       surfaces: [
         {
@@ -241,16 +231,12 @@ export default Object.freeze({
       runtime: {
         "@tanstack/vue-query": "5.92.12",
         "@mdi/js": "^7.4.47",
-        "@uppy/compressor": "^3.1.0",
-        "@uppy/core": "^5.2.0",
-        "@uppy/dashboard": "^5.1.1",
-        "@uppy/image-editor": "^4.2.0",
-        "@uppy/xhr-upload": "^5.1.1",
-        "@jskit-ai/http-runtime": "0.1.21",
-        "@jskit-ai/realtime": "0.1.21",
-        "@jskit-ai/kernel": "0.1.22",
-        "@jskit-ai/shell-web": "0.1.21",
-        "@jskit-ai/users-core": "0.1.31",
+        "@jskit-ai/http-runtime": "0.1.23",
+        "@jskit-ai/realtime": "0.1.23",
+        "@jskit-ai/kernel": "0.1.24",
+        "@jskit-ai/shell-web": "0.1.23",
+        "@jskit-ai/uploads-image-web": "0.1.2",
+        "@jskit-ai/users-core": "0.1.33",
         "vuetify": "^4.0.0"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -8,25 +8,30 @@
   "exports": {
     "./client": "./src/client/index.js",
     "./client/components/WorkspaceMembersClientElement": "./src/client/components/WorkspaceMembersClientElement.vue",
-    "./client/composables/useAddEdit": "./src/client/composables/useAddEdit.js",
-    "./client/composables/useCrudSchemaForm": "./src/client/composables/useCrudSchemaForm.js",
-    "./client/composables/crudLookupFieldRuntime": "./src/client/composables/crudLookupFieldRuntime.js",
-    "./client/composables/useList": "./src/client/composables/useList.js",
-    "./client/composables/useView": "./src/client/composables/useView.js",
+    "./client/composables/useAddEdit": "./src/client/composables/records/useAddEdit.js",
+    "./client/composables/useCrudAddEdit": "./src/client/composables/records/useCrudAddEdit.js",
+    "./client/composables/crudLookupFieldRuntime": "./src/client/composables/crud/crudLookupFieldRuntime.js",
+    "./client/composables/useList": "./src/client/composables/records/useList.js",
+    "./client/composables/useCrudList": "./src/client/composables/records/useCrudList.js",
+    "./client/composables/useCrudListParentTitle": "./src/client/composables/useCrudListParentTitle.js",
+    "./client/composables/useView": "./src/client/composables/records/useView.js",
+    "./client/composables/useCrudView": "./src/client/composables/records/useCrudView.js",
     "./client/composables/usePagedCollection": "./src/client/composables/usePagedCollection.js",
     "./client/composables/useAccountSettingsRuntime": "./src/client/composables/useAccountSettingsRuntime.js",
     "./client/composables/usePaths": "./src/client/composables/usePaths.js",
     "./client/composables/useWorkspaceRouteContext": "./src/client/composables/useWorkspaceRouteContext.js",
+    "./client/support/menuLinkTarget": "./src/client/support/menuLinkTarget.js",
     "./client/support/realtimeWorkspace": "./src/client/support/realtimeWorkspace.js"
   },
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/users-core": "0.1.31",
-    "@jskit-ai/realtime": "0.1.21",
-    "@jskit-ai/http-runtime": "0.1.21",
-    "@jskit-ai/kernel": "0.1.22",
-    "@jskit-ai/shell-web": "0.1.21",
+    "@jskit-ai/http-runtime": "0.1.23",
+    "@jskit-ai/kernel": "0.1.24",
+    "@jskit-ai/realtime": "0.1.23",
+    "@jskit-ai/shell-web": "0.1.23",
+    "@jskit-ai/uploads-image-web": "0.1.2",
+    "@jskit-ai/users-core": "0.1.33",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/components/MembersAdminClientElement.vue

@@ -44,7 +44,7 @@
                     class="mb-3"
                   />
                   <v-select
-                    v-model="inviteForm.roleId"
+                    v-model="inviteForm.roleSid"
                     label="Role"
                     :items="inviteRoleOptions"
                     item-title="title"
@@ -105,7 +105,7 @@
                     <template #append>
                       <div class="d-flex align-center ga-2">
                         <v-select
-                          v-model="member.roleId"
+                          v-model="member.roleSid"
                           :items="memberRoleOptions"
                           item-title="title"
                           item-value="value"
@@ -139,7 +139,7 @@
                       {{ invite.email }}
                     </template>
                     <template #subtitle>
-                      Role: {{ invite.roleId }} • expires {{ formatDateTime(invite.expiresAt) }}
+                      Role: {{ invite.roleSid }} • expires {{ formatDateTime(invite.expiresAt) }}
                     </template>
                     <template #append>
                       <v-btn
@@ -375,12 +375,12 @@ async function onRevokeInvite(inviteId) {
   await actionHandlers.submitRevokeInvite(inviteId);
 }
 
-async function onMemberRoleUpdate(member, roleId) {
+async function onMemberRoleUpdate(member, roleSid) {
   if (isMemberRoleLocked(member)) {
     return;
   }
 
-  await actionHandlers.submitMemberRoleUpdate(member, roleId);
+  await actionHandlers.submitMemberRoleUpdate(member, roleSid);
 }
 
 async function onRemoveMember(member) {

package/src/client/components/UsersSurfaceAwareMenuLinkItem.vue

@@ -1,9 +1,10 @@
 <script setup>
 import { computed } from "vue";
+import { useRoute } from "vue-router";
 import { useWebPlacementContext } from "@jskit-ai/shell-web/client/placement";
 import { usePaths } from "../composables/usePaths.js";
-import { surfaceRequiresWorkspaceFromPlacementContext } from "../lib/workspaceSurfaceContext.js";
 import { resolveMenuLinkIcon } from "../lib/menuIcons.js";
+import { resolveMenuLinkTarget } from "../support/menuLinkTarget.js";
 
 const props = defineProps({
   label: {
@@ -36,34 +37,22 @@ const props = defineProps({
   }
 });
 
+const route = useRoute();
 const paths = usePaths();
 const { context: placementContext } = useWebPlacementContext();
 
-const targetSurfaceId = computed(() => {
-  const explicitSurface = String(props.surface || "").trim().toLowerCase();
-  if (explicitSurface && explicitSurface !== "*") {
-    return explicitSurface;
-  }
-
-  return String(paths.currentSurfaceId.value || "").trim().toLowerCase();
-});
-
 const resolvedTo = computed(() => {
-  const explicitTo = String(props.to || "").trim();
-  if (explicitTo) {
-    return explicitTo;
-  }
-
-  const workspaceRequired = surfaceRequiresWorkspaceFromPlacementContext(
-    placementContext.value,
-    targetSurfaceId.value
-  );
-  const suffix = workspaceRequired ? props.workspaceSuffix : props.nonWorkspaceSuffix;
-  const normalizedSuffix = String(suffix || "/").trim() || "/";
-
-  return paths.page(normalizedSuffix, {
-    surface: targetSurfaceId.value,
-    mode: "auto"
+  return resolveMenuLinkTarget({
+    to: props.to,
+    surface: props.surface,
+    currentSurfaceId: paths.currentSurfaceId.value,
+    placementContext: placementContext.value,
+    workspaceSuffix: props.workspaceSuffix,
+    nonWorkspaceSuffix: props.nonWorkspaceSuffix,
+    routeParams: route.params || {},
+    resolvePagePath(relativePath, options = {}) {
+      return paths.page(relativePath, options);
+    }
   });
 });
 

package/src/client/components/WorkspaceMembersClientElement.vue

@@ -23,11 +23,11 @@ import { computed, reactive, ref, watch } from "vue";
 import { formatDateTime } from "@jskit-ai/kernel/shared/support";
 import MembersAdminClientElement from "./MembersAdminClientElement.vue";
 import { useCommand } from "../composables/useCommand.js";
-import { useList } from "../composables/useList.js";
-import { useView } from "../composables/useView.js";
+import { useList } from "../composables/records/useList.js";
+import { useView } from "../composables/records/useView.js";
 import { usePaths } from "../composables/usePaths.js";
 import { useAccess } from "../composables/useAccess.js";
-import { useUiFeedback } from "../composables/useUiFeedback.js";
+import { useUiFeedback } from "../composables/runtime/useUiFeedback.js";
 import { useWorkspaceRouteContext } from "../composables/useWorkspaceRouteContext.js";
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { createWorkspaceRealtimeMatcher } from "../support/realtimeWorkspace.js";
@@ -37,7 +37,7 @@ import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/su
 const forms = reactive({
   invite: {
     email: "",
-    roleId: "member"
+    roleSid: "member"
   },
   workspace: {
     invitesEnabled: false,
@@ -139,7 +139,7 @@ function clearRoleOptions() {
 function resetViewState() {
   resetMessages();
   forms.invite.email = "";
-  forms.invite.roleId = "member";
+  forms.invite.roleSid = "member";
   forms.workspace.invitesEnabled = false;
   forms.workspace.invitesAvailable = false;
   collections.members = [];
@@ -149,8 +149,8 @@ function resetViewState() {
   removeMemberUserId.value = 0;
 }
 
-function toRoleTitle(roleId) {
-  const normalizedRoleId = String(roleId || "").trim();
+function toRoleTitle(roleSid) {
+  const normalizedRoleId = String(roleSid || "").trim();
   if (!normalizedRoleId) {
     return "";
   }
@@ -182,9 +182,9 @@ function normalizeRoleCatalog(payload = {}) {
   }
 
   const uniqueRoleIds = Array.from(new Set(assignableRoleIds));
-  const roleOptions = uniqueRoleIds.map((roleId) => ({
-    title: toRoleTitle(roleId),
-    value: roleId
+  const roleOptions = uniqueRoleIds.map((roleSid) => ({
+    title: toRoleTitle(roleSid),
+    value: roleSid
   }));
 
   const defaultInviteRole = String(source.defaultInviteRole || "")
@@ -202,19 +202,19 @@ function applyRoleCatalog(payload = {}) {
   options.inviteRoleOptions = [...normalizedCatalog.roleOptions];
   options.memberRoleOptions = [...normalizedCatalog.roleOptions];
 
-  const selectedInviteRole = String(forms.invite.roleId || "").trim().toLowerCase();
+  const selectedInviteRole = String(forms.invite.roleSid || "").trim().toLowerCase();
   const hasSelectedInviteRole = normalizedCatalog.roleOptions.some((entry) => entry.value === selectedInviteRole);
 
   if (
     normalizedCatalog.defaultInviteRole &&
     normalizedCatalog.roleOptions.some((entry) => entry.value === normalizedCatalog.defaultInviteRole)
   ) {
-    forms.invite.roleId = normalizedCatalog.defaultInviteRole;
+    forms.invite.roleSid = normalizedCatalog.defaultInviteRole;
     return;
   }
 
   if (!hasSelectedInviteRole && normalizedCatalog.roleOptions.length > 0) {
-    forms.invite.roleId = normalizedCatalog.roleOptions[0].value;
+    forms.invite.roleSid = normalizedCatalog.roleOptions[0].value;
   }
 }
 
@@ -224,7 +224,7 @@ function normalizeMembers(entries) {
     const value = entry && typeof entry === "object" ? entry : {};
     return {
       userId: Number(value.userId || 0),
-      roleId: String(value.roleId || "").trim().toLowerCase(),
+      roleSid: String(value.roleSid || "").trim().toLowerCase(),
       status: String(value.status || "").trim().toLowerCase(),
       displayName: String(value.displayName || "").trim(),
       email: String(value.email || "").trim().toLowerCase(),
@@ -240,7 +240,7 @@ function normalizeInvites(entries) {
     return {
       id: Number(value.id || 0),
       email: String(value.email || "").trim().toLowerCase(),
-      roleId: String(value.roleId || "").trim().toLowerCase(),
+      roleSid: String(value.roleSid || "").trim().toLowerCase(),
       status: String(value.status || "").trim().toLowerCase(),
       expiresAt: value.expiresAt || "",
       invitedByUserId: value.invitedByUserId == null ? null : Number(value.invitedByUserId)
@@ -319,7 +319,7 @@ const inviteCreateCommand = useCommand({
   fallbackRunError: "Unable to send invite.",
   buildRawPayload: () => ({
     email: forms.invite.email,
-    roleId: forms.invite.roleId
+    roleSid: forms.invite.roleSid
   }),
   messages: {
     success: "Invite sent.",
@@ -352,7 +352,7 @@ const memberRoleCommand = useCommand({
   writeMethod: "PATCH",
   fallbackRunError: "Unable to update member role.",
   buildRawPayload: (_model, { context }) => ({
-    roleId: String(context?.roleId || "").trim().toLowerCase()
+    roleSid: String(context?.roleSid || "").trim().toLowerCase()
   }),
   buildCommandOptions: (_parsed, { context }) => {
     return {
@@ -595,7 +595,7 @@ async function submitRevokeInvite(inviteId) {
   }
 }
 
-async function submitMemberRoleUpdate(member, roleId) {
+async function submitMemberRoleUpdate(member, roleSid) {
   if (!canManageMembers.value) {
     return;
   }
@@ -610,7 +610,7 @@ async function submitMemberRoleUpdate(member, roleId) {
 
     await memberRoleCommand.run({
       memberUserId,
-      roleId
+      roleSid
     });
     await Promise.all([
       workspaceMembersList.reload(),

package/src/client/components/WorkspaceProfileClientElement.vue

@@ -71,7 +71,7 @@ import { computed, reactive } from "vue";
 import { validateOperationSection } from "@jskit-ai/http-runtime/shared/validators/operationValidation";
 import { workspaceResource } from "@jskit-ai/users-core/shared/resources/workspaceResource";
 import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
-import { useAddEdit } from "../composables/useAddEdit.js";
+import { useAddEdit } from "../composables/records/useAddEdit.js";
 import { buildWorkspaceQueryKey } from "../support/workspaceQueryKeys.js";
 
 const emit = defineEmits(["saved"]);

package/src/client/components/WorkspaceSettingsFieldsClientElement.vue

@@ -176,7 +176,7 @@ import {
   DEFAULT_WORKSPACE_LIGHT_PALETTE,
   resolveWorkspaceThemePalettes
 } from "@jskit-ai/users-core/shared/settings";
-import { useAddEdit } from "../composables/useAddEdit.js";
+import { useAddEdit } from "../composables/records/useAddEdit.js";
 import { useWorkspaceRouteContext } from "../composables/useWorkspaceRouteContext.js";
 import { createWorkspaceRealtimeMatcher } from "../support/realtimeWorkspace.js";
 import { buildWorkspaceQueryKey } from "../support/workspaceQueryKeys.js";

package/src/client/components/WorkspacesClientElement.vue

@@ -8,12 +8,12 @@ import {
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { normalizeWorkspaceList } from "../lib/bootstrap.js";
 import { useCommand } from "../composables/useCommand.js";
-import { useView } from "../composables/useView.js";
+import { useView } from "../composables/records/useView.js";
 import { usePaths } from "../composables/usePaths.js";
 import { useRealtimeQueryInvalidation } from "../composables/useRealtimeQueryInvalidation.js";
 import { useWorkspaceSurfaceId } from "../composables/useWorkspaceSurfaceId.js";
 import { USERS_ROUTE_VISIBILITY_PUBLIC } from "@jskit-ai/users-core/shared/support/usersVisibility";
-import { normalizePendingInvite } from "../composables/accountSettingsRuntimeHelpers.js";
+import { normalizePendingInvite } from "../composables/account-settings/accountSettingsRuntimeHelpers.js";
 
 const route = useRoute();
 const router = useRouter();
@@ -421,7 +421,7 @@ watch(
                       :title="workspace.name"
                       :subtitle="
                         workspace.isAccessible
-                          ? `/${workspace.slug} • role: ${workspace.roleId || 'member'}`
+                          ? `/${workspace.slug} • role: ${workspace.roleSid || 'member'}`
                           : `/${workspace.slug} • unavailable on this surface`
                       "
                       class="px-0"
@@ -466,7 +466,7 @@ watch(
                       v-for="invite in pendingInvites"
                       :key="invite.id"
                       :title="invite.workspaceName"
-                      :subtitle="`Role: ${invite.roleId}`"
+                      :subtitle="`Role: ${invite.roleSid}`"
                       class="px-0"
                     >
                       <template #prepend>

package/src/client/composables/account-settings/accountSettingsAvatarUploadRuntime.js

@@ -0,0 +1,61 @@
+import "@jskit-ai/uploads-image-web/client/styles";
+import { createManagedImageAssetRuntime } from "@jskit-ai/uploads-image-web/client/composables/createManagedImageAssetRuntime";
+import { resolveFieldErrors } from "@jskit-ai/http-runtime/client";
+import { usersWebHttpClient } from "../../lib/httpClient.js";
+
+function createAccountSettingsAvatarUploadRuntime({
+  queryClient,
+  sessionQueryKey,
+  accountSettingsQueryKey,
+  selectedAvatarFileName,
+  applySettingsData,
+  reportAccountFeedback
+} = {}) {
+  async function resolveCsrfToken() {
+    const sessionPayload = await queryClient.fetchQuery({
+      queryKey: sessionQueryKey,
+      queryFn: () =>
+        usersWebHttpClient.request("/api/session", {
+          method: "GET"
+        }),
+      staleTime: 60_000
+    });
+
+    const csrfToken = String(sessionPayload?.csrfToken || "");
+    if (!csrfToken) {
+      throw new Error("Unable to prepare secure avatar upload request.");
+    }
+
+    return csrfToken;
+  }
+
+  return createManagedImageAssetRuntime({
+    uploadEndpoint: "/api/settings/profile/avatar",
+    fieldName: "avatar",
+    selectedFileName: selectedAvatarFileName,
+    resolveRequestHeaders: async () => ({
+      "csrf-token": await resolveCsrfToken()
+    }),
+    onUploadSuccess: ({ data }) => {
+      applySettingsData(data);
+      queryClient.setQueryData(accountSettingsQueryKey, data);
+    },
+    reportFeedback: reportAccountFeedback,
+    resolveUploadErrorMessage: ({ error, response, defaultMessage }) => {
+      const body = response?.body && typeof response.body === "object" ? response.body : {};
+      const fieldErrors = resolveFieldErrors(body);
+      return String(fieldErrors.avatar || body?.error || error?.message || defaultMessage);
+    },
+    messages: {
+      uploadSuccess: "Avatar uploaded.",
+      uploadInvalidResponse: "Avatar uploaded, but the response payload was invalid.",
+      uploadError: "Unable to upload avatar.",
+      uploadRestriction: "Selected avatar file does not meet upload restrictions.",
+      editorUnavailable: "Avatar editor is unavailable in this environment.",
+      changeError: "Avatar uploaded, but the settings view could not refresh."
+    },
+    source: "users-web.account-settings-runtime:avatar"
+  });
+}
+
+export { createAccountSettingsAvatarUploadRuntime };

package/src/client/composables/{accountSettingsInvitesRuntime.js → account-settings/accountSettingsInvitesRuntime.js}

@@ -1,4 +1,4 @@
-import { resolveErrorStatusCode } from "../support/runtimeNormalization.js";
+import { resolveErrorStatusCode } from "../../support/runtimeNormalization.js";
 
 function createAccountSettingsInvitesRuntime({
   invitesAvailable,

package/src/client/composables/{accountSettingsRuntimeConstants.js → account-settings/accountSettingsRuntimeConstants.js}

@@ -1,5 +1,3 @@
-const AVATAR_ALLOWED_MIME_TYPES = Object.freeze(["image/jpeg", "image/png", "image/webp"]);
-const AVATAR_MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
 const AVATAR_DEFAULT_SIZE = 64;
 
 const THEME_OPTIONS = Object.freeze([
@@ -64,9 +62,7 @@ const ACCOUNT_SETTINGS_DEFAULTS = Object.freeze({
 
 export {
   ACCOUNT_SETTINGS_DEFAULTS,
-  AVATAR_ALLOWED_MIME_TYPES,
   AVATAR_DEFAULT_SIZE,
-  AVATAR_MAX_UPLOAD_BYTES,
   AVATAR_SIZE_OPTIONS,
   CURRENCY_OPTIONS,
   DATE_FORMAT_OPTIONS,

package/src/client/composables/{accountSettingsRuntimeHelpers.js → account-settings/accountSettingsRuntimeHelpers.js}

@@ -3,7 +3,7 @@ import {
   normalizeReturnToPath as normalizeSharedReturnToPath,
   resolveAllowedOriginsFromPlacementContext
 } from "@jskit-ai/kernel/shared/support";
-import { normalizeRecord } from "../support/runtimeNormalization.js";
+import { normalizeRecord } from "../../support/runtimeNormalization.js";
 
 function normalizeReturnToPath(value, { fallback = "/", accountSettingsPath = "/account", allowedOrigins = [] } = {}) {
   return normalizeSharedReturnToPath(value, {
@@ -50,7 +50,7 @@ function normalizePendingInvite(entry) {
     workspaceSlug,
     workspaceName: String(entry.workspaceName || workspaceSlug).trim() || workspaceSlug,
     workspaceAvatarUrl: String(entry.workspaceAvatarUrl || "").trim(),
-    roleId: String(entry.roleId || "member").trim().toLowerCase() || "member",
+    roleSid: String(entry.roleSid || "member").trim().toLowerCase() || "member",
     status: String(entry.status || "pending").trim().toLowerCase() || "pending",
     expiresAt: String(entry.expiresAt || "").trim()
   };

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

@@ -0,0 +1,75 @@
+import { unref } from "vue";
+import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { asPlainObject } from "../support/scopeHelpers.js";
+
+const CRUD_BINDING_MODE_ROUTE = "route";
+const CRUD_BINDING_MODE_MERGE = "merge";
+const CRUD_BINDING_MODE_EXPLICIT = "explicit";
+const CRUD_BINDING_MODE_NONE = "none";
+
+function normalizeCrudBindingMode(value = "") {
+  const normalizedValue = normalizeText(value).toLowerCase();
+  if (normalizedValue === CRUD_BINDING_MODE_MERGE) {
+    return CRUD_BINDING_MODE_MERGE;
+  }
+  if (normalizedValue === CRUD_BINDING_MODE_EXPLICIT) {
+    return CRUD_BINDING_MODE_EXPLICIT;
+  }
+  if (normalizedValue === CRUD_BINDING_MODE_NONE) {
+    return CRUD_BINDING_MODE_NONE;
+  }
+
+  return CRUD_BINDING_MODE_ROUTE;
+}
+
+function normalizeCrudBindingConfig(binding = {}) {
+  const source = asPlainObject(unref(binding));
+  return Object.freeze({
+    mode: normalizeCrudBindingMode(source.mode),
+    values: source.values ?? null
+  });
+}
+
+function resolveCrudBindingValues(values, context = {}) {
+  if (typeof values === "function") {
+    return asPlainObject(values(context));
+  }
+
+  return asPlainObject(unref(values));
+}
+
+function resolveCrudBoundValues({
+  binding = {},
+  routeValues = {},
+  context = {}
+} = {}) {
+  const normalizedBinding = normalizeCrudBindingConfig(binding);
+  const normalizedRouteValues = asPlainObject(routeValues);
+  const explicitValues = resolveCrudBindingValues(normalizedBinding.values, context);
+
+  if (normalizedBinding.mode === CRUD_BINDING_MODE_NONE) {
+    return {};
+  }
+  if (normalizedBinding.mode === CRUD_BINDING_MODE_EXPLICIT) {
+    return explicitValues;
+  }
+  if (normalizedBinding.mode === CRUD_BINDING_MODE_MERGE) {
+    return {
+      ...normalizedRouteValues,
+      ...explicitValues
+    };
+  }
+
+  return normalizedRouteValues;
+}
+
+export {
+  CRUD_BINDING_MODE_ROUTE,
+  CRUD_BINDING_MODE_MERGE,
+  CRUD_BINDING_MODE_EXPLICIT,
+  CRUD_BINDING_MODE_NONE,
+  normalizeCrudBindingMode,
+  normalizeCrudBindingConfig,
+  resolveCrudBindingValues,
+  resolveCrudBoundValues
+};

package/src/client/composables/{crudLookupFieldLabelSupport.js → crud/crudLookupFieldLabelSupport.js}

@@ -1,13 +1,16 @@
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { normalizeCrudLookupContainerKey } from "@jskit-ai/kernel/shared/support/crudLookup";
-import { asPlainObject } from "./scopeHelpers.js";
+import { asPlainObject } from "../support/scopeHelpers.js";
 
 const LOOKUP_LABEL_COMPOSITION_CANDIDATES = Object.freeze([
   Object.freeze(["name", "surname"]),
+  Object.freeze(["name", "lastName"]),
   Object.freeze(["firstName", "surname"]),
+  Object.freeze(["firstName", "lastName"]),
   Object.freeze(["name"]),
   Object.freeze(["firstName"])
 ]);
+const DEFAULT_RECORD_TITLE = "-";
 
 function hasDisplayValue(value) {
   if (value == null) {
@@ -20,9 +23,8 @@ function hasDisplayValue(value) {
   return true;
 }
 
-function resolveLookupItemLabel(item = {}, labelKey = "") {
-  const source = asPlainObject(item);
-  for (const candidate of LOOKUP_LABEL_COMPOSITION_CANDIDATES) {
+function resolveComposedLabel(source = {}, candidates = LOOKUP_LABEL_COMPOSITION_CANDIDATES) {
+  for (const candidate of candidates) {
     const parts = [];
     for (const key of candidate) {
       const part = normalizeText(source[key]);
@@ -37,6 +39,16 @@ function resolveLookupItemLabel(item = {}, labelKey = "") {
     }
   }
 
+  return "";
+}
+
+function resolveLookupItemLabel(item = {}, labelKey = "") {
+  const source = asPlainObject(item);
+  const composedLabel = resolveComposedLabel(source);
+  if (composedLabel) {
+    return composedLabel;
+  }
+
   const normalizedLabelKey = normalizeText(labelKey);
   if (!normalizedLabelKey) {
     return "";
@@ -45,6 +57,25 @@ function resolveLookupItemLabel(item = {}, labelKey = "") {
   return normalizeText(source[normalizedLabelKey]);
 }
 
+function resolveRecordTitle(record = {}, { fallbackKey = "", defaultValue = DEFAULT_RECORD_TITLE } = {}) {
+  const source = asPlainObject(record);
+  const composedLabel = resolveComposedLabel(source);
+  if (composedLabel) {
+    return composedLabel;
+  }
+
+  const normalizedFallbackKey = normalizeText(fallbackKey);
+  if (normalizedFallbackKey) {
+    const fallbackValue = normalizeText(source[normalizedFallbackKey]);
+    if (fallbackValue) {
+      return fallbackValue;
+    }
+  }
+
+  const normalizedDefaultValue = normalizeText(defaultValue);
+  return normalizedDefaultValue || DEFAULT_RECORD_TITLE;
+}
+
 function resolveLookupFieldDescriptor(field = {}, relationKind = "", valueKey = "", labelKey = "") {
   if (typeof field === "string") {
     return {
@@ -103,5 +134,6 @@ function resolveLookupFieldDisplayValue(record = {}, field = {}, relationKind =
 
 export {
   resolveLookupItemLabel,
-  resolveLookupFieldDisplayValue
+  resolveLookupFieldDisplayValue,
+  resolveRecordTitle
 };