onecore 0.0.30 → 0.0.33

package/lib/index.js

@@ -14,33 +14,38 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var ViewManager = (function () {
-  function ViewManager(repo) {
-    this.repo = repo;
+  function ViewManager(r) {
+    this.r = r;
     this.metadata = this.metadata.bind(this);
     this.keys = this.keys.bind(this);
-    this.all = this.all.bind(this);
     this.load = this.load.bind(this);
-    this.exist = this.exist.bind(this);
   }
   ViewManager.prototype.metadata = function () {
-    return (this.repo.metadata ? this.repo.metadata() : undefined);
+    return (this.r.metadata ? this.r.metadata() : undefined);
   };
   ViewManager.prototype.keys = function () {
-    return (this.repo.keys ? this.repo.keys() : []);
-  };
-  ViewManager.prototype.all = function (ctx) {
-    return (this.repo.all ? this.repo.all() : Promise.resolve([]));
+    return (this.r.keys ? this.r.keys() : []);
   };
   ViewManager.prototype.load = function (id, ctx) {
-    return this.repo.load(id, ctx);
-    ;
-  };
-  ViewManager.prototype.exist = function (id, ctx) {
-    return (this.repo.exist ? this.repo.exist(id, ctx) : Promise.resolve(false));
+    return this.r.load(id, ctx);
   };
   return ViewManager;
 }());
 exports.ViewManager = ViewManager;
+var ViewSearchManager = (function (_super) {
+  __extends(ViewSearchManager, _super);
+  function ViewSearchManager(find, repo) {
+    var _this = _super.call(this, repo) || this;
+    _this.find = find;
+    _this.search = _this.search.bind(_this);
+    return _this;
+  }
+  ViewSearchManager.prototype.search = function (s, limit, offset, fields) {
+    return this.find(s, limit, offset, fields);
+  };
+  return ViewSearchManager;
+}(ViewManager));
+exports.ViewSearchManager = ViewSearchManager;
 var GenericManager = (function (_super) {
   __extends(GenericManager, _super);
   function GenericManager(repository) {
@@ -49,24 +54,18 @@ var GenericManager = (function (_super) {
     _this.insert = _this.insert.bind(_this);
     _this.update = _this.update.bind(_this);
     _this.patch = _this.patch.bind(_this);
-    _this.save = _this.save.bind(_this);
     _this.delete = _this.delete.bind(_this);
     return _this;
   }
   GenericManager.prototype.insert = function (obj, ctx) {
     return this.repository.insert(obj, ctx);
-    ;
   };
   GenericManager.prototype.update = function (obj, ctx) {
     return this.repository.update(obj, ctx);
-    ;
   };
   GenericManager.prototype.patch = function (obj, ctx) {
     return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
   };
-  GenericManager.prototype.save = function (obj, ctx) {
-    return (this.repository.save ? this.repository.save(obj, ctx) : Promise.resolve(-1));
-  };
   GenericManager.prototype.delete = function (id, ctx) {
     return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   };
@@ -86,4 +85,9 @@ var Manager = (function (_super) {
   };
   return Manager;
 }(GenericManager));
-exports.Manager = Manager;exports.DefaultViewService = ViewManager;exports.DefaultGenericService = GenericManager;exports.GenericSearchManager = Manager;exports.DefaultService = GenericManager;exports.DefaultGenericSearchService = GenericManager;
+exports.Manager = Manager;
+exports.DefaultViewService = ViewManager;
+exports.DefaultGenericService = GenericManager;
+exports.GenericSearchManager = Manager;
+exports.DefaultService = GenericManager;
+exports.DefaultGenericSearchService = GenericManager;

package/package.json

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

package/src/index.ts

@@ -40,6 +40,10 @@ export * from './video';
 export * from './health';
 export * from './logger';
 
+export type DeleteFile = (name: string, directory?: string) => Promise<boolean>;
+export type Delete = (delFile: DeleteFile, url: string) => Promise<boolean>;
+export type BuildUrl = (name: string, directory?: string) => string;
+
 export type Log = (msg: string) => void;
 export type LogFunc = Log;
 
@@ -50,6 +54,7 @@ import { ViewRepository } from './repository/ViewRepository';
 import { GenericSearchService } from './service/GenericSearchService';
 // import { GenericSearchService } from './service/GenericSearchService';
 import { GenericService } from './service/GenericService';
+import { ViewSearchService } from './service/ViewSearchService';
 import { ViewService } from './service/ViewService';
 
 export type Search<T, F> = (s: F, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
@@ -59,9 +64,7 @@ export class ViewManager<T, ID> implements ViewService<T, ID> {
   constructor(private r: ViewRepository<T, ID>) {
     this.metadata = this.metadata.bind(this);
     this.keys = this.keys.bind(this);
-    this.all = this.all.bind(this);
     this.load = this.load.bind(this);
-    this.exist = this.exist.bind(this);
   }
   metadata(): Attributes|undefined {
     return (this.r.metadata ? this.r.metadata() : undefined);
@@ -69,14 +72,18 @@ export class ViewManager<T, ID> implements ViewService<T, ID> {
   keys(): string[] {
     return (this.r.keys ? this.r.keys() : []);
   }
-  all(ctx?: any): Promise<T[]> {
-    return (this.r.all ? this.r.all() : Promise.resolve([]));
-  }
   load(id: ID, ctx?: any): Promise<T | null> {
     return this.r.load(id, ctx);
   }
-  exist(id: ID, ctx?: any): Promise<boolean> {
-    return (this.r.exist ? this.r.exist(id, ctx) : Promise.resolve(false));
+}
+// tslint:disable-next-line:max-classes-per-file
+export class ViewSearchManager<T, ID, F extends Filter> extends ViewManager<T, ID> implements ViewSearchService<T, ID, F> {
+  constructor(public find: Search<T, F>, repo: ViewRepository<T, ID>) {
+    super(repo);
+    this.search = this.search.bind(this);
+  }
+  search(s: F, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+    return this.find(s, limit, offset, fields);
   }
 }
 // tslint:disable-next-line:max-classes-per-file
@@ -86,7 +93,6 @@ export class GenericManager<T, ID> extends ViewManager<T, ID> implements Generic
     this.insert = this.insert.bind(this);
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
-    this.save = this.save.bind(this);
     this.delete = this.delete.bind(this);
   }
   insert(obj: T, ctx?: any): Promise<number> {
@@ -95,12 +101,9 @@ export class GenericManager<T, ID> extends ViewManager<T, ID> implements Generic
   update(obj: T, ctx?: any): Promise<number> {
     return this.repository.update(obj, ctx);
   }
-  patch(obj: T, ctx?: any): Promise<number> {
+  patch(obj: Partial<T>, ctx?: any): Promise<number> {
     return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
   }
-  save(obj: T, ctx?: any): Promise<number> {
-    return (this.repository.save ? this.repository.save(obj, ctx) : Promise.resolve(-1));
-  }
   delete(id: ID, ctx?: any): Promise<number> {
     return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   }

package/src/model.ts

@@ -155,3 +155,6 @@ export interface RoleFilter extends Filter {
   remark?: string;
   description?: string;
 }
+export type Validate<T> = (obj: T, patch?: boolean) => Promise<ErrorMessage[]>;
+export type Save<T> = (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>;
+export type Load<T, ID> = ((id: ID, ctx?: any) => Promise<T|null>);

package/src/repository/GenericRepository.ts

@@ -3,12 +3,12 @@ import {ViewRepository} from './ViewRepository';
 export interface GenericRepository<T, ID> extends ViewRepository<T, ID> {
   insert(obj: T, ctx?: any): Promise<number>;
   update(obj: T, ctx?: any): Promise<number>;
-  patch(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> {
   insert(obj: T, ctx?: any): Promise<number>;
   update(obj: T, ctx?: any): Promise<number>;
-  patch(obj: T, ctx?: any): Promise<number>;
+  patch(obj: Partial<T>, ctx?: any): Promise<number>;
   delete(id: ID, ctx?: any): Promise<number>;
 }

package/src/service/GenericService.ts

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