fhir-persistence 0.7.0 → 0.9.0

package/dist/cjs/index.d.ts

@@ -2970,7 +2970,7 @@ declare interface SearchStats {
  * Physical storage strategy for a search parameter.
  *
  * - `column` — single column in the main table
- * - `token-column` — three columns (UUID[], TEXT[], TEXT) for token search
+ * - `token-column` — two columns: TEXT (JSON array of "system|code"), TEXT (sort/display)
  * - `lookup-table` — separate lookup table; only a sort column in main table
  */
 export declare type SearchStrategy = 'column' | 'token-column' | 'lookup-table';

package/dist/esm/index.d.ts

@@ -2970,7 +2970,7 @@ declare interface SearchStats {
  * Physical storage strategy for a search parameter.
  *
  * - `column` — single column in the main table
- * - `token-column` — three columns (UUID[], TEXT[], TEXT) for token search
+ * - `token-column` — two columns: TEXT (JSON array of "system|code"), TEXT (sort/display)
  * - `lookup-table` — separate lookup table; only a sort column in main table
  */
 export declare type SearchStrategy = 'column' | 'token-column' | 'lookup-table';

package/dist/esm/index.mjs

@@ -5207,36 +5207,43 @@ function buildUriFragmentV2(impl, param, dialect) {
   return buildOrFragmentV2(col, "=", param.values);
 }
 function buildTokenColumnFragmentV2(impl, param, dialect) {
-  const textCol = quoteColumn(`__${impl.columnName}Text`);
+  const textCol = quoteColumn(`__${impl.columnName}`);
   const sortCol = quoteColumn(`__${impl.columnName}Sort`);
   if (param.modifier === "text") {
     return buildLikeFragmentV2(sortCol, param.values, "", "%");
   }
-  const needsLike = param.values.some((v) => v.endsWith("|"));
-  if (needsLike) {
-    const conds = [];
-    const vals = [];
-    for (const value of param.values) {
+  const exactValues = [];
+  const likePatterns = [];
+  for (const value of param.values) {
+    if (value.includes("|")) {
       if (value.endsWith("|")) {
-        const frag = arrayContainsLikeV2(textCol, value + "%", dialect);
-        conds.push(frag.sql);
-        vals.push(...frag.values);
+        likePatterns.push(value + "%");
       } else {
-        const resolved = value.startsWith("|") ? value.slice(1) : value;
-        const frag = arrayContainsV2(textCol, [resolved], dialect);
-        conds.push(frag.sql);
-        vals.push(...frag.values);
+        exactValues.push(value);
       }
+    } else {
+      likePatterns.push(`%|${value}`);
     }
-    const inner = conds.length === 1 ? conds[0] : `(${conds.join(" OR ")})`;
-    const sql = param.modifier === "not" ? `NOT (${inner})` : inner;
-    return { sql, values: vals };
   }
-  const resolvedValues = param.values.map((v) => v.startsWith("|") ? v.slice(1) : v);
-  if (param.modifier === "not") {
-    return arrayNotContainsV2(textCol, resolvedValues, dialect);
-  }
-  return arrayContainsV2(textCol, resolvedValues, dialect);
+  const conds = [];
+  const vals = [];
+  if (exactValues.length > 0) {
+    const frag = param.modifier === "not" ? arrayNotContainsV2(textCol, exactValues, dialect) : arrayContainsV2(textCol, exactValues, dialect);
+    conds.push(frag.sql);
+    vals.push(...frag.values);
+  }
+  for (const pattern of likePatterns) {
+    const frag = arrayContainsLikeV2(textCol, pattern, dialect);
+    const sql = param.modifier === "not" ? `NOT (${frag.sql})` : frag.sql;
+    conds.push(sql);
+    vals.push(...frag.values);
+  }
+  if (conds.length === 0) {
+    return { sql: "1=1", values: [] };
+  }
+  const joiner = param.modifier === "not" ? " AND " : " OR ";
+  const inner = conds.length === 1 ? conds[0] : `(${conds.join(joiner)})`;
+  return { sql: inner, values: vals };
 }
 function buildDefaultFragmentV2(impl, param) {
   const col = quoteColumn(impl.columnName);