@open-mercato/shared 0.6.7 → 0.6.8-canary.320.1.bf889f49e4

package/dist/lib/logger/index.js

@@ -1,12 +1,53 @@
 import { selectTransport } from "./transport.js";
-import { getLogLevel, isLevelEnabled, resetLogLevelCache, OM_LOG_LEVEL_ENV } from "./level.js";
+import { getLoggerExtension } from "./extension.js";
+import { isLevelEnabled } from "./level.js";
+import { getLogLevel, isLevelEnabled as isLevelEnabled2, resetLogLevelCache, OM_LOG_LEVEL_ENV } from "./level.js";
 import { resetServerLoggerCache, OM_LOG_DESTINATION_ENV } from "./transport.server.js";
 import { resetLogPrettyCache, OM_LOG_PRETTY_ENV } from "./transport.pretty.js";
+import {
+  getLoggerExtension as getLoggerExtension2,
+  registerLoggerExtension,
+  resetLoggerExtension
+} from "./extension.js";
 const loggerRegistry = /* @__PURE__ */ new Map();
+function createExtendedLogger(namespace, transport, bindings = {}) {
+  const emit = (level, msg, fields) => {
+    if (!isLevelEnabled(level)) return;
+    const extension = getLoggerExtension();
+    let context = {};
+    try {
+      context = extension?.enrich?.() ?? {};
+    } catch {
+    }
+    const mergedFields = { ...fields, ...context };
+    transport[level](msg, mergedFields);
+    try {
+      extension?.emit?.({
+        level,
+        namespace,
+        message: msg,
+        fields: { ...bindings, ...mergedFields },
+        time: Date.now()
+      });
+    } catch {
+    }
+  };
+  return {
+    debug: (msg, fields) => emit("debug", msg, fields),
+    info: (msg, fields) => emit("info", msg, fields),
+    warn: (msg, fields) => emit("warn", msg, fields),
+    error: (msg, fields) => emit("error", msg, fields),
+    child: (childBindings) => createExtendedLogger(
+      namespace,
+      transport.child(childBindings),
+      { ...bindings, ...childBindings }
+    )
+  };
+}
 function createLogger(namespace) {
   const existing = loggerRegistry.get(namespace);
   if (existing) return existing;
-  const created = selectTransport(namespace);
+  const created = createExtendedLogger(namespace, selectTransport(namespace));
   loggerRegistry.set(namespace, created);
   return created;
 }
@@ -19,9 +60,12 @@ export {
   OM_LOG_PRETTY_ENV,
   createLogger,
   getLogLevel,
-  isLevelEnabled,
+  getLoggerExtension2 as getLoggerExtension,
+  isLevelEnabled2 as isLevelEnabled,
+  registerLoggerExtension,
   resetLogLevelCache,
   resetLogPrettyCache,
+  resetLoggerExtension,
   resetLoggerRegistry,
   resetServerLoggerCache
 };

