@maiyunnet/kebab 5.1.0 → 5.3.0

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "5.1.0";
+export declare const VER = "5.3.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '5.1.0';
+export const VER = '5.3.0';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/vector.d.ts

@@ -29,9 +29,9 @@ export declare class Vector {
         'collection': string;
         /** --- 查询的向量 --- */
         'data': number[];
-        /** --- 过滤器，如 word_count > 0 --- */
+        /** --- 过滤器，如 word_count > 0 and book_id in [1, 2, 3] --- */
         'filter'?: string;
-        /** --- 返回的结果数量，默认为 20 --- */
+        /** --- 返回的结果数量，默认为 3 --- */
         'limit'?: number;
         /** --- 计算两个向量相似度的度量，默认 L2 --- */
         'metric'?: 'L2' | 'IP' | 'COSINE';
@@ -45,6 +45,20 @@ export declare class Vector {
         metric_type: "L2" | "IP" | "COSINE";
         output_fields: string[] | undefined;
     }>>;
+    /** --- 插入数据 --- */
+    insert(data: {
+        /** --- 表名 --- */
+        'collection': string;
+        /** --- 要插入的数据 --- */
+        'data': milvus.RowData[];
+    }): Promise<milvus.MutationResult | false>;
+    /** --- 删除数据 --- */
+    delete(data: {
+        /** --- 表名 --- */
+        'collection': string;
+        /** --- 过滤器，如 word_count > 0 and book_id in [1, 2, 3] --- */
+        'filter': string;
+    }): Promise<milvus.MutationResult | false>;
     /**
      * --- 从连接池中获取一个符合要求的连接 ---
      */

package/lib/vector.js

@@ -24,7 +24,7 @@ export class Vector {
                 'collection_name': data.collection,
                 'data': data.data,
                 'filter': data.filter,
-                'limit': data.limit ?? 20,
+                'limit': data.limit ?? 3,
                 'metric_type': data.metric ?? 'L2',
                 'output_fields': data.fields,
             });
@@ -34,6 +34,40 @@ export class Vector {
             return false;
         }
     }
+    /** --- 插入数据 --- */
+    async insert(data) {
+        const link = await this._getConnection();
+        if (!link) {
+            return false;
+        }
+        try {
+            const res = await link.insert({
+                'collection_name': data.collection,
+                'data': data.data,
+            });
+            return res;
+        }
+        catch {
+            return false;
+        }
+    }
+    /** --- 删除数据 --- */
+    async delete(data) {
+        const link = await this._getConnection();
+        if (!link) {
+            return false;
+        }
+        try {
+            const res = await link.delete({
+                'collection_name': data.collection,
+                'filter': data.filter,
+            });
+            return res;
+        }
+        catch {
+            return false;
+        }
+    }
     /**
      * --- 从连接池中获取一个符合要求的连接 ---
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/sys/mod.d.ts

@@ -40,6 +40,8 @@ export default class Mod {
     protected static _$key: string;
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     protected static _$index: string;
+    /** --- 前缀，顺序：选项前缀 -> 本前缀 -> 配置文件前缀 --- */
+    protected static _$pre: string | null;
     /** --- 要 update 的内容 --- */
     protected _updates: Record<string, boolean>;
     /** --- 模型获取的属性 --- */
