onecore 0.6.2 → 0.6.3

package/package.json

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

package/src/db.ts

@@ -17,9 +17,9 @@ interface StringMap {
 export interface Executor {
   driver: string
   param(i: number): string
-  execute(sql: string, args?: any[], ctx?: any): Promise<number>
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
+  execute(sql: string, args?: any[]): Promise<number>
+  executeBatch(statements: Statement[], firstSuccess?: boolean): Promise<number>
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T[]>
 }
 export interface Transaction extends Executor {
   commit(): Promise<void>

package/src/index.ts

@@ -12,7 +12,7 @@ export * from './logger';
 export * from './io';
 
 import { GenericRepository, SearchRepository, GenericSearchRepository, Transaction } from './db';
-import { GenericSearchService, GenericService } from './service';
+import { GenericSearchService, CRUDService } from './service';
 export * from './service';
 
 export * from './mail/model/AttachmentData';
@@ -200,7 +200,7 @@ export class UseCase<T, ID, F extends Filter> extends SearchWriter<T, F> impleme
 }
 
 // tslint:disable-next-line:max-classes-per-file
-export class GenericUseCase<T, ID> extends Writer<T> implements GenericService<T, ID, number> {
+export class CRUDUseCase<T, ID> extends Writer<T> implements CRUDService<T, ID, number> {
   constructor(protected repository: GenericRepository<T, ID>) {
     super(repository);
     this.metadata = this.metadata.bind(this);
@@ -221,9 +221,9 @@ export class GenericUseCase<T, ID> extends Writer<T> implements GenericService<T
     return this.repository.delete(id);
   }
 }
-export const CRUDUseCase = GenericUseCase
-export const GenericManager = GenericUseCase
-export const CRUDManager = GenericUseCase
+export const GenericUseCase = CRUDUseCase
+export const GenericManager = CRUDUseCase
+export const CRUDManager = CRUDUseCase
 
 export interface SavedRepository<UID, ID> {
   isSaved(userId: UID, id: ID): Promise<boolean>

package/src/service.ts

@@ -25,21 +25,26 @@ export interface QueryRepository<T, ID, F extends Filter> extends SearchService<
   load(id: ID): Promise<T|null>;
 }
 
+export interface CRUDService<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 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> {
+  extends CRUDService<T, ID, R>, SearchService<T, F> {
 }
 
 export interface Service<T, ID, F extends Filter>
-  extends GenericService<T, ID, Result<T>>, SearchService<T, F> {
+  extends CRUDService<T, ID, Result<T>>, SearchService<T, F> {
 }

package/lib/index.js

@@ -1,84 +0,0 @@
-export class SearchUseCase {
-  constructor(repository) {
-    this.repository = repository;
-    this.search = this.search.bind(this);
-  }
-  search(s, limit, page, fields) {
-    return this.repository.search(s, limit, page, fields);
-  }
-}
-export const SearchManager = SearchUseCase;
-export class Writer {
-  constructor(repository) {
-    this.repository = repository;
-    this.create = this.create.bind(this);
-    this.update = this.update.bind(this);
-    this.patch = this.patch.bind(this);
-  }
-  create(obj) {
-    return this.repository.create(obj);
-  }
-  update(obj) {
-    return this.repository.update(obj);
-  }
-  patch(obj) {
-    return (this.repository.patch ? this.repository.patch(obj) : Promise.resolve(-1));
-  }
-}
-export class SearchWriter extends Writer {
-  constructor(repository) {
-    super(repository);
-    this.repository = repository;
-    this.search = this.search.bind(this);
-  }
-  search(s, limit, page, fields) {
-    return this.repository.search(s, limit, page, fields);
-  }
-}
-export class UseCase extends SearchWriter {
-  constructor(repository) {
-    super(repository);
-    this.repository = repository;
-    this.metadata = this.metadata.bind(this);
-    this.keys = this.keys.bind(this);
-    this.load = this.load.bind(this);
-    this.delete = this.delete.bind(this);
-  }
-  metadata() {
-    return (this.repository.metadata ? this.repository.metadata() : undefined);
-  }
-  keys() {
-    return (this.repository.keys ? this.repository.keys() : []);
-  }
-  load(id) {
-    return this.repository.load(id);
-  }
-  delete(id) {
-    return this.repository.delete(id);
-  }
-}
-export class GenericUseCase extends Writer {
-  constructor(repository) {
-    super(repository);
-    this.repository = repository;
-    this.metadata = this.metadata.bind(this);
-    this.keys = this.keys.bind(this);
-    this.load = this.load.bind(this);
-    this.delete = this.delete.bind(this);
-  }
-  metadata() {
-    return (this.repository.metadata ? this.repository.metadata() : undefined);
-  }
-  keys() {
-    return (this.repository.keys ? this.repository.keys() : []);
-  }
-  load(id) {
-    return this.repository.load(id);
-  }
-  delete(id) {
-    return this.repository.delete(id);
-  }
-}
-export const CRUDUseCase = GenericUseCase;
-export const GenericManager = GenericUseCase;
-export const CRUDManager = GenericUseCase;