query-core 0.2.2 → 0.2.3

package/lib/SearchBuilder.js

@@ -58,10 +58,10 @@ var SearchBuilder = (function () {
     }
     this.total = total && total.length > 0 ? total : "total";
   }
-  SearchBuilder.prototype.search = function (filter, limit, offset, fields) {
-    var skip = 0;
-    if (typeof offset === "number" && offset > 0) {
-      skip = offset;
+  SearchBuilder.prototype.search = function (filter, limit, page, fields) {
+    var ipage = 0;
+    if (typeof page === "number" && page > 0) {
+      ipage = page;
     }
     var st = this.sort ? this.sort : "sort";
     var sn = filter[st];
@@ -73,7 +73,7 @@ var SearchBuilder = (function () {
     }
     var fn = this.fromDB;
     if (fn) {
-      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total).then(function (r) {
+      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total).then(function (r) {
         if (r.list && r.list.length > 0) {
           r.list = r.list.map(function (o) { return fn(o); });
           return r;
@@ -84,7 +84,7 @@ var SearchBuilder = (function () {
       });
     }
     else {
-      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total);
+      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total);
     }
   };
   return SearchBuilder;

package/package.json

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

package/src/SearchBuilder.ts

@@ -76,10 +76,10 @@ export class SearchBuilder<T, S> {
     }
     this.total = total && total.length > 0 ? total : "total"
   }
-  search(filter: S, limit: number, offset?: number | string, fields?: string[]): Promise<SearchResult<T>> {
-    let skip = 0
-    if (typeof offset === "number" && offset > 0) {
-      skip = offset
+  search(filter: S, limit: number, page?: number | string, fields?: string[]): Promise<SearchResult<T>> {
+    let ipage = 0
+    if (typeof page === "number" && page > 0) {
+      ipage = page
     }
     const st = this.sort ? this.sort : "sort"
     const sn = (filter as any)[st] as string
@@ -91,7 +91,7 @@ export class SearchBuilder<T, S> {
     }
     const fn = this.fromDB
     if (fn) {
-      return buildFromQuery<T>(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total).then((r) => {
+      return buildFromQuery<T>(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total).then((r) => {
         if (r.list && r.list.length > 0) {
           r.list = r.list.map((o) => fn(o))
           return r
@@ -100,7 +100,7 @@ export class SearchBuilder<T, S> {
         }
       })
     } else {
-      return buildFromQuery(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total)
+      return buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total)
     }
   }
 }

package/src/metadata.ts

@@ -53,35 +53,17 @@ export interface Model {
 }
 export interface Attribute {
   name?: string
-  field?: string
   column?: string
   type?: DataType
-  format?: FormatType
-  required?: boolean
   match?: MatchType
   default?: string | number | Date | boolean
   key?: boolean
-  unique?: boolean
-  enum?: string[] | number[]
   q?: boolean
   noinsert?: boolean
   noupdate?: boolean
   nopatch?: boolean
   version?: boolean
-  length?: number
-  min?: number
-  max?: number
-  gt?: number
-  lt?: number
-  precision?: number
-  scale?: number
-  exp?: RegExp | string
-  code?: string
-  noformat?: boolean
   ignored?: boolean
-  jsonField?: string
-  link?: string
-  typeof?: Attributes
   true?: string | number
   false?: string | number
 }

package/src/services.ts

@@ -1,6 +1,6 @@
 import { attributes, buildToDelete, buildToInsert, buildToUpdate, exist, metadata, select, version } from "./build"
 import { Attribute, Attributes, Statement, StringMap } from "./metadata"
-import { SearchResult } from "./search"
+// import { SearchResult } from "./search"
 
 export interface Filter {
   fields?: string[]
@@ -205,7 +205,7 @@ export class SqlLoadRepository<T, K1, K2> {
 export class GenericRepository<T, K1, K2> extends SqlLoadRepository<T, K1, K2> {
   version?: string
   exec: (sql: string, args?: any[], ctx?: any) => Promise<number>
-  execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
+  // execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
   constructor(
     manager: Manager,
     table: string,
@@ -220,7 +220,7 @@ export class GenericRepository<T, K1, K2> extends SqlLoadRepository<T, K1, K2> {
     super(manager.query, table, attrs, manager.param, id1Field, id2Field, fromDB, id1Col, id2Col)
     const x = version(attrs)
     this.exec = manager.exec
-    this.execBatch = manager.execBatch
+    // this.execBatch = manager.execBatch
     if (x) {
       this.version = x.name
     }
@@ -266,6 +266,7 @@ export class GenericRepository<T, K1, K2> extends SqlLoadRepository<T, K1, K2> {
     return this.exec(`delete from ${this.table} where ${this.id1Col} = ${this.param(1)} and ${this.id2Col} = ${this.param(2)}`, [id1, id2], ctx)
   }
 }
+/*
 // tslint:disable-next-line:max-classes-per-file
 export class SqlSearchLoader<T, ID, S extends Filter> extends SqlLoader<T, ID> {
   constructor(
@@ -283,11 +284,12 @@ export class SqlSearchLoader<T, ID, S extends Filter> extends SqlLoader<T, ID> {
     return this.find(s, limit, offset, fields)
   }
 }
+*/
 export interface Manager {
   driver: string
   param(i: number): string
   exec(sql: string, args?: any[], ctx?: any): Promise<number>
-  execBatch(statements: Statement[], firstSuccess?: boolean, 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 type DB = Manager
@@ -629,12 +631,12 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
 export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
   version?: string
   exec: (sql: string, args?: any[], ctx?: any) => Promise<number>
-  execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
+  // execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>
   constructor(manager: Manager, table: string, attrs: Attributes, public toDB?: (v: T) => T, fromDB?: (v: T) => T) {
     super(manager.query, table, attrs, manager.param, fromDB)
     const x = version(attrs)
     this.exec = manager.exec
-    this.execBatch = manager.execBatch
+    // this.execBatch = manager.execBatch
     if (x) {
       this.version = x.name
     }
@@ -685,6 +687,7 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
     }
   }
 }
+/*
 // tslint:disable-next-line:max-classes-per-file
 export class SqlSearchWriter<T, ID, S extends Filter> extends SqlWriter<T, ID> {
   constructor(
@@ -702,3 +705,4 @@ export class SqlSearchWriter<T, ID, S extends Filter> extends SqlWriter<T, ID> {
     return this.find(s, limit, offset, fields)
   }
 }
+*/