@rexeus/typeweaver-clients 0.0.2 → 0.0.4

package/dist/lib/ApiClient.ts

@@ -1,16 +1,25 @@
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ *
+ * @generated by @rexeus/typeweaver
+ */
+
+import axios, { AxiosError } from "axios";
 import type {
-  IHttpQuery,
-  IHttpParam,
   IHttpHeader,
+  IHttpParam,
+  IHttpQuery,
   IHttpResponse,
 } from "@rexeus/typeweaver-core";
 import { RequestCommand } from "./RequestCommand";
-import axios, {
-  AxiosError,
-  type AxiosInstance,
-  type AxiosResponse,
-} from "axios";
-import Case from "case";
+import type { ProcessResponseOptions } from "./RequestCommand";
+import type { AxiosHeaderValue, AxiosInstance, AxiosResponse } from "axios";
+
+/**
+ * Configuration options for handling unknown responses.
+ */
+export type UnknownResponseHandling = "throw" | "passthrough";
 
 /**
  * Configuration options for ApiClient initialization.
@@ -20,6 +29,10 @@ export type ApiClientProps = {
   axiosInstance?: AxiosInstance;
   /** Base URL for API requests. If not provided, must be set in axiosInstance */
   baseUrl?: string;
+  /** How to handle unknown responses. Defaults to "throw" */
+  unknownResponseHandling?: UnknownResponseHandling;
+  /** Predicate to determine if a status code represents success. Defaults to 2xx status codes */
+  isSuccessStatusCode?: (statusCode: number) => boolean;
 };
 
 /**
@@ -37,6 +50,10 @@ export abstract class ApiClient {
   public readonly axiosInstance: AxiosInstance;
   /** The base URL for all API requests */
   public readonly baseUrl: string;
+  /** How to handle unknown responses */
+  public readonly unknownResponseHandling: UnknownResponseHandling;
+  /** Predicate to determine if a status code represents success */
+  public readonly isSuccessStatusCode: (statusCode: number) => boolean;
 
   /**
    * Creates a new ApiClient instance.
@@ -53,6 +70,24 @@ export abstract class ApiClient {
         "Base URL must be provided either in axios instance or in constructor"
       );
     }
+
+    this.unknownResponseHandling = props.unknownResponseHandling ?? "throw";
+    this.isSuccessStatusCode =
+      props.isSuccessStatusCode ??
+      ((statusCode: number) => statusCode >= 200 && statusCode < 300);
+  }
+
+  /**
+   * Gets the process response options for this client instance.
+   *
+   * @returns The configuration options for processing responses
+   * @protected
+   */
+  protected get processResponseOptions(): ProcessResponseOptions {
+    return {
+      unknownResponseHandling: this.unknownResponseHandling,
+      isSuccessStatusCode: this.isSuccessStatusCode,
+    };
   }
 
   /**
@@ -109,28 +144,17 @@ export abstract class ApiClient {
         throw new Error("Network error: Unknown error");
       }
 
-      throw new Error(`Network error: ${error instanceof Error ? error.message : String(error)}`);
+      throw new Error(
+        `Network error: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
 
   private createResponse(response: AxiosResponse): IHttpResponse {
-    const header: IHttpHeader = Object.entries(response.headers).reduce(
-      (acc, [key, value]) => {
-        if (!value) {
-          return acc;
-        }
-
-        const lowerCaseKey = key.toLowerCase();
-        const headerCaseKey = Case.header(lowerCaseKey);
-
-        return {
-          ...acc,
-          [headerCaseKey]: value,
-          [lowerCaseKey]: value,
-        };
-      },
-      {}
-    );
+    const header: IHttpHeader = {};
+    Object.entries(response.headers).forEach(([key, value]) => {
+      this.addMultiValue(header, key, String(value));
+    });
 
     return {
       body: response.data,
@@ -177,13 +201,32 @@ export abstract class ApiClient {
 
   private createUrl(path: string, query?: IHttpQuery): string {
     const url = new URL(path, this.baseUrl);
-
     this.addQuery(url, query);
-
     return url.toString();
   }
 
   private createHeader(header: any): any {
     return header;
   }
+
+  private addMultiValue(
+    record: Record<string, string | string[]>,
+    key: string,
+    value: AxiosHeaderValue
+  ): void {
+    const existing = record[key];
+    const preparedValue = Array.isArray(value)
+      ? value.map(String)
+      : [String(value)];
+    if (existing) {
+      if (Array.isArray(existing)) {
+        existing.push(...preparedValue);
+      } else {
+        record[key] = [existing, ...preparedValue];
+      }
+    } else {
+      record[key] =
+        preparedValue.length > 1 ? preparedValue : (preparedValue[0] as string);
+    }
+  }
 }

package/dist/lib/RequestCommand.ts

@@ -1,13 +1,29 @@
-import {
-  type HttpMethod,
-  type IHttpRequest,
-  type IHttpHeader,
-  type IHttpParam,
-  type IHttpQuery,
-  type IHttpBody,
-  type IHttpResponse,
-  HttpResponse,
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ *
+ * @generated by @rexeus/typeweaver
+ */
+
+import { HttpResponse } from "@rexeus/typeweaver-core";
+import type {
+  HttpMethod,
+  IHttpBody,
+  IHttpHeader,
+  IHttpParam,
+  IHttpQuery,
+  IHttpRequest,
+  IHttpResponse,
 } from "@rexeus/typeweaver-core";
