@ps-aux/api-client-gen 0.7.0-rc.4 → 0.7.0-rc.5

package/dist/generateApiClient.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-var Path = require('path');
+var Path$1 = require('path');
 var fs$2 = require('fs');
 var fs = require('fs/promises');
+var Path = require('node:path');
 var swaggerTypescriptApi = require('swagger-typescript-api');
 var node_url = require('node:url');
 var promises = require('node:fs/promises');
-var Path$1 = require('node:path');
 var fs$1 = require('node:fs');
 var tsToZod = require('ts-to-zod');
 
@@ -4301,6 +4301,34 @@ const downloadSpec = async (path, url) => {
   await fs.writeFile(path, content);
 };
 
+const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
+
+var __defProp$b = Object.defineProperty;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$b = (obj, key, value) => __defNormalProp$b(obj, key + "" , value);
+const EMPTY_LINE_MARKER_LINE = new RegExp(
+  `\\n[\\t ]*${EMPTY_LINE_MARKER.replaceAll("/", "\\/").replaceAll(
+    "*",
+    "\\*"
+  )}\\n`,
+  "g"
+);
+class CodeFormatter {
+  constructor(opts) {
+    this.opts = opts;
+    __publicField$b(this, "format", async (code) => {
+      const filePath = Path.resolve(this.opts.resolveConfFrom, "generated.ts");
+      const prettier = await import('prettier');
+      const prettierConfig = await prettier.resolveConfig(filePath) ?? {};
+      const formattedCode = await prettier.format(code, {
+        ...prettierConfig,
+        filepath: filePath
+      });
+      return formattedCode.replaceAll(EMPTY_LINE_MARKER_LINE, "\n\n");
+    });
+  }
+}
+
 const toPascalCaseIdentifier = (str) => {
   const words = str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
   const pascalCase = words.map((word) => word[0].toUpperCase() + word.substring(1)).join("");
@@ -4321,6 +4349,12 @@ const groupBy = (values, getKey) => {
   }
   return groups;
 };
+const findRelativePath = (src, dst) => {
+  const relativePath = Path$1.relative(Path$1.dirname(src), dst);
+  const withoutExtension = relativePath.replace(/\.ts$/u, "");
+  const normalizedPath = withoutExtension.split(Path$1.sep).join("/");
+  return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
+};
 
 const generateOpenApiClient = async (inputFile, {
   name,
@@ -4329,7 +4363,7 @@ const generateOpenApiClient = async (inputFile, {
 }, log) => {
   log(`Will generate API client name=${name} to ${outputDir}`);
   const fileName = "index";
-  const dstFile = Path.join(outputDir, `${fileName}.ts`);
+  const dstFile = Path$1.join(outputDir, `${fileName}.ts`);
   const prettier = await import('prettier');
   const prettierConfig = await prettier.resolveConfig(dstFile) ?? {};
   const prettierConfigForGenerator = {
@@ -4373,12 +4407,12 @@ const generateOpenApiClient = async (inputFile, {
   return { types: dstFile, promiseWrapper: [dstFile] };
 };
 const getThisScriptDirname = () => {
-  return Path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('generateApiClient.cjs', document.baseURI).href))));
+  return Path$1.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('generateApiClient.cjs', document.baseURI).href))));
 };
 const getTemplatesDir = () => {
   const currentDir = getThisScriptDirname();
-  const templatesRelativePath = Path.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
-  return Path.resolve(currentDir, templatesRelativePath);
+  const templatesRelativePath = Path$1.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
+  return Path$1.resolve(currentDir, templatesRelativePath);
 };
 
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -5358,8 +5392,6 @@ const indentBlock = (value, indent) => {
   return value.split("\n").map((line) => `${indent}${line}`).join("\n");
 };
 
