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

package/dist/index.cjs

@@ -1,17 +1,17 @@
 'use strict';
 
-var generateApiClient = require('./generateApiClient.cjs');
+var generate = require('./generate.cjs');
+require('node:fs');
+require('node:path');
+require('c12');
 require('path');
 require('fs');
-require('fs/promises');
-require('node:path');
+require('ts-to-zod');
+require('node:fs/promises');
 require('swagger-typescript-api');
 require('node:url');
-require('node:fs/promises');
-require('node:fs');
-require('ts-to-zod');
 
 
 
-exports.defineConfig = generateApiClient.defineConfig;
-exports.generateApiClient = generateApiClient.generateApiClient;
+exports.defineConfig = generate.defineConfig;
+exports.generateApiClient = generate.generateApiClient;

package/dist/index.d.cts

@@ -2068,16 +2068,26 @@ interface ZodReadonly<T extends SomeType = $ZodType> extends _ZodType<$ZodReadon
     unwrap(): T;
 }
 declare const ZodReadonly: $constructor<ZodReadonly>;
+interface ZodCustom<O = unknown, I = unknown> extends _ZodType<$ZodCustomInternals<O, I>>, $ZodCustom<O, I> {
+    "~standard": ZodStandardSchemaWithJSON<this>;
+}
+declare const ZodCustom: $constructor<ZodCustom>;
 
 declare const profileConfigSchema: ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2108,27 +2118,43 @@ declare const profileConfigSchema: ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>;
 declare const configSchema: ZodRecord<ZodString, ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2159,17 +2185,27 @@ declare const configSchema: ZodRecord<ZodString, ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>>;
 type ProfileConfigInput = input<typeof profileConfigSchema>;
 type ProfileConfig = output<typeof profileConfigSchema>;

package/dist/index.d.mts

@@ -2068,16 +2068,26 @@ interface ZodReadonly<T extends SomeType = $ZodType> extends _ZodType<$ZodReadon
     unwrap(): T;
 }
 declare const ZodReadonly: $constructor<ZodReadonly>;
+interface ZodCustom<O = unknown, I = unknown> extends _ZodType<$ZodCustomInternals<O, I>>, $ZodCustom<O, I> {
+    "~standard": ZodStandardSchemaWithJSON<this>;
+}
+declare const ZodCustom: $constructor<ZodCustom>;
 
 declare const profileConfigSchema: ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2108,27 +2118,43 @@ declare const profileConfigSchema: ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>;
 declare const configSchema: ZodRecord<ZodString, ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2159,17 +2185,27 @@ declare const configSchema: ZodRecord<ZodString, ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>>;
 type ProfileConfigInput = input<typeof profileConfigSchema>;
 type ProfileConfig = output<typeof profileConfigSchema>;

package/dist/index.d.ts

@@ -2068,16 +2068,26 @@ interface ZodReadonly<T extends SomeType = $ZodType> extends _ZodType<$ZodReadon
     unwrap(): T;
 }
 declare const ZodReadonly: $constructor<ZodReadonly>;
