@openhi/constructs 0.0.84 → 0.0.86

package/package.json

@@ -1,22 +1,27 @@
 {
   "name": "@openhi/constructs",
   "devDependencies": {
-    "@swc/core": "^1.15.30",
+    "@microsoft/api-extractor": "7.58.7",
+    "@swc/core": "^1.15.33",
     "@swc/jest": "^0.2.39",
     "@types/express": "5.0.6",
     "@types/jest": "^30.0.0",
-    "@types/node": "25.5.2",
+    "@types/node": "25.6.0",
+    "@types/pg": "^8.20.0",
     "@typescript-eslint/eslint-plugin": "^8",
     "@typescript-eslint/parser": "^8",
-    "aws-cdk-lib": "2.248.0",
+    "aws-cdk-lib": "2.252.0",
     "commit-and-tag-version": "^12",
     "constructs": "10.6.0",
     "copyfiles": "^2.4.1",
+    "embedded-postgres": "^18.3.0-beta.17",
     "eslint": "^9",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-tsdoc": "^0.5.2",
     "jest": "^30.3.0",
     "jest-dynalite": "^3.6.1",
     "jest-junit": "^16",
@@ -27,15 +32,17 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.248.0",
+    "aws-cdk-lib": "2.252.0",
     "constructs": "10.6.0"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.1033.0",
-    "@aws-sdk/client-eventbridge": "^3.1033.0",
-    "@aws-sdk/client-s3": "^3.1033.0",
-    "@aws-sdk/client-ssm": "^3.1033.0",
-    "@codedrifters/utils": "^0.0.20",
+    "@aws-sdk/client-dynamodb": "^3.1041.0",
+    "@aws-sdk/client-eventbridge": "^3.1041.0",
+    "@aws-sdk/client-rds-data": "^3.1041.0",
+    "@aws-sdk/client-s3": "^3.1041.0",
+    "@aws-sdk/client-secrets-manager": "^3.1041.0",
+    "@aws-sdk/client-ssm": "^3.1041.0",
+    "@codedrifters/utils": "^0.0.22",
     "@codegenie/serverless-express": "^4.17.1",
     "@types/aws-lambda": "^8.10.161",
     "awscdk-appsync-utils": "^0.0.858",
@@ -43,15 +50,16 @@
     "electrodb": "^3.7.5",
     "esbuild": "^0.28.0",
     "express": "^5.2.1",
+    "pg": "^8.20.0",
     "type-fest": "^4",
     "ulid": "^3.0.2",
-    "@openhi/config": "0.0.0",
-    "@openhi/types": "0.0.0"
+    "@openhi/types": "0.0.0",
+    "@openhi/config": "0.0.0"
   },
   "devEngines": {
     "packageManager": {
       "name": "pnpm",
-      "version": "10.33.0",
+      "version": "10.33.2",
       "onFail": "ignore"
     }
   },
@@ -60,7 +68,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.84",
+  "version": "0.0.86",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"pnpm exec projen\".",
   "scripts": {
@@ -78,6 +86,7 @@
     "reset": "projen reset",
     "run-lambda-local": "projen run-lambda-local",
     "test": "projen test",
+    "test:coverage": "projen test:coverage",
     "test:watch": "projen test:watch",
     "unbump": "projen unbump",
     "upgrade": "projen upgrade",

package/scripts/generate-operations.js

@@ -169,7 +169,7 @@ import {
 } from "../../data-operations-common";
 
 /**
- * List ${type}s in a workspace (GSI4). Returns domain result for adapters to map to FHIR Bundle or other formats.
+ * List ${type}s in a workspace (GSI1, sharded). Returns domain result for adapters to map to FHIR Bundle or other formats.
  *
  * @see sites/www-docs/content/packages/@openhi/constructs/data/shared-data-layer-layout.md
  */
@@ -180,7 +180,7 @@ export type ${type}ListEntry = ListEntry<${type}>;
 export type List${pluralLabel(type)}Result = ListResult<${type}>;
 
 /**
- * Lists all ${type}s in the workspace. Uses GSI4 (Resource Type Index).
+ * Lists all ${type}s in the workspace. Uses GSI1 (Unified Sharded List per ADR-011).
  * Throws on service errors; adapters map to HTTP/GraphQL/Step Function.
  */
 export async function ${listOp}(

package/scripts/generate-routes.js

@@ -134,7 +134,7 @@ import {
 
 /**
  * GET /${type} — search/list: returns a FHIR Bundle (searchset) from the data store.
- * Uses GSI4 (Resource Type Index) to list all ${type}s in the workspace without a table scan.
+ * Uses GSI1 (Unified Sharded List per ADR-011) to list all ${type}s in the workspace without a table scan.
  */
 export async function ${listRoute}(
   req: Request,

package/lib/chunk-SWSN6GDD.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/components/dynamodb/dynamodb-stream-record.ts","../src/components/dynamodb/data-store-change-events.ts"],"sourcesContent":["import type { AttributeValue } from \"@aws-sdk/client-dynamodb\";\n\n/**\n * Shape of a DynamoDB change record as delivered inside Kinesis (table stream\n * destination) and decoded by the Firehose transform Lambda.\n */\nexport interface DynamoDbStreamKinesisRecord {\n  eventName?: string;\n  userIdentity?: unknown;\n  dynamodb?: {\n    Keys?: Record<string, AttributeValue>;\n    NewImage?: Record<string, AttributeValue>;\n    OldImage?: Record<string, AttributeValue>;\n    SequenceNumber?: string;\n    ApproximateCreationDateTime?: number;\n  };\n}\n\nexport function dynamodbValueToJs(av: AttributeValue): unknown {\n  if (av.S !== undefined) {\n    return av.S;\n  }\n  if (av.N !== undefined) {\n    return av.N.includes(\".\")\n      ? Number.parseFloat(av.N)\n      : Number.parseInt(av.N, 10);\n  }\n  if (av.BOOL !== undefined) {\n    return av.BOOL;\n  }\n  if (av.NULL !== undefined) {\n    return null;\n  }\n  if (av.M !== undefined) {\n    return dynamodbImageToPlain(av.M);\n  }\n  if (av.L !== undefined) {\n    return av.L.map((x: AttributeValue) => dynamodbValueToJs(x));\n  }\n  if (av.SS !== undefined) {\n    return av.SS;\n  }\n  if (av.NS !== undefined) {\n    return av.NS.map((n: string) =>\n      n.includes(\".\") ? Number.parseFloat(n) : Number.parseInt(n, 10),\n    );\n  }\n  return undefined;\n}\n\nexport function dynamodbImageToPlain(\n  image: Record<string, AttributeValue>,\n): Record<string, unknown> {\n  const out: Record<string, unknown> = {};\n  for (const [k, v] of Object.entries(image)) {\n    out[k] = dynamodbValueToJs(v);\n  }\n  return out;\n}\n","import type { AttributeValue } from \"@aws-sdk/client-dynamodb\";\nimport type { DynamoDbStreamKinesisRecord } from \"./dynamodb-stream-record\";\nimport { dynamodbImageToPlain } from \"./dynamodb-stream-record\";\n\n/**\n * EventBridge envelope constants for data-store CDC (no CDK imports).\n * @see docs/architecture/adr/2026-03-02-01-dynamodb-stream-to-data-event-bus.md\n */\nexport const DATA_STORE_CHANGE_EVENT_SOURCE = \"openhi.data.store\";\n\nexport const DATA_STORE_CHANGE_DETAIL_TYPE = \"FhirCurrentResourceChanged\";\n\n/** AWS PutEvents per-entry detail limit is 256 KiB; stay under for headroom. */\nexport const DATA_STORE_CHANGE_DETAIL_MAX_UTF8_BYTES = 250 * 1024;\n\nconst EXCLUDED_CHANGE_DETAIL_KEYS = new Set([\n  \"PK\",\n  \"SK\",\n  \"GSI1PK\",\n  \"GSI1SK\",\n  \"GSI2PK\",\n  \"GSI2SK\",\n  \"GSI3PK\",\n  \"GSI3SK\",\n  \"GSI4PK\",\n  \"GSI4SK\",\n  /** Full FHIR JSON may contain PII; never list or ship in the bus payload. */\n  \"resource\",\n]);\n\nfunction shallowValueEqual(a: unknown, b: unknown): boolean {\n  return JSON.stringify(a) === JSON.stringify(b);\n}\n\nfunction changedNonResourceAttributeNames(\n  oldImage: Record<string, unknown> | undefined,\n  newImage: Record<string, unknown> | undefined,\n): string[] | undefined {\n  if (!oldImage || !newImage) {\n    return undefined;\n  }\n  const names = new Set<string>();\n  const keys = new Set([...Object.keys(oldImage), ...Object.keys(newImage)]);\n  for (const k of keys) {\n    if (EXCLUDED_CHANGE_DETAIL_KEYS.has(k)) {\n      continue;\n    }\n    if (!shallowValueEqual(oldImage[k], newImage[k])) {\n      names.add(k);\n    }\n  }\n  return names.size > 0 ? [...names].sort() : undefined;\n}\n\n/** Non-excluded attribute names present on an item (for INSERT / REMOVE). */\nfunction presentMetadataAttributeNames(\n  image: Record<string, unknown> | undefined,\n): string[] | undefined {\n  if (!image) {\n    return undefined;\n  }\n  const names = Object.keys(image).filter(\n    (k) => !EXCLUDED_CHANGE_DETAIL_KEYS.has(k),\n  );\n  return names.length > 0 ? names.sort() : undefined;\n}\n\nfunction plainImage(\n  image: Record<string, AttributeValue> | undefined,\n): Record<string, unknown> | undefined {\n  if (!image) {\n    return undefined;\n  }\n  return dynamodbImageToPlain(image);\n}\n\nexport interface FhirCurrentResourceChangeDetail {\n  changeType: \"INSERT\" | \"MODIFY\" | \"REMOVE\";\n  tenantId: string;\n  workspaceId: string;\n  resourceType: string;\n  resourceId: string;\n  resourceVersion: string;\n  streamSequenceNumber?: string;\n  /** Seconds since UNIX epoch (DynamoDB Streams `ApproximateCreationDateTime`). */\n  approximateCreationEpochSec?: number;\n  /**\n   * MODIFY: attributes whose values differ between old and new images.\n   * INSERT / REMOVE: attributes present on the written or removed image (metadata only).\n   */\n  changedAttributeNames?: string[];\n}\n\nexport function buildFhirCurrentResourceChangeDetail(\n  record: DynamoDbStreamKinesisRecord,\n  keys: {\n    tenantId: string;\n    workspaceId: string;\n    resourceType: string;\n    resourceId: string;\n    version: string;\n  },\n): FhirCurrentResourceChangeDetail {\n  const rawName = record.eventName;\n  const changeType =\n    rawName === \"INSERT\" || rawName === \"MODIFY\" || rawName === \"REMOVE\"\n      ? rawName\n      : \"MODIFY\";\n\n  const seq = record.dynamodb?.SequenceNumber;\n  const approxEpochSec = record.dynamodb?.ApproximateCreationDateTime;\n\n  const newPlain = plainImage(\n    record.dynamodb?.NewImage as Record<string, AttributeValue> | undefined,\n  );\n  const oldPlain = plainImage(\n    record.dynamodb?.OldImage as Record<string, AttributeValue> | undefined,\n  );\n\n  let changedAttributeNames: string[] | undefined;\n  if (changeType === \"MODIFY\") {\n    changedAttributeNames = changedNonResourceAttributeNames(\n      oldPlain,\n      newPlain,\n    );\n  } else if (changeType === \"INSERT\") {\n    changedAttributeNames = presentMetadataAttributeNames(newPlain);\n  } else {\n    changedAttributeNames = presentMetadataAttributeNames(oldPlain);\n  }\n\n  return {\n    changeType,\n    tenantId: keys.tenantId,\n    workspaceId: keys.workspaceId,\n    resourceType: keys.resourceType,\n    resourceId: keys.resourceId,\n    resourceVersion: keys.version,\n    ...(typeof seq === \"string\" && seq.length > 0\n      ? { streamSequenceNumber: seq }\n      : {}),\n    ...(typeof approxEpochSec === \"number\" && Number.isFinite(approxEpochSec)\n      ? { approximateCreationEpochSec: approxEpochSec }\n      : {}),\n    ...(changedAttributeNames ? { changedAttributeNames } : {}),\n  };\n}\n"],"mappings":"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","names":[]}

package/scripts/generate-route-tests.mjs

@@ -1,227 +0,0 @@
-#!/usr/bin/env node
-/**
- * Generate one route test file per FHIR type that has rest-api routes.
- * Run from constructs package: node scripts/generate-route-tests.mjs
- * Ensures routes/data/<folder>/<folder>.test.ts exists for each type.
- */
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const ROOT = path.resolve(__dirname, "..");
-const ROUTES_DATA = path.join(ROOT, "src/data/rest-api/routes/data");
-const OPERATIONS = path.join(ROOT, "src/data/operations/data");
-
-const dirs = fs.readdirSync(OPERATIONS).filter((d) => {
-  const p = path.join(OPERATIONS, d);
-  return fs.statSync(p).isDirectory() && fs.existsSync(path.join(p, `${d}-create-operation.ts`));
-});
-
-const types = [];
-for (const dir of dirs) {
-  const createPath = path.join(OPERATIONS, dir, `${dir}-create-operation.ts`);
-  const line = fs.readFileSync(createPath, "utf8").split("\n")[0];
-  const match = line.match(/import type \{ ([^}]+) \}/);
-  if (!match) continue;
-  const imports = match[1].split(",").map((s) => s.trim());
-  const type = imports.find((t) => t !== "Meta");
-  if (type) types.push({ type, folder: dir });
-}
-types.sort((a, b) => a.type.localeCompare(b.type));
-
-function basePathKey(type) {
-  return type.toUpperCase().replace(/-/g, "");
-}
-
-function pluralRoute(type) {
-  return type + "s";
-}
-
-function testContent(type, folder) {
-  const key = basePathKey(type);
-  const plural = pluralRoute(type);
-  const createOp = `create${type}Operation`;
-  const updateOp = `update${type}Operation`;
-  const listOp = `list${plural}Operation`;
-  const getByIdOp = `get${type}ByIdOperation`;
-  const deleteOp = `delete${type}Operation`;
-  const createRoute = `create${type}Route`;
-  const updateRoute = `update${type}Route`;
-  const listRoute = `list${plural}Route`;
-  const getByIdRoute = `get${type}ByIdRoute`;
-  const deleteRoute = `delete${type}Route`;
-
-  return `import type { Request, Response } from "express";
-import { NotFoundError } from "../../../../errors";
-import { ${createRoute} } from "./${folder}-create-route";
-import { ${deleteRoute} } from "./${folder}-delete-route";
-import { ${getByIdRoute} } from "./${folder}-get-by-id-route";
-import { ${listRoute} } from "./${folder}-list-route";
-import { ${updateRoute} } from "./${folder}-update-route";
-import { create${type}Operation } from "../../../../operations/data/${folder}/${folder}-create-operation";
-import { delete${type}Operation } from "../../../../operations/data/${folder}/${folder}-delete-operation";
-import { get${type}ByIdOperation } from "../../../../operations/data/${folder}/${folder}-get-by-id-operation";
-import { list${plural}Operation } from "../../../../operations/data/${folder}/${folder}-list-operation";
-import { update${type}Operation } from "../../../../operations/data/${folder}/${folder}-update-operation";
-
-jest.mock("../../../../operations/data/${folder}/${folder}-create-operation");
-jest.mock("../../../../operations/data/${folder}/${folder}-update-operation");
-jest.mock("../../../../operations/data/${folder}/${folder}-list-operation");
-jest.mock("../../../../operations/data/${folder}/${folder}-get-by-id-operation");
-jest.mock("../../../../operations/data/${folder}/${folder}-delete-operation");
-
-const defaultContext = {
-  tenantId: "tenant-1",
-  workspaceId: "ws-1",
-  date: "2026-02-26T12:00:00.000Z",
-  actorId: "actor-1",
-  actorName: "Test Actor",
-};
-
-function mockRes(): Response {
-  const res = {} as Response;
-  res.status = jest.fn().mockReturnThis();
-  res.json = jest.fn().mockReturnThis();
-  res.location = jest.fn().mockReturnThis();
-  res.send = jest.fn().mockReturnThis();
-  return res;
-}
-
-function mockReq(overrides: Partial<{ params: Record<string, string>; body: unknown }> = {}): Request {
-  const req = {
-    openhiContext: defaultContext,
-    params: {},
-    body: {},
-    ...overrides,
-  } as unknown as Request;
-  return req;
-}
-
-describe("${type} routes", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe("${createRoute}", () => {
-    it("returns 201 and location when create succeeds", async () => {
-      const id = "01HXYZ";
-      (create${type}Operation as jest.Mock).mockResolvedValue({
-        id,
-        resource: { resourceType: "${type}", id },
-      });
-      const req = mockReq({
-        body: { resourceType: "${type}" },
-      });
-      const res = mockRes();
-
-      await ${createRoute}(req, res);
-
-      expect(create${type}Operation).toHaveBeenCalledWith({
-        context: defaultContext,
-        body: expect.objectContaining({ resourceType: "${type}" }),
-      });
-      expect(res.status).toHaveBeenCalledWith(201);
-      expect(res.location).toHaveBeenCalled();
-      expect(res.json).toHaveBeenCalledWith(expect.objectContaining({ id }));
-    });
-  });
-
-  describe("${listRoute}", () => {
-    it("returns bundle when list succeeds", async () => {
-      (list${plural}Operation as jest.Mock).mockResolvedValue({
-        entries: [{ id: "01HXYZ", resource: { resourceType: "${type}", id: "01HXYZ" } }],
-      });
-      const req = mockReq();
-      const res = mockRes();
-
-      await ${listRoute}(req, res);
-
-      expect(list${plural}Operation).toHaveBeenCalledWith({ context: defaultContext });
-      expect(res.json).toHaveBeenCalledWith(
-        expect.objectContaining({
-          resourceType: "Bundle",
-          type: "searchset",
-          entry: expect.any(Array),
-        }),
-      );
-    });
-  });
-
-  describe("${getByIdRoute}", () => {
-    it("returns 404 when resource not found", async () => {
-      (get${type}ByIdOperation as jest.Mock).mockRejectedValue(new NotFoundError("not found"));
-      const req = mockReq({ params: { id: "01HXYZ" } });
-      const res = mockRes();
-
-      await ${getByIdRoute}(req, res);
-
-      expect(get${type}ByIdOperation).toHaveBeenCalledWith({
-        context: defaultContext,
-        id: "01HXYZ",
-      });
-      expect(res.status).toHaveBeenCalledWith(404);
-    });
-
-    it("returns resource when found", async () => {
-      const resource = { resourceType: "${type}", id: "01HXYZ" };
-      (get${type}ByIdOperation as jest.Mock).mockResolvedValue({ resource });
-      const req = mockReq({ params: { id: "01HXYZ" } });
-      const res = mockRes();
-
-      await ${getByIdRoute}(req, res);
-
-      expect(res.json).toHaveBeenCalledWith(resource);
-    });
-  });
-
-  describe("${updateRoute}", () => {
-    it("returns 200 and resource when update succeeds", async () => {
-      const resource = { resourceType: "${type}", id: "01HXYZ" };
-      (update${type}Operation as jest.Mock).mockResolvedValue({ resource });
-      const req = mockReq({ params: { id: "01HXYZ" }, body: { resourceType: "${type}" } });
-      const res = mockRes();
-
-      await ${updateRoute}(req, res);
-
-      expect(update${type}Operation).toHaveBeenCalledWith({
-        context: defaultContext,
-        id: "01HXYZ",
-        body: expect.objectContaining({ resourceType: "${type}", id: "01HXYZ" }),
-      });
-      expect(res.json).toHaveBeenCalledWith(resource);
-    });
-  });
-
-  describe("${deleteRoute}", () => {
-    it("returns 204 when delete succeeds", async () => {
-      (delete${type}Operation as jest.Mock).mockResolvedValue(undefined);
-      const req = mockReq({ params: { id: "01HXYZ" } });
-      const res = mockRes();
-
-      await ${deleteRoute}(req, res);
-
-      expect(delete${type}Operation).toHaveBeenCalledWith({
-        context: defaultContext,
-        id: "01HXYZ",
-      });
-      expect(res.status).toHaveBeenCalledWith(204);
-      expect(res.send).toHaveBeenCalled();
-    });
-  });
-});
-`;
-}
-
-for (const { type, folder } of types) {
-  const routeDir = path.join(ROUTES_DATA, folder);
-  const testFile = path.join(routeDir, `${folder}.test.ts`);
-  if (fs.existsSync(testFile)) {
-    console.log(`Skip ${type} (test exists)`);
-    continue;
-  }
-  fs.writeFileSync(testFile, testContent(type, folder), "utf8");
-  console.log(`Generated ${folder}.test.ts for ${type}`);
-}
-
-console.log(`Total: ${types.length} route types; ensured tests for all.`);