merge development to master

.github/workflows/aidbox-client.yaml

@@ -11,14 +11,14 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"

.github/workflows/common.yaml

@@ -8,11 +8,11 @@ jobs:
   lint:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"
@@ -23,11 +23,11 @@ jobs:
   audit:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"
@@ -38,11 +38,11 @@ jobs:
   typecheck:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"

.github/workflows/pages.yaml

@@ -6,13 +6,13 @@ jobs:
   build-sites:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
 
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"
@@ -37,7 +37,7 @@ jobs:
 
       - name: Upload Pages artifact
         if: success() && github.ref == 'refs/heads/master'
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           path: site-out
 

.github/workflows/release.yaml

@@ -21,11 +21,11 @@ jobs:
     if: github.repository == 'HealthSamurai/aidbox-ts-sdk' && github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "pnpm"

package.json

@@ -7,25 +7,29 @@
 	"workspaces": [
 		"packages/*"
 	],
-	"packageManager": "pnpm@10.21.0",
+	"packageManager": "pnpm@10.33.2",
 	"pnpm": {
 		"overrides": {
 			"fast-xml-parser": "^5.10.1",
 			"fast-xml-builder": ">=1.1.7",
 			"yaml": ">=2.8.3",
 			"picomatch": ">=4.0.4",
 			"file-type": ">=21.3.2",
-			"brace-expansion": ">=2.0.3 <3",
+			"brace-expansion@<1.1.12": "1.1.12",
+			"brace-expansion@>=2.0.0 <2.0.2": "2.0.2",
+			"brace-expansion@>=3.0.0 <3.0.1": "3.0.1",
+			"brace-expansion@>=4.0.0 <4.0.1": "4.0.1",
 			"defu": ">=6.1.5",
 			"vite": "^8.1.5",
+			"fast-xml-parser@<5.7.0": ">=5.7.0",
+			"postcss@<8.5.10": ">=8.5.10",
 			"esbuild@>=0.27.3 <0.28.1": "0.28.1",
 			"markdown-it@<=14.1.1": "14.3.0",
 			"piscina@<=4.9.2": "4.9.3",
 			"linkify-it@<=5.0.0": "5.0.2",
 			"@xhmikosr/decompress@<10.2.1": "10.2.1",
 			"ws@>=8.0.0 <8.21.0": "8.21.1",
-			"@babel/core@<=7.29.0": "7.29.7",
-			"brace-expansion": "^5.0.7"
+			"@babel/core@<=7.29.0": "7.29.7"
 		}
 	},
 	"devDependencies": {

packages/aidbox-client/package.json

@@ -45,7 +45,7 @@
 		"directory": "packages/aidbox-client"
 	},
 	"devDependencies": {
-		"@atomic-ehr/codegen": "^0.0.8",
+		"@atomic-ehr/codegen": "latest",
 		"@types/node": "^25.4.0",
 		"tsx": "^4.21.0",
 		"typedoc": "^0.28.17",

packages/aidbox-client/scripts/generate-types.ts

@@ -3,34 +3,35 @@ import { APIBuilder } from "@atomic-ehr/codegen";
 console.log("📦 Generating FHIR R4 Core Types...");
 
 const builder = new APIBuilder()
-	.verbose()
 	.throwException()
 	.fromPackage("hl7.fhir.r4.core", "4.0.1")
 	.typescript({ withDebugComment: false, generateProfile: false })
 	.outputTo("./src/fhir-types")
-	.treeShake({
-		"hl7.fhir.r4.core": {
-			"http://hl7.org/fhir/StructureDefinition/Patient": {
-				ignoreFields: [
-					"contact",
-					"communication",
-					"photo",
-					"telecom",
-					"address",
-					"link",
-				],
-			},
-			"http://hl7.org/fhir/StructureDefinition/Resource": {},
-			"http://hl7.org/fhir/StructureDefinition/Bundle": {},
-			"http://hl7.org/fhir/StructureDefinition/OperationOutcome": {},
-			"http://hl7.org/fhir/StructureDefinition/DomainResource": {
-				ignoreFields: ["extension", "modifierExtension"],
-			},
-			"http://hl7.org/fhir/StructureDefinition/BackboneElement": {
-				ignoreFields: ["modifierExtension"],
-			},
-			"http://hl7.org/fhir/StructureDefinition/Element": {
-				ignoreFields: ["extension"],
+	.typeSchema({
+		treeShake: {
+			"hl7.fhir.r4.core": {
+				"http://hl7.org/fhir/StructureDefinition/Patient": {
+					ignoreFields: [
+						"contact",
+						"communication",
+						"photo",
+						"telecom",
+						"address",
+						"link",
+					],
+				},
+				"http://hl7.org/fhir/StructureDefinition/Resource": {},
+				"http://hl7.org/fhir/StructureDefinition/Bundle": {},
+				"http://hl7.org/fhir/StructureDefinition/OperationOutcome": {},
+				"http://hl7.org/fhir/StructureDefinition/DomainResource": {
+					ignoreFields: ["extension", "modifierExtension"],
+				},
+				"http://hl7.org/fhir/StructureDefinition/BackboneElement": {
+					ignoreFields: ["modifierExtension"],
+				},
+				"http://hl7.org/fhir/StructureDefinition/Element": {
+					ignoreFields: ["extension"],
+				},
 			},
 		},
 	})

packages/aidbox-client/src/auth-providers.ts

@@ -1,16 +1,27 @@
 import type { AuthProvider } from "./types";
 import { mergeHeaders, validateBaseUrl } from "./utils";
 
+function hasAuthorizationHeader(headers: HeadersInit | undefined): boolean {
+	if (!headers) return false;
+	if (headers instanceof Headers) return headers.has("authorization");
+	if (Array.isArray(headers)) {
+		return headers.some(([key]) => key.toLowerCase() === "authorization");
+	}
+	return Object.keys(headers).some(
+		(key) => key.toLowerCase() === "authorization",
+	);
+}
+
 export class BrowserAuthProvider implements AuthProvider {
 	/** @ignore */
 	public baseUrl: string;
 
 	constructor(baseUrl: string) {
-		this.baseUrl = baseUrl;
+		this.baseUrl = baseUrl.replace(/\/+$/, "");
 	}
 
 	async #checkSession() {
-		const response = await fetch(new URL("/auth/userinfo", this.baseUrl), {
+		const response = await fetch(`${this.baseUrl}/auth/userinfo`, {
 			method: "GET",
 			headers: {
 				"content-type": "application/json",
@@ -36,7 +47,7 @@ export class BrowserAuthProvider implements AuthProvider {
 	 * Sends a POST request to `baseurl/auth/logout`.
 	 */
 	public async revokeSession() {
-		await fetch(new URL("/auth/logout", this.baseUrl), {
+		await fetch(`${this.baseUrl}/auth/logout`, {
 			method: "POST",
 			headers: {
 				"content-type": "application/json",
@@ -59,16 +70,22 @@ export class BrowserAuthProvider implements AuthProvider {
 		validateBaseUrl(input, this.baseUrl);
 
 		const requestInit = init ?? {};
-		requestInit.credentials = "include";
+		const explicitAuth = hasAuthorizationHeader(requestInit.headers);
+		requestInit.credentials = explicitAuth ? "omit" : "include";
 
 		const response = await fetch(input, requestInit);
 
-		if (response.status === 401) {
-			await this.establishSession();
-			throw new Error("unauthorized");
-		} else {
-			return response;
+		if (!explicitAuth) {
+			if (response.status === 401) {
+				await this.establishSession();
+				throw new Error("unauthorized");
+			}
+			if (response.redirected) {
+				window.location.href = response.url;
+				throw new Error("unauthorized");
+			}
 		}
+		return response;
 	}
 }
 
@@ -78,7 +95,7 @@ export class BasicAuthProvider implements AuthProvider {
 	#authHeader: string;
 
 	constructor(baseUrl: string, username: string, password: string) {
-		this.baseUrl = baseUrl;
+		this.baseUrl = baseUrl.replace(/\/+$/, "");
 		// Create Base64-encoded credentials for Basic Auth header (RFC 7617: UTF-8 encoded)
 		const credentials = `${username}:${password}`;
 		const utf8Bytes = new TextEncoder().encode(credentials);

packages/aidbox-client/src/client.ts

@@ -31,7 +31,7 @@ import type {
 	VReadOptions,
 } from "./types";
 import { ErrorResponse, RequestError } from "./types";
-import { coerceBody } from "./utils";
+import { coerceBody, joinUrl } from "./utils";
 
 type InternalAidboxErrorResponse = {
 	error?: unknown;
@@ -91,7 +91,7 @@ export class AidboxClient<
 	public authProvider: AuthProvider;
 
 	constructor(baseUrl: string, authProvider: AuthProvider) {
-		this.baseUrl = baseUrl;
+		this.baseUrl = baseUrl.replace(/\/+$/, "");
 		this.authProvider = authProvider;
 	}
 
@@ -113,7 +113,7 @@ export class AidboxClient<
 
 		const { method, url, headers = {}, params = [], body } = requestParams;
 
-		const urlObj = new URL(url, baseUrl);
+		const urlObj = joinUrl(baseUrl, url);
 
 		params.forEach(([key, value]) => {
 			urlObj.searchParams.append(key, value);