+import type { UnknownResponseHandling } from "./ApiClient";
+
+/**
+ * Configuration options for processing HTTP responses.
+ */
+export type ProcessResponseOptions = {
+  readonly unknownResponseHandling: UnknownResponseHandling;
+  readonly isSuccessStatusCode: (statusCode: number) => boolean;
+};
 
 /**
  * Abstract base class for type-safe API request commands.
@@ -55,7 +71,11 @@ export abstract class RequestCommand<
    * - Error response handling
    *
    * @param response - The raw HTTP response from the server
+   * @param options - Configuration options for response processing
    * @returns The processed, type-safe response object
    */
-  public abstract processResponse(response: IHttpResponse): HttpResponse;
+  public abstract processResponse(
+    response: IHttpResponse,
+    options: ProcessResponseOptions
+  ): HttpResponse;
 }

package/dist/lib/index.ts

@@ -1,2 +1,9 @@
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ *
+ * @generated by @rexeus/typeweaver
+ */
+
 export * from "./ApiClient";
 export * from "./RequestCommand";

package/dist/templates/Client.ejs

@@ -1,6 +1,17 @@
+/* eslint-disable */
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ * 
+ * @generated by @rexeus/typeweaver
+ */
+
 import { ApiClient, type ApiClientProps } from "../lib/clients";
 <% for (const operation of operations) { %>
-import { <%= operation.operationId %>RequestCommand, type Successful<%= operation.operationId %>Response } from "<%= operation.requestFile %>";
+import { <%= operation.operationId %>RequestCommand } from "./<%= operation.operationId %>RequestCommand";
+import type { 
+    Successful<%= operation.operationId %>Response
+} from "<%= operation.requestFile %>";
 <% } %>
 
 export type <%= pascalCaseEntityName %>RequestCommands =
@@ -24,16 +35,6 @@ export class <%= pascalCaseEntityName %>Client extends ApiClient {
     <% } %>
     public async send(command: <%= pascalCaseEntityName %>RequestCommands): Promise<Successful<%= pascalCaseEntityName %>Responses> {
         const response = await this.execute(command);
-
-        switch (true) {
-        <% for (const operation of operations) { %>
-            case command instanceof <%= operation.operationId %>RequestCommand: {
-                return command.processResponse(response);
-            }
-        <% } %>
-            default: {
-                throw new Error("Command is not supported");
-            }
-        }
+        return command.processResponse(response, this.processResponseOptions);
     }
 }

package/dist/templates/RequestCommand.ejs

