onecore 0.0.25 → 0.0.28

package/package.json

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

package/src/index.ts

@@ -1,35 +1,13 @@
-export {Locale} from './formatter';
-
 export * from './db';
 
-export {Mapper} from './formatter';
-export {LocaleMapper} from './formatter';
-export {Formatter} from './formatter';
-export {LocaleFormatter} from './formatter';
-export {StringFormatter} from './formatter';
-export {LocaleStringFormatter} from './formatter';
-
+export * from './formatter';
 export * from './metadata';
-
-export {CacheService} from './cache';
-export {SyncCacheService} from './cache';
-
-export {Validator} from './validator';
-export {SyncValidator} from './validator';
-
-export {ValueGenerator} from './loader';
-export {IdGenerator} from './loader';
-
-export {Generator} from './loader';
-export {Loader} from './loader';
-export {UniqueValueBuilder} from './loader';
-
-export {DataLoader} from './loader';
-
+export * from './cache';
+export * from './validator';
+export * from './loader';
 export * from './model';
 
 import {GenericRepository} from './repository/GenericRepository';
-export {GenericRepository as Repository};
 
 export * from './repository/ViewRepository';
 export * from './repository/GenericRepository';
@@ -37,9 +15,6 @@ export * from './repository/SearchRepository';
 export * from './repository/ViewSearchRepository';
 export * from './repository/GenericSearchRepository';
 
-import {GenericSearchService} from './service/GenericSearchService';
-export {GenericSearchService as Service};
-
 export * from './service/ViewService';
 export * from './service/GenericService';
 export * from './service/SearchService';
@@ -58,7 +33,6 @@ export * from './mail/model/MailContent';
 export * from './mail/model/PersonalizationData';
 export * from './mail/model/MailSettings';
 export * from './mail/model/ASMOptions';
-export * from './mail/service/MailService';
 export * from './mail/config';
 
 export * from './location';
@@ -66,16 +40,23 @@ export * from './video';
 export * from './health';
 export * from './logger';
 
+export type Log = (msg: string) => void;
+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 { 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,21 +64,22 @@ 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));
   }
 }
