imean-cassandra-orm 2.6.1 → 2.7.1

package/dist/mod.cjs

@@ -66,21 +66,21 @@ function getNewFields(schemaFields, tableMetadata2) {
   );
 }
 function getDeletedFields(schemaFields, tableMetadata2) {
-  return tableMetadata2.filter((t) => !schemaFields.some(
-    (field) => field.toLowerCase() === t.column_name.toLowerCase()
-  )).map((t) => t.column_name);
+  return tableMetadata2.filter(
+    (t) => !schemaFields.some(
+      (field) => field.toLowerCase() === t.column_name.toLowerCase()
+    )
+  ).map((t) => t.column_name);
 }
 function getUpdatedFields(schemaFields, tableMetadata2, shape) {
   return schemaFields.filter(
-    (field) => tableMetadata2.some(
-      (t) => {
-        const dbFieldName = t.column_name;
-        const schemaFieldName = field;
-        const dbType = t.type;
-        const schemaType = convertZodToCassandraType(shape[field]);
-        return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
-      }
-    )
+    (field) => tableMetadata2.some((t) => {
+      const dbFieldName = t.column_name;
+      const schemaFieldName = field;
+      const dbType = t.type;
+      const schemaType = convertZodToCassandraType(shape[field]);
+      return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
+    })
   );
 }
 function hasKeyFieldChanged(schema, newFields, deletedFields) {
@@ -821,8 +821,6 @@ function buildInsertParams(data, fieldConfigs) {
     const value = data[fieldName];
     if (value !== void 0) {
       params.push(convertValueToCassandra(value, config));
-    } else if (!config.flags.optional) {
-      throw new Error(`\u5FC5\u586B\u5B57\u6BB5 "${fieldName}" \u672A\u63D0\u4F9B`);
     } else {
       params.push(null);
     }
@@ -1015,8 +1013,8 @@ function convertValueToCassandra(value, config) {
   }
 }
 function convertValueFromCassandra(value, config, zodSchema, filedName) {
-  if (value === null || value === void 0) {
-    return value;
+  if (value === null) {
+    return config.flags.optional ? null : void 0;
   }
   switch (config.type) {
     case "timestamp":
@@ -1032,15 +1030,13 @@ function convertValueFromCassandra(value, config, zodSchema, filedName) {
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
-      if (config.type !== "text") {
-        console.log("value", value);
+      const zodTypeName = zodSchema?.shape[filedName]?._def?.typeName;
+      if (config.type !== "text" || zodTypeName === "ZodAny" || zodTypeName === "ZodObject") {
         try {
           return JSON.parse(value);
-        } catch {
+        } catch (error) {
           return value;
         }
-      } else if (typeof value === "string" && zodSchema?.shape[filedName]?._def?.typeName === "ZodAny") {
-        return JSON.parse(value);
       }
       return value;
     default:
@@ -1603,37 +1599,13 @@ var Types = {
   double: zod.z.number,
   enum: zod.z.enum,
   object: zod.z.object,
-  anyObject: () => createCassandraType(zod.z.any(), "text"),
+  json: () => createCassandraType(zod.z.any(), "text"),
   float: () => createCassandraType(
     zod.z.number().transform((val) => parseFloat(val.toString())),
     "float"
   ),
   int: () => createCassandraType(zod.z.number().int(), "int"),
   bigint: () => createCassandraType(zod.z.bigint(), "bigint"),
-  smallint: () => createCassandraType(
-    zod.z.number().int().refine((val) => val >= -32768 && val <= 32767, {
-      message: "Value must be between -32768 and 32767"
-    }),
-    "smallint"
-  ),
-  tinyint: () => createCassandraType(
-    zod.z.number().int().refine((val) => val >= -128 && val <= 127, {
-      message: "Value must be between -128 and 127"
-    }),
-    "tinyint"
-  ),
-  varint: () => createCassandraType(
-    zod.z.number().int().transform((val) => BigInt(val)),
-    "varint"
-  ),
-  // 字符串类型
-  varchar: (maxLength) => createCassandraType(zod.z.string().max(maxLength || 65535), "varchar"),
-  ascii: () => createCassandraType(
-    zod.z.string().refine((val) => /^[\x00-\x7F]*$/.test(val), {
-      message: "String must contain only ASCII characters"
-    }),
-    "ascii"
-  ),
   // 时间类型
   timestamp: () => createCassandraType(zod.z.date(), "timestamp"),
   time: () => createCassandraType(zod.z.date(), "time"),
@@ -1650,12 +1622,6 @@ var Types = {
   set: (elementType) => createCassandraType(
     zod.z.set(elementType),
     `set<${convertZodToCassandraType(elementType)}>`
-  ),
-  map: (keyType, valueType) => createCassandraType(
-    zod.z.record(keyType, valueType),
-    `map<${convertZodToCassandraType(keyType)}, ${convertZodToCassandraType(
-      valueType
-    )}>`
   )
 };
 

package/dist/mod.d.cts

@@ -132,15 +132,10 @@ declare const Types: {
         <U extends string, T extends [U, ...U[]]>(values: T, params?: z.RawCreateParams): z.ZodEnum<T>;
     };
     object: <T extends z.ZodRawShape>(shape: T, params?: z.RawCreateParams) => z.ZodObject<T, "strip", z.ZodTypeAny, z.objectOutputType<T, z.ZodTypeAny, "strip">, z.objectInputType<T, z.ZodTypeAny, "strip">>;
-    anyObject: () => z.ZodAny & CassandraTypeMarker;
+    json: () => z.ZodAny & CassandraTypeMarker;
     float: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
     int: () => z.ZodNumber & CassandraTypeMarker;
     bigint: () => z.ZodBigInt & CassandraTypeMarker;
-    smallint: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
-    tinyint: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
-    varint: () => z.ZodEffects<z.ZodNumber, bigint, number> & CassandraTypeMarker;
-    varchar: (maxLength?: number) => z.ZodString & CassandraTypeMarker;
-    ascii: () => z.ZodEffects<z.ZodString, string, string> & CassandraTypeMarker;
     timestamp: () => z.ZodDate & CassandraTypeMarker;
     time: () => z.ZodDate & CassandraTypeMarker;
     date: () => z.ZodDate & CassandraTypeMarker;
@@ -148,7 +143,6 @@ declare const Types: {
     blob: () => z.ZodType<Uint8Array<ArrayBuffer>, z.ZodTypeDef, Uint8Array<ArrayBuffer>> & CassandraTypeMarker;
     list: <T extends z.ZodTypeAny>(elementType: T) => z.ZodArray<T, "many"> & CassandraTypeMarker;
     set: <T extends z.ZodTypeAny>(elementType: T) => z.ZodSet<T> & CassandraTypeMarker;
-    map: <K extends z.ZodTypeAny, V extends z.ZodTypeAny>(keyType: K, valueType: V) => z.ZodRecord<K, V> & CassandraTypeMarker;
 };
 
 type FieldFlags = {

package/dist/mod.d.ts

@@ -132,15 +132,10 @@ declare const Types: {
         <U extends string, T extends [U, ...U[]]>(values: T, params?: z.RawCreateParams): z.ZodEnum<T>;
     };
     object: <T extends z.ZodRawShape>(shape: T, params?: z.RawCreateParams) => z.ZodObject<T, "strip", z.ZodTypeAny, z.objectOutputType<T, z.ZodTypeAny, "strip">, z.objectInputType<T, z.ZodTypeAny, "strip">>;
-    anyObject: () => z.ZodAny & CassandraTypeMarker;
+    json: () => z.ZodAny & CassandraTypeMarker;
     float: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
     int: () => z.ZodNumber & CassandraTypeMarker;
     bigint: () => z.ZodBigInt & CassandraTypeMarker;
-    smallint: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
-    tinyint: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
-    varint: () => z.ZodEffects<z.ZodNumber, bigint, number> & CassandraTypeMarker;
-    varchar: (maxLength?: number) => z.ZodString & CassandraTypeMarker;
-    ascii: () => z.ZodEffects<z.ZodString, string, string> & CassandraTypeMarker;
     timestamp: () => z.ZodDate & CassandraTypeMarker;
     time: () => z.ZodDate & CassandraTypeMarker;
     date: () => z.ZodDate & CassandraTypeMarker;
@@ -148,7 +143,6 @@ declare const Types: {
     blob: () => z.ZodType<Uint8Array<ArrayBuffer>, z.ZodTypeDef, Uint8Array<ArrayBuffer>> & CassandraTypeMarker;
     list: <T extends z.ZodTypeAny>(elementType: T) => z.ZodArray<T, "many"> & CassandraTypeMarker;
     set: <T extends z.ZodTypeAny>(elementType: T) => z.ZodSet<T> & CassandraTypeMarker;
-    map: <K extends z.ZodTypeAny, V extends z.ZodTypeAny>(keyType: K, valueType: V) => z.ZodRecord<K, V> & CassandraTypeMarker;
 };
 
 type FieldFlags = {

package/dist/mod.js

@@ -64,21 +64,21 @@ function getNewFields(schemaFields, tableMetadata2) {
   );
 }
 function getDeletedFields(schemaFields, tableMetadata2) {
-  return tableMetadata2.filter((t) => !schemaFields.some(
-    (field) => field.toLowerCase() === t.column_name.toLowerCase()
-  )).map((t) => t.column_name);
+  return tableMetadata2.filter(
+    (t) => !schemaFields.some(
+      (field) => field.toLowerCase() === t.column_name.toLowerCase()
+    )
+  ).map((t) => t.column_name);
 }
 function getUpdatedFields(schemaFields, tableMetadata2, shape) {
   return schemaFields.filter(
-    (field) => tableMetadata2.some(
-      (t) => {
-        const dbFieldName = t.column_name;
-        const schemaFieldName = field;
-        const dbType = t.type;
-        const schemaType = convertZodToCassandraType(shape[field]);
-        return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
-      }
-    )
+    (field) => tableMetadata2.some((t) => {
+      const dbFieldName = t.column_name;
+      const schemaFieldName = field;
+      const dbType = t.type;
+      const schemaType = convertZodToCassandraType(shape[field]);
+      return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
+    })
   );
 }
 function hasKeyFieldChanged(schema, newFields, deletedFields) {
@@ -819,8 +819,6 @@ function buildInsertParams(data, fieldConfigs) {
     const value = data[fieldName];
     if (value !== void 0) {
       params.push(convertValueToCassandra(value, config));
-    } else if (!config.flags.optional) {
-      throw new Error(`\u5FC5\u586B\u5B57\u6BB5 "${fieldName}" \u672A\u63D0\u4F9B`);
     } else {
       params.push(null);
     }
@@ -1013,8 +1011,8 @@ function convertValueToCassandra(value, config) {
   }
 }
 function convertValueFromCassandra(value, config, zodSchema, filedName) {
-  if (value === null || value === void 0) {
-    return value;
+  if (value === null) {
+    return config.flags.optional ? null : void 0;
   }
   switch (config.type) {
     case "timestamp":
@@ -1030,15 +1028,13 @@ function convertValueFromCassandra(value, config, zodSchema, filedName) {
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
-      if (config.type !== "text") {
-        console.log("value", value);
+      const zodTypeName = zodSchema?.shape[filedName]?._def?.typeName;
+      if (config.type !== "text" || zodTypeName === "ZodAny" || zodTypeName === "ZodObject") {
         try {
           return JSON.parse(value);
-        } catch {
+        } catch (error) {
           return value;
         }
-      } else if (typeof value === "string" && zodSchema?.shape[filedName]?._def?.typeName === "ZodAny") {
-        return JSON.parse(value);
       }
       return value;
     default:
@@ -1601,37 +1597,13 @@ var Types = {
   double: z.number,
   enum: z.enum,
   object: z.object,
-  anyObject: () => createCassandraType(z.any(), "text"),
+  json: () => createCassandraType(z.any(), "text"),
   float: () => createCassandraType(
     z.number().transform((val) => parseFloat(val.toString())),
     "float"
   ),
   int: () => createCassandraType(z.number().int(), "int"),
   bigint: () => createCassandraType(z.bigint(), "bigint"),
-  smallint: () => createCassandraType(
-    z.number().int().refine((val) => val >= -32768 && val <= 32767, {
-      message: "Value must be between -32768 and 32767"
-    }),
-    "smallint"
-  ),
-  tinyint: () => createCassandraType(
-    z.number().int().refine((val) => val >= -128 && val <= 127, {
-      message: "Value must be between -128 and 127"
-    }),
-    "tinyint"
-  ),
-  varint: () => createCassandraType(
-    z.number().int().transform((val) => BigInt(val)),
-    "varint"
-  ),
-  // 字符串类型
-  varchar: (maxLength) => createCassandraType(z.string().max(maxLength || 65535), "varchar"),
-  ascii: () => createCassandraType(
-    z.string().refine((val) => /^[\x00-\x7F]*$/.test(val), {
-      message: "String must contain only ASCII characters"
-    }),
-    "ascii"
-  ),
   // 时间类型
   timestamp: () => createCassandraType(z.date(), "timestamp"),
   time: () => createCassandraType(z.date(), "time"),
@@ -1648,12 +1620,6 @@ var Types = {
   set: (elementType) => createCassandraType(
     z.set(elementType),
     `set<${convertZodToCassandraType(elementType)}>`
-  ),
-  map: (keyType, valueType) => createCassandraType(
-    z.record(keyType, valueType),
-    `map<${convertZodToCassandraType(keyType)}, ${convertZodToCassandraType(
-      valueType
-    )}>`
   )
 };
 

package/package.json

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