express-ext 0.2.6 → 0.3.0

package/src/edit.ts

@@ -1,6 +1,6 @@
-import {Response} from 'express';
-import {handleError} from './http';
-import {Attribute, ErrorMessage} from './metadata';
+import { Response } from 'express';
+import { handleError } from './http';
+import { Attribute, ErrorMessage } from './metadata';
 /*
 export interface StatusConfig {
   duplicate_key: number|string;
@@ -32,7 +32,7 @@ export function initializeStatus(s?: StatusConfig): StatusConfig {
 }
 */
 export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
-  const n: string = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
+  const n: string = keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id';
   const o: any = obj;
   const i: any = id;
   if (!keys || keys.length === 1) {
@@ -62,37 +62,59 @@ export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
   }
   return true;
 }
-export function create<T>(res: Response, obj: T, insert: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
-  insert(obj).then(result => {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(201).json(returnNumber ? result : obj).end();
+export function create<T>(
+  res: Response,
+  obj: T,
+  insert: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
+  log: (msg: string, ctx?: any) => void,
+  returnNumber?: boolean,
+): void {
+  insert(obj)
+    .then((result) => {
+      if (typeof result === 'number') {
+        if (result >= 1) {
+          res
+            .status(201)
+            .json(returnNumber ? result : obj)
+            .end();
+        } else {
+          res.status(409).json(result).end();
+        }
+      } else if (Array.isArray(result)) {
+        res.status(422).json(result).end();
       } else {
-        res.status(409).json(result).end();
+        res.status(201).json(result).end();
       }
-    } else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    } else {
-      res.status(201).json(result).end();
-    }
-  }).catch(err => handleError(err, res, log));
+    })
+    .catch((err) => handleError(err, res, log));
 }
-export function update<T>(res: Response, obj: T, save: (obj: T, ctx?: any) => Promise<number|T|ErrorMessage[]>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean): void {
-  save(obj).then(result => {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(200).json(returnNumber ? result : obj).end();
-      } else if (result === 0) {
-        res.status(404).json(result).end();
+export function update<T>(
+  res: Response,
+  obj: T,
+  save: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
+  log: (msg: string, ctx?: any) => void,
+  returnNumber?: boolean,
+): void {
+  save(obj)
+    .then((result) => {
+      if (typeof result === 'number') {
+        if (result >= 1) {
+          res
+            .status(200)
+            .json(returnNumber ? result : obj)
+            .end();
+        } else if (result === 0) {
+          res.status(404).json(result).end();
+        } else {
+          res.status(409).json(result).end();
+        }
+      } else if (Array.isArray(result)) {
+        res.status(422).json(result).end();
       } else {
-        res.status(409).json(result).end();
+        res.status(200).json(result).end();
       }
-    } else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    } else {
-      res.status(200).json(result).end();
-    }
-  }).catch(err => handleError(err, res, log));
+    })
+    .catch((err) => handleError(err, res, log));
 }
 export function isTypeError(errs: ErrorMessage[]): boolean {
   if (!errs) {
@@ -100,7 +122,19 @@ export function isTypeError(errs: ErrorMessage[]): boolean {
   }
   for (const err of errs) {
     const c = err.code;
-    if (c === 'string' || c === 'number' || c === 'date' || c === 'boolean') {
+    if (
+      c === 'type' ||
+      c === 'string' ||
+      c === 'number' ||
+      c === 'date' ||
+      c === 'boolean' ||
+      c === 'strings' ||
+      c === 'numbers' ||
+      c === 'integers' ||
+      c === 'dates' ||
+      c === 'datetimes' ||
+      c === 'booleans'
+    ) {
       return true;
     }
   }

package/src/index.ts

@@ -36,7 +36,6 @@ export * from './LowCodeController';
 export * from './metadata';
 export * from './resources';
 export * from './search';
-export * from './search_func';
 export * from './SearchController';
 export * from './view';
 
@@ -291,3 +290,8 @@ export class UserReactionController {
 }
 export const ReactController = UserReactionController;
 export const ReactionController = UserReactionController;
+export function addDays(d: Date, n: number): Date {
+  const newDate = new Date(d);
+  newDate.setDate(newDate.getDate() + n);
+  return newDate;
+}

package/src/resources.ts

@@ -4,18 +4,29 @@ 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 limits = [12, 24, 60, 100, 120, 180, 300, 600];
+  static component = 'page';
   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>;
   static check: (obj: any, attributes: Attributes, allowUndefined?: boolean, patch?: boolean) => ErrorMessage[];
   static encoding?: BufferEncoding = 'utf-8';
 }
+export function getView(req: Request, view: string): string {
+  const partial = req.query[resources.partial];
+  return partial == 'true' ? resources.component + '/' + view : view;
+}
 
 export interface Validator<T> {
-  validate(obj: T, patch?: boolean): Promise<ErrorMessage[]>;
+  validate(obj: T, resource?: StringMap, patch?: boolean): Promise<ErrorMessage[]>;
 }
 
 // tslint:disable-next-line:max-classes-per-file

package/src/search.ts

@@ -1,11 +1,15 @@
 import { Request, Response } from 'express';
 import { minimizeArray, query } from './http';
+import { ViewService } from './LoadController';
 import { Attribute, Attributes } from './metadata';
 import { resources } from './resources';
 
 const et = '';
 
 export interface Filter {
+  page?: number;
+  limit?: number;
+
   fields?: string[];
   sort?: string;
 
@@ -170,6 +174,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) {
@@ -354,10 +405,10 @@ const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: an
 };
 export interface Limit {
   limit?: number;
-  offset?: number;
+  page?: number;
   nextPageToken?: string;
   fields?: string[];
-  offsetOrNextPageToken?: string | number;
+  pageOrNextPageToken?: string | number;
 }
 export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
   const o: any = obj;
@@ -382,16 +433,18 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
       const ipageSize = Math.floor(parseFloat(pageSize));
       if (ipageSize > 0) {
         r.limit = ipageSize;
+        /*
         const skip = o['skip'];
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
+            r.page = iskip;
+            r.pageOrNextPageToken = r.page;
             deletePageInfo(o);
             return r;
           }
         }
+        */
         let pageIndex = o['page'];
         if (!pageIndex) {
           pageIndex = o['pageIndex'];
@@ -404,6 +457,7 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (ipageIndex < 1) {
             ipageIndex = 1;
           }
+          /*
           let firstPageSize = o['firstLimit'];
           if (!firstPageSize) {
             firstPageSize = o['firstPageSize'];
@@ -414,27 +468,28 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
+              r.page = ipageIndex;
+              r.pageOrNextPageToken = r.page;
               deletePageInfo(o);
               return r;
             }
           }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+            */
+          r.page = ipageIndex;
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o);
           return r;
         }
-        r.offset = 0;
+        r.page = 1;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o);
     return r;
@@ -474,8 +529,8 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
         if (skip && !isNaN(skip)) {
           const iskip = Math.floor(parseFloat(skip));
           if (iskip >= 0) {
-            r.offset = iskip;
-            r.offsetOrNextPageToken = r.offset;
+            r.page = iskip;
+            r.pageOrNextPageToken = r.page;
             deletePageInfo(o, arr);
             return r;
           }
@@ -498,27 +553,27 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
           if (firstPageSize && !isNaN(firstPageSize)) {
             const ifirstPageSize = Math.floor(parseFloat(firstPageSize));
             if (ifirstPageSize > 0) {
-              r.offset = ipageSize * (ipageIndex - 2) + ifirstPageSize;
-              r.offsetOrNextPageToken = r.offset;
+              r.page = ipageSize * (ipageIndex - 2) + ifirstPageSize;
+              r.pageOrNextPageToken = r.page;
               deletePageInfo(o, arr);
               return r;
             }
           }
-          r.offset = ipageSize * (ipageIndex - 1);
-          r.offsetOrNextPageToken = r.offset;
+          r.page = ipageSize * (ipageIndex - 1);
+          r.pageOrNextPageToken = r.page;
           deletePageInfo(o, arr);
           return r;
         }
-        r.offset = 0;
+        r.page = 0;
         if (r.nextPageToken && r.nextPageToken.length > 0) {
-          r.offsetOrNextPageToken = r.nextPageToken;
+          r.pageOrNextPageToken = r.nextPageToken;
         }
         deletePageInfo(o, arr);
         return r;
       }
     }
     if (r.nextPageToken && r.nextPageToken.length > 0) {
-      r.offsetOrNextPageToken = r.nextPageToken;
+      r.pageOrNextPageToken = r.nextPageToken;
     }
     deletePageInfo(o, arr);
     return r;
