@ps-aux/api-client-gen 0.0.3 → 0.0.4

package/dist/bin.esm.js

@@ -0,0 +1,22 @@
+#!/bin/env node
+import { generateApiClient } from './index.esm.js';
+import { cosmiconfigSync } from 'cosmiconfig';
+import 'path';
+import 'fs';
+import 'axios';
+import 'fs/promises';
+import 'swagger-typescript-api';
+import 'ts-to-zod';
+
+const profile = process.argv[2];
+if (!profile)
+    throw new Error(`No profile specified`);
+const conf = cosmiconfigSync('api-client-gen')
+    .search();
+// TODO validate config
+if (!conf)
+    throw new Error(`No config provided`);
+const profileConf = conf.config[profile];
+if (!profile)
+    throw new Error(`Profile ${profile} not present in the configuration`);
+generateApiClient(profileConf).catch(console.error);

package/dist/bin.js

@@ -0,0 +1,24 @@
+#!/bin/env node
+'use strict';
+
+var index = require('./index.js');
+var cosmiconfig = require('cosmiconfig');
+require('path');
+require('fs');
+require('axios');
+require('fs/promises');
+require('swagger-typescript-api');
+require('ts-to-zod');
+
+const profile = process.argv[2];
+if (!profile)
+    throw new Error(`No profile specified`);
+const conf = cosmiconfig.cosmiconfigSync('api-client-gen')
+    .search();
+// TODO validate config
+if (!conf)
+    throw new Error(`No config provided`);
+const profileConf = conf.config[profile];
+if (!profile)
+    throw new Error(`Profile ${profile} not present in the configuration`);
+index.generateApiClient(profileConf).catch(console.error);

package/dist/downloadSpec.d.ts

@@ -1 +1 @@
-export declare const downloadSpec: (path: string, url: string) => Promise<unknown>;
+export declare const downloadSpec: (path: string, url: string) => Promise<void>;

package/dist/generateApiClient.d.ts

@@ -0,0 +1,12 @@
+export type Params = {
+    srcSpec: string;
+    dstDir: string;
+    apiName: string;
+    env: 'browser' | 'node';
+    responseWrapper?: {
+        symbol: string;
+        import?: string;
+    };
+    zodSchemas?: boolean;
+};
+export declare const generateApiClient: ({ dstDir, apiName, env, srcSpec, responseWrapper, zodSchemas, }: Params, log?: (msg: string) => void) => Promise<void>;

package/dist/generateOpenApiModel.d.ts

@@ -1 +1,11 @@
-export declare const generateOpenApiModel: (name: string, input: string, outputDir: string, log: (msg: string) => void, isNode?: boolean) => Promise<void>;
+export type GenerateOpenApiModelCmd = {
+    name: string;
+    input: string;
+    outputDir: string;
+    isNode?: boolean;
+    responseWrapper?: {
+        symbol: string;
+        import?: string;
+    };
+};
+export declare const generateOpenApiModel: ({ input, isNode, responseWrapper, name, outputDir }: GenerateOpenApiModelCmd, log: (msg: string) => void) => Promise<string>;

package/dist/generateSchemas.d.ts

@@ -0,0 +1 @@
+export declare const generateSchemas: (inputFile: string, outputFile: string) => void;

package/dist/index.d.ts

@@ -1,5 +1 @@
-export { generateModel } from "./gen-model";
-declare const _default: {
-    generateModel: ({ dstDir, apiName, env, srcSpec, }: import("./gen-model").Params, log?: (msg: string) => void) => Promise<void>;
-};
-export default _default;
+export { generateApiClient } from "./generateApiClient";

package/dist/index.esm.js

@@ -1,70 +1,34 @@
 import Path from 'path';
-import fs from 'fs';
+import fs$1 from 'fs';
 import axios from 'axios';
+import fs from 'fs/promises';
 import { generateApi } from 'swagger-typescript-api';
