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

package/README.md

@@ -10,17 +10,22 @@ npm install -D @ps-aux/api-client-gen
 
 ## CLI
 
-Create api-client-gen.config.json (via [cosmiconfig](https://github.com/cosmiconfig/cosmiconfig?tab=readme-ov-file#usage-for-end-users)):
+Create `api-client-gen.config.ts` or `api-client-gen.config.js` (loaded via [c12](https://github.com/unjs/c12)). `api-client-gen.config.ts` is recommended for the best type safety:
 
-```json
-{
-    "petstore": {
+```ts
+import { defineConfig } from '@ps-aux/api-client-gen'
+
+export default defineConfig({
+    petstore: {
         "srcSpec": "https://petstore3.swagger.io/api/v3/openapi.json",
         "dstDir": "./generated",
         "apiName": "PetstoreApi",
+        "openApiGenerator": {
+            "codegen": {}
+        },
         "zodSchemas": { "enabled": true }
     }
-}
+})
 ```
 
 Run: `npx gen-api-client petstore`
@@ -33,7 +38,10 @@ import { generateApiClient } from '@ps-aux/api-client-gen'
 await generateApiClient({
     srcSpec: 'https://petstore3.swagger.io/api/v3/openapi.json',
     dstDir: './generated',
-    apiName: 'PetstoreApi'
+    apiName: 'PetstoreApi',
+    openApiGenerator: {
+        codegen: {}
+    }
 })
 ```
 

package/dist/bin.cjs

@@ -2,22 +2,90 @@
 'use strict';
 
 var generateApiClient = require('./generateApiClient.cjs');
-var cosmiconfig = require('cosmiconfig');
+var fs = require('node:fs');
+var Path = require('node:path');
+var c12 = require('c12');
 require('path');
 require('fs');
 require('fs/promises');
-require('node:path');
-require('node:fs/promises');
-require('node:fs');
 require('swagger-typescript-api');
 require('node:url');
+require('node:fs/promises');
 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);
+
+const SUPPORTED_CONFIG_EXTENSIONS = ["ts", "js"];
+const getSupportedConfigFiles = (name) => SUPPORTED_CONFIG_EXTENSIONS.map((ext) => `${name}.config.${ext}`);
+const loadConfig = async ({
+  cwd = process.cwd(),
+  name,
+  parseConfig
+}) => {
+  const supportedConfigFiles = getSupportedConfigFiles(name);
+  const presentConfigFiles = supportedConfigFiles.filter(
+    (fileName) => fs__namespace.existsSync(Path.join(cwd, fileName))
+  );
+  if (presentConfigFiles.length === 0) {
+    throw new Error(
+      `No config provided. Expected one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  if (presentConfigFiles.length > 1) {
+    throw new Error(
+      `Multiple config files found. Keep only one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  const conf = await c12.loadConfig({
+    cwd,
+    configFile: presentConfigFiles[0],
+    rcFile: false,
+    packageJson: false,
+    globalRc: false,
+    configFileRequired: true
+  });
+  if (!conf.configFile) {
+    throw new Error(
+      `No config provided. Expected one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  return {
+    config: parseConfig(conf.config, conf.configFile),
+    configFile: conf.configFile
+  };
+};
+
 const profile = process.argv[2];
 if (!profile) throw new Error(`No profile specified`);
-const conf = cosmiconfig.cosmiconfigSync("api-client-gen").search();
-if (!conf) throw new Error(`No config provided`);
-const profileConf = conf.config[profile];
-if (!profileConf)
-  throw new Error(`Profile "${profile}" not present in the configuration`);
-generateApiClient.generateApiClient(profileConf).catch(console.error);
+const main = async () => {
+  const conf = await loadConfig({
+    cwd: process.cwd(),
+    name: "api-client-gen",
+    parseConfig: generateApiClient.parseConfig
+  });
+  const profileConf = conf.config[profile];
+  if (!profileConf)
+    throw new Error(`Profile "${profile}" not present in the configuration`);
+  await generateApiClient.generateApiClientFromConfig(profileConf);
+};
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exitCode = 1;
+});

package/dist/bin.mjs

@@ -1,21 +1,70 @@
 #!/usr/bin/env node
-import { g as generateApiClient } from './generateApiClient.mjs';
-import { cosmiconfigSync } from 'cosmiconfig';
+import { a as generateApiClientFromConfig, p as parseConfig } from './generateApiClient.mjs';
+import * as fs from 'node:fs';
+import Path from 'node:path';
+import { loadConfig as loadConfig$1 } from 'c12';
 import 'path';
 import 'fs';
 import 'fs/promises';
-import 'node:path';
-import 'node:fs/promises';
-import 'node:fs';
 import 'swagger-typescript-api';
 import 'node:url';
+import 'node:fs/promises';
 import 'ts-to-zod';
 
+const SUPPORTED_CONFIG_EXTENSIONS = ["ts", "js"];
+const getSupportedConfigFiles = (name) => SUPPORTED_CONFIG_EXTENSIONS.map((ext) => `${name}.config.${ext}`);
+const loadConfig = async ({
+  cwd = process.cwd(),
+  name,
+  parseConfig
+}) => {
+  const supportedConfigFiles = getSupportedConfigFiles(name);
+  const presentConfigFiles = supportedConfigFiles.filter(
+    (fileName) => fs.existsSync(Path.join(cwd, fileName))
+  );
+  if (presentConfigFiles.length === 0) {
+    throw new Error(
+      `No config provided. Expected one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  if (presentConfigFiles.length > 1) {
+    throw new Error(
+      `Multiple config files found. Keep only one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  const conf = await loadConfig$1({
+    cwd,
+    configFile: presentConfigFiles[0],
+    rcFile: false,
+    packageJson: false,
+    globalRc: false,
+    configFileRequired: true
+  });
+  if (!conf.configFile) {
+    throw new Error(
+      `No config provided. Expected one of: ${supportedConfigFiles.join(", ")}`
+    );
+  }
+  return {
+    config: parseConfig(conf.config, conf.configFile),
+    configFile: conf.configFile
+  };
+};
+
 const profile = process.argv[2];
 if (!profile) throw new Error(`No profile specified`);
-const conf = cosmiconfigSync("api-client-gen").search();
-if (!conf) throw new Error(`No config provided`);
-const profileConf = conf.config[profile];
-if (!profileConf)
-  throw new Error(`Profile "${profile}" not present in the configuration`);
-generateApiClient(profileConf).catch(console.error);
+const main = async () => {
+  const conf = await loadConfig({
+    cwd: process.cwd(),
+    name: "api-client-gen",
+    parseConfig
+  });
+  const profileConf = conf.config[profile];
+  if (!profileConf)
+    throw new Error(`Profile "${profile}" not present in the configuration`);
+  await generateApiClientFromConfig(profileConf);
+};
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exitCode = 1;
+});