onecore 0.0.17 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onecore",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "description": "onecore",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/common-ts/onecore"
+    "url": "git@github.com/core-ts/onecore"
   },
   "keywords": [
     "one",

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';
@@ -27,12 +26,18 @@ export {DataLoader} from './loader';
 
 export * from './model';
 
+import {GenericSearchRepository} from './repository/GenericSearchRepository';
+export {GenericSearchRepository as Repository};
+
 export * from './repository/ViewRepository';
 export * from './repository/GenericRepository';
 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';

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';
+    | '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,6 +9,7 @@ export interface Model {
   name?: string;
   attributes: Attributes;
   source?: string;
+  table?: string;
   collection?: string;
   model?: any;
   schema?: any;
@@ -16,6 +18,7 @@ export interface Model {
 export interface Attribute {
   name?: string;
   field?: string;
+  column?: string;
   type?: DataType;
   format?: FormatType;
   required?: boolean;
@@ -23,6 +26,7 @@ export interface Attribute {
   defaultValue?: any;
   key?: boolean;
   unique?: boolean;
+  enum?: string[]|number[];
   q?: boolean;
   noinsert?: boolean;
   noupdate?: boolean;

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

@@ -8,37 +8,54 @@ export interface Message<T, ID, R> {
   timestamp?: Date;
   raw?: R;
 }
-export interface Publisher<T, ID> {
-  publish(data: T, attributes?: StringMap, id?: ID): Promise<boolean|void>;
+export interface Producer<T, R, ID> {
+  produce(data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface Sender<T, ID> {
-  send(data: T, attributes?: StringMap, id?: ID): Promise<boolean|void>;
+export interface Publisher<T, R, ID> {
+  publish(data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface Writer<T, ID> {
-  write(data: T, attributes?: StringMap, id?: ID): Promise<boolean|void>;
+export interface Sender<T, R, ID> {
+  send(data: T, attributes?: StringMap, id?: ID): Promise<R>;
+}
+export interface Writer<T, R, ID> {
+  write(data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
 
-export interface SimpleSubscriber<T> {
-  subscribe(data: T, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface Producer<T, R, ID> {
+  produce(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
+}
+export interface Publisher<T, R, ID> {
+  publish(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface Subscriber<T, ID, R> {
-  subscribe(data: Message<T, ID, R>, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface Sender<T, R, ID> {
+  send(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
 }
-export interface SimpleConsumer<T> {
-  consume(data: T, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface Writer<T, R, ID> {
+  write(to: string, data: T, attributes?: StringMap, id?: ID): Promise<R>;
+}
+
+export interface SimpleConsumer<T, R> {
+  consume(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
-export interface Consumer<T, ID, R> {
-  consume(data: Message<T, ID, R>, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface SimpleSubscriber<T, R> {
+  subscribe(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
 }
-export interface SimpleReader<T> {
-  read(data: T, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface SimpleReceiver<T, R> {
+  receive(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
+}
+export interface SimpleReader<T, R> {
+  read(handle: (data: T, attributes?: StringMap, raw?: R) => Promise<number>): void;
+}
+
+export interface MessageConsumer<T, ID, R> {
+  consume(data: Message<T, ID, R>): void;
 }
-export interface Consumer<T, ID, R> {
-  read(data: Message<T, ID, R>, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface MessageSubscriber<T, ID, R> {
+  subscribe(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }
-export interface SimpleReceiver<T> {
-  receive(data: T, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface MessageReceiver<T, ID, R> {
+  receive(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }
-export interface Receiver<T, ID, R> {
-  receive(data: Message<T, ID, R>, attributes?: StringMap, err?: any): Promise<boolean|void>;
+export interface MessageReader<T, ID, R> {
+  read(handle: (data: Message<T, ID, R>) => Promise<number>): void;
 }

package/src/repository/ViewRepository.ts

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

package/src/service/ViewService.ts

@@ -1,9 +1,9 @@
 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>;
+  load(id: ID, ctx?: any): Promise<T|null>;
   exist?(id: ID, ctx?: any): Promise<boolean>;
 }

package/tsconfig.json

@@ -6,6 +6,7 @@
     "outDir": "./lib",
     "module": "commonjs",
     "moduleResolution": "node",
+    "strict": true,
     "pretty": true,
     "sourceMap": false,
     "declaration": false,