WIP mibrate to Bundle type

Co-authored-by: Aleksandr Penskoi <alexandr.penskoi@health-samurai.io>

Author: andreyorst

scripts/generate-types.ts

@@ -12,6 +12,8 @@ const builder = new APIBuilder()
 	.treeShake({
 		"hl7.fhir.r5.core": {
 			"http://hl7.org/fhir/StructureDefinition/OperationOutcome": {},
+			"http://hl7.org/fhir/StructureDefinition/Bundle": {},
+			"http://hl7.org/fhir/StructureDefinition/Resource": {},
 		},
 		"org.sql-on-fhir.ig": {
 			"https://sql-on-fhir.org/ig/StructureDefinition/ViewDefinition": {},

src/api/utils.tsx

@@ -6,29 +6,40 @@ import { AidboxClientError } from "@health-samurai/aidbox-client";
 import * as HSComp from "@health-samurai/react-components";
 import type { MutationFunctionContext } from "@tanstack/react-query";
 
-export function toastOperationOutcome(oo: OperationOutcome) {
+export function parseOperationOutcome(
+	oo: OperationOutcome,
+): { expression: string; diagnostics: string }[] {
 	const issues = oo.issue;
-	issues.forEach((o) => {
-		if (typeof o !== "object" || o === null) {
-			console.error("Invalid OperationOutcome error");
-			return;
+
+	return issues.flatMap((issue) => {
+		if (typeof issue !== "object" || issue === null) {
+			return [];
 		}
 
 		const expression =
-			hasProperty(o, "expression") && typeof o.expression === "string"
-				? o.expression
+			hasProperty(issue, "expression") && typeof issue.expression === "string"
+				? issue.expression
 				: null;
 
 		const diagnostics =
-			hasProperty(o, "diagnostics") && typeof o.diagnostics === "string"
-				? o.diagnostics
+			hasProperty(issue, "diagnostics") && typeof issue.diagnostics === "string"
+				? issue.diagnostics
 				: null;
 
-		if (expression === null && diagnostics === null) {
-			console.error("Empty OperationOutcome error");
-			return;
+		if (expression === null || diagnostics === null) {
+			return [];
 		}
 
+		return { expression, diagnostics };
+	});
+}
+
+export function toastOperationOutcome(oo: OperationOutcome) {
+	const issues = parseOperationOutcome(oo);
+	if (issues.length === 0)
+		throw new Error("Invalid OperationOutcome", { cause: oo });
+
+	issues.forEach(({ expression, diagnostics }) => {
 		HSComp.toast.error(
 			<div className="text-left">
 				<b>{expression}</b>

src/components/ResourceEditor/action.tsx

@@ -1,16 +1,12 @@
 import { defaultToastPlacement } from "@aidbox-ui/components/config";
+import type { Resource } from "@aidbox-ui/fhir-types/hl7-fhir-r5-core";
 import type * as AidboxTypes from "@health-samurai/aidbox-client";
 import * as HSComp from "@health-samurai/react-components";
 import { useMutation } from "@tanstack/react-query";
 import * as Router from "@tanstack/react-router";
 import * as YAML from "js-yaml";
 import * as Utils from "../../api/utils";
-import {
-	createResource,
-	deleteResource,
-	type Resource,
-	updateResource,
-} from "./api";
+import { createResource, deleteResource, updateResource } from "./api";
 import type { EditorMode } from "./types";
 
 export const SaveButton = ({

src/components/ResourceEditor/api.ts

@@ -1,10 +1,7 @@
-import type { AidboxClient } from "@health-samurai/aidbox-client";
-
-export type Resource = {
-	resourceType: string;
-	id?: string;
-	[key: string]: unknown;
-};
+import { parseOperationOutcome } from "@aidbox-ui/api/utils";
+import type { Bundle, Resource, OperationOutcome } from "@aidbox-ui/fhir-types/hl7-fhir-r5-core";
+import { isOperationOutcome } from "@aidbox-ui/fhir-types/hl7-fhir-r5-core";
+import type { AidboxClient, AidboxResponse } from "@health-samurai/aidbox-client";
 
 export const fetchResource = async (
 	client: AidboxClient,
@@ -24,13 +21,6 @@ export const fetchResource = async (
 	return raw;
 };
 
-export interface HistoryBundle {
-	resourceType: "Bundle";
-	type: "history";
-	total: number;
-	entry: HistoryEntry[];
-}
-
 export type HistoryEntryResource = {
 	meta: {
 		versionId: string;
@@ -49,22 +39,32 @@ export const fetchResourceHistory = async (
 	client: AidboxClient,
 	resourceType: string,
 	id: string,
-) => {
-	const raw = (
-		await client.aidboxRequest<HistoryBundle>({
-			method: "GET",
-			url: `/fhir/${resourceType}/${id}/_history`,
-			headers: {
-				"Content-Type": "application/json",
-				Accept: "application/json",
-			},
-			params: [
-				["_page", "1"],
-				["_count", "100"],
-			],
-		})
-	).response.body;
-	return raw as HistoryBundle;
+): Promise<Bundle> => {
+	const res: AidboxResponse<Bundle> = await client.aidboxRequest<Bundle>({
+		method: "GET",
+		url: `/fhir/${resourceType}/${id}/_history`,
+		headers: {
+			"Content-Type": "application/json",
+			Accept: "application/json",
+		},
+		params: [
+			["_page", "1"],
+			["_count", "100"],
+		],
+	});
+	const response = res.response;
+
+	const body = response.body;
+
+	if (isOperationOutcome(body))
+		throw new Error(
+			parseOperationOutcome(body)
+				.map(({ expression, diagnostics }) => `${expression}: ${diagnostics}`)
+				.join("; "),
+			{ cause: body },
+		);
+
+	return body;
 };
 
 export const createResource = async (

src/components/ResourceEditor/page.tsx

@@ -1,11 +1,12 @@
+import type { Resource } from "@aidbox-ui/fhir-types/hl7-fhir-r5-core";
 import * as HSComp from "@health-samurai/react-components";
 import { useQuery } from "@tanstack/react-query";
 import type * as Router from "@tanstack/react-router";
 import * as YAML from "js-yaml";
 import React from "react";
 import { useAidboxClient } from "../../AidboxClient";
 import { DeleteButton, SaveButton } from "./action";
-import { fetchResource, type Resource } from "./api";
+import { fetchResource } from "./api";
 import { EditorTab } from "./editor-tab";
 import { type EditorMode, pageId, type ResourceEditorTab } from "./types";
 import { VersionsTab } from "./versions-tab";

src/components/ResourceEditor/versions-tab.tsx

@@ -1,3 +1,4 @@
+import type { Bundle } from "@aidbox-ui/fhir-types/hl7-fhir-r5-core";
 import { DiffView } from "@git-diff-view/react";
 import * as HSComp from "@health-samurai/react-components";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
@@ -9,7 +10,6 @@ import { diff } from "../../utils/diff";
 import { traverseTree } from "../../utils/tree-walker";
 import {
 	fetchResourceHistory,
-	type HistoryBundle,
 	type HistoryEntry,
 	type HistoryEntryResource,
 } from "./api";
@@ -428,7 +428,7 @@ const calculateAffectedAttributes = (
 export const VersionsTab = ({ id, resourceType }: VersionsTabProps) => {
 	const client = useAidboxClient();
 
-	const [history, setHistory] = React.useState<HistoryBundle>();
+	const [history, setHistory] = React.useState<Bundle>();
 
 	const {
 		data: historyData,

src/fhir-types/hl7-fhir-r5-core/Bundle.ts

@@ -0,0 +1,82 @@
+// WARNING: This file is autogenerated by @atomic-ehr/codegen.
+// GitHub: https://github.com/orgs/atomic-ehr/repositories
+// Any manual changes made to this file may be overwritten.
+
+import type { BackboneElement } from "../hl7-fhir-r5-core/BackboneElement";
+import type { Identifier } from "../hl7-fhir-r5-core/Identifier";
+import type { Resource } from "../hl7-fhir-r5-core/Resource";
+import type { Signature } from "../hl7-fhir-r5-core/Signature";
+
+export type { BackboneElement } from "../hl7-fhir-r5-core/BackboneElement";
+export type { Identifier } from "../hl7-fhir-r5-core/Identifier";
+export type { Signature } from "../hl7-fhir-r5-core/Signature";
+
+export interface BundleEntry extends BackboneElement {
+	fullUrl?: string;
+	link?: BundleLink[];
+	request?: BundleEntryRequest;
+	resource?: Resource;
+	response?: BundleEntryResponse;
+	search?: BundleEntrySearch;
+}
+
+export interface BundleEntryRequest extends BackboneElement {
+	ifMatch?: string;
+	ifModifiedSince?: string;
+	ifNoneExist?: string;
+	ifNoneMatch?: string;
+	method: "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "PATCH";
+	url: string;
+}
+
+export interface BundleEntryResponse extends BackboneElement {
+	etag?: string;
+	lastModified?: string;
+	location?: string;
+	outcome?: Resource;
+	status: string;
+}
+
+export interface BundleEntrySearch extends BackboneElement {
+	mode?: "match" | "include" | "outcome";
+	score?: number;
+}
+
+export interface BundleLink extends BackboneElement {
+	relation: string;
+	url: string;
+}
+
+// CanonicalURL: http://hl7.org/fhir/StructureDefinition/Bundle
+export interface Bundle extends Resource {
+	resourceType: "Bundle";
+
+	entry?: BundleEntry[];
+	identifier?: Identifier;
+	issues?: Resource;
+	link?: BundleLink[];
+	signature?: Signature;
+	timestamp?: string;
+	_timestamp?: Element;
+	total?: number;
+	_total?: Element;
+	type:
+		| "document"
+		| "message"
+		| "transaction"
+		| "transaction-response"
+		| "batch"
+		| "batch-response"
+		| "history"
+		| "searchset"
+		| "collection"
+		| "subscription-notification";
+	_type?: Element;
+}
+export const isBundle = (resource: unknown): resource is Bundle => {
+	return (
+		resource !== null &&
+		typeof resource === "object" &&
+		(resource as { resourceType: string }).resourceType === "Bundle"
+	);
+};

src/fhir-types/hl7-fhir-r5-core/Resource.ts

@@ -11,6 +11,7 @@ export type { Meta } from "../hl7-fhir-r5-core/Meta";
 // CanonicalURL: http://hl7.org/fhir/StructureDefinition/Resource
 export interface Resource extends Base {
 	resourceType:
+		| "Bundle"
 		| "CanonicalResource"
 		| "DomainResource"
 		| "OperationOutcome"

src/fhir-types/hl7-fhir-r5-core/index.ts

@@ -6,6 +6,15 @@ export type { Availability } from "./Availability";
 export type { BackboneElement } from "./BackboneElement";
 export type { BackboneType } from "./BackboneType";
 export type { Base } from "./Base";
+export type {
+	Bundle,
+	BundleEntry,
+	BundleEntryRequest,
+	BundleEntryResponse,
+	BundleEntrySearch,
+	BundleLink,
+} from "./Bundle";
+export { isBundle } from "./Bundle";
 export type { CanonicalResource } from "./CanonicalResource";
 export { isCanonicalResource } from "./CanonicalResource";
 export type { CodeableConcept } from "./CodeableConcept";