-import fs$1 from 'fs/promises';
+import { generate } from 'ts-to-zod';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
-const downloadSpec = (path, url) => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield axios({
+const downloadSpec = async (path, url) => {
+    const res = await axios({
         url,
         method: 'GET',
-        responseType: 'stream'
+        responseType: 'arraybuffer',
     }).catch(err => {
         throw err.toString();
     });
-    const writer = fs.createWriteStream(path);
-    // TODO Format to readable JSON
-    yield res.data.pipe(writer);
-    return new Promise((resolve, reject) => {
-        writer.on('finish', resolve);
-        writer.on('error', err => {
-            reject(err);
-        });
-    });
-});
+    const content = res.data.toString();
+    await fs.writeFile(path, format(content));
+};
+const format = (content) => JSON.stringify(JSON.parse(content), null, 4);
 
-const generateOpenApiModel = (name, input, outputDir, log, isNode = false) => __awaiter(void 0, void 0, void 0, function* () {
+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 dstFile = Path.join(outputDir, name + '.ts');
-    yield generateApi({
-        name,
+    const fileName = 'index';
+    const dstFile = Path.join(outputDir, `${fileName}.ts`);
+    await generateApi({
+        name: 'index',
         output: outputDir,
         input: input,
         // modular: true,
@@ -76,6 +40,7 @@ const generateOpenApiModel = (name, input, outputDir, log, isNode = false) => __
         // extractRequestBody: true,
         cleanOutput: true,
         moduleNameFirstTag: true,
+        apiClassName: capitalize(name) + 'Api',
         // @ts-ignore
         codeGenConstructs: (struct) => ({
             // @ts-ignore
@@ -83,19 +48,67 @@ const generateOpenApiModel = (name, input, outputDir, log, isNode = false) => __
         }),
         // extractRequestParams: true,
     });
+    const addImports = [];
+    const replaces = [];
     if (isNode) {
-        let content = yield fs$1.readFile(dstFile).then((r) => r.toString());
-        // Naive solution
-        content = 'import stream from \'node:stream\'\n' + content;
-        yield fs$1.writeFile(dstFile, content);
+        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 generateModel = ({ dstDir, apiName, env, srcSpec, }, log = console.log) => __awaiter(void 0, void 0, void 0, function* () {
+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)
@@ -105,34 +118,36 @@ const generateModel = ({ dstDir, apiName, env, srcSpec, }, log = console.log) =>
     if (!env)
         throw new Error('env not specified');
     const dir = Path.resolve(dstDir, apiName);
-    if (!fs.existsSync(dir)) {
+    if (!fs$1.existsSync(dir)) {
         log(`Creating dir ${dir}`);
-        fs.mkdirSync(dir, {
+        fs$1.mkdirSync(dir, {
             recursive: true,
         });
     }
     const clientDir = Path.resolve(dir, 'client');
-    const specPath = yield getSpecPath(srcSpec, dir, log);
-    yield generateOpenApiModel(apiName + '-api', specPath, clientDir, log, env === 'node');
-    // TODO does not seem to currently generate all schemas
-    // generateSchemas(
-    //     Path.resolve(modelDir, 'data-contracts.ts'),
-    //     Path.resolve(dir, 'schemas.ts')
-    // )
-});
-const getSpecPath = (urlOrPath, dir, log) => __awaiter(void 0, void 0, void 0, function* () {
+    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.existsSync(urlOrPath))
+        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}`);
-    yield downloadSpec(specPath, urlOrPath);
+    await downloadSpec(specPath, urlOrPath);
     return specPath;
-});
-
-// Bcs of mixing for ESM and CommonJS - todo fix somehow
-var index = { generateModel };
+};
 
-export { index as default, generateModel };
+export { generateApiClient };

package/dist/index.js

@@ -1,143 +1,155 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('path'), require('fs'), require('axios'), require('swagger-typescript-api'), require('fs/promises')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'path', 'fs', 'axios', 'swagger-typescript-api', 'fs/promises'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.MyLibrary = {}, global.Path, global.fs, global.axios, global.swaggerTypescriptApi, global.fs$1));
-})(this, (function (exports, Path, fs, axios, swaggerTypescriptApi, fs$1) { 'use strict';
+'use strict';
 
-    /******************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-    /* global Reflect, Promise, SuppressedError, Symbol */
-
-
-    function __awaiter(thisArg, _arguments, P, generator) {
-        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-        return new (P || (P = Promise))(function (resolve, reject) {
-            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-
-    typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-        var e = new Error(message);
-        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-    };
+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');
 
-    const downloadSpec = (path, url) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield axios({
-            url,
-            method: 'GET',
-            responseType: 'stream'
-        }).catch(err => {
-            throw err.toString();
-        });
-        const writer = fs.createWriteStream(path);
-        // TODO Format to readable JSON
-        yield res.data.pipe(writer);
-        return new Promise((resolve, reject) => {
-            writer.on('finish', resolve);
-            writer.on('error', err => {
-                reject(err);
-            });
-        });
+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 = (name, input, outputDir, log, isNode = false) => __awaiter(void 0, void 0, void 0, function* () {
-        log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
-        const specialMapping = isNode
-            ? {
-                File: '{file: Buffer | stream.Readable, name: string}',
-            }
-            : {};
-        const dstFile = Path.join(outputDir, name + '.ts');
-        yield swaggerTypescriptApi.generateApi({
-            name,
-            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,
-            // @ts-ignore
-            codeGenConstructs: (struct) => ({
-                // @ts-ignore
-                Keyword: specialMapping,
-            }),
-            // extractRequestParams: true,
-        });
-        if (isNode) {
-            let content = yield fs$1.readFile(dstFile).then((r) => r.toString());
-            // Naive solution
-            content = 'import stream from \'node:stream\'\n' + content;
-            yield fs$1.writeFile(dstFile, content);
+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 getThisScriptDirname = () => {
-        // Might be problem in ESM mode
-        return __dirname;
-    };
-
-    const generateModel = ({ dstDir, apiName, env, srcSpec, }, log = console.log) => __awaiter(void 0, void 0, void 0, function* () {
-        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 = yield getSpecPath(srcSpec, dir, log);
-        yield generateOpenApiModel(apiName + '-api', specPath, clientDir, log, env === 'node');
-        // TODO does not seem to currently generate all schemas
-        // generateSchemas(
-        //     Path.resolve(modelDir, 'data-contracts.ts'),
-        //     Path.resolve(dir, 'schemas.ts')
-        // )
+    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,
     });
-    const getSpecPath = (urlOrPath, dir, log) => __awaiter(void 0, void 0, void 0, function* () {
-        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}`);
-        yield downloadSpec(specPath, urlOrPath);
-        return specPath;
+    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);
+};
 
-    // Bcs of mixing for ESM and CommonJS - todo fix somehow
-    var index = { generateModel };
-
-    exports.default = index;
-    exports.generateModel = generateModel;
+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);
+};
 
-    Object.defineProperty(exports, '__esModule', { value: true });
+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;

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@ps-aux/api-client-gen",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "dist/index.js",
+  "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "gen-api-client": "dist/go.js"
+    "gen-api-client": "dist/bin.js"
   },
   "scripts": {
     "build": "rollup -c",
+    "dev": "rollup -c --watch",
     "tc": "tsc",
     "eh": "foo"
   },
@@ -16,10 +18,7 @@
   "dependencies": {
     "axios": "^1.5.0",
     "cosmiconfig": "^8.3.6",
-    "swagger-typescript-api": "^13.0.3"
-  },
-  "devDependencies": {
-    "rollup": "^4.1.4",
-    "rollup-plugin-typescript2": "^0.36.0"
+    "swagger-typescript-api": "^13.0.3",
+    "ts-to-zod": "^3.2.0"
   }
 }

