express-ext 0.3.5 → 0.3.7

package/lib/index.js

@@ -354,14 +354,14 @@ var map = {
   "'": ''',
   '`': '`',
 };
-function escapeHtml(input) {
+function escapeHTML(input) {
   return input.replace(/[&<>"'`]/g, function (char) {
     return map[char];
   });
 }
 var s = 'string';
 var o = 'object';
-function escapeHTML(obj) {
+function escape(obj) {
   if (!obj || typeof obj !== s) {
     return obj;
   }
@@ -370,22 +370,22 @@ function escapeHTML(obj) {
     var key = keys_1[_i];
     var v = obj[key];
     if (typeof v === s) {
-      obj[key] = escapeHtml(v);
+      obj[key] = escapeHTML(v);
     } else if (Array.isArray(v) && v.length > 0) {
       var v1 = v[0];
       if (typeof v1 === o && !(v1 instanceof Date)) {
         for (var _a = 0, v_1 = v; _a < v_1.length; _a++) {
           var item = v_1[_a];
-          escapeHTML(item);
+          escape(item);
         }
       }
     } else if (typeof v === o && !(v instanceof Date)) {
-      escapeHTML(obj[key]);
+      escape(obj[key]);
     }
   }
   return obj;
 }
-exports.escapeHTML = escapeHTML;
+exports.escape = escape;
 function escapeArray(arrs) {
   if (!arrs) {
     return arrs;
@@ -393,7 +393,7 @@ function escapeArray(arrs) {
   if (arrs.length > 0) {
     for (var _i = 0, arrs_1 = arrs; _i < arrs_1.length; _i++) {
       var obj = arrs_1[_i];
-      escapeHTML(obj);
+      escape(obj);
     }
   }
   return arrs;

package/lib/search.js

@@ -22,6 +22,50 @@ function getPageTotal(pageSize, total) {
   }
 }
 exports.getPageTotal = getPageTotal;
+function formatText() {
+  var args = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args[_i] = arguments[_i];
+  }
+  var formatted = args[0];
+  if (!formatted || formatted === '') {
+    return '';
+  }
+  if (args.length > 1 && Array.isArray(args[1])) {
+    var params = args[1];
+    for (var i = 0; i < params.length; i++) {
+      var regexp = new RegExp('\\{' + i + '\\}', 'gi');
+      formatted = formatted.replace(regexp, params[i]);
+    }
+  } else {
+    for (var i = 1; i < args.length; i++) {
+      var regexp = new RegExp('\\{' + (i - 1) + '\\}', 'gi');
+      formatted = formatted.replace(regexp, args[i]);
+    }
+  }
+  return formatted;
+}
+exports.formatText = formatText;
+function buildMessage(resource, results, limit, page, total) {
+  if (!results || results.length === 0) {
+    return resource.msg_no_data_found;
+  } else {
+    if (!page) {
+      page = 1;
+    }
+    var fromIndex = (page - 1) * limit + 1;
+    var toIndex = fromIndex + results.length - 1;
+    var pageTotal = getPageTotal(limit, total);
+    if (pageTotal > 1) {
+      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal);
+      return msg2;
+    } else {
+      var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex);
+      return msg3;
+    }
+  }
+}
+exports.buildMessage = buildMessage;
 function buildPages(pageSize, total) {
   var pageTotal = getPageTotal(pageSize, total);
   if (pageTotal <= 1) {
@@ -131,7 +175,8 @@ function renderSort(field, sort) {
   return et;
 }
 exports.renderSort = renderSort;
-function buildSortSearch(search, fields, sort) {
+function buildSortSearch(search, fields, sortStr) {
+  var sort = buildSort(sortStr);
   search = removeSort(search);
   var sorts = {};
   var prefix = search.length > 0 ? '?' + search + '&' : '?';

package/package.json

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

package/src/index.ts

@@ -340,7 +340,7 @@ const map: StringMap = {
   "'": ''',
   '`': '`',
 };
