@ps-aux/api-client-gen 0.0.5-rc2 → 0.0.6-rc1

package/dist/bin.esm.js

@@ -1,5 +1,5 @@
 #!/bin/env node
-import { generateApiClient } from './index.esm.js';
+import { g as generateApiClient } from './generateApiClient-BSM0HlFv.js';
 import { cosmiconfigSync } from 'cosmiconfig';
 import 'path';
 import 'fs';

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/bin/env node
 'use strict';
 
-var index = require('./index.js');
+var generateApiClient = require('./generateApiClient-DBkHX8se.js');
 var cosmiconfig = require('cosmiconfig');
 require('path');
 require('fs');
@@ -21,4 +21,4 @@ if (!conf)
 const profileConf = conf.config[profile];
 if (!profile)
     throw new Error(`Profile ${profile} not present in the configuration`);
-index.generateApiClient(profileConf).catch(console.error);
+generateApiClient.generateApiClient(profileConf).catch(console.error);

package/dist/generateApiClient-BSM0HlFv.js

@@ -0,0 +1,162 @@
+import Path from 'path';
+import * as fs from 'fs';
+import fs__default from 'fs';
+import axios from 'axios';
+import fs$1 from 'fs/promises';
+import { generateApi } from 'swagger-typescript-api';
+import { generate } from 'ts-to-zod';
+
+const downloadSpec = async (path, url) => {
+    const res = await axios({
+        url,
+        method: 'GET',
+        responseType: 'arraybuffer',
+    }).catch(err => {
+        throw err.toString();
+    });
+    const content = res.data.toString();
+    await fs$1.writeFile(path, format(content));
+};
+const format = (content) => JSON.stringify(JSON.parse(content), null, 4);
+
+const generateOpenApiModel = async ({ input, isNode, responseWrapper, name, outputDir }, log) => {
+    log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
+    const specialMapping = isNode
+        ? {
+            File: '{file: Buffer | stream.Readable, name: string}',
+        }
+        : {};
+    const fileName = 'index';
+    const dstFile = Path.join(outputDir, `${fileName}.ts`);
+    await generateApi({
+        name: 'index',
+        output: outputDir,
+        input: input,
+        // modular: true,
+        httpClientType: 'axios',
+        templates: Path.resolve(getThisScriptDirname(), '../templates'),
+        defaultResponseAsSuccess: true,
+        // generateRouteTypes: true,
+        singleHttpClient: true,
+        // extractRequestBody: true,
+        cleanOutput: true,
+        moduleNameFirstTag: true,
+        apiClassName: capitalize(name) + 'Api',
+        // @ts-ignore
+        codeGenConstructs: (struct) => ({
+            // @ts-ignore
+            Keyword: specialMapping,
+        }),
+        // extractRequestParams: true,
+    });
+    const addImports = [];
+    const replaces = [];
+    if (isNode) {
+        addImports.push('import stream from \'node:stream\'');
+    }
+    if (responseWrapper) {
+        log(`Will use response wrapper '${JSON.stringify(responseWrapper)}'`);
+        if (responseWrapper.import)
+            addImports.push(responseWrapper.import);
+        replaces.push(['Promise', responseWrapper.symbol]);
+    }
+    // Remove unnecessary generics
+    replaces.push(['<SecurityDataType extends unknown>', '']);
+    replaces.push(['<SecurityDataType>', '']);
+    log(`Will modify the outputs ${JSON.stringify({
+        addImports,
+        replaces,
+    })}`);
+    await modifyOutput(dstFile, {
+        addImports,
+        replaces,
+    });
+    return dstFile;
+};
+const modifyOutput = async (path, cmd) => {
+    let content = await fs$1.readFile(path).then((r) => r.toString());
+    if (cmd.addImports.length) {
+        content = cmd.addImports.join('\n') + '\n' + content;
+    }
+    cmd.replaces.forEach(([from, to]) => {
+        content = content.replaceAll(from, to);
+    });
+    await fs$1.writeFile(path, content);
+};
+const getThisScriptDirname = () => {
+    // Might be problem in ESM mode
+    return __dirname;
+};
+const capitalize = (str) => {
+    return str[0].toUpperCase() + str.substring(1);
+};
+
+// TODO needed?
+const removeGenericTypes = (code) => {
+    const regex = /export (interface|enum|type) [^<]* \{\n(.*\n)*?}/mg;
+    const matches = code.matchAll(regex);
+    const types = Array.from(matches).map(m => m[0]);
+    return types.join('\n');
+};
+const generateSchemas = (inputFile, outputFile, opts = {}) => {
+    const code = fs__default.readFileSync(inputFile).toString();
+    const { getZodSchemasFile } = generate({
+        sourceText: removeGenericTypes(code),
+        customJSDocFormatTypes: {
+        // Custom mapping
+        // 'date-time': 'blablaj' - regex
+        },
+    });
+    const fileName = Path.basename(inputFile);
+    let f = getZodSchemasFile(`./${fileName.replace('.ts', '')}`);
+    // Backend sends nulls not undefined - should be properly set in the OpenAPI TS types generation!
+    f = f.replaceAll('.optional()', '.nullable()');
+    if (opts.localDateTimes) {
+        f = f.replaceAll('z.string().datetime()', 'z.string().datetime({local: true})');
+    }
+    fs__default.writeFileSync(outputFile, f);
+};
+
+const generateApiClient = async ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }, log = console.log) => {
+    if (!srcSpec)
+        throw new Error(`Url or path ('srcSpec' not specified`);
+    if (!apiName)
+        throw new Error('apiName not specified');
+    if (!dstDir)
+        throw new Error('dstDir not specified');
+    if (!env)
+        throw new Error('env not specified');
+    const dir = Path.resolve(dstDir, apiName);
+    if (!fs.existsSync(dir)) {
+        log(`Creating dir ${dir}`);
+        fs.mkdirSync(dir, {
+            recursive: true,
+        });
+    }
+    const clientDir = Path.resolve(dir, 'client');
+    const specPath = await getSpecPath(srcSpec, dir, log);
+    const clientFile = await generateOpenApiModel({
+        name: apiName,
+        input: specPath,
+        outputDir: clientDir,
+        isNode: env === 'node',
+        responseWrapper,
+    }, log);
+    if (zodSchemas?.enabled === false)
+        return;
+    log('Generating Zod schemas');
+    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'), zodSchemas);
+};
+const getSpecPath = async (urlOrPath, dir, log) => {
+    if (!urlOrPath.startsWith('http')) {
+        if (!fs.existsSync(urlOrPath))
+            throw new Error(`Spec file ${urlOrPath} does not exists`);
+        return urlOrPath;
+    }
+    const specPath = Path.resolve(dir, `spec.json`);
+    log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
+    await downloadSpec(specPath, urlOrPath);
+    return specPath;
+};
+
+export { generateApiClient as g };

