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

package/dist/index.mjs

@@ -2,9 +2,9 @@ export { g as generateApiClient } from './generateApiClient.mjs';
 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 'node:path';
+import 'node:fs';
 import 'ts-to-zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/api-client-gen",
-  "version": "0.7.0-rc.2",
+  "version": "0.7.0-rc.3",
   "main": "dist/index.cjs",
   "type": "module",
   "bin": {
@@ -11,9 +11,10 @@
     "clean": "rm -rf dist",
     "dev": "rollup -c --watch",
     "lint": "eslint",
-    "pub": "npm test && npm run build && npm publish",
+    "pack:tarball": "npm run build && npm pack",
+    "prepublishOnly": "echo \"Publishing disabled for this repo. Use CI workflow.\" && exit 1",
     "test": "npm run test:generation && npm run test:generated-code && npm run tc:after-gen",
-    "test:generation": "vitest run test/gen-open-api/swagger-ts-api/generateApiModel.spec.ts test/gen-open-api/v-next/generateApiModel.spec.ts test/gen-open-api/v-next/generateFromIr.spec.ts test/gen-open-api/v-next/integration.spec.ts",
+    "test:generation": "vitest run test/generateApiClient.spec.ts test/gen-open-api/*/generate*.spec.ts test/gen-open-api/*/integration.spec.ts",
     "test:generated-code": "vitest run test/gen-open-api/swagger-ts-api/contract.spec.ts test/gen-open-api/v-next/contract.spec.ts",
     "tc": "echo 'No typecheck'",
     "tc:after-gen": "tsc",

package/templates/http-client.eta

@@ -28,8 +28,17 @@ export type Request = {
     requestContentType?: RequestContentType
 }
 
+export type HttpResponse<Data> = {
+    body: Data
+    headers: Record<string, string | string[]>
+    status: number
+}
+
 export type QuerySerializer = (params: QueryParams) => string
 
 export type HttpClient<RequestParams = never> = {
-    request: <Data>(req: Request, params?: RequestParams) => Promise<Data>
+    request: <Data>(
+        req: Request,
+        params?: RequestParams
+    ) => Promise<HttpResponse<Data>>
 }

package/templates/procedure-call.ejs

@@ -85,7 +85,7 @@ const routeDocLines = routeDocs.lines ? `${routeDocs.lines}\n` : '';
 
 const describeReturnType = () => {
     if (!config.toJS) return "";
-    return `Promise<HttpResponse<${type}, ${errorType}>>`
+    return `Promise<${type}>`
 }
 
 %>
@@ -103,4 +103,4 @@ const describeReturnType = () => {
         <%~ bodyTmpl ? `body: ${bodyTmpl},` : '' %>
         <%~ bodyContentKindTmpl ? `requestContentType: ${bodyContentKindTmpl},` : '' %>
         <%~ responseFormatTmpl ? `format: ${responseFormatTmpl},` : '' %>
-    }, params)<%~ route.namespace ? ',' : '' %>
+    }, params).then(res => res.body)<%~ route.namespace ? ',' : '' %>