@open-mercato/shared 0.8.1-develop.7275.1.f772b944d4 → 0.8.1-develop.7295.1.d0e0e33014

package/.turbo/turbo-build.log

@@ -1,2 +1,3 @@
-[build:shared] found 293 entry points
+[generate-countries] up to date (259 countries)
+[build:shared] found 299 entry points
 [build:shared] built successfully

package/AGENTS.md

@@ -124,9 +124,12 @@ index stores hashes of the plaintext, so it keeps matching. Issue #2990.
 - `matched: true` with `ids: []` is a real empty result.
 - Queries that go through the query engine get this routing automatically; raw
   `em.find` / Kysely list routes must wire it themselves. One carve-out: with
-  `OM_SEARCH_USE_ILIKE_FOR_NON_ENCRYPTED_FIELDS=true` (default false), a base-column
-  `like`/`ilike` on a **plaintext** column runs as exact SQL ILIKE instead of the token
-  rewrite — encrypted columns keep the token path either way. When the fallback would run
+  `OM_SEARCH_USE_ILIKE_FOR_NON_ENCRYPTED_FIELDS=true` (**off by default per #5383**, opt in ahead
+  of it to fix #5803), a base-column `like`/`ilike` on a **plaintext** column runs as SQL ILIKE —
+  one containment predicate per word of the term, ANDed (`lib/search/containment`), so word-order
+  independence survives the reroute — instead of the token rewrite; encrypted columns keep the
+  token path either way. Leaving the var unset keeps the legacy rewrite-everything behavior. When
+  the fallback would run
   `ILIKE` against an encrypted column, both query engines now log a warning
   (`lib/query/ciphertext-search-warning`) instead of degrading silently.
 - The `…WithDecryption` helpers log the same warning outside production when the `where`

package/build.mjs

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 import { buildPackage } from '../../scripts/build-package.mjs'
 import { buildVersionSource } from './scripts/versionSource.cjs'
 
@@ -22,4 +22,7 @@ const injectVersion = {
 await buildPackage(packageDir, {
   name: 'shared',
   extraPlugins: [injectVersion],
+  async beforeBuild() {
+    await import(pathToFileURL(join(packageDir, 'scripts/generate-countries.mjs')).href)
+  },
 })

package/dist/lib/crud/errors.js

@@ -45,6 +45,10 @@ function assertFound(value, message) {
   if (!value) throw notFound(message);
   return value;
 }
+function translateCrudErrorBody(body, translate) {
+  if (typeof body?.error !== "string") return body;
+  return { ...body, error: translate(body.error, body.error) };
+}
 export {
   CrudHttpError,
   assertFound,
@@ -53,6 +57,7 @@ export {
   forbidden,
   isCrudHttpError,
   isUniqueViolation,
-  notFound
+  notFound,
+  translateCrudErrorBody
 };
 //# sourceMappingURL=errors.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/crud/errors.ts"],
-  "sourcesContent": ["// Use Symbol.for so the marker survives module duplication across bundle boundaries\n// (same behaviour as globalThis-based registries used for DI registrars)\nconst CRUD_HTTP_ERROR_MARKER = Symbol.for('@open-mercato/CrudHttpError')\n\nexport class CrudHttpError extends Error {\n  readonly [CRUD_HTTP_ERROR_MARKER] = true\n  status: number\n  body: Record<string, any>\n\n  constructor(\n    status: number,\n    body?: Record<string, any> | string,\n    options?: { cause?: unknown },\n  ) {\n    const normalizedBody = typeof body === 'string' ? { error: body } : body ?? {}\n    super(typeof body === 'string' ? body : normalizedBody.error ?? 'Request failed', options)\n    this.status = status\n    this.body = normalizedBody\n  }\n}\n\n/**\n * Type-safe check for CrudHttpError that works across module/bundle boundaries.\n * Prefer this over `instanceof CrudHttpError` whenever the error may originate\n * from a different module bundle (e.g. enterprise packages, dynamic imports).\n */\nexport function isCrudHttpError(err: unknown): err is CrudHttpError {\n  return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[CRUD_HTTP_ERROR_MARKER] === true\n}\n\nexport function badRequest(message: string): CrudHttpError {\n  return new CrudHttpError(400, { error: message })\n}\n\nexport function forbidden(message = 'Forbidden'): CrudHttpError {\n  return new CrudHttpError(403, { error: message })\n}\n\n/**\n * Builds the standardized 404 (`{ error: message }`) \u2014 use it instead of hand-rolling\n * `new CrudHttpError(404, { error: message })`. Reach for this in guard statements, where\n * the lookup spans several lines or the condition is compound\n * (`if (!entity || entity.tenantId !== auth.tenantId) throw notFound(msg)`); TypeScript\n * still narrows the value after the throw. For a plain inline lookup, `assertFound` is terser.\n *\n * Pass an already-translated message; this helper never derives one, so 404 copy\n * stays routed through i18n.\n */\nexport function notFound(message = 'Not found'): CrudHttpError {\n  return new CrudHttpError(404, { error: message })\n}\n\nexport function conflict(message: string): CrudHttpError {\n  return new CrudHttpError(409, { error: message })\n}\n\nconst POSTGRES_UNIQUE_VIOLATION = '23505'\n\n/**\n * Detects a Postgres unique-constraint violation (SQLSTATE 23505) on a thrown\n * error, looking through MikroORM's driver-error wrapping. Use this to map a DB\n * uniqueness race (e.g. a soft-deleted row the in-app check missed, or a\n * timestamp-precision mismatch) onto a clean 409 instead of a generic 500.\n */\nexport function isUniqueViolation(err: unknown, constraintName?: string): boolean {\n  if (!err || typeof err !== 'object') return false\n  const candidates: unknown[] = [err, (err as { cause?: unknown }).cause, (err as { previous?: unknown }).previous]\n  for (const candidate of candidates) {\n    if (!candidate || typeof candidate !== 'object') continue\n    const record = candidate as Record<string, unknown>\n    if (record.code === POSTGRES_UNIQUE_VIOLATION) {\n      if (!constraintName) return true\n      const constraint = typeof record.constraint === 'string' ? record.constraint : ''\n      const detail = typeof record.detail === 'string' ? record.detail : ''\n      const message = typeof record.message === 'string' ? record.message : ''\n      return constraint === constraintName || detail.includes(constraintName) || message.includes(constraintName)\n    }\n  }\n  return false\n}\n\n/**\n * The canonical \"entity must exist\" guard for API routes and commands: throws the\n * standardized 404 when the lookup came back empty, and returns the value narrowed\n * to `T` so callers drop the `| null` without a cast.\n *\n *   const deal = assertFound(await em.findOne(Deal, { id }), translate('customers.errors.deal_not_found', 'Deal not found'))\n *\n * Use this instead of hand-rolling `if (!entity) throw new CrudHttpError(404, ...)`.\n * `message` is required and passed through verbatim, so it must already be translated.\n *\n * Treats every falsy value as missing, so it suits entity/object lookups \u2014 do not use\n * it to guard numbers or strings, where `0` and `''` are legitimate results.\n */\nexport function assertFound<T>(value: T | null | undefined, message: string): T {\n  if (!value) throw notFound(message)\n  return value\n}\n"],
-  "mappings": "AAAA;AAEA,MAAM,yBAAyB,uBAAO,IAAI,6BAA6B;AAEhE,MAAM,uBAAsB,YACvB,6BADuB,IAAM;AAAA,EAKvC,YACE,QACA,MACA,SACA;AACA,UAAM,iBAAiB,OAAO,SAAS,WAAW,EAAE,OAAO,KAAK,IAAI,QAAQ,CAAC;AAC7E,UAAM,OAAO,SAAS,WAAW,OAAO,eAAe,SAAS,kBAAkB,OAAO;AAV3F,SAAU,MAA0B;AAWlC,SAAK,SAAS;AACd,SAAK,OAAO;AAAA,EACd;AACF;AAOO,SAAS,gBAAgB,KAAoC;AAClE,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAa,IAAgC,sBAAsB,MAAM;AAC1G;AAEO,SAAS,WAAW,SAAgC;AACzD,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEO,SAAS,UAAU,UAAU,aAA4B;AAC9D,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAYO,SAAS,SAAS,UAAU,aAA4B;AAC7D,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEO,SAAS,SAAS,SAAgC;AACvD,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEA,MAAM,4BAA4B;AAQ3B,SAAS,kBAAkB,KAAc,gBAAkC;AAChF,MAAI,CAAC,OAAO,OAAO,QAAQ,SAAU,QAAO;AAC5C,QAAM,aAAwB,CAAC,KAAM,IAA4B,OAAQ,IAA+B,QAAQ;AAChH,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,aAAa,OAAO,cAAc,SAAU;AACjD,UAAM,SAAS;AACf,QAAI,OAAO,SAAS,2BAA2B;AAC7C,UAAI,CAAC,eAAgB,QAAO;AAC5B,YAAM,aAAa,OAAO,OAAO,eAAe,WAAW,OAAO,aAAa;AAC/E,YAAM,SAAS,OAAO,OAAO,WAAW,WAAW,OAAO,SAAS;AACnE,YAAM,UAAU,OAAO,OAAO,YAAY,WAAW,OAAO,UAAU;AACtE,aAAO,eAAe,kBAAkB,OAAO,SAAS,cAAc,KAAK,QAAQ,SAAS,cAAc;AAAA,IAC5G;AAAA,EACF;AACA,SAAO;AACT;AAeO,SAAS,YAAe,OAA6B,SAAoB;AAC9E,MAAI,CAAC,MAAO,OAAM,SAAS,OAAO;AAClC,SAAO;AACT;",
+  "sourcesContent": ["// Use Symbol.for so the marker survives module duplication across bundle boundaries\n// (same behaviour as globalThis-based registries used for DI registrars)\nconst CRUD_HTTP_ERROR_MARKER = Symbol.for('@open-mercato/CrudHttpError')\n\nexport class CrudHttpError extends Error {\n  readonly [CRUD_HTTP_ERROR_MARKER] = true\n  status: number\n  body: Record<string, any>\n\n  constructor(\n    status: number,\n    body?: Record<string, any> | string,\n    options?: { cause?: unknown },\n  ) {\n    const normalizedBody = typeof body === 'string' ? { error: body } : body ?? {}\n    super(typeof body === 'string' ? body : normalizedBody.error ?? 'Request failed', options)\n    this.status = status\n    this.body = normalizedBody\n  }\n}\n\n/**\n * Type-safe check for CrudHttpError that works across module/bundle boundaries.\n * Prefer this over `instanceof CrudHttpError` whenever the error may originate\n * from a different module bundle (e.g. enterprise packages, dynamic imports).\n */\nexport function isCrudHttpError(err: unknown): err is CrudHttpError {\n  return !!err && typeof err === 'object' && (err as Record<symbol, unknown>)[CRUD_HTTP_ERROR_MARKER] === true\n}\n\nexport function badRequest(message: string): CrudHttpError {\n  return new CrudHttpError(400, { error: message })\n}\n\nexport function forbidden(message = 'Forbidden'): CrudHttpError {\n  return new CrudHttpError(403, { error: message })\n}\n\n/**\n * Builds the standardized 404 (`{ error: message }`) \u2014 use it instead of hand-rolling\n * `new CrudHttpError(404, { error: message })`. Reach for this in guard statements, where\n * the lookup spans several lines or the condition is compound\n * (`if (!entity || entity.tenantId !== auth.tenantId) throw notFound(msg)`); TypeScript\n * still narrows the value after the throw. For a plain inline lookup, `assertFound` is terser.\n *\n * Pass an already-translated message; this helper never derives one, so 404 copy\n * stays routed through i18n.\n */\nexport function notFound(message = 'Not found'): CrudHttpError {\n  return new CrudHttpError(404, { error: message })\n}\n\nexport function conflict(message: string): CrudHttpError {\n  return new CrudHttpError(409, { error: message })\n}\n\nconst POSTGRES_UNIQUE_VIOLATION = '23505'\n\n/**\n * Detects a Postgres unique-constraint violation (SQLSTATE 23505) on a thrown\n * error, looking through MikroORM's driver-error wrapping. Use this to map a DB\n * uniqueness race (e.g. a soft-deleted row the in-app check missed, or a\n * timestamp-precision mismatch) onto a clean 409 instead of a generic 500.\n */\nexport function isUniqueViolation(err: unknown, constraintName?: string): boolean {\n  if (!err || typeof err !== 'object') return false\n  const candidates: unknown[] = [err, (err as { cause?: unknown }).cause, (err as { previous?: unknown }).previous]\n  for (const candidate of candidates) {\n    if (!candidate || typeof candidate !== 'object') continue\n    const record = candidate as Record<string, unknown>\n    if (record.code === POSTGRES_UNIQUE_VIOLATION) {\n      if (!constraintName) return true\n      const constraint = typeof record.constraint === 'string' ? record.constraint : ''\n      const detail = typeof record.detail === 'string' ? record.detail : ''\n      const message = typeof record.message === 'string' ? record.message : ''\n      return constraint === constraintName || detail.includes(constraintName) || message.includes(constraintName)\n    }\n  }\n  return false\n}\n\n/**\n * The canonical \"entity must exist\" guard for API routes and commands: throws the\n * standardized 404 when the lookup came back empty, and returns the value narrowed\n * to `T` so callers drop the `| null` without a cast.\n *\n *   const deal = assertFound(await em.findOne(Deal, { id }), translate('customers.errors.deal_not_found', 'Deal not found'))\n *\n * Use this instead of hand-rolling `if (!entity) throw new CrudHttpError(404, ...)`.\n * `message` is required and passed through verbatim, so it must already be translated.\n *\n * Treats every falsy value as missing, so it suits entity/object lookups \u2014 do not use\n * it to guard numbers or strings, where `0` and `''` are legitimate results.\n */\nexport function assertFound<T>(value: T | null | undefined, message: string): T {\n  if (!value) throw notFound(message)\n  return value\n}\n\n/**\n * Translates a `CrudHttpError` body's `error` field before it reaches the client.\n * Some callers (command handlers, lib helpers reused by subscribers/CLI/workers) raise\n * `CrudHttpError` with a raw i18n key because they run without a request locale \u2014 a route\n * handler forwarding `err.body` verbatim would leak that key to the user. Call this at the\n * route boundary, passing the `translate` the route already resolved, instead of forwarding\n * `err.body` directly.\n */\nexport function translateCrudErrorBody<T extends Record<string, unknown>>(\n  body: T,\n  translate: (key: string, fallback?: string) => string,\n): T {\n  if (typeof body?.error !== 'string') return body\n  return { ...body, error: translate(body.error, body.error) }\n}\n"],
+  "mappings": "AAAA;AAEA,MAAM,yBAAyB,uBAAO,IAAI,6BAA6B;AAEhE,MAAM,uBAAsB,YACvB,6BADuB,IAAM;AAAA,EAKvC,YACE,QACA,MACA,SACA;AACA,UAAM,iBAAiB,OAAO,SAAS,WAAW,EAAE,OAAO,KAAK,IAAI,QAAQ,CAAC;AAC7E,UAAM,OAAO,SAAS,WAAW,OAAO,eAAe,SAAS,kBAAkB,OAAO;AAV3F,SAAU,MAA0B;AAWlC,SAAK,SAAS;AACd,SAAK,OAAO;AAAA,EACd;AACF;AAOO,SAAS,gBAAgB,KAAoC;AAClE,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAa,IAAgC,sBAAsB,MAAM;AAC1G;AAEO,SAAS,WAAW,SAAgC;AACzD,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEO,SAAS,UAAU,UAAU,aAA4B;AAC9D,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAYO,SAAS,SAAS,UAAU,aAA4B;AAC7D,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEO,SAAS,SAAS,SAAgC;AACvD,SAAO,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAClD;AAEA,MAAM,4BAA4B;AAQ3B,SAAS,kBAAkB,KAAc,gBAAkC;AAChF,MAAI,CAAC,OAAO,OAAO,QAAQ,SAAU,QAAO;AAC5C,QAAM,aAAwB,CAAC,KAAM,IAA4B,OAAQ,IAA+B,QAAQ;AAChH,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,aAAa,OAAO,cAAc,SAAU;AACjD,UAAM,SAAS;AACf,QAAI,OAAO,SAAS,2BAA2B;AAC7C,UAAI,CAAC,eAAgB,QAAO;AAC5B,YAAM,aAAa,OAAO,OAAO,eAAe,WAAW,OAAO,aAAa;AAC/E,YAAM,SAAS,OAAO,OAAO,WAAW,WAAW,OAAO,SAAS;AACnE,YAAM,UAAU,OAAO,OAAO,YAAY,WAAW,OAAO,UAAU;AACtE,aAAO,eAAe,kBAAkB,OAAO,SAAS,cAAc,KAAK,QAAQ,SAAS,cAAc;AAAA,IAC5G;AAAA,EACF;AACA,SAAO;AACT;AAeO,SAAS,YAAe,OAA6B,SAAoB;AAC9E,MAAI,CAAC,MAAO,OAAM,SAAS,OAAO;AAClC,SAAO;AACT;AAUO,SAAS,uBACd,MACA,WACG;AACH,MAAI,OAAO,MAAM,UAAU,SAAU,QAAO;AAC5C,SAAO,EAAE,GAAG,MAAM,OAAO,UAAU,KAAK,OAAO,KAAK,KAAK,EAAE;AAC7D;",
   "names": []
 }

package/dist/lib/crud/factory.js

@@ -7,6 +7,7 @@ import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/d
 import { serializeOperationMetadata } from "@open-mercato/shared/lib/commands/operationMetadata";
 import { getCommandInterceptorHttpRejection } from "@open-mercato/shared/lib/commands/errors";
 import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
+import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import {
   runMutationGuards,
   bridgeLegacyGuard
@@ -26,7 +27,7 @@ import {
   resolveCfDefIndexOrgCandidates
 } from "./custom-field-definition-index.js";
 import { serializeExport, normalizeExportFormat, defaultExportFilename, ensureColumns } from "./exporters.js";
-import { isCrudHttpError } from "./errors.js";
+import { isCrudHttpError, translateCrudErrorBody } from "./errors.js";
 import {
   buildCollectionTags,
   buildRecordTag,
@@ -316,9 +317,12 @@ function classifyCrudError(err) {
   }
   return { code: "INTERNAL_ERROR", pgSqlState: null };
 }
-function handleError(err, request) {
+async function handleError(err, request) {
   if (err instanceof Response) return err;
-  if (isCrudHttpError(err)) return json(err.body, { status: err.status });
+  if (isCrudHttpError(err)) {
+    const { translate } = await resolveTranslations();
+    return json(translateCrudErrorBody(err.body, translate), { status: err.status });
+  }
   const interceptorRejection = getCommandInterceptorHttpRejection(err);
   if (interceptorRejection) {
     return json(interceptorRejection.body, { status: interceptorRejection.status });
@@ -1400,13 +1404,15 @@ function makeCrudRoute(opts) {
               nextPage += 1;
             }
           }
-          const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list, validated, ctx);
-          const fallbackBase = `${opts.events?.entity || resourceKind || "list"}${exportFullRequested ? "_full" : ""}`;
-          const filename = finalizeExportFilename(opts.list, requestedExport, fallbackBase);
-          const serialized = serializeExport(prepared, requestedExport);
           const exportPayload = { items: exportItems, total, page: 1, pageSize: exportItems.length, totalPages: 1, ...res.meta ? { meta: res.meta } : {} };
           await opts.hooks?.afterList?.(exportPayload, { ...ctx, query: validated });
           profiler.mark("after_list_hook");
+          const hookExportItems = Array.isArray(exportPayload.items) ? exportPayload.items : exportItems;
+          const finalExportItems = exportFullRequested ? hookExportItems.map(normalizeFullRecordForExport) : hookExportItems;
+          const prepared = exportFullRequested ? { columns: ensureColumns(finalExportItems), rows: finalExportItems } : prepareExportData(finalExportItems, opts.list, validated, ctx);
+          const fallbackBase = `${opts.events?.entity || resourceKind || "list"}${exportFullRequested ? "_full" : ""}`;
+          const filename = finalizeExportFilename(opts.list, requestedExport, fallbackBase);
+          const serialized = serializeExport(prepared, requestedExport);
           const response3 = new Response(serialized.body, {
             headers: {
               "content-type": serialized.contentType,
@@ -1429,7 +1435,7 @@ function makeCrudRoute(opts) {
           finishProfile({
             result: "export",
             cacheStatus,
-            itemCount: exportItems.length,
+            itemCount: finalExportItems.length,
             total
           });
           return response3;
@@ -1585,12 +1591,15 @@ function makeCrudRoute(opts) {
       profiler.mark("access_logged", accessLogResult);
       if (exportRequested && requestedExport) {
         const exportItems = exportFullRequested ? list.map(normalizeFullRecordForExport) : list;
-        const prepared = exportFullRequested ? { columns: ensureColumns(exportItems), rows: exportItems } : prepareExportData(exportItems, opts.list, validated, ctx);
+        const exportPayload = { items: exportItems, total: exportItems.length, page: 1, pageSize: exportItems.length, totalPages: 1 };
+        await opts.hooks?.afterList?.(exportPayload, { ...ctx, query: validated });
+        profiler.mark("after_list_hook");
+        const hookExportItems = Array.isArray(exportPayload.items) ? exportPayload.items : exportItems;
+        const finalExportItems = exportFullRequested ? hookExportItems.map(normalizeFullRecordForExport) : hookExportItems;
+        const prepared = exportFullRequested ? { columns: ensureColumns(finalExportItems), rows: finalExportItems } : prepareExportData(finalExportItems, opts.list, validated, ctx);
         const fallbackBase = `${opts.events?.entity || resourceKind || "list"}${exportFullRequested ? "_full" : ""}`;
         const filename = finalizeExportFilename(opts.list, requestedExport, fallbackBase);
         const serialized = serializeExport(prepared, requestedExport);
-        await opts.hooks?.afterList?.({ items: exportItems, total: exportItems.length, page: 1, pageSize: exportItems.length, totalPages: 1 }, { ...ctx, query: validated });
-        profiler.mark("after_list_hook");
         const response2 = new Response(serialized.body, {
           headers: {
             "content-type": serialized.contentType,
@@ -1600,8 +1609,8 @@ function makeCrudRoute(opts) {
         finishProfile({
           result: "export",
           cacheStatus,
-          itemCount: exportItems.length,
-          total: exportItems.length,
+          itemCount: finalExportItems.length,
+          total: finalExportItems.length,
           branch: "fallback"
         });
         return response2;