package/dist/generateApiClient-DBkHX8se.js

@@ -0,0 +1,182 @@
+'use strict';
+
+var Path = require('path');
+var fs$1 = require('fs');
+var axios = require('axios');
+var fs = require('fs/promises');
+var swaggerTypescriptApi = require('swagger-typescript-api');
+var tsToZod = require('ts-to-zod');
+
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs$1);
+
+const downloadSpec = async (path, url) => {
+    const res = await axios({
+        url,
+        method: 'GET',
+        responseType: 'arraybuffer',
+    }).catch(err => {
+        throw err.toString();
+    });
+    const content = res.data.toString();
+    await fs.writeFile(path, format(content));
+};
+const format = (content) => JSON.stringify(JSON.parse(content), null, 4);
+
+const generateOpenApiModel = async ({ input, isNode, responseWrapper, name, outputDir }, log) => {
+    log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
+    const specialMapping = isNode
+        ? {
+            File: '{file: Buffer | stream.Readable, name: string}',
+        }
+        : {};
+    const fileName = 'index';
+    const dstFile = Path.join(outputDir, `${fileName}.ts`);
+    await swaggerTypescriptApi.generateApi({
+        name: 'index',
+        output: outputDir,
+        input: input,
+        // modular: true,
+        httpClientType: 'axios',
+        templates: Path.resolve(getThisScriptDirname(), '../templates'),
+        defaultResponseAsSuccess: true,
+        // generateRouteTypes: true,
+        singleHttpClient: true,
+        // extractRequestBody: true,
+        cleanOutput: true,
+        moduleNameFirstTag: true,
+        apiClassName: capitalize(name) + 'Api',
+        // @ts-ignore
+        codeGenConstructs: (struct) => ({
+            // @ts-ignore
+            Keyword: specialMapping,
+        }),
+        // extractRequestParams: true,
+    });
+    const addImports = [];
+    const replaces = [];
+    if (isNode) {
+        addImports.push('import stream from \'node:stream\'');
+    }
+    if (responseWrapper) {
+        log(`Will use response wrapper '${JSON.stringify(responseWrapper)}'`);
+        if (responseWrapper.import)
+            addImports.push(responseWrapper.import);
+        replaces.push(['Promise', responseWrapper.symbol]);
+    }
+    // Remove unnecessary generics
+    replaces.push(['<SecurityDataType extends unknown>', '']);
+    replaces.push(['<SecurityDataType>', '']);
+    log(`Will modify the outputs ${JSON.stringify({
+        addImports,
+        replaces,
+    })}`);
+    await modifyOutput(dstFile, {
+        addImports,
+        replaces,
+    });
+    return dstFile;
+};
+const modifyOutput = async (path, cmd) => {
+    let content = await fs.readFile(path).then((r) => r.toString());
+    if (cmd.addImports.length) {
+        content = cmd.addImports.join('\n') + '\n' + content;
+    }
+    cmd.replaces.forEach(([from, to]) => {
+        content = content.replaceAll(from, to);
+    });
+    await fs.writeFile(path, content);
+};
+const getThisScriptDirname = () => {
+    // Might be problem in ESM mode
+    return __dirname;
+};
+const capitalize = (str) => {
+    return str[0].toUpperCase() + str.substring(1);
+};
+
+// TODO needed?
+const removeGenericTypes = (code) => {
+    const regex = /export (interface|enum|type) [^<]* \{\n(.*\n)*?}/mg;
+    const matches = code.matchAll(regex);
+    const types = Array.from(matches).map(m => m[0]);
+    return types.join('\n');
+};
+const generateSchemas = (inputFile, outputFile, opts = {}) => {
+    const code = fs$1.readFileSync(inputFile).toString();
+    const { getZodSchemasFile } = tsToZod.generate({
+        sourceText: removeGenericTypes(code),
+        customJSDocFormatTypes: {
+        // Custom mapping
+        // 'date-time': 'blablaj' - regex
+        },
+    });
+    const fileName = Path.basename(inputFile);
+    let f = getZodSchemasFile(`./${fileName.replace('.ts', '')}`);
+    // Backend sends nulls not undefined - should be properly set in the OpenAPI TS types generation!
+    f = f.replaceAll('.optional()', '.nullable()');
+    if (opts.localDateTimes) {
+        f = f.replaceAll('z.string().datetime()', 'z.string().datetime({local: true})');
+    }
+    fs$1.writeFileSync(outputFile, f);
+};
+
+const generateApiClient = async ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }, log = console.log) => {
+    if (!srcSpec)
+        throw new Error(`Url or path ('srcSpec' not specified`);
+    if (!apiName)
+        throw new Error('apiName not specified');
+    if (!dstDir)
+        throw new Error('dstDir not specified');
+    if (!env)
+        throw new Error('env not specified');
+    const dir = Path.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 specPath = await getSpecPath(srcSpec, dir, log);
+    const clientFile = await generateOpenApiModel({
+        name: apiName,
+        input: specPath,
+        outputDir: clientDir,
+        isNode: env === 'node',
+        responseWrapper,
+    }, log);
+    if (zodSchemas?.enabled === false)
+        return;
+    log('Generating Zod schemas');
+    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'), zodSchemas);
+};
+const getSpecPath = async (urlOrPath, dir, log) => {
+    if (!urlOrPath.startsWith('http')) {
+        if (!fs__namespace.existsSync(urlOrPath))
+            throw new Error(`Spec file ${urlOrPath} does not exists`);
+        return urlOrPath;
+    }
+    const specPath = Path.resolve(dir, `spec.json`);
+    log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
+    await downloadSpec(specPath, urlOrPath);
+    return specPath;
+};
+
+exports.generateApiClient = generateApiClient;

