onecore 0.0.18 → 0.0.22

package/package.json

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

package/src/index.ts

@@ -7,8 +7,7 @@ export {LocaleFormatter} from './formatter';
 export {StringFormatter} from './formatter';
 export {LocaleStringFormatter} from './formatter';
 
-export {Model} from './metadata';
-export {Attribute} from './metadata';
+export * from './metadata';
 
 export {CacheService} from './cache';
 export {SyncCacheService} from './cache';
@@ -63,3 +62,4 @@ export * from './mail/config';
 export * from './location';
 export * from './video';
 export * from './health';
+export * from './logger';

package/src/logger.ts

@@ -0,0 +1,31 @@
+export interface SimpleMap {
+  [key: string]: string|number|boolean|Date;
+}
+export interface LogMap {
+  time: string;
+  level: string;
+  msg: string;
+}
+export interface LogMapConfig {
+  time?: string;
+  level?: string;
+  msg?: string;
+}
+export interface Logger {
+  level: number;
+  trace(msg: string, m?: SimpleMap, ctx?: any): void;
+  debug(msg: string, m?: SimpleMap, ctx?: any): void;
+  info(msg: string, m?: SimpleMap, ctx?: any): void;
+  warn(msg: string, m?: SimpleMap, ctx?: any): void;
+  error(msg: string, m?: SimpleMap, ctx?: any): void;
+  panic(msg: string, m?: SimpleMap, ctx?: any): void;
+  fatal(msg: string, m?: SimpleMap, ctx?: any): void;
+  isLevelEnabled(level: number): boolean;
+  isTraceEnabled(): boolean;
+  isDebugEnabled(): boolean;
+  isInfoEnabled(): boolean;
+  isWarnEnabled(): boolean;
+  isErrorEnabled(): boolean;
+  isPanicEnabled(): boolean;
+  isFatalEnabled(): boolean;
+}

package/src/metadata.ts

@@ -1,6 +1,7 @@
 export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
-    | 'boolean' | 'number' | 'integer' | 'string' | 'text'
-    | 'object' | 'array' | 'primitives' | 'binary';
+  | 'boolean' | 'number' | 'integer' | 'string' | 'text'
+  | '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
 
@@ -8,21 +9,23 @@ export interface Model {
   name?: string;
   attributes: Attributes;
   source?: string;
+  table?: string;
   collection?: string;
   model?: any;
   schema?: any;
 }
-
 export interface Attribute {
   name?: string;
   field?: string;
+  column?: string;
   type?: DataType;
   format?: FormatType;
   required?: boolean;
   match?: MatchType;
-  defaultValue?: any;
+  default?: string|number|Date|boolean;
   key?: boolean;
   unique?: boolean;
+  enum?: string[] | number[];
   q?: boolean;
   noinsert?: boolean;
   noupdate?: boolean;
@@ -35,13 +38,15 @@ export interface Attribute {
   lt?: number;
   precision?: number;
   scale?: number;
-  exp?: RegExp|string;
+  exp?: RegExp | string;
   code?: string;
   noformat?: boolean;
   ignored?: boolean;
   jsonField?: string;
   link?: string;
   typeof?: Attributes;
+  true?: string|number;
+  false?: string|number;
 }
 export interface Attributes {
   [key: string]: Attribute;

package/src/model.ts

@@ -58,16 +58,26 @@ export interface CodeText {
 }
 
 export interface DateRange {
+  min?: Date;
+  max?: Date;
+  bottom?: Date;
+  top?: Date;
   startDate?: Date;
   endDate?: Date;
 }
 export interface TimeRange {
+  min?: Date;
+  max?: Date;
+  bottom?: Date;
+  top?: Date;
   startTime?: Date;
   endTime?: Date;
 }
 export interface NumberRange {
   min?: number;
   max?: number;
+  bottom?: number;
+  top?: number;
   lower?: number;
   upper?: number;
 }

package/src/mq.ts

@@ -21,41 +21,41 @@ export interface Writer<T, R, ID> {
   write(data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
 
-export interface SimpleProducer<T, R, ID> {
+export interface Producer<T, R, ID> {
   produce(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface SimplePublisher<T, R, ID> {
+export interface Publisher<T, R, ID> {
   publish(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface SimpleSender<T, R, ID> {
+export interface Sender<T, R, ID> {
   send(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface SimpleWriter<T, R, ID> {
+export interface Writer<T, R, ID> {
   write(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
 
-export interface SimpleConsumer<T> {
-  consume(handle: (data: T, attributes?: StringMap) => Promise<number>): void;
+export interface SimpleConsumer<T, R> {
+  consume(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
 export interface SimpleSubscriber<T, R> {
-  subscribe(handle: (data: T, attributes?: StringMap) => Promise<number>): void;
+  subscribe(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
-export interface SimpleReceiver<T> {
-  receive(handle: (data: T, attributes?: StringMap) => Promise<number>): void;
+export interface SimpleReceiver<T, R> {
+  receive(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
-export interface SimpleReader<T> {
-  read(handle: (data: T, attributes?: StringMap) => Promise<number>): void;
+export interface SimpleReader<T, R> {
+  read(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
 
-export interface Consumer<T, ID, R> {
+export interface MessageConsumer<T, ID, R> {
   consume(data: Message<T, ID, R>): void;
 }
-export interface Subscriber<T, ID, R> {
+export interface MessageSubscriber<T, ID, R> {
   subscribe(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }
-export interface Receiver<T, ID, R> {
+export interface MessageReceiver<T, ID, R> {
   receive(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }
-export interface Reader<T, ID, R> {
+export interface MessageReader<T, ID, R> {
   read(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }

package/src/repository/ViewRepository.ts

@@ -1,7 +1,7 @@
 import {Attributes} from '../metadata';
 
 export interface ViewRepository<T, ID> {
-  metadata?(): Attributes;
+  metadata?(): Attributes|undefined;
   keys?(): string[];
   all?(ctx?: any): Promise<T[]>;
   load(id: ID, ctx?: any): Promise<T|null>;

package/src/service/ViewService.ts

@@ -1,7 +1,7 @@
 import {Attributes} from '../metadata';
 
 export interface ViewService<T, ID> {
-  metadata?(): Attributes;
+  metadata?(): Attributes|undefined;
   keys?(): string[];
   all?(ctx?: any): Promise<T[]>;
   load(id: ID, ctx?: any): Promise<T|null>;