express-ext 0.1.16 → 0.1.19

package/lib/LoadController.js

@@ -45,7 +45,7 @@ var LoadController = (function () {
     var id = view_1.buildAndCheckId(req, res, this.keys);
     if (id) {
       this.view(id)
-        .then(function (obj) { return http_1.respondModel(obj, res); })
+        .then(function (obj) { return http_1.respondModel(http_1.minimize(obj), res); })
         .catch(function (err) { return http_1.handleError(err, res, _this.log); });
     }
   };

package/lib/LowCodeController.js

@@ -17,9 +17,9 @@ var GenericController_1 = require("./GenericController");
 var http_1 = require("./http");
 var search_1 = require("./search");
 var search_func_1 = require("./search_func");
-var LowCodeController = (function (_super) {
-  __extends(LowCodeController, _super);
-  function LowCodeController(log, lowCodeService, config, validate, dates, numbers) {
+var Controller = (function (_super) {
+  __extends(Controller, _super);
+  function Controller(log, lowCodeService, config, validate, dates, numbers) {
     var _this = _super.call(this, log, lowCodeService, config, validate) || this;
     _this.lowCodeService = lowCodeService;
     _this.search = _this.search.bind(_this);
@@ -39,7 +39,7 @@ var LowCodeController = (function (_super) {
     }
     return _this;
   }
-  LowCodeController.prototype.search = function (req, res) {
+  Controller.prototype.search = function (req, res) {
     var _this = this;
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
@@ -48,6 +48,6 @@ var LowCodeController = (function (_super) {
       .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
       .catch(function (err) { return http_1.handleError(err, res, _this.log); });
   };
-  return LowCodeController;
+  return Controller;
 }(GenericController_1.GenericController));
-exports.LowCodeController = LowCodeController;
+exports.Controller = Controller;

package/lib/http.js

@@ -10,6 +10,7 @@ function handleError(err, res, log) {
   }
 }
 exports.handleError = handleError;
+exports.error = handleError;
 function toString(v) {
   if (typeof v === 'string') {
     return v;
@@ -174,6 +175,7 @@ function param(req, res, name) {
   return v;
 }
 exports.param = param;
+exports.getParam = param;
 function params(req, name, d, split) {
   var v = req.params[name];
   if (!v || v.length === 0) {
@@ -185,6 +187,7 @@ function params(req, name, d, split) {
   return v.split(split);
 }
 exports.params = params;
+exports.getParams = params;
 function getRequiredParameters(req, res, name, split) {
   var v = req.params[name];
   if (!v || v.length === 0) {
@@ -262,3 +265,41 @@ function getDate(req, name, d) {
   return date;
 }
 exports.getDate = getDate;
+var o = 'object';
+function minimize(obj) {
+  if (!obj || typeof obj !== o) {
+    return obj;
+  }
+  var keys = Object.keys(obj);
+  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+    var key = keys_2[_i];
+    var v = obj[key];
+    if (v == null) {
+      delete obj[key];
+    }
+    else if (Array.isArray(v) && v.length > 0) {
+      var v1 = v[0];
+      if (typeof v1 === o && !(v1 instanceof Date)) {
+        for (var _a = 0, v_1 = v; _a < v_1.length; _a++) {
+          var item = v_1[_a];
+          minimize(item);
+        }
+      }
+    }
+  }
+  return obj;
+}
+exports.minimize = minimize;
+function minimizeArray(arrs) {
+  if (!arrs) {
+    return arrs;
+  }
+  if (arrs.length > 0) {
+    for (var _i = 0, arrs_1 = arrs; _i < arrs_1.length; _i++) {
+      var obj = arrs_1[_i];
+      minimize(obj);
+    }
+  }
+  return arrs;
+}
+exports.minimizeArray = minimizeArray;

package/lib/index.js

@@ -1,3 +1 @@
-"use strict";function __export(m){for(var p in m)if(!exports.hasOwnProperty(p))exports[p]=m[p]}
-Object.defineProperty(exports,"__esModule",{value:!0});var GenericController_1=require("./GenericController");exports.GenericHandler=GenericController_1.GenericController;var GenericSearchController_1=require("./GenericSearchController");exports.GenericSearchHandler=GenericSearchController_1.GenericSearchController;var HealthController_1=require("./HealthController");exports.HealthHandler=HealthController_1.HealthController;var LoadController_1=require("./LoadController");exports.LoadHandler=LoadController_1.LoadController;exports.ViewHandler=LoadController_1.LoadController;exports.ViewController=LoadController_1.LoadController;var LoadSearchController_1=require("./LoadSearchController");exports.LoadSearchHandler=LoadSearchController_1.LoadSearchController;var LogController_1=require("./LogController");exports.LogHandler=LogController_1.LogController;var LowCodeController_1=require("./LowCodeController");exports.LowCodeHandler=LowCodeController_1.LowCodeController;exports.Handler=LowCodeController_1.LowCodeController;exports.Controller=LowCodeController_1.LowCodeController;var SearchController_1=require("./SearchController");exports.SearchHandler=SearchController_1.SearchController;__export(require("./health"));__export(require("./HealthController"));__export(require("./LogController"));__export(require("./log"));__export(require("./http"));__export(require("./view"));__export(require("./LoadController"));__export(require("./search_func"));__export(require("./search"));__export(require("./SearchController"));__export(require("./LoadSearchController"));__export(require("./resources"));__export(require("./edit"));__export(require("./GenericController"));__export(require("./GenericSearchController"));__export(require("./LowCodeController"));function allow(access){return function(req,res,next){res.header('Access-Control-Allow-Origin',access.origin);res.header('Access-Control-Allow-Credentials',access.credentials);res.header('Access-Control-Allow-Methods',access.methods);res.setHeader('Access-Control-Allow-Headers',access.headers);next()}}
-exports.allow=allow
+"use strict";function __export(r){for(var e in r)exports.hasOwnProperty(e)||(exports[e]=r[e])}Object.defineProperty(exports,"__esModule",{value:!0});var GenericController_1=require("./GenericController");exports.GenericHandler=GenericController_1.GenericController;var GenericSearchController_1=require("./GenericSearchController");exports.GenericSearchHandler=GenericSearchController_1.GenericSearchController;var HealthController_1=require("./HealthController");exports.HealthHandler=HealthController_1.HealthController;var LoadController_1=require("./LoadController");exports.LoadHandler=LoadController_1.LoadController,exports.ViewHandler=LoadController_1.LoadController,exports.ViewController=LoadController_1.LoadController;var LoadSearchController_1=require("./LoadSearchController");exports.LoadSearchHandler=LoadSearchController_1.LoadSearchController;var LogController_1=require("./LogController");exports.LogHandler=LogController_1.LogController;var LowCodeController_1=require("./LowCodeController");exports.LowCodeHandler=LowCodeController_1.Controller,exports.LowCodeController=LowCodeController_1.Controller;var SearchController_1=require("./SearchController");function allow(r){return function(e,o,l){o.header("Access-Control-Allow-Origin",r.origin),o.header("Access-Control-Allow-Credentials",r.credentials),o.header("Access-Control-Allow-Methods",r.methods),o.setHeader("Access-Control-Allow-Headers",r.headers),l()}}exports.SearchHandler=SearchController_1.SearchController,__export(require("./health")),__export(require("./HealthController")),__export(require("./LogController")),__export(require("./log")),__export(require("./http")),__export(require("./view")),__export(require("./LoadController")),__export(require("./search_func")),__export(require("./search")),__export(require("./SearchController")),__export(require("./LoadSearchController")),__export(require("./resources")),__export(require("./edit")),__export(require("./GenericController")),__export(require("./GenericSearchController")),__export(require("./LowCodeController")),exports.allow=allow;

package/lib/log.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream_1 = require("stream");
+var resources_1 = require("./resources");
 function createConfig(c) {
   if (!c) {
     return { skips: [], duration: 'duration', request: '', response: '', status: '', size: '' };
@@ -78,7 +79,7 @@ var MiddlewareLogger = (function () {
           op[x_1] = JSON.stringify(req.body);
         }
         if (_this.conf.response.length > 0) {
-          var rsBody = Buffer.concat(chunks_1).toString();
+          var rsBody = Buffer.concat(chunks_1).toString(resources_1.resources.encoding);
           op[_this.conf.response] = rsBody;
         }
         if (_this.conf.status.length > 0) {
@@ -210,3 +211,37 @@ function isValidSkips(s) {
   return true;
 }
 exports.isValidSkips = isValidSkips;
+function mask(s, start, end, replace) {
+  if (start < 0) {
+    start = 0;
+  }
+  if (end < 0) {
+    end = 0;
+  }
+  var t = start + end;
+  if (t >= s.length) {
+    return replace.repeat(s.length);
+  }
+  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end);
+}
+exports.mask = mask;
+function margin(s, start, end, replace) {
+  if (start >= end) {
+    return '';
+  }
+  if (start < 0) {
+    start = 0;
+  }
+  if (end < 0) {
+    end = 0;
+  }
+  if (start >= s.length) {
+    return replace.repeat(s.length);
+  }
+  if (end >= s.length) {
+    return replace.repeat(start) + s.substr(start);
+  }
+  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end);
+}
+exports.margin = margin;
+exports.maskMargin = margin;

package/lib/resources.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var fs = require("fs");
+var http = require("http");
+var https = require("https");
 var resources = (function () {
   function resources() {
   }
+  resources.encoding = 'utf-8';
   return resources;
 }());
 exports.resources = resources;
@@ -16,7 +19,7 @@ var TypeChecker = (function () {
   TypeChecker.prototype.check = function (req, res, next) {
     var obj = req.body;
     if (!obj || obj === '') {
-      return res.status(400).end('The request body cannot be empty');
+      res.status(400).end('The request body cannot be empty');
     }
     else {
       var errors = resources.check(obj, this.attributes, this.allowUndefined);
@@ -52,3 +55,35 @@ function loadTemplates(ok, buildTemplates, correct, files) {
   return buildTemplates(mappers, correct);
 }
 exports.loadTemplates = loadTemplates;
+function start(a, s) {
+  process.on('uncaughtException', function (err) {
+    console.log(err);
+  });
+  if (s.https) {
+    if (s.options) {
+      https.createServer(s.options, a).listen(s.port, function () {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    }
+    else if (s.key && s.cert && s.key.length > 0 && s.cert.length > 0) {
+      var options = {
+        key: fs.readFileSync(s.key),
+        cert: fs.readFileSync(s.cert)
+      };
+      https.createServer(options, a).listen(s.port, function () {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    }
+    else {
+      http.createServer(a).listen(s.port, function () {
+        console.log('Start server at port ' + s.port);
+      });
+    }
+  }
+  else {
+    http.createServer(a).listen(s.port, function () {
+      console.log('Start server at port ' + s.port);
+    });
+  }
+}
+exports.start = start;

package/lib/search.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var http_1 = require("./http");
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
     res.status(200).json(toCsv(fields, result)).end();
@@ -15,7 +16,7 @@ function buildResult(r, conf) {
   }
   var x = {};
   var li = (conf.list ? conf.list : 'list');
-  x[li] = r.list;
+  x[li] = http_1.minimizeArray(r.list);
   var to = (conf.total ? conf.total : 'total');
   x[to] = r.total;
   if (r.nextPageToken && r.nextPageToken.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.1.16",
+  "version": "0.1.19",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/LoadController.ts

@@ -1,5 +1,5 @@
 import {Request, Response} from 'express';
-import {attrs, handleError, Log, respondModel} from './http';
+import {attrs, handleError, Log, minimize, respondModel} from './http';
 import {Attribute, Attributes} from './metadata';
 import {buildAndCheckId, buildKeys} from './view';
 
@@ -48,7 +48,7 @@ export class LoadController<T, ID> {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
       this.view(id)
-        .then(obj => respondModel(obj, res))
+        .then(obj => respondModel(minimize(obj), res))
         .catch(err => handleError(err, res, this.log));
     }
   }

package/src/LowCodeController.ts

@@ -11,7 +11,7 @@ export interface LowCodeConfig extends StatusConfig, SearchConfig {
 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 Filter> extends GenericController<T, ID> {
+export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];

package/src/http.ts

@@ -11,6 +11,7 @@ export function handleError(err: any, res: Response, log?: (msg: string) => void
     res.status(500).end(toString(err));
   }
 }
+export const error = handleError;
 export function toString(v: any): string {
   if (typeof v === 'string') {
     return v;
@@ -158,6 +159,7 @@ export function param(req: Request, res: Response, name: string): string|undefin
   }
   return v;
 }
+export const getParam = param;
 export function params(req: Request, name: string, d?: string[], split?: string): string[]|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
@@ -168,6 +170,7 @@ export function params(req: Request, name: string, d?: string[], split?: string)
   }
   return v.split(split);
 }
+export const getParams = params;
 export function getRequiredParameters(req: Request, res: Response, name: string, split?: string): string[]|undefined {
   const v = req.params[name];
   if (!v || v.length === 0) {
@@ -239,3 +242,35 @@ export function getDate(req: Request, name: string, d?: Date): Date|undefined {
   }
   return date;
 }
+const o = 'object';
+export function minimize(obj: any): any {
+  if (!obj || typeof obj !== o) {
+    return obj;
+  }
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    const v = obj[key];
+    if (v == null) {
+      delete obj[key];
+    } else if (Array.isArray(v) && v.length > 0) {
+      const v1 = v[0];
+      if (typeof v1 === o && !(v1 instanceof Date)) {
+        for (const item of v) {
+          minimize(item);
+        }
+      }
+    }
+  }
+  return obj;
+}
+export function minimizeArray<T>(arrs: T[]): T[] {
+  if (!arrs) {
+    return arrs;
+  }
+  if (arrs.length > 0) {
+    for (const obj of arrs) {
+      minimize(obj);
+    }
+  }
+  return arrs;
+}

package/src/index.ts

@@ -5,7 +5,7 @@ import {HealthController} from './HealthController';
 import {LoadController} from './LoadController';
 import {LoadSearchController} from './LoadSearchController';
 import {LogController} from './LogController';
-import {LowCodeController} from './LowCodeController';
+import {Controller} from './LowCodeController';
 import {Service} from './LowCodeController';
 import {SearchController} from './SearchController';
 
@@ -19,9 +19,9 @@ 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 {Controller as LowCodeHandler};
+// export {Controller as Handler};
+export {Controller as LowCodeController};
 export {Service as LowCodeService};
 
 export * from './health';

package/src/log.ts

@@ -2,6 +2,7 @@ import { NextFunction } from 'express';
 import { ParamsDictionary, Request, Response } from 'express-serve-static-core';
 import { ParsedQs } from 'qs';
 import { PassThrough } from 'stream';
+import { resources } from './resources';
 
 export interface LogConf {
   log?: boolean;
@@ -99,7 +100,7 @@ export class MiddlewareLogger {
             op[x] = JSON.stringify(req.body);
           }
           if (this.conf.response.length > 0) {
-            const rsBody = Buffer.concat(chunks).toString();
+            const rsBody = Buffer.concat(chunks).toString(resources.encoding);
             op[this.conf.response] = rsBody;
           }
           if (this.conf.status.length > 0) {
@@ -153,6 +154,7 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
   return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
 };
 
+// tslint:disable-next-line:max-classes-per-file
 export class MiddlewareController {
   constructor(public logger: Middleware) {
     this.config = this.config.bind(this);
@@ -215,3 +217,35 @@ export function isValidSkips(s: string[]): boolean {
   }
   return true;
 }
+export function mask(s: string, start: number, end: number, replace: string): string {
+  if (start < 0) {
+    start = 0;
+  }
+  if (end < 0) {
+    end = 0;
+  }
+  const t = start + end;
+  if (t >= s.length) {
+    return replace.repeat(s.length);
+  }
+  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end);
+}
+export function margin(s: string, start: number, end: number, replace: string): string {
+  if (start >= end) {
+    return '';
+  }
+  if (start < 0) {
+    start = 0;
+  }
+  if (end < 0) {
+    end = 0;
+  }
+  if (start >= s.length) {
+    return replace.repeat(s.length);
+  }
+  if (end >= s.length) {
+    return replace.repeat(start) + s.substr(start);
+  }
+  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end);
+}
+export const maskMargin = margin;

package/src/resources.ts

@@ -1,17 +1,21 @@
-import { NextFunction, Request, Response } from 'express';
+import { Application, NextFunction, Request, Response } from 'express';
 import * as fs from 'fs';
+import * as http from 'http';
+import * as https from 'https';
 import { Attributes, ErrorMessage } from './metadata';
 
 // tslint:disable-next-line:class-name
 export class resources {
   static createValidator?: <T>(attributes: Attributes, allowUndefined?: boolean, max?: number) => Validator<T>;
   static check: (obj: any, attributes: Attributes, allowUndefined?: boolean, patch?: boolean) => ErrorMessage[];
+  static encoding?: BufferEncoding = 'utf-8';
 }
 
 export interface Validator<T> {
   validate(obj: T, patch?: boolean): Promise<ErrorMessage[]>;
 }
 
+// tslint:disable-next-line:max-classes-per-file
 export class TypeChecker {
   constructor(public attributes: Attributes, public allowUndefined?: boolean) {
     this.check = this.check.bind(this);
@@ -19,7 +23,7 @@ export class TypeChecker {
   check(req: Request, res: Response, next: NextFunction): void {
     const obj = req.body;
     if (!obj || (obj as any) === '') {
-      return res.status(400).end('The request body cannot be empty');
+      res.status(400).end('The request body cannot be empty');
     } else {
       const errors = resources.check(obj, this.attributes, this.allowUndefined);
       if (errors.length > 0) {
@@ -35,6 +39,14 @@ export function check(attributes: Attributes, allowUndefined?: boolean): Handler
   const x = new TypeChecker(attributes, allowUndefined);
   return x.check;
 }
+export interface Parameter {
+  name: string;
+  type: string;
+}
+export interface StringFormat {
+  texts: string[];
+  parameters: Parameter[];
+}
 export interface Template {
   name?: string | null;
   text: string;
@@ -46,6 +58,11 @@ export interface TemplateNode {
   property: string | null;
   encode?: string | null;
   value: string | null;
+  format: StringFormat;
+  array?: string | null;
+  separator?: string | null;
+  suffix?: string | null;
+  prefix?: string | null;
 }
 export function loadTemplates(ok: boolean|undefined, buildTemplates: (streams: string[], correct?: (stream: string) => string) => Map<string, Template>, correct?: (stream: string) => string, files?: string[]): Map<string, Template>|undefined {
   if (!ok) {
@@ -61,3 +78,38 @@ export function loadTemplates(ok: boolean|undefined, buildTemplates: (streams: s
   }
   return buildTemplates(mappers, correct);
 }
+export interface Server {
+  port: number;
+  https?: boolean;
+  options?: any;
+  key?: string;
+  cert?: string;
+}
+export function start(a: Application, s: Server): void {
+  process.on('uncaughtException', (err) => {
+    console.log(err);
+  });
+  if (s.https) {
+    if (s.options) {
+      https.createServer(s.options, a).listen(s.port, () => {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    } else if (s.key && s.cert && s.key.length > 0 && s.cert.length > 0) {
+      const options = {
+        key: fs.readFileSync(s.key),
+        cert: fs.readFileSync(s.cert)
+      };
+      https.createServer(options, a).listen(s.port, () => {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    } else {
+      http.createServer(a).listen(s.port, () => {
+        console.log('Start server at port ' + s.port);
+      });
+    }
+  } else {
+    http.createServer(a).listen(s.port, () => {
+      console.log('Start server at port ' + s.port);
+    });
+  }
+}

package/src/search.ts

@@ -1,4 +1,5 @@
 import {Request, Response} from 'express';
+import {minimizeArray} from './http';
 import {Attribute, Attributes} from './metadata';
 
 export interface Filter {
@@ -41,7 +42,7 @@ export function buildResult<T>(r: SearchResult<T>, conf?: SearchConfig): any {
   }
   const x: any = {};
   const li = (conf.list ? conf.list : 'list');
-  x[li] = r.list;
+  x[li] = minimizeArray(r.list);
   const to = (conf.total ? conf.total : 'total');
   x[to] = r.total;
   if (r.nextPageToken && r.nextPageToken.length > 0) {