express-ext 0.1.19 → 0.1.20

package/lib/GenericController.js

@@ -80,21 +80,23 @@ exports.GenericController = GenericController;
 function validateAndCreate(req, res, status, save, log, validate) {
   var obj = req.body;
   if (!obj || obj === '') {
-    return res.status(400).end('The request body cannot be empty.');
-  }
-  if (validate) {
-    validate(obj).then(function (errors) {
-      if (errors && errors.length > 0) {
-        var r = { status: status.validation_error, errors: errors };
-        res.status(getStatusCode(errors)).json(r).end();
-      }
-      else {
-        edit_1.create(res, status, obj, save, log);
-      }
-    }).catch(function (err) { return http_1.handleError(err, res, log); });
+    res.status(400).end('The request body cannot be empty.');
   }
   else {
-    edit_1.create(res, status, obj, save, log);
+    if (validate) {
+      validate(obj).then(function (errors) {
+        if (errors && errors.length > 0) {
+          var r = { status: status.validation_error, errors: errors };
+          res.status(getStatusCode(errors)).json(r).end();
+        }
+        else {
+          edit_1.create(res, status, obj, save, log);
+        }
+      }).catch(function (err) { return http_1.handleError(err, res, log); });
+    }
+    else {
+      edit_1.create(res, status, obj, save, log);
+    }
   }
 }
 exports.validateAndCreate = validateAndCreate;

package/lib/LoadSearchController.js

@@ -17,6 +17,15 @@ var http_1 = require("./http");
 var LoadController_1 = require("./LoadController");
 var search_1 = require("./search");
 var search_func_1 = require("./search_func");
