express-ext 0.1.5 → 0.1.10

package/src/search.ts

@@ -1,15 +1,11 @@
 import {Request, Response} from 'express';
 import {Attribute, Attributes} from './metadata';
 
-export interface ArrayMap {
-  [key: string]: string[]|number[];
-}
-export interface SearchModel {
+export interface Filter {
   fields?: string[];
   sort?: string;
 
-  keyword?: string;
-  excluding?: ArrayMap;
+  q?: string;
 }
 export interface SearchConfig {
   excluding?: string;
@@ -44,17 +40,21 @@ export function buildResult<T>(r: SearchResult<T>, conf?: SearchConfig): any {
     return r;
   }
   const x: any = {};
-  x[conf.list] = r.list;
-  x[conf.total] = r.total;
+  const li = (conf.list ? conf.list : 'list');
+  x[li] = r.list;
+  const to = (conf.total ? conf.total : 'total');
+  x[to] = r.total;
   if (r.nextPageToken && r.nextPageToken.length > 0) {
-    x[conf.token] = r.nextPageToken;
+    const t = (conf.token ? conf.token : 'token');
+    x[t] = r.nextPageToken;
   }
   if (r.last) {
-    x[conf.last] = r.last;
+    const l = (conf.last ? conf.last : 'last');
+    x[l] = r.last;
   }
   return x;
 }
-export function initializeConfig(conf: SearchConfig): SearchConfig {
+export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined {
   if (!conf) {
     return undefined;
   }
@@ -153,9 +153,9 @@ 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[path] = value;
+    (obj as any)[path] = value;
   } else {
-    let o = obj;
+    let o: any = obj;
     const l = paths.length - 1;
     for (let i = 0; i < l - 1; i++) {
       const p = paths[i];
@@ -177,42 +177,43 @@ export interface Limit {
   skipOrRefId?: string|number;
 }
 export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
+  const o: any = obj;
   if (!config) {
     const sfield = 'fields';
     let fields;
-    const fs = obj[sfield];
+    const fs = o[sfield];
     if (fs && Array.isArray(fs)) {
       fields = fs;
-      delete obj[sfield];
+      delete o[sfield];
     }
-    let refId = obj['refId'];
+    let refId = o['refId'];
     if (!refId) {
-      refId = obj['nextPageToken'];
+      refId = o['nextPageToken'];
     }
     const r: Limit = {fields, refId};
-    let pageSize = obj['limit'];
+    let pageSize = o['limit'];
     if (!pageSize) {
-      pageSize = obj['pageSize'];
+      pageSize = o['pageSize'];
     }
     if (pageSize && !isNaN(pageSize)) {
       const ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
-        const skip = obj['skip'];
+        const skip = o['skip'];
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
             r.skip = iskip;
             r.skipOrRefId = r.skip;
-            deletePageInfo(obj);
+            deletePageInfo(o);
             return r;
           }
         }
-        let pageIndex = obj['page'];
+        let pageIndex = o['page'];
         if (!pageIndex) {
-          pageIndex = obj['pageIndex'];
+          pageIndex = o['pageIndex'];
           if (!pageIndex) {
-            pageIndex = obj['pageNo'];
+            pageIndex = o['pageNo'];
           }
         }
         if (pageIndex && !isNaN(pageIndex)) {
@@ -220,39 +221,39 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
-          let firstPageSize = obj['firstLimit'];
+          let firstPageSize = o['firstLimit'];
           if (!firstPageSize) {
-            firstPageSize = obj['firstPageSize'];
+            firstPageSize = o['firstPageSize'];
           }
           if (!firstPageSize) {
-            firstPageSize = obj['initPageSize'];
+            firstPageSize = o['initPageSize'];
           }
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
               r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
               r.skipOrRefId = r.skip;
-              deletePageInfo(obj);
+              deletePageInfo(o);
               return r;
             }
           }
           r.skip = ipageSize * (ipageIndex - 1);
           r.skipOrRefId = r.skip;
-          deletePageInfo(obj);
+          deletePageInfo(o);
           return r;
         }
         r.skip = 0;
         if (r.refId && r.refId.length > 0) {
           r.skipOrRefId = r.refId;
         }
-        deletePageInfo(obj);
+        deletePageInfo(o);
         return r;
       }
     }
     if (r.refId && r.refId.length > 0) {
       r.skipOrRefId = r.refId;
     }
-    deletePageInfo(obj);
+    deletePageInfo(o);
     return r;
   } else {
     let sfield = config.fields;
@@ -260,23 +261,23 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
       sfield = 'fields';
     }
     let fields;
-    const fs = obj[sfield];
+    const fs = o[sfield];
     if (fs && Array.isArray(fs)) {
       fields = fs;
-      delete obj[sfield];
+      delete o[sfield];
     }
     let strRefId = config.refId;
     if (!strRefId || strRefId.length === 0) {
       strRefId = 'refId';
     }
