xdriver 2.0.12 → 2.0.13

package/lib/table.d.ts

@@ -15,8 +15,20 @@ export type Rows = Array<Row>;
 export type TableMeta = ITable & {
     rows?: Rows;
 };
-export declare class RowPacket<T extends Row> extends Array<T> {
+export declare class RowPacket<T extends Row> {
+    private readonly rows;
     constructor(rows?: Array<T>);
+    [Symbol.iterator](): Generator<T, void, unknown>;
+    forEach(callback: (value: T, index: number, array: Array<T>) => void): void;
+    filter(callback: (value: T, index: number, array: Array<T>) => boolean): Array<T>;
+    reduce<U>(callback: (previousValue: U, currentValue: T, currentIndex: number, array: Array<T>) => U, initialValue: U): U;
+    map<U>(callback: (value: T, index: number, array: Array<T>) => U): Array<U>;
+    some(callback: (value: T, index: number, array: Array<T>) => boolean): boolean;
+    find(callback: (value: T, index: number, array: Array<T>) => boolean): T | undefined;
+    push(...items: Array<T>): void;
+    slice(start?: number, end?: number): Array<T>;
+    join(separator?: string): string;
+    get length(): number;
     distinct(column?: string | ((row: T) => any)): Array<T>;
     mapping<K, T>(keyFn: (row: T, index: number, array: Array<T>) => K): Map<K, T>;
     mapping<K, V>(keyFn: (row: T, index: number, array: Array<T>) => K, valFn: (row: T, index: number, array: Array<T>) => V): Map<K, V>;

package/lib/table.js

@@ -33,13 +33,48 @@ const _request = (request) => __awaiter(void 0, void 0, void 0, function* () {
         };
     });
 });
-export class RowPacket extends Array {
+export class RowPacket {
     constructor(rows = []) {
-        super(...rows);
+        this.rows = rows;
+    }
+    *[Symbol.iterator]() {
+        for (const item of this.rows) {
+            yield item;
+        }
+    }
+    forEach(callback) {
+        this.rows.forEach(callback);
+    }
+    filter(callback) {
+        return this.rows.filter(callback);
+    }
+    reduce(callback, initialValue) {
+        return this.rows.reduce(callback, initialValue);
+    }
+    map(callback) {
+        return this.rows.map(callback);
+    }
+    some(callback) {
+        return this.rows.some(callback);
+    }
+    find(callback) {
+        return this.rows.find(callback);
+    }
+    push(...items) {
+        this.rows.push(...items);
+    }
+    slice(start, end) {
+        return this.rows.slice(start, end);
+    }
+    join(separator) {
+        return this.rows.join(separator);
+    }
+    get length() {
+        return this.rows.length;
     }
     distinct(column) {
         if (!column) {
-            return this;
+            return this.rows;
         }
         let set = new Set();
         return this.filter(row => {
@@ -77,7 +112,7 @@ export class RowPacket extends Array {
         this.forEach((item, index, array) => {
             var _a;
             let unionKey = typeof key === 'function' ? key.call(this, item, index, array) : item[key];
-            let value = valFn ? valFn(item, index, this) : item;
+            let value = valFn ? valFn(item, index, this.rows) : item;
             if (!group.has(unionKey)) {
                 group.set(unionKey, [value]);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdriver",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "A simple driver for IndexDB",
   "main": "./lib/index",
   "files": [

package/src/table.ts

@@ -49,10 +49,56 @@ export type Rows = Array<Row>;
 
 export type TableMeta = ITable & { rows?: Rows };
 
-export class RowPacket<T extends Row> extends Array<T> {
+export class RowPacket<T extends Row> {
+
+    private readonly rows: Array<T>;
 
     constructor(rows: Array<T> = []) {
-        super(...rows)
+        this.rows = rows;
+    }
+
+    *[Symbol.iterator]() {
+        // 使用 generator 函数最简单！
+        for (const item of this.rows) {
+            yield item;
+        }
+    }
+
+    forEach(callback: (value: T, index: number, array: Array<T>) => void) {
+        this.rows.forEach(callback);
+    }
+
+    filter(callback: (value: T, index: number, array: Array<T>) => boolean): Array<T> {
+        return this.rows.filter(callback);
+    }
+
+    reduce<U>(callback: (previousValue: U, currentValue: T, currentIndex: number, array: Array<T>) => U,
+                       initialValue: U): U {
+        return this.rows.reduce(callback, initialValue);
+    }
+
+    map<U>(callback: (value: T, index: number, array: Array<T>) => U): Array<U> {
+        return this.rows.map(callback);
+    }
+
+    some(callback: (value: T, index: number, array: Array<T>) => boolean): boolean {
+        return this.rows.some(callback);
+    }
+    find(callback: (value: T, index: number, array: Array<T>) => boolean): T | undefined {
+        return this.rows.find(callback);
+    }
+    push(...items: Array<T>) {
+        this.rows.push(...items);
+    }
+    slice(start?: number, end?: number): Array<T> {
+        return this.rows.slice(start, end);
+    }
+    join(separator?: string): string {
+        return this.rows.join(separator);
+    }
+
+    get length(): number {
+        return this.rows.length;
     }
 
     /**
@@ -61,7 +107,7 @@ export class RowPacket<T extends Row> extends Array<T> {
      */
     distinct(column?: string | ((row: T) => any)): Array<T> {
         if (!column) {
-            return this;
+            return this.rows;
         }
         let set = new Set<any>();
         return this.filter(row => {
@@ -111,7 +157,7 @@ export class RowPacket<T extends Row> extends Array<T> {
         let group = new Map<K, Array<V | T>>();
         this.forEach((item, index, array) => {
             let unionKey: K = typeof key === 'function' ? key.call(this, item, index, array) : item[key];
-            let value = valFn ? valFn(item, index, this) : item;
+            let value = valFn ? valFn(item, index, this.rows) : item;
             if (!group.has(unionKey)) {
                 group.set(unionKey, [value]);
             } else {
@@ -473,7 +519,7 @@ export default class Table implements ITable{
      * @param direction
      * @param indexName
      */
-    async scan<R extends Row>(key?: IDBValidKey | IDBKeyRange, direction: IDBCursorDirection = 'next', indexName?: string): Promise<RowPacket<R>> {
+    async scan<R extends Row>(key?:  IDBValidKey | IDBKeyRange, direction: IDBCursorDirection = 'next', indexName?: string): Promise<RowPacket<R>> {
         const store = _getObjectStore(this)
         let request: IDBRequest<IDBCursorWithValue | null>
         if (!indexName) {