package/rollup.config.mjs

@@ -1,26 +1,40 @@
 import typescript from 'rollup-plugin-typescript2'
+import resolve from '@rollup/plugin-node-resolve'
+
+const external = ['axios', 'cosmiconfig', 'form-data', 'swagger-typescript-api', 'ts-to-zod']
 
 export default [{
-    input: 'src/index.ts',
+    input:{
+        index: 'src/index.ts',
+        bin: 'src/go.ts'
+    },
     output: [
         {
-            file: 'dist/index.js',
-            format: 'umd',
-            name: 'MyLibrary',
+            // file: 'dist/index.js',
+            dir: 'dist',
+            entryFileNames: '[name].js',
+            format: 'cjs',
         },
         {
-            file: 'dist/index.esm.js',
+            // file: 'dist/index.esm.js',
+            dir: 'dist',
+            entryFileNames: '[name].esm.js',
             format: 'es',
         },
     ],
-    plugins: [typescript()],
-}, {
-    input: 'src/go.ts',
-    output: [
-        {
-            file: 'dist/go.js',
-            format: 'cjs',
-        }],
-
-    plugins: [typescript()],
-}]
+    plugins: [typescript(), resolve()],
+    external,
+},
+//     {
+//     input: 'src/go.ts',
+//     output: [
+//         {
+//             file: 'dist/go.js',
+//             format: 'cjs',
+//         }],
+//
+//     plugins: [typescript(),
+//         // resolve(), commonJs(), json()
+//     ],
+// }
+]

