query-core 0.1.11 → 0.1.12

package/lib/index.js

@@ -4,12 +4,6 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var services_1 = require("./services");
-exports.createGenericSearchRepository = services_1.createSqlSearchWriter;
-exports.createGenericSearchService = services_1.createSqlSearchWriter;
-exports.createRepository = services_1.createSqlSearchWriter;
-exports.createService = services_1.createSqlSearchWriter;
-exports.createGenericRepository = services_1.createSqlWriter;
-exports.createGenericService = services_1.createSqlWriter;
 exports.SqlLoadRepository = services_1.SqlLoader;
 exports.SqlViewRepository = services_1.SqlLoader;
 exports.SqlLoadService = services_1.SqlLoader;

package/lib/services.js

@@ -91,18 +91,14 @@ var SqlSearchLoader = (function (_super) {
   return SqlSearchLoader;
 }(SqlLoader));
 exports.SqlSearchLoader = SqlSearchLoader;
-function createSqlWriter(table, manager, attrs, buildParam, toDB, fromDB) {
-  var writer = new SqlWriter(table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
-}
-exports.createSqlWriter = createSqlWriter;
 var SqlWriter = (function (_super) {
   __extends(SqlWriter, _super);
-  function SqlWriter(table, query, exec, attrs, buildParam, toDB, fromDB) {
-    var _this = _super.call(this, table, query, attrs, buildParam, fromDB) || this;
-    _this.exec = exec;
+  function SqlWriter(manager, table, attrs, toDB, fromDB) {
+    var _this = _super.call(this, table, manager.query, attrs, manager.param, fromDB) || this;
     _this.toDB = toDB;
     var x = build_1.version(attrs);
+    _this.exec = manager.exec;
+    _this.execBatch = manager.execBatch;
     if (x) {
       _this.version = x.name;
     }
@@ -162,8 +158,8 @@ var SqlWriter = (function (_super) {
 exports.SqlWriter = SqlWriter;
 var SqlSearchWriter = (function (_super) {
   __extends(SqlSearchWriter, _super);
-  function SqlSearchWriter(find, table, query, exec, attrs, buildParam, toDB, fromDB) {
-    var _this = _super.call(this, table, query, exec, attrs, buildParam, toDB, fromDB) || this;
+  function SqlSearchWriter(find, manager, table, attrs, toDB, fromDB) {
+    var _this = _super.call(this, manager, table, attrs, toDB, fromDB) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     return _this;
@@ -174,8 +170,3 @@ var SqlSearchWriter = (function (_super) {
   return SqlSearchWriter;
 }(SqlWriter));
 exports.SqlSearchWriter = SqlSearchWriter;
-function createSqlSearchWriter(find, table, manager, attrs, buildParam, toDB, fromDB) {
-  var writer = new SqlSearchWriter(find, table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
-}
-exports.createSqlSearchWriter = createSqlSearchWriter;

package/package.json

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

package/src/index.ts

@@ -1,5 +1,5 @@
 import {Attribute, StringMap} from './metadata';
-import {createSqlSearchWriter, createSqlWriter, SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter} from './services';
+import {SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter} from './services';
 export {SqlLoader as SqlLoadRepository};
 export {SqlLoader as SqlViewRepository};
 export {SqlWriter as SqlGenericRepository};
@@ -23,12 +23,6 @@ export {SqlSearchWriter as SqlRepository};
 export {SqlSearchWriter as SqlService};
 export {SqlSearchWriter as Repository};
 export {SqlSearchWriter as Service};
-export {createSqlWriter as createGenericRepository};
-export {createSqlWriter as createGenericService};
-export {createSqlSearchWriter as createGenericSearchRepository};
-export {createSqlSearchWriter as createGenericSearchService};
-export {createSqlSearchWriter as createRepository};
-export {createSqlSearchWriter as createService};
 
 export * from './metadata';
 export * from './build';

package/src/services.ts

@@ -15,8 +15,8 @@ export class SqlLoader<T, ID> {
   constructor(public table: string,
     public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<T[]>,
     attrs: Attributes|string[],
-    protected param: (i: number) => string,
-    protected fromDB?: (v: T) => T) {
+    public param: (i: number) => string,
+    public fromDB?: (v: T) => T) {
     if (Array.isArray(attrs)) {
       this.primaryKeys = attributes(attrs);
       this.attributes = {} as any;
@@ -85,31 +85,23 @@ export class SqlSearchLoader<T, ID, S extends Filter> extends SqlLoader<T, ID> {
   }
 }
 export interface Manager {
+  param(i: number): string;
   exec(sql: string, args?: any[], ctx?: any): Promise<number>;
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>;
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>;
 }
-export function createSqlWriter<T, ID>(table: string,
-    manager: Manager,
-    attrs: Attributes,
-    buildParam: (i: number) => string,
-    toDB?: (v: T) => T,
-    fromDB?: (v: T) => T) {
-  const writer = new SqlWriter<T, ID>(table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
-}
-
 export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
   version?: string;
-  constructor(table: string,
-    query: (sql: string, args?: any[], m?: StringMap, ctx?: any) => Promise<T[]>,
-    public exec: (sql: string, args?: any[], ctx?: any) => Promise<number>,
+  exec: (sql: string, args?: any[], ctx?: any) => Promise<number>;
+  execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>;
+  constructor(manager: Manager, table: string,
     attrs: Attributes,
-    buildParam: (i: number) => string,
-    protected toDB?: (v: T) => T,
+    public toDB?: (v: T) => T,
     fromDB?: (v: T) => T) {
-    super(table, query, attrs, buildParam, fromDB);
+    super(table, manager.query, attrs, manager.param, fromDB);
     const x = version(attrs);
+    this.exec = manager.exec;
+    this.execBatch = manager.execBatch;
     if (x) {
       this.version = x.name;
     }
@@ -163,28 +155,15 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
 export class SqlSearchWriter<T, ID, S extends Filter> extends SqlWriter<T, ID> {
   constructor(
       protected find: (s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>,
+      manager: Manager,
       table: string,
-      query: (sql: string, args?: any[], m?: StringMap, ctx?: any) => Promise<T[]>,
-      exec: (sql: string, args?: any[], ctx?: any) => Promise<number>,
       attrs: Attributes,
-      buildParam: (i: number) => string,
       toDB?: (v: T) => T,
       fromDB?: (v: T) => T) {
-    super(table, query, exec, attrs, buildParam, toDB, fromDB);
+    super(manager, table, attrs, toDB, fromDB);
     this.search = this.search.bind(this);
   }
   search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
     return this.find(s, limit, offset, fields);
   }
 }
-export function createSqlSearchWriter<T, ID, S extends Filter>(
-  find: (s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>,
-  table: string,
-  manager: Manager,
-  attrs: Attributes,
-  buildParam: (i: number) => string,
-  toDB?: (v: T) => T,
-  fromDB?: (v: T) => T) {
-const writer = new SqlSearchWriter<T, ID, S>(find, table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-return writer;
-}