imean-cassandra-orm 1.1.0 → 1.2.1

package/dist/mod.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var cassandraDriver = require('cassandra-driver');
+var zod = require('zod');
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -17,8 +18,65 @@ __export(src_exports, {
   Field: () => Field,
   FieldBuilder: () => FieldBuilder,
   Model: () => Model,
+  createClusteringKeyZodSchema: () => createClusteringKeyZodSchema,
+  createPartitionKeyZodSchema: () => createPartitionKeyZodSchema,
+  createZodSchema: () => createZodSchema,
   uuid: () => uuid
 });
+function createZodSchemaForFields(schema, filter, makeOptional = false) {
+  const zodSchema = {};
+  Object.entries(schema).forEach(([key, config]) => {
+    if (filter(config)) {
+      let baseSchema;
+      switch (config.type) {
+        case "text":
+          baseSchema = zod.z.string();
+          break;
+        case "int":
+        case "bigint":
+        case "varint":
+          baseSchema = zod.z.number().int();
+          break;
+        case "float":
+        case "double":
+          baseSchema = zod.z.number();
+          break;
+        case "boolean":
+          baseSchema = zod.z.boolean();
+          break;
+        case "timestamp":
+          baseSchema = zod.z.date();
+          break;
+        case "uuid":
+          baseSchema = zod.z.union([zod.z.string(), zod.z.instanceof(cassandraDriver.types.Uuid)]).transform(
+            (val) => val instanceof cassandraDriver.types.Uuid ? val.toString() : val
+          );
+          break;
+        default:
+          baseSchema = zod.z.any();
+      }
+      zodSchema[key] = makeOptional && config.flags.optional ? baseSchema.optional() : baseSchema;
+    }
+  });
+  return zod.z.object(zodSchema);
+}
+function createZodSchema(schema) {
+  return createZodSchemaForFields(schema, () => true);
+}
+function createPartitionKeyZodSchema(schema) {
+  return createZodSchemaForFields(
+    schema,
+    (config) => config.flags.partitionKey
+  );
+}
+function createClusteringKeyZodSchema(schema) {
+  return createZodSchemaForFields(
+    schema,
+    (config) => !!config.flags.clusteringKey
+  );
+}
+
+// src/model.ts
 var Model = class {
   constructor(client, schema, tableName) {
     this.client = client;
@@ -26,10 +84,16 @@ var Model = class {
     this.tableName = tableName;
     this.partitionKeys = Object.entries(schema).filter(([_, config]) => config.flags.partitionKey).map(([key]) => key);
     this.clusteringKeys = Object.entries(schema).filter(([_, config]) => config.flags.clusteringKey).map(([key]) => key);
+    this.zodSchemas = {
+      entity: createZodSchema(schema),
+      partitionKey: createPartitionKeyZodSchema(schema),
+      clusteringKey: createClusteringKeyZodSchema(schema)
+    };
   }
   tableName;
   partitionKeys;
   clusteringKeys;
+  zodSchemas;
   // 获取表结构 CQL
   getTableSchema() {
     const columns = Object.entries(this.schema).map(([name, config]) => {
@@ -125,13 +189,31 @@ var Model = class {
     }
     return params;
   }
+  // 验证数据
+  validate(data) {
+    try {
+      this.zodSchemas.entity.parse(data);
+      return true;
+    } catch (error) {
+      return false;
+    }
+  }
+  // 获取验证错误
+  getValidationErrors(data) {
+    try {
+      this.zodSchemas.entity.parse(data);
+      return null;
+    } catch (error) {
+      return error;
+    }
+  }
   // 将查询结果转换为我们的类型
   convertResultToType(result) {
     const converted = {};
     Object.keys(this.schema).forEach((key) => {
       converted[key] = result[key];
     });
-    return converted;
+    return this.zodSchemas.entity.parse(converted);
   }
   // 查询方法
   async findAll(partitionFields, clusteringFields) {
@@ -183,6 +265,35 @@ var Model = class {
     const query = `DELETE FROM ${this.tableName} ${whereClause}`;
     await this.client.execute(query, params, { prepare: true });
   }
+  // 优化后的批量查询方法（支持静态列）
+  async findAllOptimized(partitionFields, clusteringFields) {
+    const staticColumns = Object.entries(this.schema).filter(([_, config]) => config.flags.static).map(([name]) => name);
+    const nonStaticColumns = Object.entries(this.schema).filter(([_, config]) => !config.flags.static).map(([name]) => name);
+    const whereClause = this.buildWhereClause(
+      partitionFields,
+      clusteringFields
+    );
+    const params = this.buildQueryParams(partitionFields, clusteringFields);
+    const [staticResult, nonStaticResult] = await Promise.all([
+      // 查询静态列
+      staticColumns.length > 0 ? this.client.execute(
+        `SELECT ${staticColumns.join(", ")} FROM ${this.tableName} ${whereClause} LIMIT 1`,
+        params,
+        { prepare: true }
+      ) : Promise.resolve({ rows: [] }),
+      // 查询非静态列
+      this.client.execute(
+        `SELECT ${nonStaticColumns.join(", ")} FROM ${this.tableName} ${whereClause}`,
+        params,
+        { prepare: true }
+      )
+    ]);
+    const staticData = staticResult.rows[0] || {};
+    return nonStaticResult.rows.map((row) => ({
+      ...staticData,
+      ...row
+    }));
+  }
 };
 var uuid = () => cassandraDriver.types.Uuid.random().toString();
 
@@ -313,5 +424,8 @@ exports.Client = Client2;
 exports.Field = Field;
 exports.FieldBuilder = FieldBuilder;
 exports.Model = Model;
+exports.createClusteringKeyZodSchema = createClusteringKeyZodSchema;
+exports.createPartitionKeyZodSchema = createPartitionKeyZodSchema;
+exports.createZodSchema = createZodSchema;
 exports.default = mod_default;
 exports.uuid = uuid;

package/dist/mod.d.cts

@@ -1,4 +1,5 @@
 import { Client as Client$1 } from 'cassandra-driver';
+import { z } from 'zod';
 
 type TypeMap = {
     text: string;
@@ -245,6 +246,15 @@ type InferStaticFields<M extends Model<any>> = M extends Model<infer S> ? InferF
 type Simplify<T> = T extends infer U ? {
     [K in keyof U]: U[K];
 } : never;
+declare function createZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<any>;
+declare function createPartitionKeyZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<{
+    [K in keyof S as S[K]["flags"]["partitionKey"] extends true ? K : never]: TypeMap[S[K]["type"]];
+}>;
+declare function createClusteringKeyZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<{
+    [K in keyof S as S[K]["flags"]["clusteringKey"] extends true | {
+        order: "ASC" | "DESC";
+    } ? K : never]: TypeMap[S[K]["type"]];
+}>;
 
 declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = InferFieldsByFlag<S, "partitionKey">, C = InferFieldsByFlag<S, "clusteringKey">, NP = InferNonPartitionFields<S>, A = InferFields<S>> {
     private client;
@@ -252,17 +262,25 @@ declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = In
     private tableName;
     private partitionKeys;
     private clusteringKeys;
+    readonly zodSchemas: {
+        entity: z.ZodType<any>;
+        partitionKey: z.ZodType<any>;
+        clusteringKey: z.ZodType<any>;
+    };
     constructor(client: Client$1, schema: S, tableName: string);
     getTableSchema(): string;
     syncSchema(): Promise<void>;
     private buildWhereClause;
     private buildQueryParams;
+    validate(data: any): data is Simplify<A>;
+    getValidationErrors(data: any): z.ZodError | null;
     private convertResultToType;
     findAll(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
     findOne(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A> | null>;
     create(data: Simplify<P & Partial<NP>>): Promise<void>;
     update(partitionFields: Simplify<P>, data: Simplify<Partial<NP>>): Promise<void>;
     delete(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<void>;
+    findAllOptimized(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
 }
 declare const uuid: () => string;
 
@@ -311,9 +329,12 @@ type orm_Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = InferFi
 declare const orm_Model: typeof Model;
 type orm_Simplify<T> = Simplify<T>;
 type orm_TypeMap = TypeMap;
+declare const orm_createClusteringKeyZodSchema: typeof createClusteringKeyZodSchema;
+declare const orm_createPartitionKeyZodSchema: typeof createPartitionKeyZodSchema;
+declare const orm_createZodSchema: typeof createZodSchema;
 declare const orm_uuid: typeof uuid;
 declare namespace orm {
-  export { orm_Client as Client, orm_Field as Field, orm_FieldBuilder as FieldBuilder, type orm_FieldConfig as FieldConfig, type orm_Infer as Infer, type orm_InferClusteringKey as InferClusteringKey, type orm_InferFields as InferFields, type orm_InferFieldsByFlag as InferFieldsByFlag, type orm_InferNonPartitionFields as InferNonPartitionFields, type orm_InferPartitionKey as InferPartitionKey, type orm_InferStaticFields as InferStaticFields, type orm_InferType as InferType, orm_Model as Model, type orm_Simplify as Simplify, type orm_TypeMap as TypeMap, orm_uuid as uuid };
+  export { orm_Client as Client, orm_Field as Field, orm_FieldBuilder as FieldBuilder, type orm_FieldConfig as FieldConfig, type orm_Infer as Infer, type orm_InferClusteringKey as InferClusteringKey, type orm_InferFields as InferFields, type orm_InferFieldsByFlag as InferFieldsByFlag, type orm_InferNonPartitionFields as InferNonPartitionFields, type orm_InferPartitionKey as InferPartitionKey, type orm_InferStaticFields as InferStaticFields, type orm_InferType as InferType, orm_Model as Model, type orm_Simplify as Simplify, type orm_TypeMap as TypeMap, orm_createClusteringKeyZodSchema as createClusteringKeyZodSchema, orm_createPartitionKeyZodSchema as createPartitionKeyZodSchema, orm_createZodSchema as createZodSchema, orm_uuid as uuid };
 }
 
-export { Client, Field, FieldBuilder, type FieldConfig, type Infer, type InferClusteringKey, type InferFields, type InferFieldsByFlag, type InferNonPartitionFields, type InferPartitionKey, type InferStaticFields, type InferType, Model, type Simplify, type TypeMap, orm as default, uuid };
+export { Client, Field, FieldBuilder, type FieldConfig, type Infer, type InferClusteringKey, type InferFields, type InferFieldsByFlag, type InferNonPartitionFields, type InferPartitionKey, type InferStaticFields, type InferType, Model, type Simplify, type TypeMap, createClusteringKeyZodSchema, createPartitionKeyZodSchema, createZodSchema, orm as default, uuid };

package/dist/mod.d.ts

@@ -1,4 +1,5 @@
 import { Client as Client$1 } from 'cassandra-driver';
+import { z } from 'zod';
 
 type TypeMap = {
     text: string;
@@ -245,6 +246,15 @@ type InferStaticFields<M extends Model<any>> = M extends Model<infer S> ? InferF
 type Simplify<T> = T extends infer U ? {
     [K in keyof U]: U[K];
 } : never;
+declare function createZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<any>;
+declare function createPartitionKeyZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<{
+    [K in keyof S as S[K]["flags"]["partitionKey"] extends true ? K : never]: TypeMap[S[K]["type"]];
+}>;
+declare function createClusteringKeyZodSchema<S extends Record<string, FieldConfig<keyof TypeMap>>>(schema: S): z.ZodType<{
+    [K in keyof S as S[K]["flags"]["clusteringKey"] extends true | {
+        order: "ASC" | "DESC";
+    } ? K : never]: TypeMap[S[K]["type"]];
+}>;
 
 declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = InferFieldsByFlag<S, "partitionKey">, C = InferFieldsByFlag<S, "clusteringKey">, NP = InferNonPartitionFields<S>, A = InferFields<S>> {
     private client;
@@ -252,17 +262,25 @@ declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = In
     private tableName;
     private partitionKeys;
     private clusteringKeys;
+    readonly zodSchemas: {
+        entity: z.ZodType<any>;
+        partitionKey: z.ZodType<any>;
+        clusteringKey: z.ZodType<any>;
+    };
     constructor(client: Client$1, schema: S, tableName: string);
     getTableSchema(): string;
     syncSchema(): Promise<void>;
     private buildWhereClause;
     private buildQueryParams;
+    validate(data: any): data is Simplify<A>;
+    getValidationErrors(data: any): z.ZodError | null;
     private convertResultToType;
     findAll(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
     findOne(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A> | null>;
     create(data: Simplify<P & Partial<NP>>): Promise<void>;
     update(partitionFields: Simplify<P>, data: Simplify<Partial<NP>>): Promise<void>;
     delete(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<void>;
+    findAllOptimized(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
 }
 declare const uuid: () => string;
 
@@ -311,9 +329,12 @@ type orm_Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = InferFi
 declare const orm_Model: typeof Model;
 type orm_Simplify<T> = Simplify<T>;
 type orm_TypeMap = TypeMap;
+declare const orm_createClusteringKeyZodSchema: typeof createClusteringKeyZodSchema;
+declare const orm_createPartitionKeyZodSchema: typeof createPartitionKeyZodSchema;
+declare const orm_createZodSchema: typeof createZodSchema;
 declare const orm_uuid: typeof uuid;
 declare namespace orm {
-  export { orm_Client as Client, orm_Field as Field, orm_FieldBuilder as FieldBuilder, type orm_FieldConfig as FieldConfig, type orm_Infer as Infer, type orm_InferClusteringKey as InferClusteringKey, type orm_InferFields as InferFields, type orm_InferFieldsByFlag as InferFieldsByFlag, type orm_InferNonPartitionFields as InferNonPartitionFields, type orm_InferPartitionKey as InferPartitionKey, type orm_InferStaticFields as InferStaticFields, type orm_InferType as InferType, orm_Model as Model, type orm_Simplify as Simplify, type orm_TypeMap as TypeMap, orm_uuid as uuid };
+  export { orm_Client as Client, orm_Field as Field, orm_FieldBuilder as FieldBuilder, type orm_FieldConfig as FieldConfig, type orm_Infer as Infer, type orm_InferClusteringKey as InferClusteringKey, type orm_InferFields as InferFields, type orm_InferFieldsByFlag as InferFieldsByFlag, type orm_InferNonPartitionFields as InferNonPartitionFields, type orm_InferPartitionKey as InferPartitionKey, type orm_InferStaticFields as InferStaticFields, type orm_InferType as InferType, orm_Model as Model, type orm_Simplify as Simplify, type orm_TypeMap as TypeMap, orm_createClusteringKeyZodSchema as createClusteringKeyZodSchema, orm_createPartitionKeyZodSchema as createPartitionKeyZodSchema, orm_createZodSchema as createZodSchema, orm_uuid as uuid };
 }
 
-export { Client, Field, FieldBuilder, type FieldConfig, type Infer, type InferClusteringKey, type InferFields, type InferFieldsByFlag, type InferNonPartitionFields, type InferPartitionKey, type InferStaticFields, type InferType, Model, type Simplify, type TypeMap, orm as default, uuid };
+export { Client, Field, FieldBuilder, type FieldConfig, type Infer, type InferClusteringKey, type InferFields, type InferFieldsByFlag, type InferNonPartitionFields, type InferPartitionKey, type InferStaticFields, type InferType, Model, type Simplify, type TypeMap, createClusteringKeyZodSchema, createPartitionKeyZodSchema, createZodSchema, orm as default, uuid };

package/dist/mod.js

@@ -1,4 +1,5 @@
 import { types } from 'cassandra-driver';
+import { z } from 'zod';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -13,8 +14,65 @@ __export(src_exports, {
   Field: () => Field,
   FieldBuilder: () => FieldBuilder,
   Model: () => Model,
+  createClusteringKeyZodSchema: () => createClusteringKeyZodSchema,
+  createPartitionKeyZodSchema: () => createPartitionKeyZodSchema,
+  createZodSchema: () => createZodSchema,
   uuid: () => uuid
 });
+function createZodSchemaForFields(schema, filter, makeOptional = false) {
+  const zodSchema = {};
+  Object.entries(schema).forEach(([key, config]) => {
+    if (filter(config)) {
+      let baseSchema;
+      switch (config.type) {
+        case "text":
+          baseSchema = z.string();
+          break;
+        case "int":
+        case "bigint":
+        case "varint":
+          baseSchema = z.number().int();
+          break;
+        case "float":
+        case "double":
+          baseSchema = z.number();
+          break;
+        case "boolean":
+          baseSchema = z.boolean();
+          break;
+        case "timestamp":
+          baseSchema = z.date();
+          break;
+        case "uuid":
+          baseSchema = z.union([z.string(), z.instanceof(types.Uuid)]).transform(
+            (val) => val instanceof types.Uuid ? val.toString() : val
+          );
+          break;
+        default:
+          baseSchema = z.any();
+      }
+      zodSchema[key] = makeOptional && config.flags.optional ? baseSchema.optional() : baseSchema;
+    }
+  });
+  return z.object(zodSchema);
+}
+function createZodSchema(schema) {
+  return createZodSchemaForFields(schema, () => true);
+}
+function createPartitionKeyZodSchema(schema) {
+  return createZodSchemaForFields(
+    schema,
+    (config) => config.flags.partitionKey
+  );
+}
+function createClusteringKeyZodSchema(schema) {
+  return createZodSchemaForFields(
+    schema,
+    (config) => !!config.flags.clusteringKey
+  );
+}
+
+// src/model.ts
 var Model = class {
   constructor(client, schema, tableName) {
     this.client = client;
@@ -22,10 +80,16 @@ var Model = class {
     this.tableName = tableName;
     this.partitionKeys = Object.entries(schema).filter(([_, config]) => config.flags.partitionKey).map(([key]) => key);
     this.clusteringKeys = Object.entries(schema).filter(([_, config]) => config.flags.clusteringKey).map(([key]) => key);
+    this.zodSchemas = {
+      entity: createZodSchema(schema),
+      partitionKey: createPartitionKeyZodSchema(schema),
+      clusteringKey: createClusteringKeyZodSchema(schema)
+    };
   }
   tableName;
   partitionKeys;
   clusteringKeys;
+  zodSchemas;
   // 获取表结构 CQL
   getTableSchema() {
     const columns = Object.entries(this.schema).map(([name, config]) => {
@@ -121,13 +185,31 @@ var Model = class {
     }
     return params;
   }
+  // 验证数据
+  validate(data) {
+    try {
+      this.zodSchemas.entity.parse(data);
+      return true;
+    } catch (error) {
+      return false;
+    }
+  }
+  // 获取验证错误
+  getValidationErrors(data) {
+    try {
+      this.zodSchemas.entity.parse(data);
+      return null;
+    } catch (error) {
+      return error;
+    }
+  }
   // 将查询结果转换为我们的类型
   convertResultToType(result) {
     const converted = {};
     Object.keys(this.schema).forEach((key) => {
       converted[key] = result[key];
     });
-    return converted;
+    return this.zodSchemas.entity.parse(converted);
   }
   // 查询方法
   async findAll(partitionFields, clusteringFields) {
@@ -179,6 +261,35 @@ var Model = class {
     const query = `DELETE FROM ${this.tableName} ${whereClause}`;
     await this.client.execute(query, params, { prepare: true });
   }
+  // 优化后的批量查询方法（支持静态列）
+  async findAllOptimized(partitionFields, clusteringFields) {
+    const staticColumns = Object.entries(this.schema).filter(([_, config]) => config.flags.static).map(([name]) => name);
+    const nonStaticColumns = Object.entries(this.schema).filter(([_, config]) => !config.flags.static).map(([name]) => name);
+    const whereClause = this.buildWhereClause(
+      partitionFields,
+      clusteringFields
+    );
+    const params = this.buildQueryParams(partitionFields, clusteringFields);
+    const [staticResult, nonStaticResult] = await Promise.all([
+      // 查询静态列
+      staticColumns.length > 0 ? this.client.execute(
+        `SELECT ${staticColumns.join(", ")} FROM ${this.tableName} ${whereClause} LIMIT 1`,
+        params,
+        { prepare: true }
+      ) : Promise.resolve({ rows: [] }),
+      // 查询非静态列
+      this.client.execute(
+        `SELECT ${nonStaticColumns.join(", ")} FROM ${this.tableName} ${whereClause}`,
+        params,
+        { prepare: true }
+      )
+    ]);
+    const staticData = staticResult.rows[0] || {};
+    return nonStaticResult.rows.map((row) => ({
+      ...staticData,
+      ...row
+    }));
+  }
 };
 var uuid = () => types.Uuid.random().toString();
 
@@ -305,4 +416,4 @@ var Field = {
 // mod.ts
 var mod_default = src_exports;
 
-export { Client2 as Client, Field, FieldBuilder, Model, mod_default as default, uuid };
+export { Client2 as Client, Field, FieldBuilder, Model, createClusteringKeyZodSchema, createPartitionKeyZodSchema, createZodSchema, mod_default as default, uuid };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-cassandra-orm",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "cassandra orm",
   "keywords": [
     "cassandra",
@@ -34,6 +34,7 @@
   },
   "dependencies": {},
   "peerDependencies": {
+    "zod": "^3.x",
     "@opentelemetry/api": "^1.x",
     "cassandra-driver": "^4.x"
   },