@jskit-ai/users-web 0.1.36 → 0.1.37

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.37",
   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.22",
+        "@jskit-ai/realtime": "0.1.22",
+        "@jskit-ai/kernel": "0.1.23",
+        "@jskit-ai/shell-web": "0.1.22",
+        "@jskit-ai/uploads-image-web": "0.1.1",
+        "@jskit-ai/users-core": "0.1.32",
         "vuetify": "^4.0.0"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -22,11 +22,12 @@
   "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.22",
+    "@jskit-ai/kernel": "0.1.23",
+    "@jskit-ai/realtime": "0.1.22",
+    "@jskit-ai/shell-web": "0.1.22",
+    "@jskit-ai/uploads-image-web": "0.1.1",
+    "@jskit-ai/users-core": "0.1.32",
     "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/WorkspaceMembersClientElement.vue

@@ -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/WorkspacesClientElement.vue

@@ -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/accountSettingsAvatarUploadRuntime.js

@@ -1,36 +1,7 @@
-import Uppy from "@uppy/core";
-import Dashboard from "@uppy/dashboard";
-import ImageEditor from "@uppy/image-editor";
-import Compressor from "@uppy/compressor";
-import XHRUpload from "@uppy/xhr-upload";
-import "@uppy/core/css/style.min.css";
-import "@uppy/dashboard/css/style.min.css";
-import "@uppy/image-editor/css/style.min.css";
+import "@jskit-ai/uploads-image-web/client/styles";
+import { createImageUploadRuntime } from "@jskit-ai/uploads-image-web/client/composables/createImageUploadRuntime";
 import { resolveFieldErrors } from "@jskit-ai/http-runtime/client";
 import { usersWebHttpClient } from "../lib/httpClient.js";
