tiding: make typeschema generator API more strict

Author: ryukzak

src/api/builder.ts

@@ -238,7 +238,7 @@ export class APIBuilder {
         this.packages.push(packageRef);
         return this;
     }
-  
+
     /**
      * Set a custom FHIR package registry URL
      * @param url The registry URL (default: https://fs.get-ig.org/pkgs/)

src/cli/commands/typeschema/generate.ts

@@ -6,6 +6,7 @@
 
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
+import { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import { complete, createLogger, list } from "@root/utils/codegen-logger";
 import { TypeSchemaGenerator } from "@typeschema/generator";
 import type { CommandModule } from "yargs";
@@ -116,6 +117,11 @@ export const generateTypeschemaCommand: CommandModule<Record<string, unknown>, G
             const generator = new TypeSchemaGenerator({
                 treeshake: treeshakeOptions,
                 registry: registryOption,
+                manager: CanonicalManager({
+                    packages: [],
+                    workingDir: ".codegen-cache/canonical-manager-cache",
+                    registry: registryOption,
+                }),
             });
 
             // Generate schemas from all packages

src/typeschema/generator.ts

@@ -5,7 +5,7 @@
  * Provides high-level API for converting FHIR Structure Definitions to TypeSchema format.
  */
 
-import { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
+import type { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import type { FHIRSchema, StructureDefinition } from "@atomic-ehr/fhirschema";
 import * as fhirschema from "@atomic-ehr/fhirschema";
 import type { CodegenLogger } from "@root/utils/codegen-logger";
@@ -34,15 +34,9 @@ export class TypeSchemaGenerator {
     private options: TypeschemaGeneratorOptions;
     private logger?: CodegenLogger;
 
-    constructor(options: TypeschemaGeneratorOptions = {}) {
+    constructor(options: TypeschemaGeneratorOptions) {
         this.options = { ...options };
-        this.manager =
-            options.manager ||
-            CanonicalManager({
-                packages: [],
-                workingDir: "tmp/fhir",
-                registry: options.registry || undefined,
-            });
+        this.manager = options.manager;
         this.logger =
             options.logger ||
             createLogger({

src/typeschema/register.ts

@@ -29,14 +29,14 @@ export type Register = {
 } & ReturnType<typeof CanonicalManager>;
 
 const readPackageDependencies = async (manager: ReturnType<typeof CanonicalManager>, packageMeta: PackageMeta) => {
-		const packageJSON = (await manager.packageJson(packageMeta.name)) as any;
-		const dependencies = packageJSON.dependencies;
-		if (dependencies !== undefined) {
+    const packageJSON = (await manager.packageJson(packageMeta.name)) as any;
+    const dependencies = packageJSON.dependencies;
+    if (dependencies !== undefined) {
         return Object.entries(dependencies).map(([name, version]): PackageMeta => {
-					return { name: name as string, version: version as string };
-				});
-		}
-		return [];
+            return { name: name as string, version: version as string };
+        });
+    }
+    return [];
 };
 
 // FIXME: Tiding: PackageName, PkgId, PkgName

src/typeschema/types.ts

@@ -345,7 +345,7 @@ export const enrichValueSet = (vs: ValueSet, packageMeta: PackageMeta): RichValu
 export interface TypeschemaGeneratorOptions {
     logger?: import("../utils/codegen-logger").CodegenLogger;
     treeshake?: string[];
-    manager?: ReturnType<typeof CanonicalManager> | null;
+    manager: ReturnType<typeof CanonicalManager>;
     /** Custom FHIR package registry URL */
     registry?: string;
 }

test/unit/typeschema/field-builder.test.ts

@@ -198,7 +198,7 @@ describe("Field Builder Core Logic", async () => {
         it("should handle fixed values", async () => {
             const element: FHIRSchemaElement = {
                 type: "code",
-                // @ts-ignore
+                // @ts-expect-error
                 fixed: "fixed-value",
             };
 
@@ -218,7 +218,7 @@ describe("Field Builder Core Logic", async () => {
         it("should handle pattern constraints", async () => {
             const element: FHIRSchemaElement = {
                 type: "string",
-                // @ts-ignore
+                // @ts-expect-error
                 pattern: "\\d{3}-\\d{3}-\\d{4}",
             };
 
@@ -259,7 +259,7 @@ describe("Field Builder Core Logic", async () => {
             const element: FHIRSchemaElement = {
                 type: "string",
                 short: "Short description",
-                // @ts-ignore
+                // @ts-expect-error
                 definition: "Detailed definition",
             };