query-core 0.1.24 → 0.1.26

package/lib/batch.js

@@ -140,3 +140,123 @@ var SqlBatchUpdater = (function () {
   return SqlBatchUpdater;
 }());
 exports.SqlBatchUpdater = SqlBatchUpdater;
+var StreamInserter = (function () {
+  function StreamInserter(exec, table, attributes, param, size, toDB) {
+    this.exec = exec;
+    this.table = table;
+    this.attributes = attributes;
+    this.param = param;
+    this.list = [];
+    this.size = 0;
+    this.write = this.write.bind(this);
+    this.flush = this.flush.bind(this);
+    this.map = toDB;
+    var x = build_1.version(attributes);
+    if (x) {
+      this.version = x.name;
+    }
+    if (size !== undefined && size > 0) {
+      this.size = size;
+    }
+  }
+  StreamInserter.prototype.write = function (obj) {
+    if (!obj) {
+      return Promise.resolve(0);
+    }
+    var obj2 = obj;
+    if (this.map) {
+      obj2 = this.map(obj);
+      this.list.push(obj2);
+    }
+    else {
+      this.list.push(obj);
+    }
+    if (this.list.length < this.size) {
+      return Promise.resolve(0);
+    }
+    else {
+      return this.flush();
+    }
+  };
+  StreamInserter.prototype.flush = function () {
+    var _this = this;
+    if (!this.list || this.list.length === 0) {
+      return Promise.resolve(0);
+    }
+    else {
+      var total_1 = this.list.length;
+      var stmt = build_1.buildToInsertBatch(this.list, this.table, this.attributes, this.param, this.version);
+      if (stmt) {
+        return this.exec(stmt.query, stmt.params).then(function (r) {
+          _this.list = [];
+          return total_1;
+        });
+      }
+      else {
+        return Promise.resolve(0);
+      }
+    }
+  };
+  return StreamInserter;
+}());
+exports.StreamInserter = StreamInserter;
+var StreamUpdater = (function () {
+  function StreamUpdater(execBatch, table, attributes, param, size, toDB) {
+    this.execBatch = execBatch;
+    this.table = table;
+    this.attributes = attributes;
+    this.param = param;
+    this.list = [];
+    this.size = 0;
+    this.write = this.write.bind(this);
+    this.flush = this.flush.bind(this);
+    this.map = toDB;
+    var x = build_1.version(attributes);
+    if (x) {
+      this.version = x.name;
+    }
+    if (size !== undefined && size > 0) {
+      this.size = size;
+    }
+  }
+  StreamUpdater.prototype.write = function (obj) {
+    if (!obj) {
+      return Promise.resolve(0);
+    }
+    var obj2 = obj;
+    if (this.map) {
+      obj2 = this.map(obj);
+      this.list.push(obj2);
+    }
+    else {
+      this.list.push(obj);
+    }
+    if (this.list.length < this.size) {
+      return Promise.resolve(0);
+    }
+    else {
+      return this.flush();
+    }
+  };
+  StreamUpdater.prototype.flush = function () {
+    var _this = this;
+    if (!this.list || this.list.length === 0) {
+      return Promise.resolve(0);
+    }
+    else {
+      var total_2 = this.list.length;
+      var stmt = build_1.buildToUpdateBatch(this.list, this.table, this.attributes, this.param);
+      if (stmt) {
+        return this.execBatch(stmt).then(function (r) {
+          _this.list = [];
+          return total_2;
+        });
+      }
+      else {
+        return Promise.resolve(0);
+      }
+    }
+  };
+  return StreamUpdater;
+}());
+exports.StreamUpdater = StreamUpdater;

package/lib/services.js