-import {
-  AVATAR_ALLOWED_MIME_TYPES,
-  AVATAR_MAX_UPLOAD_BYTES
-} from "./accountSettingsRuntimeConstants.js";
-
-function parseUploadResponse(xhr) {
-  if (!xhr.responseText) {
-    return {};
-  }
-
-  try {
-    return JSON.parse(xhr.responseText);
-  } catch {
-    return {};
-  }
-}
-
-function stopImageEditor(uppy) {
-  const imageEditor = uppy.getPlugin("ImageEditor");
-  if (imageEditor && typeof imageEditor.stop === "function") {
-    imageEditor.stop();
-  }
-}
 
 function createAccountSettingsAvatarUploadRuntime({
   queryClient,
@@ -40,8 +11,6 @@ function createAccountSettingsAvatarUploadRuntime({
   applySettingsData,
   reportAccountFeedback
 } = {}) {
-  let avatarUppy = null;
-
   async function resolveCsrfToken() {
     const sessionPayload = await queryClient.fetchQuery({
       queryKey: sessionQueryKey,
@@ -60,94 +29,16 @@ function createAccountSettingsAvatarUploadRuntime({
     return csrfToken;
   }
 
-  function setup() {
-    if (typeof window === "undefined") {
-      return;
-    }
-
-    if (avatarUppy) {
-      return;
-    }
-
-    const uppy = new Uppy({
-      autoProceed: false,
-      restrictions: {
-        maxNumberOfFiles: 1,
-        allowedFileTypes: [...AVATAR_ALLOWED_MIME_TYPES],
-        maxFileSize: AVATAR_MAX_UPLOAD_BYTES
-      }
-    });
-
-    uppy.use(Dashboard, {
-      inline: false,
-      closeAfterFinish: false,
-      showProgressDetails: true,
-      proudlyDisplayPoweredByUppy: false,
-      hideUploadButton: false,
-      doneButtonHandler: () => {
-        const dashboard = uppy.getPlugin("Dashboard");
-        if (dashboard && typeof dashboard.closeModal === "function") {
-          dashboard.closeModal();
-        }
-      },
-      note: `Accepted: ${AVATAR_ALLOWED_MIME_TYPES.join(", ")}, max ${Math.floor(AVATAR_MAX_UPLOAD_BYTES / (1024 * 1024))}MB`
-    });
-
-    uppy.use(ImageEditor, {
-      quality: 0.9
-    });
-
-    uppy.use(Compressor, {
-      quality: 0.84,
-      limit: 1
-    });
-
-    uppy.use(XHRUpload, {
-      endpoint: "/api/settings/profile/avatar",
-      method: "POST",
-      formData: true,
-      fieldName: "avatar",
-      withCredentials: true,
-      onBeforeRequest: async (xhr) => {
-        const csrfToken = await resolveCsrfToken();
-        xhr.setRequestHeader("csrf-token", csrfToken);
-      },
-      getResponseData: parseUploadResponse
-    });
-
-    uppy.on("file-added", (file) => {
-      selectedAvatarFileName.value = String(file?.name || "");
-    });
-
-    uppy.on("file-removed", () => {
-      selectedAvatarFileName.value = "";
-    });
-
-    uppy.on("file-editor:complete", (file) => {
-      selectedAvatarFileName.value = String(file?.name || selectedAvatarFileName.value || "");
-      stopImageEditor(uppy);
-    });
-
-    uppy.on("file-editor:cancel", () => {
-      stopImageEditor(uppy);
-    });
-
-    uppy.on("dashboard:modal-closed", () => {
-      stopImageEditor(uppy);
-    });
-
-    uppy.on("upload-success", (_file, response) => {
-      const data = response?.body;
-      if (!data || typeof data !== "object") {
-        reportAccountFeedback({
-          message: "Avatar uploaded, but the response payload was invalid.",
-          severity: "error",
-          channel: "banner",
-          dedupeKey: "users-web.account-settings-runtime:avatar-upload-invalid-response"
-        });
-        return;
-      }
-
+  return createImageUploadRuntime({
+    endpoint: "/api/settings/profile/avatar",
+    fieldName: "avatar",
+    resolveRequestHeaders: async () => ({
+      "csrf-token": await resolveCsrfToken()
+    }),
+    onSelectedFileNameChanged: (fileName) => {
+      selectedAvatarFileName.value = String(fileName || "");
+    },
+    onUploadSuccess: ({ data, uppy }) => {
       applySettingsData(data);
       queryClient.setQueryData(accountSettingsQueryKey, data);
 
@@ -162,10 +53,16 @@ function createAccountSettingsAvatarUploadRuntime({
         channel: "snackbar",
         dedupeKey: "users-web.account-settings-runtime:avatar-uploaded"
       });
-      selectedAvatarFileName.value = "";
-    });
-
-    uppy.on("upload-error", (_file, error, response) => {
+    },
+    onInvalidResponse: () => {
+      reportAccountFeedback({
+        message: "Avatar uploaded, but the response payload was invalid.",
+        severity: "error",
+        channel: "banner",
+        dedupeKey: "users-web.account-settings-runtime:avatar-upload-invalid-response"
+      });
+    },
+    onUploadError: ({ error, response }) => {
       const body = response?.body && typeof response.body === "object" ? response.body : {};
       const fieldErrors = resolveFieldErrors(body);
 
@@ -175,66 +72,23 @@ function createAccountSettingsAvatarUploadRuntime({
         channel: "banner",
         dedupeKey: "users-web.account-settings-runtime:avatar-upload-error"
       });
-    });
-
-    uppy.on("restriction-failed", (_file, error) => {
+    },
+    onRestrictionFailed: ({ error }) => {
       reportAccountFeedback({
         message: String(error?.message || "Selected avatar file does not meet upload restrictions."),
         severity: "error",
         channel: "banner",
         dedupeKey: "users-web.account-settings-runtime:avatar-upload-restriction"
       });
-    });
-
-    uppy.on("complete", (result) => {
-      const successfulCount = Array.isArray(result?.successful) ? result.successful.length : 0;
-      if (successfulCount <= 0) {
-        return;
-      }
-
-      try {
-        uppy.clear();
-      } catch {
-        // Upload succeeded; ignore clear timing issues.
-      }
-    });
-
-    avatarUppy = uppy;
-  }
-
-  function openEditor() {
-    setup();
-
-    const uppy = avatarUppy;
-    if (!uppy) {
+    },
+    onUnavailable: () => {
       reportAccountFeedback({
         message: "Avatar editor is unavailable in this environment.",
         severity: "error",
         channel: "banner",
         dedupeKey: "users-web.account-settings-runtime:avatar-editor-unavailable"
       });
-      return;
     }
-
-    const dashboard = uppy.getPlugin("Dashboard");
-    if (dashboard && typeof dashboard.openModal === "function") {
-      dashboard.openModal();
-    }
-  }
-
-  function destroy() {
-    if (!avatarUppy) {
-      return;
-    }
-
-    avatarUppy.destroy();
-    avatarUppy = null;
-  }
-
-  return Object.freeze({
-    destroy,
-    openEditor,
-    setup
   });
 }
 

package/src/client/composables/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

@@ -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/addEditUiRuntime.js

@@ -3,7 +3,7 @@ import { asPlainObject } from "./scopeHelpers.js";
 import {
   normalizeRouteParamName,
   resolveRouteParamsSource,
-  resolveRoutePathnameSource,
+  resolveScopedRoutePathname,
   resolveRouteTemplateLocation,
   toRouteParamValue
 } from "./routeTemplateHelpers.js";
@@ -31,6 +31,7 @@ function resolveSavedRecordId(payload, saveRecordIdSelector) {
 function createAddEditUiRuntime({
   recordIdParam = "recordId",
   routeParams = null,
+  routeParamNames = null,
   routePath = "",
   routeRecordId = null,
   apiUrlTemplate = "",
@@ -63,10 +64,18 @@ function createAddEditUiRuntime({
         routeRecordId
       });
     sourceParams[normalizedRecordIdParam] = resolvedRecordId;
+    const currentPathname = resolveScopedRoutePathname({
+      currentPathname: routePath,
+      params: currentRouteParams,
+      orderedParamNames: routeParamNames,
+      anchorParamName: normalizedRecordIdParam,
+      anchorParamValue: resolvedRecordId,
+      anchorMode: "after"
+    });
 
     return resolveRouteTemplateLocation(normalizedTemplate, {
       params: sourceParams,
-      currentPathname: resolveRoutePathnameSource(routePath)
+      currentPathname
     });
   }
 

package/src/client/composables/crudLookupFieldLabelSupport.js

@@ -4,10 +4,13 @@ import { asPlainObject } from "./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
 };

package/src/client/composables/crudLookupFieldRuntime.js

@@ -66,7 +66,8 @@ function createSelectedLookupItem(selectedValue, selectedRecord = {}, entry = {}
   const label = displayValue == null || displayValue === "" ? value : displayValue;
   return {
     value,
-    label: String(label ?? "")
+    label: String(label ?? ""),
+    record: hydratedLookup
   };
 }
 
@@ -161,12 +162,14 @@ function createCrudLookupFieldRuntime({
     }
 
     const items = (Array.isArray(entry.runtime.items) ? entry.runtime.items : []).map((item = {}) => {
+      const sourceRecord = asPlainObject(item);
       const value = normalizeLookupValue(item?.[entry.valueKey]);
       const resolvedLabel = resolveLookupItemLabel(item, entry.labelKey);
       const label = resolvedLabel || value;
       return {
         value,
-        label: String(label ?? "")
+        label: String(label ?? ""),
+        record: sourceRecord
       };
     });