@blimu/codegen 0.1.0 → 0.2.0

package/dist/generator/typescript/templates/schema.ts.hbs

@@ -1,51 +1,75 @@
 // Generated types from OpenAPI components.schemas
 
+{{! Generate import statements for predefined types actually used in this schema file }}
+{{#if (getSchemaPredefinedTypes)}}
+{{#each (groupByPackage (getSchemaPredefinedTypes))}}
+import type { {{joinTypes this.types}} } from '{{this.package}}';
+{{/each}}
+{{/if}}
+
 export type Enum<T> = T[keyof T];
 
-{{~! Enums: const objects + union types ~}}
-{{~#if (gt (len IR.modelDefs) 0)~}}
-{{~#each IR.modelDefs~}}
-  {{~#if (eq this.schema.kind "enum")~}}
+{{! Enums: const objects + union types }}
+{{#if (gt (len IR.modelDefs) 0)}}
+{{#each IR.modelDefs}}
+  {{#if (eq this.schema.kind "enum")}}
   export const {{this.name}} = {
-    {{~#each this.schema.enumValues as |v|~}}
+    {{#each this.schema.enumValues as |v|}}
     "{{v}}": {{#if (or (eq v "true") (eq v "false"))}}{{v}}{{else if (reMatch "^-?[0-9]+(\\.[0-9]+)?$" v)}}{{v}}{{else}}"{{v}}"{{/if}},
-    {{~/each~}}
+    {{/each}}
   } as const;
 
   export type {{this.name}} = Enum<typeof {{this.name}}>;
 
-  {{~/if~}}
-{{~/each~}}
+  {{/if}}
+{{/each}}
 
-{{~! Objects and other named models: render interfaces/types from structured IR ~}}
-{{~#each IR.modelDefs~}}
-  {{~#if this.annotations.description~}}
+{{! Simple types: generate as regular type exports (not in namespace) }}
+{{! Skip predefined types - they are imported instead }}
+{{#each IR.modelDefs}}
+  {{#if (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
+  {{#unless (isPredefinedType this.name)}}
+  {{#if this.annotations.description}}
   /**
    * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
    */
-  {{~/if~}}
-  {{~#if (eq this.schema.kind "object")~}}
+  {{/if}}
+  export type {{this.name}} = {{tsTypeStripNs this.schema}};
+  {{/unless}}
+  {{/if}}
+{{/each}}
+
+{{! Objects and other named models: render interfaces/types from structured IR }}
+{{#each IR.modelDefs}}
+  {{#unless (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
+  {{#if this.annotations.description}}
+  /**
+   * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
+   */
+  {{/if}}
+  {{#if (eq this.schema.kind "object")}}
   export interface {{this.name}} {
-    {{~#each this.schema.properties~}}
-    {{~#if this.annotations.description~}}
+    {{#each this.schema.properties}}
+    {{#if this.annotations.description}}
     /** {{decodeHtml (replace this.annotations.description "*/" "*\\/")}} */
-    {{~/if~}}
+    {{/if}}
     {{quotePropName this.name}}{{#unless this.required}}?{{/unless}}: {{tsTypeStripNs this.type}};
-    {{~/each~}}
+    {{/each}}
   }
 
-  {{~else if (eq this.schema.kind "ref")~}}
+  {{else if (eq this.schema.kind "ref")}}
   export type {{this.name}} = {{tsTypeStripNs this.schema}};
 
-  {{~else if (or (eq this.schema.kind "oneOf") (eq this.schema.kind "anyOf") (eq this.schema.kind "allOf"))~}}
+  {{else if (or (eq this.schema.kind "oneOf") (eq this.schema.kind "anyOf") (eq this.schema.kind "allOf"))}}
   export type {{this.name}} = {{tsTypeStripNs this.schema}};
 
-  {{~else if (or (eq this.schema.kind "array") (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null") (eq this.schema.kind "enum"))~}}
+  {{else if (eq this.schema.kind "array")}}
   export type {{this.name}} = {{tsTypeStripNs this.schema}};
 
-  {{~/if~}}
-{{~/each~}}
-{{~/if~}}
+  {{/if}}
+  {{/unless}}
+{{/each}}
+{{/if}}
 
 {{#if IR.services}}
 
@@ -62,12 +86,12 @@ export type Enum<T> = T[keyof T];
   {{~/if~}}
    */
   export interface {{pascal ../tag}}{{pascal (methodName this)}}Query {
-    {{~#each this.queryParams~}}
-    {{~#if this.description~}}
+    {{#each this.queryParams}}
+    {{#if this.description}}
     /** {{decodeHtml (replace this.description "*/" "*\\/")}} */
-    {{~/if~}}
+    {{/if}}
     {{quotePropName this.name}}{{#unless this.required}}?{{/unless}}: {{tsTypeStripNs this.schema}};
-    {{~/each~}}
+    {{/each}}
   }
 
     {{/if}}

package/dist/generator/typescript/templates/schema.zod.ts.hbs

@@ -1,11 +1,26 @@
-// Generated Zod schemas from OpenAPI components.schemas
+// Generated zod schemas from OpenAPI components.schemas
 // Use these schemas for runtime validation in forms, API requests, etc.
 
-import { z } from "zod";
-import * as Schema from "./schema";
+import { z } from 'zod';
+import * as Schema from './schema';
 
+{{! Simple types: generate as regular Zod schema exports (not in namespace) }}
+{{#each IR.modelDefs}}
+  {{#if (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
+  /**
+   * Schema for {{this.name}}
+{{#if this.annotations.description}}
+   * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
+{{/if}}
+   */
+  export const {{this.name}}Schema = {{zodSchema this.schema}};
+  {{/if}}
+{{/each}}
+
+{{! Objects and other named models: render Zod schemas from structured IR }}
 {{#if (gt (len IR.modelDefs) 0)}}
 {{~#each IR.modelDefs}}
+  {{~#unless (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
   {{~#if (eq this.schema.kind "enum")~}}
 /**
  * Zod schema for {{this.name}}
@@ -74,7 +89,7 @@ export const {{this.name}}Schema = z.union([
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
 {{~/if~}}
  */
-export const {{this.name}}Schema = {{#each this.schema.allOf}}{{#if @first}}{{zodSchema this}}{{else}}.and({{zodSchema this}}){{/if}}{{/each}};
+export const {{this.name}}Schema = {{#each this.schema.allOf}}{{#if @first}}{{zodSchema this}}{{else}}.extend({{zodSchema this}}.shape){{/if}}{{/each}};
 
   {{~else if (eq this.schema.kind "array")~}}
 /**
@@ -95,18 +110,19 @@ export const {{this.name}}Schema = z.array({{#if this.schema.items}}{{zodSchema
 export const {{this.name}}Schema = {{zodSchema this.schema}};
 
   {{~/if~}}
+  {{~/unless~}}
 {{~/each~}}
 {{~/if~}}
 
 {{#if IR.services}}
 
-// Operation query parameter Zod schemas
+// Operation query parameter schemas
 
 {{#each IR.services}}
   {{#each this.operations}}
     {{#if (gt (len this.queryParams) 0)}}
 /**
- * Zod schema for query params of {{../tag}}.{{pascal (methodName this)}}
+ * Schema for query params of {{../tag}}.{{pascal (methodName this)}}
 {{~#if this.description~}}
  * {{decodeHtml (replace this.description "*/" "*\\/")}}
 {{~/if~}}

package/dist/generator/typescript/templates/service.ts.hbs

@@ -1,5 +1,11 @@
 import { CoreClient } from "../client";
 import * as Schema from "../schema";
+{{! Generate import statements for predefined types used in this specific service }}
+{{#if (getServicePredefinedTypes Service)}}
+{{#each (groupByPackage (getServicePredefinedTypes Service))}}
+import type { {{joinTypes this.types}} } from '{{this.package}}';
+{{/each}}
+{{/if}}
 
 export class {{serviceName Service.tag}} {
   constructor(private core: CoreClient) {}
@@ -32,23 +38,7 @@ export class {{serviceName Service.tag}} {
       query,
       {{/if}}
       {{#if requestBody}}
-      {{#if (eq requestBody.contentType "application/json")}}
-      headers: {
-        ...(init?.headers || {}),
-        "content-type": "application/json",
-      },
-      body: JSON.stringify(body),
-      {{else if (eq requestBody.contentType "multipart/form-data")}}
-      body: (body as any),
-      {{else if (eq requestBody.contentType "application/x-www-form-urlencoded")}}
-      headers: {
-        ...(init?.headers || {}),
-        "content-type": "application/x-www-form-urlencoded",
-      },
-      body: (body as any),
-      {{else}}
-      body: (body as any),
-      {{/if}}
+      body: body as any,
       {{/if}}
       contentType: "{{response.contentType}}",
       streamingFormat: "{{response.streamingFormat}}",
@@ -68,23 +58,7 @@ export class {{serviceName Service.tag}} {
       query,
       {{/if}}
       {{#if requestBody}}
-      {{#if (eq requestBody.contentType "application/json")}}
-      headers: {
-        ...(init?.headers || {}),
-        "content-type": "application/json",
-      },
-      body: JSON.stringify(body),
-      {{else if (eq requestBody.contentType "multipart/form-data")}}
-      body: (body as any),
-      {{else if (eq requestBody.contentType "application/x-www-form-urlencoded")}}
-      headers: {
-        ...(init?.headers || {}),
-        "content-type": "application/x-www-form-urlencoded",
-      },
-      body: (body as any),
-      {{else}}
-      body: (body as any),
-      {{/if}}
+      body: body as any,
       {{/if}}
       ...(init || {}),
     });

package/dist/generator/typescript/templates/tsconfig.json.hbs

@@ -7,14 +7,13 @@
     "isolatedModules": true,
     "declaration": true,
     "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "target": "ES2023",
     "sourceMap": true,
     "outDir": "./dist",
     "baseUrl": "./src",
     "incremental": true,
+    "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo",
     "skipLibCheck": true,
     "strictNullChecks": true,
     "forceConsistentCasingInFileNames": true,

package/dist/generator/typescript/templates/utils.ts.hbs

@@ -1,3 +1,5 @@
+import { parseSSEStream, parseNDJSONStream } from "@blimu/fetch";
+
 export type PaginableQuery = { limit?: number; offset?: number } & Record<string, unknown>;
 
 export async function* paginate<T>(
@@ -30,139 +32,5 @@ export async function listAll<T>(
   return out;
 }
 
-/**
- * Parse Server-Sent Events (SSE) stream
- * Extracts data fields from text/event-stream format
- */
-export async function* parseSSEStream(
-  response: Response
-): AsyncGenerator<string, void, unknown> {
-  if (!response.body) {
-    return;
-  }
-
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split("\n");
-      buffer = lines.pop() || ""; // Keep incomplete line in buffer
-
-      let currentEvent: { type?: string; data?: string; id?: string } = {};
-
-      for (const line of lines) {
-        if (line.trim() === "") {
-          // Empty line indicates end of event
-          if (currentEvent.data !== undefined) {
-            yield currentEvent.data;
-          }
-          currentEvent = {};
-          continue;
-        }
-
-        const colonIndex = line.indexOf(":");
-        if (colonIndex === -1) continue;
-
-        const field = line.substring(0, colonIndex).trim();
-        const value = line.substring(colonIndex + 1).trim();
-
-        if (field === "data") {
-          currentEvent.data = currentEvent.data
-            ? currentEvent.data + "\n" + value
-            : value;
-        } else if (field === "event") {
-          currentEvent.type = value;
-        } else if (field === "id") {
-          currentEvent.id = value;
-        }
-      }
-    }
-
-    // Handle any remaining event in buffer
-    if (buffer.trim()) {
-      const lines = buffer.split("\n");
-      let currentEvent: { data?: string } = {};
-      for (const line of lines) {
-        if (line.trim() === "" && currentEvent.data !== undefined) {
-          yield currentEvent.data;
-          currentEvent = {};
-          continue;
-        }
-        const colonIndex = line.indexOf(":");
-        if (colonIndex !== -1) {
-          const field = line.substring(0, colonIndex).trim();
-          const value = line.substring(colonIndex + 1).trim();
-          if (field === "data") {
-            currentEvent.data = currentEvent.data
-              ? currentEvent.data + "\n" + value
-              : value;
-          }
-        }
-      }
-      if (currentEvent.data !== undefined) {
-        yield currentEvent.data;
-      }
-    }
-  } finally {
-    reader.releaseLock();
-  }
-}
-
-/**
- * Parse NDJSON (Newline-Delimited JSON) stream
- * Yields each JSON object as it arrives
- */
-export async function* parseNDJSONStream<T = any>(
-  response: Response
-): AsyncGenerator<T, void, unknown> {
-  if (!response.body) {
-    return;
-  }
-
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split("\n");
-      buffer = lines.pop() || ""; // Keep incomplete line in buffer
-
-      for (const line of lines) {
-        const trimmed = line.trim();
-        if (trimmed === "") continue;
-
-        try {
-          const parsed = JSON.parse(trimmed) as T;
-          yield parsed;
-        } catch (error) {
-          // Skip invalid JSON lines
-          console.warn("Skipping invalid JSON line:", trimmed);
-        }
-      }
-    }
-
-    // Handle any remaining line in buffer
-    if (buffer.trim()) {
-      try {
-        const parsed = JSON.parse(buffer.trim()) as T;
-        yield parsed;
-      } catch (error) {
-        // Skip invalid JSON
-        console.warn("Skipping invalid JSON in buffer:", buffer.trim());
-      }
-    }
-  } finally {
-    reader.releaseLock();
-  }
-}
+// Re-export streaming parsers from @blimu/fetch
+export { parseSSEStream, parseNDJSONStream };

package/dist/index.d.mts

@@ -2,12 +2,12 @@ import { z } from 'zod';
 import { OpenAPIV3, OpenAPIV3_1 } from 'openapi-types';
 
 type OperationIdParser = (operationId: string, method: string, path: string) => string | Promise<string>;
-declare const TypeAugmentationOptionsSchema: z.ZodObject<{
-    moduleName: z.ZodOptional<z.ZodString>;
-    namespace: z.ZodOptional<z.ZodString>;
-    typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    outputFileName: z.ZodOptional<z.ZodString>;
+declare const PredefinedTypeSchema: z.ZodObject<{
+    type: z.ZodString;
+    package: z.ZodString;
+    importPath: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
+type PredefinedType = z.infer<typeof PredefinedTypeSchema>;
 declare const TYPESCRIPT_TEMPLATE_NAMES: readonly ["client.ts.hbs", "index.ts.hbs", "package.json.hbs", "README.md.hbs", "schema.ts.hbs", "schema.zod.ts.hbs", "service.ts.hbs", "tsconfig.json.hbs", "utils.ts.hbs"];
 type TypeScriptTemplateName = (typeof TYPESCRIPT_TEMPLATE_NAMES)[number];
 declare const TypeScriptClientSchema: z.ZodObject<{
@@ -20,16 +20,18 @@ declare const TypeScriptClientSchema: z.ZodObject<{
     postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
     defaultBaseURL: z.ZodOptional<z.ZodString>;
     exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    typeAugmentation: z.ZodOptional<z.ZodObject<{
-        moduleName: z.ZodOptional<z.ZodString>;
-        namespace: z.ZodOptional<z.ZodString>;
-        typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        outputFileName: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>;
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+    predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        type: z.ZodString;
+        package: z.ZodString;
+        importPath: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    formatCode: z.ZodOptional<z.ZodBoolean>;
     templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>;
 declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -42,16 +44,18 @@ declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
     defaultBaseURL: z.ZodOptional<z.ZodString>;
     exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    typeAugmentation: z.ZodOptional<z.ZodObject<{
-        moduleName: z.ZodOptional<z.ZodString>;
-        namespace: z.ZodOptional<z.ZodString>;
-        typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        outputFileName: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>;
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+    predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        type: z.ZodString;
+        package: z.ZodString;
+        importPath: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    formatCode: z.ZodOptional<z.ZodBoolean>;
     templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>], "type">;
 declare const ConfigSchema: z.ZodObject<{
@@ -67,23 +71,24 @@ declare const ConfigSchema: z.ZodObject<{
         postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
         defaultBaseURL: z.ZodOptional<z.ZodString>;
         exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        typeAugmentation: z.ZodOptional<z.ZodObject<{
-            moduleName: z.ZodOptional<z.ZodString>;
-            namespace: z.ZodOptional<z.ZodString>;
-            typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-            outputFileName: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>>;
         type: z.ZodLiteral<"typescript">;
         packageName: z.ZodString;
         moduleName: z.ZodOptional<z.ZodString>;
         includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+        predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            type: z.ZodString;
+            package: z.ZodString;
+            importPath: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>>;
+        dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        formatCode: z.ZodOptional<z.ZodBoolean>;
         templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     }, z.core.$strip>], "type">>;
 }, z.core.$strip>;
 type Config = z.infer<typeof ConfigSchema>;
 type Client = z.infer<typeof ClientSchema>;
 type TypeScriptClient = z.infer<typeof TypeScriptClientSchema>;
-type TypeAugmentationOptions = z.infer<typeof TypeAugmentationOptionsSchema>;
 
 declare class ConfigService {
     private readonly logger;
@@ -143,6 +148,7 @@ interface IR {
     models: IRModel[];
     securitySchemes: IRSecurityScheme[];
     modelDefs: IRModelDef[];
+    openApiDocument?: any;
 }
 interface IRParam {
     name: string;
@@ -245,6 +251,10 @@ declare class IrBuilderService {
     private firstAllowedTag;
     private collectSecuritySchemes;
     private collectParams;
+    private findMatchingComponentSchema;
+    private compareSchemas;
+    private extractModelNameFromSchema;
+    private generateTypeName;
     private extractRequestBodyWithTypes;
     private extractRequestBody;
     private extractResponseWithTypes;
@@ -289,6 +299,7 @@ declare class TypeScriptGeneratorService implements Generator<TypeScriptClient>
     private generatePackageJson;
     private generateTsConfig;
     private generateReadme;
+    private generatePrettierConfig;
 }
 
 declare class GeneratorModule {
@@ -302,8 +313,9 @@ declare class OpenApiModule {
 
 interface GenerateOptions {
     client?: string;
+    baseDir?: string;
 }
 declare function generate(configOrPath: Config | string, options?: GenerateOptions): Promise<void>;
 declare function loadConfig(configPath: string): Promise<Config>;
 
-export { type Client, ClientSchema, type Config, ConfigModule, ConfigSchema, ConfigService, type GenerateOptions, type Generator, GeneratorModule, GeneratorService, type IR, type IRAnnotations, type IRDiscriminator, type IRField, type IRModel, type IRModelDef, type IROperation, type IRParam, type IRRequestBody, type IRResponse, type IRSchema, IRSchemaKind, type IRSecurityScheme, type IRService, OpenApiModule, OpenApiService, type OperationIdParser, TYPESCRIPT_TEMPLATE_NAMES, type TypeAugmentationOptions, TypeAugmentationOptionsSchema, type TypeScriptClient, TypeScriptClientSchema, type TypeScriptTemplateName, defineConfig, generate, loadConfig, loadMjsConfig };
+export { type Client, ClientSchema, type Config, ConfigModule, ConfigSchema, ConfigService, type GenerateOptions, type Generator, GeneratorModule, GeneratorService, type IR, type IRAnnotations, type IRDiscriminator, type IRField, type IRModel, type IRModelDef, type IROperation, type IRParam, type IRRequestBody, type IRResponse, type IRSchema, IRSchemaKind, type IRSecurityScheme, type IRService, OpenApiModule, OpenApiService, type OperationIdParser, type PredefinedType, PredefinedTypeSchema, TYPESCRIPT_TEMPLATE_NAMES, type TypeScriptClient, TypeScriptClientSchema, type TypeScriptTemplateName, defineConfig, generate, loadConfig, loadMjsConfig };

package/dist/index.d.ts

@@ -2,12 +2,12 @@ import { z } from 'zod';
 import { OpenAPIV3, OpenAPIV3_1 } from 'openapi-types';
 
 type OperationIdParser = (operationId: string, method: string, path: string) => string | Promise<string>;
-declare const TypeAugmentationOptionsSchema: z.ZodObject<{
-    moduleName: z.ZodOptional<z.ZodString>;
-    namespace: z.ZodOptional<z.ZodString>;
-    typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    outputFileName: z.ZodOptional<z.ZodString>;
+declare const PredefinedTypeSchema: z.ZodObject<{
+    type: z.ZodString;
+    package: z.ZodString;
+    importPath: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
+type PredefinedType = z.infer<typeof PredefinedTypeSchema>;
 declare const TYPESCRIPT_TEMPLATE_NAMES: readonly ["client.ts.hbs", "index.ts.hbs", "package.json.hbs", "README.md.hbs", "schema.ts.hbs", "schema.zod.ts.hbs", "service.ts.hbs", "tsconfig.json.hbs", "utils.ts.hbs"];
 type TypeScriptTemplateName = (typeof TYPESCRIPT_TEMPLATE_NAMES)[number];
 declare const TypeScriptClientSchema: z.ZodObject<{
@@ -20,16 +20,18 @@ declare const TypeScriptClientSchema: z.ZodObject<{
     postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
     defaultBaseURL: z.ZodOptional<z.ZodString>;
     exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    typeAugmentation: z.ZodOptional<z.ZodObject<{
-        moduleName: z.ZodOptional<z.ZodString>;
-        namespace: z.ZodOptional<z.ZodString>;
-        typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        outputFileName: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>;
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+    predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        type: z.ZodString;
+        package: z.ZodString;
+        importPath: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    formatCode: z.ZodOptional<z.ZodBoolean>;
     templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>;
 declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -42,16 +44,18 @@ declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
     defaultBaseURL: z.ZodOptional<z.ZodString>;
     exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    typeAugmentation: z.ZodOptional<z.ZodObject<{
-        moduleName: z.ZodOptional<z.ZodString>;
-        namespace: z.ZodOptional<z.ZodString>;
-        typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        outputFileName: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>;
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+    predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        type: z.ZodString;
+        package: z.ZodString;
+        importPath: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    formatCode: z.ZodOptional<z.ZodBoolean>;
     templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>], "type">;
 declare const ConfigSchema: z.ZodObject<{
@@ -67,23 +71,24 @@ declare const ConfigSchema: z.ZodObject<{
         postCommand: z.ZodOptional<z.ZodArray<z.ZodString>>;
         defaultBaseURL: z.ZodOptional<z.ZodString>;
         exclude: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        typeAugmentation: z.ZodOptional<z.ZodObject<{
-            moduleName: z.ZodOptional<z.ZodString>;
-            namespace: z.ZodOptional<z.ZodString>;
-            typeNames: z.ZodOptional<z.ZodArray<z.ZodString>>;
-            outputFileName: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>>;
         type: z.ZodLiteral<"typescript">;
         packageName: z.ZodString;
         moduleName: z.ZodOptional<z.ZodString>;
         includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
+        predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            type: z.ZodString;
+            package: z.ZodString;
+            importPath: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>>;
+        dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        formatCode: z.ZodOptional<z.ZodBoolean>;
         templates: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     }, z.core.$strip>], "type">>;
 }, z.core.$strip>;
 type Config = z.infer<typeof ConfigSchema>;
 type Client = z.infer<typeof ClientSchema>;
 type TypeScriptClient = z.infer<typeof TypeScriptClientSchema>;
-type TypeAugmentationOptions = z.infer<typeof TypeAugmentationOptionsSchema>;
 
 declare class ConfigService {
     private readonly logger;
@@ -143,6 +148,7 @@ interface IR {
     models: IRModel[];
     securitySchemes: IRSecurityScheme[];
     modelDefs: IRModelDef[];
+    openApiDocument?: any;
 }
 interface IRParam {
     name: string;
@@ -245,6 +251,10 @@ declare class IrBuilderService {
     private firstAllowedTag;
     private collectSecuritySchemes;
     private collectParams;
+    private findMatchingComponentSchema;
+    private compareSchemas;
+    private extractModelNameFromSchema;
+    private generateTypeName;
     private extractRequestBodyWithTypes;
     private extractRequestBody;
     private extractResponseWithTypes;
@@ -289,6 +299,7 @@ declare class TypeScriptGeneratorService implements Generator<TypeScriptClient>
     private generatePackageJson;
     private generateTsConfig;
     private generateReadme;
+    private generatePrettierConfig;
 }
 
 declare class GeneratorModule {
@@ -302,8 +313,9 @@ declare class OpenApiModule {
 
 interface GenerateOptions {
     client?: string;
+    baseDir?: string;
 }
 declare function generate(configOrPath: Config | string, options?: GenerateOptions): Promise<void>;
 declare function loadConfig(configPath: string): Promise<Config>;
 
-export { type Client, ClientSchema, type Config, ConfigModule, ConfigSchema, ConfigService, type GenerateOptions, type Generator, GeneratorModule, GeneratorService, type IR, type IRAnnotations, type IRDiscriminator, type IRField, type IRModel, type IRModelDef, type IROperation, type IRParam, type IRRequestBody, type IRResponse, type IRSchema, IRSchemaKind, type IRSecurityScheme, type IRService, OpenApiModule, OpenApiService, type OperationIdParser, TYPESCRIPT_TEMPLATE_NAMES, type TypeAugmentationOptions, TypeAugmentationOptionsSchema, type TypeScriptClient, TypeScriptClientSchema, type TypeScriptTemplateName, defineConfig, generate, loadConfig, loadMjsConfig };
+export { type Client, ClientSchema, type Config, ConfigModule, ConfigSchema, ConfigService, type GenerateOptions, type Generator, GeneratorModule, GeneratorService, type IR, type IRAnnotations, type IRDiscriminator, type IRField, type IRModel, type IRModelDef, type IROperation, type IRParam, type IRRequestBody, type IRResponse, type IRSchema, IRSchemaKind, type IRSecurityScheme, type IRService, OpenApiModule, OpenApiService, type OperationIdParser, type PredefinedType, PredefinedTypeSchema, TYPESCRIPT_TEMPLATE_NAMES, type TypeScriptClient, TypeScriptClientSchema, type TypeScriptTemplateName, defineConfig, generate, loadConfig, loadMjsConfig };