@maiyunnet/kebab 3.2.12 → 3.2.14

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -34,11 +34,19 @@ export declare function get(u: string, opt?: IRequestOptions): Promise<lResponse
 export declare function post(u: string, data: Record<string, kebab.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起 JSON 请求 ---
- * @param u
- * @param data
- * @param opt
+ * @param u 网址
+ * @param data 数据
+ * @param opt选项
  */
 export declare function postJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<lResponse.Response>;
+/**
+ * --- 发起 JSON 请求并解析 JSON 响应 ---
+ * @param url 网址
+ * @param data 数据
+ * @param init 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export declare function postJsonResponseJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<any | null>;
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项

package/lib/net.js

@@ -57,15 +57,36 @@ export async function post(u, data, opt = {}) {
 }
 /**
  * --- 发起 JSON 请求 ---
- * @param u
- * @param data
- * @param opt
+ * @param u 网址
+ * @param data 数据
+ * @param opt选项
  */
 export async function postJson(u, data, opt = {}) {
     opt.method = 'POST';
     opt.type = 'json';
     return request(u, data, opt);
 }
+/**
+ * --- 发起 JSON 请求并解析 JSON 响应 ---
+ * @param url 网址
+ * @param data 数据
+ * @param init 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export async function postJsonResponseJson(u, data, opt = {}) {
+    opt.method = 'POST';
+    opt.type = 'json';
+    const res = await request(u, data, opt);
+    const rtn = await res.getContent();
+    if (!rtn) {
+        return null;
+    }
+    const json = lText.parseJson(rtn.toString());
+    if (!json) {
+        return null;
+    }
+    return json;
+}
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.12",
+  "version": "3.2.14",
   "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

@@ -19,7 +19,7 @@ declare class Rows<T extends Mod> implements CRows<T> {
     get length(): number;
     /** --- 通过索引获取一个对象 --- */
     item(index: number): T;
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray(): Array<Record<string, any>>;
     /** --- 根据规则筛掉项，predicate 返回 true 代表保留 --- */
     filter(predicate: (value: T, index: number) => boolean): Rows<T>;
@@ -127,7 +127,7 @@ export default class Mod {
     static removeByWhere(db: lDb.Pool | lDb.Transaction, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
-        'index'?: string;
+        'index'?: string | string[];
         'by'?: [string | string[], 'DESC' | 'ASC'];
         'limit'?: [number, number?];
     }): Promise<number | false | null>;
@@ -226,7 +226,7 @@ export default class Mod {
         'lock'?: boolean;
         'raw'?: boolean;
         'pre'?: string;
-        'index'?: string;
+        'index'?: string | string[];
     }): Promise<false | null | (T & Record<string, any>)>;
     static one(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;
@@ -272,7 +272,7 @@ export default class Mod {
         'index'?: string;
     }): Promise<any[] | false>;
     /**
-     * --- 将 key val 组成的数据列表转换为原生对象模式 ---
+     * --- 将 key val 组成的数据列表转换为原生对象模式，获取的是新创建的数组 ---
      * @param obj 要转换的 kv 数据列表
      */
     static toArrayByRecord<T extends Mod>(obj: Record<string, T>): Record<string, Record<string, any>>;
@@ -453,7 +453,7 @@ export default class Mod {
      */
     format(sql?: string, data?: any[]): string;
     /**
-     * --- 获取值对象 ---
+     * --- 获取值对象，获取的是新创建的数组 ---
      */
     toArray<TC extends abstract new (...args: any) => any>(): TOnlyProperties<InstanceType<TC>> & Record<string, any>;
     /**
@@ -481,7 +481,7 @@ export declare class CRows<T> implements Iterable<T> {
     get length(): number;
     /** --- 通过索引获取一个对象 --- */
     item(index: number): T;
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray(): Array<Record<string, kebab.DbValue>>;
     [Symbol.iterator](): Iterator<T>;
 }

package/sys/mod.js

