onecore 0.3.1 → 0.5.1

package/lib/index.js

@@ -13,115 +13,106 @@ var __extends = (this && this.__extends) || (function () {
   };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ViewUseCase = (function () {
-  function ViewUseCase(r) {
-    this.r = r;
-    this.metadata = this.metadata.bind(this);
-    this.keys = this.keys.bind(this);
-    this.load = this.load.bind(this);
-  }
-  ViewUseCase.prototype.metadata = function () {
-    return (this.r.metadata ? this.r.metadata() : undefined);
-  };
-  ViewUseCase.prototype.keys = function () {
-    return (this.r.keys ? this.r.keys() : []);
-  };
-  ViewUseCase.prototype.load = function (id, ctx) {
-    return this.r.load(id, ctx);
-  };
-  return ViewUseCase;
-}());
-exports.ViewUseCase = ViewUseCase;
-var ViewManager = (function (_super) {
-  __extends(ViewManager, _super);
-  function ViewManager() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  return ViewManager;
-}(ViewUseCase));
-exports.ViewManager = ViewManager;
 var SearchUseCase = (function () {
-  function SearchUseCase(repo) {
-    this.repo = repo;
+  function SearchUseCase(repository) {
+    this.repository = repository;
     this.search = this.search.bind(this);
   }
   SearchUseCase.prototype.search = function (s, limit, page, fields) {
-    return this.repo.search(s, limit, page, fields);
+    return this.repository.search(s, limit, page, fields);
   };
   return SearchUseCase;
 }());
 exports.SearchUseCase = SearchUseCase;
 exports.SearchManager = SearchUseCase;
-var ViewSearchUseCase = (function (_super) {
-  __extends(ViewSearchUseCase, _super);
-  function ViewSearchUseCase(repo) {
-    var _this = _super.call(this, repo) || this;
-    _this.repo = repo;
+var Writer = (function () {
+  function Writer(repository) {
+    this.repository = repository;
+    this.create = this.create.bind(this);
+    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.update = function (obj, ctx) {
+    return this.repository.update(obj, ctx);
+  };
+  Writer.prototype.patch = function (obj, ctx) {
+    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
+  };
+  return Writer;
+}());
+exports.Writer = Writer;
+var SearchWriter = (function (_super) {
+  __extends(SearchWriter, _super);
+  function SearchWriter(repository) {
+    var _this = _super.call(this, repository) || this;
+    _this.repository = repository;
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  ViewSearchUseCase.prototype.search = function (s, limit, page, fields) {
-    return this.repo.search(s, limit, page, fields);
-  };
-  return ViewSearchUseCase;
-}(ViewUseCase));
-exports.ViewSearchUseCase = ViewSearchUseCase;
-var ViewSearchManger = (function (_super) {
-  __extends(ViewSearchManger, _super);
-  function ViewSearchManger() {
-    return _super !== null && _super.apply(this, arguments) || this;
+  SearchWriter.prototype.search = function (s, limit, page, fields) {
+    return this.repository.search(s, limit, page, fields);
+  };
+  return SearchWriter;
+}(Writer));
+exports.SearchWriter = SearchWriter;
+var UseCase = (function (_super) {
+  __extends(UseCase, _super);
+  function UseCase(repository) {
+    var _this = _super.call(this, repository) || this;
+    _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);
+    return _this;
   }
-  return ViewSearchManger;
-}(ViewSearchUseCase));
-exports.ViewSearchManger = ViewSearchManger;
+  UseCase.prototype.metadata = function () {
+    return (this.repository.metadata ? this.repository.metadata() : undefined);
+  };
+  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.delete = function (id, ctx) {
+    return this.repository.delete(id, ctx);
+  };
+  return UseCase;
+}(SearchWriter));
+exports.UseCase = UseCase;
 var GenericUseCase = (function (_super) {
   __extends(GenericUseCase, _super);
-  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);
+  function GenericUseCase(repository) {
+    var _this = _super.call(this, repository) || this;
+    _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);
     return _this;
   }
-  GenericUseCase.prototype.create = function (obj, ctx) {
-    return this.repo.create(obj, ctx);
+  GenericUseCase.prototype.metadata = function () {
+    return (this.repository.metadata ? this.repository.metadata() : undefined);
   };
-  GenericUseCase.prototype.update = function (obj, ctx) {
-    return this.repo.update(obj, ctx);
+  GenericUseCase.prototype.keys = function () {
+    return (this.repository.keys ? this.repository.keys() : []);
   };
-  GenericUseCase.prototype.patch = function (obj, ctx) {
-    return (this.repo.patch ? this.repo.patch(obj, ctx) : Promise.resolve(-1));
+  GenericUseCase.prototype.load = function (id, ctx) {
+    return this.repository.load(id, ctx);
   };
   GenericUseCase.prototype.delete = function (id, ctx) {
-    return (this.repo.delete ? this.repo.delete(id, ctx) : Promise.resolve(-1));
+    return this.repository.delete(id, ctx);
   };
   return GenericUseCase;
-}(ViewUseCase));
+}(Writer));
 exports.GenericUseCase = GenericUseCase;
+exports.CRUDUseCase = GenericUseCase;
 exports.GenericManager = GenericUseCase;
-var UseCase = (function (_super) {
-  __extends(UseCase, _super);
-  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.repository.search(s, limit, page, fields);
-  };
-  return UseCase;
-}(GenericUseCase));
-exports.UseCase = UseCase;
-var Manager = (function (_super) {
-  __extends(Manager, _super);
-  function Manager() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  return Manager;
-}(UseCase));
-exports.Manager = Manager;
+exports.CRUDManager = GenericUseCase;
 var SavedService = (function () {
   function SavedService(savedRepository, max) {
     this.savedRepository = savedRepository;
@@ -150,14 +141,6 @@ var SavedService = (function () {
   return SavedService;
 }());
 exports.SavedService = SavedService;
-var SavedManager = (function (_super) {
-  __extends(SavedManager, _super);
-  function SavedManager() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  return SavedManager;
-}(SavedService));
-exports.SavedManager = SavedManager;
 var SavedUseCase = (function (_super) {
   __extends(SavedUseCase, _super);
   function SavedUseCase() {

package/package.json

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

package/src/index.ts

@@ -57,14 +57,10 @@ export type LogFunc = Log;
 import { Attributes } from './metadata';
 import { Filter, SearchResult } from './model';
 // import { GenericRepository } from './repository/GenericRepository';
-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';
 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>>;
@@ -129,85 +125,107 @@ export interface ExportService {
 export interface Exporter {
   export(ctx?: any): Promise<number>;
 }
-export class ViewUseCase<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.load = this.load.bind(this);
-  }
-  metadata(): Attributes|undefined {
-    return (this.r.metadata ? this.r.metadata() : undefined);
-  }
-  keys(): string[] {
-    return (this.r.keys ? this.r.keys() : []);
-  }
-  load(id: ID, ctx?: any): Promise<T | null> {
-    return this.r.load(id, ctx);
-  }
-}
-
-// tslint:disable-next-line:max-classes-per-file
-export class ViewManager<T, ID> extends ViewUseCase<T, ID> {
-}
 
 // tslint:disable-next-line:max-classes-per-file
 export class SearchUseCase<T, F extends Filter> {
-  constructor(protected repo: SearchRepository<T, F>) {
+  constructor(protected repository: SearchRepository<T, F>) {
     this.search = this.search.bind(this);
   }
   search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.repo.search(s, limit, page, fields);
+    return this.repository.search(s, limit, page, fields);
   }
 }
 export const SearchManager = SearchUseCase
-// tslint:disable-next-line:max-classes-per-file
-export class ViewSearchUseCase<T, ID, F extends Filter> extends ViewUseCase<T, ID> implements ViewSearchService<T, ID, F> {
-  constructor(protected repo: ViewSearchRepository<T, ID, Filter>) {
-    super(repo);
-    this.search = this.search.bind(this);
-  }
-  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.repo.search(s, limit, page, fields);
-  }
-}
-// tslint:disable-next-line:max-classes-per-file
-export class ViewSearchManger<T, ID, F extends Filter> extends ViewSearchUseCase<T, ID, F> {
+
+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>;
 }
 // tslint:disable-next-line:max-classes-per-file
-export class GenericUseCase<T, ID> extends ViewUseCase<T, ID> implements GenericService<T, ID, number> {
-  constructor(private repo: GenericRepository<T, ID>) {
-    super(repo);
+export class Writer<T> {
+  constructor(protected repository: WriterRepo<T>) {
     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.repo.create(obj, ctx);
+    return this.repository.create(obj, ctx);
   }
   update(obj: T, ctx?: any): Promise<number> {
-    return this.repo.update(obj, ctx);
+    return this.repository.update(obj, ctx);
   }
   patch(obj: Partial<T>, ctx?: any): Promise<number> {
-    return (this.repo.patch ? this.repo.patch(obj, ctx) : Promise.resolve(-1));
+    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
   }
-  delete(id: ID, ctx?: any): Promise<number> {
-    return (this.repo.delete ? this.repo.delete(id, ctx) : 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>;
+}
+// tslint:disable-next-line:max-classes-per-file
+export class SearchWriter<T, F extends Filter> extends Writer<T> {
+  constructor(protected repository: SearchWriterRepo<T, F>) {
+    super(repository)
+    this.search = this.search.bind(this);
+  }
+  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+    return this.repository.search(s, limit, page, fields);
   }
 }
-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> {
+export class UseCase<T, ID, F extends Filter> extends SearchWriter<T, F> implements GenericSearchService<T, ID, number, F> {
   constructor(protected repository: GenericSearchRepository<T, ID, F>) {
     super(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);
   }
-  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.repository.search(s, limit, page, fields);
+  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);
+  }
+  delete(id: ID, ctx?: any): Promise<number> {
+    return this.repository.delete(id, ctx);
   }
 }
+
 // tslint:disable-next-line:max-classes-per-file
-export class Manager<T, ID, F extends Filter> extends UseCase<T, ID, F> {
+export class GenericUseCase<T, ID> extends Writer<T> implements GenericService<T, ID, number> {
+  constructor(protected repository: GenericRepository<T, ID>) {
+    super(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(): 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);
+  }
+  delete(id: ID, ctx?: any): Promise<number> {
+    return this.repository.delete(id, ctx);
+  }
 }
+export const CRUDUseCase = GenericUseCase
+export const GenericManager = GenericUseCase
+export const CRUDManager = GenericUseCase
+
 export interface SavedRepository<UID, ID> {
   isSaved(userId: UID, id: ID): Promise<boolean>
   save(userId: UID, id: ID): Promise<number>
@@ -239,8 +257,5 @@ export class SavedService<UID, ID> {
   }
 }
 // tslint:disable-next-line:max-classes-per-file
-export class SavedManager<ID, T> extends SavedService<ID, T> {
-}
-// tslint:disable-next-line:max-classes-per-file
 export class SavedUseCase<ID, T> extends SavedService<ID, T> {
 }

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;