-const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
-
 var __defProp$5 = Object.defineProperty;
 var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -6638,38 +6670,12 @@ class OperationProjector {
 
 var __defProp$1 = Object.defineProperty;
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, key + "" , value);
-const EMPTY_LINE_MARKER_LINE = new RegExp(
-  `\\n[\\t ]*${EMPTY_LINE_MARKER.replaceAll("/", "\\/").replaceAll(
-    "*",
-    "\\*"
-  )}\\n`,
-  "g"
-);
-class CodeFormatter {
-  constructor(opts) {
-    this.opts = opts;
-    __publicField$1(this, "format", async (code) => {
-      const filePath = Path$1.resolve(this.opts.resolveConfFrom, "generated.ts");
-      const prettier = await import('prettier');
-      const prettierConfig = await prettier.resolveConfig(filePath) ?? {};
-      const formattedCode = await prettier.format(code, {
-        ...prettierConfig,
-        filepath: filePath
-      });
-      return formattedCode.replaceAll(EMPTY_LINE_MARKER_LINE, "\n\n");
-    });
-  }
-}
-
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
 class CodeWriter {
   constructor(formatter) {
     this.formatter = formatter;
-    __publicField(this, "symbolChunkMap", /* @__PURE__ */ new Map());
-    __publicField(this, "write", async (dir, chunks) => {
+    __publicField$1(this, "symbolChunkMap", /* @__PURE__ */ new Map());
+    __publicField$1(this, "write", async (dir, chunks) => {
       this.symbolChunkMap = this.createSymbolChunkMap(chunks);
       fs$1.mkdirSync(dir, { recursive: true });
       for (const chunk of chunks) {
@@ -6684,7 +6690,7 @@ class CodeWriter {
         fs$1.writeFileSync(`${dir}/${chunk.name}.ts`, code, "utf8");
       }
     });
-    __publicField(this, "createSymbolChunkMap", (chunks) => {
+    __publicField$1(this, "createSymbolChunkMap", (chunks) => {
       const map = /* @__PURE__ */ new Map();
       for (const chunk of chunks) {
         for (const exportedSymbol of chunk.exports) {
@@ -6698,7 +6704,7 @@ class CodeWriter {
       }
       return map;
     });
-    __publicField(this, "collectImports", (chunk) => {
+    __publicField$1(this, "collectImports", (chunk) => {
       const imports = [];
       for (const ref of chunk.refs) {
         if (ref.kind === "builtin") continue;
@@ -6721,7 +6727,7 @@ class CodeWriter {
       }
       return imports;
     });
-    __publicField(this, "genImportStatements", (imports) => {
+    __publicField$1(this, "genImportStatements", (imports) => {
       const symbolsBySource = groupBy(
         imports.map((i) => ({
           name: i.name,
@@ -6734,7 +6740,7 @@ class CodeWriter {
         return `import type { ${sortedSymbols.join(", ")} } from '${source}'`;
       });
     });
-    __publicField(this, "importSourcetoString", (src) => {
+    __publicField$1(this, "importSourcetoString", (src) => {
       return "externalModule" in src ? src.externalModule : (
         // TODO generalize later when we have different paths
         `./${src.name}`
@@ -6749,7 +6755,7 @@ class VNextOasClientGenerator {
     this.options = options;
     this.log = log;
   }
-  async generate(cmd) {
+  async generate(cmd, formatter) {
     const { inputFile, outputDir, apiName } = cmd;
     this.log(`Will generate API client name=${apiName} to ${outputDir}`);
     const sourceSchema = await loadSourceSchema(inputFile);
@@ -6770,12 +6776,9 @@ class VNextOasClientGenerator {
       projectResult,
       this.options.codegen
     );
-    const codeFormatter = new CodeFormatter({
-      resolveConfFrom: outputDir
-    });
-    const writer = new CodeWriter(codeFormatter);
+    const writer = new CodeWriter(formatter);
     await writer.write(outputDir, chunks.all);
-    const tsFilePath = (name) => Path.join(outputDir, `${name}.ts`);
+    const tsFilePath = (name) => Path$1.join(outputDir, `${name}.ts`);
     return {
       promiseWrapper: chunks.promiseWrappersNames.map(tsFilePath),
       types: tsFilePath(chunks.typesName)
@@ -6841,7 +6844,7 @@ const toErrorMessage = (error) => {
   return error instanceof Error ? error.message : String(error);
 };
 
-const generateOpenApiModel = async (spectPath, config, log) => {
+const generateOpenApiModel = async (spectPath, config, log, codeFormatter) => {
   let outFiles;
   const { openApiGenerator, responseWrapper } = config;
   if ("legacy" in openApiGenerator) {
@@ -6858,11 +6861,14 @@ const generateOpenApiModel = async (spectPath, config, log) => {
     outFiles = await new VNextOasClientGenerator(
       openApiGenerator,
       log
-    ).generate({
-      inputFile: spectPath,
-      apiName: config.apiName,
-      outputDir: config.dstDir
-    });
+    ).generate(
+      {
+        inputFile: spectPath,
+        apiName: config.apiName,
+        outputDir: config.dstDir
+      },
+      codeFormatter
+    );
   }
   if (responseWrapper) {
     await modifyHttpClientAsyncWrapper(
@@ -6951,34 +6957,33 @@ const findMatchingBrace = (code, openBraceIndex) => {
   return -1;
 };
 
-const generateSchemas = async (inputFile, outputFile, opts = {}) => {
-  const code = fs$2.readFileSync(inputFile).toString();
-  const { getZodSchemasFile } = tsToZod.generate({
-    sourceText: removeGenericTypes(code)
-  });
-  let f = getZodSchemasFile(getModuleImportPath(inputFile, outputFile));
-  f = f.replaceAll(".optional()", ".nullable()");
-  if (opts.localDateTimes) {
-    f = f.replaceAll(
-      "z.string().datetime()",
-      "z.string().datetime({local: true})"
-    );
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+class ZodSchemaGenerator {
+  constructor(codeFormatter) {
+    this.codeFormatter = codeFormatter;
+    __publicField(this, "generate", async ({
+      sourceText,
+      moduleImportPath,
+      options = {}
+    }) => {
+      const { getZodSchemasFile } = tsToZod.generate({
+        sourceText: removeGenericTypes(sourceText)
+      });
+      let generated = getZodSchemasFile(moduleImportPath);
+      generated = generated.replaceAll(".optional()", ".nullable()");
+      generated = generated.replaceAll(".int64()", ".int()");
+      if (options.localDateTimes) {
+        generated = generated.replaceAll(
+          "z.string().datetime()",
+          "z.string().datetime({local: true})"
+        );
+      }
+      return this.codeFormatter.format(generated);
+    });
   }
-  const prettier = await import('prettier');
-  const prettierConfig = await prettier.resolveConfig(outputFile) ?? {};
-  const formatted = await prettier.format(f, {
-    ...prettierConfig,
-    filepath: outputFile
-  });
-  fs$2.writeFileSync(outputFile, formatted);
-};
-const getModuleImportPath = (inputFile, outputFile) => {
-  const sourceDir = Path.dirname(outputFile);
-  const relativePath = Path.relative(sourceDir, inputFile);
-  const withoutExtension = relativePath.replace(/\.ts$/u, "");
-  const normalizedPath = withoutExtension.split(Path.sep).join("/");
-  return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
-};
+}
 
 const generateApiClient = async (params, configFilePath, log = console.log) => {
   const config = parseProfileConfig(params, configFilePath);
@@ -6986,14 +6991,17 @@ const generateApiClient = async (params, configFilePath, log = console.log) => {
 };
 const generateApiClientFromConfig = async (config, log = console.log) => {
   const { dstDir, apiName, srcSpec, zodSchemas } = config;
-  const dir = Path.resolve(dstDir, apiName);
+  const dir = Path$1.resolve(dstDir, apiName);
   if (!fs__namespace.existsSync(dir)) {
     log(`Creating dir ${dir}`);
     fs__namespace.mkdirSync(dir, {
       recursive: true
     });
   }
-  const clientDir = Path.resolve(dir, "client");
+  const clientDir = Path$1.resolve(dir, "client");
+  const formatter = new CodeFormatter({
+    resolveConfFrom: dir
+  });
   const specPath = await getSpecPath(srcSpec, dir, log);
   log(`Cleaning client output dir ${clientDir}`);
   fs__namespace.rmSync(clientDir, {
@@ -7009,15 +7017,20 @@ const generateApiClientFromConfig = async (config, log = console.log) => {
       ...config,
       dstDir: clientDir
     },
-    log
+    log,
+    formatter
   );
   if (zodSchemas?.enabled === false) return;
   log("Generating Zod schemas");
-  await generateSchemas(
-    typesFilePath,
-    Path.resolve(dir, "./zod.ts"),
-    zodSchemas
-  );
+  const zodOutputFile = Path$1.resolve(dir, "./zod.ts");
+  const generator = new ZodSchemaGenerator(formatter);
+  const sourceText = fs__namespace.readFileSync(typesFilePath, "utf8");
+  const generated = await generator.generate({
+    sourceText,
+    moduleImportPath: findRelativePath(zodOutputFile, typesFilePath),
+    options: zodSchemas
+  });
+  fs__namespace.writeFileSync(zodOutputFile, generated);
 };
 const getSpecPath = async (urlOrPath, dir, log) => {
   if (!urlOrPath.startsWith("http")) {
@@ -7025,7 +7038,7 @@ const getSpecPath = async (urlOrPath, dir, log) => {
       throw new Error(`Spec file ${urlOrPath} does not exists`);
     return urlOrPath;
   }
-  const specPath = Path.resolve(dir, `spec.json`);
+  const specPath = Path$1.resolve(dir, `spec.json`);
   log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
   await downloadSpec(specPath, urlOrPath);
   return specPath;

package/dist/generateApiClient.mjs

@@ -1,11 +1,10 @@
-import Path from 'path';
+import Path$1 from 'path';
 import * as fs from 'fs';
-import fs__default$1 from 'fs';
 import fs$1 from 'fs/promises';
+import Path from 'node:path';
 import { generateApi } from 'swagger-typescript-api';
 import { fileURLToPath } from 'node:url';
 import { readFile } from 'node:fs/promises';
-import Path$1 from 'node:path';
 import fs__default from 'node:fs';
 import { generate } from 'ts-to-zod';
 
@@ -4280,6 +4279,34 @@ const downloadSpec = async (path, url) => {
   await fs$1.writeFile(path, content);
 };
 
+const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
+
+var __defProp$b = Object.defineProperty;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$b = (obj, key, value) => __defNormalProp$b(obj, key + "" , value);
+const EMPTY_LINE_MARKER_LINE = new RegExp(
+  `\\n[\\t ]*${EMPTY_LINE_MARKER.replaceAll("/", "\\/").replaceAll(
+    "*",
+    "\\*"
+  )}\\n`,
+  "g"
+);
+class CodeFormatter {
+  constructor(opts) {
+    this.opts = opts;
+    __publicField$b(this, "format", async (code) => {
+      const filePath = Path.resolve(this.opts.resolveConfFrom, "generated.ts");
+      const prettier = await import('prettier');
+      const prettierConfig = await prettier.resolveConfig(filePath) ?? {};
+      const formattedCode = await prettier.format(code, {
+        ...prettierConfig,
+        filepath: filePath
+      });
+      return formattedCode.replaceAll(EMPTY_LINE_MARKER_LINE, "\n\n");
+    });
+  }
+}
+
 const toPascalCaseIdentifier = (str) => {
   const words = str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
   const pascalCase = words.map((word) => word[0].toUpperCase() + word.substring(1)).join("");
@@ -4300,6 +4327,12 @@ const groupBy = (values, getKey) => {
   }
   return groups;
 };
+const findRelativePath = (src, dst) => {
+  const relativePath = Path$1.relative(Path$1.dirname(src), dst);
+  const withoutExtension = relativePath.replace(/\.ts$/u, "");
+  const normalizedPath = withoutExtension.split(Path$1.sep).join("/");
+  return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
+};
 
 const generateOpenApiClient = async (inputFile, {
   name,
@@ -4308,7 +4341,7 @@ const generateOpenApiClient = async (inputFile, {
 }, log) => {
   log(`Will generate API client name=${name} to ${outputDir}`);
   const fileName = "index";
-  const dstFile = Path.join(outputDir, `${fileName}.ts`);
+  const dstFile = Path$1.join(outputDir, `${fileName}.ts`);
   const prettier = await import('prettier');
   const prettierConfig = await prettier.resolveConfig(dstFile) ?? {};
   const prettierConfigForGenerator = {
@@ -4352,12 +4385,12 @@ const generateOpenApiClient = async (inputFile, {
   return { types: dstFile, promiseWrapper: [dstFile] };
 };
 const getThisScriptDirname = () => {
-  return Path.dirname(fileURLToPath(import.meta.url));
+  return Path$1.dirname(fileURLToPath(import.meta.url));
 };
 const getTemplatesDir = () => {
   const currentDir = getThisScriptDirname();
-  const templatesRelativePath = Path.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
-  return Path.resolve(currentDir, templatesRelativePath);
+  const templatesRelativePath = Path$1.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
+  return Path$1.resolve(currentDir, templatesRelativePath);
 };
 
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -5337,8 +5370,6 @@ const indentBlock = (value, indent) => {
   return value.split("\n").map((line) => `${indent}${line}`).join("\n");
 };
 
-const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
-
 var __defProp$5 = Object.defineProperty;
 var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -6617,38 +6648,12 @@ class OperationProjector {
 
 var __defProp$1 = Object.defineProperty;
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, key + "" , value);
-const EMPTY_LINE_MARKER_LINE = new RegExp(
-  `\\n[\\t ]*${EMPTY_LINE_MARKER.replaceAll("/", "\\/").replaceAll(
-    "*",
-    "\\*"
-  )}\\n`,
-  "g"
-);
-class CodeFormatter {
-  constructor(opts) {
-    this.opts = opts;
-    __publicField$1(this, "format", async (code) => {
-      const filePath = Path$1.resolve(this.opts.resolveConfFrom, "generated.ts");
-      const prettier = await import('prettier');
-      const prettierConfig = await prettier.resolveConfig(filePath) ?? {};
-      const formattedCode = await prettier.format(code, {
-        ...prettierConfig,
-        filepath: filePath
-      });
-      return formattedCode.replaceAll(EMPTY_LINE_MARKER_LINE, "\n\n");
-    });
-  }
-}
-
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
 class CodeWriter {
   constructor(formatter) {
     this.formatter = formatter;
-    __publicField(this, "symbolChunkMap", /* @__PURE__ */ new Map());
-    __publicField(this, "write", async (dir, chunks) => {
+    __publicField$1(this, "symbolChunkMap", /* @__PURE__ */ new Map());
+    __publicField$1(this, "write", async (dir, chunks) => {
       this.symbolChunkMap = this.createSymbolChunkMap(chunks);
       fs__default.mkdirSync(dir, { recursive: true });
       for (const chunk of chunks) {
@@ -6663,7 +6668,7 @@ class CodeWriter {
         fs__default.writeFileSync(`${dir}/${chunk.name}.ts`, code, "utf8");
       }
     });
-    __publicField(this, "createSymbolChunkMap", (chunks) => {
+    __publicField$1(this, "createSymbolChunkMap", (chunks) => {
       const map = /* @__PURE__ */ new Map();
       for (const chunk of chunks) {
         for (const exportedSymbol of chunk.exports) {
@@ -6677,7 +6682,7 @@ class CodeWriter {
       }
       return map;
     });
-    __publicField(this, "collectImports", (chunk) => {
+    __publicField$1(this, "collectImports", (chunk) => {
       const imports = [];
       for (const ref of chunk.refs) {
         if (ref.kind === "builtin") continue;
@@ -6700,7 +6705,7 @@ class CodeWriter {
       }
       return imports;
     });
-    __publicField(this, "genImportStatements", (imports) => {
+    __publicField$1(this, "genImportStatements", (imports) => {
       const symbolsBySource = groupBy(
         imports.map((i) => ({
           name: i.name,
@@ -6713,7 +6718,7 @@ class CodeWriter {
         return `import type { ${sortedSymbols.join(", ")} } from '${source}'`;
       });
     });
-    __publicField(this, "importSourcetoString", (src) => {
+    __publicField$1(this, "importSourcetoString", (src) => {
       return "externalModule" in src ? src.externalModule : (
         // TODO generalize later when we have different paths
         `./${src.name}`
@@ -6728,7 +6733,7 @@ class VNextOasClientGenerator {
     this.options = options;
     this.log = log;
   }
-  async generate(cmd) {
+  async generate(cmd, formatter) {
     const { inputFile, outputDir, apiName } = cmd;
     this.log(`Will generate API client name=${apiName} to ${outputDir}`);
     const sourceSchema = await loadSourceSchema(inputFile);
@@ -6749,12 +6754,9 @@ class VNextOasClientGenerator {
       projectResult,
       this.options.codegen
     );
-    const codeFormatter = new CodeFormatter({
-      resolveConfFrom: outputDir
-    });
-    const writer = new CodeWriter(codeFormatter);
+    const writer = new CodeWriter(formatter);
     await writer.write(outputDir, chunks.all);
-    const tsFilePath = (name) => Path.join(outputDir, `${name}.ts`);
+    const tsFilePath = (name) => Path$1.join(outputDir, `${name}.ts`);
     return {
       promiseWrapper: chunks.promiseWrappersNames.map(tsFilePath),
       types: tsFilePath(chunks.typesName)
@@ -6820,7 +6822,7 @@ const toErrorMessage = (error) => {
   return error instanceof Error ? error.message : String(error);
 };
 
-const generateOpenApiModel = async (spectPath, config, log) => {
+const generateOpenApiModel = async (spectPath, config, log, codeFormatter) => {
   let outFiles;
   const { openApiGenerator, responseWrapper } = config;
   if ("legacy" in openApiGenerator) {
@@ -6837,11 +6839,14 @@ const generateOpenApiModel = async (spectPath, config, log) => {
     outFiles = await new VNextOasClientGenerator(
       openApiGenerator,
       log
-    ).generate({
-      inputFile: spectPath,
-      apiName: config.apiName,
-      outputDir: config.dstDir
-    });
+    ).generate(
+      {
+        inputFile: spectPath,
+        apiName: config.apiName,
+        outputDir: config.dstDir
+      },
+      codeFormatter
+    );
   }
   if (responseWrapper) {
     await modifyHttpClientAsyncWrapper(
@@ -6930,34 +6935,33 @@ const findMatchingBrace = (code, openBraceIndex) => {
   return -1;
 };
 
-const generateSchemas = async (inputFile, outputFile, opts = {}) => {
-  const code = fs__default$1.readFileSync(inputFile).toString();
-  const { getZodSchemasFile } = generate({
-    sourceText: removeGenericTypes(code)
-  });
-  let f = getZodSchemasFile(getModuleImportPath(inputFile, outputFile));
-  f = f.replaceAll(".optional()", ".nullable()");
-  if (opts.localDateTimes) {
-    f = f.replaceAll(
-      "z.string().datetime()",
-      "z.string().datetime({local: true})"
-    );
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+class ZodSchemaGenerator {
+  constructor(codeFormatter) {
+    this.codeFormatter = codeFormatter;
+    __publicField(this, "generate", async ({
+      sourceText,
+      moduleImportPath,
+      options = {}
+    }) => {
+      const { getZodSchemasFile } = generate({
+        sourceText: removeGenericTypes(sourceText)
+      });
+      let generated = getZodSchemasFile(moduleImportPath);
+      generated = generated.replaceAll(".optional()", ".nullable()");
+      generated = generated.replaceAll(".int64()", ".int()");
+      if (options.localDateTimes) {
+        generated = generated.replaceAll(
+          "z.string().datetime()",
+          "z.string().datetime({local: true})"
+        );
+      }
+      return this.codeFormatter.format(generated);
+    });
   }
-  const prettier = await import('prettier');
-  const prettierConfig = await prettier.resolveConfig(outputFile) ?? {};
-  const formatted = await prettier.format(f, {
-    ...prettierConfig,
-    filepath: outputFile
-  });
-  fs__default$1.writeFileSync(outputFile, formatted);
-};
-const getModuleImportPath = (inputFile, outputFile) => {
-  const sourceDir = Path.dirname(outputFile);
-  const relativePath = Path.relative(sourceDir, inputFile);
-  const withoutExtension = relativePath.replace(/\.ts$/u, "");
-  const normalizedPath = withoutExtension.split(Path.sep).join("/");
-  return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
-};
+}
 
 const generateApiClient = async (params, configFilePath, log = console.log) => {
   const config = parseProfileConfig(params, configFilePath);
@@ -6965,14 +6969,17 @@ const generateApiClient = async (params, configFilePath, log = console.log) => {
 };
 const generateApiClientFromConfig = async (config, log = console.log) => {
   const { dstDir, apiName, srcSpec, zodSchemas } = config;
-  const dir = Path.resolve(dstDir, apiName);
+  const dir = Path$1.resolve(dstDir, apiName);
   if (!fs.existsSync(dir)) {
     log(`Creating dir ${dir}`);
     fs.mkdirSync(dir, {
       recursive: true
     });
   }
-  const clientDir = Path.resolve(dir, "client");
+  const clientDir = Path$1.resolve(dir, "client");
+  const formatter = new CodeFormatter({
+    resolveConfFrom: dir
+  });
   const specPath = await getSpecPath(srcSpec, dir, log);
   log(`Cleaning client output dir ${clientDir}`);
   fs.rmSync(clientDir, {
@@ -6988,15 +6995,20 @@ const generateApiClientFromConfig = async (config, log = console.log) => {
       ...config,
       dstDir: clientDir
     },
-    log
+    log,
+    formatter
   );
   if (zodSchemas?.enabled === false) return;
   log("Generating Zod schemas");
-  await generateSchemas(
-    typesFilePath,
-    Path.resolve(dir, "./zod.ts"),
-    zodSchemas
-  );
+  const zodOutputFile = Path$1.resolve(dir, "./zod.ts");
+  const generator = new ZodSchemaGenerator(formatter);
+  const sourceText = fs.readFileSync(typesFilePath, "utf8");
+  const generated = await generator.generate({
+    sourceText,
+    moduleImportPath: findRelativePath(zodOutputFile, typesFilePath),
+    options: zodSchemas
+  });
+  fs.writeFileSync(zodOutputFile, generated);
 };
 const getSpecPath = async (urlOrPath, dir, log) => {
   if (!urlOrPath.startsWith("http")) {
@@ -7004,7 +7016,7 @@ const getSpecPath = async (urlOrPath, dir, log) => {
       throw new Error(`Spec file ${urlOrPath} does not exists`);
     return urlOrPath;
   }
-  const specPath = Path.resolve(dir, `spec.json`);
+  const specPath = Path$1.resolve(dir, `spec.json`);
   log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
   await downloadSpec(specPath, urlOrPath);
   return specPath;

package/dist/index.cjs

@@ -4,10 +4,10 @@ var generateApiClient = require('./generateApiClient.cjs');
 require('path');
 require('fs');
 require('fs/promises');
+require('node:path');
 require('swagger-typescript-api');
 require('node:url');
 require('node:fs/promises');
-require('node:path');
 require('node:fs');
 require('ts-to-zod');
 

package/dist/index.mjs

@@ -2,9 +2,9 @@ export { d as defineConfig, g as generateApiClient } from './generateApiClient.m
 import 'path';
 import 'fs';
 import 'fs/promises';
+import 'node:path';
 import 'swagger-typescript-api';
 import 'node:url';
 import 'node:fs/promises';
-import 'node:path';
 import 'node:fs';
 import 'ts-to-zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/api-client-gen",
-  "version": "0.7.0-rc.4",
+  "version": "0.7.0-rc.5",
   "main": "dist/index.cjs",
   "type": "module",
   "bin": {
@@ -14,8 +14,8 @@
     "pack:tarball": "npm run build && npm pack",
     "prepublishOnly": "echo \"Publishing disabled for this repo. Use CI workflow.\" && exit 1",
     "test": "npm run test:generation && npm run test:generated-code && npm run tc:after-gen",
-    "test:generation": "vitest run test/generateApiClient.spec.ts test/e2e/e2e.spec.ts test/gen-open-api/*/generate*.spec.ts test/gen-open-api/*/integration.spec.ts",
-    "test:generated-code": "vitest run test/gen-open-api/swagger-ts-api/contract.spec.ts test/gen-open-api/v-next/contract.spec.ts",
+    "test:generation": "vitest run --project generation",
+    "test:generated-code": "vitest run --project generated-code",
     "tc": "echo 'No typecheck'",
     "tc:after-gen": "tsc",
     "tc:v-next-compat": "tsc -p tsconfig.v-next-compat.json"