+// tslint:disable-next-line:max-classes-per-file
 export class GenericManager<T, ID> extends ViewManager<T, ID> implements GenericService<T, ID, number> {
   constructor(protected repository: GenericRepository<T, ID>) {
     super(repository);
@@ -123,12 +105,13 @@ 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>) {
+// tslint:disable-next-line:max-classes-per-file
+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/mail/config.ts

@@ -1,6 +1,28 @@
+import {EmailData} from './model/EmailData';
 import {MailData} from './model/MailData';
 
-export interface SendGridConfig {
-  from: MailData;
+export interface MailConfig {
+  provider?: string;
+  from: EmailData;
   key: string;
+  smtp?: SmtpConfig;
+}
+export interface Address {
+  name: string;
+  address: string;
+}
+export interface SmtpConfig {
+  host: string;
+  port: number;
+  secure?: boolean;
+  auth: Auth;
+}
+export interface Auth {
+  user: string;
+  pass: string;
+}
+export type Send = (mailData: MailData) => Promise<boolean>;
+export type SendMail = Send;
+export interface MailService {
+  send(mailData: MailData): Promise<boolean>;
 }

package/src/model.ts

@@ -36,6 +36,10 @@ export interface Domain {
   name?: string;
   status?: string;
 }
+export interface Item {
+  value: string;
+  text?: string;
+}
 export interface ValueText {
   value: string;
   text?: string;
@@ -117,6 +121,7 @@ export interface ResultInfo<T> {
   value?: T;
   message?: string;
 }
+export type Result<T> = number | ResultInfo<T>;
 
 export interface DiffModel<T, ID> {
   id?: ID;
@@ -124,12 +129,24 @@ export interface DiffModel<T, ID> {
   value: T;
 }
 
+export interface Achievement {
+  subject: string;
+  description: string;
+}
+export interface Skill {
+  skill: string;
+  hirable: boolean;
+}
 export interface UserFilter extends Filter {
   userId?: string;
   username?: string;
   email?: string;
   displayName?: string;
+  dateOfBirth?: DateRange;
   status?: string[]|string;
+  interests: string[];
+  skills: Skill[];
+  achievements: Achievement[];
 }
 export interface RoleFilter extends Filter {
   roleId?: string;

package/src/mq.ts

@@ -1,6 +1,28 @@
 interface StringMap {
   [key: string]: string;
 }
+export interface NumberMap {
+  [key: number]: number;
+}
+export type Handle<T> = (data: T, header?: StringMap) => Promise<number>;
+export type Consume<T> = (handle: (data: T, header?: StringMap) => Promise<number>) => void;
+export type Read<T> = Consume<T>;
+export type Subscribe<T> = Consume<T>;
+export type Receive<T> = Consume<T>;
+export type Get<T> = Consume<T>;
+export type Fetch<T> = Consume<T>;
+export type Produce<T, R> = (data: T) => Promise<R>;
+export type Write<T, R> = Produce<T, R>;
+export type Publish<T, R> = Produce<T, R>;
+export type Send<T, R> = Produce<T, R>;
+export type Put<T, R> = Produce<T, R>;
+export type Set<T, R> = Produce<T, R>;
+
+export interface RetryConfig {
+  name: string;
+  limit: number;
+}
+
 export interface Message<T, ID, R> {
   id?: ID;
   data?: T;

package/src/repository/GenericRepository.ts

@@ -7,3 +7,10 @@ export interface GenericRepository<T, ID> extends ViewRepository<T, ID> {
   save?(obj: 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>;
+  save?(obj: T, ctx?: any): Promise<number>;
+  delete?(id: ID, ctx?: any): Promise<number>;
+}

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

@@ -1,7 +1,10 @@
-import {Filter} from '../model';
+import {Filter, Result} 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> {
+}
+export interface Service<T, ID, F extends Filter> extends GenericSearchService<T, ID, Result<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> {
 }

package/src/video.ts

@@ -64,7 +64,7 @@ export interface ListResult<T> {
   nextPageToken?: string;
 }
 export type ChannelSortType = 'title' | 'count' | 'date';
-export interface ChannelSM {
+export interface ChannelFilter {
   q?: string;
   sort?: SortType; // date, rating, relevance, title, count (for channels)
   forMine?: boolean;
@@ -78,7 +78,7 @@ export interface ChannelSM {
   topicId?: string;
 }
 export type PlaylistSortType = 'title' | 'count' | 'date';
-export interface PlaylistSM {
+export interface PlaylistFilter {
   q?: string;
   sort?: SortType; // date, rating, relevance, title, count (for channels), viewCount (for live broadcast)
   forMine?: boolean;
@@ -102,7 +102,7 @@ export type LicenseType = 'creativeCommon' | 'youtube' | 'any' | '';
 export type SyndicatedType = 'true' | 'any' | '';
 export type VideoType = 'movie' | 'episode' | 'any' | '';
 export type SortType = 'rating' | 'date' | 'count' | 'relevance' | 'title' | 'viewCount' | '';
-export interface ItemSM {
+export interface ItemFilter {
   q?: string;
   type?: ItemType; // video, channel, playlist
   duration?: Duration; // any, long (more than 20 minutes), medium (from 4 minutes to 20 minutes), short (less than 4 minutes)
@@ -127,7 +127,7 @@ export interface ItemSM {
   syndicated?: SyndicatedType; // any, true
   videoType?: SyndicatedType; // any, episode, movie
 }
-export interface Item extends Title, Thumbnail, ChannelInfo {
+export interface VideoItem extends Title, Thumbnail, ChannelInfo {
   kind?: string; // video, channel, playlist
   id?: string;
   liveBroadcastContent?: string; // upcoming, live, none
@@ -384,11 +384,11 @@ export interface VideoService {
   getPopularVideos(regionCode?: string, videoCategoryId?: string, max?: number, nextPageToken?: string, fields?: string[]): Promise<ListResult<Video>>;
   getVideos(ids: string[], fields?: string[]): Promise<Video[]>;
   getVideo(id: string, fields?: string[]): Promise<Video>;
-  search(sm: ItemSM, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Item>>;
-  getRelatedVideos?(videoId: string, max?: number, nextPageToken?: string, fields?: string[]): Promise<ListResult<Item>>;
-  searchVideos?(sm: ItemSM, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Item>>;
-  searchPlaylists?(sm: PlaylistSM, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Playlist>>;
-  searchChannels?(sm: ChannelSM, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Channel>>;
+  search(sm: ItemFilter, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<VideoItem>>;
+  getRelatedVideos?(videoId: string, max?: number, nextPageToken?: string, fields?: string[]): Promise<ListResult<VideoItem>>;
+  searchVideos?(sm: ItemFilter, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<VideoItem>>;
+  searchPlaylists?(sm: PlaylistFilter, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Playlist>>;
+  searchChannels?(sm: ChannelFilter, max?: number, nextPageToken?: string | number, fields?: string[]): Promise<ListResult<Channel>>;
   /**
    * @param videoId
    * @param order relevance, time (default)

package/src/mail/service/MailService.ts

@@ -1,5 +0,0 @@
-import {MailData} from '../model/MailData';
-
-export interface MailService {
-  sendMail(mail: MailData): Promise<boolean>;
-}