imean-cassandra-orm 2.1.1 → 2.2.0

package/dist/mod.cjs

@@ -5,6 +5,9 @@ var zod = require('zod');
 
 // src/client.ts
 function convertZodToCassandraType(schema) {
+  if (schema._cassandraType) {
+    return schema._cassandraType;
+  }
   let baseSchema = schema instanceof zod.z.ZodEffects ? schema._def.schema : schema;
   if (schema instanceof zod.z.ZodOptional) {
     return convertZodToCassandraType(schema.unwrap());
@@ -12,6 +15,9 @@ function convertZodToCassandraType(schema) {
   while (baseSchema instanceof zod.z.ZodEffects) {
     baseSchema = baseSchema._def.schema;
   }
+  if (baseSchema._cassandraType) {
+    return baseSchema._cassandraType;
+  }
   if (baseSchema instanceof zod.z.ZodString) {
     if (baseSchema._def.checks.some((c) => c.kind === "uuid")) {
       return "uuid";
@@ -146,9 +152,24 @@ function dropColumns(schema, fields) {
   return `ALTER TABLE ${schema.keyspace}.${schema.tableName} DROP (${fields.join(", ")});`;
 }
 function convertToFieldConfig(zodType, flags = {}) {
+  if (zodType._cassandraType) {
+    return {
+      type: zodType._cassandraType,
+      flags: {
+        partitionKey: !!flags.partitionKey,
+        clusteringKey: flags.clusteringKey || false,
+        optional: !!flags.optional,
+        static: !!flags.static
+      }
+    };
+  }
   let type = "text";
   if (zodType._def.typeName === "ZodString") {
-    type = "text";
+    if (zodType._def.checks && zodType._def.checks.some((c) => c.kind === "uuid")) {
+      type = "uuid";
+    } else {
+      type = "text";
+    }
   } else if (zodType._def.typeName === "ZodNumber") {
     type = "double";
   } else if (zodType._def.typeName === "ZodBoolean") {
@@ -371,7 +392,13 @@ function convertValueFromCassandra(value, config) {
     case "timestamp":
       return value instanceof Date ? value : new Date(value);
     case "uuid":
-      return typeof value === "string" ? value : value.toString();
+      if (typeof value === "string") {
+        return value;
+      }
+      if (value && typeof value.toString === "function") {
+        return value.toString();
+      }
+      return String(value);
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
@@ -816,10 +843,89 @@ var Client = class {
     return this.cassandraClient;
   }
 };
+function createCassandraType(schema, cassandraType) {
+  const markedSchema = schema;
+  markedSchema._cassandraType = cassandraType;
+  return markedSchema;
+}
+var Types = {
+  boolean: zod.z.boolean,
+  text: zod.z.string,
+  double: zod.z.number,
+  enum: zod.z.enum,
+  object: zod.z.object,
+  float: () => createCassandraType(
+    zod.z.number().transform((val) => parseFloat(val.toString())),
+    "float"
+  ),
+  int: () => createCassandraType(zod.z.number().int(), "int"),
+  bigint: () => createCassandraType(
+    zod.z.number().int().transform((val) => BigInt(val)),
+    "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"),
+  date: () => createCassandraType(zod.z.date(), "date"),
+  // UUID 类型
+  uuid: () => createCassandraType(zod.z.string().uuid(), "uuid"),
+  // 二进制类型
+  blob: () => createCassandraType(zod.z.instanceof(Uint8Array), "blob"),
+  // 集合类型
+  list: (elementType) => createCassandraType(
+    zod.z.array(elementType),
+    `list<${getCassandraTypeFromZod(elementType)}>`
+  ),
+  set: (elementType) => createCassandraType(
+    zod.z.set(elementType),
+    `set<${getCassandraTypeFromZod(elementType)}>`
+  ),
+  map: (keyType, valueType) => createCassandraType(
+    zod.z.record(keyType, valueType),
+    `map<${getCassandraTypeFromZod(keyType)}, ${getCassandraTypeFromZod(
+      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;
 exports.TableSchema = TableSchema;
+exports.Types = Types;
 exports.createModel = createModel;
 exports.createTableSchema = createTableSchema;
 exports.uuid = uuid;

package/dist/mod.d.cts

@@ -2,34 +2,44 @@ import * as cassandra_driver from 'cassandra-driver';
 import { ClientOptions, QueryOptions, Client as Client$1 } from 'cassandra-driver';
 import { z } from 'zod';
 
-type TypeMap = {
-    text: string;
-    int: number;
-    bigint: number;
-    varint: number;
-    boolean: boolean;
-    timestamp: Date;
-    uuid: string;
-    blob: Uint8Array;
-    float: number;
-    double: number;
-    list: any[];
-    set: any[];
-    map: any;
-};
-type FieldConfig<T extends keyof TypeMap> = {
-    type: T;
-    flags: {
-        partitionKey: boolean;
-        clusteringKey: boolean | {
-            order: "ASC" | "DESC";
-        };
-        optional: boolean;
-        static: boolean;
+/**
+ * Cassandra 数据类型扩展
+ * 提供更精确的类型映射支持
+ */
+interface CassandraTypeMarker {
+    _cassandraType: string;
+}
+declare const Types: {
+    boolean: (params?: z.RawCreateParams & {
+        coerce?: boolean;
+    }) => z.ZodBoolean;
+    text: (params?: z.RawCreateParams & {
+        coerce?: true;
+    }) => z.ZodString;
+    double: (params?: z.RawCreateParams & {
+        coerce?: boolean;
+    }) => z.ZodNumber;
+    enum: {
+        <U extends string, T extends Readonly<[U, ...U[]]>>(values: T, params?: z.RawCreateParams): z.ZodEnum<z.Writeable<T>>;
+        <U extends string, T extends [U, ...U[]]>(values: T, params?: z.RawCreateParams): z.ZodEnum<T>;
     };
-    elementType?: keyof TypeMap;
-    keyType?: keyof TypeMap;
-    valueType?: keyof TypeMap;
+    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">>;
+    float: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
+    int: () => z.ZodNumber & CassandraTypeMarker;
+    bigint: () => z.ZodEffects<z.ZodNumber, bigint, number> & 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;
+    uuid: () => z.ZodString & CassandraTypeMarker;
+    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;
 };
 
 interface KeyspaceConfig {
@@ -79,9 +89,9 @@ type ExtractFieldConfig<T extends z.ZodTypeAny> = {
         };
     } ? "double" : "double" : T extends z.ZodBoolean ? "boolean" : T extends z.ZodDate ? "timestamp" : T extends z.ZodType<Uint8Array> ? "blob" : T extends z.ZodArray<any> ? "list" : T extends z.ZodSet<any> ? "set" : T extends z.ZodRecord<any, any> ? "map" : "text";
     flags: FieldFlags;
-    elementType?: keyof TypeMap;
-    keyType?: keyof TypeMap;
-    valueType?: keyof TypeMap;
+    elementType?: keyof typeof Types;
+    keyType?: keyof typeof Types;
+    valueType?: keyof typeof Types;
 };
 type ClusteringKeyConfig = Record<string, "asc" | "desc">;
 type SchemaConfig<F extends z.ZodRawShape> = {
@@ -226,4 +236,4 @@ declare class Client {
     getCassandraClient(): Client$1;
 }
 
-export { Client, type ClusteringKeyConfig, type ExtractClusteringKeyShape, type ExtractClusteringKeyType, type ExtractFieldConfig, type ExtractPartitionKeyShape, type ExtractPartitionKeyType, type FieldConfig, type FieldFlags, Model, type OrmOptions, type Schema, type SchemaConfig, type SchemaDefinition, TableSchema, type TypeMap, createModel, createTableSchema, uuid };
+export { Client, type ClusteringKeyConfig, type ExtractClusteringKeyShape, type ExtractClusteringKeyType, type ExtractFieldConfig, type ExtractPartitionKeyShape, type ExtractPartitionKeyType, type FieldFlags, Model, type OrmOptions, type Schema, type SchemaConfig, type SchemaDefinition, TableSchema, Types, createModel, createTableSchema, uuid };

package/dist/mod.d.ts

@@ -2,34 +2,44 @@ import * as cassandra_driver from 'cassandra-driver';
 import { ClientOptions, QueryOptions, Client as Client$1 } from 'cassandra-driver';
 import { z } from 'zod';
 
-type TypeMap = {
-    text: string;
-    int: number;
-    bigint: number;
-    varint: number;
-    boolean: boolean;
-    timestamp: Date;
-    uuid: string;
-    blob: Uint8Array;
-    float: number;
-    double: number;
-    list: any[];
-    set: any[];
-    map: any;
-};
-type FieldConfig<T extends keyof TypeMap> = {
-    type: T;
-    flags: {
-        partitionKey: boolean;
-        clusteringKey: boolean | {
-            order: "ASC" | "DESC";
-        };
-        optional: boolean;
-        static: boolean;
+/**
+ * Cassandra 数据类型扩展
+ * 提供更精确的类型映射支持
+ */
+interface CassandraTypeMarker {
+    _cassandraType: string;
+}
+declare const Types: {
+    boolean: (params?: z.RawCreateParams & {
+        coerce?: boolean;
+    }) => z.ZodBoolean;
+    text: (params?: z.RawCreateParams & {
+        coerce?: true;
+    }) => z.ZodString;
+    double: (params?: z.RawCreateParams & {
+        coerce?: boolean;
+    }) => z.ZodNumber;
+    enum: {
+        <U extends string, T extends Readonly<[U, ...U[]]>>(values: T, params?: z.RawCreateParams): z.ZodEnum<z.Writeable<T>>;
+        <U extends string, T extends [U, ...U[]]>(values: T, params?: z.RawCreateParams): z.ZodEnum<T>;
     };
-    elementType?: keyof TypeMap;
-    keyType?: keyof TypeMap;
-    valueType?: keyof TypeMap;
+    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">>;
+    float: () => z.ZodEffects<z.ZodNumber, number, number> & CassandraTypeMarker;
+    int: () => z.ZodNumber & CassandraTypeMarker;
+    bigint: () => z.ZodEffects<z.ZodNumber, bigint, number> & 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;
+    uuid: () => z.ZodString & CassandraTypeMarker;
+    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;
 };
 
 interface KeyspaceConfig {
@@ -79,9 +89,9 @@ type ExtractFieldConfig<T extends z.ZodTypeAny> = {
         };
     } ? "double" : "double" : T extends z.ZodBoolean ? "boolean" : T extends z.ZodDate ? "timestamp" : T extends z.ZodType<Uint8Array> ? "blob" : T extends z.ZodArray<any> ? "list" : T extends z.ZodSet<any> ? "set" : T extends z.ZodRecord<any, any> ? "map" : "text";
     flags: FieldFlags;
-    elementType?: keyof TypeMap;
-    keyType?: keyof TypeMap;
-    valueType?: keyof TypeMap;
+    elementType?: keyof typeof Types;
+    keyType?: keyof typeof Types;
+    valueType?: keyof typeof Types;
 };
 type ClusteringKeyConfig = Record<string, "asc" | "desc">;
 type SchemaConfig<F extends z.ZodRawShape> = {
@@ -226,4 +236,4 @@ declare class Client {
     getCassandraClient(): Client$1;
 }
 
-export { Client, type ClusteringKeyConfig, type ExtractClusteringKeyShape, type ExtractClusteringKeyType, type ExtractFieldConfig, type ExtractPartitionKeyShape, type ExtractPartitionKeyType, type FieldConfig, type FieldFlags, Model, type OrmOptions, type Schema, type SchemaConfig, type SchemaDefinition, TableSchema, type TypeMap, createModel, createTableSchema, uuid };
+export { Client, type ClusteringKeyConfig, type ExtractClusteringKeyShape, type ExtractClusteringKeyType, type ExtractFieldConfig, type ExtractPartitionKeyShape, type ExtractPartitionKeyType, type FieldFlags, Model, type OrmOptions, type Schema, type SchemaConfig, type SchemaDefinition, TableSchema, Types, createModel, createTableSchema, uuid };

package/dist/mod.js

@@ -3,6 +3,9 @@ import { z } from 'zod';
 
 // src/client.ts
 function convertZodToCassandraType(schema) {
+  if (schema._cassandraType) {
+    return schema._cassandraType;
+  }
   let baseSchema = schema instanceof z.ZodEffects ? schema._def.schema : schema;
   if (schema instanceof z.ZodOptional) {
     return convertZodToCassandraType(schema.unwrap());
@@ -10,6 +13,9 @@ function convertZodToCassandraType(schema) {
   while (baseSchema instanceof z.ZodEffects) {
     baseSchema = baseSchema._def.schema;
   }
+  if (baseSchema._cassandraType) {
+    return baseSchema._cassandraType;
+  }
   if (baseSchema instanceof z.ZodString) {
     if (baseSchema._def.checks.some((c) => c.kind === "uuid")) {
       return "uuid";
@@ -144,9 +150,24 @@ function dropColumns(schema, fields) {
   return `ALTER TABLE ${schema.keyspace}.${schema.tableName} DROP (${fields.join(", ")});`;
 }
 function convertToFieldConfig(zodType, flags = {}) {
+  if (zodType._cassandraType) {
+    return {
+      type: zodType._cassandraType,
+      flags: {
+        partitionKey: !!flags.partitionKey,
+        clusteringKey: flags.clusteringKey || false,
+        optional: !!flags.optional,
+        static: !!flags.static
+      }
+    };
+  }
   let type = "text";
   if (zodType._def.typeName === "ZodString") {
-    type = "text";
+    if (zodType._def.checks && zodType._def.checks.some((c) => c.kind === "uuid")) {
+      type = "uuid";
+    } else {
+      type = "text";
+    }
   } else if (zodType._def.typeName === "ZodNumber") {
     type = "double";
   } else if (zodType._def.typeName === "ZodBoolean") {
@@ -369,7 +390,13 @@ function convertValueFromCassandra(value, config) {
     case "timestamp":
       return value instanceof Date ? value : new Date(value);
     case "uuid":
-      return typeof value === "string" ? value : value.toString();
+      if (typeof value === "string") {
+        return value;
+      }
+      if (value && typeof value.toString === "function") {
+        return value.toString();
+      }
+      return String(value);
     case "blob":
       return value instanceof Uint8Array ? value : new Uint8Array(value);
     case "text":
@@ -814,5 +841,83 @@ var Client = class {
     return this.cassandraClient;
   }
 };
+function createCassandraType(schema, cassandraType) {
+  const markedSchema = schema;
+  markedSchema._cassandraType = cassandraType;
+  return markedSchema;
+}
+var Types = {
+  boolean: z.boolean,
+  text: z.string,
+  double: z.number,
+  enum: z.enum,
+  object: z.object,
+  float: () => createCassandraType(
+    z.number().transform((val) => parseFloat(val.toString())),
+    "float"
+  ),
+  int: () => createCassandraType(z.number().int(), "int"),
+  bigint: () => createCassandraType(
+    z.number().int().transform((val) => BigInt(val)),
+    "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"),
+  date: () => createCassandraType(z.date(), "date"),
+  // UUID 类型
+  uuid: () => createCassandraType(z.string().uuid(), "uuid"),
+  // 二进制类型
+  blob: () => createCassandraType(z.instanceof(Uint8Array), "blob"),
+  // 集合类型
+  list: (elementType) => createCassandraType(
+    z.array(elementType),
+    `list<${getCassandraTypeFromZod(elementType)}>`
+  ),
+  set: (elementType) => createCassandraType(
+    z.set(elementType),
+    `set<${getCassandraTypeFromZod(elementType)}>`
+  ),
+  map: (keyType, valueType) => createCassandraType(
+    z.record(keyType, valueType),
+    `map<${getCassandraTypeFromZod(keyType)}, ${getCassandraTypeFromZod(
+      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, createModel, createTableSchema, uuid };
+export { Client, Model, TableSchema, Types, createModel, createTableSchema, uuid };

package/package.json

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