imean-cassandra-orm 3.0.3 → 3.1.0

package/dist/mod.cjs

@@ -766,13 +766,14 @@ function convertSchemaToFieldConfigs(schema) {
   });
   return configs;
 }
-function buildInsertCql(schema) {
+function buildInsertCql(schema, options) {
   const tableRef = schema.keyspace ? `${schema.keyspace}.${schema.tableName}` : schema.tableName;
   const columns = Object.keys(schema.fields.shape);
   const placeholders = columns.map(() => "?").join(", ");
+  const ttlSegment = options?.ttl ? ` USING TTL ${options.ttl}` : "";
   return `INSERT INTO ${tableRef} (${columns.join(
     ", "
-  )}) VALUES (${placeholders});`;
+  )}) VALUES (${placeholders})${ttlSegment};`;
 }
 function buildInsertParams(data, fieldConfigs) {
   const params = [];
@@ -1278,7 +1279,9 @@ function syncIndexes(schema, existingIndexes) {
       const normalizedExisting = normalizeOptions(existingOptions);
       const normalizedNew = normalizeOptions(newOptions);
       if (normalizedExisting !== normalizedNew) {
-        operations.push(`DROP INDEX IF EXISTS ${schema.keyspace}.${indexName};`);
+        operations.push(
+          `DROP INDEX IF EXISTS ${schema.keyspace}.${indexName};`
+        );
         let createQuery = `CREATE INDEX ${indexName} ON ${schema.keyspace}.${schema.tableName} (${indexInfo.fieldName}) USING 'sai'`;
         if (indexInfo.options) {
           createQuery += ` WITH OPTIONS = ${indexInfo.options}`;
@@ -1380,9 +1383,9 @@ var Model = class _Model {
     const schema = new TableSchema(definition);
     return new _Model(schema, client);
   }
-  async insert(data) {
+  async insert(data, options) {
     this.schema.fields.parse(data);
-    const cassandraQuery = this.buildInsertQuery(data);
+    const cassandraQuery = this.buildInsertQuery(data, options);
     const dualWriteManager = this.client.getDualWriteManager();
     await Promise.all([
       this.client.execute(cassandraQuery.query, cassandraQuery.params, {
@@ -1431,10 +1434,10 @@ var Model = class _Model {
       )
     ]);
   }
-  async batchInsert(dataArray) {
+  async batchInsert(dataArray, options) {
     dataArray.forEach((data) => this.schema.fields.parse(data));
     const cassandraQueries = dataArray.map(
-      (data) => this.buildInsertQuery(data)
+      (data) => this.buildInsertQuery(data, options)
     );
     const dualWriteManager = this.client.getDualWriteManager();
     const validatedDataArray = dataArray.map(
@@ -1527,12 +1530,19 @@ var Model = class _Model {
   // 同步 Schema
   async syncSchema(force = false) {
     try {
-      console.log(`\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(
+        `\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`
+      );
       const operations = await this.syncTableSchema(force);
-      console.log(`\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`);
+      console.log(
+        `\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`
+      );
       return operations.join("\n");
     } catch (error) {
-      console.error(`\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`, error);
+      console.error(
+        `\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`,
+        error
+      );
       throw error;
     }
   }
