express-ext 0.1.7 → 0.1.12

package/src/LowCodeController.ts

@@ -3,22 +3,22 @@ import {ResultInfo, StatusConfig} from './edit';
 import {GenericController, GenericService} from './GenericController';
 import {handleError} from './http';
 import {ErrorMessage} from './metadata';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export interface LowCodeConfig extends StatusConfig, SearchConfig {
 }
-export interface LowCodeService<T, ID, R, S extends SearchModel> extends GenericService<T, ID, R> {
+export interface Service<T, ID, R, S extends Filter> extends GenericService<T, ID, R> {
   search: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>;
 }
-export class LowCodeController<T, ID, S extends SearchModel> extends GenericController<T, ID> {
+export class LowCodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: string, ctx?: any) => void, public lowCodeService: LowCodeService<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: string) => void, public lowCodeService: Service<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, lowCodeService, config, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);

package/src/SearchController.ts

@@ -1,13 +1,13 @@
 import {Request, Response} from 'express';
 import {handleError} from './http';
-import {format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchModel, SearchResult} from './search';
+import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 
-export class SearchController<T, S extends SearchModel> {
+export class SearchController<T, S extends Filter> {
   config?: SearchConfig;
   csv?: boolean;
   fields?: string;
   excluding?: string;
-  constructor(protected log: (msg: any, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, config?: SearchConfig|boolean, public dates?: string[], public numbers?: string[]) {
+  constructor(protected log: (msg: string) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, config?: SearchConfig|boolean, public dates?: string[], public numbers?: string[]) {
     this.search = this.search.bind(this);
     if (config) {
       if (typeof config === 'boolean') {

package/src/edit.ts

@@ -3,11 +3,11 @@ import {handleError} from './http';
 import {Attribute, ErrorMessage} from './metadata';
 
 export interface StatusConfig {
-  duplicate_key?: number|string;
-  not_found?: number|string;
-  success?: number|string;
+  duplicate_key: number|string;
+  not_found: number|string;
+  success: number|string;
   version_error?: number|string;
-  validation_error?: number|string;
+  validation_error: number|string;
   error?: number|string;
 }
 export interface ResultInfo<T> {
@@ -16,7 +16,7 @@ export interface ResultInfo<T> {
   value?: T;
   message?: string;
 }
-export function initializeStatus(s: StatusConfig): StatusConfig {
+export function initializeStatus(s?: StatusConfig): StatusConfig {
   if (s) {
     return s;
   }
@@ -25,39 +25,39 @@ export function initializeStatus(s: StatusConfig): StatusConfig {
     not_found: 0,
     success: 1,
     version_error: 2,
+    validation_error: 4,
     error: 4
   };
   return s1;
 }
-export function checkId<T, ID>(obj: T, id: ID, keys: Attribute[]): boolean {
-  let n = 'id';
-  if (keys && keys.length === 1) {
-    n = keys[0].name;
-  }
+export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
+  const n: string = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
+  const o: any = obj;
+  const i: any = id;
   if (!keys || keys.length === 1) {
-    const v = obj[n];
+    const v = o[n];
     if (!v) {
-      obj[n] = id;
+      o[n] = i;
       return true;
     }
     // tslint:disable-next-line:triple-equals
-    if (v != id) {
+    if (v != i) {
       return false;
     }
     return true;
   }
-  const ks = Object.keys(id);
+  const ks = Object.keys(i);
   for (const k of ks) {
-    const v = obj[k];
+    const v = o[k];
     if (!v) {
-      obj[k] = id[k];
+      o[k] = i[k];
     } else {
       // tslint:disable-next-line:triple-equals
-      if (v != id[k]) {
+      if (v != i[k]) {
         return false;
       }
     }
-    obj[k] = id[k];
+    o[k] = i[k];
   }
   return true;
 }

package/src/health.ts

@@ -17,12 +17,10 @@ export interface HealthChecker {
 }
 
 export async function check(checkers: HealthChecker[]): Promise<Health> {
-  const p: Health = {
-    status: 'UP',
-    details: {} as HealthMap,
-  };
+  const p: Health = { status: 'UP' };
   const total = checkers.length - 1;
   let count = 0;
+  p.details = {} as HealthMap;
   for (const checker of checkers) {
     const sub: Health = {status: 'UP'};
     try {
@@ -48,4 +46,5 @@ export async function check(checkers: HealthChecker[]): Promise<Health> {
       }
     }
   }
+  return p;
 }

package/src/http.ts

@@ -1,12 +1,19 @@
 import {Request, Response} from 'express';
 import {Attribute} from './metadata';
 
-export function handleError(err: any, res: Response, log?: (msg: string, ctx?: any) => void) {
+export function handleError(err: any, res: Response, log?: (msg: string) => void) {
   if (log) {
-    log(JSON.stringify(err));
+    log(toString(err));
     res.status(500).end('Internal Server Error');
   } else {
-    res.status(500).end(JSON.stringify(err));
+    res.status(500).end(toString(err));
+  }
+}
+export function toString(v: any): string {
+  if (typeof v === 'string') {
+    return v;
+  } else {
+    return JSON.stringify(v);
   }
 }
 export function attr(name: string): Attribute {
@@ -27,7 +34,7 @@ export function respondModel<T>(obj: T, res: Response): void {
     res.status(404).json(null).end();
   }
 }
-export function queryRequiredParams(req: Request, res: Response, name: string, split?: string): string[] {
+export function queryRequiredParams(req: Request, res: Response, name: string, split?: string): string[]|undefined {
   const v = req.query[name];
   if (!v) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -43,9 +50,12 @@ export function queryRequiredParams(req: Request, res: Response, name: string, s
   }
   return v2.split(split);
 }
-export function queryParams(req: Request, name: string, d?: string[], split?: string): string[] {
+export function queryParams(req: Request, name: string, d?: string[], split?: string): string[]|undefined {
   const q = req.query[name];
-  const v = q && q.toString();
+  if (!q) {
+    return d;
+  }
+  const v = q.toString();
   if (!v || v.length === 0) {
     return d;
   }
@@ -54,23 +64,33 @@ export function queryParams(req: Request, name: string, d?: string[], split?: st
   }
   return v.split(split);
 }
-export function queryParam(req: Request, res: Response, name: string): string {
-  const v = req.query[name].toString();
-  if (!v || v.length === 0) {
+export function queryParam(req: Request, res: Response, name: string): string|undefined {
+  const v = req.query[name];
+  if (!v) {
     res.status(400).end(`'${name}' cannot be empty`);
     return undefined;
+  } else {
+    const v1 = v.toString();
+    if (v1.length === 0) {
+      res.status(400).end(`'${name}' cannot be empty`);
+      return undefined;
+    } else {
+      return v1;
+    }
   }
-  return v;
 }
-export function query(req: Request, name: string, d?: string): string {
+export function query(req: Request, name: string, d?: string): string|undefined {
   const p = req.query[name];
   if (!p || p.toString().length === 0) {
     return d;
   }
   return p.toString();
 }
-export function queryRequiredNumber(req: Request, res: Response, name: string): number {
+export function queryRequiredNumber(req: Request, res: Response, name: string): number|undefined {
   const field = req.query[name];
+  if (!field) {
+    return undefined;
+  }
   const v = field.toString();
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -83,7 +103,7 @@ export function queryRequiredNumber(req: Request, res: Response, name: string):
   const n = parseFloat(v);
   return n;
 }
-export function queryNumber(req: Request, name: string, d?: number): number {
+export function queryNumber(req: Request, name: string, d?: number): number|undefined {
   const field = req.query[name];
   const v = field ? field.toString() : undefined;
   if (!v || v.length === 0) {
@@ -95,8 +115,11 @@ export function queryNumber(req: Request, name: string, d?: number): number {
   const n = parseFloat(v);
   return n;
 }
-export function queryRequiredDate(req: Request, res: Response, name: string): Date {
+export function queryRequiredDate(req: Request, res: Response, name: string): Date|undefined {
   const field = req.query[name];
+  if (!field) {
+    return undefined;
+  }
   const v = field.toString();
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -109,7 +132,7 @@ export function queryRequiredDate(req: Request, res: Response, name: string): Da
   }
   return date;
 }
-export function queryDate(req: Request, name: string, d?: Date): Date {
+export function queryDate(req: Request, name: string, d?: Date): Date|undefined {
   const field = req.query[name];
   if (field) {
     const v = field.toString();
@@ -125,7 +148,7 @@ export function queryDate(req: Request, name: string, d?: Date): Date {
   return undefined;
 }
 
-export function param(req: Request, res: Response, name: string): string {
+export function param(req: Request, res: Response, name: string): string|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -133,7 +156,7 @@ export function param(req: Request, res: Response, name: string): string {
   }
   return v;
 }
-export function params(req: Request, name: string, d?: string[], split?: string): string[] {
+export function params(req: Request, name: string, d?: string[], split?: string): string[]|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     return d;
@@ -143,7 +166,7 @@ export function params(req: Request, name: string, d?: string[], split?: string)
   }
   return v.split(split);
 }
-export function getRequiredParameters(req: Request, res: Response, name: string, split?: string): string[] {
+export function getRequiredParameters(req: Request, res: Response, name: string, split?: string): string[]|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -154,7 +177,7 @@ export function getRequiredParameters(req: Request, res: Response, name: string,
   }
   return v.split(split);
 }
-export function getRequiredNumber(req: Request, res: Response, name: string): number {
+export function getRequiredNumber(req: Request, res: Response, name: string): number|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -167,7 +190,7 @@ export function getRequiredNumber(req: Request, res: Response, name: string): nu
   const n = parseFloat(v);
   return n;
 }
-export function getNumber(req: Request, name: string, d?: number): number {
+export function getNumber(req: Request, name: string, d?: number): number|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     return d;
@@ -178,7 +201,7 @@ export function getNumber(req: Request, name: string, d?: number): number {
   const n = parseFloat(v);
   return n;
 }
-export function getInteger(req: Request, name: string, d?: number): number {
+export function getInteger(req: Request, name: string, d?: number): number|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     return d;
@@ -190,7 +213,7 @@ export function getInteger(req: Request, name: string, d?: number): number {
   const s = n.toFixed(0);
   return parseFloat(s);
 }
-export function getRequiredDate(req: Request, res: Response, name: string): Date {
+export function getRequiredDate(req: Request, res: Response, name: string): Date|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     res.status(400).end(`'${name}' cannot be empty`);
@@ -203,7 +226,7 @@ export function getRequiredDate(req: Request, res: Response, name: string): Date
   }
   return date;
 }
-export function getDate(req: Request, name: string, d?: Date): Date {
+export function getDate(req: Request, name: string, d?: Date): Date|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
     return d;

package/src/index.ts

@@ -3,19 +3,29 @@ import {GenericSearchController} from './GenericSearchController';
 import {HealthController} from './HealthController';
 import {LoadController} from './LoadController';
 import {LoadSearchController} from './LoadSearchController';
+import {LogController} from './LogController';
 import {LowCodeController} from './LowCodeController';
+import {Service} from './LowCodeController';
 import {SearchController} from './SearchController';
 
 export {HealthController as HealthHandler};
+export {LogController as LogHandler};
 export {LoadController as LoadHandler};
+export {LoadController as ViewHandler};
+export {LoadController as ViewController};
+
 export {GenericController as GenericHandler};
 export {SearchController as SearchHandler};
 export {LoadSearchController as LoadSearchHandler};
 export {GenericSearchController as GenericSearchHandler};
 export {LowCodeController as LowCodeHandler};
+export {LowCodeController as Handler};
+export {LowCodeController as Controller};
+export {Service as LowCodeService};
 
 export * from './health';
 export * from './HealthController';
+export * from './LogController';
 export * from './http';
 export * from './metadata';
 export * from './view';

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 interface ErrorMessage {