+function useSearchController(log, find, viewService, array, dates, numbers, keys, config) {
+  var c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
+  c.array = array;
+  return c;
+}
+exports.useSearchController = useSearchController;
+exports.useSearchHandler = useSearchController;
+exports.createSearchController = useSearchController;
+exports.createSearchHandler = useSearchController;
 var LoadSearchController = (function (_super) {
   __extends(LoadSearchController, _super);
   function LoadSearchController(log, find, viewService, keys, config, dates, numbers) {

package/lib/search.js

@@ -139,28 +139,40 @@ function inArray(s, arr) {
   return false;
 }
 exports.inArray = inArray;
-function setValue(obj, path, value) {
-  var paths = path.split('.');
-  if (paths.length === 1) {
-    obj[path] = value;
+function setValue(o, key, value) {
+  var obj = o;
+  var replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
+  if (replaceKey.indexOf('.') === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length);
+  }
+  var keys = replaceKey.split('.');
+  var firstKey = keys.shift();
+  if (!firstKey) {
+    return;
+  }
+  var isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  if (keys.length > 0) {
+    var firstKeyValue = obj[firstKey] || {};
+    var returnValue = setValue(firstKeyValue, keys.join('.'), value);
+    return setKey(obj, isArrayKey, firstKey, returnValue);
+  }
+  return setKey(obj, isArrayKey, firstKey, value);
+}
+exports.setValue = setValue;
+var setKey = function (_object, _isArrayKey, _key, _nextValue) {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue;
+    }
+    else {
+      _object.push(_nextValue);
+    }
   }
   else {
-    var o = obj;
-    var l = paths.length - 1;
-    for (var i = 0; i < l - 1; i++) {
-      var p = paths[i];
-      if (p in o) {
-        o = o[p];
-      }
-      else {
-        o[p] = {};
-        o = o[p];
-      }
-    }
-    o[paths[paths.length - 1]] = value;
+    _object[_key] = _nextValue;
   }
-}
-exports.setValue = setValue;
+  return _object;
+};
 function getParameters(obj, config) {
   var o = obj;
   if (!config) {

package/package.json

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

package/src/GenericController.ts

@@ -36,25 +36,25 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
       this.validate = v.validate;
     }
   }
-  create(req: Request, res: Response) {
+  create(req: Request, res: Response): void {
     return this.insert(req, res);
   }
-  insert(req: Request, res: Response) {
+  insert(req: Request, res: Response): void {
     validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
   }
-  update(req: Request, res: Response) {
+  update(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update);
     if (id) {
       validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate);
     }
   }
-  patch(req: Request, res: Response) {
+  patch(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch);
     if (id && this.service.patch) {
       validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate);
     }
   }
-  delete(req: Request, res: Response) {
+  delete(req: Request, res: Response): void {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
       if (!this.service.delete) {
@@ -70,19 +70,20 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
 export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: Log, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
   const obj = req.body;
   if (!obj || obj === '') {
-    return res.status(400).end('The request body cannot be empty.');
-  }
-  if (validate) {
-    validate(obj).then(errors => {
-      if (errors && errors.length > 0) {
-        const r: ResultInfo<T> = {status: status.validation_error, errors};
-        res.status(getStatusCode(errors)).json(r).end();
-      } else {
-        create(res, status, obj, save, log);
-      }
-    }).catch(err => handleError(err, res, log));
+    res.status(400).end('The request body cannot be empty.');
   } else {
-    create(res, status, obj, save, log);
+    if (validate) {
+      validate(obj).then(errors => {
+        if (errors && errors.length > 0) {
+          const r: ResultInfo<T> = {status: status.validation_error, errors};
+          res.status(getStatusCode(errors)).json(r).end();
+        } else {
+          create(res, status, obj, save, log);
+        }
+      }).catch(err => handleError(err, res, log));
+    } else {
+      create(res, status, obj, save, log);
+    }
   }
 }
 export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: Log, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {

package/src/LoadController.ts

@@ -44,7 +44,7 @@ export class LoadController<T, ID> {
     this.view = getViewFunc(viewService);
     this.keys = getKeysFunc(viewService, keys);
   }
-  load(req: Request, res: Response) {
+  load(req: Request, res: Response): void {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
       this.view(id)

package/src/LoadSearchController.ts

@@ -5,6 +5,22 @@ import {Attribute, Attributes} from './metadata';
 import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
+export interface Search {
+  search(req: Request, res: Response): void;
+  load(req: Request, res: Response): void;
+}
+export interface SearchManager {
+  search(req: Request, res: Response): void;
+  load(req: Request, res: Response): void;
+}
+export function useSearchController<T, ID, S extends Filter>(log: Log, find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), array?: string[], dates?: string[], numbers?: string[], keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean): Search {
+  const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
+  c.array = array;
+  return c;
+}
+export const useSearchHandler = useSearchController;
+export const createSearchController = useSearchController;
+export const createSearchHandler = useSearchController;
 export class LoadSearchController<T, ID, S extends Filter> extends LoadController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
@@ -37,7 +53,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
       this.numbers = m.numbers;
     }
   }
-  search(req: Request, res: Response) {
+  search(req: Request, res: Response): void {
     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);

package/src/search.ts

@@ -137,17 +137,17 @@ export function fromUrl<S>(req: Request, arr?: string[]): S {
   }
   */
   const s: any = {};
-    const obj = req.query;
-    const keys = Object.keys(obj);
-    for (const key of keys) {
-      if (inArray(key, arr)) {
-        const x = (obj[key] as string).split(',');
-        setValue(s, key, x);
-      } else {
-        setValue(s, key, obj[key] as string);
-      }
+  const obj = req.query;
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    if (inArray(key, arr)) {
+      const x = (obj[key] as string).split(',');
+      setValue(s, key, x);
+    } else {
+      setValue(s, key, obj[key] as string);
     }
-    return s;
+  }
+  return s;
 }
 export function inArray(s: string, arr?: string[]): boolean {
   if (!arr || arr.length === 0) {
@@ -179,25 +179,37 @@ export function setValue<T>(obj: T, path: string, value: string): void {
   }
 }
 */
-export function setValue<T, V>(obj: T, path: string, value: V): void {
-  const paths = path.split('.');
-  if (paths.length === 1) {
-    (obj as any)[path] = value;
-  } else {
-    let o: any = obj;
-    const l = paths.length - 1;
-    for (let i = 0; i < l - 1; i++) {
-      const p = paths[i];
-      if (p in o) {
-        o = o[p];
-      } else {
-        o[p] = {};
-        o = o[p];
-      }
+export function setValue<T, V>(o: T, key: string, value: V): any {
+  const obj: any = o;
+  let replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
+  if (replaceKey.indexOf('.') === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length);
+  }
+  const keys = replaceKey.split('.');
+  const firstKey = keys.shift();
+  if (!firstKey) {
+    return;
+  }
+  const isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  if (keys.length > 0) {
+    const firstKeyValue = obj[firstKey] || {};
+    const returnValue = setValue(firstKeyValue, keys.join('.'), value);
+    return setKey(obj, isArrayKey, firstKey, returnValue);
+  }
+  return setKey(obj, isArrayKey, firstKey, value);
+}
+const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: any) => {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue;
+    } else {
+      _object.push(_nextValue);
     }
-    o[paths[paths.length - 1]] = value;
+  } else {
+    _object[_key] = _nextValue;
   }
-}
+  return _object;
+};
 export interface Limit {
   limit?: number;
   skip?: number;
@@ -370,7 +382,8 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
     return r;
   }
 }
-export function deletePageInfo(obj: any, arr?: (string | undefined)[]): void {
+// tslint:disable-next-line:array-type
+export function deletePageInfo(obj: any, arr?: Array<string | undefined>): void {
   if (!arr || arr.length === 0) {
     delete obj['limit'];
     delete obj['firstLimit'];