package/dist/lib/logger/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/logger/index.ts"],
-  "sourcesContent": ["import { selectTransport } from './transport'\n\nexport type { LogLevel } from './level'\nexport { getLogLevel, isLevelEnabled, resetLogLevelCache, OM_LOG_LEVEL_ENV } from './level'\nexport { resetServerLoggerCache, OM_LOG_DESTINATION_ENV } from './transport.server'\nexport { resetLogPrettyCache, OM_LOG_PRETTY_ENV } from './transport.pretty'\n\nexport type LogBindings = Record<string, unknown>\n\nexport interface Logger {\n  debug(msg: string, fields?: LogBindings): void\n  info(msg: string, fields?: LogBindings): void\n  warn(msg: string, fields?: LogBindings): void\n  error(msg: string, fields?: LogBindings): void\n  /** Returns a logger with `bindings` merged into every subsequent line. */\n  child(bindings: LogBindings): Logger\n}\n\nconst loggerRegistry = new Map<string, Logger>()\n\n/** Create (or reuse) a namespaced logger. `namespace` is attached as `name`. */\nexport function createLogger(namespace: string): Logger {\n  const existing = loggerRegistry.get(namespace)\n  if (existing) return existing\n  const created = selectTransport(namespace)\n  loggerRegistry.set(namespace, created)\n  return created\n}\n\n/** Internal: clear cached loggers so tests can re-run transport selection. */\nexport function resetLoggerRegistry(): void {\n  loggerRegistry.clear()\n}\n"],
-  "mappings": "AAAA,SAAS,uBAAuB;AAGhC,SAAS,aAAa,gBAAgB,oBAAoB,wBAAwB;AAClF,SAAS,wBAAwB,8BAA8B;AAC/D,SAAS,qBAAqB,yBAAyB;AAavD,MAAM,iBAAiB,oBAAI,IAAoB;AAGxC,SAAS,aAAa,WAA2B;AACtD,QAAM,WAAW,eAAe,IAAI,SAAS;AAC7C,MAAI,SAAU,QAAO;AACrB,QAAM,UAAU,gBAAgB,SAAS;AACzC,iBAAe,IAAI,WAAW,OAAO;AACrC,SAAO;AACT;AAGO,SAAS,sBAA4B;AAC1C,iBAAe,MAAM;AACvB;",
-  "names": []
+  "sourcesContent": ["import { selectTransport } from './transport'\nimport { getLoggerExtension } from './extension'\nimport { isLevelEnabled, type LogLevel } from './level'\n\nexport type { LogLevel } from './level'\nexport { getLogLevel, isLevelEnabled, resetLogLevelCache, OM_LOG_LEVEL_ENV } from './level'\nexport { resetServerLoggerCache, OM_LOG_DESTINATION_ENV } from './transport.server'\nexport { resetLogPrettyCache, OM_LOG_PRETTY_ENV } from './transport.pretty'\nexport {\n  getLoggerExtension,\n  registerLoggerExtension,\n  resetLoggerExtension,\n} from './extension'\nexport type { LoggerExtension, LoggerExtensionRecord } from './extension'\n\nexport type LogBindings = Record<string, unknown>\n\nexport interface Logger {\n  debug(msg: string, fields?: LogBindings): void\n  info(msg: string, fields?: LogBindings): void\n  warn(msg: string, fields?: LogBindings): void\n  error(msg: string, fields?: LogBindings): void\n  /** Returns a logger with `bindings` merged into every subsequent line. */\n  child(bindings: LogBindings): Logger\n}\n\nconst loggerRegistry = new Map<string, Logger>()\n\nfunction createExtendedLogger(\n  namespace: string,\n  transport: Logger,\n  bindings: LogBindings = {},\n): Logger {\n  const emit = (\n    level: LogLevel,\n    msg: string,\n    fields?: LogBindings,\n  ): void => {\n    if (!isLevelEnabled(level)) return\n\n    const extension = getLoggerExtension()\n    let context: LogBindings = {}\n    try {\n      context = extension?.enrich?.() ?? {}\n    } catch {\n      // Observability must never alter application behavior.\n    }\n\n    const mergedFields = { ...fields, ...context }\n    transport[level](msg, mergedFields)\n\n    try {\n      extension?.emit?.({\n        level,\n        namespace,\n        message: msg,\n        fields: { ...bindings, ...mergedFields },\n        time: Date.now(),\n      })\n    } catch {\n      // Remote logging is best-effort; the local line has already been written.\n    }\n  }\n\n  return {\n    debug: (msg, fields) => emit('debug', msg, fields),\n    info: (msg, fields) => emit('info', msg, fields),\n    warn: (msg, fields) => emit('warn', msg, fields),\n    error: (msg, fields) => emit('error', msg, fields),\n    child: (childBindings) =>\n      createExtendedLogger(\n        namespace,\n        transport.child(childBindings),\n        { ...bindings, ...childBindings },\n      ),\n  }\n}\n\n/** Create (or reuse) a namespaced logger. `namespace` is attached as `name`. */\nexport function createLogger(namespace: string): Logger {\n  const existing = loggerRegistry.get(namespace)\n  if (existing) return existing\n  const created = createExtendedLogger(namespace, selectTransport(namespace))\n  loggerRegistry.set(namespace, created)\n  return created\n}\n\n/** Internal: clear cached loggers so tests can re-run transport selection. */\nexport function resetLoggerRegistry(): void {\n  loggerRegistry.clear()\n}\n"],
+  "mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAS,0BAA0B;AACnC,SAAS,sBAAqC;AAG9C,SAAS,aAAa,kBAAAA,iBAAgB,oBAAoB,wBAAwB;AAClF,SAAS,wBAAwB,8BAA8B;AAC/D,SAAS,qBAAqB,yBAAyB;AACvD;AAAA,EACE,sBAAAC;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAcP,MAAM,iBAAiB,oBAAI,IAAoB;AAE/C,SAAS,qBACP,WACA,WACA,WAAwB,CAAC,GACjB;AACR,QAAM,OAAO,CACX,OACA,KACA,WACS;AACT,QAAI,CAAC,eAAe,KAAK,EAAG;AAE5B,UAAM,YAAY,mBAAmB;AACrC,QAAI,UAAuB,CAAC;AAC5B,QAAI;AACF,gBAAU,WAAW,SAAS,KAAK,CAAC;AAAA,IACtC,QAAQ;AAAA,IAER;AAEA,UAAM,eAAe,EAAE,GAAG,QAAQ,GAAG,QAAQ;AAC7C,cAAU,KAAK,EAAE,KAAK,YAAY;AAElC,QAAI;AACF,iBAAW,OAAO;AAAA,QAChB;AAAA,QACA;AAAA,QACA,SAAS;AAAA,QACT,QAAQ,EAAE,GAAG,UAAU,GAAG,aAAa;AAAA,QACvC,MAAM,KAAK,IAAI;AAAA,MACjB,CAAC;AAAA,IACH,QAAQ;AAAA,IAER;AAAA,EACF;AAEA,SAAO;AAAA,IACL,OAAO,CAAC,KAAK,WAAW,KAAK,SAAS,KAAK,MAAM;AAAA,IACjD,MAAM,CAAC,KAAK,WAAW,KAAK,QAAQ,KAAK,MAAM;AAAA,IAC/C,MAAM,CAAC,KAAK,WAAW,KAAK,QAAQ,KAAK,MAAM;AAAA,IAC/C,OAAO,CAAC,KAAK,WAAW,KAAK,SAAS,KAAK,MAAM;AAAA,IACjD,OAAO,CAAC,kBACN;AAAA,MACE;AAAA,MACA,UAAU,MAAM,aAAa;AAAA,MAC7B,EAAE,GAAG,UAAU,GAAG,cAAc;AAAA,IAClC;AAAA,EACJ;AACF;AAGO,SAAS,aAAa,WAA2B;AACtD,QAAM,WAAW,eAAe,IAAI,SAAS;AAC7C,MAAI,SAAU,QAAO;AACrB,QAAM,UAAU,qBAAqB,WAAW,gBAAgB,SAAS,CAAC;AAC1E,iBAAe,IAAI,WAAW,OAAO;AACrC,SAAO;AACT;AAGO,SAAS,sBAA4B;AAC1C,iBAAe,MAAM;AACvB;",
+  "names": ["isLevelEnabled", "getLoggerExtension"]
 }

package/dist/lib/modules/registry.js

@@ -1,5 +1,5 @@
 import { applyModuleOverridesToModules } from "@open-mercato/shared/modules/overrides";
-import { invalidateDictionaryCache } from "../i18n/dictionary-cache.js";
+import { invalidateDictionaryCache, invalidateDictionaryCacheLocales } from "../i18n/dictionary-cache.js";
 import { createLogger } from "../logger/index.js";
 const logger = createLogger("shared").child({ component: "modules-registry" });
 const GLOBAL_KEY = "__openMercatoModulesRegistry__";
@@ -24,7 +24,10 @@ function mergeI18nModules(existing, incoming) {
     if (!i18nModule?.translations) return entry;
     return {
       ...entry,
-      translations: i18nModule.translations
+      translations: {
+        ...entry.translations ?? {},
+        ...i18nModule.translations
+      }
     };
   });
   for (const entry of incoming) {
@@ -32,15 +35,38 @@ function mergeI18nModules(existing, incoming) {
   }
   return merged;
 }
+function getTranslationLocales(modules) {
+  const locales = /* @__PURE__ */ new Set();
+  for (const entry of modules) {
+    for (const locale of Object.keys(entry.translations ?? {})) {
+      locales.add(locale);
+    }
+  }
+  return [...locales];
+}
+function preserveExistingTranslations(existing, incoming) {
+  const existingById = new Map(existing.map((entry) => [entry.id, entry]));
+  return incoming.map((entry) => {
+    if (entry.translations) return entry;
+    const translations = existingById.get(entry.id)?.translations;
+    return translations ? { ...entry, translations } : entry;
+  });
+}
 function registerModules(modules) {
   const existing = getGlobalModules();
   if (existing !== null && process.env.NODE_ENV === "development") {
     logger.debug("Modules re-registered (this may occur during HMR)");
   }
   const nextModules = applyModuleOverridesToModules(modules);
-  const shouldMergeI18nOnly = existing !== null && existing.some(hasRuntimeContracts) && isI18nOnlyRegistration(nextModules);
-  setGlobalModules(shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : nextModules);
-  invalidateDictionaryCache();
+  const i18nOnlyRegistration = isI18nOnlyRegistration(nextModules);
+  const shouldMergeI18nOnly = existing !== null && i18nOnlyRegistration;
+  const registeredModules = shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : preserveExistingTranslations(existing ?? [], nextModules);
+  setGlobalModules(registeredModules);
+  if (i18nOnlyRegistration) {
+    invalidateDictionaryCacheLocales(getTranslationLocales(nextModules));
+  } else {
+    invalidateDictionaryCache();
+  }
 }
 function getModules() {
   const modules = getGlobalModules();
@@ -49,8 +75,12 @@ function getModules() {
   }
   return modules;
 }
