@rexeus/typeweaver-types 0.1.1 → 0.1.2

package/dist/lib/ResponseValidator.ts

@@ -5,6 +5,7 @@
  * @generated by @rexeus/typeweaver
  */
 
+import { z } from "zod";
 import type {
   HttpBodySchema,
   HttpHeaderSchema,
@@ -93,7 +94,9 @@ export abstract class ResponseValidator
       if (headerSchema) {
         const coercedHeader = this.coerceHeaderToSchema(
           response.header,
-          headerSchema.shape
+          headerSchema instanceof z.ZodObject
+            ? headerSchema.shape
+            : headerSchema.unwrap().shape
         );
         const validateHeaderResult = headerSchema.safeParse(
           coercedHeader

package/dist/lib/Validator.ts

@@ -191,7 +191,7 @@ export abstract class Validator {
    * @returns Coerced header object
    */
   protected coerceHeaderToSchema(header: unknown, shape: $ZodShape): unknown {
-    return this.coerceToSchema(header, shape, false); // case-insensitive
+    return this.coerceToSchema(header ?? {}, shape, false); // case-insensitive
   }
 
   /**
@@ -202,6 +202,6 @@ export abstract class Validator {
    * @returns Coerced query object
    */
   protected coerceQueryToSchema(query: unknown, shape: $ZodShape): unknown {
-    return this.coerceToSchema(query, shape, true); // case-sensitive
+    return this.coerceToSchema(query ?? {}, shape, true); // case-sensitive
   }
 }

package/dist/templates/RequestValidator.ejs

@@ -41,7 +41,11 @@ export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidat
 
         <% if(header) { %>
             if (definition.request.header) {
+                <% if(header instanceof z.ZodObject) { %>
                 const coercedHeader = this.coerceHeaderToSchema(request.header, definition.request.header.shape);
+                <% } else { %>
+                const coercedHeader = this.coerceHeaderToSchema(request.header, definition.request.header.unwrap().shape);
+                <% } %>  
                 const result = definition.request.header.safeParse(coercedHeader);
           
                 if (!result.success) {
@@ -66,7 +70,11 @@ export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidat
 
         <% if(query) { %>
             if (definition.request.query) {
+                <% if(query instanceof z.ZodObject) { %>
                 const coercedQuery = this.coerceQueryToSchema(request.query, definition.request.query.shape);
+                <% } else { %>
+                const coercedQuery = this.coerceQueryToSchema(request.query, definition.request.query.unwrap().shape);
+                <% } %>
                 const result = definition.request.query.safeParse(coercedQuery);
           
                 if (!result.success) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexeus/typeweaver-types",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "TypeScript type and Zod validator generators for typeweaver APIs",
   "type": "module",
   "main": "dist/index.js",
@@ -39,17 +39,17 @@
   },
   "homepage": "https://github.com/rexeus/typeweaver#readme",
   "peerDependencies": {
-    "@rexeus/typeweaver-core": "^0.1.1",
-    "@rexeus/typeweaver-gen": "^0.1.1"
+    "@rexeus/typeweaver-core": "^0.1.2",
+    "@rexeus/typeweaver-gen": "^0.1.2"
   },
   "devDependencies": {
     "test-utils": "file:../test-utils",
-    "@rexeus/typeweaver-core": "^0.1.1",
-    "@rexeus/typeweaver-gen": "^0.1.1"
+    "@rexeus/typeweaver-core": "^0.1.2",
+    "@rexeus/typeweaver-gen": "^0.1.2"
   },
   "dependencies": {
     "case": "^1.6.3",
-    "@rexeus/typeweaver-zod-to-ts": "^0.1.1"
+    "@rexeus/typeweaver-zod-to-ts": "^0.1.2"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",