@@ -100,6 +100,7 @@ var QueryRepository = (function () {
       return Promise.resolve([]);
     }
     var ps = [];
+    var length = ids.length;
     for (var i = 1; i <= length; i++) {
       ps.push(this.db.param(i));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-core",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/batch.ts

@@ -1,5 +1,5 @@
-import {buildToInsert, buildToInsertBatch, buildToUpdate, buildToUpdateBatch, version} from './build';
-import {Attributes, Statement} from './metadata';
+import { buildToInsert, buildToInsertBatch, buildToUpdate, buildToUpdateBatch, version } from './build';
+import { Attributes, Statement } from './metadata';
 
 export class SqlInserter<T> {
   version?: string;
@@ -14,7 +14,7 @@ export class SqlInserter<T> {
     if (!obj) {
       return Promise.resolve(0);
     }
-    let obj2 = obj;
+    let obj2: NonNullable<T> | T = obj;
     if (this.map) {
       obj2 = this.map(obj);
     }
@@ -40,7 +40,7 @@ export class SqlUpdater<T> {
     if (!obj) {
       return Promise.resolve(0);
     }
-    let obj2 = obj;
+    let obj2: NonNullable<T> | T = obj;
     if (this.map) {
       obj2 = this.map(obj);
     }
@@ -55,7 +55,7 @@ export class SqlUpdater<T> {
 // tslint:disable-next-line:max-classes-per-file
 export class SqlBatchInserter<T> {
   version?: string;
-  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: ((i: number) => string)|boolean, public map?: (v: T) => T) {
+  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: ((i: number) => string) | boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -112,3 +112,107 @@ export class SqlBatchUpdater<T> {
     }
   }
 }
+// tslint:disable-next-line:max-classes-per-file
+export class StreamInserter<T> {
+  list: T[] = [];
+  size: number = 0;
+  version?: string;
+  map?: (v: T) => T;
+  constructor(public exec: ((sql: string, args?: any[]) => Promise<number>), public table: string, public attributes: Attributes, public param: (i: number) => string, size?: number, toDB?: (v: T) => T) {
+    this.write = this.write.bind(this);
+    this.flush = this.flush.bind(this);
+    this.map = toDB;
+    const x = version(attributes);
+    if (x) {
+      this.version = x.name;
+    }
+    if (size !== undefined && size > 0) {
+      this.size = size;
+    }
+  }
+  write(obj: T): Promise<number> {
+    if (!obj) {
+      return Promise.resolve(0);
+    }
+    let obj2: NonNullable<T> | T = obj;
+    if (this.map) {
+      obj2 = this.map(obj);
+      this.list.push(obj2);
+    } else {
+      this.list.push(obj);
+    }
+    if (this.list.length < this.size) {
+      return Promise.resolve(0);
+    } else {
+      return this.flush();
+    }
+  }
+  flush(): Promise<number> {
+    if (!this.list || this.list.length === 0) {
+      return Promise.resolve(0);
+    } else {
+      const total = this.list.length;
+      const stmt = buildToInsertBatch(this.list, this.table, this.attributes, this.param, this.version);
+      if (stmt) {
+        return this.exec(stmt.query, stmt.params).then(r => {
+          this.list = [];
+          return total;
+        });
+      } else {
+        return Promise.resolve(0);
+      }
+    }
+  }
+}
+// tslint:disable-next-line:max-classes-per-file
+export class StreamUpdater<T> {
+  list: T[] = [];
+  size: number = 0;
+  version?: string;
+  map?: (v: T) => T;
+  constructor(public execBatch: ((statements: Statement[]) => Promise<number>), public table: string, public attributes: Attributes, public param: (i: number) => string, size?: number, toDB?: (v: T) => T) {
+    this.write = this.write.bind(this);
+    this.flush = this.flush.bind(this);
+    this.map = toDB;
+    const x = version(attributes);
+    if (x) {
+      this.version = x.name;
+    }
+    if (size !== undefined && size > 0) {
+      this.size = size;
+    }
+  }
+  write(obj: T): Promise<number> {
+    if (!obj) {
+      return Promise.resolve(0);
+    }
+    let obj2: NonNullable<T> | T = obj;
+    if (this.map) {
+      obj2 = this.map(obj);
+      this.list.push(obj2);
+    } else {
+      this.list.push(obj);
+    }
+    if (this.list.length < this.size) {
+      return Promise.resolve(0);
+    } else {
+      return this.flush();
+    }
+  }
+  flush(): Promise<number> {
+    if (!this.list || this.list.length === 0) {
+      return Promise.resolve(0);
+    } else {
+      const total = this.list.length;
+      const stmt = buildToUpdateBatch(this.list, this.table, this.attributes, this.param);
+      if (stmt) {
+        return this.execBatch(stmt).then(r => {
+          this.list = [];
+          return total;
+        });
+      } else {
+        return Promise.resolve(0);
+      }
+    }
+  }
+}

package/src/index.ts

@@ -102,7 +102,7 @@ export function map<T>(obj: T, m?: StringMap): any {
     return obj;
   }
   const obj2: any = {};
-  const keys = Object.keys(obj);
+  const keys = Object.keys(obj as any);
   for (const key of keys) {
     let k0 = m[key];
     if (!k0) {

package/src/map.ts

@@ -13,7 +13,7 @@ export function mapArray<T>(results: T[], m?: StringMap): T[] {
   for (let i = 0; i < length; i++) {
     const obj = results[i];
     const obj2: any = {};
-    const keys = Object.keys(obj);
+    const keys = Object.keys(obj as any);
     for (const key of keys) {
       let k0 = m[key];
       if (!k0) {

package/src/query.ts

@@ -300,7 +300,7 @@ export function buildMatch(v: string, match: string): string|RegExp {
   }
 }
 export function isDateRange<T>(obj: T): boolean {
-  const keys: string[] = Object.keys(obj);
+  const keys: string[] = Object.keys(obj as any);
   for (const key of keys) {
     const v = (obj as any)[key];
     if (!(v instanceof Date)) {
@@ -310,7 +310,7 @@ export function isDateRange<T>(obj: T): boolean {
   return true;
 }
 export function isNumberRange<T>(obj: T): boolean {
-  const keys: string[] = Object.keys(obj);
+  const keys: string[] = Object.keys(obj as any);
   for (const key of keys) {
     const v = (obj as any)[key];
     if (typeof v !== 'number') {

package/src/search.ts

@@ -26,7 +26,7 @@ export function buildFromQuery<T>(query: <K>(sql: string, args?: any[], m?: Stri
           return 0;
         } else {
           const r0 = r[0];
-          const keys = Object.keys(r0);
+          const keys = Object.keys(r0 as any);
           return (r0 as any)[keys[0]] as number;
         }
       });

package/src/services.ts

@@ -99,6 +99,7 @@ export class QueryRepository<T, ID> {
       return Promise.resolve([]);
     }
     const ps: string[] = [];
+    const length = ids.length;
     for (let i = 1; i <= length; i++) {
       ps.push(this.db.param(i));
     }