express-ext 0.5.4 → 0.5.7

package/lib/GenericSearchController.js

@@ -48,7 +48,7 @@ var GenericSearchController = (function (_super) {
   GenericSearchController.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {

package/lib/LoadSearchController.js

@@ -63,7 +63,7 @@ var LoadSearchController = (function (_super) {
   LoadSearchController.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {
@@ -104,7 +104,7 @@ var QueryController = (function (_super) {
   QueryController.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.query
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)

package/lib/LowCodeController.js

@@ -48,7 +48,7 @@ var LowcodeController = (function (_super) {
   LowcodeController.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
@@ -84,7 +84,7 @@ var Controller = (function (_super) {
   Controller.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)

package/lib/SearchController.js

@@ -25,7 +25,7 @@ var SearchController = (function () {
   SearchController.prototype.search = function (req, res) {
     var _this = this
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, resources_1.resources.fields, this.excluding))
-    var l = search_1.getParameters(s, this.config)
+    var l = search_1.getParameters(s)
     var s2 = search_1.format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then(function (result) {

package/lib/search.js

@@ -61,8 +61,8 @@ function getLimit(req, filter) {
   if (filter) {
     var v0 = filter[resources_1.resources.limit]
     if (v0 == undefined) {
-      var field = req.query[resources_1.resources.limit]
-      var v_2 = field ? field.toString() : undefined
+      var field_2 = req.query[resources_1.resources.limit]
+      var v_2 = field_2 ? field_2.toString() : undefined
       if (!v_2 || v_2.length === 0) {
         filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
         return resources_1.resources.defaultLimit
@@ -87,8 +87,8 @@ function getLimit(req, filter) {
       }
     }
   }
-  var fieldxxx = req.query[resources_1.resources.limit]
-  var v = fieldxxx ? fieldxxx.toString() : undefined
+  var field = req.query[resources_1.resources.limit]
+  var v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
     if (filter) {
       filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
@@ -398,10 +398,6 @@ function buildResult(r, conf) {
     var t = conf.token ? conf.token : "token"
     x[t] = r.nextPageToken
   }
-  if (r.last) {
-    var l = conf.last ? conf.last : "last"
-    x[l] = r.last
-  }
   return x
 }
 exports.buildResult = buildResult
@@ -414,7 +410,6 @@ function initializeConfig(conf) {
     list: conf.list,
     total: conf.total,
     token: conf.token,
-    last: conf.last,
     csv: conf.csv,
   }
   if (!c.excluding || c.excluding.length === 0) {
@@ -426,9 +421,6 @@ function initializeConfig(conf) {
   if (!c.total || c.total.length === 0) {
     c.total = "total"
   }
-  if (!c.last || c.last.length === 0) {
-    c.last = "last"
-  }
   if (!c.token || c.token.length === 0) {
     c.token = "nextPageToken"
   }
@@ -437,6 +429,37 @@ function initializeConfig(conf) {
 exports.initializeConfig = initializeConfig
 function fromRequest(req, arr) {
   var s = req.method === "GET" ? fromUrl(req, arr) : req.body
+  var page = s[resources_1.resources.page]
+  if (page) {
+    if (isNaN(page)) {
+      s[resources_1.resources.page] = 1
+    } else {
+      var n = parseFloat(page)
+      if (n < 1) {
+        n = 1
+      }
+      s[resources_1.resources.page] = n
+    }
+  } else {
+    s[resources_1.resources.page] = 1
+  }
+  var limit = s[resources_1.resources.limit]
+  if (limit) {
+    if (isNaN(limit)) {
+      s[resources_1.resources.limit] = resources_1.resources.defaultLimit
+    } else {
+      var n = parseFloat(limit)
+      if (n < 1) {
+        n = resources_1.resources.defaultLimit
+      }
+      s[resources_1.resources.limit] = n
+    }
+  } else {
+    s[resources_1.resources.limit] = resources_1.resources.defaultLimit
+  }
+  if (resources_1.resources.partial.length > 0) {
+    delete s[resources_1.resources.partial]
+  }
   return s
 }
 exports.fromRequest = fromRequest
@@ -521,7 +544,7 @@ var setKey = function (_object, _isArrayKey, _key, _nextValue) {
   }
   return _object
 }
-function getParameters(obj, config) {
+function getParameters(obj) {
   var o = obj
   var fields
   var fs = o[resources_1.resources.fields]
@@ -539,17 +562,17 @@ function getParameters(obj, config) {
       }
     }
   }
-  var pageSize = resources_1.resources.defaultLimit
-  var spageSize = o[resources_1.resources.limit]
-  if (spageSize && typeof spageSize === "string") {
-    if (!isNaN(spageSize)) {
-      var ipageSize = Math.floor(parseFloat(spageSize))
-      if (ipageSize > 0) {
-        pageSize = ipageSize
+  var limit = resources_1.resources.defaultLimit
+  var slimit = o[resources_1.resources.limit]
+  if (slimit && typeof slimit === "string") {
+    if (!isNaN(slimit)) {
+      var ilimit = Math.floor(parseFloat(slimit))
+      if (ilimit > 0) {
+        limit = ilimit
       }
     }
   }
-  var r = { limit: pageSize, fields: fields, page: page, nextPageToken: nextPageToken, pageOrNextPageToken: page }
+  var r = { limit: limit, fields: fields, page: page, nextPageToken: nextPageToken, pageOrNextPageToken: page }
   if (r.nextPageToken && r.nextPageToken.length > 0) {
     r.pageOrNextPageToken = r.nextPageToken
   }
@@ -588,7 +611,7 @@ function toCsv(fields, r) {
     var n = "number"
     var b = '""'
     var rows = []
-    rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : "") + "," + (r.last ? "1" : ""))
+    rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : ""))
     for (var _i = 0, _a = r.list; _i < _a.length; _i++) {
       var item = _a[_i]
       var cols = []

package/package.json

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

package/src/GenericSearchController.ts

@@ -37,7 +37,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
   }
   search(req: Request, res: Response) {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))

package/src/LoadSearchController.ts

@@ -72,7 +72,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
   }
   search(req: Request, res: Response): void {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
@@ -109,7 +109,7 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
   }
   search(req: Request, res: Response): void {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.query
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)

package/src/LowCodeController.ts

@@ -39,7 +39,7 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
   }
   search(req: Request, res: Response) {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
@@ -79,7 +79,7 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
   }
   search(req: Request, res: Response) {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)

package/src/SearchController.ts

@@ -30,7 +30,7 @@ export class SearchController<T, S extends Filter> {
   }
   search(req: Request, res: Response) {
     const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
-    const l = getParameters(s, this.config)
+    const l = getParameters(s)
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))

package/src/search.ts

@@ -21,7 +21,7 @@ export interface SearchConfig {
   list?: string
   total?: string
   token?: string
-  last?: string
+  // last?: string
   csv?: boolean
   // page?: string
   // limit?: string
@@ -33,7 +33,6 @@ export interface SearchResult<T> {
   list: T[]
   total?: number
   nextPageToken?: string
-  last?: boolean
 }
 
 export function getPage<F extends Filter>(req: Request, filter?: F): number {
@@ -120,8 +119,8 @@ export function getLimit<F extends Filter>(req: Request, filter?: F): number {
       }
     }
   }
-  const fieldxxx = req.query[resources.limit]
-  const v = fieldxxx ? fieldxxx.toString() : undefined
+  const field = req.query[resources.limit]
+  const v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
     if (filter) {
       ;(filter as any)[resources.limit] = resources.defaultLimit
@@ -413,10 +412,6 @@ export function buildResult<T>(r: SearchResult<T>, conf?: SearchConfig): any {
     const t = conf.token ? conf.token : "token"
     x[t] = r.nextPageToken
   }
-  if (r.last) {
-    const l = conf.last ? conf.last : "last"
-    x[l] = r.last
-  }
   return x
 }
 export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined {
@@ -428,7 +423,6 @@ export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined
     list: conf.list,
     total: conf.total,
     token: conf.token,
-    last: conf.last,
     csv: conf.csv,
   }
   if (!c.excluding || c.excluding.length === 0) {
@@ -440,9 +434,6 @@ export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined
   if (!c.total || c.total.length === 0) {
     c.total = "total"
   }
-  if (!c.last || c.last.length === 0) {
-    c.last = "last"
-  }
   if (!c.token || c.token.length === 0) {
     c.token = "nextPageToken"
   }
@@ -450,6 +441,38 @@ export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined
 }
 export function fromRequest<S>(req: Request, arr?: string[]): S {
   const s: any = req.method === "GET" ? fromUrl(req, arr) : req.body
+  const page = s[resources.page]
+  if (page) {
+    if (isNaN(page as any)) {
+      s[resources.page] = 1
+    } else {
+      let n = parseFloat(page)
+      if (n < 1) {
+        n = 1
+      }
+      s[resources.page] = n
+    }
+  } else {
+    s[resources.page] = 1
+  }
+
+  const limit = s[resources.limit]
+  if (limit) {
+    if (isNaN(limit as any)) {
+      s[resources.limit] = resources.defaultLimit
+    } else {
+      let n = parseFloat(limit)
+      if (n < 1) {
+        n = resources.defaultLimit
+      }
+      s[resources.limit] = n
+    }
+  } else {
+    s[resources.limit] = resources.defaultLimit
+  }
+  if (resources.partial.length > 0) {
+    delete s[resources.partial]
+  }
   return s
 }
 export function buildArray(arr?: string[], s0?: string, s1?: string, s2?: string): string[] {
@@ -557,7 +580,7 @@ export interface Limit {
   fields?: string[]
   pageOrNextPageToken?: string | number
 }
-export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
+export function getParameters<T>(obj: T): Limit {
   const o: any = obj
   let fields: string[] | undefined
   const fs = o[resources.fields]
@@ -575,17 +598,17 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
       }
     }
   }
-  let pageSize = resources.defaultLimit
-  let spageSize = o[resources.limit]
-  if (spageSize && typeof spageSize === "string") {
-    if (!isNaN(spageSize as any)) {
-      const ipageSize = Math.floor(parseFloat(spageSize))
-      if (ipageSize > 0) {
-        pageSize = ipageSize
+  let limit = resources.defaultLimit
+  let slimit = o[resources.limit]
+  if (slimit && typeof slimit === "string") {
+    if (!isNaN(slimit as any)) {
+      const ilimit = Math.floor(parseFloat(slimit))
+      if (ilimit > 0) {
+        limit = ilimit
       }
     }
   }
-  const r: Limit = { limit: pageSize, fields, page, nextPageToken, pageOrNextPageToken: page }
+  const r: Limit = { limit: limit, fields, page, nextPageToken, pageOrNextPageToken: page }
   if (r.nextPageToken && r.nextPageToken.length > 0) {
     r.pageOrNextPageToken = r.nextPageToken
   }
@@ -622,7 +645,7 @@ export function toCsv<T>(fields: string[], r: SearchResult<T>): string {
     const n = "number"
     const b = '""'
     const rows: string[] = []
-    rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : "") + "," + (r.last ? "1" : ""))
+    rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : ""))
     for (const item of r.list) {
       const cols: string[] = []
       for (const name of fields) {