@@ -94,7 +96,8 @@ export default class Mod {
      * @param opt 选项
      */
     static insert(db: lDb.Pool | lDb.Transaction, cs: string[] | Record<string, any>, vs?: any[] | any[][], opt?: {
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string;
     }): Promise<boolean | null | false>;
     /**
@@ -105,7 +108,8 @@ export default class Mod {
      * @param opt 选项
      */
     static insertSql(db: lDb.Pool | lDb.Transaction, cs: string[] | Record<string, any>, vs?: any[] | any[][], opt?: {
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string;
     }): string;
     /**
@@ -116,7 +120,8 @@ export default class Mod {
      */
     static removeByWhere(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string | string[];
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'limit'?: [number, number?];
@@ -129,7 +134,8 @@ export default class Mod {
      */
     static removeByWhereSql(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string;
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'limit'?: [number, number?];
@@ -143,7 +149,8 @@ export default class Mod {
      */
     static updateByWhere(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string | string[];
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'limit'?: [number, number?];
@@ -157,7 +164,8 @@ export default class Mod {
      */
     static updateByWhereSql(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
-        'pre'?: sCtr.Ctr | string;
+        'pre'?: string;
+        'ctr'?: sCtr.Ctr;
         'index'?: string;
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'limit'?: [number, number?];

package/sys/mod.js

@@ -7,7 +7,6 @@ import * as lSql from '#kebab/lib/sql.js';
 import * as lDb from '#kebab/lib/db.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
-import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 条数列表 --- */
 class Rows {
     constructor(initialItems = []) {
@@ -54,6 +53,8 @@ export default class Mod {
     static { this._$key = ''; }
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     static { this._$index = ''; }
+    /** --- 前缀，顺序：选项前缀 -> 本前缀 -> 配置文件前缀 --- */
+    static { this._$pre = null; }
     /**
      * --- 构造函数 ---
      * @param ctr Ctr 对象
@@ -79,7 +80,7 @@ export default class Mod {
         /** --- 导入数据库连接 --- */
         this._db = opt.db;
         /** --- 新建 sql 对象 --- */
-        this._sql = lSql.get(opt.pre ?? opt.ctr, {
+        this._sql = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': this._db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         if (opt.index) {
@@ -118,7 +119,7 @@ export default class Mod {
      * @param opt 选项
      */
     static async insert(db, cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre, {
+        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         if (!vs) {
@@ -127,7 +128,7 @@ export default class Mod {
             sq.values(cs);
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
                 return false;
             }
             return r.packet.affected ? true : null;
@@ -147,7 +148,7 @@ export default class Mod {
             sq.values(cs, vs.slice(i * line, (i + 1) * line));
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -165,7 +166,7 @@ export default class Mod {
      * @param opt 选项
      */
     static insertSql(db, cs, vs, opt = {}) {
-        const sq = lSql.get(opt.pre, {
+        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
@@ -181,7 +182,7 @@ export default class Mod {
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre, {
+            const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             });
             sq.delete(this._$table + (index ? ('_' + index) : '')).where(where);
@@ -193,7 +194,7 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[MOD][removeByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][removeByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -209,7 +210,7 @@ export default class Mod {
      * @param opt 选项
      */
     static removeByWhereSql(db, where, opt = {}) {
-        const sq = lSql.get(opt.pre, {
+        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         sq.delete(this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
@@ -232,7 +233,7 @@ export default class Mod {
         const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         let ar = 0;
         for (const index of indexs) {
-            const sq = lSql.get(opt.pre, {
+            const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
                 'service': db.getService() ?? lDb.ESERVICE.PGSQL,
             });
             sq.update(this._$table + (index ? ('_' + index) : ''), data).where(where);
@@ -244,7 +245,7 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[MOD][updateByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][updateByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -261,7 +262,7 @@ export default class Mod {
      * @param opt 选项
      */
     static updateByWhereSql(db, data, where, opt = {}) {
-        const sq = lSql.get(opt.pre, {
+        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), data).where(where);
@@ -408,7 +409,7 @@ export default class Mod {
      * @param opt 选项
      */
     static async primarys(db, where = '', opt = {}) {
-        const sq = lSql.get(opt.pre ?? opt.ctr, {
+        const sq = lSql.get(opt.pre ?? this.constructor._$pre ?? opt.ctr, {
             'service': db.getService() ?? lDb.ESERVICE.PGSQL,
         });
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);

package/www/example/ctr/test.js

@@ -573,7 +573,8 @@ Result:<pre id="result">Nothing.</pre>` + this._getEnd();
             await mTest.removeByWhere(db, [
                 ['token', 'LIKE', 'test_%'],
             ], {
-                'pre': this._get['s'] === 'pgsql' ? 'm' : this,
+                'ctr': this,
+                'pre': this._get['s'] === 'pgsql' ? 'm' : undefined,
             });
             return this._location('test/mod-test' + (this._get['s'] === 'pgsql' ? '?s=pgsql' : ''));
         }
@@ -834,7 +835,7 @@ CREATE TABLE \`m_test_data_0\` (
             ]);
         }
         const res = await mTestData.insert(db, ['test_id', 'content', 'time_add'], datas, {
-            'pre': this,
+            'ctr': this,
             'index': '0',
         });
         echo.push('<br><br>Result: ' + JSON.stringify(res));