@open-mercato/shared 0.6.7-develop.6661.1.0043ed1d03 → 0.6.7-develop.6670.1.4efa7961c6

package/dist/lib/encryption/customFieldValues.js

@@ -6,6 +6,7 @@ const STRING_TYPED_CUSTOM_FIELD_KINDS = /* @__PURE__ */ new Set([
   "select",
   "currency",
   "dictionary",
+  "phone",
   "email",
   "url",
   "string"

package/dist/lib/encryption/customFieldValues.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/encryption/customFieldValues.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { encryptWithAesGcm, decryptWithAesGcm } from './aes'\nimport { TenantDataEncryptionService } from './tenantDataEncryptionService'\n\n/**\n * Custom field kinds that ALWAYS round-trip as a string. The encrypt path\n * stores raw strings unwrapped, so blindly running `JSON.parse` on the\n * decrypted payload coerces text values like `\"123\"` or `\"true\"` back into\n * numbers/booleans (issue #1734). For these kinds, callers MUST pass the\n * `kind` option so we keep the decrypted value as a string.\n *\n * Numeric (`integer`/`float`) and `boolean` kinds rely on JSON round-trip\n * because the encrypt path JSON-stringifies the typed value before storage.\n * Omitting the kind preserves legacy round-trip behavior for backward\n * compatibility.\n */\nconst STRING_TYPED_CUSTOM_FIELD_KINDS = new Set([\n  'text',\n  'multiline',\n  'select',\n  'currency',\n  'dictionary',\n  'email',\n  'url',\n  'string',\n])\n\nexport type DecryptCustomFieldOptions = {\n  /** Field kind, e.g. from `CustomFieldDef.kind`. When string-typed, the helper preserves the decrypted string verbatim. */\n  kind?: string | null\n}\n\nfunction shouldPreserveAsString(kind: string | null | undefined): boolean {\n  if (!kind) return false\n  return STRING_TYPED_CUSTOM_FIELD_KINDS.has(kind)\n}\n\nconst serviceCache = new WeakMap<EntityManager, TenantDataEncryptionService>()\n\nexport function resolveTenantEncryptionService(\n  em: EntityManager,\n  provided?: TenantDataEncryptionService | null,\n): TenantDataEncryptionService | null {\n  if (provided) return provided\n  const cached = serviceCache.get(em)\n  if (cached) return cached\n  const service = new TenantDataEncryptionService(em as any)\n  serviceCache.set(em, service)\n  return service\n}\n\nasync function resolveDekKey(\n  service: TenantDataEncryptionService | null,\n  tenantId: string | null | undefined,\n  cache?: Map<string | null, string | null>,\n  opts?: { createIfMissing?: boolean },\n): Promise<string | null> {\n  const scopedTenantId = tenantId ?? null\n  if (!service || !service.isEnabled() || !scopedTenantId) return null\n  if (cache?.has(scopedTenantId)) return cache.get(scopedTenantId) ?? null\n  const dek = await service.getDek(scopedTenantId)\n  let key = dek?.key ?? null\n  if (!key && opts?.createIfMissing && typeof service.createDek === 'function') {\n    const created = await service.createDek(scopedTenantId)\n    key = created?.key ?? null\n  }\n  cache?.set(scopedTenantId, key)\n  return key\n}\n\nexport async function encryptCustomFieldValue(\n  value: unknown,\n  tenantId: string | null | undefined,\n  service: TenantDataEncryptionService | null,\n  cache?: Map<string | null, string | null>,\n): Promise<unknown> {\n  if (value === undefined || value === null) return value\n  const key = await resolveDekKey(service, tenantId, cache, { createIfMissing: true })\n  if (!key) return value\n  const serialized = typeof value === 'string' ? value : JSON.stringify(value)\n  return encryptWithAesGcm(serialized, key).value\n}\n\nexport async function decryptCustomFieldValue(\n  value: unknown,\n  tenantId: string | null | undefined,\n  service: TenantDataEncryptionService | null,\n  cache?: Map<string | null, string | null>,\n  options?: DecryptCustomFieldOptions,\n): Promise<unknown> {\n  if (value === undefined || value === null || typeof value !== 'string') return value\n  const key = await resolveDekKey(service, tenantId, cache)\n  if (!key) return value\n  const decrypted = decryptWithAesGcm(value, key)\n  if (decrypted === null) return value\n  if (shouldPreserveAsString(options?.kind ?? null)) return decrypted\n  try {\n    return JSON.parse(decrypted)\n  } catch {\n    return decrypted\n  }\n}\n"],
-  "mappings": "AACA,SAAS,mBAAmB,yBAAyB;AACrD,SAAS,mCAAmC;AAc5C,MAAM,kCAAkC,oBAAI,IAAI;AAAA,EAC9C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAOD,SAAS,uBAAuB,MAA0C;AACxE,MAAI,CAAC,KAAM,QAAO;AAClB,SAAO,gCAAgC,IAAI,IAAI;AACjD;AAEA,MAAM,eAAe,oBAAI,QAAoD;AAEtE,SAAS,+BACd,IACA,UACoC;AACpC,MAAI,SAAU,QAAO;AACrB,QAAM,SAAS,aAAa,IAAI,EAAE;AAClC,MAAI,OAAQ,QAAO;AACnB,QAAM,UAAU,IAAI,4BAA4B,EAAS;AACzD,eAAa,IAAI,IAAI,OAAO;AAC5B,SAAO;AACT;AAEA,eAAe,cACb,SACA,UACA,OACA,MACwB;AACxB,QAAM,iBAAiB,YAAY;AACnC,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU,KAAK,CAAC,eAAgB,QAAO;AAChE,MAAI,OAAO,IAAI,cAAc,EAAG,QAAO,MAAM,IAAI,cAAc,KAAK;AACpE,QAAM,MAAM,MAAM,QAAQ,OAAO,cAAc;AAC/C,MAAI,MAAM,KAAK,OAAO;AACtB,MAAI,CAAC,OAAO,MAAM,mBAAmB,OAAO,QAAQ,cAAc,YAAY;AAC5E,UAAM,UAAU,MAAM,QAAQ,UAAU,cAAc;AACtD,UAAM,SAAS,OAAO;AAAA,EACxB;AACA,SAAO,IAAI,gBAAgB,GAAG;AAC9B,SAAO;AACT;AAEA,eAAsB,wBACpB,OACA,UACA,SACA,OACkB;AAClB,MAAI,UAAU,UAAa,UAAU,KAAM,QAAO;AAClD,QAAM,MAAM,MAAM,cAAc,SAAS,UAAU,OAAO,EAAE,iBAAiB,KAAK,CAAC;AACnF,MAAI,CAAC,IAAK,QAAO;AACjB,QAAM,aAAa,OAAO,UAAU,WAAW,QAAQ,KAAK,UAAU,KAAK;AAC3E,SAAO,kBAAkB,YAAY,GAAG,EAAE;AAC5C;AAEA,eAAsB,wBACpB,OACA,UACA,SACA,OACA,SACkB;AAClB,MAAI,UAAU,UAAa,UAAU,QAAQ,OAAO,UAAU,SAAU,QAAO;AAC/E,QAAM,MAAM,MAAM,cAAc,SAAS,UAAU,KAAK;AACxD,MAAI,CAAC,IAAK,QAAO;AACjB,QAAM,YAAY,kBAAkB,OAAO,GAAG;AAC9C,MAAI,cAAc,KAAM,QAAO;AAC/B,MAAI,uBAAuB,SAAS,QAAQ,IAAI,EAAG,QAAO;AAC1D,MAAI;AACF,WAAO,KAAK,MAAM,SAAS;AAAA,EAC7B,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { encryptWithAesGcm, decryptWithAesGcm } from './aes'\nimport { TenantDataEncryptionService } from './tenantDataEncryptionService'\n\n/**\n * Custom field kinds that ALWAYS round-trip as a string. The encrypt path\n * stores raw strings unwrapped, so blindly running `JSON.parse` on the\n * decrypted payload coerces text values like `\"123\"` or `\"true\"` back into\n * numbers/booleans (issue #1734). For these kinds, callers MUST pass the\n * `kind` option so we keep the decrypted value as a string.\n *\n * Numeric (`integer`/`float`) and `boolean` kinds rely on JSON round-trip\n * because the encrypt path JSON-stringifies the typed value before storage.\n * Omitting the kind preserves legacy round-trip behavior for backward\n * compatibility.\n */\nconst STRING_TYPED_CUSTOM_FIELD_KINDS = new Set([\n  'text',\n  'multiline',\n  'select',\n  'currency',\n  'dictionary',\n  'phone',\n  'email',\n  'url',\n  'string',\n])\n\nexport type DecryptCustomFieldOptions = {\n  /** Field kind, e.g. from `CustomFieldDef.kind`. When string-typed, the helper preserves the decrypted string verbatim. */\n  kind?: string | null\n}\n\nfunction shouldPreserveAsString(kind: string | null | undefined): boolean {\n  if (!kind) return false\n  return STRING_TYPED_CUSTOM_FIELD_KINDS.has(kind)\n}\n\nconst serviceCache = new WeakMap<EntityManager, TenantDataEncryptionService>()\n\nexport function resolveTenantEncryptionService(\n  em: EntityManager,\n  provided?: TenantDataEncryptionService | null,\n): TenantDataEncryptionService | null {\n  if (provided) return provided\n  const cached = serviceCache.get(em)\n  if (cached) return cached\n  const service = new TenantDataEncryptionService(em as any)\n  serviceCache.set(em, service)\n  return service\n}\n\nasync function resolveDekKey(\n  service: TenantDataEncryptionService | null,\n  tenantId: string | null | undefined,\n  cache?: Map<string | null, string | null>,\n  opts?: { createIfMissing?: boolean },\n): Promise<string | null> {\n  const scopedTenantId = tenantId ?? null\n  if (!service || !service.isEnabled() || !scopedTenantId) return null\n  if (cache?.has(scopedTenantId)) return cache.get(scopedTenantId) ?? null\n  const dek = await service.getDek(scopedTenantId)\n  let key = dek?.key ?? null\n  if (!key && opts?.createIfMissing && typeof service.createDek === 'function') {\n    const created = await service.createDek(scopedTenantId)\n    key = created?.key ?? null\n  }\n  cache?.set(scopedTenantId, key)\n  return key\n}\n\nexport async function encryptCustomFieldValue(\n  value: unknown,\n  tenantId: string | null | undefined,\n  service: TenantDataEncryptionService | null,\n  cache?: Map<string | null, string | null>,\n): Promise<unknown> {\n  if (value === undefined || value === null) return value\n  const key = await resolveDekKey(service, tenantId, cache, { createIfMissing: true })\n  if (!key) return value\n  const serialized = typeof value === 'string' ? value : JSON.stringify(value)\n  return encryptWithAesGcm(serialized, key).value\n}\n\nexport async function decryptCustomFieldValue(\n  value: unknown,\n  tenantId: string | null | undefined,\n  service: TenantDataEncryptionService | null,\n  cache?: Map<string | null, string | null>,\n  options?: DecryptCustomFieldOptions,\n): Promise<unknown> {\n  if (value === undefined || value === null || typeof value !== 'string') return value\n  const key = await resolveDekKey(service, tenantId, cache)\n  if (!key) return value\n  const decrypted = decryptWithAesGcm(value, key)\n  if (decrypted === null) return value\n  if (shouldPreserveAsString(options?.kind ?? null)) return decrypted\n  try {\n    return JSON.parse(decrypted)\n  } catch {\n    return decrypted\n  }\n}\n"],
+  "mappings": "AACA,SAAS,mBAAmB,yBAAyB;AACrD,SAAS,mCAAmC;AAc5C,MAAM,kCAAkC,oBAAI,IAAI;AAAA,EAC9C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAOD,SAAS,uBAAuB,MAA0C;AACxE,MAAI,CAAC,KAAM,QAAO;AAClB,SAAO,gCAAgC,IAAI,IAAI;AACjD;AAEA,MAAM,eAAe,oBAAI,QAAoD;AAEtE,SAAS,+BACd,IACA,UACoC;AACpC,MAAI,SAAU,QAAO;AACrB,QAAM,SAAS,aAAa,IAAI,EAAE;AAClC,MAAI,OAAQ,QAAO;AACnB,QAAM,UAAU,IAAI,4BAA4B,EAAS;AACzD,eAAa,IAAI,IAAI,OAAO;AAC5B,SAAO;AACT;AAEA,eAAe,cACb,SACA,UACA,OACA,MACwB;AACxB,QAAM,iBAAiB,YAAY;AACnC,MAAI,CAAC,WAAW,CAAC,QAAQ,UAAU,KAAK,CAAC,eAAgB,QAAO;AAChE,MAAI,OAAO,IAAI,cAAc,EAAG,QAAO,MAAM,IAAI,cAAc,KAAK;AACpE,QAAM,MAAM,MAAM,QAAQ,OAAO,cAAc;AAC/C,MAAI,MAAM,KAAK,OAAO;AACtB,MAAI,CAAC,OAAO,MAAM,mBAAmB,OAAO,QAAQ,cAAc,YAAY;AAC5E,UAAM,UAAU,MAAM,QAAQ,UAAU,cAAc;AACtD,UAAM,SAAS,OAAO;AAAA,EACxB;AACA,SAAO,IAAI,gBAAgB,GAAG;AAC9B,SAAO;AACT;AAEA,eAAsB,wBACpB,OACA,UACA,SACA,OACkB;AAClB,MAAI,UAAU,UAAa,UAAU,KAAM,QAAO;AAClD,QAAM,MAAM,MAAM,cAAc,SAAS,UAAU,OAAO,EAAE,iBAAiB,KAAK,CAAC;AACnF,MAAI,CAAC,IAAK,QAAO;AACjB,QAAM,aAAa,OAAO,UAAU,WAAW,QAAQ,KAAK,UAAU,KAAK;AAC3E,SAAO,kBAAkB,YAAY,GAAG,EAAE;AAC5C;AAEA,eAAsB,wBACpB,OACA,UACA,SACA,OACA,SACkB;AAClB,MAAI,UAAU,UAAa,UAAU,QAAQ,OAAO,UAAU,SAAU,QAAO;AAC/E,QAAM,MAAM,MAAM,cAAc,SAAS,UAAU,KAAK;AACxD,MAAI,CAAC,IAAK,QAAO;AACjB,QAAM,YAAY,kBAAkB,OAAO,GAAG;AAC9C,MAAI,cAAc,KAAM,QAAO;AAC/B,MAAI,uBAAuB,SAAS,QAAQ,IAAI,EAAG,QAAO;AAC1D,MAAI;AACF,WAAO,KAAK,MAAM,SAAS;AAAA,EAC7B,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
   "names": []
 }