-function escapeHtml(input: string): string {
+function escapeHTML(input: string): string {
   return input.replace(/[&<>"'`]/g, function (char) {
     return map[char];
   });
@@ -348,7 +348,7 @@ function escapeHtml(input: string): string {
 
 const s = 'string';
 const o = 'object';
-export function escapeHTML(obj: any): any {
+export function escape(obj: any): any {
   if (!obj || typeof obj !== s) {
     return obj;
   }
@@ -356,16 +356,16 @@ export function escapeHTML(obj: any): any {
   for (const key of keys) {
     const v = obj[key];
     if (typeof v === s) {
-      obj[key] = escapeHtml(v);
+      obj[key] = escapeHTML(v);
     } else if (Array.isArray(v) && v.length > 0) {
       const v1 = v[0];
       if (typeof v1 === o && !(v1 instanceof Date)) {
         for (const item of v) {
-          escapeHTML(item);
+          escape(item);
         }
       }
     } else if (typeof v === o && !(v instanceof Date)) {
-      escapeHTML(obj[key]);
+      escape(obj[key]);
     }
   }
   return obj;
@@ -376,7 +376,7 @@ export function escapeArray<T>(arrs: T[]): T[] {
   }
   if (arrs.length > 0) {
     for (const obj of arrs) {
-      escapeHTML(obj);
+      escape(obj);
     }
   }
   return arrs;

package/src/search.ts

@@ -2,7 +2,7 @@ import { Request, Response } from 'express';
 import { minimizeArray, query } from './http';
 import { ViewService } from './LoadController';
 import { Attribute, Attributes } from './metadata';
-import { resources } from './resources';
+import { resources, StringMap } from './resources';
 
 const et = '';
 
@@ -54,6 +54,44 @@ export function getPageTotal(pageSize?: number, total?: number): number {
     return Math.floor(total / pageSize + 1);
   }
 }
+export function formatText(...args: any[]): string {
+  let formatted = args[0];
+  if (!formatted || formatted === '') {
+    return '';
+  }
+  if (args.length > 1 && Array.isArray(args[1])) {
+    const params = args[1];
+    for (let i = 0; i < params.length; i++) {
+      const regexp = new RegExp('\\{' + i + '\\}', 'gi');
+      formatted = formatted.replace(regexp, params[i]);
+    }
+  } else {
+    for (let i = 1; i < args.length; i++) {
+      const regexp = new RegExp('\\{' + (i - 1) + '\\}', 'gi');
+      formatted = formatted.replace(regexp, args[i]);
+    }
+  }
+  return formatted;
+}
+export function buildMessage<T>(resource: StringMap, results: T[], limit: number, page: number | undefined, total?: number): string {
+  if (!results || results.length === 0) {
+    return resource.msg_no_data_found;
+  } else {
+    if (!page) {
+      page = 1;
+    }
+    const fromIndex = (page - 1) * limit + 1;
+    const toIndex = fromIndex + results.length - 1;
+    const pageTotal = getPageTotal(limit, total);
+    if (pageTotal > 1) {
+      const msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal);
+      return msg2;
+    } else {
+      const msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex);
+      return msg3;
+    }
+  }
+}
 export function buildPages(pageSize?: number, total?: number): number[] {
   const pageTotal = getPageTotal(pageSize, total);
   if (pageTotal <= 1) {
@@ -162,7 +200,8 @@ export function renderSort(field: string, sort: Sort): string {
   }
   return et;
 }
-export function buildSortSearch(search: string, fields: string[], sort: Sort): SortMap {
+export function buildSortSearch(search: string, fields: string[], sortStr?: string): SortMap {
+  const sort = buildSort(sortStr);
   search = removeSort(search);
   let sorts: SortMap = {};
   const prefix = search.length > 0 ? '?' + search + '&' : '?';