onecore 0.0.25 → 0.0.26

package/package.json

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

package/src/index.ts

@@ -74,8 +74,11 @@ import { ViewRepository } from './repository/ViewRepository';
 import { GenericService } from './service/GenericService';
 import { ViewService } from './service/ViewService';
 
+export type Search<T, F> = (s: F, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
+export type SearchFunc<T, F> = Search<T, F>;
+
 export class ViewManager<T, ID> implements ViewService<T, ID> {
-  constructor(private repo: ViewRepository<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);
@@ -83,19 +86,19 @@ export class ViewManager<T, ID> implements ViewService<T, ID> {
     this.exist = this.exist.bind(this);
   }
   metadata(): Attributes|undefined {
-    return (this.repo.metadata ? this.repo.metadata() : undefined);
+    return (this.r.metadata ? this.r.metadata() : undefined);
   }
   keys(): string[] {
-    return (this.repo.keys ? this.repo.keys() : []);
+    return (this.r.keys ? this.r.keys() : []);
   }
   all(ctx?: any): Promise<T[]> {
-    return (this.repo.all ? this.repo.all() : Promise.resolve([]));
+    return (this.r.all ? this.r.all() : Promise.resolve([]));
   }
   load(id: ID, ctx?: any): Promise<T | null> {
-    return this.repo.load(id, ctx);
+    return this.r.load(id, ctx);
   }
   exist(id: ID, ctx?: any): Promise<boolean> {
-    return (this.repo.exist ? this.repo.exist(id, ctx) : Promise.resolve(false));
+    return (this.r.exist ? this.r.exist(id, ctx) : Promise.resolve(false));
   }
 }
 export class GenericManager<T, ID> extends ViewManager<T, ID> implements GenericService<T, ID, number> {
@@ -123,12 +126,12 @@ export class GenericManager<T, ID> extends ViewManager<T, ID> implements Generic
     return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   }
 }
-export class Manager<T, ID, S extends Filter> extends GenericManager<T, ID> implements GenericSearchService<T, ID, number, S> {
-  constructor(public find: (s: S, offset?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, repo: GenericRepository<T, ID>) {
+export class Manager<T, ID, F extends Filter> extends GenericManager<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);
   }
-  search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+  search(s: F, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
     return this.find(s, limit, offset, fields);
   }
 }

package/src/repository/GenericSearchRepository.ts

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

package/src/repository/SearchRepository.ts

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

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

package/src/service/GenericSearchDiffApprService.ts

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

package/src/service/GenericSearchService.ts

@@ -2,6 +2,6 @@ import {Filter} from '../model';
 import {GenericService} from './GenericService';
 import {SearchService} from './SearchService';
 
-export interface GenericSearchService<T, ID, R, S extends Filter>
-  extends GenericService<T, ID, R>, SearchService<T, S> {
+export interface GenericSearchService<T, ID, R, F extends Filter>
+  extends GenericService<T, ID, R>, SearchService<T, F> {
 }

package/src/service/SearchService.ts

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

package/src/service/ViewSearchService.ts

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