genoc 0.1.0 → 0.1.2

package/README.md

@@ -127,7 +127,7 @@ if (options.expectStream === true) {
 class StreamResponse {
   data: ReadableStream<Uint8Array>;
   filename?: string;
-  headers: Headers;
+  headers: Record<string, string>;
 }
 ```
 

package/dist/generator/client-generator.js

@@ -89,12 +89,12 @@ function buildClientMethodBody(op) {
     if (op.queryParams.length > 0) {
         opts.push('query');
     }
-    if (op.headerParams.length > 0) {
-        opts.push('headers');
-    }
     if (op.requestBody) {
         opts.push('body');
     }
+    if (op.headerParams.length > 0) {
+        opts.push('headers');
+    }
     const lines = [];
     if (op.requestBody?.isMultipart && op.requestBody.schema) {
         const schema = op.requestBody.schema;
@@ -181,24 +181,22 @@ function buildClientFile(operations, version) {
         lines.push('/* global FormData */');
     }
     lines.push('');
-    lines.push("const errorsSymbol = Symbol('errors');");
-    lines.push('');
     lines.push('function decorateWithErrors<T, E>(');
     lines.push('  item: T,');
     lines.push('  runtimeErrors: unknown,');
-    lines.push('): T & { [errorsSymbol]: E } {');
-    lines.push('  Object.defineProperty(item, errorsSymbol, {');
+    lines.push('): T & { __definedErrors: E } {');
+    lines.push('  Object.defineProperty(item, "__definedErrors", {');
     lines.push('    value: runtimeErrors,');
     lines.push('    enumerable: false,');
     lines.push('    configurable: true,');
     lines.push('    writable: false,');
     lines.push('  });');
-    lines.push('  return item as T & { [errorsSymbol]: E };');
+    lines.push('  return item as T & { __definedErrors: E };');
     lines.push('}');
     lines.push('');
     lines.push('export function isDefinedError<E extends ApiError<number, unknown>>(');
     lines.push('  err: unknown,');
-    lines.push('  fn: { [errorsSymbol]: E },');
+    lines.push('  fn: { __definedErrors: E },');
     lines.push('): err is E {');
     lines.push('  if (err instanceof UnspecifiedApiError) return false;');
     lines.push('  if (!(err instanceof ApiError)) return false;');

package/dist/generator/contracts-generator.js

@@ -442,16 +442,16 @@ export function generateContracts(doc, resolver) {
     lines.push('  constructor(');
     lines.push('    public readonly data: ReadableStream<Uint8Array>,');
     lines.push('    public readonly filename?: string,');
-    lines.push('    public readonly headers: Headers = new Headers(),');
+    lines.push('    public readonly headers: Record<string, string> = {},');
     lines.push('  ) {}');
     lines.push('}');
     lines.push('');
     lines.push(`export function streamResponse(
   data: ReadableStream<Uint8Array>,
   filename?: string,
-  headers?: Headers,
+  headers?: Record<string, string>,
 ): StreamResponse {
-  return new StreamResponse(data, filename, headers ?? new Headers());
+  return new StreamResponse(data, filename, headers ?? {});
 }`);
     // ErrorResponse class
     lines.push('');
@@ -459,7 +459,7 @@ export function generateContracts(doc, resolver) {
   constructor(
     public readonly status: number,
     public readonly data: unknown,
-    public readonly headers: Headers,
+    public readonly headers: Record<string, string>,
     public readonly message?: string,
   ) {}
 }`);
@@ -468,10 +468,10 @@ export function generateContracts(doc, resolver) {
     lines.push(`export function errorResponse(
   status: number,
   data: unknown,
-  headers?: Headers,
+  headers?: Record<string, string>,
   message?: string,
 ): ErrorResponse {
-  return new ErrorResponse(status, data, headers ?? new Headers(), message);
+  return new ErrorResponse(status, data, headers ?? {}, message);
 }`);
     // RequesterFailError class
     lines.push('');

package/dist/generator/method-generator.js

@@ -7,7 +7,7 @@ function buildParameters(op) {
     if (op.queryParams.length > 0) {
         const prefix = getOperationTypePrefix(op);
         const allOptional = op.queryParams.every((p) => !p.required);
-        const hasRequiredAfter = op.headerParams.some((p) => p.required) || !!op.requestBody?.required;
+        const hasRequiredAfter = !!op.requestBody?.required || op.headerParams.some((p) => p.required);
         if (allOptional && hasRequiredAfter) {
             // All optional query params + required param after: use explicit undefined to avoid "required param cannot follow optional" error
             params.push(`query: ${prefix}Query | undefined`);
@@ -18,22 +18,17 @@ function buildParameters(op) {
             params.push(`query${optional}: ${prefix}Query`);
         }
     }
-    if (op.headerParams.length > 0) {
-        const prefix = getOperationTypePrefix(op);
-        const allOptional = op.headerParams.every((p) => !p.required);
-        if (allOptional && op.requestBody?.required) {
-            params.push(`headers: ${prefix}Headers | undefined`);
-        }
-        else {
-            const optional = allOptional ? '?' : '';
-            params.push(`headers${optional}: ${prefix}Headers`);
-        }
-    }
     if (op.requestBody) {
         const prefix = getOperationTypePrefix(op);
         const optional = op.requestBody.required ? '' : '?';
         params.push(`body${optional}: ${prefix}Body`);
     }
+    if (op.headerParams.length > 0) {
+        const prefix = getOperationTypePrefix(op);
+        const allOptional = op.headerParams.every((p) => !p.required);
+        const optional = allOptional ? '?' : '';
+        params.push(`headers${optional}: ${prefix}Headers`);
+    }
     return params.join(', ');
 }
 function buildJsDoc(op) {
@@ -117,12 +112,12 @@ function buildImplementation(op) {
     if (op.queryParams.length > 0) {
         requesterOpts.push('query');
     }
-    if (op.headerParams.length > 0) {
-        requesterOpts.push('headers');
-    }
     if (op.requestBody) {
         requesterOpts.push('body');
     }
+    if (op.headerParams.length > 0) {
+        requesterOpts.push('headers');
+    }
     // Error responses for status-specific checks
     const errorResponses = op.responses.filter((r) => !r.isSuccess && r.statusCode !== 'default');
     // Lines for inside `if (result instanceof ErrorResponse) { ... }`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genoc",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Generate typed HTTP clients from OpenAPI 3.0 / 3.1 specifications",
   "keywords": [
     "client",