-    const refId = obj[strRefId];
+    const refId = o[strRefId];
     const r: Limit = {fields, refId};
 
     let strLimit = config.limit;
     if (!strLimit || strLimit.length === 0) {
       strLimit = 'limit';
     }
-    const pageSize = obj[strLimit];
+    const pageSize = o[strLimit];
     const arr = [config.page, config.limit, config.skip, config.refId, config.firstLimit];
     if (pageSize && !isNaN(pageSize)) {
       const ipageSize = Math.floor(parseFloat(pageSize));
@@ -286,13 +287,13 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
         if (!strSkip || strSkip.length === 0) {
           strSkip = 'skip';
         }
-        const skip = obj[strSkip];
+        const skip = o[strSkip];
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
             r.skip = iskip;
             r.skipOrRefId = r.skip;
-            deletePageInfo(obj, arr);
+            deletePageInfo(o, arr);
             return r;
           }
         }
@@ -300,7 +301,7 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
         if (!strPage || strPage.length === 0) {
           strPage = 'page';
         }
-        const pageIndex = obj[strPage];
+        const pageIndex = o[strPage];
         if (pageIndex && !isNaN(pageIndex)) {
           let ipageIndex = Math.floor(parseFloat(pageIndex));
           if (ipageIndex < 1) {
@@ -310,37 +311,37 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (!strFirstLimit || strFirstLimit.length === 0) {
             strFirstLimit = 'firstLimit';
           }
-          const firstPageSize = obj[strFirstLimit];
+          const firstPageSize = o[strFirstLimit];
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
               r.skip = ipageSize * (ipageIndex - 2) + ifirstPageSize;
               r.skipOrRefId = r.skip;
-              deletePageInfo(obj, arr);
+              deletePageInfo(o, arr);
               return r;
             }
           }
           r.skip = ipageSize * (ipageIndex - 1);
           r.skipOrRefId = r.skip;
-          deletePageInfo(obj, arr);
+          deletePageInfo(o, arr);
           return r;
         }
         r.skip = 0;
         if (r.refId && r.refId.length > 0) {
           r.skipOrRefId = r.refId;
         }
-        deletePageInfo(obj, arr);
+        deletePageInfo(o, arr);
         return r;
       }
     }
     if (r.refId && r.refId.length > 0) {
       r.skipOrRefId = r.refId;
     }
-    deletePageInfo(obj, arr);
+    deletePageInfo(o, arr);
     return r;
   }
 }
