babelfhir-ts 1.0.39 → 1.0.41

package/out/src/generator/clientGenerator.js

@@ -32,6 +32,8 @@ export function generateClient(options) {
     generateSmartClient(clientDir, resourceTypes);
     generateIndex(clientDir, resourceTypes);
     generateReadme(clientDir);
+    // Install base client type declarations so tsc can resolve @babelfhir-ts/client-r4
+    installBaseClientTypes(options.outputDir);
     log.success(`Generated FHIR client with ${resourceTypes.length} resource types + SMART auth`);
 }
 /**
@@ -525,64 +527,50 @@ export function parseBundle(bundle: Bundle<FhirResource>): BundleParser {
  * Generate fhir-client.ts
  */
 function generateFhirClient(clientDir, resourceTypes) {
-    const readerImports = resourceTypes
-        .map((rt) => `  type ${rt.profileName}Reader,`)
-        .join("\n");
-    const writerImports = resourceTypes
-        .map((rt) => `  type ${rt.profileName}Writer,`)
-        .join("\n");
     const readerMethods = resourceTypes
         .map((rt) => {
         const methodName = rt.profileName.charAt(0).toLowerCase() + rt.profileName.slice(1);
-        return `  ${methodName}(): ${rt.profileName}Reader {
-    return new FhirResourceReader(this.baseUrl, "${rt.baseResourceType}", this.fetchFn);
+        return `  ${methodName}() {
+    return this.forType<GeneratedTypes.${rt.profileName}>("${rt.baseResourceType}");
   }`;
     })
         .join("\n\n");
     const writerMethods = resourceTypes
         .map((rt) => {
         const methodName = rt.profileName.charAt(0).toLowerCase() + rt.profileName.slice(1);
-        return `  ${methodName}(): ${rt.profileName}Writer {
-    return new FhirResourceWriterImpl(this.baseUrl, "${rt.baseResourceType}", this.fetchFn);
+        return `  ${methodName}() {
+    return this.forType<GeneratedTypes.${rt.profileName}>("${rt.baseResourceType}");
   }`;
     })
         .join("\n\n");
     const content = `import {
-${readerImports}
-  FhirResourceReader,
+  FhirReadClient as BaseFhirReadClient,
+  FhirWriteClient as BaseFhirWriteClient,
   type FetchFn,
-} from "./resource-reader.js";
-import {
-${writerImports}
-  FhirResourceWriterImpl,
-} from "./resource-writer.js";
+} from "@babelfhir-ts/client-r4";
+import type * as GeneratedTypes from "../index.js";
 
 /**
- * FHIR Client for reading resources
+ * Profile-specific FHIR Read Client.
+ * Extends the base R4 read client with typed profile accessors.
+ * Inherits all base R4 resource methods from @babelfhir-ts/client-r4.
  */
-export class FhirReadClient {
-  constructor(
-    private readonly baseUrl: string,
-    private readonly fetchFn?: FetchFn,
-  ) {}
-
+export class FhirReadClient extends BaseFhirReadClient {
 ${readerMethods}
 }
 
 /**
- * FHIR Client for writing resources
+ * Profile-specific FHIR Write Client.
+ * Extends the base R4 write client with typed profile accessors.
+ * Inherits all base R4 resource methods from @babelfhir-ts/client-r4.
  */
-export class FhirWriteClient {
-  constructor(
-    private readonly baseUrl: string,
-    private readonly fetchFn?: FetchFn,
-  ) {}
-
+export class FhirWriteClient extends BaseFhirWriteClient {
 ${writerMethods}
 }
 
 /**
  * Main FHIR Client — works with plain fetch or an authenticated fetch wrapper.
+ * Provides both base R4 accessors (inherited) and profile-specific accessors.
  *
  * @example
  * // Unauthenticated
@@ -590,6 +578,12 @@ ${writerMethods}
  *
  * // With custom fetch (e.g. from SmartFhirClient)
  * const client = new FhirClient("https://fhir.example.com", authenticatedFetch);
+ *
+ * // Base R4 methods (inherited from @babelfhir-ts/client-r4)
+ * const pt = await client.read().patient().read("123");
+ *
+ * // Profile-specific methods (generated)
+ * const claim = await client.read().pASClaim().search({ status: "active" });
  */
 export class FhirClient {
   private readonly readClient: FhirReadClient;
@@ -1437,3 +1431,73 @@ const client = new FhirClient('https://fhir.example.com/fhir', loggingFetch);
 `;
     fs.writeFileSync(path.join(clientDir, "README.md"), content);
 }
+/**
+ * Install @babelfhir-ts/client-r4 type declarations into the generated output's
+ * node_modules so tsc can resolve the import during compilation.
+ * At runtime, the consumer installs the actual package via npm.
+ */
+function installBaseClientTypes(outputDir) {
+    const pkgDir = path.join(outputDir, "node_modules", "@babelfhir-ts", "client-r4");
+    fs.mkdirSync(pkgDir, { recursive: true });
+    // Minimal package.json
+    fs.writeFileSync(path.join(pkgDir, "package.json"), JSON.stringify({
+        name: "@babelfhir-ts/client-r4",
+        version: "0.0.0-types",
+        types: "index.d.ts"
+    }, null, 2));
+    // Type declarations matching the base package's public API
+    const dts = `/// <reference types="@types/fhir" />
+
+export type FetchFn = typeof globalThis.fetch;
+
+export type WithId<T> = T & { id: string };
+
+export type SearchParams = Record<string, boolean | number | string | string[] | undefined>;
+
+export interface Bundle<T = fhir4.Resource> {
+  resourceType: "Bundle";
+  type: "collection" | "searchset" | "transaction-response" | "transaction" | "batch" | "batch-response" | "document" | "message" | "history";
+  total?: number;
+  link?: { relation: string; url: string }[];
+  entry?: { resource?: T; fullUrl?: string; search?: { mode?: string; score?: number }; request?: { method: string; url: string }; response?: { status: string } }[];
+}
+
+export declare class FhirResourceReader<T extends fhir4.Resource> {
+  readonly baseUrl: string;
+  readonly resourceType: string;
+  constructor(baseUrl: string, resourceType: string, fetchFn?: FetchFn);
+  read(id: string): Promise<WithId<T>>;
+  search(params?: SearchParams): Promise<Bundle<WithId<T>>>;
+  searchOne(params?: SearchParams): Promise<WithId<T> | undefined>;
+  searchAll(params?: SearchParams): Promise<WithId<T>[]>;
+}
+
+export declare class FhirResourceWriter<T extends fhir4.Resource> {
+  readonly baseUrl: string;
+  readonly resourceType: string;
+  constructor(baseUrl: string, resourceType: string, fetchFn?: FetchFn);
+  create(resource: T): Promise<WithId<T>>;
+  update(resource: WithId<T>): Promise<WithId<T>>;
+  delete(id: string): Promise<void>;
+  createOrUpdate(resource: WithId<T>): Promise<WithId<T>>;
+}
+
+export declare class FhirReadClient {
+  constructor(baseUrl: string, fetchFn?: FetchFn);
+  protected forType<T extends fhir4.Resource>(resourceType: string): FhirResourceReader<T>;
+}
+
+export declare class FhirWriteClient {
+  constructor(baseUrl: string, fetchFn?: FetchFn);
+  protected forType<T extends fhir4.Resource>(resourceType: string): FhirResourceWriter<T>;
+}
+
+export declare class FhirClient {
+  readonly baseUrl: string;
+  constructor(baseUrl: string, fetchFn?: FetchFn);
+  read(): FhirReadClient;
+  write(): FhirWriteClient;
+}
+`;
+    fs.writeFileSync(path.join(pkgDir, "index.d.ts"), dts);
+}

package/out/src/generator/index.js

@@ -1295,11 +1295,9 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
                 '@types/fhir': '^0.0.41'
             }
         };
