@rexeus/typeweaver-core 0.1.0 → 0.1.2

package/dist/index.d.ts

@@ -6,7 +6,8 @@ type HttpBodySchema = ZodType;
 
 type IHttpHeader = Record<string, string | string[]> | undefined;
 type HttpHeaderValue = ZodString | ZodStringFormat | ZodLiteral<string> | ZodEnum<Record<string, string>>;
-type HttpHeaderSchema = ZodObject<Record<string, HttpHeaderValue | ZodOptional<HttpHeaderValue> | ZodArray<HttpHeaderValue> | ZodOptional<ZodArray<HttpHeaderValue>>>>;
+type HttpHeaderObject = ZodObject<Record<string, HttpHeaderValue | ZodOptional<HttpHeaderValue> | ZodArray<HttpHeaderValue> | ZodOptional<ZodArray<HttpHeaderValue>>>>;
+type HttpHeaderSchema = HttpHeaderObject | ZodOptional<HttpHeaderObject>;
 
 declare enum HttpMethod {
     GET = "GET",
@@ -24,7 +25,8 @@ type HttpParamSchema = ZodObject<Record<string, HttpParamValue>>;
 
 type IHttpQuery = Record<string, string | string[]> | undefined;
 type HttpQueryValue = ZodString | ZodStringFormat | ZodLiteral<string> | ZodEnum<Record<string, string>>;
-type HttpQuerySchema = ZodObject<Record<string, HttpQueryValue | ZodOptional<HttpQueryValue> | ZodArray<HttpQueryValue> | ZodOptional<ZodArray<HttpQueryValue>>>>;
+type HttpQueryObject = ZodObject<Record<string, HttpQueryValue | ZodOptional<HttpQueryValue> | ZodArray<HttpQueryValue> | ZodOptional<ZodArray<HttpQueryValue>>>>;
+type HttpQuerySchema = HttpQueryObject | ZodOptional<HttpQueryObject>;
 
 type IHttpRequest<Header extends IHttpHeader = IHttpHeader, Param extends IHttpParam = IHttpParam, Query extends IHttpQuery = IHttpQuery, Body extends IHttpBody = IHttpBody> = {
     body?: Body;

package/dist/index.js

@@ -170,10 +170,16 @@ class HttpResponseDefinition {
       if (!this.header && !definition.header) return void 0;
       if (!this.header) return definition.header;
       if (!definition.header) return this.header;
-      return z.object({
-        ...this.header.shape,
-        ...definition.header.shape
+      const mergedHeader2 = z.object({
+        ...this.header instanceof z.ZodObject ? this.header.shape : this.header.unwrap().shape,
+        ...definition.header instanceof z.ZodObject ? definition.header.shape : definition.header.unwrap().shape
       });
+      if (Object.values(mergedHeader2.shape).every(
+        (schema) => schema instanceof z.ZodOptional
+      )) {
+        return mergedHeader2.optional();
+      }
+      return mergedHeader2;
     })();
     const mergedBody = (() => {
       if (!this.body && !definition.body) return void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexeus/typeweaver-core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Core TypeScript and Zod utilities for typeweaver API framework",
   "type": "module",
   "main": "dist/index.js",