-export function deletePageInfo(obj: any, arr?: string[]): void {
+export function deletePageInfo(obj: any, arr?: (string | undefined)[]): void {
   if (!arr || arr.length === 0) {
     delete obj['limit'];
     delete obj['firstLimit'];
@@ -375,7 +376,7 @@ export function toCsv<T>(fields: string[], r: SearchResult<T>): string {
     for (const item of r.list) {
       const cols: string[] = [];
       for (const name of fields) {
-        const v = item[name];
+        const v = (item as any)[name];
         if (!v) {
           cols.push(e);
         } else {
@@ -443,8 +444,8 @@ export function buildMetadata(attributes: Attributes, includeDate?: boolean): Me
 
 const _datereg = '/Date(';
 const _re = /-?\d+/;
-function toDate(v: any) {
-  if (!v || v === '') {
+function toDate(v: any): Date | null | undefined {
+  if (!v) {
     return null;
   }
   if (v instanceof Date) {
@@ -455,33 +456,39 @@ function toDate(v: any) {
   const i = v.indexOf(_datereg);
   if (i >= 0) {
     const m = _re.exec(v);
-    const d = parseInt(m[0], null);
-    return new Date(d);
+    if (m !== null) {
+      const d = parseInt(m[0], 10);
+      return new Date(d);
+    } else {
+      return null;
+    }
   } else {
     if (isNaN(v)) {
       return new Date(v);
     } else {
-      const d = parseInt(v, null);
+      const d = parseInt(v, 10);
       return new Date(d);
     }
   }
 }
 
 export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
+  const o: any = obj;
   if (dates && dates.length > 0) {
     for (const s of dates) {
-      const v = obj[s];
+      const v = o[s];
       if (v) {
         if (v instanceof Date) {
           continue;
         }
         if (typeof v === 'string' || typeof v === 'number') {
           const d = toDate(v);
-          const error = d.toString();
-          if (!(d instanceof Date) || error === 'Invalid Date') {
-            delete obj[s];
-          } else {
-            obj[s] = d;
+          if (d) {
+            if (!(d instanceof Date) || d.toString() === 'Invalid Date') {
+              delete o[s];
+            } else {
+              o[s] = d;
+            }
           }
         } else if (typeof v === 'object') {
           const keys = Object.keys(v);
@@ -492,11 +499,12 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
             }
             if (typeof v2 === 'string' || typeof v2 === 'number') {
               const d2 = toDate(v2);
-              const error2 = d2.toString();
-              if (!(d2 instanceof Date) || error2 === 'Invalid Date') {
-                delete v[key];
-              } else {
-                v[key] = d2;
+              if (d2) {
+                if (!(d2 instanceof Date) || d2.toString() === 'Invalid Date') {
+                  delete v[key];
+                } else {
+                  v[key] = d2;
+                }
               }
             }
           }
@@ -506,10 +514,10 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
   }
   if (nums && nums.length > 0) {
     for (const s of nums) {
-      const v = obj[s];
+      const v = o[s];
       if (v) {
         if (v instanceof Date) {
-          delete obj[s];
+          delete o[s];
           continue;
         }
         if (typeof v === 'number') {
@@ -517,18 +525,18 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
         }
         if (typeof v === 'string') {
           if (!isNaN(v as any)) {
-            delete obj[s];
+            delete o[s];
             continue;
           } else {
             const i = parseFloat(v);
-            obj[s] = i;
+            o[s] = i;
           }
         } else if (typeof v === 'object') {
           const keys = Object.keys(v);
           for (const key of keys) {
             const v2 = v[key];
             if (v2 instanceof Date) {
-              delete obj[key];
+              delete o[key];
               continue;
             }
             if (typeof v2 === 'number') {
@@ -547,5 +555,5 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
       }
     }
   }
-  return obj;
+  return o;
 }

package/src/search_func.ts

@@ -2,7 +2,7 @@ import {ViewService} from './LoadController';
 import {Attribute, Attributes} from './metadata';
 import {buildMetadata, Metadata} from './search';
 
-export function getMetadataFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), dates?: string[], numbers?: string[], keys?: Attributes|Attribute[]|string[]): Metadata {
+export function getMetadataFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), dates?: string[], numbers?: string[], keys?: Attributes|Attribute[]|string[]): Metadata | undefined {
   const m: Metadata = { dates, numbers };
   if (m.dates && m.dates.length > 0 || m.numbers && m.numbers.length > 0) {
     return m;

package/src/view.ts

@@ -1,29 +1,32 @@
 import {Request, Response} from 'express';
 import {Attribute, Attributes} from './metadata';
 
-export function buildAndCheckId<ID>(req: Request, res: Response, keys?: Attribute[]) {
+export function buildAndCheckId<ID>(req: Request, res: Response, keys?: Attribute[]): ID | undefined {
   const id = buildId<ID>(req, keys);
   if (!id) {
     res.status(400).end('invalid parameters');
-    return null;
+    return undefined;
   }
   return id;
 }
-export function buildId<T>(req: Request, attrs?: Attribute[]): T {
-  if (!attrs) {
+export function buildId<T>(req: Request, attrs?: Attribute[]): T | undefined {
+  if (!attrs || attrs.length === 0) {
     const id = req.params['id'];
     if (id && id.length > 0) {
       return id as any;
     }
-    return null;
+    return undefined;
   }
   if (attrs && attrs.length === 1) {
-    const key = (attrs[0].name ? attrs[0].name : 'id');
-    const id = req.params[key];
+    let id = req.params['id'];
+    const n = attrs[0].name;
+    if ((!id || id.length === 0) && n && n.length > 0) {
+      id = req.params[n];
+    }
     if (id && id.length > 0) {
       if (attrs[0].type === 'integer' || attrs[0].type === 'number') {
         if (isNaN(id as any)) {
-          return null;
+          return undefined;
         }
         const v = parseFloat(id);
         return v as any;
@@ -33,13 +36,16 @@ export function buildId<T>(req: Request, attrs?: Attribute[]): T {
   }
   const ids: any = {};
   for (const attr of attrs) {
+    if (!attr.name) {
+      return undefined;
+    }
     const v = req.params[attr.name];
     if (!v) {
-      return null;
+      return undefined;
     }
     if (attr.type === 'integer' || attr.type === 'number') {
       if (isNaN(v as any)) {
-        return null;
+        return undefined;
       }
       ids[attr.name] = parseFloat(v);
     } else {
@@ -48,7 +54,7 @@ export function buildId<T>(req: Request, attrs?: Attribute[]): T {
     return ids;
   }
 }
-export function buildKeys(attrs: Attributes): Attribute[] {
+export function buildKeys(attrs: Attributes): Attribute[] | undefined {
   if (!attrs) {
     return undefined;
   }

package/tsconfig.json

@@ -6,6 +6,7 @@
     "outDir": "./lib",
     "module": "commonjs",
     "moduleResolution": "node",
+    "strict": true,
     "pretty": true,
     "sourceMap": false,
     "declaration": false,