express-ext 0.3.6 → 0.3.8

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

@@ -229,7 +229,7 @@ function clone(obj) {
   return x;
 }
 exports.clone = clone;
-function cloneFilter(obj, page, limit) {
+function cloneFilter(obj, limit, page) {
   var f = clone(obj);
   if (!obj.hasOwnProperty(resources_1.resources.page)) {
     obj[resources_1.resources.page] = page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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

@@ -250,7 +250,7 @@ export function clone(obj: any): any {
   }
   return x;
 }
-export function cloneFilter<F extends Filter>(obj: F, page: number, limit: number): F {
+export function cloneFilter<F extends Filter>(obj: F, limit: number, page: number): F {
   const f = clone(obj);
   if (!obj.hasOwnProperty(resources.page)) {
     (obj as any)[resources.page] = page;