@@ -1540,12 +1550,18 @@ var Model = class _Model {
   async syncTableSchema(forceRecreate = false) {
     const operations = [];
     try {
-      console.log(`  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(
+        `  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`
+      );
       console.log(`  \u{1F511} \u5206\u533A\u952E: [${this.schema.partitionKey.join(", ")}]`);
       if (this.schema.clusteringKey) {
-        console.log(`  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`);
+        console.log(
+          `  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`
+        );
       }
-      console.log(`  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`);
+      console.log(
+        `  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`
+      );
       await this.client.execute(
         queryHelper.ensureKeyspace(
           this.schema.keyspace,
@@ -1662,7 +1678,9 @@ ${reasons}
       operations.push(...indexOperations);
       return { operations, changes, unalterableReasons };
     } catch (error) {
-      throw new Error(`\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`);
+      throw new Error(
+        `\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`
+      );
     }
   }
   // 智能同步索引
@@ -1761,7 +1779,9 @@ ${reasons}
           if (!this.isTypeCompatible(existingType, schemaType)) {
             return {
               hasChanges: true,
-              reasons: [`\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`]
+              reasons: [
+                `\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`
+              ]
             };
           }
         }
@@ -1835,9 +1855,9 @@ ${reasons}
     return false;
   }
   // 构建插入查询
-  buildInsertQuery(data) {
+  buildInsertQuery(data, options) {
     const fieldConfigs = queryHelper.convertSchemaToFieldConfigs(this.schema);
-    const insertQuery = queryHelper.buildInsertCql(this.schema);
+    const insertQuery = queryHelper.buildInsertCql(this.schema, options);
     const params = queryHelper.buildInsertParams(data, fieldConfigs);
     return { query: insertQuery, params };
   }

package/dist/mod.d.cts

@@ -19,9 +19,12 @@ interface ClickHouseConfig {
 }
 type DualWriteConfig = {
     clickhouse?: ClickHouseConfig;
-    errorHandling?: 'throw' | 'ignore' | 'log';
+    errorHandling?: "throw" | "ignore" | "log";
     debug?: boolean;
 };
+interface InsertOptions {
+    ttl?: number;
+}
 
 declare class ClickHouseClientWrapper {
     private client;
@@ -341,10 +344,10 @@ declare class Model<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends
         clusteringKey: CK extends ClusteringKeyConfig ? z.ZodObject<ExtractClusteringKeyShape<F, CK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any> extends infer T_4 ? { [k_4 in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any>[k_4]; } : never, z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>> extends infer T_5 ? { [k_5 in keyof T_5]: z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>>[k_5]; } : never> : never;
     };
     static create<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends ClusteringKeyConfig | undefined = undefined>(definition: SchemaDefinition<F, PK, CK>, client: Client): Model<F, PK, CK>;
-    insert(data: z.infer<z.ZodObject<F>>): Promise<void>;
+    insert(data: z.infer<z.ZodObject<F>>, options?: InsertOptions): Promise<void>;
     update(partitionKey: ExtractPartitionKeyType<F, PK>, clusteringKey: CK extends ClusteringKeyConfig ? ExtractClusteringKeyType<F, CK> : undefined, data: Partial<z.infer<z.ZodObject<F>>>): Promise<void>;
     delete(partitionKey: ExtractPartitionKeyType<F, PK>, clusteringKey?: ExtractClusteringKeyType<F, CK>): Promise<void>;
-    batchInsert(dataArray: z.infer<z.ZodObject<F>>[]): Promise<void>;
+    batchInsert(dataArray: z.infer<z.ZodObject<F>>[], options?: InsertOptions): Promise<void>;
     find<T extends QueryCondition<F>>(query: T, clusteringKey?: Partial<ExtractClusteringKeyType<F, CK>>): Promise<z.infer<z.ZodObject<F>>[]>;
     findOne<T extends QueryCondition<F>>(query: T): Promise<z.infer<z.ZodObject<F>> | null>;
     syncSchema(force?: boolean): Promise<string>;

package/dist/mod.d.ts

@@ -19,9 +19,12 @@ interface ClickHouseConfig {
 }
 type DualWriteConfig = {
     clickhouse?: ClickHouseConfig;
-    errorHandling?: 'throw' | 'ignore' | 'log';
+    errorHandling?: "throw" | "ignore" | "log";
     debug?: boolean;
 };
+interface InsertOptions {
+    ttl?: number;
+}
 
 declare class ClickHouseClientWrapper {
     private client;
@@ -341,10 +344,10 @@ declare class Model<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends
         clusteringKey: CK extends ClusteringKeyConfig ? z.ZodObject<ExtractClusteringKeyShape<F, CK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any> extends infer T_4 ? { [k_4 in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any>[k_4]; } : never, z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>> extends infer T_5 ? { [k_5 in keyof T_5]: z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>>[k_5]; } : never> : never;
     };
     static create<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends ClusteringKeyConfig | undefined = undefined>(definition: SchemaDefinition<F, PK, CK>, client: Client): Model<F, PK, CK>;
-    insert(data: z.infer<z.ZodObject<F>>): Promise<void>;
+    insert(data: z.infer<z.ZodObject<F>>, options?: InsertOptions): Promise<void>;
     update(partitionKey: ExtractPartitionKeyType<F, PK>, clusteringKey: CK extends ClusteringKeyConfig ? ExtractClusteringKeyType<F, CK> : undefined, data: Partial<z.infer<z.ZodObject<F>>>): Promise<void>;
     delete(partitionKey: ExtractPartitionKeyType<F, PK>, clusteringKey?: ExtractClusteringKeyType<F, CK>): Promise<void>;
-    batchInsert(dataArray: z.infer<z.ZodObject<F>>[]): Promise<void>;
+    batchInsert(dataArray: z.infer<z.ZodObject<F>>[], options?: InsertOptions): Promise<void>;
     find<T extends QueryCondition<F>>(query: T, clusteringKey?: Partial<ExtractClusteringKeyType<F, CK>>): Promise<z.infer<z.ZodObject<F>>[]>;
     findOne<T extends QueryCondition<F>>(query: T): Promise<z.infer<z.ZodObject<F>> | null>;
     syncSchema(force?: boolean): Promise<string>;

package/dist/mod.js

@@ -764,13 +764,14 @@ function convertSchemaToFieldConfigs(schema) {
   });
   return configs;
 }
-function buildInsertCql(schema) {
+function buildInsertCql(schema, options) {
   const tableRef = schema.keyspace ? `${schema.keyspace}.${schema.tableName}` : schema.tableName;
   const columns = Object.keys(schema.fields.shape);
   const placeholders = columns.map(() => "?").join(", ");
+  const ttlSegment = options?.ttl ? ` USING TTL ${options.ttl}` : "";
   return `INSERT INTO ${tableRef} (${columns.join(
     ", "
-  )}) VALUES (${placeholders});`;
+  )}) VALUES (${placeholders})${ttlSegment};`;
 }
 function buildInsertParams(data, fieldConfigs) {
   const params = [];
@@ -1276,7 +1277,9 @@ function syncIndexes(schema, existingIndexes) {
       const normalizedExisting = normalizeOptions(existingOptions);
       const normalizedNew = normalizeOptions(newOptions);
       if (normalizedExisting !== normalizedNew) {
-        operations.push(`DROP INDEX IF EXISTS ${schema.keyspace}.${indexName};`);
+        operations.push(
+          `DROP INDEX IF EXISTS ${schema.keyspace}.${indexName};`
+        );
         let createQuery = `CREATE INDEX ${indexName} ON ${schema.keyspace}.${schema.tableName} (${indexInfo.fieldName}) USING 'sai'`;
         if (indexInfo.options) {
           createQuery += ` WITH OPTIONS = ${indexInfo.options}`;
@@ -1378,9 +1381,9 @@ var Model = class _Model {
     const schema = new TableSchema(definition);
     return new _Model(schema, client);
   }
-  async insert(data) {
+  async insert(data, options) {
     this.schema.fields.parse(data);
-    const cassandraQuery = this.buildInsertQuery(data);
+    const cassandraQuery = this.buildInsertQuery(data, options);
     const dualWriteManager = this.client.getDualWriteManager();
     await Promise.all([
       this.client.execute(cassandraQuery.query, cassandraQuery.params, {
@@ -1429,10 +1432,10 @@ var Model = class _Model {
       )
     ]);
   }
-  async batchInsert(dataArray) {
+  async batchInsert(dataArray, options) {
     dataArray.forEach((data) => this.schema.fields.parse(data));
     const cassandraQueries = dataArray.map(
-      (data) => this.buildInsertQuery(data)
+      (data) => this.buildInsertQuery(data, options)
     );
     const dualWriteManager = this.client.getDualWriteManager();
     const validatedDataArray = dataArray.map(
@@ -1525,12 +1528,19 @@ var Model = class _Model {
   // 同步 Schema
   async syncSchema(force = false) {
     try {
-      console.log(`\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(
+        `\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`
+      );
       const operations = await this.syncTableSchema(force);
-      console.log(`\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`);
+      console.log(
+        `\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`
+      );
       return operations.join("\n");
     } catch (error) {
-      console.error(`\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`, error);
+      console.error(
+        `\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`,
+        error
+      );
       throw error;
     }
   }
@@ -1538,12 +1548,18 @@ var Model = class _Model {
   async syncTableSchema(forceRecreate = false) {
     const operations = [];
     try {
-      console.log(`  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(
+        `  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`
+      );
       console.log(`  \u{1F511} \u5206\u533A\u952E: [${this.schema.partitionKey.join(", ")}]`);
       if (this.schema.clusteringKey) {
-        console.log(`  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`);
+        console.log(
+          `  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`
+        );
       }
-      console.log(`  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`);
+      console.log(
+        `  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`
+      );
       await this.client.execute(
         queryHelper.ensureKeyspace(
           this.schema.keyspace,
@@ -1660,7 +1676,9 @@ ${reasons}
       operations.push(...indexOperations);
       return { operations, changes, unalterableReasons };
     } catch (error) {
-      throw new Error(`\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`);
+      throw new Error(
+        `\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`
+      );
     }
   }
   // 智能同步索引
@@ -1759,7 +1777,9 @@ ${reasons}
           if (!this.isTypeCompatible(existingType, schemaType)) {
             return {
               hasChanges: true,
-              reasons: [`\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`]
+              reasons: [
+                `\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`
+              ]
             };
           }
         }
@@ -1833,9 +1853,9 @@ ${reasons}
     return false;
   }
   // 构建插入查询
-  buildInsertQuery(data) {
+  buildInsertQuery(data, options) {
     const fieldConfigs = queryHelper.convertSchemaToFieldConfigs(this.schema);
-    const insertQuery = queryHelper.buildInsertCql(this.schema);
+    const insertQuery = queryHelper.buildInsertCql(this.schema, options);
     const params = queryHelper.buildInsertParams(data, fieldConfigs);
     return { query: insertQuery, params };
   }

package/package.json

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