@@ -741,3 +796,26 @@ export function format<T>(obj: T, dates?: string[], nums?: string[]): T {
   }
   return o;
 }
+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;
+  }
+  if (keys) {
+    if (!Array.isArray(keys)) {
+      return buildMetadata(keys);
+    }
+  }
+  if (typeof viewService !== 'function' && viewService.metadata) {
+    const metadata = viewService.metadata();
+    if (metadata) {
+      return buildMetadata(metadata);
+    }
+  }
+  return undefined;
+}

package/lib/search_func.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var search_1 = require("./search");
-function getMetadataFunc(viewService, dates, numbers, keys) {
-  var m = { dates: dates, numbers: numbers };
-  if (m.dates && m.dates.length > 0 || m.numbers && m.numbers.length > 0) {
-    return m;
-  }
-  if (keys) {
-    if (!Array.isArray(keys)) {
-      return search_1.buildMetadata(keys);
-    }
-  }
-  if (typeof viewService !== 'function' && viewService.metadata) {
-    var metadata = viewService.metadata();
-    if (metadata) {
-      return search_1.buildMetadata(metadata);
-    }
-  }
-  return undefined;
-}
-exports.getMetadataFunc = getMetadataFunc;

package/src/search_func.ts

@@ -1,22 +0,0 @@
-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 | undefined {
-  const m: Metadata = { dates, numbers };
-  if (m.dates && m.dates.length > 0 || m.numbers && m.numbers.length > 0) {
-    return m;
-  }
-  if (keys) {
-    if (!Array.isArray(keys)) {
-      return buildMetadata(keys);
-    }
-  }
-  if (typeof viewService !== 'function' && viewService.metadata) {
-    const metadata = viewService.metadata();
-    if (metadata) {
-      return buildMetadata(metadata);
-    }
-  }
-  return undefined;
-}