express-ext 0.1.15 → 0.1.18

package/lib/GenericSearchController.js

@@ -41,7 +41,7 @@ var GenericSearchController = (function (_super) {
   }
   GenericSearchController.prototype.search = function (req, res) {
     var _this = this;
-    var s = search_1.fromRequest(req, this.fields, this.excluding);
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

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

@@ -48,7 +48,7 @@ var LoadSearchController = (function (_super) {
   }
   LoadSearchController.prototype.search = function (req, res) {
     var _this = this;
-    var s = search_1.fromRequest(req, this.fields, this.excluding);
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

package/lib/LogController.js

@@ -10,9 +10,10 @@ exports.map = {
   FATAL: 4
 };
 var LogController = (function () {
-  function LogController(logger, mp) {
+  function LogController(logger, updateL, mp) {
     this.logger = logger;
     this.map = (mp ? mp : exports.map);
+    this.update = updateL ? updateL : updateLog;
     this.config = this.config.bind(this);
   }
   LogController.prototype.config = function (req, res) {
@@ -23,53 +24,12 @@ var LogController = (function () {
     if (!this.logger) {
       return res.status(503).end('Logger is not available');
     }
-    var changed = false;
     if (typeof obj.level === 'string' && obj.level.length > 0) {
       if (!this.map) {
         return res.status(503).end('Map is not available');
       }
-      var lv = this.map[obj.level.toUpperCase()];
-      if (lv !== undefined) {
-        this.logger.level = lv;
-        changed = true;
-      }
-    }
-    if (obj.map) {
-      if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
-        this.logger.map.level = obj.map.level;
-        changed = true;
-      }
-      if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
-        this.logger.map.time = obj.map.time;
-        changed = true;
-      }
-      if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
-        this.logger.map.msg = obj.map.msg;
-        changed = true;
-      }
-    }
-    if (obj.constants !== undefined && typeof obj.constants === 'object') {
-      var ks = Object.keys(obj.constants);
-      if (ks.length > 0) {
-        this.logger.constants = obj.constants;
-      }
-      else {
-        this.logger.constants = undefined;
-      }
-      changed = true;
-    }
-    if (obj.name) {
-      if (typeof obj.name.trace === 'string'
-        && typeof obj.name.debug === 'string'
-        && typeof obj.name.info === 'string'
-        && typeof obj.name.warn === 'string'
-        && typeof obj.name.error === 'string'
-        && typeof obj.name.panic === 'string'
-        && typeof obj.name.fatal === 'string') {
-        this.logger.name = obj.name;
-        changed = true;
-      }
     }
+    var changed = this.update(this.logger, obj, this.map);
     if (changed) {
       return res.status(200).json(true).end();
     }
@@ -80,3 +40,51 @@ var LogController = (function () {
   return LogController;
 }());
 exports.LogController = LogController;
+function updateLog(logger, obj, mp) {
+  var changed = false;
+  if (typeof obj.level === 'string' && obj.level.length > 0) {
+    var lv = mp[obj.level.toUpperCase()];
+    if (lv !== undefined) {
+      logger.level = lv;
+      changed = true;
+    }
+  }
+  if (obj.map) {
+    if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
+      logger.map.level = obj.map.level;
+      changed = true;
+    }
+    if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
+      logger.map.time = obj.map.time;
+      changed = true;
+    }
+    if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
+      logger.map.msg = obj.map.msg;
+      changed = true;
+    }
+  }
+  if (obj.constants !== undefined && typeof obj.constants === 'object') {
+    var ks = Object.keys(obj.constants);
+    if (ks.length > 0) {
+      logger.constants = obj.constants;
+    }
+    else {
+      logger.constants = undefined;
+    }
+    changed = true;
+  }
+  if (obj.name) {
+    if (typeof obj.name.trace === 'string'
+      && typeof obj.name.debug === 'string'
+      && typeof obj.name.info === 'string'
+      && typeof obj.name.warn === 'string'
+      && typeof obj.name.error === 'string'
+      && typeof obj.name.panic === 'string'
+      && typeof obj.name.fatal === 'string') {
+      logger.name = obj.name;
+      changed = true;
+    }
+  }
+  return changed;
+}
+exports.updateLog = updateLog;

package/lib/LowCodeController.js

@@ -41,7 +41,7 @@ var LowCodeController = (function (_super) {
   }
   LowCodeController.prototype.search = function (req, res) {
     var _this = this;
-    var s = search_1.fromRequest(req, this.fields, this.excluding);
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
     this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)

package/lib/SearchController.js

@@ -28,7 +28,7 @@ var SearchController = (function () {
   }
   SearchController.prototype.search = function (req, res) {
     var _this = this;
-    var s = search_1.fromRequest(req, this.fields, this.excluding);
+    var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
     var s2 = search_1.format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

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 +1,3 @@
-"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.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"));
+"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

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: '' };
@@ -37,6 +38,7 @@ function removeUrlParams(url) {
   return startParams !== -1 ? url.substring(0, startParams) : url;
 }
 exports.removeUrlParams = removeUrlParams;
+var o = 'OPTIONS';
 var MiddlewareLogger = (function () {
   function MiddlewareLogger(write, conf, build) {
     this.write = write;
@@ -46,9 +48,9 @@ var MiddlewareLogger = (function () {
   }
   MiddlewareLogger.prototype.log = function (req, res, next) {
     var _this = this;
-    if (this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
+    var m = req.method;
+    if (m !== o && this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
       var start_1 = process.hrtime();
-      var m = req.method;
       var x_1 = this.conf.request;
       var r_1 = false;
       if (m !== 'GET' && m !== 'DELETE') {
@@ -77,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) {
@@ -209,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,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var fs = require("fs");
 var resources = (function () {
   function resources() {
   }
+  resources.encoding = 'utf-8';
   return resources;
 }());
 exports.resources = resources;
@@ -15,7 +17,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);
@@ -35,3 +37,19 @@ function check(attributes, allowUndefined) {
   return x.check;
 }
 exports.check = check;
+function loadTemplates(ok, buildTemplates, correct, files) {
+  if (!ok) {
+    return undefined;
+  }
+  if (!files) {
+    files = ['./src/query.xml'];
+  }
+  var mappers = [];
+  for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+    var file = files_1[_i];
+    var mapper = fs.readFileSync(file, 'utf8');
+    mappers.push(mapper);
+  }
+  return buildTemplates(mappers, correct);
+}
+exports.loadTemplates = loadTemplates;

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) {
@@ -83,27 +84,40 @@ function initializeConfig(conf) {
   return c;
 }
 exports.initializeConfig = initializeConfig;
-function fromRequest(req, fields, excluding) {
-  var s = (req.method === 'GET' ? fromUrl(req, fields, excluding) : req.body);
+function fromRequest(req, arr) {
+  var s = (req.method === 'GET' ? fromUrl(req, arr) : req.body);
   return s;
 }
 exports.fromRequest = fromRequest;
-function fromUrl(req, fields, excluding) {
-  if (!fields || fields.length === 0) {
-    fields = 'fields';
+function buildArray(arr, s0, s1, s2) {
+  var r = [];
+  if (arr && arr.length > 0) {
+    for (var _i = 0, arr_1 = arr; _i < arr_1.length; _i++) {
+      var a = arr_1[_i];
+      r.push(a);
+    }
+  }
+  if (s0 && s0.length > 0) {
+    r.push(s0);
+  }
+  if (s1 && s1.length > 0) {
+    r.push(s1);
   }
+  if (s2 && s2.length > 0) {
+    r.push(s2);
+  }
+  return r;
+}
+exports.buildArray = buildArray;
+function fromUrl(req, arr) {
   var s = {};
   var obj = req.query;
   var keys = Object.keys(obj);
   for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
     var key = keys_1[_i];
-    if (key === fields) {
-      var x = obj[key].split(',');
-      s[key] = x;
-    }
-    else if (key === excluding) {
+    if (inArray(key, arr)) {
       var x = obj[key].split(',');
-      s[key] = x;
+      setValue(s, key, x);
     }
     else {
       setValue(s, key, obj[key]);
@@ -112,6 +126,19 @@ function fromUrl(req, fields, excluding) {
   return s;
 }
 exports.fromUrl = fromUrl;
+function inArray(s, arr) {
+  if (!arr || arr.length === 0) {
+    return false;
+  }
+  for (var _i = 0, arr_2 = arr; _i < arr_2.length; _i++) {
+    var a = arr_2[_i];
+    if (s === a) {
+      return true;
+    }
+  }
+  return false;
+}
+exports.inArray = inArray;
 function setValue(obj, path, value) {
   var paths = path.split('.');
   if (paths.length === 1) {
@@ -315,8 +342,8 @@ function deletePageInfo(obj, arr) {
     delete obj['nextPageToken'];
   }
   else {
-    for (var _i = 0, arr_1 = arr; _i < arr_1.length; _i++) {
-      var o = arr_1[_i];
+    for (var _i = 0, arr_3 = arr; _i < arr_3.length; _i++) {
+      var o = arr_3[_i];
       if (o && o.length > 0) {
         delete obj[o];
       }

package/package.json

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

package/src/GenericSearchController.ts

@@ -3,7 +3,7 @@ import {ResultInfo, StatusConfig} from './edit';
 import {GenericController, GenericService} from './GenericController';
 import {handleError, Log} from './http';
 import {ErrorMessage} from './metadata';
-import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
+import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export interface Config extends StatusConfig, SearchConfig {
@@ -15,6 +15,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
   numbers?: string[];
   fields?: string;
   excluding?: string;
+  array?: string[];
   constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, service, config, validate);
     this.search = this.search.bind(this);
@@ -34,7 +35,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, this.fields, this.excluding);
+    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

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/LoadSearchController.ts

@@ -2,7 +2,7 @@ import {Request, Response} from 'express';
 import {handleError, Log} from './http';
 import {LoadController, ViewService} from './LoadController';
 import {Attribute, Attributes} from './metadata';
-import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
+import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export class LoadSearchController<T, ID, S extends Filter> extends LoadController<T, ID> {
@@ -12,6 +12,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
   numbers?: string[];
   fields?: string;
   excluding?: string;
+  array?: string[];
   constructor(log: Log, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean, dates?: string[], numbers?: string[]) {
     super(log, viewService, keys);
     this.search = this.search.bind(this);
@@ -37,7 +38,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, this.fields, this.excluding);
+    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

package/src/LogController.ts

@@ -4,7 +4,7 @@ import { SimpleMap } from './log';
 export interface NumberMap {
   [key: string]: number;
 }
-export interface LogConf {
+export interface LogConfig {
   level?: string;
   map?: LogMapConfig;
   constants?: SimpleMap;
@@ -61,68 +61,76 @@ export const map: NumberMap = {
 };
 export class LogController {
   map: NumberMap;
-  constructor(public logger: Logger, mp?: NumberMap) {
+  update: (logger: Logger, obj: LogConfig, mp: NumberMap) => boolean;
+  constructor(public logger: Logger, updateL?: (logger: Logger, obj: LogConfig, mp: NumberMap) => boolean, mp?: NumberMap) {
     this.map = (mp ? mp : map);
+    this.update = updateL ? updateL : updateLog;
     this.config = this.config.bind(this);
   }
   config(req: Request, res: Response) {
-    const obj: LogConf = req.body;
+    const obj: LogConfig = req.body;
     if (!obj || obj === '') {
       return res.status(400).end('The request body cannot be empty');
     }
     if (!this.logger) {
       return res.status(503).end('Logger is not available');
     }
-    let changed = false;
     if (typeof obj.level === 'string' && obj.level.length > 0) {
       if (!this.map) {
         return res.status(503).end('Map is not available');
       }
-      const lv = this.map[obj.level.toUpperCase()];
-      if (lv !== undefined) {
-        this.logger.level = lv;
-        changed = true;
-      }
     }
-    if (obj.map) {
-      if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
-        this.logger.map.level = obj.map.level;
-        changed = true;
-      }
-      if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
-        this.logger.map.time = obj.map.time;
-        changed = true;
-      }
-      if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
-        this.logger.map.msg = obj.map.msg;
-        changed = true;
-      }
+    const changed = this.update(this.logger, obj, this.map);
+    if (changed) {
+      return res.status(200).json(true).end();
+    } else {
+      return res.status(204).json(false).end();
     }
-    if (obj.constants !== undefined && typeof obj.constants === 'object') {
-      const ks = Object.keys(obj.constants);
-      if (ks.length > 0) {
-        this.logger.constants = obj.constants;
-      } else {
-        this.logger.constants = undefined;
-      }
+  }
+}
+export function updateLog(logger: Logger, obj: LogConfig, mp: NumberMap): boolean {
+  let changed = false;
+  if (typeof obj.level === 'string' && obj.level.length > 0) {
+    const lv = mp[obj.level.toUpperCase()];
+    if (lv !== undefined) {
+      logger.level = lv;
       changed = true;
     }
-    if (obj.name) {
-      if (typeof obj.name.trace === 'string'
-        && typeof obj.name.debug === 'string'
-        && typeof obj.name.info === 'string'
-        && typeof obj.name.warn === 'string'
-        && typeof obj.name.error === 'string'
-        && typeof obj.name.panic === 'string'
-        && typeof obj.name.fatal === 'string') {
-        this.logger.name = obj.name;
-        changed = true;
-      }
+  }
+  if (obj.map) {
+    if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
+      logger.map.level = obj.map.level;
+      changed = true;
     }
-    if (changed) {
-      return res.status(200).json(true).end();
+    if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
+      logger.map.time = obj.map.time;
+      changed = true;
+    }
+    if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
+      logger.map.msg = obj.map.msg;
+      changed = true;
+    }
+  }
+  if (obj.constants !== undefined && typeof obj.constants === 'object') {
+    const ks = Object.keys(obj.constants);
+    if (ks.length > 0) {
+      logger.constants = obj.constants;
     } else {
-      return res.status(204).json(false).end();
+      logger.constants = undefined;
+    }
+    changed = true;
+  }
+  if (obj.name) {
+    if (typeof obj.name.trace === 'string'
+      && typeof obj.name.debug === 'string'
+      && typeof obj.name.info === 'string'
+      && typeof obj.name.warn === 'string'
+      && typeof obj.name.error === 'string'
+      && typeof obj.name.panic === 'string'
+      && typeof obj.name.fatal === 'string') {
+      logger.name = obj.name;
+      changed = true;
     }
   }
+  return changed;
 }

package/src/LowCodeController.ts

@@ -3,7 +3,7 @@ import {ResultInfo, StatusConfig} from './edit';
 import {GenericController, GenericService} from './GenericController';
 import {handleError, Log} from './http';
 import {ErrorMessage} from './metadata';
-import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
+import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
 export interface LowCodeConfig extends StatusConfig, SearchConfig {
@@ -18,6 +18,7 @@ export class LowCodeController<T, ID, S extends Filter> extends GenericControlle
   numbers?: string[];
   fields?: string;
   excluding?: string;
+  array?: string[];
   constructor(log: Log, 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);
@@ -37,7 +38,7 @@ export class LowCodeController<T, ID, S extends Filter> extends GenericControlle
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, this.fields, this.excluding);
+    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.lowCodeService.search(s2, l.limit, l.skipOrRefId, l.fields)

package/src/SearchController.ts

@@ -1,12 +1,13 @@
 import {Request, Response} from 'express';
 import {handleError, Log} from './http';
-import {Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
+import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 
 export class SearchController<T, S extends Filter> {
   config?: SearchConfig;
   csv?: boolean;
   fields?: string;
   excluding?: string;
+  array?: string[];
   constructor(protected log: Log, 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) {
@@ -26,7 +27,7 @@ export class SearchController<T, S extends Filter> {
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, this.fields, this.excluding);
+    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);
     this.find(s2, l.limit, l.skipOrRefId, l.fields)

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

@@ -1,3 +1,4 @@
+import {NextFunction, Request, Response} from 'express';
 import {GenericController} from './GenericController';
 import {GenericSearchController} from './GenericSearchController';
 import {HealthController} from './HealthController';
@@ -40,3 +41,20 @@ export * from './edit';
 export * from './GenericController';
 export * from './GenericSearchController';
 export * from './LowCodeController';
+
+export interface AccessConfig {
+  origin: string;
+  credentials: string;
+  methods: string;
+  headers: string;
+}
+export type AccessControlAllowConfig = AccessConfig;
+export function allow(access: AccessConfig): (req: Request, res: Response, next: NextFunction) => void {
+  return (req: Request, res: Response, next: NextFunction) => {
+    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();
+  };
+}

package/src/log.ts

@@ -2,8 +2,9 @@ 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 LogConfig {
+export interface LogConf {
   log?: boolean;
   separate?: boolean;
   skips?: string;
@@ -26,7 +27,7 @@ export interface MiddleLog {
 export interface SimpleMap {
   [key: string]: string|number|boolean|Date;
 }
-export function createConfig(c?: LogConfig): MiddleLog {
+export function createConfig(c?: LogConf): MiddleLog {
   if (!c) {
     return {skips: [], duration: 'duration', request: '', response: '', status: '', size: ''};
   }
@@ -61,16 +62,17 @@ export function removeUrlParams(url: string): string {
 export interface Middleware {
   conf: MiddleLog;
 }
+const o = 'OPTIONS';
 export class MiddlewareLogger {
-  constructor(public write: (msg: string, m?: SimpleMap) => void, conf?: LogConfig, public build?: (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, m: SimpleMap) => SimpleMap) {
+  constructor(public write: (msg: string, m?: SimpleMap) => void, conf?: LogConf, public build?: (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, m: SimpleMap) => SimpleMap) {
     this.log = this.log.bind(this);
     this.conf = createConfig(conf);
   }
   conf: MiddleLog;
   log(req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) {
-    if (this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
+    const m = req.method;
+    if (m !== o && this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
       const start = process.hrtime();
-      const m = req.method;
       const x = this.conf.request;
       let r = false;
       if (m !== 'GET' && m !== 'DELETE') {
@@ -98,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) {
@@ -152,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);
@@ -214,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,16 +1,19 @@
 import { NextFunction, Request, Response } from 'express';
+import * as fs from 'fs';
 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);
@@ -18,7 +21,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) {
@@ -34,3 +37,42 @@ 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;
+  templates: TemplateNode[];
+}
+export interface TemplateNode {
+  type: string;
+  text: string;
+  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) {
+    return undefined;
+  }
+  if (!files) {
+    files = ['./src/query.xml'];
+  }
+  const mappers: string[] = [];
+  for (const file of files) {
+    const mapper = fs.readFileSync(file, 'utf8');
+    mappers.push(mapper);
+  }
+  return buildTemplates(mappers, correct);
+}

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) {
@@ -107,30 +108,58 @@ export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined
   }
   return c;
 }
-export function fromRequest<S>(req: Request, fields?: string, excluding?: string): S {
-  const s: any = (req.method === 'GET' ? fromUrl(req, fields, excluding) : req.body);
+export function fromRequest<S>(req: Request, arr?: string[]): S {
+  const s: any = (req.method === 'GET' ? fromUrl(req, arr) : req.body);
   return s;
 }
-export function fromUrl<S>(req: Request, fields?: string, excluding?: string): S {
+export function buildArray(arr?: string[], s0?: string, s1?: string, s2?: string): string[] {
+  const r: string[] = [];
+  if (arr && arr.length > 0) {
+    for (const a of arr) {
+      r.push(a);
+    }
+  }
+  if (s0 && s0.length > 0) {
+    r.push(s0);
+  }
+  if (s1 && s1.length > 0) {
+    r.push(s1);
+  }
+  if (s2 && s2.length > 0) {
+    r.push(s2);
+  }
+  return r;
+}
+export function fromUrl<S>(req: Request, arr?: string[]): S {
+  /*
   if (!fields || fields.length === 0) {
     fields = 'fields';
   }
+  */
   const s: any = {};
     const obj = req.query;
     const keys = Object.keys(obj);
     for (const key of keys) {
-      if (key === fields) {
+      if (inArray(key, arr)) {
         const x = (obj[key] as string).split(',');
-        s[key] = x;
-      } else if (key === excluding) {
-        const x = (obj[key] as string).split(',');
-        s[key] = x;
+        setValue(s, key, x);
       } else {
         setValue(s, key, obj[key] as string);
       }
     }
     return s;
 }
+export function inArray(s: string, arr?: string[]): boolean {
+  if (!arr || arr.length === 0) {
+    return false;
+  }
+  for (const a of arr) {
+    if (s === a) {
+      return true;
+    }
+  }
+  return false;
+}
 /*
 export function setValue<T>(obj: T, path: string, value: string): void {
   const paths = path.split('.');