imean-cassandra-orm 2.2.2 → 2.4.0

package/dist/mod.cjs

@@ -149,9 +149,13 @@ function dropColumns(schema, fields) {
   return `ALTER TABLE ${schema.keyspace}.${schema.tableName} DROP (${fields.join(", ")});`;
 }
 function convertToFieldConfig(zodType, flags = {}) {
-  if (zodType._cassandraType) {
+  let baseType = zodType;
+  while (baseType._def && (baseType._def.typeName === "ZodOptional" || baseType._def.typeName === "ZodNullable" || baseType._def.typeName === "ZodDefault")) {
+    baseType = baseType._def.innerType;
+  }
+  if (baseType._cassandraType) {
     return {
-      type: zodType._cassandraType,
+      type: baseType._cassandraType,
       flags: {
         partitionKey: !!flags.partitionKey,
         clusteringKey: flags.clusteringKey || false,
@@ -161,23 +165,23 @@ function convertToFieldConfig(zodType, flags = {}) {
     };
   }
   let type = "text";
-  if (zodType._def.typeName === "ZodString") {
-    if (zodType._def.checks && zodType._def.checks.some((c) => c.kind === "uuid")) {
+  if (baseType._def.typeName === "ZodString") {
+    if (baseType._def.checks && baseType._def.checks.some((c) => c.kind === "uuid")) {
       type = "uuid";
     } else {
       type = "text";
     }
-  } else if (zodType._def.typeName === "ZodNumber") {
+  } else if (baseType._def.typeName === "ZodNumber") {
     type = "double";
-  } else if (zodType._def.typeName === "ZodBoolean") {
+  } else if (baseType._def.typeName === "ZodBoolean") {
     type = "boolean";
-  } else if (zodType._def.typeName === "ZodDate") {
+  } else if (baseType._def.typeName === "ZodDate") {
     type = "timestamp";
-  } else if (zodType._def.typeName === "ZodArray") {
+  } else if (baseType._def.typeName === "ZodArray") {
     type = "list";
-  } else if (zodType._def.typeName === "ZodSet") {
+  } else if (baseType._def.typeName === "ZodSet") {
     type = "set";
-  } else if (zodType._def.typeName === "ZodRecord") {
+  } else if (baseType._def.typeName === "ZodRecord") {
     type = "map";
   }
   return {
@@ -370,7 +374,24 @@ function convertValueToCassandra(value, config) {
   }
   switch (config.type) {
     case "timestamp":
-      return value instanceof Date ? value : new Date(value);
+      if (value instanceof Date) {
+        return value;
+      }
+      if (typeof value === "string") {
+        const parsedDate = new Date(value);
+        if (isNaN(parsedDate.getTime())) {
+          throw new Error(`Invalid date string: ${value}`);
+        }
+        return parsedDate;
+      }
+      if (typeof value === "number") {
+        return new Date(value);
+      }
+      try {
+        return new Date(value);
+      } catch (error) {
+        throw new Error(`Cannot convert value to Date: ${value}`);
+      }
     case "uuid":
       return typeof value === "string" ? value : value.toString();
     case "blob":
@@ -378,7 +399,16 @@ function convertValueToCassandra(value, config) {
     case "text":
       return typeof value === "string" ? value : JSON.stringify(value);
     default:
-      return value;
+      const type = config.type;
+      switch (type) {
+        case "list<text>":
+        case "set<text>":
+          return value.map(
+            (item) => typeof item === "string" ? item : JSON.stringify(item)
+          );
+        default:
+          return value;
+      }
   }
 }
 function convertValueFromCassandra(value, config) {
@@ -399,13 +429,29 @@ function convertValueFromCassandra(value, config) {
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
-      try {
-        return JSON.parse(value);
-      } catch {
-        return value;
+      if (config.type !== "text") {
+        try {
+          return JSON.parse(value);
+        } catch {
+          return value;
+        }
       }
-    default:
       return value;
+    default:
+      const type = config.type;
+      switch (type) {
+        case "list<text>":
+        case "set<text>":
+          return value.map((item) => {
+            try {
+              return JSON.parse(item);
+            } catch {
+              return item;
+            }
+          });
+        default:
+          return value;
+      }
   }
 }
 var queryHelper = {

package/dist/mod.js

@@ -147,9 +147,13 @@ function dropColumns(schema, fields) {
   return `ALTER TABLE ${schema.keyspace}.${schema.tableName} DROP (${fields.join(", ")});`;
 }
 function convertToFieldConfig(zodType, flags = {}) {
-  if (zodType._cassandraType) {
+  let baseType = zodType;
+  while (baseType._def && (baseType._def.typeName === "ZodOptional" || baseType._def.typeName === "ZodNullable" || baseType._def.typeName === "ZodDefault")) {
+    baseType = baseType._def.innerType;
+  }
+  if (baseType._cassandraType) {
     return {
-      type: zodType._cassandraType,
+      type: baseType._cassandraType,
       flags: {
         partitionKey: !!flags.partitionKey,
         clusteringKey: flags.clusteringKey || false,
@@ -159,23 +163,23 @@ function convertToFieldConfig(zodType, flags = {}) {
     };
   }
   let type = "text";
-  if (zodType._def.typeName === "ZodString") {
-    if (zodType._def.checks && zodType._def.checks.some((c) => c.kind === "uuid")) {
+  if (baseType._def.typeName === "ZodString") {
+    if (baseType._def.checks && baseType._def.checks.some((c) => c.kind === "uuid")) {
       type = "uuid";
     } else {
       type = "text";
     }
-  } else if (zodType._def.typeName === "ZodNumber") {
+  } else if (baseType._def.typeName === "ZodNumber") {
     type = "double";
-  } else if (zodType._def.typeName === "ZodBoolean") {
+  } else if (baseType._def.typeName === "ZodBoolean") {
     type = "boolean";
-  } else if (zodType._def.typeName === "ZodDate") {
+  } else if (baseType._def.typeName === "ZodDate") {
     type = "timestamp";
-  } else if (zodType._def.typeName === "ZodArray") {
+  } else if (baseType._def.typeName === "ZodArray") {
     type = "list";
-  } else if (zodType._def.typeName === "ZodSet") {
+  } else if (baseType._def.typeName === "ZodSet") {
     type = "set";
-  } else if (zodType._def.typeName === "ZodRecord") {
+  } else if (baseType._def.typeName === "ZodRecord") {
     type = "map";
   }
   return {
@@ -368,7 +372,24 @@ function convertValueToCassandra(value, config) {
   }
   switch (config.type) {
     case "timestamp":
-      return value instanceof Date ? value : new Date(value);
+      if (value instanceof Date) {
+        return value;
+      }
+      if (typeof value === "string") {
+        const parsedDate = new Date(value);
+        if (isNaN(parsedDate.getTime())) {
+          throw new Error(`Invalid date string: ${value}`);
+        }
+        return parsedDate;
+      }
+      if (typeof value === "number") {
+        return new Date(value);
+      }
+      try {
+        return new Date(value);
+      } catch (error) {
+        throw new Error(`Cannot convert value to Date: ${value}`);
+      }
     case "uuid":
       return typeof value === "string" ? value : value.toString();
     case "blob":
@@ -376,7 +397,16 @@ function convertValueToCassandra(value, config) {
     case "text":
       return typeof value === "string" ? value : JSON.stringify(value);
     default:
-      return value;
+      const type = config.type;
+      switch (type) {
+        case "list<text>":
+        case "set<text>":
+          return value.map(
+            (item) => typeof item === "string" ? item : JSON.stringify(item)
+          );
+        default:
+          return value;
+      }
   }
 }
 function convertValueFromCassandra(value, config) {
@@ -397,13 +427,29 @@ function convertValueFromCassandra(value, config) {
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
-      try {
-        return JSON.parse(value);
-      } catch {
-        return value;
+      if (config.type !== "text") {
+        try {
+          return JSON.parse(value);
+        } catch {
+          return value;
+        }
       }
-    default:
       return value;
+    default:
+      const type = config.type;
+      switch (type) {
+        case "list<text>":
+        case "set<text>":
+          return value.map((item) => {
+            try {
+              return JSON.parse(item);
+            } catch {
+              return item;
+            }
+          });
+        default:
+          return value;
+      }
   }
 }
 var queryHelper = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-cassandra-orm",
-  "version": "2.2.2",
+  "version": "2.4.0",
   "description": "cassandra orm",
   "keywords": [
     "cassandra",