+function tryGetModules() {
+  return getGlobalModules();
+}
 export {
   getModules,
-  registerModules
+  registerModules,
+  tryGetModules
 };
 //# sourceMappingURL=registry.js.map

package/dist/lib/modules/registry.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/modules/registry.ts"],
-  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\nimport { invalidateDictionaryCache } from '../i18n/dictionary-cache'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'modules-registry' })\n\n// Registration pattern for publishable packages.\n// Use globalThis to survive tsx/esbuild module duplication where the same\n// registry.ts file can be loaded as multiple module instances when mixing\n// dynamic and static imports \u2014 for example a standalone integration test\n// bootstraps via the source path while a worker handler resolves it through\n// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used\n// by `getDiRegistrars()` in `../di/container.ts`.\nconst GLOBAL_KEY = '__openMercatoModulesRegistry__'\n\nfunction getGlobalModules(): Module[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalModules(modules: Module[]): void {\n  ;(globalThis as any)[GLOBAL_KEY] = modules\n}\n\nfunction hasRuntimeContracts(entry: Module): boolean {\n  return Object.keys(entry).some((key) => key !== 'id' && key !== 'translations')\n}\n\nfunction isI18nOnlyRegistration(modules: Module[]): boolean {\n  return modules.length > 0 && modules.every((entry) => !hasRuntimeContracts(entry))\n}\n\nfunction mergeI18nModules(existing: Module[], incoming: Module[]): Module[] {\n  const incomingById = new Map(incoming.map((entry) => [entry.id, entry]))\n  const existingIds = new Set(existing.map((entry) => entry.id))\n  const merged = existing.map((entry) => {\n    const i18nModule = incomingById.get(entry.id)\n    if (!i18nModule?.translations) return entry\n    return {\n      ...entry,\n      translations: i18nModule.translations,\n    }\n  })\n\n  for (const entry of incoming) {\n    if (!existingIds.has(entry.id)) merged.push(entry)\n  }\n\n  return merged\n}\n\nexport function registerModules(modules: Module[]) {\n  const existing = getGlobalModules()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    logger.debug('Modules re-registered (this may occur during HMR)')\n  }\n  const nextModules = applyModuleOverridesToModules(modules)\n  const shouldMergeI18nOnly = existing !== null\n    && existing.some(hasRuntimeContracts)\n    && isI18nOnlyRegistration(nextModules)\n  setGlobalModules(shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : nextModules)\n  invalidateDictionaryCache()\n}\n\nexport function getModules(): Module[] {\n  const modules = getGlobalModules()\n  if (!modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return modules\n}\n"],
-  "mappings": "AACA,SAAS,qCAAqC;AAC9C,SAAS,iCAAiC;AAC1C,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAS7E,MAAM,aAAa;AAEnB,SAAS,mBAAoC;AAC3C,SAAQ,WAAmB,UAAU,KAAK;AAC5C;AAEA,SAAS,iBAAiB,SAAyB;AACjD;AAAC,EAAC,WAAmB,UAAU,IAAI;AACrC;AAEA,SAAS,oBAAoB,OAAwB;AACnD,SAAO,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,QAAQ,QAAQ,cAAc;AAChF;AAEA,SAAS,uBAAuB,SAA4B;AAC1D,SAAO,QAAQ,SAAS,KAAK,QAAQ,MAAM,CAAC,UAAU,CAAC,oBAAoB,KAAK,CAAC;AACnF;AAEA,SAAS,iBAAiB,UAAoB,UAA8B;AAC1E,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,QAAM,cAAc,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC;AAC7D,QAAM,SAAS,SAAS,IAAI,CAAC,UAAU;AACrC,UAAM,aAAa,aAAa,IAAI,MAAM,EAAE;AAC5C,QAAI,CAAC,YAAY,aAAc,QAAO;AACtC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,cAAc,WAAW;AAAA,IAC3B;AAAA,EACF,CAAC;AAED,aAAW,SAAS,UAAU;AAC5B,QAAI,CAAC,YAAY,IAAI,MAAM,EAAE,EAAG,QAAO,KAAK,KAAK;AAAA,EACnD;AAEA,SAAO;AACT;AAEO,SAAS,gBAAgB,SAAmB;AACjD,QAAM,WAAW,iBAAiB;AAClC,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,WAAO,MAAM,mDAAmD;AAAA,EAClE;AACA,QAAM,cAAc,8BAA8B,OAAO;AACzD,QAAM,sBAAsB,aAAa,QACpC,SAAS,KAAK,mBAAmB,KACjC,uBAAuB,WAAW;AACvC,mBAAiB,sBAAsB,iBAAiB,UAAU,WAAW,IAAI,WAAW;AAC5F,4BAA0B;AAC5B;AAEO,SAAS,aAAuB;AACrC,QAAM,UAAU,iBAAiB;AACjC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;",
+  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\nimport type { Locale } from '../i18n/config'\nimport { invalidateDictionaryCache, invalidateDictionaryCacheLocales } from '../i18n/dictionary-cache'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'modules-registry' })\n\n// Registration pattern for publishable packages.\n// Use globalThis to survive tsx/esbuild module duplication where the same\n// registry.ts file can be loaded as multiple module instances when mixing\n// dynamic and static imports \u2014 for example a standalone integration test\n// bootstraps via the source path while a worker handler resolves it through\n// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used\n// by `getDiRegistrars()` in `../di/container.ts`.\nconst GLOBAL_KEY = '__openMercatoModulesRegistry__'\n\nfunction getGlobalModules(): Module[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalModules(modules: Module[]): void {\n  ;(globalThis as any)[GLOBAL_KEY] = modules\n}\n\nfunction hasRuntimeContracts(entry: Module): boolean {\n  return Object.keys(entry).some((key) => key !== 'id' && key !== 'translations')\n}\n\nfunction isI18nOnlyRegistration(modules: Module[]): boolean {\n  return modules.length > 0 && modules.every((entry) => !hasRuntimeContracts(entry))\n}\n\nfunction mergeI18nModules(existing: Module[], incoming: Module[]): Module[] {\n  const incomingById = new Map(incoming.map((entry) => [entry.id, entry]))\n  const existingIds = new Set(existing.map((entry) => entry.id))\n  const merged = existing.map((entry) => {\n    const i18nModule = incomingById.get(entry.id)\n    if (!i18nModule?.translations) return entry\n    return {\n      ...entry,\n      translations: {\n        ...(entry.translations ?? {}),\n        ...i18nModule.translations,\n      },\n    }\n  })\n\n  for (const entry of incoming) {\n    if (!existingIds.has(entry.id)) merged.push(entry)\n  }\n\n  return merged\n}\n\nfunction getTranslationLocales(modules: Module[]): Locale[] {\n  const locales = new Set<Locale>()\n  for (const entry of modules) {\n    for (const locale of Object.keys(entry.translations ?? {})) {\n      locales.add(locale as Locale)\n    }\n  }\n  return [...locales]\n}\n\nfunction preserveExistingTranslations(existing: Module[], incoming: Module[]): Module[] {\n  const existingById = new Map(existing.map((entry) => [entry.id, entry]))\n  return incoming.map((entry) => {\n    if (entry.translations) return entry\n    const translations = existingById.get(entry.id)?.translations\n    return translations ? { ...entry, translations } : entry\n  })\n}\n\nexport function registerModules(modules: Module[]) {\n  const existing = getGlobalModules()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    logger.debug('Modules re-registered (this may occur during HMR)')\n  }\n  const nextModules = applyModuleOverridesToModules(modules)\n  const i18nOnlyRegistration = isI18nOnlyRegistration(nextModules)\n  const shouldMergeI18nOnly = existing !== null && i18nOnlyRegistration\n  const registeredModules = shouldMergeI18nOnly\n    ? mergeI18nModules(existing, nextModules)\n    : preserveExistingTranslations(existing ?? [], nextModules)\n  setGlobalModules(registeredModules)\n  if (i18nOnlyRegistration) {\n    invalidateDictionaryCacheLocales(getTranslationLocales(nextModules))\n  } else {\n    invalidateDictionaryCache()\n  }\n}\n\nexport function getModules(): Module[] {\n  const modules = getGlobalModules()\n  if (!modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return modules\n}\n\n/**\n * Non-throwing counterpart of `getModules()` for call sites that have a\n * meaningful degraded behavior when bootstrap has not run \u2014 route unit tests\n * exercise a single handler without `registerModules()`, and a hard throw there\n * turns an unrelated assertion into a bootstrap error.\n */\nexport function tryGetModules(): Module[] | null {\n  return getGlobalModules()\n}\n"],
+  "mappings": "AACA,SAAS,qCAAqC;AAE9C,SAAS,2BAA2B,wCAAwC;AAC5E,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAS7E,MAAM,aAAa;AAEnB,SAAS,mBAAoC;AAC3C,SAAQ,WAAmB,UAAU,KAAK;AAC5C;AAEA,SAAS,iBAAiB,SAAyB;AACjD;AAAC,EAAC,WAAmB,UAAU,IAAI;AACrC;AAEA,SAAS,oBAAoB,OAAwB;AACnD,SAAO,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,QAAQ,QAAQ,cAAc;AAChF;AAEA,SAAS,uBAAuB,SAA4B;AAC1D,SAAO,QAAQ,SAAS,KAAK,QAAQ,MAAM,CAAC,UAAU,CAAC,oBAAoB,KAAK,CAAC;AACnF;AAEA,SAAS,iBAAiB,UAAoB,UAA8B;AAC1E,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,QAAM,cAAc,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC;AAC7D,QAAM,SAAS,SAAS,IAAI,CAAC,UAAU;AACrC,UAAM,aAAa,aAAa,IAAI,MAAM,EAAE;AAC5C,QAAI,CAAC,YAAY,aAAc,QAAO;AACtC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,cAAc;AAAA,QACZ,GAAI,MAAM,gBAAgB,CAAC;AAAA,QAC3B,GAAG,WAAW;AAAA,MAChB;AAAA,IACF;AAAA,EACF,CAAC;AAED,aAAW,SAAS,UAAU;AAC5B,QAAI,CAAC,YAAY,IAAI,MAAM,EAAE,EAAG,QAAO,KAAK,KAAK;AAAA,EACnD;AAEA,SAAO;AACT;AAEA,SAAS,sBAAsB,SAA6B;AAC1D,QAAM,UAAU,oBAAI,IAAY;AAChC,aAAW,SAAS,SAAS;AAC3B,eAAW,UAAU,OAAO,KAAK,MAAM,gBAAgB,CAAC,CAAC,GAAG;AAC1D,cAAQ,IAAI,MAAgB;AAAA,IAC9B;AAAA,EACF;AACA,SAAO,CAAC,GAAG,OAAO;AACpB;AAEA,SAAS,6BAA6B,UAAoB,UAA8B;AACtF,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,SAAO,SAAS,IAAI,CAAC,UAAU;AAC7B,QAAI,MAAM,aAAc,QAAO;AAC/B,UAAM,eAAe,aAAa,IAAI,MAAM,EAAE,GAAG;AACjD,WAAO,eAAe,EAAE,GAAG,OAAO,aAAa,IAAI;AAAA,EACrD,CAAC;AACH;AAEO,SAAS,gBAAgB,SAAmB;AACjD,QAAM,WAAW,iBAAiB;AAClC,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,WAAO,MAAM,mDAAmD;AAAA,EAClE;AACA,QAAM,cAAc,8BAA8B,OAAO;AACzD,QAAM,uBAAuB,uBAAuB,WAAW;AAC/D,QAAM,sBAAsB,aAAa,QAAQ;AACjD,QAAM,oBAAoB,sBACtB,iBAAiB,UAAU,WAAW,IACtC,6BAA6B,YAAY,CAAC,GAAG,WAAW;AAC5D,mBAAiB,iBAAiB;AAClC,MAAI,sBAAsB;AACxB,qCAAiC,sBAAsB,WAAW,CAAC;AAAA,EACrE,OAAO;AACL,8BAA0B;AAAA,EAC5B;AACF;AAEO,SAAS,aAAuB;AACrC,QAAM,UAAU,iBAAiB;AACjC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;AAQO,SAAS,gBAAiC;AAC/C,SAAO,iBAAiB;AAC1B;",
   "names": []
 }

package/dist/lib/modules/surfaceFingerprint.js

@@ -0,0 +1,47 @@
+import { createHash } from "node:crypto";
+import { getBackendRouteManifests } from "../../modules/registry.js";
+import { getModules } from "./registry.js";
+const UNKNOWN_FINGERPRINT = "unknown";
+let cachedFingerprint = null;
+let cachedManifestsRef = null;
+let cachedModulesRef = null;
+function readModulesRef() {
+  try {
+    return getModules();
+  } catch {
+    return null;
+  }
+}
+function byCodeUnit(a, b) {
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+function describeModules(modules) {
+  if (!modules) return [];
+  return modules.map((mod) => {
+    const features = (Array.isArray(mod.features) ? mod.features : []).filter((feature) => feature && typeof feature.id === "string" && feature.id.length > 0).map((feature) => `${feature.id}:${feature.module || mod.id}`).sort(byCodeUnit);
+    return JSON.stringify({ id: mod.id, features });
+  }).sort(byCodeUnit);
+}
+function getModuleSurfaceFingerprint() {
+  const manifests = getBackendRouteManifests();
+  const modulesRef = readModulesRef();
+  if (cachedFingerprint !== null && cachedManifestsRef === manifests && cachedModulesRef === modulesRef) {
+    return cachedFingerprint;
+  }
+  let fingerprint;
+  try {
+    const modules = describeModules(modulesRef);
+    const routes = manifests.map((route) => JSON.stringify(route)).sort(byCodeUnit);
+    fingerprint = createHash("sha1").update(JSON.stringify({ modules, routes })).digest("hex").slice(0, 12);
+  } catch {
+    fingerprint = UNKNOWN_FINGERPRINT;
+  }
+  cachedManifestsRef = manifests;
+  cachedModulesRef = modulesRef;
+  cachedFingerprint = fingerprint;
+  return fingerprint;
+}
+export {
+  getModuleSurfaceFingerprint
+};
+//# sourceMappingURL=surfaceFingerprint.js.map

package/dist/lib/modules/surfaceFingerprint.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/modules/surfaceFingerprint.ts"],
+  "sourcesContent": ["/**\n * Deploy-time fingerprint of the registered module surface.\n *\n * Some cached payloads are derived from state that only changes when the app\n * is redeployed \u2014 the enabled module set and the backend route manifest. That\n * state has no database write to hang a tag invalidation off, so a cache key\n * that omits it keeps serving the pre-deploy payload to anyone with a warm\n * entry (see `/api/auth/admin/nav`, whose payload embeds\n * `filterGrantsByEnabledModules(...)` computed at write time).\n *\n * Mixing this fingerprint into such keys makes new processes write to new\n * keys, so old and new pods coexist during a rolling deploy without a purge\n * step and without any ordering constraint between purge and rollout.\n *\n * Covered inputs: the enabled module ids, each module's declared `features`\n * (which drive `filterGrantsByEnabledModules`, including the `*` superadmin\n * expansion and off-convention prefixes), and every JSON-serializable field\n * of the backend route manifest.\n *\n * NOT covered: a route's `icon`. It is a React element whose `type` is a\n * function, which `JSON.stringify` drops \u2014 two different icon components\n * serialize identically. Swapping an icon heals on the caller's TTL, not on\n * the fingerprint. Callers MUST therefore still pass a `ttl`.\n */\nimport { createHash } from 'node:crypto'\nimport type { Module } from '../../modules/registry'\nimport { getBackendRouteManifests } from '../../modules/registry'\nimport { getModules } from './registry'\n\nconst UNKNOWN_FINGERPRINT = 'unknown'\n\nlet cachedFingerprint: string | null = null\nlet cachedManifestsRef: unknown = null\nlet cachedModulesRef: unknown = null\n\nfunction readModulesRef(): readonly Module[] | null {\n  try {\n    return getModules()\n  } catch {\n    return null\n  }\n}\n\nfunction byCodeUnit(a: string, b: string): number {\n  return a < b ? -1 : a > b ? 1 : 0\n}\n\nfunction describeModules(modules: readonly Module[] | null): string[] {\n  if (!modules) return []\n  return modules\n    .map((mod) => {\n      const features = (Array.isArray(mod.features) ? mod.features : [])\n        .filter((feature) => feature && typeof feature.id === 'string' && feature.id.length > 0)\n        .map((feature) => `${feature.id}:${feature.module || mod.id}`)\n        .sort(byCodeUnit)\n      return JSON.stringify({ id: mod.id, features })\n    })\n    .sort(byCodeUnit)\n}\n\nexport function getModuleSurfaceFingerprint(): string {\n  const manifests = getBackendRouteManifests()\n  const modulesRef = readModulesRef()\n  if (cachedFingerprint !== null && cachedManifestsRef === manifests && cachedModulesRef === modulesRef) {\n    return cachedFingerprint\n  }\n  // The manifest carries third-party route metadata and module-scope React\n  // elements, so serialization is not fully under this repo's control. Every\n  // other fallible step in the nav handler degrades rather than throws, and a\n  // throw here would blank the entire admin chrome \u2014 fall back to a constant,\n  // which is exactly the pre-fingerprint behavior.\n  let fingerprint: string\n  try {\n    const modules = describeModules(modulesRef)\n    const routes = manifests.map((route) => JSON.stringify(route)).sort(byCodeUnit)\n    fingerprint = createHash('sha1')\n      .update(JSON.stringify({ modules, routes }))\n      .digest('hex')\n      .slice(0, 12)\n  } catch {\n    fingerprint = UNKNOWN_FINGERPRINT\n  }\n  cachedManifestsRef = manifests\n  cachedModulesRef = modulesRef\n  cachedFingerprint = fingerprint\n  return fingerprint\n}\n"],
+  "mappings": "AAwBA,SAAS,kBAAkB;AAE3B,SAAS,gCAAgC;AACzC,SAAS,kBAAkB;AAE3B,MAAM,sBAAsB;AAE5B,IAAI,oBAAmC;AACvC,IAAI,qBAA8B;AAClC,IAAI,mBAA4B;AAEhC,SAAS,iBAA2C;AAClD,MAAI;AACF,WAAO,WAAW;AAAA,EACpB,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,SAAS,WAAW,GAAW,GAAmB;AAChD,SAAO,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI;AAClC;AAEA,SAAS,gBAAgB,SAA6C;AACpE,MAAI,CAAC,QAAS,QAAO,CAAC;AACtB,SAAO,QACJ,IAAI,CAAC,QAAQ;AACZ,UAAM,YAAY,MAAM,QAAQ,IAAI,QAAQ,IAAI,IAAI,WAAW,CAAC,GAC7D,OAAO,CAAC,YAAY,WAAW,OAAO,QAAQ,OAAO,YAAY,QAAQ,GAAG,SAAS,CAAC,EACtF,IAAI,CAAC,YAAY,GAAG,QAAQ,EAAE,IAAI,QAAQ,UAAU,IAAI,EAAE,EAAE,EAC5D,KAAK,UAAU;AAClB,WAAO,KAAK,UAAU,EAAE,IAAI,IAAI,IAAI,SAAS,CAAC;AAAA,EAChD,CAAC,EACA,KAAK,UAAU;AACpB;AAEO,SAAS,8BAAsC;AACpD,QAAM,YAAY,yBAAyB;AAC3C,QAAM,aAAa,eAAe;AAClC,MAAI,sBAAsB,QAAQ,uBAAuB,aAAa,qBAAqB,YAAY;AACrG,WAAO;AAAA,EACT;AAMA,MAAI;AACJ,MAAI;AACF,UAAM,UAAU,gBAAgB,UAAU;AAC1C,UAAM,SAAS,UAAU,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EAAE,KAAK,UAAU;AAC9E,kBAAc,WAAW,MAAM,EAC5B,OAAO,KAAK,UAAU,EAAE,SAAS,OAAO,CAAC,CAAC,EAC1C,OAAO,KAAK,EACZ,MAAM,GAAG,EAAE;AAAA,EAChB,QAAQ;AACN,kBAAc;AAAA,EAChB;AACA,uBAAqB;AACrB,qBAAmB;AACnB,sBAAoB;AACpB,SAAO;AACT;",
+  "names": []
+}

