imean-cassandra-orm 2.2.0 → 2.2.1

package/dist/mod.cjs

@@ -5,12 +5,12 @@ var zod = require('zod');
 
 // src/client.ts
 function convertZodToCassandraType(schema) {
-  if (schema._cassandraType) {
-    return schema._cassandraType;
+  let baseSchema = schema;
+  while (baseSchema instanceof zod.z.ZodOptional || baseSchema instanceof zod.z.ZodNullable || baseSchema instanceof zod.z.ZodDefault) {
+    baseSchema = baseSchema._def.innerType;
   }
-  let baseSchema = schema instanceof zod.z.ZodEffects ? schema._def.schema : schema;
-  if (schema instanceof zod.z.ZodOptional) {
-    return convertZodToCassandraType(schema.unwrap());
+  if (baseSchema._cassandraType) {
+    return baseSchema._cassandraType;
   }
   while (baseSchema instanceof zod.z.ZodEffects) {
     baseSchema = baseSchema._def.schema;
@@ -51,13 +51,10 @@ function convertZodToCassandraType(schema) {
     return `set<${elementType}>`;
   }
   if (baseSchema instanceof zod.z.ZodRecord) {
-    const keyType = convertZodToCassandraType(baseSchema.keySchema);
-    const valueType = convertZodToCassandraType(baseSchema.valueSchema);
+    const keyType = convertZodToCassandraType(baseSchema._def.keyType);
+    const valueType = convertZodToCassandraType(baseSchema._def.valueType);
     return `map<${keyType}, ${valueType}>`;
   }
-  if (baseSchema instanceof zod.z.ZodObject) {
-    return "text";
-  }
   return "text";
 }
 function getNewFields(schemaFields, tableMetadata2) {
@@ -898,29 +895,19 @@ var Types = {
   // 集合类型
   list: (elementType) => createCassandraType(
     zod.z.array(elementType),
-    `list<${getCassandraTypeFromZod(elementType)}>`
+    `list<${convertZodToCassandraType(elementType)}>`
   ),
   set: (elementType) => createCassandraType(
     zod.z.set(elementType),
-    `set<${getCassandraTypeFromZod(elementType)}>`
+    `set<${convertZodToCassandraType(elementType)}>`
   ),
   map: (keyType, valueType) => createCassandraType(
     zod.z.record(keyType, valueType),
-    `map<${getCassandraTypeFromZod(keyType)}, ${getCassandraTypeFromZod(
+    `map<${convertZodToCassandraType(keyType)}, ${convertZodToCassandraType(
       valueType
     )}>`
   )
 };
-function getCassandraTypeFromZod(schema) {
-  if (schema._cassandraType) {
-    return schema._cassandraType;
-  }
-  if (schema instanceof zod.z.ZodString) return "text";
-  if (schema instanceof zod.z.ZodNumber) return "double";
-  if (schema instanceof zod.z.ZodBoolean) return "boolean";
-  if (schema instanceof zod.z.ZodDate) return "timestamp";
-  return "text";
-}
 
 exports.Client = Client;
 exports.Model = Model;

package/dist/mod.js

@@ -3,12 +3,12 @@ import { z } from 'zod';
 
 // src/client.ts
 function convertZodToCassandraType(schema) {
-  if (schema._cassandraType) {
-    return schema._cassandraType;
+  let baseSchema = schema;
+  while (baseSchema instanceof z.ZodOptional || baseSchema instanceof z.ZodNullable || baseSchema instanceof z.ZodDefault) {
+    baseSchema = baseSchema._def.innerType;
   }
-  let baseSchema = schema instanceof z.ZodEffects ? schema._def.schema : schema;
-  if (schema instanceof z.ZodOptional) {
-    return convertZodToCassandraType(schema.unwrap());
+  if (baseSchema._cassandraType) {
+    return baseSchema._cassandraType;
   }
   while (baseSchema instanceof z.ZodEffects) {
     baseSchema = baseSchema._def.schema;
@@ -49,13 +49,10 @@ function convertZodToCassandraType(schema) {
     return `set<${elementType}>`;
   }
   if (baseSchema instanceof z.ZodRecord) {
-    const keyType = convertZodToCassandraType(baseSchema.keySchema);
-    const valueType = convertZodToCassandraType(baseSchema.valueSchema);
+    const keyType = convertZodToCassandraType(baseSchema._def.keyType);
+    const valueType = convertZodToCassandraType(baseSchema._def.valueType);
     return `map<${keyType}, ${valueType}>`;
   }
-  if (baseSchema instanceof z.ZodObject) {
-    return "text";
-  }
   return "text";
 }
 function getNewFields(schemaFields, tableMetadata2) {
@@ -896,28 +893,18 @@ var Types = {
   // 集合类型
   list: (elementType) => createCassandraType(
     z.array(elementType),
-    `list<${getCassandraTypeFromZod(elementType)}>`
+    `list<${convertZodToCassandraType(elementType)}>`
   ),
   set: (elementType) => createCassandraType(
     z.set(elementType),
-    `set<${getCassandraTypeFromZod(elementType)}>`
+    `set<${convertZodToCassandraType(elementType)}>`
   ),
   map: (keyType, valueType) => createCassandraType(
     z.record(keyType, valueType),
-    `map<${getCassandraTypeFromZod(keyType)}, ${getCassandraTypeFromZod(
+    `map<${convertZodToCassandraType(keyType)}, ${convertZodToCassandraType(
       valueType
     )}>`
   )
 };
-function getCassandraTypeFromZod(schema) {
-  if (schema._cassandraType) {
-    return schema._cassandraType;
-  }
-  if (schema instanceof z.ZodString) return "text";
-  if (schema instanceof z.ZodNumber) return "double";
-  if (schema instanceof z.ZodBoolean) return "boolean";
-  if (schema instanceof z.ZodDate) return "timestamp";
-  return "text";
-}
 
 export { Client, Model, TableSchema, Types, createModel, createTableSchema, uuid };

package/package.json

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