package/dist/generateApiClient.d.ts

@@ -1,3 +1,4 @@
+import { GenerateSchemasOptions } from './generateSchemas';
 export type Params = {
     srcSpec: string;
     dstDir: string;
@@ -7,6 +8,8 @@ export type Params = {
         symbol: string;
         import?: string;
     };
-    zodSchemas?: boolean;
+    zodSchemas?: GenerateSchemasOptions & {
+        enabled?: boolean;
+    };
 };
 export declare const generateApiClient: ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }: Params, log?: (msg: string) => void) => Promise<void>;

package/dist/generateSchemas.d.ts

@@ -1 +1,4 @@
-export declare const generateSchemas: (inputFile: string, outputFile: string) => void;
+export type GenerateSchemasOptions = {
+    localDateTimes?: boolean;
+};
+export declare const generateSchemas: (inputFile: string, outputFile: string, opts?: GenerateSchemasOptions) => void;

package/dist/index.esm.js

@@ -1,153 +1,7 @@
-import Path from 'path';
-import fs$1 from 'fs';
-import axios from 'axios';
-import fs from 'fs/promises';
-import { generateApi } from 'swagger-typescript-api';
-import { generate } from 'ts-to-zod';
-
-const downloadSpec = async (path, url) => {
-    const res = await axios({
-        url,
-        method: 'GET',
-        responseType: 'arraybuffer',
-    }).catch(err => {
-        throw err.toString();
-    });
-    const content = res.data.toString();
-    await fs.writeFile(path, format(content));
-};
-const format = (content) => JSON.stringify(JSON.parse(content), null, 4);
-
-const generateOpenApiModel = async ({ input, isNode, responseWrapper, name, outputDir }, log) => {
-    log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
-    const specialMapping = isNode
-        ? {
-            File: '{file: Buffer | stream.Readable, name: string}',
-        }
-        : {};
-    const fileName = 'index';
-    const dstFile = Path.join(outputDir, `${fileName}.ts`);
-    await generateApi({
-        name: 'index',
-        output: outputDir,
-        input: input,
-        // modular: true,
-        httpClientType: 'axios',
-        templates: Path.resolve(getThisScriptDirname(), '../templates'),
-        defaultResponseAsSuccess: true,
-        // generateRouteTypes: true,
-        singleHttpClient: true,
-        // extractRequestBody: true,
-        cleanOutput: true,
-        moduleNameFirstTag: true,
-        apiClassName: capitalize(name) + 'Api',
-        // @ts-ignore
-        codeGenConstructs: (struct) => ({
-            // @ts-ignore
-            Keyword: specialMapping,
-        }),
-        // extractRequestParams: true,
-    });
-    const addImports = [];
-    const replaces = [];
-    if (isNode) {
-        addImports.push('import stream from \'node:stream\'');
-    }
-    if (responseWrapper) {
-        log(`Will use response wrapper '${JSON.stringify(responseWrapper)}'`);
-        if (responseWrapper.import)
-            addImports.push(responseWrapper.import);
-        replaces.push(['Promise', responseWrapper.symbol]);
-    }
-    // Remove unnecessary generics
-    replaces.push(['<SecurityDataType extends unknown>', '']);
-    replaces.push(['<SecurityDataType>', '']);
-    log(`Will modify the outputs ${JSON.stringify({
-        addImports,
-        replaces,
-    })}`);
-    await modifyOutput(dstFile, {
-        addImports,
-        replaces,
-    });
-    return dstFile;
-};
-const modifyOutput = async (path, cmd) => {
-    let content = await fs.readFile(path).then((r) => r.toString());
-    if (cmd.addImports.length) {
-        content = cmd.addImports.join('\n') + '\n' + content;
-    }
-    cmd.replaces.forEach(([from, to]) => {
-        content = content.replaceAll(from, to);
-    });
-    await fs.writeFile(path, content);
-};
-const getThisScriptDirname = () => {
-    // Might be problem in ESM mode
-    return __dirname;
-};
-const capitalize = (str) => {
-    return str[0].toUpperCase() + str.substring(1);
-};
-
-const removeGenericTypes = (code) => {
-    const regex = /export (interface|enum|type) [^<]* \{\n(.*\n)*?}/mg;
-    const matches = code.matchAll(regex);
-    const types = Array.from(matches).map(m => m[0]);
-    return types.join('\n');
-};
-const generateSchemas = (inputFile, outputFile) => {
-    const code = fs$1.readFileSync(inputFile).toString();
-    const { getZodSchemasFile } = generate({
-        sourceText: removeGenericTypes(code),
-    });
-    const fileName = Path.basename(inputFile);
-    let f = getZodSchemasFile(`./${fileName.replace('.ts', '')}`);
-    // Backend sends nulls not undefined - should be properly set in the OpenAPI TS types generation!
-    f = f.replaceAll('.optional()', '.nullable()');
-    fs$1.writeFileSync(outputFile, f);
-};
-
-const generateApiClient = async ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }, log = console.log) => {
-    if (!srcSpec)
-        throw new Error(`Url or path ('srcSpec' not specified`);
-    if (!apiName)
-        throw new Error('apiName not specified');
-    if (!dstDir)
-        throw new Error('dstDir not specified');
-    if (!env)
-        throw new Error('env not specified');
-    const dir = Path.resolve(dstDir, apiName);
-    if (!fs$1.existsSync(dir)) {
-        log(`Creating dir ${dir}`);
-        fs$1.mkdirSync(dir, {
-            recursive: true,
-        });
-    }
-    const clientDir = Path.resolve(dir, 'client');
-    const specPath = await getSpecPath(srcSpec, dir, log);
-    const clientFile = await generateOpenApiModel({
-        name: apiName,
-        input: specPath,
-        outputDir: clientDir,
-        isNode: env === 'node',
-        responseWrapper,
-    }, log);
-    if (zodSchemas === false)
-        return;
-    log('Generating Zod schemas');
-    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'));
-};
-const getSpecPath = async (urlOrPath, dir, log) => {
-    if (!urlOrPath.startsWith('http')) {
-        if (!fs$1.existsSync(urlOrPath))
-            throw new Error(`Spec file ${urlOrPath} does not exists`);
-        return urlOrPath;
-    }
-    const specPath = Path.resolve(dir, `spec.json`);
-    log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
-    await downloadSpec(specPath, urlOrPath);
-    return specPath;
-};
-
-export { generateApiClient };
+export { g as generateApiClient } from './generateApiClient-BSM0HlFv.js';
+import 'path';
+import 'fs';
+import 'axios';
+import 'fs/promises';
+import 'swagger-typescript-api';
+import 'ts-to-zod';

