onecore 0.3.0 → 0.5.0

package/lib/index.js

@@ -76,9 +76,9 @@ var ViewSearchManger = (function (_super) {
 exports.ViewSearchManger = ViewSearchManger;
 var GenericUseCase = (function (_super) {
   __extends(GenericUseCase, _super);
-  function GenericUseCase(repository) {
-    var _this = _super.call(this, repository) || this;
-    _this.repository = repository;
+  function GenericUseCase(repo) {
+    var _this = _super.call(this, repo) || this;
+    _this.repo = repo;
     _this.create = _this.create.bind(_this);
     _this.update = _this.update.bind(_this);
     _this.patch = _this.patch.bind(_this);
@@ -86,16 +86,16 @@ var GenericUseCase = (function (_super) {
     return _this;
   }
   GenericUseCase.prototype.create = function (obj, ctx) {
-    return this.repository.create(obj, ctx);
+    return this.repo.create(obj, ctx);
   };
   GenericUseCase.prototype.update = function (obj, ctx) {
-    return this.repository.update(obj, ctx);
+    return this.repo.update(obj, ctx);
   };
   GenericUseCase.prototype.patch = function (obj, ctx) {
-    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
+    return (this.repo.patch ? this.repo.patch(obj, ctx) : Promise.resolve(-1));
   };
   GenericUseCase.prototype.delete = function (id, ctx) {
-    return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
+    return (this.repo.delete ? this.repo.delete(id, ctx) : Promise.resolve(-1));
   };
   return GenericUseCase;
 }(ViewUseCase));
@@ -103,14 +103,13 @@ exports.GenericUseCase = GenericUseCase;
 exports.GenericManager = GenericUseCase;
 var UseCase = (function (_super) {
   __extends(UseCase, _super);
-  function UseCase(find, repo) {
-    var _this = _super.call(this, repo) || this;
-    _this.find = find;
-    _this.search = _this.search.bind(_this);
+  function UseCase(repository) {
+    var _this = _super.call(this, repository) || this;
+    _this.repository = repository;
     return _this;
   }
   UseCase.prototype.search = function (s, limit, page, fields) {
-    return this.find(s, limit, page, fields);
+    return this.repository.search(s, limit, page, fields);
   };
   return UseCase;
 }(GenericUseCase));

package/package.json

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

package/src/index.ts

@@ -65,6 +65,7 @@ import { ViewSearchService } from './service/ViewSearchService';
 import { ViewService } from './service/ViewService';
 import { SearchRepository } from './repository/SearchRepository';
 import { ViewSearchRepository } from './repository/ViewSearchRepository';
+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>;
@@ -174,35 +175,34 @@ export class ViewSearchManger<T, ID, F extends Filter> extends ViewSearchUseCase
 }
 // tslint:disable-next-line:max-classes-per-file
 export class GenericUseCase<T, ID> extends ViewUseCase<T, ID> implements GenericService<T, ID, number> {
-  constructor(protected repository: GenericRepository<T, ID>) {
-    super(repository);
+  constructor(private repo: GenericRepository<T, ID>) {
+    super(repo);
     this.create = this.create.bind(this);
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
     this.delete = this.delete.bind(this);
   }
   create(obj: T, ctx?: any): Promise<number> {
-    return this.repository.create(obj, ctx);
+    return this.repo.create(obj, ctx);
   }
   update(obj: T, ctx?: any): Promise<number> {
-    return this.repository.update(obj, ctx);
+    return this.repo.update(obj, ctx);
   }
   patch(obj: Partial<T>, ctx?: any): Promise<number> {
-    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
+    return (this.repo.patch ? this.repo.patch(obj, ctx) : Promise.resolve(-1));
   }
   delete(id: ID, ctx?: any): Promise<number> {
-    return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
+    return (this.repo.delete ? this.repo.delete(id, ctx) : Promise.resolve(-1));
   }
 }
 export const GenericManager = GenericUseCase
 // tslint:disable-next-line:max-classes-per-file
 export class UseCase<T, ID, F extends Filter> extends GenericUseCase<T, ID> implements GenericSearchService<T, ID, number, F> {
-  constructor(public find: Search<T, F>, repo: GenericRepository<T, ID>) {
-    super(repo);
-    this.search = this.search.bind(this);
+  constructor(protected repository: GenericSearchRepository<T, ID, F>) {
+    super(repository);
   }
   search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.find(s, limit, page, fields);
+    return this.repository.search(s, limit, page, fields);
   }
 }
 // tslint:disable-next-line:max-classes-per-file

package/src/metadata.ts

@@ -3,7 +3,7 @@ export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
   | 'object' | 'array' | 'binary'
   | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
 export type FormatType = 'currency' | 'percentage' | 'email' | 'url' | 'phone' | 'fax' | 'ipv4' | 'ipv6';
-export type MatchType = 'equal' | 'prefix' | 'contain' | 'max' | 'min'; // contain: default for string, min: default for Date, number
+export type Operator = "=" | "like" | "!=" | "<>" | ">" | ">=" | "<" | "<="
 
 export interface Model {
   name?: string;
@@ -24,7 +24,7 @@ export interface Attribute {
   type?: DataType;
   format?: FormatType;
   required?: boolean;
-  match?: MatchType;
+  operator?: Operator;
   default?: string|number|Date|boolean;
   key?: boolean;
   unique?: boolean;