express-ext 0.1.13 → 0.1.17

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('.');