package/dist/index.js

@@ -1,155 +1,13 @@
 'use strict';
 
-var Path = require('path');
-var fs$1 = require('fs');
-var axios = require('axios');
-var fs = require('fs/promises');
-var swaggerTypescriptApi = require('swagger-typescript-api');
-var tsToZod = require('ts-to-zod');
+var generateApiClient = require('./generateApiClient-DBkHX8se.js');
+require('path');
+require('fs');
+require('axios');
+require('fs/promises');
+require('swagger-typescript-api');
+require('ts-to-zod');
 
-const downloadSpec = async (path, url) => {
-    const res = await axios({
-        url,
-        method: 'GET',
-        responseType: 'arraybuffer',
-    }).catch(err => {
-        throw err.toString();
-    });
-    const content = res.data.toString();
-    await fs.writeFile(path, format(content));
-};
-const format = (content) => JSON.stringify(JSON.parse(content), null, 4);
 
-const generateOpenApiModel = async ({ input, isNode, responseWrapper, name, outputDir }, log) => {
-    log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
-    const specialMapping = isNode
-        ? {
-            File: '{file: Buffer | stream.Readable, name: string}',
-        }
-        : {};
-    const fileName = 'index';
-    const dstFile = Path.join(outputDir, `${fileName}.ts`);
-    await swaggerTypescriptApi.generateApi({
-        name: 'index',
-        output: outputDir,
-        input: input,
-        // modular: true,
-        httpClientType: 'axios',
-        templates: Path.resolve(getThisScriptDirname(), '../templates'),
-        defaultResponseAsSuccess: true,
-        // generateRouteTypes: true,
-        singleHttpClient: true,
-        // extractRequestBody: true,
-        cleanOutput: true,
-        moduleNameFirstTag: true,
-        apiClassName: capitalize(name) + 'Api',
-        // @ts-ignore
-        codeGenConstructs: (struct) => ({
-            // @ts-ignore
-            Keyword: specialMapping,
-        }),
-        // extractRequestParams: true,
-    });
-    const addImports = [];
-    const replaces = [];
-    if (isNode) {
-        addImports.push('import stream from \'node:stream\'');
-    }
-    if (responseWrapper) {
-        log(`Will use response wrapper '${JSON.stringify(responseWrapper)}'`);
-        if (responseWrapper.import)
-            addImports.push(responseWrapper.import);
-        replaces.push(['Promise', responseWrapper.symbol]);
-    }
-    // Remove unnecessary generics
-    replaces.push(['<SecurityDataType extends unknown>', '']);
-    replaces.push(['<SecurityDataType>', '']);
-    log(`Will modify the outputs ${JSON.stringify({
-        addImports,
-        replaces,
-    })}`);
-    await modifyOutput(dstFile, {
-        addImports,
-        replaces,
-    });
-    return dstFile;
-};
-const modifyOutput = async (path, cmd) => {
-    let content = await fs.readFile(path).then((r) => r.toString());
-    if (cmd.addImports.length) {
-        content = cmd.addImports.join('\n') + '\n' + content;
-    }
-    cmd.replaces.forEach(([from, to]) => {
-        content = content.replaceAll(from, to);
-    });
-    await fs.writeFile(path, content);
-};
-const getThisScriptDirname = () => {
-    // Might be problem in ESM mode
-    return __dirname;
-};
-const capitalize = (str) => {
-    return str[0].toUpperCase() + str.substring(1);
-};
 
