Skip to content

Commit 7633bfa

Browse files
committed
Use CodegenLogManager/CodegenTag consistently across builder and tests
1 parent b69f8ed commit 7633bfa

4 files changed

Lines changed: 14 additions & 10 deletions

File tree

examples/python/generate.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import type { CodegenLog } from "@root/utils/types";
12
import { APIBuilder, prettyReport } from "../../src";
2-
import { type LogManager, mkLogger } from "../../src/utils/log";
3+
import { mkLogger } from "../../src/utils/log";
34

45
console.log("📦 Generating FHIR R4 Core Types...");
56

6-
const logger: LogManager = mkLogger({
7+
const logger: CodegenLog = mkLogger({
78
prefix: "API",
89
suppressTags: ["FIELD_TYPE_NOT_FOUND", "LARGE_VALUESET"],
910
});

src/api/builder.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import type { IrConf, LogicalPromotionConf, TreeShakeConf } from "@root/typesche
2323
import { type Register, registerFromManager } from "@root/typeschema/register";
2424
import { type PackageMeta, packageMetaToNpm } from "@root/typeschema/types";
2525
import { mkTypeSchemaIndex, type TypeSchemaIndex } from "@root/typeschema/utils";
26-
import { type LogLevel, type LogManager, mkLogger } from "@root/utils/log";
26+
import { type LogLevel, mkLogger } from "@root/utils/log";
27+
import type { CodegenLogManager } from "@root/utils/types";
2728
import { IntrospectionWriter, type IntrospectionWriterOptions } from "./writer-generator/introspection";
2829
import { IrReportWriterWriter, type IrReportWriterWriterOptions } from "./writer-generator/ir-report";
2930
import type { FileBasedMustacheGeneratorOptions } from "./writer-generator/mustache";
@@ -94,7 +95,7 @@ export interface LocalStructureDefinitionConfig {
9495
dependencies?: PackageMeta[];
9596
}
9697

97-
const cleanup = async (opts: APIBuilderOptions, logger: LogManager): Promise<void> => {
98+
const cleanup = async (opts: APIBuilderOptions, logger: CodegenLogManager): Promise<void> => {
9899
logger.info(`Cleaning outputs...`);
99100
try {
100101
logger.info(`Clean ${opts.outputDir}`);
@@ -119,15 +120,15 @@ export class APIBuilder {
119120
localSDs: LocalPackageConfig[];
120121
localTgzPackages: TgzPackageConfig[];
121122
};
122-
private logger: LogManager;
123+
private logger: CodegenLogManager;
123124
private generators: { name: string; writer: FileSystemWriter }[] = [];
124125

125126
constructor(
126127
userOpts: Partial<APIBuilderOptions> & {
127128
manager?: ReturnType<typeof CanonicalManager>;
128129
register?: Register;
129130
preprocessPackage?: (context: PreprocessContext) => PreprocessContext;
130-
logger?: LogManager;
131+
logger?: CodegenLogManager;
131132
} = {},
132133
) {
133134
const defaultOpts: APIBuilderOptions = {

test/api/write-generator/typescript.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { describe, expect, it } from "bun:test";
22
import { APIBuilder } from "@root/api/builder";
33
import type { CanonicalUrl } from "@root/typeschema/types";
44
import { mkLogger } from "@root/utils/log";
5+
import type { CodegenTag } from "@root/utils/types";
56
import { ccdaManager, r4Manager } from "@typeschema-test/utils";
67

78
describe("TypeScript Writer Generator", async () => {
@@ -52,7 +53,7 @@ describe("TypeScript CDA with Logical Model Promotion to Resource", async () =>
5253
});
5354

5455
describe("TypeScript R4 Example (with generateProfile)", async () => {
55-
const logger = mkLogger({ level: "ERROR" });
56+
const logger = mkLogger<CodegenTag>({ level: "ERROR" });
5657

5758
const result = await new APIBuilder({ register: r4Manager, logger })
5859
.typescript({

test/unit/typeschema/utils.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ import type { FHIRSchema } from "@atomic-ehr/fhirschema";
22
import type { ValueSet } from "@root/fhir-types/hl7-fhir-r4-core";
33
import { generateTypeSchemas } from "@root/typeschema";
44
import { mkTypeSchemaIndex } from "@root/typeschema/utils";
5-
import { type Log, mkLogger } from "@root/utils/log";
5+
import { mkLogger } from "@root/utils/log";
6+
import type { CodegenLog, CodegenTag } from "@root/utils/types";
67
import { transformFhirSchema, transformValueSet } from "@typeschema/core/transformer";
78
import { type Register, registerFromPackageMetas } from "@typeschema/register";
89
import { type CanonicalUrl, enrichFHIRSchema, enrichValueSet, type PackageMeta } from "@typeschema/types";
910

1011
export type PFS = Partial<FHIRSchema>;
1112
export type PVS = Partial<ValueSet>;
1213

13-
const logger = mkLogger({ prefix: "TEST" });
14+
const logger = mkLogger<CodegenTag>({ prefix: "TEST" });
1415

15-
export const mkIndex = async (register: Register, logger?: Log) => {
16+
export const mkIndex = async (register: Register, logger?: CodegenLog) => {
1617
const { schemas } = await generateTypeSchemas(register, logger);
1718
return mkTypeSchemaIndex(schemas, { register, logger });
1819
};

0 commit comments

Comments
 (0)