-        // When client is generated, add @babelfhir-ts/client-r4 as optional dependency
+        // When client is generated, add @babelfhir-ts/client-r4 as dependency (generated client extends base)
         if (!flags?.noClient) {
-            generatedPackageJson.optionalDependencies = {
-                '@babelfhir-ts/client-r4': '^0.1.0'
-            };
+            generatedPackageJson.dependencies['@babelfhir-ts/client-r4'] = '^0.2.0';
         }
         const generatedPackageJsonPath = path.join(outputDir, 'package.json');
         fs.writeFileSync(generatedPackageJsonPath, JSON.stringify(generatedPackageJson, null, 2));
@@ -1334,6 +1332,20 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
         // Compile TypeScript to JavaScript
         logger.log('Compiling TypeScript to JavaScript...');
         await compileTypeScriptToJS(outputDir);
+        // Remove base client type stubs — they were only needed for tsc to resolve
+        // @babelfhir-ts/client-r4 imports during compilation. The real package is
+        // installed by the consumer via npm.
+        const stubDir = path.join(outputDir, 'node_modules', '@babelfhir-ts');
+        try {
+            fs.rmSync(stubDir, { recursive: true, force: true });
+        }
+        catch { /* ignore */ }
+        // Clean up empty node_modules if nothing else is in it
+        const nodeModulesDir = path.join(outputDir, 'node_modules');
+        try {
+            fs.rmdirSync(nodeModulesDir);
+        }
+        catch { /* not empty or doesn't exist — fine */ }
         // Copy package.json to root of extractedRoot so it's at the tarball root
         const rootPackageJsonPath = path.join(extractedRoot, 'package.json');
         fs.copyFileSync(generatedPackageJsonPath, rootPackageJsonPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",