@openhi/constructs 0.0.122 → 0.0.124

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

@@ -9587,59 +9587,6 @@ async function getAppointmentByIdRoute(req, res) {
   }
 }
 
-// src/data/operations/data/appointment/appointment-date-search-predicate.ts
-var APPOINTMENT_DATE_SEARCH_PREFIXES = [
-  "gt",
-  "lt",
-  "ge",
-  "le",
-  "sa",
-  "eb"
-];
-function isAppointmentDateSearchPrefix(s) {
-  return APPOINTMENT_DATE_SEARCH_PREFIXES.includes(
-    s
-  );
-}
-var APPT_START = "resource->>'start'";
-var APPT_END = "resource->>'end'";
-var HAS_ANY_BOUND_GUARD = `(${APPT_START} IS NOT NULL OR ${APPT_END} IS NOT NULL)`;
-function buildSinglePredicateSql(prefix, paramName) {
-  switch (prefix) {
-    case "gt":
-      return `(${APPT_END} IS NULL OR ${APPT_END} > :${paramName})`;
-    case "lt":
-      return `(${APPT_START} IS NULL OR ${APPT_START} < :${paramName})`;
-    case "ge":
-      return `(${APPT_END} IS NULL OR ${APPT_END} >= :${paramName})`;
-    case "le":
-      return `(${APPT_START} IS NULL OR ${APPT_START} <= :${paramName})`;
-    case "sa":
-      return `(${APPT_START} IS NOT NULL AND ${APPT_START} > :${paramName})`;
-    case "eb":
-      return `(${APPT_END} IS NOT NULL AND ${APPT_END} < :${paramName})`;
-  }
-}
-function appointmentDateConstraintParamName(index) {
-  return `apptDateConstraint${index}`;
-}
-function buildAppointmentDateSearchPredicateSql(constraints) {
-  if (constraints.length === 0) {
-    return [];
-  }
-  const fragments = constraints.map(
-    (c, i) => buildSinglePredicateSql(c.prefix, appointmentDateConstraintParamName(i))
-  );
-  fragments.push(HAS_ANY_BOUND_GUARD);
-  return fragments;
-}
-function buildAppointmentDateSearchPredicateParams(constraints) {
-  return constraints.map((c, i) => ({
-    name: appointmentDateConstraintParamName(i),
-    value: c.value
-  }));
-}
-
 // src/data/operations/data/appointment/appointment-list-operation.ts
 async function listAppointmentsOperation(params) {
   const { context, tableName, mode } = params;
@@ -9814,123 +9761,93 @@ function getDefaultPostgresQueryRunner() {
   return cached;
 }
 
-// src/data/operations/data/encounter/encounter-period-search-predicate.ts
-var PERIOD_SEARCH_PREFIXES = [
-  "gt",
-  "lt",
-  "ge",
-  "le",
-  "sa",
-  "eb"
-];
-function isPeriodSearchPrefix(s) {
-  return PERIOD_SEARCH_PREFIXES.includes(s);
+// src/data/search/engine/date-predicate.ts
+function flatJsonbExtract(jsonbPath) {
+  const match = /^\$\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(jsonbPath);
+  if (!match) {
+    throw new Error(
+      `Generic date predicate requires a flat top-level JSONPath like "$.fieldName"; received "${jsonbPath}".`
+    );
+  }
+  return `resource->>'${match[1]}'`;
 }
-var PERIOD_START = "resource->'period'->>'start'";
-var PERIOD_END = "resource->'period'->>'end'";
-var HAS_ANY_BOUND_GUARD2 = `(${PERIOD_START} IS NOT NULL OR ${PERIOD_END} IS NOT NULL)`;
-function buildSinglePredicateSql2(prefix, paramName) {
+var DEFAULT_INTERVAL_PARAM_PREFIX = "intervalDateConstraint";
+function intervalConstraintParamName(prefix, index) {
+  return `${prefix}${index}`;
+}
+function buildIntervalSingleSql(prefix, startExtract, endExtract, paramName) {
   switch (prefix) {
+    case "eq":
+      return `(${startExtract} IS NOT NULL AND ${startExtract} = :${paramName})`;
     case "gt":
-      return `(${PERIOD_END} IS NULL OR ${PERIOD_END} > :${paramName})`;
+      return `(${endExtract} IS NULL OR ${endExtract} > :${paramName})`;
     case "lt":
-      return `(${PERIOD_START} IS NULL OR ${PERIOD_START} < :${paramName})`;
+      return `(${startExtract} IS NULL OR ${startExtract} < :${paramName})`;
     case "ge":
-      return `(${PERIOD_END} IS NULL OR ${PERIOD_END} >= :${paramName})`;
+      return `(${endExtract} IS NULL OR ${endExtract} >= :${paramName})`;
     case "le":
-      return `(${PERIOD_START} IS NULL OR ${PERIOD_START} <= :${paramName})`;
+      return `(${startExtract} IS NULL OR ${startExtract} <= :${paramName})`;
     case "sa":
-      return `(${PERIOD_START} IS NOT NULL AND ${PERIOD_START} > :${paramName})`;
+      return `(${startExtract} IS NOT NULL AND ${startExtract} > :${paramName})`;
     case "eb":
-      return `(${PERIOD_END} IS NOT NULL AND ${PERIOD_END} < :${paramName})`;
+      return `(${endExtract} IS NOT NULL AND ${endExtract} < :${paramName})`;
   }
 }
-function periodConstraintParamName(index) {
-  return `periodConstraint${index}`;
-}
-function buildPeriodSearchPredicateSql(constraints) {
+function buildIntervalDateSearchPredicateSql(constraints, opts) {
   if (constraints.length === 0) {
     return [];
   }
+  const paramPrefix = opts.paramNamePrefix ?? DEFAULT_INTERVAL_PARAM_PREFIX;
+  const startExtract = flatJsonbExtract(opts.startPath);
+  const endExtract = flatJsonbExtract(opts.endPath);
   const fragments = constraints.map(
-    (c, i) => buildSinglePredicateSql2(c.prefix, periodConstraintParamName(i))
+    (c, i) => buildIntervalSingleSql(
+      c.prefix,
+      startExtract,
+      endExtract,
+      intervalConstraintParamName(paramPrefix, i)
+    )
   );
-  fragments.push(HAS_ANY_BOUND_GUARD2);
+  fragments.push(`(${startExtract} IS NOT NULL OR ${endExtract} IS NOT NULL)`);
   return fragments;
 }
-function buildPeriodSearchPredicateParams(constraints) {
+function buildIntervalDateSearchPredicateParams(constraints, opts) {
+  const paramPrefix = opts?.paramNamePrefix ?? DEFAULT_INTERVAL_PARAM_PREFIX;
   return constraints.map((c, i) => ({
-    name: periodConstraintParamName(i),
+    name: intervalConstraintParamName(paramPrefix, i),
     value: c.value
   }));
 }
-
-// src/data/operations/data/encounter/encounter-search-by-patient-operation.ts
-var DEFAULT_LIMIT = 100;
-function buildOpenHiResourceUrn(opts) {
-  return `urn:ohi:${opts.tenantId}:${opts.workspaceId}:${opts.resourceType}:${opts.resourceId}`;
-}
-function buildSearchEncountersByPatientSql(opts) {
-  const periodPredicates = buildPeriodSearchPredicateSql(
-    opts?.periodConstraints ?? []
+var APPOINTMENT_DATE_SEARCH_PREFIXES = [
+  "gt",
+  "lt",
+  "ge",
+  "le",
+  "sa",
+  "eb"
+];
+function isAppointmentDateSearchPrefix(s) {
+  return APPOINTMENT_DATE_SEARCH_PREFIXES.includes(
+    s
   );
-  const lines = [
-    "SELECT resource_id AS id, resource",
-    "FROM resources",
-    "WHERE tenant_id = :tenantId",
-    "  AND workspace_id = :workspaceId",
-    "  AND resource_type = 'Encounter'",
-    "  AND deleted_at IS NULL",
-    "  AND (resource @> :containmentRelative::jsonb",
-    "    OR resource @> :containmentUrn::jsonb)"
-  ];
-  for (const fragment of periodPredicates) {
-    lines.push(`  AND ${fragment}`);
-  }
-  lines.push("ORDER BY last_updated DESC");
-  lines.push("LIMIT :limit;");
-  return lines.join("\n");
 }
-async function searchEncountersByPatientOperation(params) {
-  const { context, patientId } = params;
-  const periodConstraints = params.periodConstraints ?? [];
-  const { tenantId, workspaceId } = context;
-  const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT;
-  const containmentRelative = JSON.stringify({
-    subject: { reference: `Patient/${patientId}` }
+function buildAppointmentDateSearchPredicateSql(constraints) {
+  return buildIntervalDateSearchPredicateSql(constraints, {
+    startPath: "$.start",
+    endPath: "$.end",
+    paramNamePrefix: "apptDateConstraint"
   });
-  const containmentUrn = JSON.stringify({
-    subject: {
-      reference: buildOpenHiResourceUrn({
-        tenantId,
-        workspaceId,
-        resourceType: "Patient",
-        resourceId: patientId
-      })
-    }
+}
+function buildAppointmentDateSearchPredicateParams(constraints) {
+  return buildIntervalDateSearchPredicateParams(constraints, {
+    paramNamePrefix: "apptDateConstraint"
   });
-  const sql = buildSearchEncountersByPatientSql({ periodConstraints });
-  const queryParams = [
-    { name: "tenantId", value: tenantId },
-    { name: "workspaceId", value: workspaceId },
-    { name: "containmentRelative", value: containmentRelative },
-    { name: "containmentUrn", value: containmentUrn },
-    { name: "limit", value: limit },
-    ...buildPeriodSearchPredicateParams(periodConstraints)
-  ];
-  const rows = await runner.query(sql, queryParams);
-  const entries = rows.map((row) => ({
-    id: row.id,
-    resource: {
-      ...row.resource,
-      id: row.id
-    }
-  }));
-  return { entries, total: entries.length };
 }
 
-// src/data/operations/data/reference-containment-predicate.ts
+// src/data/search/engine/reference-predicate.ts
+function buildOpenHiResourceUrn(opts) {
+  return `urn:ohi:${opts.tenantId}:${opts.workspaceId}:${opts.resourceType}:${opts.resourceId}`;
+}
 var REFERENCE_CONTAINMENT_SQL_FRAGMENT = "(resource @> :containmentRelative::jsonb OR resource @> :containmentUrn::jsonb)";
 function parseTypedReference(s) {
   const match = /^([A-Za-z][A-Za-z0-9_]*)\/([^\s/]+)$/.exec(s);
@@ -9971,7 +9888,7 @@ function buildReferenceContainmentPayload(params) {
 }
 
 // src/data/operations/data/appointment/appointment-search-by-actor-operation.ts
-var DEFAULT_LIMIT2 = 100;
+var DEFAULT_LIMIT = 100;
 function buildSearchAppointmentsByActorSql(opts) {
   const datePredicates = buildAppointmentDateSearchPredicateSql(
     opts?.dateConstraints ?? []
@@ -9997,7 +9914,7 @@ async function searchAppointmentsByActorOperation(params) {
   const dateConstraints = params.dateConstraints ?? [];
   const { tenantId, workspaceId } = context;
   const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT2;
+  const limit = params.limit ?? DEFAULT_LIMIT;
   const { containmentRelative, containmentUrn } = buildReferenceContainmentPayload({
     shape: {
       kind: "array-of-objects",
@@ -10029,7 +9946,7 @@ async function searchAppointmentsByActorOperation(params) {
 }
 
 // src/data/operations/data/appointment/appointment-search-by-date-operation.ts
-var DEFAULT_LIMIT3 = 100;
+var DEFAULT_LIMIT2 = 100;
 function buildSearchAppointmentsByDateSql(opts) {
   const datePredicates = buildAppointmentDateSearchPredicateSql(
     opts.dateConstraints
@@ -10058,7 +9975,7 @@ async function searchAppointmentsByDateOperation(params) {
   }
   const { tenantId, workspaceId } = context;
   const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT3;
+  const limit = params.limit ?? DEFAULT_LIMIT2;
   const sql = buildSearchAppointmentsByDateSql({ dateConstraints });
   const queryParams = [
     { name: "tenantId", value: tenantId },
@@ -10078,7 +9995,7 @@ async function searchAppointmentsByDateOperation(params) {
 }
 
 // src/data/operations/data/appointment/appointment-search-by-patient-operation.ts
-var DEFAULT_LIMIT4 = 100;
+var DEFAULT_LIMIT3 = 100;
 function buildSearchAppointmentsByPatientSql(opts) {
   const datePredicates = buildAppointmentDateSearchPredicateSql(
     opts?.dateConstraints ?? []
@@ -10105,7 +10022,7 @@ async function searchAppointmentsByPatientOperation(params) {
   const dateConstraints = params.dateConstraints ?? [];
   const { tenantId, workspaceId } = context;
   const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT4;
+  const limit = params.limit ?? DEFAULT_LIMIT3;
   const containmentRelative = JSON.stringify({
     participant: [{ actor: { reference: `Patient/${patientId}` } }]
   });
@@ -17821,8 +17738,59 @@ async function listEncountersOperation(params) {
   );
 }
 
+// src/data/operations/data/encounter/encounter-period-search-predicate.ts
+var PERIOD_SEARCH_PREFIXES = [
+  "gt",
+  "lt",
+  "ge",
+  "le",
+  "sa",
+  "eb"
+];
+function isPeriodSearchPrefix(s) {
+  return PERIOD_SEARCH_PREFIXES.includes(s);
+}
+var PERIOD_START = "resource->'period'->>'start'";
+var PERIOD_END = "resource->'period'->>'end'";
+var HAS_ANY_BOUND_GUARD = `(${PERIOD_START} IS NOT NULL OR ${PERIOD_END} IS NOT NULL)`;
+function buildSinglePredicateSql(prefix, paramName) {
+  switch (prefix) {
+    case "gt":
+      return `(${PERIOD_END} IS NULL OR ${PERIOD_END} > :${paramName})`;
+    case "lt":
+      return `(${PERIOD_START} IS NULL OR ${PERIOD_START} < :${paramName})`;
+    case "ge":
+      return `(${PERIOD_END} IS NULL OR ${PERIOD_END} >= :${paramName})`;
+    case "le":
+      return `(${PERIOD_START} IS NULL OR ${PERIOD_START} <= :${paramName})`;
+    case "sa":
+      return `(${PERIOD_START} IS NOT NULL AND ${PERIOD_START} > :${paramName})`;
+    case "eb":
+      return `(${PERIOD_END} IS NOT NULL AND ${PERIOD_END} < :${paramName})`;
+  }
+}
+function periodConstraintParamName(index) {
+  return `periodConstraint${index}`;
+}
+function buildPeriodSearchPredicateSql(constraints) {
+  if (constraints.length === 0) {
+    return [];
+  }
+  const fragments = constraints.map(
+    (c, i) => buildSinglePredicateSql(c.prefix, periodConstraintParamName(i))
+  );
+  fragments.push(HAS_ANY_BOUND_GUARD);
+  return fragments;
+}
+function buildPeriodSearchPredicateParams(constraints) {
+  return constraints.map((c, i) => ({
+    name: periodConstraintParamName(i),
+    value: c.value
+  }));
+}
+
 // src/data/operations/data/encounter/encounter-search-by-date-operation.ts
-var DEFAULT_LIMIT5 = 100;
+var DEFAULT_LIMIT4 = 100;
 function buildSearchEncountersByDateSql(opts) {
   const periodPredicates = buildPeriodSearchPredicateSql(
     opts.periodConstraints
@@ -17851,7 +17819,7 @@ async function searchEncountersByDateOperation(params) {
   }
   const { tenantId, workspaceId } = context;
   const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT5;
+  const limit = params.limit ?? DEFAULT_LIMIT4;
   const sql = buildSearchEncountersByDateSql({ periodConstraints });
   const queryParams = [
     { name: "tenantId", value: tenantId },
@@ -17871,7 +17839,7 @@ async function searchEncountersByDateOperation(params) {
 }
 
 // src/data/operations/data/encounter/encounter-search-by-participant-operation.ts
-var DEFAULT_LIMIT6 = 100;
+var DEFAULT_LIMIT5 = 100;
 function buildSearchEncountersByParticipantSql(opts) {
   const periodPredicates = buildPeriodSearchPredicateSql(
     opts?.periodConstraints ?? []
@@ -17897,7 +17865,7 @@ async function searchEncountersByParticipantOperation(params) {
   const periodConstraints = params.periodConstraints ?? [];
   const { tenantId, workspaceId } = context;
   const runner = params.runner ?? getDefaultPostgresQueryRunner();
-  const limit = params.limit ?? DEFAULT_LIMIT6;
+  const limit = params.limit ?? DEFAULT_LIMIT5;
   const { containmentRelative, containmentUrn } = buildReferenceContainmentPayload({
     shape: {
       kind: "array-of-objects",
@@ -17928,6 +17896,68 @@ async function searchEncountersByParticipantOperation(params) {
   return { entries, total: entries.length };
 }
 
+// src/data/operations/data/encounter/encounter-search-by-patient-operation.ts
+var DEFAULT_LIMIT6 = 100;
+function buildSearchEncountersByPatientSql(opts) {
+  const periodPredicates = buildPeriodSearchPredicateSql(
+    opts?.periodConstraints ?? []
+  );
+  const lines = [
+    "SELECT resource_id AS id, resource",
+    "FROM resources",
+    "WHERE tenant_id = :tenantId",
+    "  AND workspace_id = :workspaceId",
+    "  AND resource_type = 'Encounter'",
+    "  AND deleted_at IS NULL",
+    "  AND (resource @> :containmentRelative::jsonb",
+    "    OR resource @> :containmentUrn::jsonb)"
+  ];
+  for (const fragment of periodPredicates) {
+    lines.push(`  AND ${fragment}`);
+  }
+  lines.push("ORDER BY last_updated DESC");
+  lines.push("LIMIT :limit;");
+  return lines.join("\n");
+}
+async function searchEncountersByPatientOperation(params) {
+  const { context, patientId } = params;
+  const periodConstraints = params.periodConstraints ?? [];
+  const { tenantId, workspaceId } = context;
+  const runner = params.runner ?? getDefaultPostgresQueryRunner();
+  const limit = params.limit ?? DEFAULT_LIMIT6;
+  const containmentRelative = JSON.stringify({
+    subject: { reference: `Patient/${patientId}` }
+  });
+  const containmentUrn = JSON.stringify({
+    subject: {
+      reference: buildOpenHiResourceUrn({
+        tenantId,
+        workspaceId,
+        resourceType: "Patient",
+        resourceId: patientId
+      })
+    }
+  });
+  const sql = buildSearchEncountersByPatientSql({ periodConstraints });
+  const queryParams = [
+    { name: "tenantId", value: tenantId },
+    { name: "workspaceId", value: workspaceId },
+    { name: "containmentRelative", value: containmentRelative },
+    { name: "containmentUrn", value: containmentUrn },
+    { name: "limit", value: limit },
+    ...buildPeriodSearchPredicateParams(periodConstraints)
+  ];
+  const rows = await runner.query(sql, queryParams);
+  const entries = rows.map((row) => ({
+    id: row.id,
+    resource: {
+      ...row.resource,
+      id: row.id
+    }
+  }));
+  return { entries, total: entries.length };
+}
+
 // src/data/rest-api/routes/data/encounter/encounter-list-route.ts
 function singleStringQueryParam2(req, name) {
   const v = req.query[name];