cabloy 5.1.56 → 5.1.58

package/vona/packages-utils/zod-query/src/lib/query.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 import { Metadata } from './metadata.ts';
 import { isNil } from './utils.ts';
-import { isZodType } from './zod-is-type.ts';
+import { isNullableSchema, isZodType } from './zod-is-type.ts';
 
 interface IParsePayload {
   value: any;
@@ -33,6 +33,8 @@ function __parseAdapter(inst: z.ZodType, 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':
@@ -171,17 +173,27 @@ function __parseArray(_inst, parse, payload: IParsePayload, _) {
 ///////////////////////////////////////////
 
 function __parseOptional(_inst, parse, payload: IParsePayload, _) {
-  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: IParsePayload, _) {
+  _coerceNullable(_inst, payload, true);
+  return parse(payload, _);
+}
+
 ////////////////////////////////////////////
 ////////////////////////////////////////////
 /// ///////                        /////////
@@ -191,11 +203,7 @@ function __parseOptional(_inst, parse, payload: IParsePayload, _) {
 ////////////////////////////////////////////
 
 function __parseDefault(_inst, parse, payload: IParsePayload, _) {
-  if (isZodType(Metadata.unwrapUntil(_inst), 'ZodString')) {
-    _coerceString(payload);
-  } else {
-    _coerceWithNil(payload);
-  }
+  _coerceNullable(_inst, payload, isNullableSchema(_inst));
   return parse(payload, _);
 }
 
@@ -225,6 +233,17 @@ function _coerceString(payload: IParsePayload, fn?: Function) {
   }
 }
 
+function _coerceNullable(inst: z.ZodType, payload: IParsePayload, nullable: boolean) {
+  if (isZodType(Metadata.unwrapUntil(inst), 'ZodString')) {
+    _coerceString(payload);
+    if (nullable && payload.value === 'null') {
+      payload.value = null;
+    }
+  } else {
+    _coerceWithNil(payload);
+  }
+}
+
 function _coerceWithNil(payload: IParsePayload, fn?: Function) {
   if (!isNil(payload.value)) {
     if (payload.value === 'undefined' || payload.value === '') {

package/vona/packages-utils/zod-query/src/lib/zod-is-type.ts

@@ -90,17 +90,59 @@ export 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 function isNullableSchema(schema: z.ZodType) {
-  return schema.safeParse(null).success;
+  return _isNullableSchema(schema);
 }
 
 /**
- * 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 function isOptionalSchema(schema: z.ZodType) {
-  return schema.safeParse(undefined).success;
+  return _isOptionalSchema(schema);
+}
+
+function _isNullableSchema(schema: z.ZodType): boolean {
+  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: z.ZodType): boolean {
+  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;
 }

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.44",
+  "version": "5.1.45",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/packages-vona/vona-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-core",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona",
   "keywords": [

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.20",
+  "version": "6.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [