express-ext 0.2.6 → 0.2.7

package/lib/resources.js

@@ -5,7 +5,10 @@ var http = require('http');
 var https = require('https');
 var resources = (function () {
   function resources() {}
+  resources.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
   resources.page = 'page';
+  resources.limit = 'limit';
+  resources.defaultLimit = 12;
   resources.sort = 'sort';
   resources.partial = 'partial';
   resources.encoding = 'utf-8';

package/lib/search.js

@@ -144,6 +144,57 @@ function buildSortSearch(search, fields, sort) {
   return sorts;
 }
 exports.buildSortSearch = buildSortSearch;
+function clone(obj) {
+  if (!obj) {
+    return obj;
+  }
+  if (obj instanceof Date) {
+    return new Date(obj.getTime());
+  }
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    var arr = [];
+    for (var _i = 0, obj_1 = obj; _i < obj_1.length; _i++) {
+      var sub = obj_1[_i];
+      var c = clone(sub);
+      arr.push(c);
+    }
+    return arr;
+  }
+  var x = {};
+  var keys = Object.keys(obj);
+  for (var _a = 0, keys_1 = keys; _a < keys_1.length; _a++) {
+    var k = keys_1[_a];
+    var v = obj[k];
+    if (v instanceof Date) {
+      x[k] = new Date(v.getTime());
+    } else {
+      switch (typeof v) {
+        case 'object':
+          x[k] = clone(v);
+          break;
+        default:
+          x[k] = v;
+          break;
+      }
+    }
+  }
+  return x;
+}
+exports.clone = clone;
+function cloneFilter(obj, page, limit) {
+  var f = clone(obj);
+  if (!obj.hasOwnProperty(resources_1.resources.page)) {
+    obj[resources_1.resources.page] = page;
+  }
+  if (!obj.hasOwnProperty(resources_1.resources.limit)) {
+    obj[resources_1.resources.limit] = limit;
+  }
+  return f;
+}
+exports.cloneFilter = cloneFilter;
 function jsonResult(res, result, quick, fields, config) {
   if (quick && fields && fields.length > 0) {
     res.status(200).json(toCsv(fields, result)).end();
@@ -255,8 +306,8 @@ 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];
+  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+    var key = keys_2[_i];
     if (inArray(key, arr)) {
       var x = obj[key].split(',');
       setValue(s, key, x);
@@ -545,8 +596,8 @@ function buildMetadata(attributes, includeDate) {
   var keys = Object.keys(attributes);
   var dates = [];
   var numbers = [];
-  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-    var key = keys_2[_i];
+  for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
+    var key = keys_3[_i];
     var attr = attributes[key];
     if (attr.type === 'number' || attr.type === 'integer') {
       numbers.push(key);
@@ -614,8 +665,8 @@ function format(obj, dates, nums) {
           }
         } else if (typeof v === 'object') {
           var keys = Object.keys(v);
-          for (var _a = 0, keys_3 = keys; _a < keys_3.length; _a++) {
-            var key = keys_3[_a];
+          for (var _a = 0, keys_4 = keys; _a < keys_4.length; _a++) {
+            var key = keys_4[_a];
             var v2 = v[key];
             if (v2 instanceof Date) {
               continue;
@@ -657,8 +708,8 @@ function format(obj, dates, nums) {
           }
         } else if (typeof v === 'object') {
           var keys = Object.keys(v);
-          for (var _c = 0, keys_4 = keys; _c < keys_4.length; _c++) {
-            var key = keys_4[_c];
+          for (var _c = 0, keys_5 = keys; _c < keys_5.length; _c++) {
+            var key = keys_5[_c];
             var v2 = v[key];
             if (v2 instanceof Date) {
               delete o[key];

package/package.json

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

package/src/resources.ts

@@ -4,9 +4,15 @@ import * as http from 'http';
 import * as https from 'https';
 import { Attributes, ErrorMessage } from './metadata';
 
+export interface StringMap {
+  [key: string]: string;
+}
 // tslint:disable-next-line:class-name
 export class resources {
+  static pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
   static page = 'page';
+  static limit = 'limit';
+  static defaultLimit = 12;
   static sort = 'sort';
   static partial = 'partial';
   static createValidator?: <T>(attributes: Attributes, allowUndefined?: boolean, max?: number) => Validator<T>;
@@ -15,7 +21,7 @@ export class resources {
 }
 
 export interface Validator<T> {
-  validate(obj: T, patch?: boolean): Promise<ErrorMessage[]>;
+  validate(obj: T, patch?: boolean, resource?: StringMap): Promise<ErrorMessage[]>;
 }
 
 // tslint:disable-next-line:max-classes-per-file

package/src/search.ts

@@ -6,6 +6,9 @@ import { resources } from './resources';
 const et = '';
 
 export interface Filter {
+  page?: number;
+  limit?: number;
+
   fields?: string[];
   sort?: string;
 
@@ -170,6 +173,53 @@ export function buildSortSearch(search: string, fields: string[], sort: Sort): S
   }
   return sorts;
 }
+export function clone(obj: any): any {
+  if (!obj) {
+    return obj;
+  }
+  if (obj instanceof Date) {
+    return new Date(obj.getTime());
+  }
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    const arr = [];
+    for (const sub of obj) {
+      const c = clone(sub);
+      arr.push(c);
+    }
+    return arr;
+  }
+  const x: any = {};
+  const keys = Object.keys(obj);
+  for (const k of keys) {
+    const v = obj[k];
+    if (v instanceof Date) {
+      x[k] = new Date(v.getTime());
+    } else {
+      switch (typeof v) {
+        case 'object':
+          x[k] = clone(v);
+          break;
+        default:
+          x[k] = v;
+          break;
+      }
+    }
+  }
+  return x;
+}
+export function cloneFilter<F extends Filter>(obj: F, page: number, limit: number): F {
+  const f = clone(obj);
+  if (!obj.hasOwnProperty(resources.page)) {
+    (obj as any)[resources.page] = page;
+  }
+  if (!obj.hasOwnProperty(resources.limit)) {
+    (obj as any)[resources.limit] = limit;
+  }
+  return f;
+}
 
 export function jsonResult<T>(res: Response, result: SearchResult<T>, quick?: boolean, fields?: string[], config?: SearchConfig): void {
   if (quick && fields && fields.length > 0) {