package/dist/lib/frontend/organizationEvents.js

@@ -4,6 +4,7 @@ let currentScope = {
   tenantId: null
 };
 let currentVersion = 0;
+let hasEmitted = false;
 function getCurrentOrganizationScope() {
   return { ...currentScope };
 }
@@ -13,11 +14,15 @@ function getCurrentOrganizationScopeVersion() {
 function emitOrganizationScopeChanged(detail) {
   if (typeof window === "undefined" || typeof CustomEvent === "undefined") return;
   const hasChanged = currentScope.organizationId !== detail.organizationId || currentScope.tenantId !== detail.tenantId;
+  const isFirstEmit = !hasEmitted;
   currentScope = { ...detail };
+  hasEmitted = true;
   if (hasChanged) {
     currentVersion++;
   }
-  window.dispatchEvent(new CustomEvent(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }));
+  if (hasChanged || isFirstEmit) {
+    window.dispatchEvent(new CustomEvent(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }));
+  }
 }
 function subscribeOrganizationScopeChanged(handler) {
   if (typeof window === "undefined") return () => {

package/dist/lib/frontend/organizationEvents.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/frontend/organizationEvents.ts"],
-  "sourcesContent": ["export const ORGANIZATION_SCOPE_CHANGED_EVENT = 'om:organization-scope-changed'\n\nexport type OrganizationScopeChangedDetail = {\n  organizationId: string | null\n  tenantId: string | null\n}\n\n// Module-level state to track current scope and version\nlet currentScope: OrganizationScopeChangedDetail = { \n  organizationId: null, \n  tenantId: null \n}\nlet currentVersion = 0\n\nexport function getCurrentOrganizationScope(): OrganizationScopeChangedDetail {\n  return { ...currentScope }\n}\n\nexport function getCurrentOrganizationScopeVersion(): number {\n  return currentVersion\n}\n\nexport function emitOrganizationScopeChanged(detail: OrganizationScopeChangedDetail): void {\n  if (typeof window === 'undefined' || typeof CustomEvent === 'undefined') return\n  \n  // Detect actual changes\n  const hasChanged = \n    currentScope.organizationId !== detail.organizationId ||\n    currentScope.tenantId !== detail.tenantId\n  \n  // Update module-level state\n  currentScope = { ...detail }\n  \n  // Increment version only if actual change detected\n  if (hasChanged) {\n    currentVersion++\n  }\n  \n  // Emit event\n  window.dispatchEvent(new CustomEvent<OrganizationScopeChangedDetail>(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }))\n}\n\nexport function subscribeOrganizationScopeChanged(\n  handler: (detail: OrganizationScopeChangedDetail) => void\n): () => void {\n  if (typeof window === 'undefined') return () => {}\n  const listener = (event: Event) => {\n    const detail = (event as CustomEvent<OrganizationScopeChangedDetail>).detail ?? { organizationId: null, tenantId: null }\n    handler(detail)\n  }\n  window.addEventListener(ORGANIZATION_SCOPE_CHANGED_EVENT, listener as EventListener)\n  return () => {\n    window.removeEventListener(ORGANIZATION_SCOPE_CHANGED_EVENT, listener as EventListener)\n  }\n}\n"],
-  "mappings": "AAAO,MAAM,mCAAmC;AAQhD,IAAI,eAA+C;AAAA,EACjD,gBAAgB;AAAA,EAChB,UAAU;AACZ;AACA,IAAI,iBAAiB;AAEd,SAAS,8BAA8D;AAC5E,SAAO,EAAE,GAAG,aAAa;AAC3B;AAEO,SAAS,qCAA6C;AAC3D,SAAO;AACT;AAEO,SAAS,6BAA6B,QAA8C;AACzF,MAAI,OAAO,WAAW,eAAe,OAAO,gBAAgB,YAAa;AAGzE,QAAM,aACJ,aAAa,mBAAmB,OAAO,kBACvC,aAAa,aAAa,OAAO;AAGnC,iBAAe,EAAE,GAAG,OAAO;AAG3B,MAAI,YAAY;AACd;AAAA,EACF;AAGA,SAAO,cAAc,IAAI,YAA4C,kCAAkC,EAAE,OAAO,CAAC,CAAC;AACpH;AAEO,SAAS,kCACd,SACY;AACZ,MAAI,OAAO,WAAW,YAAa,QAAO,MAAM;AAAA,EAAC;AACjD,QAAM,WAAW,CAAC,UAAiB;AACjC,UAAM,SAAU,MAAsD,UAAU,EAAE,gBAAgB,MAAM,UAAU,KAAK;AACvH,YAAQ,MAAM;AAAA,EAChB;AACA,SAAO,iBAAiB,kCAAkC,QAAyB;AACnF,SAAO,MAAM;AACX,WAAO,oBAAoB,kCAAkC,QAAyB;AAAA,EACxF;AACF;",
+  "sourcesContent": ["export const ORGANIZATION_SCOPE_CHANGED_EVENT = 'om:organization-scope-changed'\n\nexport type OrganizationScopeChangedDetail = {\n  organizationId: string | null\n  tenantId: string | null\n}\n\n// Module-level state to track current scope and version\nlet currentScope: OrganizationScopeChangedDetail = { \n  organizationId: null, \n  tenantId: null \n}\nlet currentVersion = 0\nlet hasEmitted = false\n\nexport function getCurrentOrganizationScope(): OrganizationScopeChangedDetail {\n  return { ...currentScope }\n}\n\nexport function getCurrentOrganizationScopeVersion(): number {\n  return currentVersion\n}\n\nexport function emitOrganizationScopeChanged(detail: OrganizationScopeChangedDetail): void {\n  if (typeof window === 'undefined' || typeof CustomEvent === 'undefined') return\n  \n  // Detect actual changes\n  const hasChanged = \n    currentScope.organizationId !== detail.organizationId ||\n    currentScope.tenantId !== detail.tenantId\n  // Guard so the very first emission always syncs subscribers, even when the\n  // initial scope matches the default all-orgs `{ null, null }` state.\n  const isFirstEmit = !hasEmitted\n  \n  // Update module-level state\n  currentScope = { ...detail }\n  hasEmitted = true\n  \n  // Increment version only if actual change detected\n  if (hasChanged) {\n    currentVersion++\n  }\n  \n  // Only dispatch on real scope changes (or the first emission). Suppressing\n  // no-op re-emits avoids spurious DataTable refreshes, chrome refetches, and\n  // scope-hook churn when navigating between pages with the same scope.\n  if (hasChanged || isFirstEmit) {\n    window.dispatchEvent(new CustomEvent<OrganizationScopeChangedDetail>(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }))\n  }\n}\n\nexport function subscribeOrganizationScopeChanged(\n  handler: (detail: OrganizationScopeChangedDetail) => void\n): () => void {\n  if (typeof window === 'undefined') return () => {}\n  const listener = (event: Event) => {\n    const detail = (event as CustomEvent<OrganizationScopeChangedDetail>).detail ?? { organizationId: null, tenantId: null }\n    handler(detail)\n  }\n  window.addEventListener(ORGANIZATION_SCOPE_CHANGED_EVENT, listener as EventListener)\n  return () => {\n    window.removeEventListener(ORGANIZATION_SCOPE_CHANGED_EVENT, listener as EventListener)\n  }\n}\n"],
+  "mappings": "AAAO,MAAM,mCAAmC;AAQhD,IAAI,eAA+C;AAAA,EACjD,gBAAgB;AAAA,EAChB,UAAU;AACZ;AACA,IAAI,iBAAiB;AACrB,IAAI,aAAa;AAEV,SAAS,8BAA8D;AAC5E,SAAO,EAAE,GAAG,aAAa;AAC3B;AAEO,SAAS,qCAA6C;AAC3D,SAAO;AACT;AAEO,SAAS,6BAA6B,QAA8C;AACzF,MAAI,OAAO,WAAW,eAAe,OAAO,gBAAgB,YAAa;AAGzE,QAAM,aACJ,aAAa,mBAAmB,OAAO,kBACvC,aAAa,aAAa,OAAO;AAGnC,QAAM,cAAc,CAAC;AAGrB,iBAAe,EAAE,GAAG,OAAO;AAC3B,eAAa;AAGb,MAAI,YAAY;AACd;AAAA,EACF;AAKA,MAAI,cAAc,aAAa;AAC7B,WAAO,cAAc,IAAI,YAA4C,kCAAkC,EAAE,OAAO,CAAC,CAAC;AAAA,EACpH;AACF;AAEO,SAAS,kCACd,SACY;AACZ,MAAI,OAAO,WAAW,YAAa,QAAO,MAAM;AAAA,EAAC;AACjD,QAAM,WAAW,CAAC,UAAiB;AACjC,UAAM,SAAU,MAAsD,UAAU,EAAE,gBAAgB,MAAM,UAAU,KAAK;AACvH,YAAQ,MAAM;AAAA,EAChB;AACA,SAAO,iBAAiB,kCAAkC,QAAyB;AACnF,SAAO,MAAM;AACX,WAAO,oBAAoB,kCAAkC,QAAyB;AAAA,EACxF;AACF;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.6.7-develop.6661.1.0043ed1d03";
+const APP_VERSION = "0.6.7-develop.6670.1.4efa7961c6";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.7-develop.6661.1.0043ed1d03'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.7-develop.6670.1.4efa7961c6'\nexport const appVersion = APP_VERSION\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/dist/modules/dsl.js

@@ -15,6 +15,7 @@ const cf = {
   boolean: (key, opts = {}) => ({ key, kind: "boolean", ...opts }),
   select: (key, options, opts = {}) => ({ key, kind: "select", options, ...opts }),
   currency: (key, opts = {}) => ({ key, kind: "currency", ...opts }),
+  phone: (key, opts = {}) => ({ key, kind: "phone", ...opts }),
   date: (key, opts = {}) => ({ key, kind: "date", ...opts }),
   datetime: (key, opts = {}) => ({ key, kind: "datetime", ...opts }),
   dictionary: (key, dictionaryId, opts = {}) => ({ key, kind: "dictionary", dictionaryId, ...opts })

package/dist/modules/dsl.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/modules/dsl.ts"],
-  "sourcesContent": ["import type { CustomFieldDefinition, CustomFieldSet, EntityExtension, EntityId } from '@open-mercato/shared/modules/entities'\n\nexport function entityId(moduleId: string, entity: string): EntityId {\n  return `${moduleId}:${entity}`\n}\n\nexport function linkable(moduleId: string, entities: string[]): Record<string, EntityId> {\n  return Object.fromEntries(entities.map((e) => [e, entityId(moduleId, e)]))\n}\n\nexport function defineLink(\n  base: EntityId,\n  extension: EntityId,\n  opts: Pick<EntityExtension, 'join' | 'cardinality' | 'required' | 'description'>\n): EntityExtension {\n  return { base, extension, ...opts }\n}\n\nexport const cf = {\n  text: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'text', ...opts }),\n  multiline: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'multiline', ...opts }),\n  integer: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'integer', ...opts }),\n  float: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'float', ...opts }),\n  boolean: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'boolean', ...opts }),\n  select: (key: string, options: string[], opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'options'> = {}): CustomFieldDefinition => ({ key, kind: 'select', options, ...opts }),\n  currency: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'currency', ...opts }),\n  date: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'date', ...opts }),\n  datetime: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'datetime', ...opts }),\n  dictionary: (key: string, dictionaryId: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'dictionaryId'> = {}): CustomFieldDefinition => ({ key, kind: 'dictionary', dictionaryId, ...opts }),\n}\n\nexport function defineFields(entity: EntityId, fields: CustomFieldDefinition[], source?: string): CustomFieldSet {\n  return { entity, fields, source }\n}\n"],
-  "mappings": "AAEO,SAAS,SAAS,UAAkB,QAA0B;AACnE,SAAO,GAAG,QAAQ,IAAI,MAAM;AAC9B;AAEO,SAAS,SAAS,UAAkB,UAA8C;AACvF,SAAO,OAAO,YAAY,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,UAAU,CAAC,CAAC,CAAC,CAAC;AAC3E;AAEO,SAAS,WACd,MACA,WACA,MACiB;AACjB,SAAO,EAAE,MAAM,WAAW,GAAG,KAAK;AACpC;AAEO,MAAM,KAAK;AAAA,EAChB,MAAM,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;AAAA,EACpI,WAAW,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,aAAa,GAAG,KAAK;AAAA,EAC9I,SAAS,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,WAAW,GAAG,KAAK;AAAA,EAC1I,OAAO,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,SAAS,GAAG,KAAK;AAAA,EACtI,SAAS,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,WAAW,GAAG,KAAK;AAAA,EAC1I,QAAQ,CAAC,KAAa,SAAmB,OAAgE,CAAC,OAA8B,EAAE,KAAK,MAAM,UAAU,SAAS,GAAG,KAAK;AAAA,EAChL,UAAU,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,YAAY,GAAG,KAAK;AAAA,EAC5I,MAAM,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;AAAA,EACpI,UAAU,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,YAAY,GAAG,KAAK;AAAA,EAC5I,YAAY,CAAC,KAAa,cAAsB,OAAqE,CAAC,OAA8B,EAAE,KAAK,MAAM,cAAc,cAAc,GAAG,KAAK;AACvM;AAEO,SAAS,aAAa,QAAkB,QAAiC,QAAiC;AAC/G,SAAO,EAAE,QAAQ,QAAQ,OAAO;AAClC;",
+  "sourcesContent": ["import type { CustomFieldDefinition, CustomFieldSet, EntityExtension, EntityId } from '@open-mercato/shared/modules/entities'\n\nexport function entityId(moduleId: string, entity: string): EntityId {\n  return `${moduleId}:${entity}`\n}\n\nexport function linkable(moduleId: string, entities: string[]): Record<string, EntityId> {\n  return Object.fromEntries(entities.map((e) => [e, entityId(moduleId, e)]))\n}\n\nexport function defineLink(\n  base: EntityId,\n  extension: EntityId,\n  opts: Pick<EntityExtension, 'join' | 'cardinality' | 'required' | 'description'>\n): EntityExtension {\n  return { base, extension, ...opts }\n}\n\nexport const cf = {\n  text: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'text', ...opts }),\n  multiline: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'multiline', ...opts }),\n  integer: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'integer', ...opts }),\n  float: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'float', ...opts }),\n  boolean: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'boolean', ...opts }),\n  select: (key: string, options: string[], opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'options'> = {}): CustomFieldDefinition => ({ key, kind: 'select', options, ...opts }),\n  currency: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'currency', ...opts }),\n  phone: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'phone', ...opts }),\n  date: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'date', ...opts }),\n  datetime: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'datetime', ...opts }),\n  dictionary: (key: string, dictionaryId: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'dictionaryId'> = {}): CustomFieldDefinition => ({ key, kind: 'dictionary', dictionaryId, ...opts }),\n}\n\nexport function defineFields(entity: EntityId, fields: CustomFieldDefinition[], source?: string): CustomFieldSet {\n  return { entity, fields, source }\n}\n"],
+  "mappings": "AAEO,SAAS,SAAS,UAAkB,QAA0B;AACnE,SAAO,GAAG,QAAQ,IAAI,MAAM;AAC9B;AAEO,SAAS,SAAS,UAAkB,UAA8C;AACvF,SAAO,OAAO,YAAY,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,UAAU,CAAC,CAAC,CAAC,CAAC;AAC3E;AAEO,SAAS,WACd,MACA,WACA,MACiB;AACjB,SAAO,EAAE,MAAM,WAAW,GAAG,KAAK;AACpC;AAEO,MAAM,KAAK;AAAA,EAChB,MAAM,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;AAAA,EACpI,WAAW,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,aAAa,GAAG,KAAK;AAAA,EAC9I,SAAS,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,WAAW,GAAG,KAAK;AAAA,EAC1I,OAAO,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,SAAS,GAAG,KAAK;AAAA,EACtI,SAAS,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,WAAW,GAAG,KAAK;AAAA,EAC1I,QAAQ,CAAC,KAAa,SAAmB,OAAgE,CAAC,OAA8B,EAAE,KAAK,MAAM,UAAU,SAAS,GAAG,KAAK;AAAA,EAChL,UAAU,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,YAAY,GAAG,KAAK;AAAA,EAC5I,OAAO,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,SAAS,GAAG,KAAK;AAAA,EACtI,MAAM,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;AAAA,EACpI,UAAU,CAAC,KAAa,OAAoD,CAAC,OAA8B,EAAE,KAAK,MAAM,YAAY,GAAG,KAAK;AAAA,EAC5I,YAAY,CAAC,KAAa,cAAsB,OAAqE,CAAC,OAA8B,EAAE,KAAK,MAAM,cAAc,cAAc,GAAG,KAAK;AACvM;AAEO,SAAS,aAAa,QAAkB,QAAiC,QAAiC;AAC/G,SAAO,EAAE,QAAQ,QAAQ,OAAO;AAClC;",
   "names": []
 }

package/dist/modules/entities/kinds.js

@@ -9,6 +9,7 @@ const CUSTOM_FIELD_KINDS = [
   "relation",
   "attachment",
   "dictionary",
+  "phone",
   "date",
   "datetime"
 ];

package/dist/modules/entities/kinds.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/modules/entities/kinds.ts"],
-  "sourcesContent": ["export const CUSTOM_FIELD_KINDS = [\n  'text',\n  'multiline',\n  'integer',\n  'float',\n  'boolean',\n  'select',\n  'currency',\n  'relation',\n  'attachment',\n  'dictionary',\n  'date',\n  'datetime',\n] as const\n\nexport type CustomFieldKind = typeof CUSTOM_FIELD_KINDS[number]\n\nexport function isCustomFieldKind(x: string): x is CustomFieldKind {\n  return (CUSTOM_FIELD_KINDS as readonly string[]).includes(x)\n}\n\nexport const CURRENCY_OPTIONS_URL = '/api/currencies/currencies/options'\n"],
-  "mappings": "AAAO,MAAM,qBAAqB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,SAAS,kBAAkB,GAAiC;AACjE,SAAQ,mBAAyC,SAAS,CAAC;AAC7D;AAEO,MAAM,uBAAuB;",
+  "sourcesContent": ["export const CUSTOM_FIELD_KINDS = [\n  'text',\n  'multiline',\n  'integer',\n  'float',\n  'boolean',\n  'select',\n  'currency',\n  'relation',\n  'attachment',\n  'dictionary',\n  'phone',\n  'date',\n  'datetime',\n] as const\n\nexport type CustomFieldKind = typeof CUSTOM_FIELD_KINDS[number]\n\nexport function isCustomFieldKind(x: string): x is CustomFieldKind {\n  return (CUSTOM_FIELD_KINDS as readonly string[]).includes(x)\n}\n\nexport const CURRENCY_OPTIONS_URL = '/api/currencies/currencies/options'\n"],
+  "mappings": "AAAO,MAAM,qBAAqB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,SAAS,kBAAkB,GAAiC;AACjE,SAAQ,mBAAyC,SAAS,CAAC;AAC7D;AAEO,MAAM,uBAAuB;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.6.7-develop.6661.1.0043ed1d03",
+  "version": "0.6.7-develop.6670.1.4efa7961c6",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -97,7 +97,7 @@
     "@mikro-orm/core": "^7.1.5",
     "@mikro-orm/decorators": "^7.1.5",
     "@mikro-orm/postgresql": "^7.1.5",
-    "@open-mercato/cache": "0.6.7-develop.6661.1.0043ed1d03",
+    "@open-mercato/cache": "0.6.7-develop.6670.1.4efa7961c6",
     "@types/sanitize-html": "^2.16.1",
     "dotenv": "^17.4.2",
     "pino": "^10.3.1",

package/src/lib/bootstrap/__tests__/dynamicLoader.cacheRecovery.test.ts

@@ -0,0 +1,150 @@
+/**
+ * @jest-environment node
+ *
+ * Regression guard for #4526: compileAndImport must await its dynamic import so
+ * an import-time rejection is caught by the surrounding try/catch and reaches
+ * the MikroORM v7 generated-cache recovery. Returning the promise unawaited let
+ * it settle after the try block had exited, so the reactive recovery was dead
+ * code for exactly the failure it exists to repair (a stale generated cache
+ * whose top-level `@mikro-orm/core` decorator import no longer resolves).
+ *
+ * generatedCacheRecovery is mocked here: it owns cache detection/deletion and is
+ * covered by its own tests, while these cases only assert how dynamicLoader
+ * reacts to a rejecting import. The recovery double rewrites the compiled
+ * sibling the way a real cache wipe plus recompile would, so the retry loads the
+ * refreshed module without invoking esbuild.
+ */
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { loadBootstrapData } from '../dynamicLoader'
+import {
+  ensureMikroOrmV7GeneratedCacheCompatibility,
+  recoverMikroOrmV7GeneratedCacheFromImportError,
+  type GeneratedCacheRecoveryResult,
+} from '../generatedCacheRecovery'
+
+jest.mock('../generatedCacheRecovery', () => ({
+  ensureMikroOrmV7GeneratedCacheCompatibility: jest.fn(),
+  recoverMikroOrmV7GeneratedCacheFromImportError: jest.fn(),
+}))
+
+const ensureCompatibilityMock = ensureMikroOrmV7GeneratedCacheCompatibility as jest.MockedFunction<
+  typeof ensureMikroOrmV7GeneratedCacheCompatibility
+>
+const recoverFromImportErrorMock = recoverMikroOrmV7GeneratedCacheFromImportError as jest.MockedFunction<
+  typeof recoverMikroOrmV7GeneratedCacheFromImportError
+>
+
+const NO_RECOVERY: GeneratedCacheRecoveryResult = { applied: false, deletedFiles: [], markerPath: null }
+const STALE_DECORATOR_IMPORT_ERROR =
+  "The requested module '@mikro-orm/core' does not provide an export named 'Entity'"
+
+const STALE_ENTITY_IDS_CACHE = `throw new SyntaxError(${JSON.stringify(STALE_DECORATOR_IMPORT_ERROR)})`
+const FRESH_ENTITY_IDS_CACHE = "module.exports = { E: { example: { todo: 'example:todo' } } }"
+
+const BASE_GENERATED_MODULES: Record<string, { ts: string; compiled: string }> = {
+  'modules.cli.generated': { ts: 'export const modules = []', compiled: 'module.exports = { modules: [] }' },
+  'entities.generated': { ts: 'export const entities = []', compiled: 'module.exports = { entities: [] }' },
+  'di.generated': { ts: 'export const diRegistrars = []', compiled: 'module.exports = { diRegistrars: [] }' },
+}
+
+let compiledCacheGeneration = 0
+
+function writeGeneratedModule(generatedDir: string, baseName: string, source: { ts: string; compiled: string }) {
+  fs.writeFileSync(path.join(generatedDir, `${baseName}.ts`), source.ts)
+  writeCompiledSibling(generatedDir, baseName, source.compiled)
+}
+
+/**
+ * Write the .mjs sibling with an mtime ahead of its .ts source so
+ * compileAndImport takes its cache path and never invokes esbuild. Each write
+ * advances the timestamp, which also gives the retry a distinct `?mtime=` import
+ * URL instead of the rejected module's cached one.
+ */
+function writeCompiledSibling(generatedDir: string, baseName: string, compiled: string) {
+  const compiledPath = path.join(generatedDir, `${baseName}.mjs`)
+  fs.writeFileSync(compiledPath, compiled)
+  compiledCacheGeneration += 1
+  const fresh = new Date(Date.now() + compiledCacheGeneration * 60_000)
+  fs.utimesSync(compiledPath, fresh, fresh)
+}
+
+function createAppRoot(entityIdsCache: string): string {
+  const appRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'om-bootstrap-4526-'))
+  const generatedDir = path.join(appRoot, '.mercato', 'generated')
+  fs.mkdirSync(generatedDir, { recursive: true })
+  for (const [baseName, source] of Object.entries(BASE_GENERATED_MODULES)) {
+    writeGeneratedModule(generatedDir, baseName, source)
+  }
+  writeGeneratedModule(generatedDir, 'entities.ids.generated', {
+    ts: 'export const E = {}',
+    compiled: entityIdsCache,
+  })
+  return appRoot
+}
+
+function recoverByRewritingCache(appRoot: string, compiled: string): GeneratedCacheRecoveryResult {
+  const generatedDir = path.join(appRoot, '.mercato', 'generated')
+  writeCompiledSibling(generatedDir, 'entities.ids.generated', compiled)
+  // Node busts its ESM cache through the `?mtime=` query compileAndImport
+  // appends; Jest's registry keys on the resolved path alone, so the retry would
+  // otherwise replay the rejected evaluation instead of the rewritten file.
+  jest.resetModules()
+  return {
+    applied: true,
+    deletedFiles: [path.join(generatedDir, 'entities.ids.generated.mjs')],
+    markerPath: path.join(generatedDir, '.mikro-orm-v7-cache-recovery.json'),
+  }
+}
+
+describe('compileAndImport — a rejecting import reaches the cache recovery (#4526)', () => {
+  const appRoots: string[] = []
+
+  beforeEach(() => {
+    ensureCompatibilityMock.mockReset()
+    recoverFromImportErrorMock.mockReset()
+    ensureCompatibilityMock.mockReturnValue(NO_RECOVERY)
+    recoverFromImportErrorMock.mockReturnValue(NO_RECOVERY)
+  })
+
+  afterAll(() => {
+    for (const appRoot of appRoots) {
+      fs.rmSync(appRoot, { recursive: true, force: true })
+    }
+  })
+
+  function createTrackedAppRoot(entityIdsCache: string): string {
+    const appRoot = createAppRoot(entityIdsCache)
+    appRoots.push(appRoot)
+    return appRoot
+  }
+
+  it('recovers the stale cache and loads the refreshed module', async () => {
+    const appRoot = createTrackedAppRoot(STALE_ENTITY_IDS_CACHE)
+    recoverFromImportErrorMock.mockImplementation(() => recoverByRewritingCache(appRoot, FRESH_ENTITY_IDS_CACHE))
+
+    const data = await loadBootstrapData(appRoot)
+
+    expect(data.entityIds).toEqual({ example: { todo: 'example:todo' } })
+    expect(recoverFromImportErrorMock).toHaveBeenCalledTimes(1)
+    const [recoveryAppRoot, recoveryError] = recoverFromImportErrorMock.mock.calls[0]
+    expect(recoveryAppRoot).toBe(appRoot)
+    expect(String((recoveryError as Error).message)).toContain(STALE_DECORATOR_IMPORT_ERROR)
+  })
+
+  it('propagates the import error when no recovery applies', async () => {
+    const appRoot = createTrackedAppRoot(STALE_ENTITY_IDS_CACHE)
+
+    await expect(loadBootstrapData(appRoot)).rejects.toThrow(STALE_DECORATOR_IMPORT_ERROR)
+    expect(recoverFromImportErrorMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('retries at most once when the refreshed cache still fails to import', async () => {
+    const appRoot = createTrackedAppRoot(STALE_ENTITY_IDS_CACHE)
+    recoverFromImportErrorMock.mockImplementation(() => recoverByRewritingCache(appRoot, STALE_ENTITY_IDS_CACHE))
+
+    await expect(loadBootstrapData(appRoot)).rejects.toThrow(STALE_DECORATOR_IMPORT_ERROR)
+    expect(recoverFromImportErrorMock).toHaveBeenCalledTimes(1)
+  })
+})

package/src/lib/bootstrap/dynamicLoader.ts

@@ -91,7 +91,7 @@ async function compileAndImport(tsPath: string, allowRecovery: boolean = true):
   // Import the compiled JavaScript
   try {
     const fileUrl = `${pathToFileURL(jsPath).href}?mtime=${fs.statSync(jsPath).mtimeMs}`
-    return import(fileUrl)
+    return await import(fileUrl)
   } catch (error) {
     if (!allowRecovery) {
       throw error

package/src/lib/commands/__tests__/command-bus.cache.test.ts

@@ -26,6 +26,7 @@ describe('CommandBus cache invalidation for sales documents', () => {
   afterEach(() => {
     unregisterCommand('sales.orders.update')
     unregisterCommand('sales.orders.noop-update')
+    unregisterCommand('wms.warehouses.create')
     invalidateMock.mockClear()
   })
 
@@ -194,4 +195,49 @@ describe('CommandBus cache invalidation for sales documents', () => {
       expect.any(Array)
     )
   })
+
+  it('resolves record id from warehouseId-style command results for cache tags', async () => {
+    const logMock = jest.fn(async () => ({ id: 'log-entry' }))
+
+    registerCommand({
+      id: 'wms.warehouses.create',
+      execute: jest.fn(async () => ({ warehouseId: 'warehouse-uuid-1' })),
+      buildLog: jest.fn(() => ({
+        actionLabel: 'Create warehouse',
+        resourceKind: 'wms.warehouse',
+        tenantId: 'tenant-1',
+        organizationId: 'org-1',
+      })),
+    })
+
+    const container = createContainer({ injectionMode: InjectionMode.CLASSIC })
+    container.register({
+      actionLogService: asValue({
+        log: logMock,
+        findByUndoToken: jest.fn(async () => null),
+        markUndone: jest.fn(async () => {}),
+      }),
+      dataEngine: asValue({ flushOrmEntityChanges: jest.fn() }),
+    })
+
+    const bus = new CommandBus()
+    const ctx = {
+      container,
+      auth: { sub: 'user-1', tenantId: 'tenant-1', orgId: 'org-1' },
+      organizationScope: null,
+      selectedOrganizationId: 'org-1',
+      organizationIds: null,
+    }
+
+    await bus.execute('wms.warehouses.create', { input: {}, ctx })
+
+    expect(invalidateMock).toHaveBeenCalledWith(
+      container,
+      'wms.warehouse',
+      { id: 'warehouse-uuid-1', organizationId: 'org-1', tenantId: 'tenant-1' },
+      'tenant-1',
+      'command:wms.warehouses.create:execute',
+      expect.any(Array)
+    )
+  })
 })

package/src/lib/commands/command-bus.ts

@@ -48,6 +48,28 @@ function asRecord(input: unknown): Record<string, unknown> | null {
   return input as Record<string, unknown>
 }
 
+/** Command handlers often return domain keys (e.g. warehouseId) without `id`; cache invalidation must still resolve the record. */
+function extractPrimaryIdFromCommandResult(result: unknown): string | null {
+  const r = asRecord(result)
+  if (!r) return null
+  const direct = pickFirstIdentifier(r.id, r.entityId, r.recordId)
+  if (direct) return direct
+  for (const key of [
+    'warehouseId',
+    'zoneId',
+    'locationId',
+    'lotId',
+    'reservationId',
+    'profileId',
+    'movementId',
+    'balanceId',
+  ]) {
+    const v = r[key]
+    if (typeof v === 'string' && v.trim().length > 0) return v.trim()
+  }
+  return null
+}
+
 function toISOString(value: unknown): string | null {
   if (value instanceof Date) {
     const iso = value.toISOString()
@@ -584,6 +606,7 @@ export class CommandBus {
 
       const recordId = pickFirstIdentifier(
         metadata?.resourceId,
+        extractPrimaryIdFromCommandResult(result),
         resultRecord?.entityId,
         resultRecord?.id,
         resultRecord?.recordId,

package/src/lib/crud/factory.ts

@@ -228,6 +228,8 @@ export type ListConfig<TList> = {
    * filters/sorts, `search_tokens` fulltext filtering, and vector-search branches are bypassed.
    */
   omitAutomaticTenantOrgScope?: boolean
+  /** When true, skip server-side CRUD GET cache for this list (avoids stale empty payloads after mutations). */
+  disableListCache?: boolean
 }
 
 export type CrudExportColumnConfig = {
@@ -1461,7 +1463,8 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
       const exportFullRequested = exportRequested && (exportScope === 'full' || parseBooleanToken((queryParams as any).full) === true)
       profiler.mark('export_configured', { exportRequested, exportFullRequested })
 
-      const cacheEnabled = isCrudCacheEnabled() && !exportRequested
+      const cacheEnabled =
+        isCrudCacheEnabled() && !exportRequested && !opts.list?.disableListCache
       const cacheTimerStart = cacheEnabled && isCrudCacheDebugEnabled()
         ? process.hrtime.bigint()
         : null

package/src/lib/encryption/__tests__/customFieldValues.test.ts

@@ -79,6 +79,23 @@ describe('customFieldValues encryption helpers', () => {
     expect(await decryptCustomFieldValue(booleanText, 'tenant-1', service, cache, { kind: 'currency' })).toBe('true')
     expect(await decryptCustomFieldValue(booleanText, 'tenant-1', service, cache, { kind: 'dictionary' })).toBe('true')
     expect(await decryptCustomFieldValue(booleanText, 'tenant-1', service, cache, { kind: 'email' })).toBe('true')
+    expect(await decryptCustomFieldValue(booleanText, 'tenant-1', service, cache, { kind: 'phone' })).toBe('true')
+  })
+
+  it('keeps an all-digit phone value a string instead of coercing it to a number (#62)', async () => {
+    const service = {
+      isEnabled: () => true,
+      getDek: async () => ({ key: fixedKey }),
+    } as any
+    const cache = new Map<string | null, string | null>()
+
+    const digitsOnly = await encryptCustomFieldValue('15551234567', 'tenant-1', service, cache)
+    const decrypted = await decryptCustomFieldValue(digitsOnly, 'tenant-1', service, cache, { kind: 'phone' })
+    expect(decrypted).toBe('15551234567')
+    expect(typeof decrypted).toBe('string')
+
+    const formatted = await encryptCustomFieldValue('+1 212 555 1234', 'tenant-1', service, cache)
+    expect(await decryptCustomFieldValue(formatted, 'tenant-1', service, cache, { kind: 'phone' })).toBe('+1 212 555 1234')
   })
 
   it('still parses typed kinds (integer/float/boolean) so legacy round-trip stays correct', async () => {

package/src/lib/encryption/customFieldValues.ts

@@ -20,6 +20,7 @@ const STRING_TYPED_CUSTOM_FIELD_KINDS = new Set([
   'select',
   'currency',
   'dictionary',
+  'phone',
   'email',
   'url',
   'string',

package/src/lib/frontend/organizationEvents.ts

@@ -11,6 +11,7 @@ let currentScope: OrganizationScopeChangedDetail = {
   tenantId: null 
 }
 let currentVersion = 0
+let hasEmitted = false
 
 export function getCurrentOrganizationScope(): OrganizationScopeChangedDetail {
   return { ...currentScope }
@@ -27,17 +28,25 @@ export function emitOrganizationScopeChanged(detail: OrganizationScopeChangedDet
   const hasChanged = 
     currentScope.organizationId !== detail.organizationId ||
     currentScope.tenantId !== detail.tenantId
+  // Guard so the very first emission always syncs subscribers, even when the
+  // initial scope matches the default all-orgs `{ null, null }` state.
+  const isFirstEmit = !hasEmitted
   
   // Update module-level state
   currentScope = { ...detail }
+  hasEmitted = true
   
   // Increment version only if actual change detected
   if (hasChanged) {
     currentVersion++
   }
   
-  // Emit event
-  window.dispatchEvent(new CustomEvent<OrganizationScopeChangedDetail>(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }))
+  // Only dispatch on real scope changes (or the first emission). Suppressing
+  // no-op re-emits avoids spurious DataTable refreshes, chrome refetches, and
+  // scope-hook churn when navigating between pages with the same scope.
+  if (hasChanged || isFirstEmit) {
+    window.dispatchEvent(new CustomEvent<OrganizationScopeChangedDetail>(ORGANIZATION_SCOPE_CHANGED_EVENT, { detail }))
+  }
 }
 
 export function subscribeOrganizationScopeChanged(

package/src/modules/__tests__/dsl.test.ts

@@ -39,6 +39,18 @@ describe('DSL helpers', () => {
     expect(cf.datetime('seen_at')).toMatchObject({ key: 'seen_at', kind: 'datetime' })
   })
 
+  test('cf.phone helper produces a phone kind (#62)', () => {
+    expect(cf.phone('work_phone', { label: 'Work phone', formEditable: true })).toMatchObject({
+      key: 'work_phone',
+      kind: 'phone',
+      label: 'Work phone',
+      formEditable: true,
+    })
+    expect(CUSTOM_FIELD_KINDS).toContain('phone')
+    const phoneField: CustomFieldDefinition = { key: 'work_phone', kind: 'phone' }
+    expect(phoneField.kind).toBe('phone')
+  })
+
   test('CustomFieldKind type stays in sync with the runtime kinds list (#3042)', () => {
     // The CustomFieldKind type is derived from CUSTOM_FIELD_KINDS, so declaring a
     // field with any runtime kind — including date/datetime — must type-check.

package/src/modules/dsl.ts

@@ -24,6 +24,7 @@ export const cf = {
   boolean: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'boolean', ...opts }),
   select: (key: string, options: string[], opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'options'> = {}): CustomFieldDefinition => ({ key, kind: 'select', options, ...opts }),
   currency: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'currency', ...opts }),
+  phone: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'phone', ...opts }),
   date: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'date', ...opts }),
   datetime: (key: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind'> = {}): CustomFieldDefinition => ({ key, kind: 'datetime', ...opts }),
   dictionary: (key: string, dictionaryId: string, opts: Omit<CustomFieldDefinition, 'key' | 'kind' | 'dictionaryId'> = {}): CustomFieldDefinition => ({ key, kind: 'dictionary', dictionaryId, ...opts }),

package/src/modules/entities/kinds.ts

@@ -9,6 +9,7 @@ export const CUSTOM_FIELD_KINDS = [
   'relation',
   'attachment',
   'dictionary',
+  'phone',
   'date',
   'datetime',
 ] as const

package/src/modules/widgets/injection.ts

@@ -248,6 +248,13 @@ export type InjectionWidgetModule<TContext = unknown, TData = unknown> = {
 
 export type InjectionColumnDefinition = {
   id: string
+  /**
+   * i18n translation key for the column header.
+   * When present, consumers should call `t(headerKey, header)` instead of treating `header` as a key.
+   * Follows the same `label`/`labelKey` convention used by `InjectionFieldDefinition`.
+   */
+  headerKey?: string
+  /** Display text (and i18n fallback) for the column header. */
   header: string
   accessorKey: string
   cell?: (props: { getValue: () => unknown }) => ReactNode