+interface ZodCustom<O = unknown, I = unknown> extends _ZodType<$ZodCustomInternals<O, I>>, $ZodCustom<O, I> {
+    "~standard": ZodStandardSchemaWithJSON<this>;
+}
+declare const ZodCustom: $constructor<ZodCustom>;
 
 declare const profileConfigSchema: ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2108,27 +2118,43 @@ declare const profileConfigSchema: ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>;
 declare const configSchema: ZodRecord<ZodString, ZodObject<{
     srcSpec: ZodString;
-    dstDir: ZodString;
+    outputDir: ZodString;
     apiName: ZodString;
-    openApiGenerator: ZodUnion<readonly [ZodObject<{
+    openApiGenerator: ZodPrefault<ZodUnion<readonly [ZodObject<{
         selection: ZodOptional<ZodObject<{
             ignoreOperationsWithTags: ZodDefault<ZodArray<ZodString>>;
             allSchemas: ZodDefault<ZodBoolean>;
         }, $strict>>;
+        httpClient: ZodPrefault<ZodObject<{
+            type: ZodDefault<ZodEnum<{
+                promise: "promise";
+                rxjs: "rxjs";
+            }>>;
+        }, $strict>>;
         codegen: ZodPrefault<ZodObject<{
             unwrap: ZodDefault<ZodBoolean>;
             withRequestParams: ZodDefault<ZodBoolean>;
@@ -2159,17 +2185,27 @@ declare const configSchema: ZodRecord<ZodString, ZodObject<{
     }, $strict>, ZodObject<{
         legacy: ZodObject<{
             ignoreOperationsWithTags: ZodOptional<ZodArray<ZodString>>;
+            responseWrapper: ZodOptional<ZodObject<{
+                symbol: ZodString;
+                import: ZodOptional<ZodString>;
+                unwrapExpr: ZodOptional<ZodString>;
+            }, $strict>>;
         }, $strict>;
-    }, $strict>]>;
-    responseWrapper: ZodOptional<ZodObject<{
-        symbol: ZodString;
-        import: ZodOptional<ZodString>;
-        unwrapExpr: ZodOptional<ZodString>;
-    }, $strict>>;
+    }, $strict>]>>;
     zodSchemas: ZodOptional<ZodObject<{
         enabled: ZodOptional<ZodBoolean>;
         localDateTimes: ZodOptional<ZodBoolean>;
     }, $strict>>;
+    files: ZodOptional<ZodObject<{
+        transformFileName: ZodOptional<ZodCustom<(req: {
+            name: string;
+            ext: string;
+        }) => string, (req: {
+            name: string;
+            ext: string;
+        }) => string>>;
+        generatedFileSuffix: ZodOptional<ZodNullable<ZodString>>;
+    }, $strict>>;
 }, $strict>>;
 type ProfileConfigInput = input<typeof profileConfigSchema>;
 type ProfileConfig = output<typeof profileConfigSchema>;

package/dist/index.mjs

@@ -1,10 +1,10 @@
-export { d as defineConfig, g as generateApiClient } from './generateApiClient.mjs';
+export { d as defineConfig, g as generateApiClient } from './generate.mjs';
+import 'node:fs';
+import 'node:path';
+import 'c12';
 import 'path';
 import 'fs';
-import 'fs/promises';
-import 'node:path';
+import 'ts-to-zod';
+import 'node:fs/promises';
 import 'swagger-typescript-api';
 import 'node:url';
-import 'node:fs/promises';
-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.5",
+  "version": "0.7.0-rc.7",
   "main": "dist/index.cjs",
   "type": "module",
   "bin": {
@@ -13,8 +13,8 @@
     "lint": "eslint",
     "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 --project generation",
+    "test": "npm run test:main && npm run test:generated-code && npm run tc:after-gen",
+    "test:main": "vitest run --project main",
     "test:generated-code": "vitest run --project generated-code",
     "tc": "echo 'No typecheck'",
     "tc:after-gen": "tsc",
@@ -29,6 +29,7 @@
     "prettier": "^3.8.1",
     "swagger-typescript-api": "13.0.23",
     "ts-to-zod": "5.1.0",
+    "yaml": "^2.8.4",
     "zod": "^4.3.6"
   },
   "devDependencies": {

package/templates/{http-client.eta → legacy/http-client.eta}

@@ -18,14 +18,14 @@ export type QueryValue =
 
 export type QueryParams = Record<string, QueryValue>
 
-export type Request = {
+export type HttpRequest = {
     path: string
     method: 'GET' | 'POST' | 'PUT' | 'DELETE'
-    format?: 'json' | 'document'
+    responseFormat?: 'json' | 'document'
     headers?: Record<string, string>
     query?: QueryParams
     body?: any
-    requestContentType?: RequestContentType
+    contentType?: RequestContentType
 }
 
 export type HttpResponse<Data> = {
@@ -38,7 +38,7 @@ export type QuerySerializer = (params: QueryParams) => string
 
 export type HttpClient<RequestParams = never> = {
     request: <Data>(
-        req: Request,
+        req: HttpRequest,
         params?: RequestParams
     ) => Promise<HttpResponse<Data>>
 }

package/templates/{procedure-call.ejs → legacy/procedure-call.ejs}

@@ -42,14 +42,14 @@ const wrapperArgs = _
     .map(argToTmpl)
     .join(', ')
 
-// Request["requestContentType"]
+// HttpRequest["contentType"]
 const requestContentKind = {
     "JSON": '"application/json"',
     "URL_ENCODED": '"application/x-www-form-urlencoded"',
     "FORM_DATA": '"multipart/form-data"',
     "TEXT": '"text/plain"',
 }
-// RequestParams["format"]
+// HttpRequest["responseFormat"]
 const responseContentKind = {
     "JSON": '"json"',
     "IMAGE": '"blob"',
@@ -101,6 +101,6 @@ const describeReturnType = () => {
         method: '<%~ _.upperCase(method) %>',
         <%~ queryTmpl ? `query: ${queryTmpl},` : '' %>
         <%~ bodyTmpl ? `body: ${bodyTmpl},` : '' %>
-        <%~ bodyContentKindTmpl ? `requestContentType: ${bodyContentKindTmpl},` : '' %>
-        <%~ responseFormatTmpl ? `format: ${responseFormatTmpl},` : '' %>
+        <%~ bodyContentKindTmpl ? `contentType: ${bodyContentKindTmpl},` : '' %>
+        <%~ responseFormatTmpl ? `responseFormat: ${responseFormatTmpl},` : '' %>
     }, params).then(res => res.body)<%~ route.namespace ? ',' : '' %>