-const removeGenericTypes = (code) => {
-    const regex = /export (interface|enum|type) [^<]* \{\n(.*\n)*?}/mg;
-    const matches = code.matchAll(regex);
-    const types = Array.from(matches).map(m => m[0]);
-    return types.join('\n');
-};
-const generateSchemas = (inputFile, outputFile) => {
-    const code = fs$1.readFileSync(inputFile).toString();
-    const { getZodSchemasFile } = tsToZod.generate({
-        sourceText: removeGenericTypes(code),
-    });
-    const fileName = Path.basename(inputFile);
-    let f = getZodSchemasFile(`./${fileName.replace('.ts', '')}`);
-    // Backend sends nulls not undefined - should be properly set in the OpenAPI TS types generation!
-    f = f.replaceAll('.optional()', '.nullable()');
-    fs$1.writeFileSync(outputFile, f);
-};
-
-const generateApiClient = async ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }, log = console.log) => {
-    if (!srcSpec)
-        throw new Error(`Url or path ('srcSpec' not specified`);
-    if (!apiName)
-        throw new Error('apiName not specified');
-    if (!dstDir)
-        throw new Error('dstDir not specified');
-    if (!env)
-        throw new Error('env not specified');
-    const dir = Path.resolve(dstDir, apiName);
-    if (!fs$1.existsSync(dir)) {
-        log(`Creating dir ${dir}`);
-        fs$1.mkdirSync(dir, {
-            recursive: true,
-        });
-    }
-    const clientDir = Path.resolve(dir, 'client');
-    const specPath = await getSpecPath(srcSpec, dir, log);
-    const clientFile = await generateOpenApiModel({
-        name: apiName,
-        input: specPath,
-        outputDir: clientDir,
-        isNode: env === 'node',
-        responseWrapper,
-    }, log);
-    if (zodSchemas === false)
-        return;
-    log('Generating Zod schemas');
-    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'));
-};
-const getSpecPath = async (urlOrPath, dir, log) => {
-    if (!urlOrPath.startsWith('http')) {
-        if (!fs$1.existsSync(urlOrPath))
-            throw new Error(`Spec file ${urlOrPath} does not exists`);
-        return urlOrPath;
-    }
-    const specPath = Path.resolve(dir, `spec.json`);
-    log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
-    await downloadSpec(specPath, urlOrPath);
-    return specPath;
-};
-
-exports.generateApiClient = generateApiClient;
+exports.generateApiClient = generateApiClient.generateApiClient;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@ps-aux/api-client-gen",
-  "version": "0.0.5-rc2",
+  "version": "0.0.6-rc1",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
+  "type": "module",
   "types": "dist/index.d.ts",
   "bin": {
     "gen-api-client": "dist/bin.js"
@@ -10,7 +11,8 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c --watch",
-    "publish": "npm run build && npm publish",
+    "pub": "npm test && npm run build && npm publish",
+    "test": "vitest",
     "tc": "tsc",
     "eh": "foo"
   },