@@ -0,0 +1,90 @@
+/* eslint-disable */
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ * 
+ * @generated by @rexeus/typeweaver
+ */
+
+import definition from "<%= sourcePath %>";
+import { HttpMethod, type IHttpResponse, ResponseValidationError, UnknownResponse } from "@rexeus/typeweaver-core";
+import { RequestCommand, type ProcessResponseOptions } from "../lib/clients";
+import { <%= pascalCaseOperationId %>ResponseValidator } from "<%= responseValidatorFile %>";
+import type {
+    I<%= pascalCaseOperationId %>Request,
+    <%= headerTsType ? `I${pascalCaseOperationId}RequestHeader,` : "" %>
+    <%= paramTsType ? `I${pascalCaseOperationId}RequestParam,` : "" %>
+    <%= queryTsType ? `I${pascalCaseOperationId}RequestQuery,` : "" %>
+    <%= bodyTsType ? `I${pascalCaseOperationId}RequestBody,` : "" %>
+    Successful<%= pascalCaseOperationId %>Response,
+} from "<%= requestFile %>";
+<% for (const successResponse of [...ownSuccessResponses, ...sharedSuccessResponses]) { %>
+import { <%= successResponse.name %>Response } from "<%= successResponseImportPath(successResponse) %>";
+<% } %>
+
+export class <%= pascalCaseOperationId %>RequestCommand extends RequestCommand implements I<%= pascalCaseOperationId %>Request {
+    public override readonly method = definition.method as HttpMethod.<%= method %>;
+    public override readonly path = definition.path;
+
+    public <%= headerTsType ? `override` : `declare` %> readonly header: <%= headerTsType ? `I${pascalCaseOperationId}RequestHeader` : `undefined` %>;
+    public  <%= paramTsType ? `override` : `declare` %> readonly param: <%= paramTsType ? `I${pascalCaseOperationId}RequestParam` : `undefined` %>;
+    public <%= queryTsType ? `override` : `declare` %> readonly query: <%= queryTsType ? `I${pascalCaseOperationId}RequestQuery` : `undefined` %>;
+    public <%= bodyTsType ? `override` : `declare` %> readonly body: <%= bodyTsType ? `I${pascalCaseOperationId}RequestBody` : `undefined` %>;
+
+    private readonly responseValidator: <%= pascalCaseOperationId %>ResponseValidator;
+
+    public constructor(input: Omit<I<%= pascalCaseOperationId %>Request, "method" | "path">) {
+        super();
+
+        <% if (headerTsType) { %>
+        this.header = input.header;
+        <% } %>
+
+        <% if (paramTsType) { %>
+        this.param = input.param;
+        <% } %>
+
+        <% if (queryTsType) { %>
+        this.query = input.query;
+        <% } %>
+
+        <% if (bodyTsType) { %>
+        this.body = input.body;
+        <% } %>
+
+        this.responseValidator = new <%= pascalCaseOperationId %>ResponseValidator();
+    }
+
+    public processResponse(
+        response: IHttpResponse, 
+        options: ProcessResponseOptions
+    ): Successful<%= pascalCaseOperationId %>Response {
+        try {
+            const result = this.responseValidator.validate(response);
+
+            <% for (const successResponse of [...ownSuccessResponses, ...sharedSuccessResponses]) { %>
+                if (result instanceof <%= successResponse.name %>Response) {
+                    return result;
+                }
+            <% } %>
+
+            throw result;
+        } catch (error) {
+            if (error instanceof ResponseValidationError) {
+                const unknownResponse = new UnknownResponse(
+                    response.statusCode,
+                    response.header,
+                    response.body,
+                    error
+                );
+
+                if (options.unknownResponseHandling === "passthrough" && options.isSuccessStatusCode(response.statusCode)) {
+                    return unknownResponse as any;
+                }
+
+                throw unknownResponse;
+            }
+            throw error;
+        }
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rexeus/typeweaver-clients",
-  "version": "0.0.2",
-  "description": "HTTP client generator for TypeWeaver API framework",
+  "version": "0.0.4",
+  "description": "HTTP client generator for typeweaver API framework",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,9 @@
   "files": [
     "dist",
     "package.json",
-    "README.md"
+    "README.md",
+    "LICENSE",
+    "NOTICE"
   ],
   "keywords": [
     "api",
@@ -26,7 +28,7 @@
     "typeweaver"
   ],
   "author": "Dennis Wentzien <dw@rexeus.com>",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rexeus/typeweaver.git",
@@ -37,18 +39,26 @@
   },
   "homepage": "https://github.com/rexeus/typeweaver#readme",
   "peerDependencies": {
-    "axios": "^1.7.0"
+    "axios": "^1.7.0",
+    "@rexeus/typeweaver-core": "^0.0.4",
+    "@rexeus/typeweaver-gen": "^0.0.4"
   },
   "devDependencies": {
+    "@hono/node-server": "^1.16.0",
+    "axios": "^1.11.0",
+    "test-utils": "file:../test-utils",
+    "@rexeus/typeweaver-gen": "^0.0.4",
+    "@rexeus/typeweaver-core": "^0.0.4"
+  },
+  "dependencies": {
     "case": "^1.6.3",
-    "axios": "^1.9.0",
-    "@rexeus/typeweaver-core": "^0.0.2",
-    "@rexeus/typeweaver-gen": "^0.0.2"
+    "@rexeus/typeweaver-zod-to-ts": "^0.0.4"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
-    "build": "pkgroll --clean-dist && cp -r ./src/templates ./dist/templates && cp -r ./src/lib ./dist/lib",
+    "build": "pkgroll --clean-dist && cp -r ./src/templates ./dist/templates && cp -r ./src/lib ./dist/lib && cp ../../LICENSE ../../NOTICE ./dist/",
+    "test": "vitest --run",
     "preversion": "npm run build"
   }
 }