fix: make private

Author: mnahkies

packages/openapi-code-generator/src/core/input.ts

@@ -65,8 +65,7 @@ export class Input {
     private loader: OpenapiLoader,
     readonly config: InputConfig,
     private readonly syntheticNameGenerator: SyntheticNameGenerator = defaultSyntheticNameGenerator,
-    // todo: make private
-    readonly schemaNormalizer = new SchemaNormalizer(config),
+    private readonly schemaNormalizer = new SchemaNormalizer(config),
     private readonly parameterNormalizer = new ParameterNormalizer(
       loader,
       schemaNormalizer,

packages/openapi-code-generator/src/test/input.test-utils.ts

@@ -2,7 +2,7 @@ import path from "node:path"
 import {jest} from "@jest/globals"
 import yaml from "js-yaml"
 import {NodeFsAdaptor} from "../core/file-system/node-fs-adaptor"
-import {Input} from "../core/input"
+import {Input, type InputConfig, SchemaNormalizer} from "../core/input"
 import {GenericLoader} from "../core/loaders/generic.loader"
 import {TypespecLoader} from "../core/loaders/typespec.loader"
 import {logger} from "../core/logger"
@@ -51,11 +51,14 @@ export async function unitTestInput(
     await TypespecLoader.create(),
   )
 
+  const config = {
+    extractInlineSchemas: true,
+    enumExtensibility: "closed",
+  } satisfies InputConfig
+
   return {
-    input: new Input(loader, {
-      extractInlineSchemas: true,
-      enumExtensibility: "closed",
-    }),
+    input: new Input(loader, config),
+    schemaNormalizer: new SchemaNormalizer(config),
     file,
   }
 }

packages/openapi-code-generator/src/typescript/common/schema-builders/schema-builder.test-utils.ts

@@ -1,5 +1,5 @@
 import ts from "typescript"
-import type {Input} from "../../../core/input"
+import type {Input, SchemaNormalizer} from "../../../core/input"
 import type {
   Reference,
   Schema,
@@ -27,20 +27,27 @@ export function schemaBuilderTestHarness(
     schema: Schema,
     config: SchemaBuilderConfig = {allowAny: false},
   ) {
-    const {input} = await unitTestInput(version)
-    return getResult(input, schema, true, config)
+    const {input, schemaNormalizer} = await unitTestInput(version)
+    return getResult(input, schemaNormalizer, schema, true, config)
   }
 
   async function getActual(
     path: string,
     config: SchemaBuilderConfig = {allowAny: false},
   ) {
-    const {input, file} = await unitTestInput(version)
-    return getResult(input, {$ref: `${file}#${path}`}, true, config)
+    const {input, schemaNormalizer, file} = await unitTestInput(version)
+    return getResult(
+      input,
+      schemaNormalizer,
+      {$ref: `${file}#${path}`},
+      true,
+      config,
+    )
   }
 
   async function getResult(
     input: Input,
+    schemaNormalizer: SchemaNormalizer,
     maybeSchema: Schema | Reference,
     required: boolean,
     config: SchemaBuilderConfig,
@@ -70,7 +77,7 @@ export function schemaBuilderTestHarness(
       .fromModel(
         isRef(maybeSchema)
           ? maybeSchema
-          : input.schemaNormalizer.normalize(maybeSchema),
+          : schemaNormalizer.normalize(maybeSchema),
         required,
       )