express-ext 0.1.16 → 0.1.17

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/http.js

@@ -262,3 +262,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/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

@@ -4,6 +4,7 @@ var fs = require("fs");
 var resources = (function () {
   function resources() {
   }
+  resources.encoding = 'utf-8';
   return resources;
 }());
 exports.resources = resources;

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.17",
   "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/http.ts

@@ -239,3 +239,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/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

@@ -6,12 +6,14 @@ import { Attributes, ErrorMessage } from './metadata';
 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);

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) {