package/dist/lib/query/ciphertext-search-warning.js

@@ -0,0 +1,51 @@
+import { createLogger } from "../logger/index.js";
+const logger = createLogger("shared").child({ component: "query" });
+const REASON_HINTS = {
+  "search-disabled": "OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing.",
+  "no-indexable-tokens": "The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column.",
+  "no-search-tokens": "No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column.",
+  "raw-orm-filter": "This filter bypasses the query engine, so it runs as ILIKE against ciphertext and matches nothing. Resolve ids through findEntityIdsBySearchTokens (@open-mercato/shared/lib/search/tokenLookup), filter on the deterministic hash column, or compare in memory after decryption."
+};
+const WARN_CACHE_CAP = 5e3;
+const warned = /* @__PURE__ */ new Set();
+const warnKey = (entity, tenantId, field) => `${entity}|${tenantId ?? "null"}|${field}`;
+const normalizeColumnName = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase();
+function resetCiphertextLikeWarnCache() {
+  warned.clear();
+}
+async function warnOnCiphertextLikeFallback(params) {
+  const { entity, tenantId, reason, service } = params;
+  if (!service || service.isEnabled?.() === false) return;
+  if (typeof service.getEncryptedFieldNames !== "function") return;
+  const candidates = params.fields.filter((field) => typeof field === "string" && !field.startsWith("cf:")).map((field) => normalizeColumnName(field)).filter((field, index, all) => field.length > 0 && all.indexOf(field) === index).filter((field) => !warned.has(warnKey(entity, tenantId, field)));
+  if (!candidates.length) return;
+  try {
+    const encrypted = new Set(
+      (await service.getEncryptedFieldNames(entity, tenantId, null)).map(
+        (field) => normalizeColumnName(String(field))
+      )
+    );
+    for (const field of candidates) {
+      if (!encrypted.has(field)) continue;
+      if (warned.size >= WARN_CACHE_CAP) warned.clear();
+      warned.add(warnKey(entity, tenantId, field));
+      logger.warn("Text search filter cannot match an encrypted column", {
+        entity,
+        field,
+        reason,
+        hint: REASON_HINTS[reason]
+      });
+    }
+  } catch (err) {
+    logger.debug("Ciphertext search warning check failed", {
+      entity,
+      err: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+export {
+  normalizeColumnName,
+  resetCiphertextLikeWarnCache,
+  warnOnCiphertextLikeFallback
+};
+//# sourceMappingURL=ciphertext-search-warning.js.map

package/dist/lib/query/ciphertext-search-warning.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/query/ciphertext-search-warning.ts"],
+  "sourcesContent": ["import { createLogger } from '../logger'\nimport type { EntityId } from '../../modules/entities'\n\nconst logger = createLogger('shared').child({ component: 'query' })\n\n/**\n * Minimal slice of `TenantDataEncryptionService` needed to decide whether a\n * text filter targets an encrypted column.\n */\nexport type CiphertextWarningEncryptionService = {\n  getEncryptedFieldNames?: (\n    entityId: EntityId,\n    tenantId?: string | null,\n    organizationId?: string | null,\n  ) => Promise<readonly string[]>\n  isEnabled?: () => boolean\n} | null | undefined\n\nexport type CiphertextLikeFallbackReason =\n  | 'no-indexable-tokens'\n  | 'no-search-tokens'\n  | 'search-disabled'\n  | 'raw-orm-filter'\n\nconst REASON_HINTS: Record<CiphertextLikeFallbackReason, string> = {\n  'search-disabled':\n    'OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing.',\n  'no-indexable-tokens':\n    'The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column.',\n  'no-search-tokens':\n    'No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column.',\n  'raw-orm-filter':\n    'This filter bypasses the query engine, so it runs as ILIKE against ciphertext and matches nothing. Resolve ids through findEntityIdsBySearchTokens (@open-mercato/shared/lib/search/tokenLookup), filter on the deterministic hash column, or compare in memory after decryption.',\n}\n\n// One warning per entity/tenant/field per process \u2014 the fallback repeats on\n// every request, and an operator only needs to learn about it once.\nconst WARN_CACHE_CAP = 5000\nconst warned = new Set<string>()\n\nconst warnKey = (entity: string, tenantId: string | null, field: string): string =>\n  `${entity}|${tenantId ?? 'null'}|${field}`\n\nexport const normalizeColumnName = (value: string): string =>\n  value.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()\n\n/** Test seam: the warn-once cache is process-global by design. */\nexport function resetCiphertextLikeWarnCache(): void {\n  warned.clear()\n}\n\n/**\n * Warn when a `like`/`ilike` filter is about to run against a column that an\n * encryption map covers while the token index is unavailable.\n *\n * Without this the query degrades silently: the predicate compares a plaintext\n * pattern against ciphertext, matches nothing, and the endpoint returns an\n * empty page that is indistinguishable from a genuine no-result. Issue #2990.\n *\n * Never throws and never blocks the query \u2014 a failure here is logged at debug\n * level and the caller proceeds unchanged.\n */\nexport async function warnOnCiphertextLikeFallback(params: {\n  entity: string\n  fields: readonly string[]\n  tenantId: string | null\n  reason: CiphertextLikeFallbackReason\n  service: CiphertextWarningEncryptionService\n}): Promise<void> {\n  const { entity, tenantId, reason, service } = params\n  if (!service || service.isEnabled?.() === false) return\n  if (typeof service.getEncryptedFieldNames !== 'function') return\n\n  const candidates = params.fields\n    .filter((field) => typeof field === 'string' && !field.startsWith('cf:'))\n    .map((field) => normalizeColumnName(field))\n    .filter((field, index, all) => field.length > 0 && all.indexOf(field) === index)\n    .filter((field) => !warned.has(warnKey(entity, tenantId, field)))\n  if (!candidates.length) return\n\n  try {\n    // `organizationId: null` resolves the global map plus every per-organization\n    // override, so a field encrypted for any organization is reported.\n    const encrypted = new Set(\n      (await service.getEncryptedFieldNames(entity, tenantId, null)).map((field) =>\n        normalizeColumnName(String(field)),\n      ),\n    )\n    for (const field of candidates) {\n      if (!encrypted.has(field)) continue\n      if (warned.size >= WARN_CACHE_CAP) warned.clear()\n      warned.add(warnKey(entity, tenantId, field))\n      logger.warn('Text search filter cannot match an encrypted column', {\n        entity,\n        field,\n        reason,\n        hint: REASON_HINTS[reason],\n      })\n    }\n  } catch (err) {\n    logger.debug('Ciphertext search warning check failed', {\n      entity,\n      err: err instanceof Error ? err.message : String(err),\n    })\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAG7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,QAAQ,CAAC;AAqBlE,MAAM,eAA6D;AAAA,EACjE,mBACE;AAAA,EACF,uBACE;AAAA,EACF,oBACE;AAAA,EACF,kBACE;AACJ;AAIA,MAAM,iBAAiB;AACvB,MAAM,SAAS,oBAAI,IAAY;AAE/B,MAAM,UAAU,CAAC,QAAgB,UAAyB,UACxD,GAAG,MAAM,IAAI,YAAY,MAAM,IAAI,KAAK;AAEnC,MAAM,sBAAsB,CAAC,UAClC,MAAM,QAAQ,sBAAsB,OAAO,EAAE,YAAY;AAGpD,SAAS,+BAAqC;AACnD,SAAO,MAAM;AACf;AAaA,eAAsB,6BAA6B,QAMjC;AAChB,QAAM,EAAE,QAAQ,UAAU,QAAQ,QAAQ,IAAI;AAC9C,MAAI,CAAC,WAAW,QAAQ,YAAY,MAAM,MAAO;AACjD,MAAI,OAAO,QAAQ,2BAA2B,WAAY;AAE1D,QAAM,aAAa,OAAO,OACvB,OAAO,CAAC,UAAU,OAAO,UAAU,YAAY,CAAC,MAAM,WAAW,KAAK,CAAC,EACvE,IAAI,CAAC,UAAU,oBAAoB,KAAK,CAAC,EACzC,OAAO,CAAC,OAAO,OAAO,QAAQ,MAAM,SAAS,KAAK,IAAI,QAAQ,KAAK,MAAM,KAAK,EAC9E,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC,CAAC;AAClE,MAAI,CAAC,WAAW,OAAQ;AAExB,MAAI;AAGF,UAAM,YAAY,IAAI;AAAA,OACnB,MAAM,QAAQ,uBAAuB,QAAQ,UAAU,IAAI,GAAG;AAAA,QAAI,CAAC,UAClE,oBAAoB,OAAO,KAAK,CAAC;AAAA,MACnC;AAAA,IACF;AACA,eAAW,SAAS,YAAY;AAC9B,UAAI,CAAC,UAAU,IAAI,KAAK,EAAG;AAC3B,UAAI,OAAO,QAAQ,eAAgB,QAAO,MAAM;AAChD,aAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC;AAC3C,aAAO,KAAK,uDAAuD;AAAA,QACjE;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM,aAAa,MAAM;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF,SAAS,KAAK;AACZ,WAAO,MAAM,0CAA0C;AAAA,MACrD;AAAA,MACA,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IACtD,CAAC;AAAA,EACH;AACF;",
+  "names": []
+}

package/dist/lib/query/engine.js

@@ -6,12 +6,17 @@ import {
   resolveJoins
 } from "./join-utils.js";
 import { resolveSearchConfig } from "../search/config.js";
+import {
+  createSearchTokenAvailability,
+  isSearchFilterOp
+} from "../search/availability.js";
 import { tokenizeText } from "../search/tokenize.js";
 import { runBeforeQueryPipeline, runAfterQueryPipeline } from "./query-extension-runner.js";
 import {
   buildCustomFieldDefinitionIndexFromRows,
   resolveCfDefIndexOrgCandidates
 } from "../crud/custom-field-definition-index.js";
+import { warnOnCiphertextLikeFallback } from "./ciphertext-search-warning.js";
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from "./encrypted-sort.js";
 import { mapWithConcurrency } from "./bounded-decrypt.js";
 import { createLogger } from "../logger/index.js";
@@ -26,6 +31,8 @@ const pluralizeBaseName = (name) => {
   if (name.endsWith("y")) return `${name.slice(0, -1)}ies`;
   return `${name}s`;
 };
+const PLAIN_TABLE_IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const isPlainTableIdentifier = (value) => typeof value === "string" && PLAIN_TABLE_IDENTIFIER_PATTERN.test(value);
 const toPascalCase = (value) => {
   return value.split(/[_\s]+/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
 };
@@ -133,8 +140,8 @@ class BasicQueryEngine {
     this.getDbFn = getDbFn;
     this.resolveEncryptionService = resolveEncryptionService;
     this.columnCache = /* @__PURE__ */ new Map();
-    this.tableCache = /* @__PURE__ */ new Map();
     this.searchAliasSeq = 0;
+    this.searchAvailabilityInstance = null;
   }
   getEncryptionService() {
     try {
@@ -149,6 +156,21 @@ class BasicQueryEngine {
     if (typeof emAny?.getKysely === "function") return emAny.getKysely();
     throw new Error("BasicQueryEngine requires an EntityManager exposing getKysely() (MikroORM v7)");
   }
+  searchAvailability() {
+    if (!this.searchAvailabilityInstance) {
+      this.searchAvailabilityInstance = createSearchTokenAvailability({
+        getDb: () => this.getDb(),
+        getConfig: resolveSearchConfig,
+        applyOrganizationScope: (query, column, scope) => this.applyOrganizationScope(
+          query,
+          column,
+          scope
+        ),
+        logDebug: (event, payload) => this.logSearchDebug(event, payload)
+      });
+    }
+    return this.searchAvailabilityInstance;
+  }
   async query(entity, opts = {}) {
     const ext = opts.extensions;
     let effectiveOpts = opts;
@@ -204,11 +226,10 @@ class BasicQueryEngine {
     const { baseFilters, joinFilters } = partitionFilters(table, normalizedFilters, joinMap);
     const cfFilters = normalizedFilters.filter((filter) => String(filter.field).startsWith("cf:"));
     const searchConfig = resolveSearchConfig();
-    const searchEnabled = !skipAutoScope && searchConfig.enabled && await this.tableExists("search_tokens");
-    const hasSearchTokens = searchEnabled ? await this.hasSearchTokens(String(entity), opts.tenantId ?? null, orgScope) : false;
+    const searchFilters = [...baseFilters, ...cfFilters].filter((filter) => isSearchFilterOp(filter.op));
+    const searchEnabled = !skipAutoScope && await this.searchAvailability().staticEnabled();
+    const hasSearchTokens = searchEnabled && searchFilters.length ? await this.searchAvailability().hasTokens(String(entity), opts.tenantId ?? null, orgScope) : false;
     const searchActive = searchEnabled && hasSearchTokens;
-    const joinSearchAvailability = /* @__PURE__ */ new Map();
-    const searchFilters = [...baseFilters, ...cfFilters].filter((filter) => filter.op === "like" || filter.op === "ilike");
     if (searchFilters.length) {
       const fields = searchFilters.map((filter) => String(filter.field));
       this.logSearchDebug("search:init", {
@@ -238,6 +259,35 @@ class BasicQueryEngine {
           organizationScope: orgScope
         });
       }
+      const fallbackFields = searchFilters.filter((filter) => !searchActive || typeof filter.value !== "string" || tokenizeText(filter.value, searchConfig).hashes.length === 0).map((filter) => String(filter.field));
+      if (fallbackFields.length) {
+        await warnOnCiphertextLikeFallback({
+          entity: String(entity),
+          fields: fallbackFields,
+          tenantId: opts.tenantId ?? null,
+          // `searchEnabled` also folds in the missing-table and
+          // omitAutomaticTenantOrgScope cases, which are "no usable tokens"
+          // rather than "the operator switched search off".
+          reason: searchActive ? "no-indexable-tokens" : searchConfig.enabled ? "no-search-tokens" : "search-disabled",
+          service: this.getEncryptionService()
+        });
+      }
+    }
+    for (const [alias, joinedFilters] of joinFilters) {
+      const filters = joinedFilters.filter((entry) => entry.op === "like" || entry.op === "ilike");
+      if (!filters.length) continue;
+      const join = joinMap.get(alias);
+      if (!join?.entityId) continue;
+      const hasJoinedTokens = searchEnabled ? await this.searchAvailability().hasTokens(join.entityId, opts.tenantId ?? null, orgScope) : false;
+      const fallbackFields = filters.filter((filter) => !hasJoinedTokens || typeof filter.value !== "string" || tokenizeText(filter.value, searchConfig).hashes.length === 0).map((filter) => filter.column);
+      if (!fallbackFields.length) continue;
+      await warnOnCiphertextLikeFallback({
+        entity: join.entityId,
+        fields: fallbackFields,
+        tenantId: opts.tenantId ?? null,
+        reason: hasJoinedTokens ? "no-indexable-tokens" : searchConfig.enabled ? "no-search-tokens" : "search-disabled",
+        service: this.getEncryptionService()
+      });
     }
     const recordIdColumn = qualify("id");
     const applyFilterOp = (builder, column, op, value, fieldName) => {
@@ -278,11 +328,7 @@ class BasicQueryEngine {
       if (!searchEnabled || !join.entityId) return { applied: false, builder };
       if (!["like", "ilike"].includes(filter.op)) return { applied: false, builder };
       if (typeof filter.value !== "string" || filter.value.trim().length === 0) return { applied: false, builder };
-      let searchAvailable = joinSearchAvailability.get(join.entityId);
-      if (searchAvailable === void 0) {
-        searchAvailable = await this.hasSearchTokens(join.entityId, opts.tenantId ?? null, orgScope);
-        joinSearchAvailability.set(join.entityId, searchAvailable);
-      }
+      const searchAvailable = await this.searchAvailability().hasTokens(join.entityId, opts.tenantId ?? null, orgScope);
       if (!searchAvailable) return { applied: false, builder };
       const tokens = tokenizeText(String(filter.value), searchConfig);
       if (!tokens.hashes.length) return { applied: false, builder };
@@ -652,7 +698,8 @@ class BasicQueryEngine {
         const chosen = Array.isArray(opts.includeExtensions) ? exts.filter((e) => opts.includeExtensions.includes(e.extension)) : exts;
         for (const e of chosen) {
           const [, extName] = e.extension.split(":");
-          const extTable = extName.endsWith("s") ? extName : `${extName}s`;
+          const derivedTable = pluralizeBaseName(extName);
+          const extTable = isPlainTableIdentifier(e.table) ? e.table : derivedTable;
           const alias = `ext_${sanitize(extName)}`;
           q = q.leftJoin(
             `${extTable} as ${alias}`,
@@ -867,36 +914,6 @@ class BasicQueryEngine {
     else this.columnCache.delete(key);
     return present;
   }
-  async tableExists(table) {
-    if (this.tableCache.has(table)) return this.tableCache.get(table) ?? false;
-    const db = this.getDb();
-    const exists = await db.selectFrom("information_schema.tables").select(sql`1`.as("one")).where("table_name", "=", table).limit(1).executeTakeFirst();
-    const present = !!exists;
-    this.tableCache.set(table, present);
-    return present;
-  }
-  async hasSearchTokens(entity, tenantId, orgScope) {
-    try {
-      const db = this.getDb();
-      let query = db.selectFrom("search_tokens").select(sql`1`.as("one")).where("entity_type", "=", entity).limit(1);
-      if (tenantId !== void 0) {
-        query = query.where(sql`tenant_id is not distinct from ${tenantId}`);
-      }
-      if (orgScope) {
-        query = this.applyOrganizationScope(query, "search_tokens.organization_id", orgScope);
-      }
-      const row = await query.executeTakeFirst();
-      return !!row;
-    } catch (err) {
-      this.logSearchDebug("search:has-tokens-error", {
-        entity,
-        tenantId,
-        organizationScope: orgScope,
-        error: err instanceof Error ? err.message : String(err)
-      });
-      return false;
-    }
-  }
   applySearchTokens(q, opts) {
     if (!opts.hashes.length) {
       this.logSearchDebug("search:skip-no-hashes", {
@@ -993,10 +1010,10 @@ class BasicQueryEngine {
       const textExpr = sql`(${sql.ref(`${alias}.doc`)} ->> ${opts.field})`;
       switch (opts.op) {
         case "eq":
-          sub = sub.where(sql`${textExpr} = ${opts.value}`);
+          sub = opts.value === null ? sub.where(sql`${textExpr} is null`) : sub.where(sql`${textExpr} = ${opts.value}`);
           break;
         case "ne":
-          sub = sub.where(sql`${textExpr} <> ${opts.value}`);
+          sub = opts.value === null ? sub.where(sql`${textExpr} is not null`) : sub.where(sql`${textExpr} <> ${opts.value}`);
           break;
         case "gt":
         case "gte":