onecore 0.5.3 → 0.5.4

package/lib/index.js

@@ -32,14 +32,14 @@ var Writer = (function () {
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
   }
-  Writer.prototype.create = function (obj, ctx) {
-    return this.repository.create(obj, ctx);
+  Writer.prototype.create = function (obj) {
+    return this.repository.create(obj);
   };
-  Writer.prototype.update = function (obj, ctx) {
-    return this.repository.update(obj, ctx);
+  Writer.prototype.update = function (obj) {
+    return this.repository.update(obj);
   };
-  Writer.prototype.patch = function (obj, ctx) {
-    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
+  Writer.prototype.patch = function (obj) {
+    return (this.repository.patch ? this.repository.patch(obj) : Promise.resolve(-1));
   };
   return Writer;
 }());
@@ -75,11 +75,11 @@ var UseCase = (function (_super) {
   UseCase.prototype.keys = function () {
     return (this.repository.keys ? this.repository.keys() : []);
   };
-  UseCase.prototype.load = function (id, ctx) {
-    return this.repository.load(id, ctx);
+  UseCase.prototype.load = function (id) {
+    return this.repository.load(id);
   };
-  UseCase.prototype.delete = function (id, ctx) {
-    return this.repository.delete(id, ctx);
+  UseCase.prototype.delete = function (id) {
+    return this.repository.delete(id);
   };
   return UseCase;
 }(SearchWriter));
@@ -101,11 +101,11 @@ var GenericUseCase = (function (_super) {
   GenericUseCase.prototype.keys = function () {
     return (this.repository.keys ? this.repository.keys() : []);
   };
-  GenericUseCase.prototype.load = function (id, ctx) {
-    return this.repository.load(id, ctx);
+  GenericUseCase.prototype.load = function (id) {
+    return this.repository.load(id);
   };
-  GenericUseCase.prototype.delete = function (id, ctx) {
-    return this.repository.delete(id, ctx);
+  GenericUseCase.prototype.delete = function (id) {
+    return this.repository.delete(id);
   };
   return GenericUseCase;
 }(Writer));
@@ -141,15 +141,4 @@ var SavedService = (function () {
   return SavedService;
 }());
 exports.SavedService = SavedService;
-var SavedUseCase = (function (_super) {
-  __extends(SavedUseCase, _super);
-  function SavedUseCase() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  return SavedUseCase;
-}(SavedService));
-exports.SavedUseCase = SavedUseCase;
-function isSuccessful(res) {
-  return (typeof res === "number" && res <= 0) || Array.isArray(res) ? false : true;
-}
-exports.isSuccessful = isSuccessful;
+exports.SavedUseCase = SavedService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onecore",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "onecore",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/db.ts

@@ -1,4 +1,5 @@
-import {Attribute} from './metadata';
+import { Attribute, Attributes } from './metadata';
+import { Filter, SearchResult } from './model';
 export interface Statement {
   query: string;
   params?: any[];
@@ -16,9 +17,9 @@ interface StringMap {
 export interface Executor {
   driver: string;
   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[]>;
+  exec(sql: string, args?: any[], ctx?: Transaction): Promise<number>;
+  execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: Transaction): Promise<number>;
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: Transaction): Promise<T[]>;
 }
 export interface Transaction extends Executor {
   commit(): Promise<void>
@@ -28,3 +29,33 @@ export interface Transaction extends Executor {
 export interface DB extends Executor {
   beginTransaction(): Promise<Transaction>
 }
+
+export interface ViewRepository<T, ID> {
+  metadata?(): Attributes|undefined;
+  keys?(): string[];
+  load(id: ID, ctx?: Transaction): Promise<T|null>;
+}
+export interface SearchRepository<T, F extends Filter> {
+  search(s: F, limit: number, offset?: number|string, fields?: string[], ctx?: Transaction): Promise<SearchResult<T>>;
+}
+export interface ViewSearchRepository<T, ID, F extends Filter>
+  extends ViewRepository<T, ID>, SearchRepository<T, F> {
+}
+export interface GenericRepository<T, ID> extends ViewRepository<T, ID> {
+  create(obj: T, ctx?: Transaction): Promise<number>;
+  update(obj: T, ctx?: Transaction): Promise<number>;
+  patch(obj: Partial<T>, ctx?: Transaction): Promise<number>;
+  delete(id: ID, ctx?: Transaction): Promise<number>;
+}
+export interface CRUDRepository<T, ID> extends ViewRepository<T, ID> {
+  create(obj: T, ctx?: Transaction): Promise<number>;
+  update(obj: T, ctx?: Transaction): Promise<number>;
+  patch(obj: Partial<T>, ctx?: Transaction): Promise<number>;
+  delete(id: ID, ctx?: Transaction): Promise<number>;
+}
+export interface Repository<T, ID, F extends Filter>
+  extends GenericRepository<T, ID>, SearchRepository<T, F> {
+}
+export interface GenericSearchRepository<T, ID, F extends Filter>
+  extends GenericRepository<T, ID>, SearchRepository<T, F> {
+}

package/src/index.ts

@@ -7,23 +7,9 @@ export * from './validator';
 export * from './loader';
 export * from './model';
 
-import {GenericRepository} from './repository/GenericRepository';
-
-export * from './repository/ViewRepository';
-export * from './repository/GenericRepository';
-export * from './repository/SearchRepository';
-export * from './repository/ViewSearchRepository';
-export * from './repository/GenericSearchRepository';
-
-export * from './service/ViewService';
-export * from './service/GenericService';
-export * from './service/SearchService';
-export * from './service/ViewSearchService';
-export * from './service/GenericSearchService';
-export * from './service/DiffService';
-export * from './service/ApprService';
-export * from './service/DiffApprService';
-export * from './service/GenericSearchDiffApprService';
+import { GenericRepository, SearchRepository, GenericSearchRepository, Transaction } from './db';
+import { GenericSearchService, GenericService } from './service';
+export * from './service';
 
 export * from './mail/model/AttachmentData';
 export * from './mail/model/TrackingSettings';
@@ -56,10 +42,6 @@ export type LogFunc = Log;
 
 import { Attributes } from './metadata';
 import { ErrorMessage, Filter, SearchResult } from './model';
-import { GenericSearchService } from './service/GenericSearchService';
-import { GenericService } from './service/GenericService';
-import { SearchRepository } from './repository/SearchRepository';
-import { GenericSearchRepository } from './repository/GenericSearchRepository';
 
 export type Search<T, F> = (s: F, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
 export type SearchFunc<T, F> = Search<T, F>;
@@ -136,9 +118,9 @@ export class SearchUseCase<T, F extends Filter> {
 export const SearchManager = SearchUseCase
 
 interface WriterRepo<T> {
-  create(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: Partial<T>, ctx?: any): Promise<number>;
+  create(obj: T, ctx?: Transaction): Promise<number>;
+  update(obj: T, ctx?: Transaction): Promise<number>;
+  patch(obj: Partial<T>, ctx?: Transaction): Promise<number>;
 }
 // tslint:disable-next-line:max-classes-per-file
 export class Writer<T> {
@@ -147,22 +129,22 @@ export class Writer<T> {
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
   }
-  create(obj: T, ctx?: any): Promise<number> {
-    return this.repository.create(obj, ctx);
+  create(obj: T): Promise<number> {
+    return this.repository.create(obj);
   }
-  update(obj: T, ctx?: any): Promise<number> {
-    return this.repository.update(obj, ctx);
+  update(obj: T): Promise<number> {
+    return this.repository.update(obj);
   }
-  patch(obj: Partial<T>, ctx?: any): Promise<number> {
-    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
+  patch(obj: Partial<T>): Promise<number> {
+    return (this.repository.patch ? this.repository.patch(obj) : Promise.resolve(-1));
   }
 }
 
 interface SearchWriterRepo<T, F extends Filter> {
   search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>>
-  create(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: Partial<T>, ctx?: any): Promise<number>;
+  create(obj: T, ctx?: Transaction): Promise<number>;
+  update(obj: T, ctx?: Transaction): Promise<number>;
+  patch(obj: Partial<T>, ctx?: Transaction): Promise<number>;
 }
 // tslint:disable-next-line:max-classes-per-file
 export class SearchWriter<T, F extends Filter> extends Writer<T> {
@@ -190,11 +172,11 @@ export class UseCase<T, ID, F extends Filter> extends SearchWriter<T, F> impleme
   keys(): string[] {
     return (this.repository.keys ? this.repository.keys() : []);
   }
-  load(id: ID, ctx?: any): Promise<T | null> {
-    return this.repository.load(id, ctx);
+  load(id: ID): Promise<T | null> {
+    return this.repository.load(id);
   }
-  delete(id: ID, ctx?: any): Promise<number> {
-    return this.repository.delete(id, ctx);
+  delete(id: ID): Promise<number> {
+    return this.repository.delete(id);
   }
 }
 
@@ -207,17 +189,17 @@ export class GenericUseCase<T, ID> extends Writer<T> implements GenericService<T
     this.load = this.load.bind(this);
     this.delete = this.delete.bind(this);
   }
-  metadata(): Attributes|undefined {
+  metadata(): Attributes | undefined {
     return (this.repository.metadata ? this.repository.metadata() : undefined);
   }
   keys(): string[] {
     return (this.repository.keys ? this.repository.keys() : []);
   }
-  load(id: ID, ctx?: any): Promise<T | null> {
-    return this.repository.load(id, ctx);
+  load(id: ID): Promise<T | null> {
+    return this.repository.load(id);
   }
-  delete(id: ID, ctx?: any): Promise<number> {
-    return this.repository.delete(id, ctx);
+  delete(id: ID): Promise<number> {
+    return this.repository.delete(id);
   }
 }
 export const CRUDUseCase = GenericUseCase
@@ -254,9 +236,4 @@ export class SavedService<UID, ID> {
     return this.savedRepository.remove(userId, id)
   }
 }
-// tslint:disable-next-line:max-classes-per-file
-export class SavedUseCase<ID, T> extends SavedService<ID, T> {
-}
-export function isSuccessful<T>(res: number | T | ErrorMessage[]): boolean {
-  return (typeof res === "number" && res <= 0) || Array.isArray(res) ? false : true
-}
+export const SavedUseCase = SavedService

package/src/service.ts

@@ -0,0 +1,45 @@
+import { Filter, Result, SearchResult } from './model';
+import { Attributes } from './metadata';
+
+export interface ViewService<T, ID> {
+  metadata?(): Attributes|undefined;
+  keys?(): string[];
+  load(id: ID): Promise<T|null>;
+}
+
+export interface SearchService<T, F extends Filter> {
+  keys?(): string[];
+  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>>;
+}
+
+export interface Query<T, ID, F extends Filter> extends SearchService<T, F> {
+  metadata?(): Attributes|undefined;
+  load(id: ID): Promise<T|null>;
+}
+export interface QueryService<T, ID, F extends Filter> extends SearchService<T, F> {
+  metadata?(): Attributes|undefined;
+  load(id: ID): Promise<T|null>;
+}
+export interface QueryRepository<T, ID, F extends Filter> extends SearchService<T, F> {
+  metadata?(): Attributes|undefined;
+  load(id: ID): Promise<T|null>;
+}
+
+export interface GenericService<T, ID, R> extends ViewService<T, ID> {
+  create(obj: T): Promise<R>;
+  update(obj: T): Promise<R>;
+  patch(obj: Partial<T>): Promise<R>;
+  delete(id: ID): Promise<number>;
+}
+
+export interface ViewSearchService<T, ID, F extends Filter>
+  extends ViewService<T, ID>, SearchService<T, F> {
+}
+
+export interface GenericSearchService<T, ID, R, F extends Filter>
+  extends GenericService<T, ID, R>, SearchService<T, F> {
+}
+
+export interface Service<T, ID, F extends Filter>
+  extends GenericService<T, ID, Result<T>>, SearchService<T, F> {
+}

package/src/repository/GenericRepository.ts

@@ -1,20 +0,0 @@
-import {ViewRepository} from './ViewRepository';
-
-export interface GenericRepository<T, ID> extends ViewRepository<T, ID> {
-  create(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: Partial<T>, ctx?: any): Promise<number>;
-  delete(id: ID, ctx?: any): Promise<number>;
-}
-export interface Repository<T, ID> extends ViewRepository<T, ID> {
-  create(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: Partial<T>, ctx?: any): Promise<number>;
-  delete(id: ID, ctx?: any): Promise<number>;
-}
-export interface CRUDRepository<T, ID> extends ViewRepository<T, ID> {
-  create(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: Partial<T>, ctx?: any): Promise<number>;
-  delete(id: ID, ctx?: any): Promise<number>;
-}

package/src/repository/GenericSearchRepository.ts

@@ -1,7 +0,0 @@
-import {Filter} from '../model';
-import {GenericRepository} from './GenericRepository';
-import {SearchRepository} from './SearchRepository';
-
-export interface GenericSearchRepository<T, ID, F extends Filter>
-  extends GenericRepository<T, ID>, SearchRepository<T, F> {
-}

package/src/repository/SearchRepository.ts

@@ -1,6 +0,0 @@
-import {Filter} from '../model';
-import {SearchResult} from '../model';
-
-export interface SearchRepository<T, F extends Filter> {
-  search(s: F, limit: number, offset?: number|string, fields?: string[], ctx?: any): Promise<SearchResult<T>>;
-}

package/src/repository/ViewRepository.ts

@@ -1,7 +0,0 @@
-import {Attributes} from '../metadata';
-
-export interface ViewRepository<T, ID> {
-  metadata?(): Attributes|undefined;
-  keys?(): string[];
-  load(id: ID, ctx?: any): Promise<T|null>;
-}

package/src/repository/ViewSearchRepository.ts

@@ -1,7 +0,0 @@
-import {Filter} from '../model';
-import {SearchRepository} from './SearchRepository';
-import {ViewRepository} from './ViewRepository';
-
-export interface ViewSearchRepository<T, ID, F extends Filter>
-  extends ViewRepository<T, ID>, SearchRepository<T, F> {
-}

package/src/service/ApprService.ts

@@ -1,17 +0,0 @@
-export interface ApprService<ID> {
-  approve(id: ID, ctx?: any): Promise<number|string>;
-  reject(id: ID, ctx?: any): Promise<number|string>;
-}
-export interface ApprListService<ID> {
-  approve(ids: ID[], ctx?: any): Promise<number|string>;
-  reject(ids: ID[], ctx?: any): Promise<number|string>;
-}
-
-export interface ApprRepository<ID> {
-  approve(id: ID, ctx?: any): Promise<number|string>;
-  reject(id: ID, ctx?: any): Promise<number|string>;
-}
-export interface ApprListRepository<ID> {
-  approve(ids: ID[], ctx?: any): Promise<number|string>;
-  reject(ids: ID[], ctx?: any): Promise<number|string>;
-}

package/src/service/DiffApprService.ts

@@ -1,16 +0,0 @@
-import {ApprListRepository, ApprListService, ApprRepository, ApprService} from './ApprService';
-import {DiffListRepository, DiffListService, DiffRepository, DiffService} from './DiffService';
-
-export interface DiffApprService<T, ID> extends DiffService<T, ID>, ApprService<ID> {
-
-}
-export interface DiffApprListService<T, ID> extends DiffListService<T, ID>, ApprListService<ID> {
-
-}
-
-export interface DiffApprRepository<T, ID> extends DiffRepository<T, ID>, ApprRepository<ID> {
-
-}
-export interface DiffApprListRepository<T, ID> extends DiffListRepository<T, ID>, ApprListRepository<ID> {
-
-}

package/src/service/DiffService.ts

@@ -1,22 +0,0 @@
-
-import {DiffModel} from '../model';
-
-export interface DiffService<T, ID> {
-  keys?(): string[];
-  diff(id: ID, ctx?: any): Promise<DiffModel<T, ID>>;
-}
-export interface DiffListService<T, ID> {
-  keys?(): string[];
-  // tslint:disable-next-line:array-type
-  diff(ids: ID[], ctx?: any): Promise<Array<DiffModel<T, ID>>>;
-}
-
-export interface DiffRepository<T, ID> {
-  keys?(): string[];
-  diff(id: ID, ctx?: any): Promise<DiffModel<T, ID>>;
-}
-export interface DiffListRepository<T, ID> {
-  keys?(): string[];
-  // tslint:disable-next-line:array-type
-  diff(ids: ID[], ctx?: any): Promise<Array<DiffModel<T, ID>>>;
-}

package/src/service/GenericSearchDiffApprService.ts

@@ -1,7 +0,0 @@
-import {Filter} from '../model';
-import {DiffApprService} from './DiffApprService';
-import {GenericSearchService} from './GenericSearchService';
-
-export interface GenericSearchDiffApprService<T, ID, R, F extends Filter> extends GenericSearchService<T, ID, R, F>, DiffApprService<T, ID> {
-
-}

package/src/service/GenericSearchService.ts

@@ -1,10 +0,0 @@
-import {Filter, Result} from '../model';
-import {GenericService} from './GenericService';
-import {SearchService} from './SearchService';
-
-export interface GenericSearchService<T, ID, R, F extends Filter>
-  extends GenericService<T, ID, R>, SearchService<T, F> {
-}
-export interface Service<T, ID, F extends Filter> extends GenericSearchService<T, ID, Result<T>, F> {
-
-}

package/src/service/GenericService.ts

@@ -1,8 +0,0 @@
-import {ViewService} from './ViewService';
-
-export interface GenericService<T, ID, R> extends ViewService<T, ID> {
-  create(obj: T, ctx?: any): Promise<R>;
-  update(obj: T, ctx?: any): Promise<R>;
-  patch(obj: Partial<T>, ctx?: any): Promise<R>;
-  delete(id: ID, ctx?: any): Promise<number>;
-}

package/src/service/SearchService.ts

@@ -1,22 +0,0 @@
-import {Attributes} from '../metadata';
-import {Filter, SearchResult} from '../model';
-
-export interface SearchService<T, F extends Filter> {
-  keys?(): string[];
-  search(s: F, limit: number, page?: number|string, fields?: string[], ctx?: any): Promise<SearchResult<T>>;
-}
-export interface Query<T, ID, F extends Filter> extends SearchService<T, F> {
-  metadata?(): Attributes|undefined;
-  metadata?(): Attributes|undefined;
-  load(id: ID, ctx?: any): Promise<T|null>;
-}
-export interface QueryService<T, ID, F extends Filter> extends SearchService<T, F> {
-  metadata?(): Attributes|undefined;
-  metadata?(): Attributes|undefined;
-  load(id: ID, ctx?: any): Promise<T|null>;
-}
-export interface QueryRepository<T, ID, F extends Filter> extends SearchService<T, F> {
-  metadata?(): Attributes|undefined;
-  metadata?(): Attributes|undefined;
-  load(id: ID, ctx?: any): Promise<T|null>;
-}

package/src/service/ViewSearchService.ts

@@ -1,7 +0,0 @@
-import {Filter} from '../model';
-import {SearchService} from './SearchService';
-import {ViewService} from './ViewService';
-
-export interface ViewSearchService<T, ID, F extends Filter>
-  extends ViewService<T, ID>, SearchService<T, F> {
-}

package/src/service/ViewService.ts

@@ -1,7 +0,0 @@
-import {Attributes} from '../metadata';
-
-export interface ViewService<T, ID> {
-  metadata?(): Attributes|undefined;
-  keys?(): string[];
-  load(id: ID, ctx?: any): Promise<T|null>;
-}