@open-mercato/shared 0.6.6-develop.6460.1.f94c74174c → 0.6.6-develop.6471.1.9ab5bdd79a

package/dist/lib/commands/scope.js

@@ -2,6 +2,8 @@ import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
 import { isOrganizationAccessAllowed } from "@open-mercato/shared/lib/auth/organizationAccess";
 import { parseBooleanWithDefault } from "@open-mercato/shared/lib/boolean";
 import { env } from "process";
+import { createLogger } from "../logger/index.js";
+const logger = createLogger("shared").child({ component: "scope" });
 function buildScopeLogContext(ctx) {
   const requestInfo = ctx.request && typeof ctx.request === "object" ? {
     method: ctx.request.method ?? void 0,
@@ -29,7 +31,7 @@ function isStrictOrganizationScopeEnforced() {
 function logScopeViolation(ctx, expected, actual) {
   try {
     if (env.NODE_ENV !== "test") {
-      console.warn("[scope] Forbidden organization scope mismatch detected", {
+      logger.warn("Forbidden organization scope mismatch detected", {
         expectedId: expected,
         actualId: actual,
         ...buildScopeLogContext(ctx)
@@ -41,7 +43,7 @@ function logScopeViolation(ctx, expected, actual) {
 function logUnscopedOrganizationAccess(ctx, organizationId) {
   try {
     if (env.NODE_ENV !== "test") {
-      console.warn("[scope] Unscoped organization command executed without organization context", {
+      logger.warn("Unscoped organization command executed without organization context", {
         targetOrganizationId: organizationId,
         strictEnforcement: isStrictOrganizationScopeEnforced(),
         ...buildScopeLogContext(ctx)
@@ -53,7 +55,7 @@ function logUnscopedOrganizationAccess(ctx, organizationId) {
 function logTenantScopeViolation(ctx, expectedTenantId, actualTenantId) {
   try {
     if (env.NODE_ENV !== "test") {
-      console.warn("[scope] Forbidden tenant scope mismatch detected", {
+      logger.warn("Forbidden tenant scope mismatch detected", {
         expectedTenantId,
         actualTenantId,
         ...buildScopeLogContext(ctx)

package/dist/lib/commands/scope.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/commands/scope.ts"],
-  "sourcesContent": ["import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { isOrganizationAccessAllowed } from '@open-mercato/shared/lib/auth/organizationAccess'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\nimport { env } from 'process'\n\nfunction buildScopeLogContext(ctx: CommandRuntimeContext) {\n  const requestInfo =\n    ctx.request && typeof ctx.request === 'object'\n      ? {\n          method: (ctx.request as Request).method ?? undefined,\n          url: (ctx.request as Request).url ?? undefined,\n        }\n      : null\n  const scope = ctx.organizationScope\n    ? {\n        selectedId: ctx.organizationScope.selectedId ?? null,\n        tenantId: ctx.organizationScope.tenantId ?? null,\n        allowedIdsCount: Array.isArray(ctx.organizationScope.allowedIds)\n          ? ctx.organizationScope.allowedIds.length\n          : null,\n        filterIdsCount: Array.isArray(ctx.organizationScope.filterIds)\n          ? ctx.organizationScope.filterIds.length\n          : null,\n      }\n    : null\n  return {\n    userId: ctx.auth?.sub ?? null,\n    actorTenantId: ctx.auth?.tenantId ?? null,\n    actorOrganizationId: ctx.auth?.orgId ?? null,\n    selectedOrganizationId: ctx.selectedOrganizationId ?? null,\n    organizationIdsCount: Array.isArray(ctx.organizationIds) ? ctx.organizationIds.length : null,\n    scope,\n    request: requestInfo,\n  }\n}\n\nfunction isStrictOrganizationScopeEnforced(): boolean {\n  return parseBooleanWithDefault(env.OM_ENFORCE_ORG_SCOPE_STRICT, false)\n}\n\nfunction logScopeViolation(\n  ctx: CommandRuntimeContext,\n  expected: string,\n  actual: string | null\n): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      console.warn('[scope] Forbidden organization scope mismatch detected', {\n        expectedId: expected,\n        actualId: actual,\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nfunction logUnscopedOrganizationAccess(ctx: CommandRuntimeContext, organizationId: string): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      console.warn('[scope] Unscoped organization command executed without organization context', {\n        targetOrganizationId: organizationId,\n        strictEnforcement: isStrictOrganizationScopeEnforced(),\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nfunction logTenantScopeViolation(\n  ctx: CommandRuntimeContext,\n  expectedTenantId: string,\n  actualTenantId: string | null\n): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      console.warn('[scope] Forbidden tenant scope mismatch detected', {\n        expectedTenantId,\n        actualTenantId,\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nexport function ensureOrganizationScope(ctx: CommandRuntimeContext, organizationId: string): void {\n  const isSuperAdmin = ctx.auth?.isSuperAdmin === true\n  const scope = ctx.organizationScope\n\n  // Pattern C: when no organization scope was resolved (system/worker/non-user\n  // command contexts that build ctx with `organizationScope: null`), preserve\n  // the legacy currentOrg fallback. This branch is load-bearing \u2014 switching it\n  // to deny would break payment, scheduled-command, and other scope-less flows.\n  if (!scope) {\n    if (isSuperAdmin) return\n    const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n    if (currentOrg) {\n      if (currentOrg !== organizationId) {\n        logScopeViolation(ctx, organizationId, currentOrg)\n        throw new CrudHttpError(403, { error: 'Forbidden' })\n      }\n      return\n    }\n    // No current org could be resolved either. This branch previously returned\n    // with no validation and no signal \u2014 a fail-open-by-omission shape (#2441):\n    // a new command path reaching here with `organizationScope: null` would act\n    // on an arbitrary target org silently. Preserve the legacy allow behavior by\n    // default (the path is load-bearing) but make the unscoped access observable,\n    // and let operators harden it into a deny via OM_ENFORCE_ORG_SCOPE_STRICT.\n    if (organizationId) {\n      logUnscopedOrganizationAccess(ctx, organizationId)\n      if (isStrictOrganizationScopeEnforced()) {\n        throw new CrudHttpError(403, { error: 'Forbidden' })\n      }\n    }\n    return\n  }\n\n  if (!scope.tenantId && organizationId && ctx.auth && !isSuperAdmin) {\n    const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n    logScopeViolation(ctx, organizationId, currentOrg)\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n\n  if (\n    isOrganizationAccessAllowed({\n      isSuperAdmin,\n      allowedOrganizationIds: scope.allowedIds,\n      targetOrganizationId: organizationId,\n    })\n  ) {\n    return\n  }\n\n  const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n  logScopeViolation(ctx, organizationId, currentOrg)\n  throw new CrudHttpError(403, { error: 'Forbidden' })\n}\n\nexport function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {\n  const isSuperAdmin = ctx.auth?.isSuperAdmin === true\n  const currentTenant = ctx.auth?.tenantId ?? null\n  if (!currentTenant) {\n    if (tenantId && ctx.auth && !isSuperAdmin) {\n      logTenantScopeViolation(ctx, tenantId, currentTenant)\n      throw new CrudHttpError(403, { error: 'Forbidden' })\n    }\n    return\n  }\n  if (currentTenant !== tenantId) {\n    logTenantScopeViolation(ctx, tenantId, currentTenant)\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n}\n\nexport function ensureSameScope(\n  entity: Pick<{ organizationId: string; tenantId: string }, 'organizationId' | 'tenantId'>,\n  organizationId: string,\n  tenantId: string\n): void {\n  if (entity.organizationId !== organizationId || entity.tenantId !== tenantId) {\n    throw new CrudHttpError(403, { error: 'Cross-tenant relation forbidden' })\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { isOrganizationAccessAllowed } from '@open-mercato/shared/lib/auth/organizationAccess'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\nimport { env } from 'process'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'scope' })\n\nfunction buildScopeLogContext(ctx: CommandRuntimeContext) {\n  const requestInfo =\n    ctx.request && typeof ctx.request === 'object'\n      ? {\n          method: (ctx.request as Request).method ?? undefined,\n          url: (ctx.request as Request).url ?? undefined,\n        }\n      : null\n  const scope = ctx.organizationScope\n    ? {\n        selectedId: ctx.organizationScope.selectedId ?? null,\n        tenantId: ctx.organizationScope.tenantId ?? null,\n        allowedIdsCount: Array.isArray(ctx.organizationScope.allowedIds)\n          ? ctx.organizationScope.allowedIds.length\n          : null,\n        filterIdsCount: Array.isArray(ctx.organizationScope.filterIds)\n          ? ctx.organizationScope.filterIds.length\n          : null,\n      }\n    : null\n  return {\n    userId: ctx.auth?.sub ?? null,\n    actorTenantId: ctx.auth?.tenantId ?? null,\n    actorOrganizationId: ctx.auth?.orgId ?? null,\n    selectedOrganizationId: ctx.selectedOrganizationId ?? null,\n    organizationIdsCount: Array.isArray(ctx.organizationIds) ? ctx.organizationIds.length : null,\n    scope,\n    request: requestInfo,\n  }\n}\n\nfunction isStrictOrganizationScopeEnforced(): boolean {\n  return parseBooleanWithDefault(env.OM_ENFORCE_ORG_SCOPE_STRICT, false)\n}\n\nfunction logScopeViolation(\n  ctx: CommandRuntimeContext,\n  expected: string,\n  actual: string | null\n): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      logger.warn('Forbidden organization scope mismatch detected', {\n        expectedId: expected,\n        actualId: actual,\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nfunction logUnscopedOrganizationAccess(ctx: CommandRuntimeContext, organizationId: string): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      logger.warn('Unscoped organization command executed without organization context', {\n        targetOrganizationId: organizationId,\n        strictEnforcement: isStrictOrganizationScopeEnforced(),\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nfunction logTenantScopeViolation(\n  ctx: CommandRuntimeContext,\n  expectedTenantId: string,\n  actualTenantId: string | null\n): void {\n  try {\n    if (env.NODE_ENV !== 'test') {\n      logger.warn('Forbidden tenant scope mismatch detected', {\n        expectedTenantId,\n        actualTenantId,\n        ...buildScopeLogContext(ctx),\n      })\n    }\n  } catch {\n    // best-effort logging\n  }\n}\n\nexport function ensureOrganizationScope(ctx: CommandRuntimeContext, organizationId: string): void {\n  const isSuperAdmin = ctx.auth?.isSuperAdmin === true\n  const scope = ctx.organizationScope\n\n  // Pattern C: when no organization scope was resolved (system/worker/non-user\n  // command contexts that build ctx with `organizationScope: null`), preserve\n  // the legacy currentOrg fallback. This branch is load-bearing \u2014 switching it\n  // to deny would break payment, scheduled-command, and other scope-less flows.\n  if (!scope) {\n    if (isSuperAdmin) return\n    const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n    if (currentOrg) {\n      if (currentOrg !== organizationId) {\n        logScopeViolation(ctx, organizationId, currentOrg)\n        throw new CrudHttpError(403, { error: 'Forbidden' })\n      }\n      return\n    }\n    // No current org could be resolved either. This branch previously returned\n    // with no validation and no signal \u2014 a fail-open-by-omission shape (#2441):\n    // a new command path reaching here with `organizationScope: null` would act\n    // on an arbitrary target org silently. Preserve the legacy allow behavior by\n    // default (the path is load-bearing) but make the unscoped access observable,\n    // and let operators harden it into a deny via OM_ENFORCE_ORG_SCOPE_STRICT.\n    if (organizationId) {\n      logUnscopedOrganizationAccess(ctx, organizationId)\n      if (isStrictOrganizationScopeEnforced()) {\n        throw new CrudHttpError(403, { error: 'Forbidden' })\n      }\n    }\n    return\n  }\n\n  if (!scope.tenantId && organizationId && ctx.auth && !isSuperAdmin) {\n    const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n    logScopeViolation(ctx, organizationId, currentOrg)\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n\n  if (\n    isOrganizationAccessAllowed({\n      isSuperAdmin,\n      allowedOrganizationIds: scope.allowedIds,\n      targetOrganizationId: organizationId,\n    })\n  ) {\n    return\n  }\n\n  const currentOrg = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null\n  logScopeViolation(ctx, organizationId, currentOrg)\n  throw new CrudHttpError(403, { error: 'Forbidden' })\n}\n\nexport function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {\n  const isSuperAdmin = ctx.auth?.isSuperAdmin === true\n  const currentTenant = ctx.auth?.tenantId ?? null\n  if (!currentTenant) {\n    if (tenantId && ctx.auth && !isSuperAdmin) {\n      logTenantScopeViolation(ctx, tenantId, currentTenant)\n      throw new CrudHttpError(403, { error: 'Forbidden' })\n    }\n    return\n  }\n  if (currentTenant !== tenantId) {\n    logTenantScopeViolation(ctx, tenantId, currentTenant)\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n}\n\nexport function ensureSameScope(\n  entity: Pick<{ organizationId: string; tenantId: string }, 'organizationId' | 'tenantId'>,\n  organizationId: string,\n  tenantId: string\n): void {\n  if (entity.organizationId !== organizationId || entity.tenantId !== tenantId) {\n    throw new CrudHttpError(403, { error: 'Cross-tenant relation forbidden' })\n  }\n}\n"],
+  "mappings": "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",
   "names": ["currentOrg"]
 }

package/dist/lib/crud/advanced-filter-integration.js

@@ -5,6 +5,8 @@ import {
   convertAdvancedFilterToWhere
 } from "../query/advanced-filter.js";
 import { compileTreeToWhere } from "../query/advanced-filter-tree.js";
+import { createLogger } from "../logger/index.js";
+const logger = createLogger("shared").child({ component: "crud" });
 function splitOrClauses(filters) {
   const directFilters = {};
   let orClauses = null;
@@ -76,7 +78,7 @@ function consumeAdvancedFilterState(query) {
         const g = globalThis;
         if (!g[sentinel]) {
           g[sentinel] = true;
-          console.warn("[advanced-filter] legacy v1 URL detected; auto-upgraded to v2 tree");
+          logger.warn("Legacy v1 advanced-filter URL detected; auto-upgraded to v2 tree");
         }
       }
     }

package/dist/lib/crud/advanced-filter-integration.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/crud/advanced-filter-integration.ts"],
-  "sourcesContent": ["import {\n  deserializeAdvancedFilter,\n  deserializeTree,\n  flatToTree,\n  convertAdvancedFilterToWhere,\n} from '../query/advanced-filter'\nimport { compileTreeToWhere, type AdvancedFilterTree } from '../query/advanced-filter-tree'\n\nfunction splitOrClauses(filters: Record<string, unknown>): {\n  directFilters: Record<string, unknown>\n  orClauses: Record<string, unknown>[] | null\n} {\n  const directFilters: Record<string, unknown> = {}\n  let orClauses: Record<string, unknown>[] | null = null\n\n  for (const [key, value] of Object.entries(filters)) {\n    if (key === '$or' && Array.isArray(value)) {\n      orClauses = value.filter((entry): entry is Record<string, unknown> => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry))\n      continue\n    }\n    directFilters[key] = value\n  }\n\n  return { directFilters, orClauses }\n}\n\n/**\n * Parse advanced filter query params and merge with existing Where filters.\n * Call this in buildFilters callback to support advanced filter query params.\n */\nexport function mergeAdvancedFilters(\n  existingFilters: Record<string, unknown>,\n  query: Record<string, unknown>,\n): Record<string, unknown> {\n  const advancedState = deserializeAdvancedFilter(query)\n  if (!advancedState) return existingFilters\n\n  const advancedWhere = convertAdvancedFilterToWhere(advancedState)\n  if (!Object.keys(advancedWhere).length) return existingFilters\n\n  if ('$or' in advancedWhere) {\n    if (!Object.keys(existingFilters).length) return advancedWhere\n\n    const { directFilters: existingDirect, orClauses: existingOrClauses } = splitOrClauses(existingFilters)\n    const advancedClauses = Array.isArray((advancedWhere as { $or?: unknown }).$or)\n      ? ((advancedWhere as { $or: unknown[] }).$or).filter(\n          (entry): entry is Record<string, unknown> => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry),\n        )\n      : []\n\n    if (!advancedClauses.length) return existingFilters\n\n    if (!existingOrClauses?.length) {\n      return {\n        ...existingDirect,\n        $or: advancedClauses,\n      }\n    }\n\n    const combinedClauses: Record<string, unknown>[] = []\n    for (const leftClause of existingOrClauses) {\n      for (const rightClause of advancedClauses) {\n        combinedClauses.push({\n          ...leftClause,\n          ...rightClause,\n        })\n      }\n    }\n\n    return combinedClauses.length\n      ? {\n          ...existingDirect,\n          $or: combinedClauses,\n        }\n      : existingFilters\n  }\n\n  // AND logic: merge directly\n  return { ...existingFilters, ...advancedWhere }\n}\n\n/**\n * Combine route-side filters with an advanced filter tree by AND.\n *\n * The compiled tree may itself contain nested `$and`/`$or` \u2014 the query engine's\n * normalize step (`compileToDnf` in join-utils.ts) expands those into Disjunctive\n * Normal Form, so the engine sees a single OR group with disjuncts that AND'd\n * leaves. Common-clause lifting in normalize keeps shared predicates ungrouped\n * (preserving the search-tokens optimization).\n */\nexport function mergeAdvancedFilterTree(\n  routeFilters: Record<string, unknown>,\n  tree: AdvancedFilterTree | null,\n): Record<string, unknown> {\n  if (!tree) return routeFilters\n  const treeWhere = compileTreeToWhere(tree)\n  if (!treeWhere) return routeFilters\n  if (Object.keys(routeFilters).length === 0) return treeWhere\n  // AND-combine via $and so any nested $and/$or in either side reaches normalize unchanged.\n  return { $and: [routeFilters, treeWhere] }\n}\n\n/**\n * Read-old-write-new helper: parse the request `query` for either a v2 tree URL\n * or a legacy v1 flat URL (auto-upgraded via flatToTree under SQL precedence),\n * and AND-combine the result with the route's existing filters.\n */\nexport function mergeAdvancedFiltersFromQuery(\n  routeFilters: Record<string, unknown>,\n  query: Record<string, unknown>,\n): Record<string, unknown> {\n  const v2 = deserializeTree(query)\n  if (v2) return mergeAdvancedFilterTree(routeFilters, v2)\n  const flat = deserializeAdvancedFilter(query)\n  if (!flat) return routeFilters\n  return mergeAdvancedFilterTree(routeFilters, flatToTree(flat))\n}\n\n/**\n * Returns the request's advanced filter as a tree, after stripping the\n * `filter[...]` keys from the query map. Mirrors `mergeAdvancedFiltersFromQuery`\n * but exposes the tree so callers can apply additional shaping (e.g. mapping to\n * `query.ids`, narrowing by feature flags, or surfacing the tree to enrichers)\n * before merging into the route filter.\n *\n * - Detects v2 tree URL params first.\n * - Falls back to legacy v1 flat params, upgraded via `flatToTree` under\n *   standard SQL precedence (AND binds tighter than OR).\n * - Mutates `query` in place: every `filter[...]` key is removed after parsing.\n *\n * Returns `null` when no advanced-filter query params are present.\n */\nexport function consumeAdvancedFilterState(query: Record<string, unknown>): AdvancedFilterTree | null {\n  let tree: AdvancedFilterTree | null = deserializeTree(query)\n  if (!tree) {\n    const flat = deserializeAdvancedFilter(query)\n    if (flat) {\n      tree = flatToTree(flat)\n      if (process.env.NODE_ENV !== 'production') {\n        const sentinel = '__OM_FILTER_V1_WARNED'\n        const g = globalThis as Record<string, unknown>\n        if (!g[sentinel]) {\n          g[sentinel] = true\n          // eslint-disable-next-line no-console\n          console.warn('[advanced-filter] legacy v1 URL detected; auto-upgraded to v2 tree')\n        }\n      }\n    }\n  }\n\n  for (const key of Object.keys(query)) {\n    if (key.startsWith('filter[')) {\n      delete query[key]\n    }\n  }\n\n  return tree\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  deserializeAdvancedFilter,\n  deserializeTree,\n  flatToTree,\n  convertAdvancedFilterToWhere,\n} from '../query/advanced-filter'\nimport { compileTreeToWhere, type AdvancedFilterTree } from '../query/advanced-filter-tree'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'crud' })\n\nfunction splitOrClauses(filters: Record<string, unknown>): {\n  directFilters: Record<string, unknown>\n  orClauses: Record<string, unknown>[] | null\n} {\n  const directFilters: Record<string, unknown> = {}\n  let orClauses: Record<string, unknown>[] | null = null\n\n  for (const [key, value] of Object.entries(filters)) {\n    if (key === '$or' && Array.isArray(value)) {\n      orClauses = value.filter((entry): entry is Record<string, unknown> => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry))\n      continue\n    }\n    directFilters[key] = value\n  }\n\n  return { directFilters, orClauses }\n}\n\n/**\n * Parse advanced filter query params and merge with existing Where filters.\n * Call this in buildFilters callback to support advanced filter query params.\n */\nexport function mergeAdvancedFilters(\n  existingFilters: Record<string, unknown>,\n  query: Record<string, unknown>,\n): Record<string, unknown> {\n  const advancedState = deserializeAdvancedFilter(query)\n  if (!advancedState) return existingFilters\n\n  const advancedWhere = convertAdvancedFilterToWhere(advancedState)\n  if (!Object.keys(advancedWhere).length) return existingFilters\n\n  if ('$or' in advancedWhere) {\n    if (!Object.keys(existingFilters).length) return advancedWhere\n\n    const { directFilters: existingDirect, orClauses: existingOrClauses } = splitOrClauses(existingFilters)\n    const advancedClauses = Array.isArray((advancedWhere as { $or?: unknown }).$or)\n      ? ((advancedWhere as { $or: unknown[] }).$or).filter(\n          (entry): entry is Record<string, unknown> => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry),\n        )\n      : []\n\n    if (!advancedClauses.length) return existingFilters\n\n    if (!existingOrClauses?.length) {\n      return {\n        ...existingDirect,\n        $or: advancedClauses,\n      }\n    }\n\n    const combinedClauses: Record<string, unknown>[] = []\n    for (const leftClause of existingOrClauses) {\n      for (const rightClause of advancedClauses) {\n        combinedClauses.push({\n          ...leftClause,\n          ...rightClause,\n        })\n      }\n    }\n\n    return combinedClauses.length\n      ? {\n          ...existingDirect,\n          $or: combinedClauses,\n        }\n      : existingFilters\n  }\n\n  // AND logic: merge directly\n  return { ...existingFilters, ...advancedWhere }\n}\n\n/**\n * Combine route-side filters with an advanced filter tree by AND.\n *\n * The compiled tree may itself contain nested `$and`/`$or` \u2014 the query engine's\n * normalize step (`compileToDnf` in join-utils.ts) expands those into Disjunctive\n * Normal Form, so the engine sees a single OR group with disjuncts that AND'd\n * leaves. Common-clause lifting in normalize keeps shared predicates ungrouped\n * (preserving the search-tokens optimization).\n */\nexport function mergeAdvancedFilterTree(\n  routeFilters: Record<string, unknown>,\n  tree: AdvancedFilterTree | null,\n): Record<string, unknown> {\n  if (!tree) return routeFilters\n  const treeWhere = compileTreeToWhere(tree)\n  if (!treeWhere) return routeFilters\n  if (Object.keys(routeFilters).length === 0) return treeWhere\n  // AND-combine via $and so any nested $and/$or in either side reaches normalize unchanged.\n  return { $and: [routeFilters, treeWhere] }\n}\n\n/**\n * Read-old-write-new helper: parse the request `query` for either a v2 tree URL\n * or a legacy v1 flat URL (auto-upgraded via flatToTree under SQL precedence),\n * and AND-combine the result with the route's existing filters.\n */\nexport function mergeAdvancedFiltersFromQuery(\n  routeFilters: Record<string, unknown>,\n  query: Record<string, unknown>,\n): Record<string, unknown> {\n  const v2 = deserializeTree(query)\n  if (v2) return mergeAdvancedFilterTree(routeFilters, v2)\n  const flat = deserializeAdvancedFilter(query)\n  if (!flat) return routeFilters\n  return mergeAdvancedFilterTree(routeFilters, flatToTree(flat))\n}\n\n/**\n * Returns the request's advanced filter as a tree, after stripping the\n * `filter[...]` keys from the query map. Mirrors `mergeAdvancedFiltersFromQuery`\n * but exposes the tree so callers can apply additional shaping (e.g. mapping to\n * `query.ids`, narrowing by feature flags, or surfacing the tree to enrichers)\n * before merging into the route filter.\n *\n * - Detects v2 tree URL params first.\n * - Falls back to legacy v1 flat params, upgraded via `flatToTree` under\n *   standard SQL precedence (AND binds tighter than OR).\n * - Mutates `query` in place: every `filter[...]` key is removed after parsing.\n *\n * Returns `null` when no advanced-filter query params are present.\n */\nexport function consumeAdvancedFilterState(query: Record<string, unknown>): AdvancedFilterTree | null {\n  let tree: AdvancedFilterTree | null = deserializeTree(query)\n  if (!tree) {\n    const flat = deserializeAdvancedFilter(query)\n    if (flat) {\n      tree = flatToTree(flat)\n      if (process.env.NODE_ENV !== 'production') {\n        const sentinel = '__OM_FILTER_V1_WARNED'\n        const g = globalThis as Record<string, unknown>\n        if (!g[sentinel]) {\n          g[sentinel] = true\n          // eslint-disable-next-line no-console\n          logger.warn('Legacy v1 advanced-filter URL detected; auto-upgraded to v2 tree')\n        }\n      }\n    }\n  }\n\n  for (const key of Object.keys(query)) {\n    if (key.startsWith('filter[')) {\n      delete query[key]\n    }\n  }\n\n  return tree\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/crud/cache.js

@@ -1,5 +1,7 @@
 import { runWithCacheTenant } from "@open-mercato/cache";
 import { parseBooleanToken } from "../boolean.js";
+import { createLogger } from "../logger/index.js";
+const logger = createLogger("shared").child({ component: "crud-cache" });
 let crudCacheEnabledFlag = null;
 function isCrudCacheEnabled() {
   if (crudCacheEnabledFlag !== null) return crudCacheEnabledFlag;
@@ -15,7 +17,7 @@ function isCrudCacheDebugEnabled() {
 function debugCrudCache(event, context) {
   if (!isCrudCacheDebugEnabled()) return;
   try {
-    console.debug("[crud][cache]", event, context);
+    logger.debug(event, context);
   } catch {
   }
 }

package/dist/lib/crud/cache.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/crud/cache.ts"],
-  "sourcesContent": ["import type { AwilixContainer } from 'awilix'\nimport { runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'\nimport { parseBooleanToken } from '../boolean'\n\nexport type CrudCacheIdentifiers = {\n  id?: string | null\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nlet crudCacheEnabledFlag: boolean | null = null\nexport function isCrudCacheEnabled(): boolean {\n  if (crudCacheEnabledFlag !== null) return crudCacheEnabledFlag\n  crudCacheEnabledFlag = parseBooleanToken(process.env.ENABLE_CRUD_API_CACHE ?? '') === true\n  return crudCacheEnabledFlag\n}\n\nlet crudCacheDebugFlag: boolean | null = null\nexport function isCrudCacheDebugEnabled(): boolean {\n  if (crudCacheDebugFlag !== null) return crudCacheDebugFlag\n  crudCacheDebugFlag = parseBooleanToken(process.env.QUERY_ENGINE_DEBUG_SQL ?? '') === true\n  return crudCacheDebugFlag\n}\n\nexport function debugCrudCache(event: string, context: Record<string, unknown>) {\n  if (!isCrudCacheDebugEnabled()) return\n  try {\n    console.debug('[crud][cache]', event, context)\n  } catch {}\n}\n\nexport function resolveCrudCache(container: AwilixContainer): CacheStrategy | null {\n  try {\n    const cache = (container.resolve('cache') as CacheStrategy)\n    if (cache && typeof cache.get === 'function' && typeof cache.set === 'function') {\n      return cache\n    }\n  } catch {}\n  return null\n}\n\nexport function normalizeTagSegment(value: string | null | undefined): string {\n  if (value === null || value === undefined || value === '') return 'null'\n  return value.toString().trim().replace(/[^a-zA-Z0-9._-]/g, '-')\n}\n\nexport function canonicalizeResourceTag(value: string | null | undefined): string | null {\n  if (value === null || value === undefined) return null\n  const trimmed = String(value).trim()\n  if (!trimmed.length) return null\n  const withSeparators = trimmed\n    .replace(/::/g, '.')\n    .replace(/[/\\\\]+/g, '.')\n    .replace(/[\\s]+/g, '.')\n    .replace(/_/g, '.')\n    .replace(/-+/g, '.')\n  const withCamelBreaks = withSeparators.replace(/([a-z0-9])([A-Z])/g, '$1.$2')\n  const collapsed = withCamelBreaks.replace(/\\.{2,}/g, '.').replace(/(?:^\\.+|\\.+$)/g, '')\n  const lowered = collapsed.toLowerCase()\n  return lowered.length ? lowered : null\n}\n\nexport function buildRecordTag(resource: string, tenantId: string | null, recordId: string): string {\n  return [\n    'crud',\n    normalizeTagSegment(resource),\n    'tenant',\n    normalizeTagSegment(tenantId),\n    'record',\n    normalizeTagSegment(recordId),\n  ].join(':')\n}\n\nexport function buildCollectionTags(\n  resource: string,\n  tenantId: string | null,\n  organizationIds: Array<string | null>\n): string[] {\n  const normalizedResource = normalizeTagSegment(resource)\n  const normalizedTenant = normalizeTagSegment(tenantId)\n  const tags = new Set<string>()\n  if (!organizationIds.length) {\n    tags.add(['crud', normalizedResource, 'tenant', normalizedTenant, 'org', 'null', 'collection'].join(':'))\n    return Array.from(tags)\n  }\n  for (const orgId of organizationIds) {\n    tags.add(['crud', normalizedResource, 'tenant', normalizedTenant, 'org', normalizeTagSegment(orgId), 'collection'].join(':'))\n  }\n  return Array.from(tags)\n}\n\nexport function normalizeIdentifierValue(value: unknown): string | null {\n  if (value === null || value === undefined) return null\n  if (typeof value === 'string') return value\n  if (typeof value === 'number' || typeof value === 'bigint') return String(value)\n  if (typeof value === 'object') {\n    if (value instanceof Date) return value.toISOString()\n    if (value && typeof (value as { id?: unknown }).id !== 'undefined') {\n      return normalizeIdentifierValue((value as { id?: unknown }).id)\n    }\n  }\n  return String(value)\n}\n\nexport function pickFirstIdentifier(...values: Array<unknown>): string | null {\n  for (const value of values) {\n    const normalized = normalizeIdentifierValue(value)\n    if (normalized) return normalized\n  }\n  return null\n}\n\nconst IRREGULAR_PLURALS: Record<string, string> = {\n  people: 'person',\n  children: 'child',\n  mice: 'mouse',\n  men: 'man',\n  women: 'woman',\n  geese: 'goose',\n  feet: 'foot',\n  teeth: 'tooth',\n  oxen: 'ox',\n}\n\nfunction singularizeSegment(segment: string): string {\n  const lower = segment.toLowerCase()\n  const irregular = IRREGULAR_PLURALS[lower]\n  if (irregular) return irregular\n  if (lower.endsWith('ies') && lower.length > 3) return lower.slice(0, -3) + 'y'\n  if (lower.endsWith('ses') && lower.length > 3) return lower.slice(0, -2)\n  if (\n    (lower.endsWith('xes') ||\n      lower.endsWith('zes') ||\n      lower.endsWith('ches') ||\n      lower.endsWith('shes')) &&\n    lower.length > 3\n  ) {\n    return lower.slice(0, -2)\n  }\n  if (lower.endsWith('s') && !lower.endsWith('ss') && lower.length > 1) return lower.slice(0, -1)\n  return lower\n}\n\nfunction singularizeResourceSegment(segment: string): string {\n  return segment\n    .split('-')\n    .map((part) => singularizeSegment(part))\n    .join('-')\n}\n\nexport function deriveResourceFromCommandId(commandId: string | undefined | null): string | null {\n  if (!commandId || typeof commandId !== 'string') return null\n  const parts = commandId.split('.')\n  if (parts.length < 2) return null\n  const modulePart = parts[0]\n  const entityPart = singularizeResourceSegment(parts[1])\n  if (!modulePart || !entityPart) return null\n  return `${modulePart}.${entityPart}`\n}\n\nexport function expandResourceAliases(resource: string, aliases?: string[]): string[] {\n  const set = new Set<string>()\n  const inputs = [resource, ...(aliases ?? [])]\n  for (const candidate of inputs) {\n    const canonical = canonicalizeResourceTag(candidate)\n    if (canonical) set.add(canonical)\n  }\n  if (!set.size) return []\n  return Array.from(set)\n}\n\nexport async function invalidateCrudCache(\n  container: AwilixContainer,\n  resource: string,\n  identifiers: CrudCacheIdentifiers,\n  fallbackTenant: string | null,\n  reason: string,\n  aliases?: string[]\n): Promise<void> {\n  if (!isCrudCacheEnabled()) return\n  const cache = resolveCrudCache(container)\n  if (!cache || typeof cache.deleteByTags !== 'function') return\n  const resources = expandResourceAliases(resource, aliases)\n  const tenantId = identifiers.tenantId ?? fallbackTenant ?? null\n  const recordId = normalizeIdentifierValue(identifiers.id)\n  const tags = new Set<string>()\n  for (const key of resources) {\n    if (recordId) {\n      tags.add(buildRecordTag(key, tenantId, recordId))\n    }\n    const organizationIds: Array<string | null> = []\n    if (identifiers.organizationId !== undefined) {\n      organizationIds.push(identifiers.organizationId ?? null)\n    }\n    if (!organizationIds.length) organizationIds.push(null)\n    for (const tag of buildCollectionTags(key, tenantId, organizationIds)) {\n      tags.add(tag)\n    }\n  }\n  if (!tags.size) return\n  const tagList = Array.from(tags)\n  debugCrudCache('invalidate', {\n    resource,\n    aliases: resources,\n    reason,\n    tenantId: tenantId ?? 'null',\n    tags: tagList,\n    action: 'clearing',\n  })\n  const deleted = await runWithCacheTenant(tenantId, () => cache.deleteByTags(tagList))\n  debugCrudCache('invalidate', {\n    resource,\n    reason,\n    tenantId: tenantId ?? 'null',\n    tags: tagList,\n    action: 'cleared',\n    deleted,\n  })\n}\n"],
-  "mappings": "AACA,SAAS,0BAA8C;AACvD,SAAS,yBAAyB;AAQlC,IAAI,uBAAuC;AACpC,SAAS,qBAA8B;AAC5C,MAAI,yBAAyB,KAAM,QAAO;AAC1C,yBAAuB,kBAAkB,QAAQ,IAAI,yBAAyB,EAAE,MAAM;AACtF,SAAO;AACT;AAEA,IAAI,qBAAqC;AAClC,SAAS,0BAAmC;AACjD,MAAI,uBAAuB,KAAM,QAAO;AACxC,uBAAqB,kBAAkB,QAAQ,IAAI,0BAA0B,EAAE,MAAM;AACrF,SAAO;AACT;AAEO,SAAS,eAAe,OAAe,SAAkC;AAC9E,MAAI,CAAC,wBAAwB,EAAG;AAChC,MAAI;AACF,YAAQ,MAAM,iBAAiB,OAAO,OAAO;AAAA,EAC/C,QAAQ;AAAA,EAAC;AACX;AAEO,SAAS,iBAAiB,WAAkD;AACjF,MAAI;AACF,UAAM,QAAS,UAAU,QAAQ,OAAO;AACxC,QAAI,SAAS,OAAO,MAAM,QAAQ,cAAc,OAAO,MAAM,QAAQ,YAAY;AAC/E,aAAO;AAAA,IACT;AAAA,EACF,QAAQ;AAAA,EAAC;AACT,SAAO;AACT;AAEO,SAAS,oBAAoB,OAA0C;AAC5E,MAAI,UAAU,QAAQ,UAAU,UAAa,UAAU,GAAI,QAAO;AAClE,SAAO,MAAM,SAAS,EAAE,KAAK,EAAE,QAAQ,oBAAoB,GAAG;AAChE;AAEO,SAAS,wBAAwB,OAAiD;AACvF,MAAI,UAAU,QAAQ,UAAU,OAAW,QAAO;AAClD,QAAM,UAAU,OAAO,KAAK,EAAE,KAAK;AACnC,MAAI,CAAC,QAAQ,OAAQ,QAAO;AAC5B,QAAM,iBAAiB,QACpB,QAAQ,OAAO,GAAG,EAClB,QAAQ,WAAW,GAAG,EACtB,QAAQ,UAAU,GAAG,EACrB,QAAQ,MAAM,GAAG,EACjB,QAAQ,OAAO,GAAG;AACrB,QAAM,kBAAkB,eAAe,QAAQ,sBAAsB,OAAO;AAC5E,QAAM,YAAY,gBAAgB,QAAQ,WAAW,GAAG,EAAE,QAAQ,kBAAkB,EAAE;AACtF,QAAM,UAAU,UAAU,YAAY;AACtC,SAAO,QAAQ,SAAS,UAAU;AACpC;AAEO,SAAS,eAAe,UAAkB,UAAyB,UAA0B;AAClG,SAAO;AAAA,IACL;AAAA,IACA,oBAAoB,QAAQ;AAAA,IAC5B;AAAA,IACA,oBAAoB,QAAQ;AAAA,IAC5B;AAAA,IACA,oBAAoB,QAAQ;AAAA,EAC9B,EAAE,KAAK,GAAG;AACZ;AAEO,SAAS,oBACd,UACA,UACA,iBACU;AACV,QAAM,qBAAqB,oBAAoB,QAAQ;AACvD,QAAM,mBAAmB,oBAAoB,QAAQ;AACrD,QAAM,OAAO,oBAAI,IAAY;AAC7B,MAAI,CAAC,gBAAgB,QAAQ;AAC3B,SAAK,IAAI,CAAC,QAAQ,oBAAoB,UAAU,kBAAkB,OAAO,QAAQ,YAAY,EAAE,KAAK,GAAG,CAAC;AACxG,WAAO,MAAM,KAAK,IAAI;AAAA,EACxB;AACA,aAAW,SAAS,iBAAiB;AACnC,SAAK,IAAI,CAAC,QAAQ,oBAAoB,UAAU,kBAAkB,OAAO,oBAAoB,KAAK,GAAG,YAAY,EAAE,KAAK,GAAG,CAAC;AAAA,EAC9H;AACA,SAAO,MAAM,KAAK,IAAI;AACxB;AAEO,SAAS,yBAAyB,OAA+B;AACtE,MAAI,UAAU,QAAQ,UAAU,OAAW,QAAO;AAClD,MAAI,OAAO,UAAU,SAAU,QAAO;AACtC,MAAI,OAAO,UAAU,YAAY,OAAO,UAAU,SAAU,QAAO,OAAO,KAAK;AAC/E,MAAI,OAAO,UAAU,UAAU;AAC7B,QAAI,iBAAiB,KAAM,QAAO,MAAM,YAAY;AACpD,QAAI,SAAS,OAAQ,MAA2B,OAAO,aAAa;AAClE,aAAO,yBAA0B,MAA2B,EAAE;AAAA,IAChE;AAAA,EACF;AACA,SAAO,OAAO,KAAK;AACrB;AAEO,SAAS,uBAAuB,QAAuC;AAC5E,aAAW,SAAS,QAAQ;AAC1B,UAAM,aAAa,yBAAyB,KAAK;AACjD,QAAI,WAAY,QAAO;AAAA,EACzB;AACA,SAAO;AACT;AAEA,MAAM,oBAA4C;AAAA,EAChD,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,MAAM;AAAA,EACN,KAAK;AAAA,EACL,OAAO;AAAA,EACP,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACR;AAEA,SAAS,mBAAmB,SAAyB;AACnD,QAAM,QAAQ,QAAQ,YAAY;AAClC,QAAM,YAAY,kBAAkB,KAAK;AACzC,MAAI,UAAW,QAAO;AACtB,MAAI,MAAM,SAAS,KAAK,KAAK,MAAM,SAAS,EAAG,QAAO,MAAM,MAAM,GAAG,EAAE,IAAI;AAC3E,MAAI,MAAM,SAAS,KAAK,KAAK,MAAM,SAAS,EAAG,QAAO,MAAM,MAAM,GAAG,EAAE;AACvE,OACG,MAAM,SAAS,KAAK,KACnB,MAAM,SAAS,KAAK,KACpB,MAAM,SAAS,MAAM,KACrB,MAAM,SAAS,MAAM,MACvB,MAAM,SAAS,GACf;AACA,WAAO,MAAM,MAAM,GAAG,EAAE;AAAA,EAC1B;AACA,MAAI,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,SAAS,IAAI,KAAK,MAAM,SAAS,EAAG,QAAO,MAAM,MAAM,GAAG,EAAE;AAC9F,SAAO;AACT;AAEA,SAAS,2BAA2B,SAAyB;AAC3D,SAAO,QACJ,MAAM,GAAG,EACT,IAAI,CAAC,SAAS,mBAAmB,IAAI,CAAC,EACtC,KAAK,GAAG;AACb;AAEO,SAAS,4BAA4B,WAAqD;AAC/F,MAAI,CAAC,aAAa,OAAO,cAAc,SAAU,QAAO;AACxD,QAAM,QAAQ,UAAU,MAAM,GAAG;AACjC,MAAI,MAAM,SAAS,EAAG,QAAO;AAC7B,QAAM,aAAa,MAAM,CAAC;AAC1B,QAAM,aAAa,2BAA2B,MAAM,CAAC,CAAC;AACtD,MAAI,CAAC,cAAc,CAAC,WAAY,QAAO;AACvC,SAAO,GAAG,UAAU,IAAI,UAAU;AACpC;AAEO,SAAS,sBAAsB,UAAkB,SAA8B;AACpF,QAAM,MAAM,oBAAI,IAAY;AAC5B,QAAM,SAAS,CAAC,UAAU,GAAI,WAAW,CAAC,CAAE;AAC5C,aAAW,aAAa,QAAQ;AAC9B,UAAM,YAAY,wBAAwB,SAAS;AACnD,QAAI,UAAW,KAAI,IAAI,SAAS;AAAA,EAClC;AACA,MAAI,CAAC,IAAI,KAAM,QAAO,CAAC;AACvB,SAAO,MAAM,KAAK,GAAG;AACvB;AAEA,eAAsB,oBACpB,WACA,UACA,aACA,gBACA,QACA,SACe;AACf,MAAI,CAAC,mBAAmB,EAAG;AAC3B,QAAM,QAAQ,iBAAiB,SAAS;AACxC,MAAI,CAAC,SAAS,OAAO,MAAM,iBAAiB,WAAY;AACxD,QAAM,YAAY,sBAAsB,UAAU,OAAO;AACzD,QAAM,WAAW,YAAY,YAAY,kBAAkB;AAC3D,QAAM,WAAW,yBAAyB,YAAY,EAAE;AACxD,QAAM,OAAO,oBAAI,IAAY;AAC7B,aAAW,OAAO,WAAW;AAC3B,QAAI,UAAU;AACZ,WAAK,IAAI,eAAe,KAAK,UAAU,QAAQ,CAAC;AAAA,IAClD;AACA,UAAM,kBAAwC,CAAC;AAC/C,QAAI,YAAY,mBAAmB,QAAW;AAC5C,sBAAgB,KAAK,YAAY,kBAAkB,IAAI;AAAA,IACzD;AACA,QAAI,CAAC,gBAAgB,OAAQ,iBAAgB,KAAK,IAAI;AACtD,eAAW,OAAO,oBAAoB,KAAK,UAAU,eAAe,GAAG;AACrE,WAAK,IAAI,GAAG;AAAA,IACd;AAAA,EACF;AACA,MAAI,CAAC,KAAK,KAAM;AAChB,QAAM,UAAU,MAAM,KAAK,IAAI;AAC/B,iBAAe,cAAc;AAAA,IAC3B;AAAA,IACA,SAAS;AAAA,IACT;AAAA,IACA,UAAU,YAAY;AAAA,IACtB,MAAM;AAAA,IACN,QAAQ;AAAA,EACV,CAAC;AACD,QAAM,UAAU,MAAM,mBAAmB,UAAU,MAAM,MAAM,aAAa,OAAO,CAAC;AACpF,iBAAe,cAAc;AAAA,IAC3B;AAAA,IACA;AAAA,IACA,UAAU,YAAY;AAAA,IACtB,MAAM;AAAA,IACN,QAAQ;AAAA,IACR;AAAA,EACF,CAAC;AACH;",
+  "sourcesContent": ["import type { AwilixContainer } from 'awilix'\nimport { runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'\nimport { parseBooleanToken } from '../boolean'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'crud-cache' })\n\nexport type CrudCacheIdentifiers = {\n  id?: string | null\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nlet crudCacheEnabledFlag: boolean | null = null\nexport function isCrudCacheEnabled(): boolean {\n  if (crudCacheEnabledFlag !== null) return crudCacheEnabledFlag\n  crudCacheEnabledFlag = parseBooleanToken(process.env.ENABLE_CRUD_API_CACHE ?? '') === true\n  return crudCacheEnabledFlag\n}\n\nlet crudCacheDebugFlag: boolean | null = null\nexport function isCrudCacheDebugEnabled(): boolean {\n  if (crudCacheDebugFlag !== null) return crudCacheDebugFlag\n  crudCacheDebugFlag = parseBooleanToken(process.env.QUERY_ENGINE_DEBUG_SQL ?? '') === true\n  return crudCacheDebugFlag\n}\n\nexport function debugCrudCache(event: string, context: Record<string, unknown>) {\n  if (!isCrudCacheDebugEnabled()) return\n  try {\n    logger.debug(event, context)\n  } catch {}\n}\n\nexport function resolveCrudCache(container: AwilixContainer): CacheStrategy | null {\n  try {\n    const cache = (container.resolve('cache') as CacheStrategy)\n    if (cache && typeof cache.get === 'function' && typeof cache.set === 'function') {\n      return cache\n    }\n  } catch {}\n  return null\n}\n\nexport function normalizeTagSegment(value: string | null | undefined): string {\n  if (value === null || value === undefined || value === '') return 'null'\n  return value.toString().trim().replace(/[^a-zA-Z0-9._-]/g, '-')\n}\n\nexport function canonicalizeResourceTag(value: string | null | undefined): string | null {\n  if (value === null || value === undefined) return null\n  const trimmed = String(value).trim()\n  if (!trimmed.length) return null\n  const withSeparators = trimmed\n    .replace(/::/g, '.')\n    .replace(/[/\\\\]+/g, '.')\n    .replace(/[\\s]+/g, '.')\n    .replace(/_/g, '.')\n    .replace(/-+/g, '.')\n  const withCamelBreaks = withSeparators.replace(/([a-z0-9])([A-Z])/g, '$1.$2')\n  const collapsed = withCamelBreaks.replace(/\\.{2,}/g, '.').replace(/(?:^\\.+|\\.+$)/g, '')\n  const lowered = collapsed.toLowerCase()\n  return lowered.length ? lowered : null\n}\n\nexport function buildRecordTag(resource: string, tenantId: string | null, recordId: string): string {\n  return [\n    'crud',\n    normalizeTagSegment(resource),\n    'tenant',\n    normalizeTagSegment(tenantId),\n    'record',\n    normalizeTagSegment(recordId),\n  ].join(':')\n}\n\nexport function buildCollectionTags(\n  resource: string,\n  tenantId: string | null,\n  organizationIds: Array<string | null>\n): string[] {\n  const normalizedResource = normalizeTagSegment(resource)\n  const normalizedTenant = normalizeTagSegment(tenantId)\n  const tags = new Set<string>()\n  if (!organizationIds.length) {\n    tags.add(['crud', normalizedResource, 'tenant', normalizedTenant, 'org', 'null', 'collection'].join(':'))\n    return Array.from(tags)\n  }\n  for (const orgId of organizationIds) {\n    tags.add(['crud', normalizedResource, 'tenant', normalizedTenant, 'org', normalizeTagSegment(orgId), 'collection'].join(':'))\n  }\n  return Array.from(tags)\n}\n\nexport function normalizeIdentifierValue(value: unknown): string | null {\n  if (value === null || value === undefined) return null\n  if (typeof value === 'string') return value\n  if (typeof value === 'number' || typeof value === 'bigint') return String(value)\n  if (typeof value === 'object') {\n    if (value instanceof Date) return value.toISOString()\n    if (value && typeof (value as { id?: unknown }).id !== 'undefined') {\n      return normalizeIdentifierValue((value as { id?: unknown }).id)\n    }\n  }\n  return String(value)\n}\n\nexport function pickFirstIdentifier(...values: Array<unknown>): string | null {\n  for (const value of values) {\n    const normalized = normalizeIdentifierValue(value)\n    if (normalized) return normalized\n  }\n  return null\n}\n\nconst IRREGULAR_PLURALS: Record<string, string> = {\n  people: 'person',\n  children: 'child',\n  mice: 'mouse',\n  men: 'man',\n  women: 'woman',\n  geese: 'goose',\n  feet: 'foot',\n  teeth: 'tooth',\n  oxen: 'ox',\n}\n\nfunction singularizeSegment(segment: string): string {\n  const lower = segment.toLowerCase()\n  const irregular = IRREGULAR_PLURALS[lower]\n  if (irregular) return irregular\n  if (lower.endsWith('ies') && lower.length > 3) return lower.slice(0, -3) + 'y'\n  if (lower.endsWith('ses') && lower.length > 3) return lower.slice(0, -2)\n  if (\n    (lower.endsWith('xes') ||\n      lower.endsWith('zes') ||\n      lower.endsWith('ches') ||\n      lower.endsWith('shes')) &&\n    lower.length > 3\n  ) {\n    return lower.slice(0, -2)\n  }\n  if (lower.endsWith('s') && !lower.endsWith('ss') && lower.length > 1) return lower.slice(0, -1)\n  return lower\n}\n\nfunction singularizeResourceSegment(segment: string): string {\n  return segment\n    .split('-')\n    .map((part) => singularizeSegment(part))\n    .join('-')\n}\n\nexport function deriveResourceFromCommandId(commandId: string | undefined | null): string | null {\n  if (!commandId || typeof commandId !== 'string') return null\n  const parts = commandId.split('.')\n  if (parts.length < 2) return null\n  const modulePart = parts[0]\n  const entityPart = singularizeResourceSegment(parts[1])\n  if (!modulePart || !entityPart) return null\n  return `${modulePart}.${entityPart}`\n}\n\nexport function expandResourceAliases(resource: string, aliases?: string[]): string[] {\n  const set = new Set<string>()\n  const inputs = [resource, ...(aliases ?? [])]\n  for (const candidate of inputs) {\n    const canonical = canonicalizeResourceTag(candidate)\n    if (canonical) set.add(canonical)\n  }\n  if (!set.size) return []\n  return Array.from(set)\n}\n\nexport async function invalidateCrudCache(\n  container: AwilixContainer,\n  resource: string,\n  identifiers: CrudCacheIdentifiers,\n  fallbackTenant: string | null,\n  reason: string,\n  aliases?: string[]\n): Promise<void> {\n  if (!isCrudCacheEnabled()) return\n  const cache = resolveCrudCache(container)\n  if (!cache || typeof cache.deleteByTags !== 'function') return\n  const resources = expandResourceAliases(resource, aliases)\n  const tenantId = identifiers.tenantId ?? fallbackTenant ?? null\n  const recordId = normalizeIdentifierValue(identifiers.id)\n  const tags = new Set<string>()\n  for (const key of resources) {\n    if (recordId) {\n      tags.add(buildRecordTag(key, tenantId, recordId))\n    }\n    const organizationIds: Array<string | null> = []\n    if (identifiers.organizationId !== undefined) {\n      organizationIds.push(identifiers.organizationId ?? null)\n    }\n    if (!organizationIds.length) organizationIds.push(null)\n    for (const tag of buildCollectionTags(key, tenantId, organizationIds)) {\n      tags.add(tag)\n    }\n  }\n  if (!tags.size) return\n  const tagList = Array.from(tags)\n  debugCrudCache('invalidate', {\n    resource,\n    aliases: resources,\n    reason,\n    tenantId: tenantId ?? 'null',\n    tags: tagList,\n    action: 'clearing',\n  })\n  const deleted = await runWithCacheTenant(tenantId, () => cache.deleteByTags(tagList))\n  debugCrudCache('invalidate', {\n    resource,\n    reason,\n    tenantId: tenantId ?? 'null',\n    tags: tagList,\n    action: 'cleared',\n    deleted,\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/crud/custom-fields.js

@@ -2,12 +2,14 @@ import { CustomFieldDef, CustomFieldValue } from "@open-mercato/core/modules/ent
 import { decryptCustomFieldValue, resolveTenantEncryptionService } from "../encryption/customFieldValues.js";
 import { parseBooleanToken } from "../boolean.js";
 import { extractCustomFieldEntries } from "./custom-fields-client.js";
+import { createLogger } from "../logger/index.js";
 import {
   buildCustomFieldDefinitionIndexFromRows,
   normalizeDefinitionKey,
   normalizeFieldsetFilter,
   selectDefinitionForRecord
 } from "./custom-field-definition-index.js";
+const logger = createLogger("shared").child({ component: "crud" });
 function buildCustomFieldSelectorsForEntity(entityId, sets) {
   const keys = Array.from(new Set(
     (sets || []).filter((s) => s.entity === entityId).flatMap((s) => (s.fields || []).map((f) => f.key))
@@ -279,7 +281,7 @@ async function loadCustomFieldDefinitionIndex(opts) {
         return restored;
       }
     } catch (err) {
-      console.warn("[crud:cf-def-cache] read failed", err);
+      logger.warn("Custom-field definition cache read failed", { err });
     }
   }
   const index = await loadCustomFieldDefinitionIndexFresh({
@@ -294,7 +296,7 @@ async function loadCustomFieldDefinitionIndex(opts) {
         tags: buildCfDefIndexCacheTags({ tenantId, entityIds })
       });
     } catch (err) {
-      console.warn("[crud:cf-def-cache] write failed", err);
+      logger.warn("Custom-field definition cache write failed", { err });
     }
   }
   if (requestBucket) requestBucket.set(cacheKey, index);

package/dist/lib/crud/custom-fields.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/crud/custom-fields.ts"],
-  "sourcesContent": ["import type { CustomFieldSet, EntityId } from '@open-mercato/shared/modules/entities'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { CustomFieldDef, CustomFieldValue } from '@open-mercato/core/modules/entities/data/entities'\nimport type { WhereValue } from '@open-mercato/shared/lib/query/types'\nimport type { TenantDataEncryptionService } from '../encryption/tenantDataEncryptionService'\nimport { decryptCustomFieldValue, resolveTenantEncryptionService } from '../encryption/customFieldValues'\nimport { parseBooleanToken } from '../boolean'\nimport { extractCustomFieldEntries } from './custom-fields-client'\nimport {\n  buildCustomFieldDefinitionIndexFromRows,\n  normalizeDefinitionKey,\n  normalizeFieldsetFilter,\n  selectDefinitionForRecord,\n  type CustomFieldDefinitionIndex,\n  type CustomFieldDefinitionRow,\n  type CustomFieldDefinitionSummary,\n} from './custom-field-definition-index'\n\nexport type { CustomFieldDefinitionSummary, CustomFieldDefinitionIndex } from './custom-field-definition-index'\n\nexport type CustomFieldSelectors = {\n  keys: string[]\n  selectors: string[] // e.g. ['cf:priority', 'cf:severity']\n  outputKeys: string[] // e.g. ['cf_priority', 'cf_severity']\n}\n\nexport type SplitCustomFieldPayload = {\n  base: Record<string, unknown>\n  custom: Record<string, unknown>\n}\n\nexport type CustomFieldDisplayEntry = {\n  key: string\n  label: string | null\n  value: unknown\n  kind: string | null\n  multi: boolean\n}\n\nexport type CustomFieldDisplayPayload = {\n  customValues: Record<string, unknown> | null\n  customFields: CustomFieldDisplayEntry[]\n}\n\nexport type CustomFieldSnapshot = {\n  entries: Record<string, unknown>\n  customValues: Record<string, unknown> | null\n  customFields: CustomFieldDisplayEntry[]\n}\n\nexport function buildCustomFieldSelectorsForEntity(entityId: EntityId, sets: CustomFieldSet[]): CustomFieldSelectors {\n  const keys = Array.from(new Set(\n    (sets || [])\n      .filter((s) => s.entity === entityId)\n      .flatMap((s) => (s.fields || []).map((f) => f.key))\n  ))\n  const selectors = keys.map((k) => `cf:${k}`)\n  const outputKeys = keys.map((k) => `cf_${k}`)\n  return { keys, selectors, outputKeys }\n}\n\nexport function normalizeCustomFieldValue(val: unknown): unknown {\n  if (Array.isArray(val)) return val\n  if (typeof val === 'string') {\n    const s = val.trim()\n    // Parse Postgres array-like '{a,b,c}' to string[] when present\n    if (s.startsWith('{') && s.endsWith('}')) {\n      const inner = s.slice(1, -1).trim()\n      if (!inner) return []\n      return inner.split(/[\\s,]+/).map((x) => x.trim()).filter(Boolean)\n    }\n    return s\n  }\n  return val as any\n}\n\n// Extracts cf_* fields from a record that may contain both 'cf:<key>' and/or 'cf_<key>'\nexport function extractCustomFieldsFromItem(item: Record<string, unknown>, keys: string[]): Record<string, unknown> {\n  const out: Record<string, unknown> = {}\n  for (const key of keys) {\n    const colon = item[`cf:${key}` as keyof typeof item]\n    const snake = item[`cf_${key}` as keyof typeof item]\n    const value = colon !== undefined ? colon : snake\n    if (value !== undefined) out[`cf_${key}`] = normalizeCustomFieldValue(value)\n  }\n  return out\n}\n\nexport function extractAllCustomFieldEntries(item: Record<string, unknown>): Record<string, unknown> {\n  return extractCustomFieldEntries(item)\n}\n\nexport async function buildCustomFieldFiltersFromQuery(opts: {\n  entityId?: EntityId\n  entityIds?: EntityId[]\n  query: Record<string, unknown>\n  em: EntityManager\n  tenantId: string | null | undefined\n  fieldset?: string | string[] | null\n}): Promise<Record<string, WhereValue>> {\n  const out: Record<string, WhereValue> = {}\n  const entries = Object.entries(opts.query).filter(([k]) => k.startsWith('cf_'))\n  if (!entries.length) return out\n\n  const entityIdList = Array.isArray(opts.entityIds) && opts.entityIds.length\n    ? opts.entityIds\n    : opts.entityId\n      ? [opts.entityId]\n      : []\n  if (!entityIdList.length) return out\n\n  // Tenant-only scope: allow global (null) or tenant match; ignore organization here\n  const defs = await opts.em.find(CustomFieldDef, {\n    entityId: { $in: entityIdList as any },\n    isActive: true,\n    $and: [\n      { $or: [ { tenantId: opts.tenantId as any }, { tenantId: null } ] },\n    ],\n  })\n  const fieldsetFilter = normalizeFieldsetFilter(opts.fieldset)\n  const order = new Map<string, number>()\n  entityIdList.map(String).forEach((id, index) => order.set(id, index))\n  const byKey: Record<string, { kind: string; multi?: boolean; entityId: string }> = {}\n  for (const d of defs) {\n    if (fieldsetFilter) {\n      const fieldsets = Array.isArray(d.configJson?.fieldsets)\n        ? d.configJson.fieldsets\n            .filter((entry: unknown): entry is string => typeof entry === 'string')\n            .map((entry: string) => entry.trim())\n            .filter((entry: string) => entry.length > 0)\n        : []\n      const rawFieldset = typeof d.configJson?.fieldset === 'string' ? d.configJson.fieldset.trim() : ''\n      const normalizedFieldset = rawFieldset.length ? rawFieldset : null\n      const matches = fieldsets.length > 0\n        ? fieldsets.some((entry: string) => fieldsetFilter.has(entry))\n        : fieldsetFilter.has(normalizedFieldset)\n      if (!matches) continue\n    }\n    const key = d.key\n    const entityId = String(d.entityId)\n    const current = byKey[key]\n    const rankNew = order.get(entityId) ?? Number.MAX_SAFE_INTEGER\n    if (!current) {\n      byKey[key] = { kind: d.kind, multi: Boolean((d as any).configJson?.multi), entityId }\n      continue\n    }\n    const rankOld = order.get(current.entityId) ?? Number.MAX_SAFE_INTEGER\n    if (rankNew < rankOld) {\n      byKey[key] = { kind: d.kind, multi: Boolean((d as any).configJson?.multi), entityId }\n    }\n  }\n\n  const coerce = (kind: string, v: unknown) => {\n    if (v == null) return v as undefined\n    switch (kind) {\n      case 'integer': return Number.parseInt(String(v), 10)\n      case 'float': return Number.parseFloat(String(v))\n      case 'boolean': return parseBooleanToken(String(v)) === true\n      case 'date':\n      case 'datetime': return String(v)\n      default: return String(v)\n    }\n  }\n\n  for (const [rawKey, rawVal] of entries) {\n    const isIn = rawKey.endsWith('In')\n    const key = isIn ? rawKey.replace(/^cf_/, '').replace(/In$/, '') : rawKey.replace(/^cf_/, '')\n    const def = byKey[key]\n    const fieldId = `cf:${key}`\n    if (!def) continue\n    if (isIn) {\n      const list = Array.isArray(rawVal)\n        ? (rawVal as unknown[])\n        : String(rawVal)\n            .split(',')\n            .map((s) => s.trim())\n            .filter(Boolean)\n      if (list.length) out[fieldId] = { $in: list.map((x) => coerce(def.kind, x)) as (string[] | number[] | boolean[]) }\n    } else {\n      out[fieldId] = coerce(def.kind, rawVal)\n    }\n  }\n\n  return out\n}\n\nexport function splitCustomFieldPayload(raw: unknown): SplitCustomFieldPayload {\n  const base: Record<string, unknown> = {}\n  const custom: Record<string, unknown> = {}\n  if (!raw || typeof raw !== 'object') return { base, custom }\n  for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {\n    if (key === 'customFields') {\n      if (Array.isArray(value)) {\n        value.forEach((entry) => {\n          if (!entry || typeof entry !== 'object') return\n          const entryKey = typeof (entry as any).key === 'string' ? (entry as any).key.trim() : ''\n          if (!entryKey) return\n          custom[entryKey] = (entry as any).value\n        })\n        continue\n      }\n      if (value && typeof value === 'object') {\n        for (const [ck, cv] of Object.entries(value as Record<string, unknown>)) {\n          const normalizedKey = typeof ck === 'string' ? ck.trim() : ''\n          if (!normalizedKey) continue\n          custom[normalizedKey] = cv\n        }\n        continue\n      }\n    }\n    if (key === 'customValues' && value && typeof value === 'object' && !Array.isArray(value)) {\n      for (const [ck, cv] of Object.entries(value as Record<string, unknown>)) {\n        custom[String(ck)] = cv\n      }\n      continue\n    }\n    if (key.startsWith('cf_')) {\n      custom[key.slice(3)] = value\n      continue\n    }\n    if (key.startsWith('cf:')) {\n      custom[key.slice(3)] = value\n      continue\n    }\n    base[key] = value\n  }\n  return { base, custom }\n}\n\nexport function extractCustomFieldValuesFromPayload(raw: Record<string, unknown>): Record<string, unknown> {\n  return splitCustomFieldPayload(raw).custom\n}\n\ntype LoadCustomFieldDefinitionIndexOptions = {\n  em: EntityManager\n  entityIds: string | string[]\n  tenantId?: string | null | undefined\n  organizationIds?: Array<string | null | undefined> | null\n  fieldset?: string | string[] | null\n}\n\ntype CustomFieldDefIndexCache = {\n  get(key: string): Promise<unknown> | unknown\n  set(key: string, value: unknown, opts?: { ttl?: number; tags?: string[] }): Promise<unknown> | unknown\n  deleteByTags?(tags: string[]): Promise<number> | number\n}\n\nconst CF_DEF_INDEX_CACHE_KEY_PREFIX = 'crud:cf-def-index'\n// Phase 2 default-off: integration runs observed `/api/customers/people`\n// returning 500 with this cache path active, and the readiness-probe\n// timeout blocked artifact upload so the direct stack trace was lost.\n// Until cross-request safety of the SQLite-cache JSON round-trip is\n// re-verified, ship with the layer disabled. Set\n// `OM_CF_DEF_CACHE_TTL_MS=300000` (or any positive integer) to opt in.\nconst CF_DEF_INDEX_DEFAULT_TTL_MS = 0\n\nfunction resolveCfDefIndexCacheTtlMs(): number {\n  const raw = process.env.OM_CF_DEF_CACHE_TTL_MS\n  if (raw === undefined) return CF_DEF_INDEX_DEFAULT_TTL_MS\n  const parsed = Number(raw)\n  if (!Number.isFinite(parsed) || parsed < 0) return CF_DEF_INDEX_DEFAULT_TTL_MS\n  return parsed\n}\n\nfunction buildCfDefIndexCacheKey(opts: {\n  tenantId: string | null\n  entityIds: string[]\n  organizationIds: string[]\n  fieldsetKey: string | null\n}): string {\n  const tenant = opts.tenantId ?? 'global'\n  const entities = opts.entityIds.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join('|')\n  const orgs = opts.organizationIds.length ? opts.organizationIds.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join('|') : 'none'\n  const fieldset = opts.fieldsetKey ?? 'all'\n  return `${CF_DEF_INDEX_CACHE_KEY_PREFIX}:${tenant}:${entities}:${orgs}:${fieldset}`\n}\n\nfunction buildCfDefIndexCacheTags(opts: {\n  tenantId: string | null\n  entityIds: string[]\n}): string[] {\n  const tenant = opts.tenantId ?? 'global'\n  const tagBase = `entities:definitions:${tenant}`\n  const tags = new Set<string>([tagBase])\n  for (const entityId of opts.entityIds) {\n    tags.add(`${tagBase}:entity:${entityId}`)\n  }\n  return Array.from(tags)\n}\n\nfunction normalizeFieldsetKey(value: string | string[] | null | undefined): string | null {\n  if (!value) return null\n  if (Array.isArray(value)) {\n    const cleaned = value\n      .map((entry) => (typeof entry === 'string' ? entry.trim() : ''))\n      .filter((entry) => entry.length > 0)\n    if (!cleaned.length) return null\n    return cleaned.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(',')\n  }\n  if (typeof value !== 'string') return null\n  const trimmed = value.trim()\n  return trimmed.length > 0 ? trimmed : null\n}\n\nfunction serializableIndexFromMap(index: CustomFieldDefinitionIndex): Array<[string, CustomFieldDefinitionSummary[]]> {\n  return Array.from(index.entries())\n}\n\nfunction indexMapFromSerializable(value: unknown): CustomFieldDefinitionIndex | null {\n  if (!Array.isArray(value)) return null\n  const map: CustomFieldDefinitionIndex = new Map()\n  for (const entry of value) {\n    if (!Array.isArray(entry) || entry.length !== 2) return null\n    const [key, summaries] = entry as [unknown, unknown]\n    if (typeof key !== 'string' || !Array.isArray(summaries)) return null\n    map.set(key, summaries as CustomFieldDefinitionSummary[])\n  }\n  return map\n}\n\n// Per-request micro-cache. Two CRUD calls within one HTTP request (rare but\n// possible via interceptors) share the same Map keyed by ctx-like objects.\nconst requestScopedCfDefIndexCache = new WeakMap<object, Map<string, CustomFieldDefinitionIndex>>()\n\nexport type CustomFieldDefinitionIndexCacheKey = string\n\nexport function getRequestScopedCfDefIndexCache(scope: object): Map<string, CustomFieldDefinitionIndex> {\n  let bucket = requestScopedCfDefIndexCache.get(scope)\n  if (!bucket) {\n    bucket = new Map()\n    requestScopedCfDefIndexCache.set(scope, bucket)\n  }\n  return bucket\n}\n\nasync function loadCustomFieldDefinitionIndexFresh(\n  opts: LoadCustomFieldDefinitionIndexOptions & { entityIds: string[]; orgCandidates: string[] }\n): Promise<CustomFieldDefinitionIndex> {\n  const { em, entityIds, orgCandidates } = opts\n  const tenantId = opts.tenantId ?? null\n  const scopeClauses: Record<string, unknown>[] = [\n    tenantId\n      ? { $or: [{ tenantId: tenantId as any }, { tenantId: null }] }\n      : { tenantId: null },\n  ]\n  if (orgCandidates.length) {\n    scopeClauses.push({\n      $or: [{ organizationId: { $in: orgCandidates as any } }, { organizationId: null }],\n    })\n  } else {\n    scopeClauses.push({ organizationId: null })\n  }\n  const where: Record<string, unknown> = {\n    entityId: { $in: entityIds as any },\n    deletedAt: null,\n    isActive: true,\n    $and: scopeClauses,\n  }\n  const defs = await em.find(CustomFieldDef, where as any)\n  const rows: CustomFieldDefinitionRow[] = defs.map((def) => ({\n    key: def.key,\n    entityId: String((def as any).entityId),\n    kind: typeof def.kind === 'string' ? def.kind : null,\n    configJson: (def as any).configJson,\n    organizationId: def.organizationId ?? null,\n    tenantId: def.tenantId ?? null,\n    deletedAt: (def as any).deletedAt ?? null,\n    updatedAt: (def as any).updatedAt ?? null,\n  }))\n  return buildCustomFieldDefinitionIndexFromRows(rows, {\n    organizationIds: orgCandidates,\n    fieldset: opts.fieldset,\n  })\n}\n\nexport async function loadCustomFieldDefinitionIndex(opts: LoadCustomFieldDefinitionIndexOptions & {\n  cache?: CustomFieldDefIndexCache | null\n  requestScope?: object | null\n}): Promise<CustomFieldDefinitionIndex> {\n  const list = Array.isArray(opts.entityIds) ? opts.entityIds : [opts.entityIds]\n  const entityIds = list\n    .map((id) => (typeof id === 'string' ? id.trim() : String(id ?? '')))\n    .filter((id) => id.length > 0)\n  if (!entityIds.length) return new Map()\n  const tenantId = opts.tenantId ?? null\n  const orgCandidates = Array.isArray(opts.organizationIds)\n    ? opts.organizationIds\n        .map((id) => (typeof id === 'string' ? id.trim() : id))\n        .filter((id): id is string => typeof id === 'string' && id.length > 0)\n    : []\n\n  const fieldsetKey = normalizeFieldsetKey(opts.fieldset)\n  const ttlMs = resolveCfDefIndexCacheTtlMs()\n  const cacheKey = buildCfDefIndexCacheKey({\n    tenantId,\n    entityIds,\n    organizationIds: orgCandidates,\n    fieldsetKey,\n  })\n\n  const requestBucket = opts.requestScope\n    ? getRequestScopedCfDefIndexCache(opts.requestScope)\n    : null\n  if (requestBucket) {\n    const cached = requestBucket.get(cacheKey)\n    if (cached) return cached\n  }\n\n  const sharedCache = ttlMs > 0 ? opts.cache ?? null : null\n  if (sharedCache && typeof sharedCache.get === 'function') {\n    try {\n      const cached = await sharedCache.get(cacheKey)\n      const restored = indexMapFromSerializable(cached)\n      if (restored) {\n        if (requestBucket) requestBucket.set(cacheKey, restored)\n        return restored\n      }\n    } catch (err) {\n      console.warn('[crud:cf-def-cache] read failed', err)\n    }\n  }\n\n  const index = await loadCustomFieldDefinitionIndexFresh({\n    ...opts,\n    entityIds,\n    orgCandidates,\n  })\n\n  if (sharedCache && typeof sharedCache.set === 'function') {\n    try {\n      await sharedCache.set(cacheKey, serializableIndexFromMap(index), {\n        ttl: ttlMs,\n        tags: buildCfDefIndexCacheTags({ tenantId, entityIds }),\n      })\n    } catch (err) {\n      console.warn('[crud:cf-def-cache] write failed', err)\n    }\n  }\n  if (requestBucket) requestBucket.set(cacheKey, index)\n  return index\n}\n\nexport type ApplyCustomFieldsNormalizationOptions = {\n  /**\n   * When true, removes raw `cf_*` and `cf:*` keys from the record once they\n   * have been extracted into `customValues` / `customFields`. Produces a single\n   * canonical response shape (issue #1769). Defaults to `false` to preserve the\n   * existing wire format for callers that read `cf_*` from the top level.\n   */\n  stripPrefixedKeys?: boolean\n}\n\nexport function applyCustomFieldsNormalization(\n  record: Record<string, unknown>,\n  decorated: CustomFieldDisplayPayload,\n  options: ApplyCustomFieldsNormalizationOptions = {},\n): Record<string, unknown> {\n  const stripPrefixedKeys = options.stripPrefixedKeys === true\n  const base: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(record)) {\n    if (stripPrefixedKeys && (key.startsWith('cf_') || key.startsWith('cf:'))) continue\n    base[key] = value\n  }\n  base.customValues = decorated.customValues\n  base.customFields = decorated.customFields\n  return base\n}\n\nexport function decorateRecordWithCustomFields(\n  record: Record<string, unknown>,\n  definitions: CustomFieldDefinitionIndex,\n  context: {\n    organizationId?: string | null\n    tenantId?: string | null\n  } = {},\n): CustomFieldDisplayPayload {\n  const rawEntries = extractAllCustomFieldEntries(record)\n  if (!Object.keys(rawEntries).length) {\n    return { customValues: null, customFields: [] }\n  }\n  const values: Record<string, unknown> = {}\n  const entries: Array<{ entry: CustomFieldDisplayEntry; priority: number; updatedAt: number }> = []\n  const organizationId = context.organizationId ?? null\n  const tenantId = context.tenantId ?? null\n\n  Object.entries(rawEntries).forEach(([prefixedKey, value]) => {\n    const bareKey = prefixedKey.replace(/^cf_/, '')\n    const normalizedKey = normalizeDefinitionKey(bareKey)\n    if (!normalizedKey) return\n    const defsForKey = definitions.get(normalizedKey) ?? []\n    const resolvedDef = selectDefinitionForRecord(defsForKey, organizationId, tenantId)\n    // Skip custom field values without active definitions to prevent orphaned fields\n    if (!resolvedDef) return\n    values[bareKey] = value\n    const entry: CustomFieldDisplayEntry = {\n      key: bareKey,\n      label: resolvedDef.label ?? bareKey,\n      value,\n      kind: resolvedDef.kind ?? null,\n      multi: resolvedDef.multi ?? Array.isArray(value),\n    }\n    entries.push({\n      entry,\n      priority: resolvedDef.priority ?? Number.MAX_SAFE_INTEGER,\n      updatedAt: resolvedDef.updatedAt ?? 0,\n    })\n  })\n\n  const ordered = entries\n    .sort((a, b) => {\n      const priorityDiff = a.priority - b.priority\n      if (priorityDiff !== 0) return priorityDiff\n      const updatedDiff = b.updatedAt - a.updatedAt\n      if (updatedDiff !== 0) return updatedDiff\n      return a.entry.key.localeCompare(b.entry.key)\n    })\n    .map((item) => item.entry)\n\n  return {\n    customValues: Object.keys(values).length ? values : null,\n    customFields: ordered,\n  }\n}\n\nexport async function loadCustomFieldValues(opts: {\n  em: EntityManager\n  entityId: EntityId\n  recordIds: string[]\n  tenantIdByRecord?: Record<string, string | null | undefined>\n  organizationIdByRecord?: Record<string, string | null | undefined>\n  tenantFallbacks?: (string | null | undefined)[]\n  encryptionService?: TenantDataEncryptionService | null\n}): Promise<Record<string, Record<string, unknown>>> {\n  const { em, entityId, recordIds } = opts\n  if (!Array.isArray(recordIds) || recordIds.length === 0) return {}\n\n  const normalizedRecordIds = recordIds.map((id) => String(id))\n  let encryptionService: TenantDataEncryptionService | null | undefined\n  const encryptionCache = new Map<string | null, string | null>()\n  const getEncryptionService = () => {\n    if (encryptionService !== undefined) return encryptionService\n    encryptionService = resolveTenantEncryptionService(em, opts.encryptionService)\n    return encryptionService\n  }\n  const tenantCandidates = new Set<string | null>()\n  tenantCandidates.add(null)\n  if (opts.tenantIdByRecord) {\n    for (const val of Object.values(opts.tenantIdByRecord)) {\n      tenantCandidates.add(val ? String(val) : null)\n    }\n  }\n  if (opts.tenantFallbacks) {\n    for (const val of opts.tenantFallbacks) tenantCandidates.add(val ? String(val) : null)\n  }\n  const fallbackTenant = (opts.tenantFallbacks || []).find((t) => t != null) ?? null\n\n  const tenantList = Array.from(tenantCandidates)\n  const tenantNonNull = tenantList.filter((t): t is string => t !== null)\n  const tenantFilter = tenantNonNull.length\n    ? { tenantId: { $in: [...tenantNonNull, null] as any } }\n    : { tenantId: null }\n  const cfRows = await em.find(CustomFieldValue, {\n    entityId: entityId as any,\n    recordId: { $in: normalizedRecordIds as any },\n    deletedAt: null,\n    ...(tenantList.length ? tenantFilter : {}),\n  })\n\n  if (!cfRows.length) return {}\n\n  const allKeys = Array.from(new Set(cfRows.map((row) => String(row.fieldKey))))\n  const organizationCandidates = new Set<string | null>()\n  organizationCandidates.add(null)\n  if (opts.organizationIdByRecord) {\n    for (const val of Object.values(opts.organizationIdByRecord)) {\n      organizationCandidates.add(val ? String(val) : null)\n    }\n  }\n  for (const row of cfRows) {\n    organizationCandidates.add(row.organizationId ? String(row.organizationId) : null)\n  }\n  const orgList = Array.from(organizationCandidates)\n\n  const defs = allKeys.length\n    ? await em.find(CustomFieldDef, {\n        entityId: entityId as any,\n        key: { $in: allKeys as any },\n        deletedAt: null,\n        isActive: true,\n        ...(tenantList.length ? { tenantId: tenantFilter.tenantId } : {}),\n        organizationId: { $in: orgList as any },\n      })\n    : []\n\n  const defsByKey = new Map<string, CustomFieldDef[]>()\n  for (const def of defs) {\n    const list = defsByKey.get(def.key) || []\n    list.push(def)\n    defsByKey.set(def.key, list)\n  }\n\n  const pickDefinition = (fieldKey: string, organizationId: string | null, tenantId: string | null) => {\n    const candidates = defsByKey.get(fieldKey)\n    if (!candidates || candidates.length === 0) return null\n    const active = candidates.filter((opt) => opt.isActive !== false && !opt.deletedAt)\n    const list = active.length ? active : candidates\n    if (organizationId && tenantId) {\n      const exact = list.find((opt) => opt.organizationId === organizationId && opt.tenantId === tenantId)\n      if (exact) return exact\n    }\n    if (organizationId) {\n      const orgMatch = list.find((opt) => opt.organizationId === organizationId && (!tenantId || opt.tenantId == null || opt.tenantId === tenantId))\n      if (orgMatch) return orgMatch\n    }\n    if (tenantId) {\n      const tenantMatch = list.find((opt) => opt.organizationId == null && opt.tenantId === tenantId)\n      if (tenantMatch) return tenantMatch\n    }\n    const global = list.find((opt) => opt.organizationId == null && opt.tenantId == null)\n    return global ?? list[0]\n  }\n\n  const valueFromRow = (row: CustomFieldValue): unknown => {\n    if (row.valueMultiline !== null && row.valueMultiline !== undefined) return row.valueMultiline\n    if (row.valueText !== null && row.valueText !== undefined) return row.valueText\n    if (row.valueInt !== null && row.valueInt !== undefined) return row.valueInt\n    if (row.valueFloat !== null && row.valueFloat !== undefined) return row.valueFloat\n    if (row.valueBool !== null && row.valueBool !== undefined) return row.valueBool\n    return null\n  }\n\n  type Bucket = { orgId: string | null; tenantId: string | null; values: unknown[]; def?: CustomFieldDef | null; encrypted?: boolean }\n  const buckets = new Map<string, Bucket>()\n\n  const rowInfos = cfRows.map((row) => {\n    const recordId = String(row.recordId)\n    const key = String(row.fieldKey)\n    const bucketKey = `${recordId}::${key}`\n    const orgId = row.organizationId ? String(row.organizationId) : null\n    const tenantId = row.tenantId ? String(row.tenantId) : null\n    const resolvedOrgId = orgId ?? (opts.organizationIdByRecord?.[recordId] ?? null)\n    const resolvedTenantId = tenantId ?? (opts.tenantIdByRecord?.[recordId] ?? fallbackTenant)\n    const def = pickDefinition(key, resolvedOrgId, resolvedTenantId)\n    const encrypted = Boolean(def?.configJson && (def as any).configJson?.encrypted)\n    const value = valueFromRow(row)\n    return { bucketKey, resolvedOrgId, resolvedTenantId, tenantId, def, encrypted, value }\n  })\n\n  // Decrypt every encrypted value concurrently so a list of N rows \u00D7 M encrypted\n  // fields costs the slowest single decryption rather than the sum (issue #2229).\n  // The shared encryptionCache keeps DEK lookups deduped per tenant.\n  const decryptedValues = await Promise.all(\n    rowInfos.map((info) =>\n      info.encrypted\n        ? decryptCustomFieldValue(\n            info.value,\n            info.resolvedTenantId ?? info.tenantId ?? null,\n            getEncryptionService(),\n            encryptionCache,\n            { kind: info.def?.kind ?? null },\n          )\n        : info.value,\n    ),\n  )\n\n  rowInfos.forEach((info, index) => {\n    const decrypted = decryptedValues[index]\n    const existing = buckets.get(info.bucketKey)\n    if (existing) {\n      if (existing.orgId == null && info.resolvedOrgId) existing.orgId = info.resolvedOrgId\n      if (existing.tenantId == null && info.resolvedTenantId) existing.tenantId = info.resolvedTenantId\n      if (existing.def == null && info.def) existing.def = info.def\n      existing.encrypted = existing.encrypted || info.encrypted\n      existing.values.push(decrypted)\n    } else {\n      buckets.set(info.bucketKey, { orgId: info.resolvedOrgId, tenantId: info.resolvedTenantId, values: [decrypted], def: info.def ?? null, encrypted: info.encrypted })\n    }\n  })\n\n  const result: Record<string, Record<string, unknown>> = {}\n  for (const [compoundKey, bucket] of buckets.entries()) {\n    const [recordId, fieldKey] = compoundKey.split('::')\n    if (!result[recordId]) result[recordId] = {}\n    const prefixed = `cf_${fieldKey}`\n    const def = bucket.def ?? pickDefinition(fieldKey, bucket.orgId ?? (opts.organizationIdByRecord?.[recordId] ?? null), bucket.tenantId ?? (opts.tenantIdByRecord?.[recordId] ?? null))\n    if (def && def.configJson && typeof def.configJson === 'object' && (def.configJson as any).multi) {\n      const cleaned = bucket.values.filter((v) => v !== undefined && v !== null)\n      result[recordId][prefixed] = cleaned\n    } else if (bucket.values.length > 1) {\n      const cleaned = bucket.values.filter((v) => v !== undefined)\n      result[recordId][prefixed] = cleaned\n    } else {\n      result[recordId][prefixed] = bucket.values[0] ?? null\n    }\n  }\n\n  return result\n}\n\nexport function summarizeCustomFields(record: Record<string, unknown>): CustomFieldSnapshot {\n  const entries = extractAllCustomFieldEntries(record)\n  const values = Object.fromEntries(\n    Object.entries(entries).map(([prefixedKey, value]) => [\n      prefixedKey.replace(/^cf_/, ''),\n      value,\n    ]),\n  )\n  const customValues = Object.keys(values).length ? values : null\n  const customFields = Object.entries(values).map(([key, value]) => ({\n    key,\n    label: key,\n    value,\n    kind: null,\n    multi: Array.isArray(value),\n  }))\n  return { entries, customValues, customFields }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { CustomFieldSet, EntityId } from '@open-mercato/shared/modules/entities'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { CustomFieldDef, CustomFieldValue } from '@open-mercato/core/modules/entities/data/entities'\nimport type { WhereValue } from '@open-mercato/shared/lib/query/types'\nimport type { TenantDataEncryptionService } from '../encryption/tenantDataEncryptionService'\nimport { decryptCustomFieldValue, resolveTenantEncryptionService } from '../encryption/customFieldValues'\nimport { parseBooleanToken } from '../boolean'\nimport { extractCustomFieldEntries } from './custom-fields-client'\nimport { createLogger } from '../logger'\nimport {\n  buildCustomFieldDefinitionIndexFromRows,\n  normalizeDefinitionKey,\n  normalizeFieldsetFilter,\n  selectDefinitionForRecord,\n  type CustomFieldDefinitionIndex,\n  type CustomFieldDefinitionRow,\n  type CustomFieldDefinitionSummary,\n} from './custom-field-definition-index'\n\nconst logger = createLogger('shared').child({ component: 'crud' })\n\nexport type { CustomFieldDefinitionSummary, CustomFieldDefinitionIndex } from './custom-field-definition-index'\n\nexport type CustomFieldSelectors = {\n  keys: string[]\n  selectors: string[] // e.g. ['cf:priority', 'cf:severity']\n  outputKeys: string[] // e.g. ['cf_priority', 'cf_severity']\n}\n\nexport type SplitCustomFieldPayload = {\n  base: Record<string, unknown>\n  custom: Record<string, unknown>\n}\n\nexport type CustomFieldDisplayEntry = {\n  key: string\n  label: string | null\n  value: unknown\n  kind: string | null\n  multi: boolean\n}\n\nexport type CustomFieldDisplayPayload = {\n  customValues: Record<string, unknown> | null\n  customFields: CustomFieldDisplayEntry[]\n}\n\nexport type CustomFieldSnapshot = {\n  entries: Record<string, unknown>\n  customValues: Record<string, unknown> | null\n  customFields: CustomFieldDisplayEntry[]\n}\n\nexport function buildCustomFieldSelectorsForEntity(entityId: EntityId, sets: CustomFieldSet[]): CustomFieldSelectors {\n  const keys = Array.from(new Set(\n    (sets || [])\n      .filter((s) => s.entity === entityId)\n      .flatMap((s) => (s.fields || []).map((f) => f.key))\n  ))\n  const selectors = keys.map((k) => `cf:${k}`)\n  const outputKeys = keys.map((k) => `cf_${k}`)\n  return { keys, selectors, outputKeys }\n}\n\nexport function normalizeCustomFieldValue(val: unknown): unknown {\n  if (Array.isArray(val)) return val\n  if (typeof val === 'string') {\n    const s = val.trim()\n    // Parse Postgres array-like '{a,b,c}' to string[] when present\n    if (s.startsWith('{') && s.endsWith('}')) {\n      const inner = s.slice(1, -1).trim()\n      if (!inner) return []\n      return inner.split(/[\\s,]+/).map((x) => x.trim()).filter(Boolean)\n    }\n    return s\n  }\n  return val as any\n}\n\n// Extracts cf_* fields from a record that may contain both 'cf:<key>' and/or 'cf_<key>'\nexport function extractCustomFieldsFromItem(item: Record<string, unknown>, keys: string[]): Record<string, unknown> {\n  const out: Record<string, unknown> = {}\n  for (const key of keys) {\n    const colon = item[`cf:${key}` as keyof typeof item]\n    const snake = item[`cf_${key}` as keyof typeof item]\n    const value = colon !== undefined ? colon : snake\n    if (value !== undefined) out[`cf_${key}`] = normalizeCustomFieldValue(value)\n  }\n  return out\n}\n\nexport function extractAllCustomFieldEntries(item: Record<string, unknown>): Record<string, unknown> {\n  return extractCustomFieldEntries(item)\n}\n\nexport async function buildCustomFieldFiltersFromQuery(opts: {\n  entityId?: EntityId\n  entityIds?: EntityId[]\n  query: Record<string, unknown>\n  em: EntityManager\n  tenantId: string | null | undefined\n  fieldset?: string | string[] | null\n}): Promise<Record<string, WhereValue>> {\n  const out: Record<string, WhereValue> = {}\n  const entries = Object.entries(opts.query).filter(([k]) => k.startsWith('cf_'))\n  if (!entries.length) return out\n\n  const entityIdList = Array.isArray(opts.entityIds) && opts.entityIds.length\n    ? opts.entityIds\n    : opts.entityId\n      ? [opts.entityId]\n      : []\n  if (!entityIdList.length) return out\n\n  // Tenant-only scope: allow global (null) or tenant match; ignore organization here\n  const defs = await opts.em.find(CustomFieldDef, {\n    entityId: { $in: entityIdList as any },\n    isActive: true,\n    $and: [\n      { $or: [ { tenantId: opts.tenantId as any }, { tenantId: null } ] },\n    ],\n  })\n  const fieldsetFilter = normalizeFieldsetFilter(opts.fieldset)\n  const order = new Map<string, number>()\n  entityIdList.map(String).forEach((id, index) => order.set(id, index))\n  const byKey: Record<string, { kind: string; multi?: boolean; entityId: string }> = {}\n  for (const d of defs) {\n    if (fieldsetFilter) {\n      const fieldsets = Array.isArray(d.configJson?.fieldsets)\n        ? d.configJson.fieldsets\n            .filter((entry: unknown): entry is string => typeof entry === 'string')\n            .map((entry: string) => entry.trim())\n            .filter((entry: string) => entry.length > 0)\n        : []\n      const rawFieldset = typeof d.configJson?.fieldset === 'string' ? d.configJson.fieldset.trim() : ''\n      const normalizedFieldset = rawFieldset.length ? rawFieldset : null\n      const matches = fieldsets.length > 0\n        ? fieldsets.some((entry: string) => fieldsetFilter.has(entry))\n        : fieldsetFilter.has(normalizedFieldset)\n      if (!matches) continue\n    }\n    const key = d.key\n    const entityId = String(d.entityId)\n    const current = byKey[key]\n    const rankNew = order.get(entityId) ?? Number.MAX_SAFE_INTEGER\n    if (!current) {\n      byKey[key] = { kind: d.kind, multi: Boolean((d as any).configJson?.multi), entityId }\n      continue\n    }\n    const rankOld = order.get(current.entityId) ?? Number.MAX_SAFE_INTEGER\n    if (rankNew < rankOld) {\n      byKey[key] = { kind: d.kind, multi: Boolean((d as any).configJson?.multi), entityId }\n    }\n  }\n\n  const coerce = (kind: string, v: unknown) => {\n    if (v == null) return v as undefined\n    switch (kind) {\n      case 'integer': return Number.parseInt(String(v), 10)\n      case 'float': return Number.parseFloat(String(v))\n      case 'boolean': return parseBooleanToken(String(v)) === true\n      case 'date':\n      case 'datetime': return String(v)\n      default: return String(v)\n    }\n  }\n\n  for (const [rawKey, rawVal] of entries) {\n    const isIn = rawKey.endsWith('In')\n    const key = isIn ? rawKey.replace(/^cf_/, '').replace(/In$/, '') : rawKey.replace(/^cf_/, '')\n    const def = byKey[key]\n    const fieldId = `cf:${key}`\n    if (!def) continue\n    if (isIn) {\n      const list = Array.isArray(rawVal)\n        ? (rawVal as unknown[])\n        : String(rawVal)\n            .split(',')\n            .map((s) => s.trim())\n            .filter(Boolean)\n      if (list.length) out[fieldId] = { $in: list.map((x) => coerce(def.kind, x)) as (string[] | number[] | boolean[]) }\n    } else {\n      out[fieldId] = coerce(def.kind, rawVal)\n    }\n  }\n\n  return out\n}\n\nexport function splitCustomFieldPayload(raw: unknown): SplitCustomFieldPayload {\n  const base: Record<string, unknown> = {}\n  const custom: Record<string, unknown> = {}\n  if (!raw || typeof raw !== 'object') return { base, custom }\n  for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {\n    if (key === 'customFields') {\n      if (Array.isArray(value)) {\n        value.forEach((entry) => {\n          if (!entry || typeof entry !== 'object') return\n          const entryKey = typeof (entry as any).key === 'string' ? (entry as any).key.trim() : ''\n          if (!entryKey) return\n          custom[entryKey] = (entry as any).value\n        })\n        continue\n      }\n      if (value && typeof value === 'object') {\n        for (const [ck, cv] of Object.entries(value as Record<string, unknown>)) {\n          const normalizedKey = typeof ck === 'string' ? ck.trim() : ''\n          if (!normalizedKey) continue\n          custom[normalizedKey] = cv\n        }\n        continue\n      }\n    }\n    if (key === 'customValues' && value && typeof value === 'object' && !Array.isArray(value)) {\n      for (const [ck, cv] of Object.entries(value as Record<string, unknown>)) {\n        custom[String(ck)] = cv\n      }\n      continue\n    }\n    if (key.startsWith('cf_')) {\n      custom[key.slice(3)] = value\n      continue\n    }\n    if (key.startsWith('cf:')) {\n      custom[key.slice(3)] = value\n      continue\n    }\n    base[key] = value\n  }\n  return { base, custom }\n}\n\nexport function extractCustomFieldValuesFromPayload(raw: Record<string, unknown>): Record<string, unknown> {\n  return splitCustomFieldPayload(raw).custom\n}\n\ntype LoadCustomFieldDefinitionIndexOptions = {\n  em: EntityManager\n  entityIds: string | string[]\n  tenantId?: string | null | undefined\n  organizationIds?: Array<string | null | undefined> | null\n  fieldset?: string | string[] | null\n}\n\ntype CustomFieldDefIndexCache = {\n  get(key: string): Promise<unknown> | unknown\n  set(key: string, value: unknown, opts?: { ttl?: number; tags?: string[] }): Promise<unknown> | unknown\n  deleteByTags?(tags: string[]): Promise<number> | number\n}\n\nconst CF_DEF_INDEX_CACHE_KEY_PREFIX = 'crud:cf-def-index'\n// Phase 2 default-off: integration runs observed `/api/customers/people`\n// returning 500 with this cache path active, and the readiness-probe\n// timeout blocked artifact upload so the direct stack trace was lost.\n// Until cross-request safety of the SQLite-cache JSON round-trip is\n// re-verified, ship with the layer disabled. Set\n// `OM_CF_DEF_CACHE_TTL_MS=300000` (or any positive integer) to opt in.\nconst CF_DEF_INDEX_DEFAULT_TTL_MS = 0\n\nfunction resolveCfDefIndexCacheTtlMs(): number {\n  const raw = process.env.OM_CF_DEF_CACHE_TTL_MS\n  if (raw === undefined) return CF_DEF_INDEX_DEFAULT_TTL_MS\n  const parsed = Number(raw)\n  if (!Number.isFinite(parsed) || parsed < 0) return CF_DEF_INDEX_DEFAULT_TTL_MS\n  return parsed\n}\n\nfunction buildCfDefIndexCacheKey(opts: {\n  tenantId: string | null\n  entityIds: string[]\n  organizationIds: string[]\n  fieldsetKey: string | null\n}): string {\n  const tenant = opts.tenantId ?? 'global'\n  const entities = opts.entityIds.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join('|')\n  const orgs = opts.organizationIds.length ? opts.organizationIds.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join('|') : 'none'\n  const fieldset = opts.fieldsetKey ?? 'all'\n  return `${CF_DEF_INDEX_CACHE_KEY_PREFIX}:${tenant}:${entities}:${orgs}:${fieldset}`\n}\n\nfunction buildCfDefIndexCacheTags(opts: {\n  tenantId: string | null\n  entityIds: string[]\n}): string[] {\n  const tenant = opts.tenantId ?? 'global'\n  const tagBase = `entities:definitions:${tenant}`\n  const tags = new Set<string>([tagBase])\n  for (const entityId of opts.entityIds) {\n    tags.add(`${tagBase}:entity:${entityId}`)\n  }\n  return Array.from(tags)\n}\n\nfunction normalizeFieldsetKey(value: string | string[] | null | undefined): string | null {\n  if (!value) return null\n  if (Array.isArray(value)) {\n    const cleaned = value\n      .map((entry) => (typeof entry === 'string' ? entry.trim() : ''))\n      .filter((entry) => entry.length > 0)\n    if (!cleaned.length) return null\n    return cleaned.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(',')\n  }\n  if (typeof value !== 'string') return null\n  const trimmed = value.trim()\n  return trimmed.length > 0 ? trimmed : null\n}\n\nfunction serializableIndexFromMap(index: CustomFieldDefinitionIndex): Array<[string, CustomFieldDefinitionSummary[]]> {\n  return Array.from(index.entries())\n}\n\nfunction indexMapFromSerializable(value: unknown): CustomFieldDefinitionIndex | null {\n  if (!Array.isArray(value)) return null\n  const map: CustomFieldDefinitionIndex = new Map()\n  for (const entry of value) {\n    if (!Array.isArray(entry) || entry.length !== 2) return null\n    const [key, summaries] = entry as [unknown, unknown]\n    if (typeof key !== 'string' || !Array.isArray(summaries)) return null\n    map.set(key, summaries as CustomFieldDefinitionSummary[])\n  }\n  return map\n}\n\n// Per-request micro-cache. Two CRUD calls within one HTTP request (rare but\n// possible via interceptors) share the same Map keyed by ctx-like objects.\nconst requestScopedCfDefIndexCache = new WeakMap<object, Map<string, CustomFieldDefinitionIndex>>()\n\nexport type CustomFieldDefinitionIndexCacheKey = string\n\nexport function getRequestScopedCfDefIndexCache(scope: object): Map<string, CustomFieldDefinitionIndex> {\n  let bucket = requestScopedCfDefIndexCache.get(scope)\n  if (!bucket) {\n    bucket = new Map()\n    requestScopedCfDefIndexCache.set(scope, bucket)\n  }\n  return bucket\n}\n\nasync function loadCustomFieldDefinitionIndexFresh(\n  opts: LoadCustomFieldDefinitionIndexOptions & { entityIds: string[]; orgCandidates: string[] }\n): Promise<CustomFieldDefinitionIndex> {\n  const { em, entityIds, orgCandidates } = opts\n  const tenantId = opts.tenantId ?? null\n  const scopeClauses: Record<string, unknown>[] = [\n    tenantId\n      ? { $or: [{ tenantId: tenantId as any }, { tenantId: null }] }\n      : { tenantId: null },\n  ]\n  if (orgCandidates.length) {\n    scopeClauses.push({\n      $or: [{ organizationId: { $in: orgCandidates as any } }, { organizationId: null }],\n    })\n  } else {\n    scopeClauses.push({ organizationId: null })\n  }\n  const where: Record<string, unknown> = {\n    entityId: { $in: entityIds as any },\n    deletedAt: null,\n    isActive: true,\n    $and: scopeClauses,\n  }\n  const defs = await em.find(CustomFieldDef, where as any)\n  const rows: CustomFieldDefinitionRow[] = defs.map((def) => ({\n    key: def.key,\n    entityId: String((def as any).entityId),\n    kind: typeof def.kind === 'string' ? def.kind : null,\n    configJson: (def as any).configJson,\n    organizationId: def.organizationId ?? null,\n    tenantId: def.tenantId ?? null,\n    deletedAt: (def as any).deletedAt ?? null,\n    updatedAt: (def as any).updatedAt ?? null,\n  }))\n  return buildCustomFieldDefinitionIndexFromRows(rows, {\n    organizationIds: orgCandidates,\n    fieldset: opts.fieldset,\n  })\n}\n\nexport async function loadCustomFieldDefinitionIndex(opts: LoadCustomFieldDefinitionIndexOptions & {\n  cache?: CustomFieldDefIndexCache | null\n  requestScope?: object | null\n}): Promise<CustomFieldDefinitionIndex> {\n  const list = Array.isArray(opts.entityIds) ? opts.entityIds : [opts.entityIds]\n  const entityIds = list\n    .map((id) => (typeof id === 'string' ? id.trim() : String(id ?? '')))\n    .filter((id) => id.length > 0)\n  if (!entityIds.length) return new Map()\n  const tenantId = opts.tenantId ?? null\n  const orgCandidates = Array.isArray(opts.organizationIds)\n    ? opts.organizationIds\n        .map((id) => (typeof id === 'string' ? id.trim() : id))\n        .filter((id): id is string => typeof id === 'string' && id.length > 0)\n    : []\n\n  const fieldsetKey = normalizeFieldsetKey(opts.fieldset)\n  const ttlMs = resolveCfDefIndexCacheTtlMs()\n  const cacheKey = buildCfDefIndexCacheKey({\n    tenantId,\n    entityIds,\n    organizationIds: orgCandidates,\n    fieldsetKey,\n  })\n\n  const requestBucket = opts.requestScope\n    ? getRequestScopedCfDefIndexCache(opts.requestScope)\n    : null\n  if (requestBucket) {\n    const cached = requestBucket.get(cacheKey)\n    if (cached) return cached\n  }\n\n  const sharedCache = ttlMs > 0 ? opts.cache ?? null : null\n  if (sharedCache && typeof sharedCache.get === 'function') {\n    try {\n      const cached = await sharedCache.get(cacheKey)\n      const restored = indexMapFromSerializable(cached)\n      if (restored) {\n        if (requestBucket) requestBucket.set(cacheKey, restored)\n        return restored\n      }\n    } catch (err) {\n      logger.warn('Custom-field definition cache read failed', { err })\n    }\n  }\n\n  const index = await loadCustomFieldDefinitionIndexFresh({\n    ...opts,\n    entityIds,\n    orgCandidates,\n  })\n\n  if (sharedCache && typeof sharedCache.set === 'function') {\n    try {\n      await sharedCache.set(cacheKey, serializableIndexFromMap(index), {\n        ttl: ttlMs,\n        tags: buildCfDefIndexCacheTags({ tenantId, entityIds }),\n      })\n    } catch (err) {\n      logger.warn('Custom-field definition cache write failed', { err })\n    }\n  }\n  if (requestBucket) requestBucket.set(cacheKey, index)\n  return index\n}\n\nexport type ApplyCustomFieldsNormalizationOptions = {\n  /**\n   * When true, removes raw `cf_*` and `cf:*` keys from the record once they\n   * have been extracted into `customValues` / `customFields`. Produces a single\n   * canonical response shape (issue #1769). Defaults to `false` to preserve the\n   * existing wire format for callers that read `cf_*` from the top level.\n   */\n  stripPrefixedKeys?: boolean\n}\n\nexport function applyCustomFieldsNormalization(\n  record: Record<string, unknown>,\n  decorated: CustomFieldDisplayPayload,\n  options: ApplyCustomFieldsNormalizationOptions = {},\n): Record<string, unknown> {\n  const stripPrefixedKeys = options.stripPrefixedKeys === true\n  const base: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(record)) {\n    if (stripPrefixedKeys && (key.startsWith('cf_') || key.startsWith('cf:'))) continue\n    base[key] = value\n  }\n  base.customValues = decorated.customValues\n  base.customFields = decorated.customFields\n  return base\n}\n\nexport function decorateRecordWithCustomFields(\n  record: Record<string, unknown>,\n  definitions: CustomFieldDefinitionIndex,\n  context: {\n    organizationId?: string | null\n    tenantId?: string | null\n  } = {},\n): CustomFieldDisplayPayload {\n  const rawEntries = extractAllCustomFieldEntries(record)\n  if (!Object.keys(rawEntries).length) {\n    return { customValues: null, customFields: [] }\n  }\n  const values: Record<string, unknown> = {}\n  const entries: Array<{ entry: CustomFieldDisplayEntry; priority: number; updatedAt: number }> = []\n  const organizationId = context.organizationId ?? null\n  const tenantId = context.tenantId ?? null\n\n  Object.entries(rawEntries).forEach(([prefixedKey, value]) => {\n    const bareKey = prefixedKey.replace(/^cf_/, '')\n    const normalizedKey = normalizeDefinitionKey(bareKey)\n    if (!normalizedKey) return\n    const defsForKey = definitions.get(normalizedKey) ?? []\n    const resolvedDef = selectDefinitionForRecord(defsForKey, organizationId, tenantId)\n    // Skip custom field values without active definitions to prevent orphaned fields\n    if (!resolvedDef) return\n    values[bareKey] = value\n    const entry: CustomFieldDisplayEntry = {\n      key: bareKey,\n      label: resolvedDef.label ?? bareKey,\n      value,\n      kind: resolvedDef.kind ?? null,\n      multi: resolvedDef.multi ?? Array.isArray(value),\n    }\n    entries.push({\n      entry,\n      priority: resolvedDef.priority ?? Number.MAX_SAFE_INTEGER,\n      updatedAt: resolvedDef.updatedAt ?? 0,\n    })\n  })\n\n  const ordered = entries\n    .sort((a, b) => {\n      const priorityDiff = a.priority - b.priority\n      if (priorityDiff !== 0) return priorityDiff\n      const updatedDiff = b.updatedAt - a.updatedAt\n      if (updatedDiff !== 0) return updatedDiff\n      return a.entry.key.localeCompare(b.entry.key)\n    })\n    .map((item) => item.entry)\n\n  return {\n    customValues: Object.keys(values).length ? values : null,\n    customFields: ordered,\n  }\n}\n\nexport async function loadCustomFieldValues(opts: {\n  em: EntityManager\n  entityId: EntityId\n  recordIds: string[]\n  tenantIdByRecord?: Record<string, string | null | undefined>\n  organizationIdByRecord?: Record<string, string | null | undefined>\n  tenantFallbacks?: (string | null | undefined)[]\n  encryptionService?: TenantDataEncryptionService | null\n}): Promise<Record<string, Record<string, unknown>>> {\n  const { em, entityId, recordIds } = opts\n  if (!Array.isArray(recordIds) || recordIds.length === 0) return {}\n\n  const normalizedRecordIds = recordIds.map((id) => String(id))\n  let encryptionService: TenantDataEncryptionService | null | undefined\n  const encryptionCache = new Map<string | null, string | null>()\n  const getEncryptionService = () => {\n    if (encryptionService !== undefined) return encryptionService\n    encryptionService = resolveTenantEncryptionService(em, opts.encryptionService)\n    return encryptionService\n  }\n  const tenantCandidates = new Set<string | null>()\n  tenantCandidates.add(null)\n  if (opts.tenantIdByRecord) {\n    for (const val of Object.values(opts.tenantIdByRecord)) {\n      tenantCandidates.add(val ? String(val) : null)\n    }\n  }\n  if (opts.tenantFallbacks) {\n    for (const val of opts.tenantFallbacks) tenantCandidates.add(val ? String(val) : null)\n  }\n  const fallbackTenant = (opts.tenantFallbacks || []).find((t) => t != null) ?? null\n\n  const tenantList = Array.from(tenantCandidates)\n  const tenantNonNull = tenantList.filter((t): t is string => t !== null)\n  const tenantFilter = tenantNonNull.length\n    ? { tenantId: { $in: [...tenantNonNull, null] as any } }\n    : { tenantId: null }\n  const cfRows = await em.find(CustomFieldValue, {\n    entityId: entityId as any,\n    recordId: { $in: normalizedRecordIds as any },\n    deletedAt: null,\n    ...(tenantList.length ? tenantFilter : {}),\n  })\n\n  if (!cfRows.length) return {}\n\n  const allKeys = Array.from(new Set(cfRows.map((row) => String(row.fieldKey))))\n  const organizationCandidates = new Set<string | null>()\n  organizationCandidates.add(null)\n  if (opts.organizationIdByRecord) {\n    for (const val of Object.values(opts.organizationIdByRecord)) {\n      organizationCandidates.add(val ? String(val) : null)\n    }\n  }\n  for (const row of cfRows) {\n    organizationCandidates.add(row.organizationId ? String(row.organizationId) : null)\n  }\n  const orgList = Array.from(organizationCandidates)\n\n  const defs = allKeys.length\n    ? await em.find(CustomFieldDef, {\n        entityId: entityId as any,\n        key: { $in: allKeys as any },\n        deletedAt: null,\n        isActive: true,\n        ...(tenantList.length ? { tenantId: tenantFilter.tenantId } : {}),\n        organizationId: { $in: orgList as any },\n      })\n    : []\n\n  const defsByKey = new Map<string, CustomFieldDef[]>()\n  for (const def of defs) {\n    const list = defsByKey.get(def.key) || []\n    list.push(def)\n    defsByKey.set(def.key, list)\n  }\n\n  const pickDefinition = (fieldKey: string, organizationId: string | null, tenantId: string | null) => {\n    const candidates = defsByKey.get(fieldKey)\n    if (!candidates || candidates.length === 0) return null\n    const active = candidates.filter((opt) => opt.isActive !== false && !opt.deletedAt)\n    const list = active.length ? active : candidates\n    if (organizationId && tenantId) {\n      const exact = list.find((opt) => opt.organizationId === organizationId && opt.tenantId === tenantId)\n      if (exact) return exact\n    }\n    if (organizationId) {\n      const orgMatch = list.find((opt) => opt.organizationId === organizationId && (!tenantId || opt.tenantId == null || opt.tenantId === tenantId))\n      if (orgMatch) return orgMatch\n    }\n    if (tenantId) {\n      const tenantMatch = list.find((opt) => opt.organizationId == null && opt.tenantId === tenantId)\n      if (tenantMatch) return tenantMatch\n    }\n    const global = list.find((opt) => opt.organizationId == null && opt.tenantId == null)\n    return global ?? list[0]\n  }\n\n  const valueFromRow = (row: CustomFieldValue): unknown => {\n    if (row.valueMultiline !== null && row.valueMultiline !== undefined) return row.valueMultiline\n    if (row.valueText !== null && row.valueText !== undefined) return row.valueText\n    if (row.valueInt !== null && row.valueInt !== undefined) return row.valueInt\n    if (row.valueFloat !== null && row.valueFloat !== undefined) return row.valueFloat\n    if (row.valueBool !== null && row.valueBool !== undefined) return row.valueBool\n    return null\n  }\n\n  type Bucket = { orgId: string | null; tenantId: string | null; values: unknown[]; def?: CustomFieldDef | null; encrypted?: boolean }\n  const buckets = new Map<string, Bucket>()\n\n  const rowInfos = cfRows.map((row) => {\n    const recordId = String(row.recordId)\n    const key = String(row.fieldKey)\n    const bucketKey = `${recordId}::${key}`\n    const orgId = row.organizationId ? String(row.organizationId) : null\n    const tenantId = row.tenantId ? String(row.tenantId) : null\n    const resolvedOrgId = orgId ?? (opts.organizationIdByRecord?.[recordId] ?? null)\n    const resolvedTenantId = tenantId ?? (opts.tenantIdByRecord?.[recordId] ?? fallbackTenant)\n    const def = pickDefinition(key, resolvedOrgId, resolvedTenantId)\n    const encrypted = Boolean(def?.configJson && (def as any).configJson?.encrypted)\n    const value = valueFromRow(row)\n    return { bucketKey, resolvedOrgId, resolvedTenantId, tenantId, def, encrypted, value }\n  })\n\n  // Decrypt every encrypted value concurrently so a list of N rows \u00D7 M encrypted\n  // fields costs the slowest single decryption rather than the sum (issue #2229).\n  // The shared encryptionCache keeps DEK lookups deduped per tenant.\n  const decryptedValues = await Promise.all(\n    rowInfos.map((info) =>\n      info.encrypted\n        ? decryptCustomFieldValue(\n            info.value,\n            info.resolvedTenantId ?? info.tenantId ?? null,\n            getEncryptionService(),\n            encryptionCache,\n            { kind: info.def?.kind ?? null },\n          )\n        : info.value,\n    ),\n  )\n\n  rowInfos.forEach((info, index) => {\n    const decrypted = decryptedValues[index]\n    const existing = buckets.get(info.bucketKey)\n    if (existing) {\n      if (existing.orgId == null && info.resolvedOrgId) existing.orgId = info.resolvedOrgId\n      if (existing.tenantId == null && info.resolvedTenantId) existing.tenantId = info.resolvedTenantId\n      if (existing.def == null && info.def) existing.def = info.def\n      existing.encrypted = existing.encrypted || info.encrypted\n      existing.values.push(decrypted)\n    } else {\n      buckets.set(info.bucketKey, { orgId: info.resolvedOrgId, tenantId: info.resolvedTenantId, values: [decrypted], def: info.def ?? null, encrypted: info.encrypted })\n    }\n  })\n\n  const result: Record<string, Record<string, unknown>> = {}\n  for (const [compoundKey, bucket] of buckets.entries()) {\n    const [recordId, fieldKey] = compoundKey.split('::')\n    if (!result[recordId]) result[recordId] = {}\n    const prefixed = `cf_${fieldKey}`\n    const def = bucket.def ?? pickDefinition(fieldKey, bucket.orgId ?? (opts.organizationIdByRecord?.[recordId] ?? null), bucket.tenantId ?? (opts.tenantIdByRecord?.[recordId] ?? null))\n    if (def && def.configJson && typeof def.configJson === 'object' && (def.configJson as any).multi) {\n      const cleaned = bucket.values.filter((v) => v !== undefined && v !== null)\n      result[recordId][prefixed] = cleaned\n    } else if (bucket.values.length > 1) {\n      const cleaned = bucket.values.filter((v) => v !== undefined)\n      result[recordId][prefixed] = cleaned\n    } else {\n      result[recordId][prefixed] = bucket.values[0] ?? null\n    }\n  }\n\n  return result\n}\n\nexport function summarizeCustomFields(record: Record<string, unknown>): CustomFieldSnapshot {\n  const entries = extractAllCustomFieldEntries(record)\n  const values = Object.fromEntries(\n    Object.entries(entries).map(([prefixedKey, value]) => [\n      prefixedKey.replace(/^cf_/, ''),\n      value,\n    ]),\n  )\n  const customValues = Object.keys(values).length ? values : null\n  const customFields = Object.entries(values).map(([key, value]) => ({\n    key,\n    label: key,\n    value,\n    kind: null,\n    multi: Array.isArray(value),\n  }))\n  return { entries, customValues, customFields }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/crud/enricher-runner.js

@@ -1,5 +1,7 @@
 import { getEnrichersForEntity } from "./enricher-registry.js";
 import { logEnricherTiming } from "../umes/enricher-timing.js";
+import { createLogger } from "../logger/index.js";
+const logger = createLogger("shared").child({ component: "umes" });
 const DEFAULT_TIMEOUT = 2e3;
 const SLOW_WARN_MS = 100;
 const SLOW_ERROR_MS = 500;
@@ -148,13 +150,9 @@ async function applyResponseEnrichers(items, targetEntity, context, preFilteredE
       }
       const elapsedMs = Date.now() - startTime;
       if (elapsedMs > SLOW_ERROR_MS) {
-        console.error(
-          `[UMES] Enricher ${enricher.id} took ${elapsedMs}ms (threshold: ${SLOW_ERROR_MS}ms)`
-        );
+        logger.error("Enricher exceeded slow threshold", { enricherId: enricher.id, elapsedMs, thresholdMs: SLOW_ERROR_MS });
       } else if (elapsedMs > SLOW_WARN_MS) {
-        console.warn(
-          `[UMES] Enricher ${enricher.id} took ${elapsedMs}ms (threshold: ${SLOW_WARN_MS}ms)`
-        );
+        logger.warn("Enricher exceeded slow threshold", { enricherId: enricher.id, elapsedMs, thresholdMs: SLOW_WARN_MS });
       }
       logEnricherTiming(enricher.id, entry.moduleId, targetEntity, elapsedMs);
       currentItems = result;
@@ -172,8 +170,7 @@ async function applyResponseEnrichers(items, targetEntity, context, preFilteredE
       if (enricher.critical) {
         throw err;
       }
-      const message = err instanceof Error ? err.message : String(err);
-      console.warn(`[UMES] Enricher ${enricher.id} failed: ${message}`);
+      logger.warn("Enricher failed", { enricherId: enricher.id, err });
       enricherErrors.push(enricher.id);
       if (enricher.fallback) {
         currentItems = currentItems.map((item) => ({
@@ -237,8 +234,7 @@ async function applyResponseEnricherToRecord(record, targetEntity, context, preF
       if (enricher.critical) {
         throw err;
       }
-      const message = err instanceof Error ? err.message : String(err);
-      console.warn(`[UMES] Enricher ${enricher.id} failed: ${message}`);
+      logger.warn("Enricher failed", { enricherId: enricher.id, err });
       enricherErrors.push(enricher.id);
       if (enricher.fallback) {
         currentRecord = { ...currentRecord, ...enricher.fallback };