@@ -19,7 +21,10 @@
   "dependencies": {
     "axios": "^1.5.0",
     "cosmiconfig": "^8.3.6",
-    "swagger-typescript-api": "^13.0.3",
-    "ts-to-zod": "^3.2.0"
+    "swagger-typescript-api": "^13.0.23",
+    "ts-to-zod": "^3.15.0"
+  },
+  "devDependencies": {
+    "vitest": "^3.1.1"
   }
 }

package/src/generateApiClient.ts

@@ -1,8 +1,8 @@
 import Path from 'path'
-import fs from 'fs'
+import * as fs from 'fs'
 import { downloadSpec } from './downloadSpec'
 import { generateOpenApiModel } from './generateOpenApiModel'
-import { generateSchemas } from './generateSchemas'
+import { generateSchemas, GenerateSchemasOptions } from './generateSchemas'
 
 export type Params = {
     srcSpec: string, // path or http(s) URL
@@ -13,7 +13,9 @@ export type Params = {
         symbol: string
         import?: string
     },
-    zodSchemas?: boolean
+    zodSchemas?: GenerateSchemasOptions & {
+        enabled?: boolean
+    }
 }
 
 export const generateApiClient = async ({
@@ -51,12 +53,12 @@ export const generateApiClient = async ({
         log,
     )
 
-    if (zodSchemas === false)
+    if (zodSchemas?.enabled === false)
         return
 
 
     log('Generating Zod schemas')
-    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'))
+    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'), zodSchemas)
 }
 
 const getSpecPath = async (urlOrPath: string, dir: string, log: (str: string) => void): Promise<string> => {

package/src/generateSchemas.ts

@@ -1,7 +1,8 @@
 import fs from 'fs'
-import {generate} from 'ts-to-zod'
+import { generate } from 'ts-to-zod'
 import Path from 'path'
 
+// TODO needed?
 const removeGenericTypes = (code: string): string => {
     const regex = /export (interface|enum|type) [^<]* \{\n(.*\n)*?}/mg
     const matches = code.matchAll(regex)
@@ -10,11 +11,19 @@ const removeGenericTypes = (code: string): string => {
     return types.join('\n')
 }
 
-export const generateSchemas = (inputFile: string, outputFile: string) => {
+export type GenerateSchemasOptions = {
+    localDateTimes?: boolean
+}
+
+export const generateSchemas = (inputFile: string, outputFile: string, opts: GenerateSchemasOptions = {}) => {
     const code = fs.readFileSync(inputFile).toString()
 
-    const {getZodSchemasFile} = generate({
+    const { getZodSchemasFile } = generate({
         sourceText: removeGenericTypes(code),
+        customJSDocFormatTypes: {
+            // Custom mapping
+            // 'date-time': 'blablaj' - regex
+        },
     })
 
     const fileName = Path.basename(inputFile)
@@ -23,6 +32,9 @@ export const generateSchemas = (inputFile: string, outputFile: string) => {
 
     // Backend sends nulls not undefined - should be properly set in the OpenAPI TS types generation!
     f = f.replaceAll('.optional()', '.nullable()')
+    if (opts.localDateTimes) {
+        f = f.replaceAll('z.string().datetime()', 'z.string().datetime({local: true})')
+    }
     fs.writeFileSync(outputFile, f)
 
 }

package/test/go.spec.ts

@@ -0,0 +1,16 @@
+import { generateApiClient } from '../src'
+import * as Path from 'path'
+import { test } from 'vitest'
+
+
+test('generate', async () => {
+    await generateApiClient({
+        srcSpec: Path.resolve(__dirname, 'schema.json'),
+        dstDir: Path.resolve(__dirname, 'out'),
+        env: 'browser',
+        apiName: 'test',
+        zodSchemas: {
+            localDateTimes: true,
+        },
+    })
+})

package/test/schema.json

@@ -0,0 +1,118 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Simple API",
+    "description": "A basic API example",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "https://api.example.com/v1",
+      "description": "Main production server"
+    }
+  ],
+  "paths": {
+    "/users": {
+      "get": {
+        "summary": "Get list of users",
+        "responses": {
+          "200": {
+            "description": "Successful response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/User"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "summary": "Create a new user",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/User"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "User created successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/users/{id}": {
+      "get": {
+        "summary": "Get user by ID",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "User": {
+        "type": "object",
+        "required": [
+          "id",
+          "name"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "example": "123"
+          },
+          "name": {
+            "type": "string",
+            "example": "John Doe"
+          },
+          "email": {
+            "type": "string",
+            "format": "email",
+            "example": "john@example.com"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          }
+        }
+      }
+    }
+  }
+}

package/vitest.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+    test: {
+        watch: false,
+        exclude: [],
+    },
+})

package/jest.config.js

@@ -1,17 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-    preset: 'ts-jest/presets/default-esm', // or other ESM presets
-    moduleNameMapper: {
-        '^(\\.{1,2}/.*)\\.js$': '$1',
-    },
-    transform: {
-        // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
-        // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-        '^.+\\.tsx?$': [
-            'ts-jest',
-            {
-                useESM: true,
-            },
-        ],
-    },
-}