@@ -22,7 +22,7 @@ class Rows {
     item(index) {
         return this._items[index];
     }
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray() {
         const arr = [];
         for (const item of this._items) {
@@ -55,7 +55,7 @@ class Rows {
             next: () => {
                 if (index < this._items.length) {
                     return {
-                        value: this._items[index++],
+                        value: this._items[++index],
                         done: false
                     };
                 }
@@ -226,12 +226,9 @@ class Mod {
      */
     static async removeByWhere(db, where, opt = {}) {
         const tim = lTime.stamp();
-        const sq = lSql.get(opt.pre);
+        const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         if (this._$soft && !opt.raw) {
             // --- 软删除 ---
-            sq.update(this._$table + (opt.index ? ('_' + opt.index) : ''), [{
-                    'time_remove': tim
-                }]);
             if (typeof where === 'string') {
                 where = '(' + where + ') AND `time_remove` = 0';
             }
@@ -244,26 +241,36 @@ class Mod {
                 where['time_remove'] = 0;
             }
         }
-        else {
-            // --- 真删除 ---
-            sq.delete(this._$table + (opt.index ? ('_' + opt.index) : ''));
-        }
-        sq.where(where);
-        if (opt.by) {
-            sq.by(opt.by[0], opt.by[1]);
-        }
-        if (opt.limit) {
-            sq.limit(opt.limit[0], opt.limit[1]);
-        }
-        const r = await db.execute(sq.getSql(), sq.getData());
-        if (r.packet === null) {
-            lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[removeByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
-            return false;
-        }
-        if (r.packet.affectedRows > 0) {
-            return r.packet.affectedRows;
+        let ar = 0;
+        for (const index of indexs) {
+            const sq = lSql.get(opt.pre);
+            if (this._$soft && !opt.raw) {
+                // --- 软删除 ---
+                sq.update(this._$table + (index ? ('_' + index) : ''), [{
+                        'time_remove': tim,
+                    }]);
+            }
+            else {
+                // --- 真删除 ---
+                sq.delete(this._$table + (index ? ('_' + index) : ''));
+            }
+            sq.where(where);
+            if (opt.by) {
+                sq.by(opt.by[0], opt.by[1]);
+            }
+            if (opt.limit) {
+                sq.limit(opt.limit[0], opt.limit[1]);
+            }
+            const r = await db.execute(sq.getSql(), sq.getData());
+            if (r.packet === null) {
+                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[removeByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                return false;
+            }
+            if (r.packet.affectedRows > 0) {
+                ar += r.packet.affectedRows;
+            }
         }
-        return null;
+        return ar ? ar : null;
     }
     /**
      * --- 根据条件移除条目（仅获取 SQL 对象） ---
@@ -312,12 +319,7 @@ class Mod {
      * @param opt 选项
      */
     static async updateByWhere(db, data, where, opt = {}) {
-        if (typeof opt.index === 'string') {
-            opt.index = [opt.index];
-        }
-        else {
-            opt.index ??= [''];
-        }
+        const indexs = opt.index ? (typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)]) : [''];
         if (this._$soft && !opt.raw) {
             if (typeof where === 'string') {
                 where = '(' + where + ') AND `time_remove` = 0';
@@ -332,7 +334,7 @@ class Mod {
             }
         }
         let ar = 0;
-        for (const index of opt.index) {
+        for (const index of indexs) {
             const sq = lSql.get(opt.pre);
             sq.update(this._$table + (index ? ('_' + index) : ''), data);
             sq.where(where);
@@ -448,7 +450,7 @@ class Mod {
                     [this._$primary]: val
                 }],
             'raw': opt.raw,
-            'index': opt.index
+            'index': opt.index,
         }).first(opt.lock);
     }
     /**
@@ -459,6 +461,7 @@ class Mod {
      */
     static async one(db, s, opt = {}) {
         if (!opt.index) {
+            // --- 无 index ---
             const o = new this({
                 'select': opt.select,
                 'db': db,
@@ -472,8 +475,8 @@ class Mod {
             }
             return opt.array ? o.firstArray() : o.first();
         }
-        opt.index = typeof opt.index === 'string' ? [opt.index] : [...new Set(opt.index)];
-        for (const item of opt.index) {
+        const indexs = (typeof opt.index === 'string') ? [opt.index] : [...new Set(opt.index)];
+        for (const item of indexs) {
             const row = new this({
                 'select': opt.select,
                 'db': db,
@@ -481,7 +484,7 @@ class Mod {
                 'pre': opt.pre,
                 'where': s,
                 'raw': opt.raw,
-                'index': item
+                'index': item,
             });
             if (opt.by) {
                 row.by(opt.by[0], opt.by[1]);
@@ -544,7 +547,7 @@ class Mod {
         return primarys;
     }
     /**
-     * --- 将 key val 组成的数据列表转换为原生对象模式 ---
+     * --- 将 key val 组成的数据列表转换为原生对象模式，获取的是新创建的数组 ---
      * @param obj 要转换的 kv 数据列表
      */
     static toArrayByRecord(obj) {
@@ -638,6 +641,8 @@ class Mod {
                         // --- 确实重复了 ---
                         continue;
                     }
+                    // --- 1062 非 index 冲突，那需要用户自行处理（可能不允许重复的邮箱） ---
+                    return false;
                 }
                 // --- 未处理的错误 ---
                 lCore.log(this._ctr ?? {}, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
@@ -1393,10 +1398,10 @@ class Mod {
         return this._sql.format(sql, data);
     }
     /**
-     * --- 获取值对象 ---
+     * --- 获取值对象，获取的是新创建的数组 ---
      */
     toArray() {
-        return this._data;
+        return { ...this._data };
     }
     /**
      * --- 获取当前设置要提交的数据 ---