package/src/downloadSpec.ts

@@ -1,24 +1,22 @@
 import axios from 'axios'
-import fs from 'fs'
+import fs from 'fs/promises'
 
 export const downloadSpec = async (path: string, url: string) => {
     const res = await axios({
         url,
         method: 'GET',
-        responseType: 'stream'
+        responseType: 'arraybuffer',
     }).catch(err => {
         throw err.toString()
     })
 
-    const writer = fs.createWriteStream(path)
+    const content = res.data.toString()
 
-    // TODO Format to readable JSON
-    await res.data.pipe(writer)
-
-    return new Promise((resolve, reject) => {
-        writer.on('finish', resolve)
-        writer.on('error', err => {
-            reject(err)
-        })
-    })
+    await fs.writeFile(path, format(content))
 }
+
+const format = (content: string): string =>
+    JSON.stringify(
+        JSON.parse(content), null, 4,
+    )
+

package/src/{gen-model.ts → generateApiClient.ts}

@@ -2,20 +2,28 @@ import Path from 'path'
 import fs from 'fs'
 import { downloadSpec } from './downloadSpec'
 import { generateOpenApiModel } from './generateOpenApiModel'
+import { generateSchemas } from './generateSchemas'
 
 export type Params = {
     srcSpec: string, // path or http(s) URL
     dstDir: string
     apiName: string
     env: 'browser' | 'node'
+    responseWrapper?: {
+        symbol: string
+        import?: string
+    },
+    zodSchemas?: boolean
 }
 
