@openhi/constructs 0.0.183 → 0.0.184

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

@@ -5815,10 +5815,25 @@ function wrapTokenInShape(shape, value) {
       return { [shape.field]: [{ [shape.subfield]: value }] };
   }
 }
+function wrapTokenWithSystem(shape, systemSubfield, parsed) {
+  if (shape.kind !== "array-of-objects") {
+    throw new Error(
+      `Token predicate option "systemSubfield" requires an array-of-objects JSONPath ("$.field[*].subfield"); got shape "${shape.kind}".`
+    );
+  }
+  const entry = {};
+  if (parsed.system !== void 0) {
+    entry[systemSubfield] = parsed.system;
+  }
+  if (parsed.system === void 0 || parsed.code.length > 0) {
+    entry[shape.subfield] = parsed.code;
+  }
+  return { [shape.field]: [entry] };
+}
 function emitTokenPredicate(opts) {
   const shape = jsonbPathToTokenShape(opts.jsonbPath);
-  const { code } = parseTokenValue(opts.rawValue);
-  const payload = wrapTokenInShape(shape, code);
+  const parsed = parseTokenValue(opts.rawValue);
+  const payload = opts.systemSubfield !== void 0 ? wrapTokenWithSystem(shape, opts.systemSubfield, parsed) : wrapTokenInShape(shape, parsed.code);
   const sql = `resource @> :${opts.paramName}::jsonb`;
   const params = [
     { name: opts.paramName, value: JSON.stringify(payload) }
@@ -5892,6 +5907,7 @@ function emitOne(opts) {
     rawValue,
     paramName,
     modifier: effectiveModifier,
+    systemSubfield: param.systemSubfield,
     context
   });
   if (!negate) {
@@ -5913,6 +5929,7 @@ function emitForType(opts) {
         jsonbPath: opts.jsonbPath,
         rawValue: opts.rawValue,
         paramName: opts.paramName,
+        systemSubfield: opts.systemSubfield,
         context: opts.context
       });
     case "date":
@@ -6098,7 +6115,12 @@ var APPOINTMENT_SEARCH_PARAMETERS = [
     jsonbPath: "$.appointmentType"
   },
   { code: "slot", type: "reference", jsonbPath: "$.slot[*]" },
-  { code: "identifier", type: "token", jsonbPath: "$.identifier[*].value" }
+  {
+    code: "identifier",
+    type: "token",
+    jsonbPath: "$.identifier[*].value",
+    systemSubfield: "system"
+  }
 ];
 
 // src/data/search/registry/chargeitem-search-parameters.ts
@@ -6349,7 +6371,12 @@ var ENCOUNTER_SEARCH_PARAMETERS = [
     type: "reference",
     jsonbPath: "$.episodeOfCare[*]"
   },
-  { code: "identifier", type: "token", jsonbPath: "$.identifier[*].value" }
+  {
+    code: "identifier",
+    type: "token",
+    jsonbPath: "$.identifier[*].value",
+    systemSubfield: "system"
+  }
 ];
 
 // src/data/search/registry/endpoint-search-parameters.ts