@openhi/constructs 0.0.177 → 0.0.178

package/lib/rest-api-lambda.handler.js

@@ -10964,6 +10964,16 @@ function jsonbPathToStringShape(jsonbPath) {
   if (arrayOfScalars) {
     return { kind: "array-of-scalars", field: arrayOfScalars[1] };
   }
+  const arrayOfArrays = /^\$\.([A-Za-z_][A-Za-z0-9_]*)\[\*\]\.([A-Za-z_][A-Za-z0-9_]*)\[\*\]$/.exec(
+    jsonbPath
+  );
+  if (arrayOfArrays) {
+    return {
+      kind: "array-of-arrays",
+      field: arrayOfArrays[1],
+      subfield: arrayOfArrays[2]
+    };
+  }
   const arrayOfObjs = /^\$\.([A-Za-z_][A-Za-z0-9_]*)\[\*\]\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(
     jsonbPath
   );
@@ -10975,7 +10985,7 @@ function jsonbPathToStringShape(jsonbPath) {
     };
   }
   throw new Error(
-    `String predicate cannot translate JSONPath "${jsonbPath}". Supported shapes: "$.field", "$.field[*]", "$.field[*].subfield".`
+    `String predicate cannot translate JSONPath "${jsonbPath}". Supported shapes: "$.field", "$.field[*]", "$.field[*].subfield", "$.field[*].subfield[*]".`
   );
 }
 function escapeLikePattern(value) {
@@ -11008,6 +11018,13 @@ function buildIlikeExtractSql(shape, paramName) {
         `jsonb_array_elements(resource->'${shape.field}') AS s_obj(obj)`,
         `WHERE s_obj.obj->>'${shape.subfield}' ILIKE :${paramName})`
       ].join(" ");
+    case "array-of-arrays":
+      return [
+        "EXISTS (SELECT 1 FROM",
+        `jsonb_array_elements(resource->'${shape.field}') AS s_obj(obj),`,
+        `jsonb_array_elements_text(s_obj.obj->'${shape.subfield}') AS s_elem(text_val)`,
+        `WHERE s_elem.text_val ILIKE :${paramName})`
+      ].join(" ");
   }
 }
 function emitStringPredicate(opts) {
@@ -11280,12 +11297,23 @@ async function genericSearchOperation(params) {
     ...combined.params
   ];
   const rows = await runner.query(sql, queryParams);
-  const entries = rows.map((row) => ({
-    id: row.id,
-    resource: { ...row.resource, id: row.id }
-  }));
+  const entries = rows.map((row) => {
+    const parsed = parseResourceColumn(row.resource);
+    const bodyId = typeof parsed.id === "string" ? parsed.id : void 0;
+    const id = bodyId ?? row.id;
+    return {
+      id,
+      resource: { ...parsed, id }
+    };
+  });
   return { entries, total: entries.length };
 }
+function parseResourceColumn(raw) {
+  if (typeof raw === "string") {
+    return JSON.parse(raw);
+  }
+  return raw;
+}
 
 // src/data/search/registry/allergyintolerance-search-parameters.ts
 var ALLERGYINTOLERANCE_SEARCH_PARAMETERS = [
@@ -11886,7 +11914,7 @@ var PATIENT_SEARCH_PARAMETERS = [
   {
     code: "given",
     type: "string",
-    jsonbPath: "$.name[*].given",
+    jsonbPath: "$.name[*].given[*]",
     modifiers: ["exact", "contains", "missing", "not"]
   },
   { code: "active", type: "token", jsonbPath: "$.active" },
@@ -11936,7 +11964,7 @@ var PRACTITIONER_SEARCH_PARAMETERS = [
   {
     code: "given",
     type: "string",
-    jsonbPath: "$.name[*].given",
+    jsonbPath: "$.name[*].given[*]",
     modifiers: ["exact", "contains", "missing", "not"]
   },
   { code: "active", type: "token", jsonbPath: "$.active" },