-export const generateModel = async ({
-                                        dstDir,
-                                        apiName,
-                                        env,
-                                        srcSpec,
-                                    }: Params, log: (msg: string) => void = console.log): Promise<void> => {
+export const generateApiClient = async ({
+                                            dstDir,
+                                            apiName,
+                                            env,
+                                            srcSpec,
+                                            responseWrapper,
+                                            zodSchemas,
+                                        }: Params, log: (msg: string) => void = console.log): Promise<void> => {
     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')
@@ -32,19 +40,23 @@ export const generateModel = async ({
 
     const specPath = await getSpecPath(srcSpec, dir, log)
 
-    await generateOpenApiModel(
-        apiName + '-api',
-        specPath,
-        clientDir,
+    const clientFile = await generateOpenApiModel(
+        {
+            name: apiName,
+            input: specPath,
+            outputDir: clientDir,
+            isNode: env === 'node',
+            responseWrapper,
+        },
         log,
-        env === 'node',
     )
 
-    // TODO does not seem to currently generate all schemas
-    // generateSchemas(
-    //     Path.resolve(modelDir, 'data-contracts.ts'),
-    //     Path.resolve(dir, 'schemas.ts')
-    // )
+    if (zodSchemas === false)
+        return
+
+
+    log('Generating Zod schemas')
+    generateSchemas(Path.resolve(dir, clientFile), Path.resolve(dir, './zod.ts'))
 }
 
 const getSpecPath = async (urlOrPath: string, dir: string, log: (str: string) => void): Promise<string> => {

package/src/generateOpenApiModel.ts

@@ -2,13 +2,20 @@ import { generateApi } from 'swagger-typescript-api'
 import Path from 'path'
 import fs from 'fs/promises'
 
-export const generateOpenApiModel = async (
+export type GenerateOpenApiModelCmd = {
     name: string,
     input: string,
     outputDir: string,
-    log: (msg: string) => void,
-    isNode = false,
-): Promise<void> => {
+    isNode?: boolean
+    responseWrapper?: {
+        symbol: string
+        import?: string
+    },
+}
+
+export const generateOpenApiModel = async ({ input, isNode, responseWrapper, name, outputDir }: GenerateOpenApiModelCmd,
+                                           log: (msg: string) => void,
+): Promise<string> => {
 
     log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`)
     const specialMapping = isNode
@@ -17,10 +24,11 @@ export const generateOpenApiModel = async (
         }
         : {}
 
-    const dstFile = Path.join(outputDir, name + '.ts')
+    const fileName = 'index'
+    const dstFile = Path.join(outputDir,  `${fileName}.ts`)
 
     await generateApi({
-        name,
+        name: 'index',
         output: outputDir,
         input: input,
         // modular: true,
@@ -32,6 +40,7 @@ export const generateOpenApiModel = async (
         // extractRequestBody: true,
         cleanOutput: true,
         moduleNameFirstTag: true,
+        apiClassName: capitalize(name) + 'Api',
         // @ts-ignore
         codeGenConstructs: (struct) => ({
             // @ts-ignore
@@ -40,16 +49,66 @@ export const generateOpenApiModel = async (
         // extractRequestParams: true,
     })
 
+    const addImports: string[] = []
+    const replaces: [string, string][] = []
+
     if (isNode) {
-        let content = await fs.readFile(dstFile).then((r) => r.toString())
-        // Naive solution
-        content = 'import stream from \'node:stream\'\n' + content
+        addImports.push('import stream from \'node:stream\'')
+    }
 
-        await fs.writeFile(dstFile, content)
+
+    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: string, cmd: {
+    addImports: string[]
+    replaces: [string, string][]
+}) => {
+
+
+    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 = (): string => {
     // Might be problem in ESM mode
     return __dirname
 }
+
+
+const capitalize = (str: string): string => {
+    return str[0].toUpperCase() + str.substring(1)
+}

package/src/generateSchemas.ts

@@ -0,0 +1,28 @@
+import fs from 'fs'
+import {generate} from 'ts-to-zod'
+import Path from 'path'
+
+const removeGenericTypes = (code: string): string => {
+    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')
+}
+
+export const generateSchemas = (inputFile: string, outputFile: string) => {
+    const code = fs.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.writeFileSync(outputFile, f)
+
+}

package/src/go.ts

@@ -1,10 +1,7 @@
 #!/bin/env node
-import { generateModel } from './gen-model'
+import { generateApiClient } from './generateApiClient'
 import { cosmiconfigSync } from 'cosmiconfig'
 
-
-const arg = process.argv
-
 const profile = process.argv[2]
 
 if (!profile)
@@ -23,4 +20,4 @@ const profileConf = conf.config[profile]
 if (!profile)
     throw new Error(`Profile ${profile} not present in the configuration`)
 
-generateModel(profileConf).catch(console.error)
+generateApiClient(profileConf).catch(console.error)

package/src/index.ts

@@ -1,8 +1,3 @@
-import { generateModel } from "./gen-model";
-
-export { generateModel } from "./gen-model";
-
-// Bcs of mixing for ESM and CommonJS - todo fix somehow
-export default { generateModel };
+export { generateApiClient } from "./generateApiClient";
 
 

package/templates/http-client.eta

@@ -1,5 +1,3 @@
-// Use this file also as a symlink for http-client.eta file
-
 export type ContentType = {}
 
 export type RequestParams = {
@@ -14,14 +12,13 @@ export const ContentType = {
 export type Request = {
     path: string
     method: 'GET' | 'POST' | 'PUT' | 'DELETE'
-    format?: 'json'
+    format?: 'json' | 'document'
     query?: any
     body?: any
     type?: string
     secure?: boolean
-    fileDownload?: boolean
 }
 
-export type HttpClient<Any = any> = {
+export type HttpClient = {
     request: <Data, A = any>(req: Request) => Promise<Data>
 }

package/dist/foo.d.ts

@@ -1 +0,0 @@
-export declare const foo = "123";

package/dist/gen-model.d.ts

@@ -1,7 +0,0 @@
-export type Params = {
-    srcSpec: string;
-    dstDir: string;
-    apiName: string;
-    env: 'browser' | 'node';
-};
-export declare const generateModel: ({ dstDir, apiName, env, srcSpec, }: Params, log?: (msg: string) => void) => Promise<void>;

package/dist/go

@@ -1,4 +0,0 @@
-#!/bin/env bash
-
-
-echo "gogo"

package/dist/go.js

@@ -1,151 +0,0 @@
-#!/bin/env node
-'use strict';
-
-var Path = require('path');
-var fs = require('fs');
-var axios = require('axios');
-var swaggerTypescriptApi = require('swagger-typescript-api');
-var fs$1 = require('fs/promises');
-var cosmiconfig = require('cosmiconfig');
-
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
-const downloadSpec = (path, url) => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield axios({
-        url,
-        method: 'GET',
-        responseType: 'stream'
-    }).catch(err => {
-        throw err.toString();
-    });
-    const writer = fs.createWriteStream(path);
-    // TODO Format to readable JSON
-    yield res.data.pipe(writer);
-    return new Promise((resolve, reject) => {
-        writer.on('finish', resolve);
-        writer.on('error', err => {
-            reject(err);
-        });
-    });
-});
-
-const generateOpenApiModel = (name, input, outputDir, log, isNode = false) => __awaiter(void 0, void 0, void 0, function* () {
-    log(`Will generate API client name=${name} to ${outputDir}, node=${isNode}`);
-    const specialMapping = isNode
-        ? {
-            File: '{file: Buffer | stream.Readable, name: string}',
-        }
-        : {};
-    const dstFile = Path.join(outputDir, name + '.ts');
-    yield swaggerTypescriptApi.generateApi({
-        name,
-        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,
-        // @ts-ignore
-        codeGenConstructs: (struct) => ({
-            // @ts-ignore
-            Keyword: specialMapping,
-        }),
-        // extractRequestParams: true,
-    });
-    if (isNode) {
-        let content = yield fs$1.readFile(dstFile).then((r) => r.toString());
-        // Naive solution
-        content = 'import stream from \'node:stream\'\n' + content;
-        yield fs$1.writeFile(dstFile, content);
-    }
-});
-const getThisScriptDirname = () => {
-    // Might be problem in ESM mode
-    return __dirname;
-};
-
-const generateModel = ({ dstDir, apiName, env, srcSpec, }, log = console.log) => __awaiter(void 0, void 0, void 0, function* () {
-    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 = yield getSpecPath(srcSpec, dir, log);
-    yield generateOpenApiModel(apiName + '-api', specPath, clientDir, log, env === 'node');
-    // TODO does not seem to currently generate all schemas
-    // generateSchemas(
-    //     Path.resolve(modelDir, 'data-contracts.ts'),
-    //     Path.resolve(dir, 'schemas.ts')
-    // )
-});
-const getSpecPath = (urlOrPath, dir, log) => __awaiter(void 0, void 0, void 0, function* () {
-    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}`);
-    yield downloadSpec(specPath, urlOrPath);
-    return specPath;
-});
-
-process.argv;
-const profile = process.argv[2];
-if (!profile)
-    throw new Error(`No profile specified`);
-const conf = cosmiconfig.cosmiconfigSync('api-client-gen')
-    .search();
-// TODO validate config
-if (!conf)
-    throw new Error(`No config provided`);
-const profileConf = conf.config[profile];
-if (!profile)
-    throw new Error(`Profile ${profile} not present in the configuration`);
-generateModel(profileConf).catch(console.error);