@cabloy/zod-query 2.1.8 → 2.1.11

package/dist/index.d.ts

@@ -1 +1,2 @@
 export * from './lib/query.ts';
+export * from './lib/zod-is-type.ts';

package/dist/index.js

@@ -43,6 +43,56 @@ function isAnyZodType(schema) {
   return 'def' in schema;
 }
 
+/**
+ * The schema.isNullable() is deprecated. This is the suggested replacement.
+ */
+function isNullableSchema(schema) {
+  return _isNullableSchema(schema);
+}
+
+/**
+ * The schema.isOptional() is deprecated. This is the suggested replacement.
+ */
+function isOptionalSchema(schema) {
+  return _isOptionalSchema(schema);
+}
+function _isNullableSchema(schema) {
+  if (isZodType(schema, 'ZodNullable')) return true;
+  if (isZodType(schema, 'ZodNonOptional')) return false;
+  if (isZodType(schema, ['ZodOptional', 'ZodDefault', 'ZodReadonly']) && isAnyZodType(schema._zod.def.innerType)) {
+    return _isNullableSchema(schema._zod.def.innerType);
+  }
+  if (isZodType(schema, 'ZodPipe')) {
+    const inSchema = schema._zod.def.in;
+    const outSchema = schema._zod.def.out;
+    if (isZodType(inSchema, 'ZodTransform') && isAnyZodType(outSchema)) {
+      return _isNullableSchema(outSchema);
+    }
+    if (isAnyZodType(inSchema)) {
+      return _isNullableSchema(inSchema);
+    }
+  }
+  return false;
+}
+function _isOptionalSchema(schema) {
+  if (isZodType(schema, ['ZodOptional', 'ZodDefault'])) return true;
+  if (isZodType(schema, 'ZodNonOptional')) return false;
+  if (isZodType(schema, ['ZodNullable', 'ZodReadonly']) && isAnyZodType(schema._zod.def.innerType)) {
+    return _isOptionalSchema(schema._zod.def.innerType);
+  }
+  if (isZodType(schema, 'ZodPipe')) {
+    const inSchema = schema._zod.def.in;
+    const outSchema = schema._zod.def.out;
+    if (isZodType(inSchema, 'ZodTransform') && isAnyZodType(outSchema)) {
+      return _isOptionalSchema(outSchema);
+    }
+    if (isAnyZodType(inSchema)) {
+      return _isOptionalSchema(inSchema);
+    }
+  }
+  return false;
+}
+
 class Metadata {
   static unwrapUntil(schema, typeName) {
     if (typeName && isZodType(schema, typeName)) {
@@ -95,6 +145,8 @@ function __parseAdapter(inst, parse) {
         return __parseObject(inst, parse, payload, _);
       case 'array':
         return __parseArray(inst, parse, payload, _);
+      case 'nullable':
+        return __parseNullable(inst, parse, payload, _);
       case 'optional':
         return __parseOptional(inst, parse, payload, _);
       case 'default':
@@ -233,17 +285,27 @@ function __parseArray(_inst, parse, payload, _) {
 ///////////////////////////////////////////
 
 function __parseOptional(_inst, parse, payload, _) {
-  if (isZodType(Metadata.unwrapUntil(_inst), 'ZodString')) {
-    _coerceString(payload);
-  } else {
-    _coerceWithNil(payload);
-  }
-  if (payload.value === null) {
+  const nullable = isNullableSchema(_inst);
+  _coerceNullable(_inst, payload, nullable);
+  if (payload.value === null && !nullable) {
     payload.value = undefined;
   }
   return parse(payload, _);
 }
 
+////////////////////////////////////////////
+////////////////////////////////////////////
+/// ///////                       //////////
+/// ///////      ZodNullable      /////////
+/// ///////                       //////////
+////////////////////////////////////////////
+////////////////////////////////////////////
+
+function __parseNullable(_inst, parse, payload, _) {
+  _coerceNullable(_inst, payload, true);
+  return parse(payload, _);
+}
+
 ////////////////////////////////////////////
 ////////////////////////////////////////////
 /// ///////                        /////////
@@ -253,11 +315,7 @@ function __parseOptional(_inst, parse, payload, _) {
 ////////////////////////////////////////////
 
 function __parseDefault(_inst, parse, payload, _) {
-  if (isZodType(Metadata.unwrapUntil(_inst), 'ZodString')) {
-    _coerceString(payload);
-  } else {
-    _coerceWithNil(payload);
-  }
+  _coerceNullable(_inst, payload, isNullableSchema(_inst));
   return parse(payload, _);
 }
 
@@ -284,6 +342,16 @@ function _coerceString(payload, fn) {
     } else ;
   }
 }
+function _coerceNullable(inst, payload, nullable) {
+  if (isZodType(Metadata.unwrapUntil(inst), 'ZodString')) {
+    _coerceString(payload);
+    if (nullable && payload.value === 'null') {
+      payload.value = null;
+    }
+  } else {
+    _coerceWithNil(payload);
+  }
+}
 function _coerceWithNil(payload, fn) {
   if (!isNil(payload.value)) {
     if (payload.value === 'undefined' || payload.value === '') {
@@ -315,4 +383,4 @@ function getInnerTypeName(schema) {
 //   }
 // }
 
-export { coerceWithNil, getInnerTypeName, setParseAdapter };
+export { coerceWithNil, getInnerTypeName, isAnyZodType, isNullableSchema, isOptionalSchema, isZodType, setParseAdapter };

package/dist/lib/zod-is-type.d.ts

@@ -32,12 +32,10 @@ export declare function isZodType<TypeName extends keyof ZodTypes>(schema: objec
 export declare function isZodType<TypeName extends keyof ZodTypes>(schema: object, typeName: TypeName): schema is ZodTypes[TypeName];
 export declare function isAnyZodType(schema: object): schema is z.ZodType;
 /**
- * The schema.isNullable() is deprecated. This is the suggested replacement
- * as this was how isNullable operated beforehand.
+ * The schema.isNullable() is deprecated. This is the suggested replacement.
  */
 export declare function isNullableSchema(schema: z.ZodType): boolean;
 /**
- * The schema.isOptional() is deprecated. This is the suggested replacement
- * as this was how isOptional operated beforehand.
+ * The schema.isOptional() is deprecated. This is the suggested replacement.
  */
 export declare function isOptionalSchema(schema: z.ZodType): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/zod-query",
-  "version": "2.1.8",
-  "gitHead": "3380f8c5d3989242b60dc2a34cbb330f74335cbe",
+  "version": "2.1.11",
+  "gitHead": "c7429e0d6a259341ae6e23d018b3238fb2483fdf",
   "description": "zod-query",
   "keywords": [
     "ioc",