express-ext 0.4.0 → 0.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/GenericSearchController.js +38 -41
- package/lib/LoadSearchController.js +73 -80
- package/lib/LowCodeController.js +61 -68
- package/lib/SearchController.js +26 -29
- package/lib/index.js +278 -242
- package/lib/resources.js +60 -56
- package/lib/search.js +348 -477
- package/package.json +1 -1
- package/src/GenericController.ts +101 -101
- package/src/GenericSearchController.ts +25 -30
- package/src/HealthController.ts +8 -8
- package/src/LoadController.ts +55 -48
- package/src/LoadSearchController.ts +63 -72
- package/src/LogController.ts +86 -84
- package/src/LowCodeController.ts +44 -54
- package/src/SearchController.ts +19 -23
- package/src/client.ts +46 -46
- package/src/edit.ts +45 -45
- package/src/health.ts +26 -26
- package/src/http.ts +139 -139
- package/src/index.ts +229 -197
- package/src/log.ts +155 -151
- package/src/metadata.ts +44 -27
- package/src/resources.ts +73 -69
- package/src/search.ts +342 -502
- package/src/view.ts +33 -33
package/lib/search.js
CHANGED
|
@@ -1,722 +1,593 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports,
|
|
3
|
-
var http_1 = require(
|
|
4
|
-
var resources_1 = require(
|
|
5
|
-
var et =
|
|
1
|
+
"use strict"
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true })
|
|
3
|
+
var http_1 = require("./http")
|
|
4
|
+
var resources_1 = require("./resources")
|
|
5
|
+
var et = ""
|
|
6
6
|
function queryLimit(req) {
|
|
7
|
-
return http_1.queryNumber(req, resources_1.resources.limit, resources_1.resources.defaultLimit)
|
|
7
|
+
return http_1.queryNumber(req, resources_1.resources.limit, resources_1.resources.defaultLimit)
|
|
8
8
|
}
|
|
9
|
-
exports.queryLimit = queryLimit
|
|
9
|
+
exports.queryLimit = queryLimit
|
|
10
10
|
function queryPage(req, filter) {
|
|
11
|
-
var field = req.query[resources_1.resources.page]
|
|
12
|
-
var v = field ? field.toString() : undefined
|
|
11
|
+
var field = req.query[resources_1.resources.page]
|
|
12
|
+
var v = field ? field.toString() : undefined
|
|
13
13
|
if (!v || v.length === 0) {
|
|
14
|
-
filter[resources_1.resources.page] = 1
|
|
15
|
-
return 1
|
|
14
|
+
filter[resources_1.resources.page] = 1
|
|
15
|
+
return 1
|
|
16
16
|
}
|
|
17
17
|
if (isNaN(v)) {
|
|
18
|
-
filter[resources_1.resources.page] = 1
|
|
19
|
-
return 1
|
|
18
|
+
filter[resources_1.resources.page] = 1
|
|
19
|
+
return 1
|
|
20
20
|
}
|
|
21
|
-
var n = parseFloat(v)
|
|
22
|
-
filter[resources_1.resources.page] = n
|
|
23
|
-
return n
|
|
21
|
+
var n = parseFloat(v)
|
|
22
|
+
filter[resources_1.resources.page] = n
|
|
23
|
+
return n
|
|
24
24
|
}
|
|
25
|
-
exports.queryPage = queryPage
|
|
25
|
+
exports.queryPage = queryPage
|
|
26
26
|
function getOffset(limit, page) {
|
|
27
|
-
var offset = limit * (page - 1)
|
|
28
|
-
return offset < 0 ? 0 : offset
|
|
27
|
+
var offset = limit * (page - 1)
|
|
28
|
+
return offset < 0 ? 0 : offset
|
|
29
29
|
}
|
|
30
|
-
exports.getOffset = getOffset
|
|
30
|
+
exports.getOffset = getOffset
|
|
31
31
|
function getPageTotal(pageSize, total) {
|
|
32
32
|
if (!pageSize || pageSize <= 0) {
|
|
33
|
-
return 1
|
|
33
|
+
return 1
|
|
34
34
|
} else {
|
|
35
35
|
if (!total) {
|
|
36
|
-
total = 0
|
|
36
|
+
total = 0
|
|
37
37
|
}
|
|
38
38
|
if (total % pageSize === 0) {
|
|
39
|
-
return Math.floor(total / pageSize)
|
|
39
|
+
return Math.floor(total / pageSize)
|
|
40
40
|
}
|
|
41
|
-
return Math.floor(total / pageSize + 1)
|
|
41
|
+
return Math.floor(total / pageSize + 1)
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
exports.getPageTotal = getPageTotal
|
|
44
|
+
exports.getPageTotal = getPageTotal
|
|
45
45
|
function formatText() {
|
|
46
|
-
var args = []
|
|
46
|
+
var args = []
|
|
47
47
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
48
|
-
args[_i] = arguments[_i]
|
|
48
|
+
args[_i] = arguments[_i]
|
|
49
49
|
}
|
|
50
|
-
var formatted = args[0]
|
|
51
|
-
if (!formatted || formatted ===
|
|
52
|
-
return
|
|
50
|
+
var formatted = args[0]
|
|
51
|
+
if (!formatted || formatted === "") {
|
|
52
|
+
return ""
|
|
53
53
|
}
|
|
54
54
|
if (args.length > 1 && Array.isArray(args[1])) {
|
|
55
|
-
var params = args[1]
|
|
55
|
+
var params = args[1]
|
|
56
56
|
for (var i = 0; i < params.length; i++) {
|
|
57
|
-
var regexp = new RegExp(
|
|
58
|
-
formatted = formatted.replace(regexp, params[i])
|
|
57
|
+
var regexp = new RegExp("\\{" + i + "\\}", "gi")
|
|
58
|
+
formatted = formatted.replace(regexp, params[i])
|
|
59
59
|
}
|
|
60
60
|
} else {
|
|
61
61
|
for (var i = 1; i < args.length; i++) {
|
|
62
|
-
var regexp = new RegExp(
|
|
63
|
-
formatted = formatted.replace(regexp, args[i])
|
|
62
|
+
var regexp = new RegExp("\\{" + (i - 1) + "\\}", "gi")
|
|
63
|
+
formatted = formatted.replace(regexp, args[i])
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
|
-
return formatted
|
|
66
|
+
return formatted
|
|
67
67
|
}
|
|
68
|
-
exports.formatText = formatText
|
|
68
|
+
exports.formatText = formatText
|
|
69
69
|
function buildMessage(resource, results, limit, page, total) {
|
|
70
70
|
if (!results || results.length === 0) {
|
|
71
|
-
return resource.msg_no_data_found
|
|
71
|
+
return resource.msg_no_data_found
|
|
72
72
|
} else {
|
|
73
73
|
if (!page) {
|
|
74
|
-
page = 1
|
|
74
|
+
page = 1
|
|
75
75
|
}
|
|
76
|
-
var fromIndex = (page - 1) * limit + 1
|
|
77
|
-
var toIndex = fromIndex + results.length - 1
|
|
78
|
-
var pageTotal = getPageTotal(limit, total)
|
|
76
|
+
var fromIndex = (page - 1) * limit + 1
|
|
77
|
+
var toIndex = fromIndex + results.length - 1
|
|
78
|
+
var pageTotal = getPageTotal(limit, total)
|
|
79
79
|
if (pageTotal > 1) {
|
|
80
|
-
var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal)
|
|
81
|
-
return msg2
|
|
80
|
+
var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal)
|
|
81
|
+
return msg2
|
|
82
82
|
} else {
|
|
83
|
-
var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex)
|
|
84
|
-
return msg3
|
|
83
|
+
var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex)
|
|
84
|
+
return msg3
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
exports.buildMessage = buildMessage
|
|
88
|
+
exports.buildMessage = buildMessage
|
|
89
89
|
function buildPages(pageSize, total) {
|
|
90
|
-
var pageTotal = getPageTotal(pageSize, total)
|
|
90
|
+
var pageTotal = getPageTotal(pageSize, total)
|
|
91
91
|
if (pageTotal <= 1) {
|
|
92
|
-
return [1]
|
|
92
|
+
return [1]
|
|
93
93
|
}
|
|
94
|
-
var arr = []
|
|
94
|
+
var arr = []
|
|
95
95
|
for (var i = 1; i <= pageTotal; i++) {
|
|
96
|
-
arr.push(i)
|
|
96
|
+
arr.push(i)
|
|
97
97
|
}
|
|
98
|
-
return arr
|
|
98
|
+
return arr
|
|
99
99
|
}
|
|
100
|
-
exports.buildPages = buildPages
|
|
100
|
+
exports.buildPages = buildPages
|
|
101
101
|
function hasSearch(req) {
|
|
102
|
-
return req.url.indexOf(
|
|
102
|
+
return req.url.indexOf("?") >= 0
|
|
103
103
|
}
|
|
104
|
-
exports.hasSearch = hasSearch
|
|
104
|
+
exports.hasSearch = hasSearch
|
|
105
105
|
function getSearch(url) {
|
|
106
|
-
var i = url.indexOf(
|
|
107
|
-
return i < 0 ? et : url.substring(i + 1)
|
|
106
|
+
var i = url.indexOf("?")
|
|
107
|
+
return i < 0 ? et : url.substring(i + 1)
|
|
108
108
|
}
|
|
109
|
-
exports.getSearch = getSearch
|
|
109
|
+
exports.getSearch = getSearch
|
|
110
110
|
function getField(search, fieldName) {
|
|
111
|
-
var i = search.indexOf(fieldName +
|
|
111
|
+
var i = search.indexOf(fieldName + "=")
|
|
112
112
|
if (i < 0) {
|
|
113
|
-
return
|
|
113
|
+
return ""
|
|
114
114
|
}
|
|
115
115
|
if (i > 0) {
|
|
116
|
-
if (search.substring(i - 1, 1) !=
|
|
117
|
-
i = search.indexOf(
|
|
116
|
+
if (search.substring(i - 1, 1) != "&") {
|
|
117
|
+
i = search.indexOf("&" + fieldName + "=")
|
|
118
118
|
if (i < 0) {
|
|
119
|
-
return search
|
|
119
|
+
return search
|
|
120
120
|
}
|
|
121
|
-
i = i + 1
|
|
121
|
+
i = i + 1
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
|
-
var j = search.indexOf(
|
|
125
|
-
return j >= 0 ? search.substring(i, j) : search.substring(i)
|
|
124
|
+
var j = search.indexOf("&", i + fieldName.length)
|
|
125
|
+
return j >= 0 ? search.substring(i, j) : search.substring(i)
|
|
126
126
|
}
|
|
127
|
-
exports.getField = getField
|
|
127
|
+
exports.getField = getField
|
|
128
128
|
function removeField(search, fieldName) {
|
|
129
|
-
var i = search.indexOf(fieldName +
|
|
129
|
+
var i = search.indexOf(fieldName + "=")
|
|
130
130
|
if (i < 0) {
|
|
131
|
-
return search
|
|
131
|
+
return search
|
|
132
132
|
}
|
|
133
133
|
if (i > 0) {
|
|
134
|
-
if (search.substring(i - 1, 1) !=
|
|
135
|
-
i = search.indexOf(
|
|
134
|
+
if (search.substring(i - 1, 1) != "&") {
|
|
135
|
+
i = search.indexOf("&" + fieldName + "=")
|
|
136
136
|
if (i < 0) {
|
|
137
|
-
return search
|
|
137
|
+
return search
|
|
138
138
|
}
|
|
139
|
-
i = i + 1
|
|
139
|
+
i = i + 1
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
|
-
var j = search.indexOf(
|
|
143
|
-
return j >= 0 ? search.substring(0, i) + search.substring(j + 1) : search.substring(0, i - 1)
|
|
142
|
+
var j = search.indexOf("&", i + fieldName.length)
|
|
143
|
+
return j >= 0 ? search.substring(0, i) + search.substring(j + 1) : search.substring(0, i - 1)
|
|
144
144
|
}
|
|
145
|
-
exports.removeField = removeField
|
|
145
|
+
exports.removeField = removeField
|
|
146
146
|
function removePage(search) {
|
|
147
|
-
search = removeField(search, resources_1.resources.page)
|
|
148
|
-
search = removeField(search, resources_1.resources.partial)
|
|
149
|
-
return search
|
|
147
|
+
search = removeField(search, resources_1.resources.page)
|
|
148
|
+
search = removeField(search, resources_1.resources.partial)
|
|
149
|
+
return search
|
|
150
150
|
}
|
|
151
|
-
exports.removePage = removePage
|
|
151
|
+
exports.removePage = removePage
|
|
152
152
|
function buildPageSearch(search) {
|
|
153
|
-
var sr = removePage(search)
|
|
154
|
-
return sr.length == 0 ? sr :
|
|
153
|
+
var sr = removePage(search)
|
|
154
|
+
return sr.length == 0 ? sr : "&" + sr
|
|
155
155
|
}
|
|
156
|
-
exports.buildPageSearch = buildPageSearch
|
|
156
|
+
exports.buildPageSearch = buildPageSearch
|
|
157
157
|
function buildPageSearchFromUrl(url) {
|
|
158
|
-
var search = getSearch(url)
|
|
159
|
-
return buildPageSearch(search)
|
|
158
|
+
var search = getSearch(url)
|
|
159
|
+
return buildPageSearch(search)
|
|
160
160
|
}
|
|
161
|
-
exports.buildPageSearchFromUrl = buildPageSearchFromUrl
|
|
161
|
+
exports.buildPageSearchFromUrl = buildPageSearchFromUrl
|
|
162
162
|
function removeSort(search) {
|
|
163
|
-
search = removeField(search, resources_1.resources.sort)
|
|
164
|
-
search = removeField(search, resources_1.resources.partial)
|
|
165
|
-
return search
|
|
163
|
+
search = removeField(search, resources_1.resources.sort)
|
|
164
|
+
search = removeField(search, resources_1.resources.partial)
|
|
165
|
+
return search
|
|
166
166
|
}
|
|
167
|
-
exports.removeSort = removeSort
|
|
167
|
+
exports.removeSort = removeSort
|
|
168
168
|
function getSortString(field, sort) {
|
|
169
169
|
if (field === sort.field) {
|
|
170
|
-
return sort.type ===
|
|
170
|
+
return sort.type === "-" ? field : "-" + field
|
|
171
171
|
}
|
|
172
|
-
return field
|
|
172
|
+
return field
|
|
173
173
|
}
|
|
174
|
-
exports.getSortString = getSortString
|
|
174
|
+
exports.getSortString = getSortString
|
|
175
175
|
function buildSort(s) {
|
|
176
|
-
if (!s || s.indexOf(
|
|
177
|
-
return {}
|
|
176
|
+
if (!s || s.indexOf(",") >= 0) {
|
|
177
|
+
return {}
|
|
178
178
|
}
|
|
179
|
-
if (s.startsWith(
|
|
180
|
-
return { field: s.substring(1), type:
|
|
179
|
+
if (s.startsWith("-")) {
|
|
180
|
+
return { field: s.substring(1), type: "-" }
|
|
181
181
|
} else {
|
|
182
|
-
return { field: s.startsWith(
|
|
182
|
+
return { field: s.startsWith("+") ? s.substring(1) : s, type: "+" }
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
exports.buildSort = buildSort
|
|
185
|
+
exports.buildSort = buildSort
|
|
186
186
|
function buildSortFromRequest(req) {
|
|
187
|
-
var s = http_1.query(req, resources_1.resources.sort)
|
|
188
|
-
return buildSort(s)
|
|
187
|
+
var s = http_1.query(req, resources_1.resources.sort)
|
|
188
|
+
return buildSort(s)
|
|
189
189
|
}
|
|
190
|
-
exports.buildSortFromRequest = buildSortFromRequest
|
|
190
|
+
exports.buildSortFromRequest = buildSortFromRequest
|
|
191
191
|
function renderSort(field, sort) {
|
|
192
192
|
if (field === sort.field) {
|
|
193
|
-
return sort.type ===
|
|
193
|
+
return sort.type === "-" ? "<i class='sort-down'></i>" : "<i class='sort-up'></i>"
|
|
194
194
|
}
|
|
195
|
-
return et
|
|
195
|
+
return et
|
|
196
196
|
}
|
|
197
|
-
exports.renderSort = renderSort
|
|
197
|
+
exports.renderSort = renderSort
|
|
198
198
|
function buildSortSearch(search, fields, sortStr) {
|
|
199
|
-
var sort = buildSort(sortStr)
|
|
200
|
-
search = removeSort(search)
|
|
201
|
-
var sorts = {}
|
|
202
|
-
var prefix = search.length > 0 ?
|
|
199
|
+
var sort = buildSort(sortStr)
|
|
200
|
+
search = removeSort(search)
|
|
201
|
+
var sorts = {}
|
|
202
|
+
var prefix = search.length > 0 ? "?" + search + "&" : "?"
|
|
203
203
|
for (var i = 0; i < fields.length; i++) {
|
|
204
204
|
sorts[fields[i]] = {
|
|
205
|
-
url: prefix + resources_1.resources.sort +
|
|
205
|
+
url: prefix + resources_1.resources.sort + "=" + getSortString(fields[i], sort),
|
|
206
206
|
tag: renderSort(fields[i], sort),
|
|
207
|
-
}
|
|
207
|
+
}
|
|
208
208
|
}
|
|
209
|
-
return sorts
|
|
209
|
+
return sorts
|
|
210
210
|
}
|
|
211
|
-
exports.buildSortSearch = buildSortSearch
|
|
211
|
+
exports.buildSortSearch = buildSortSearch
|
|
212
212
|
function clone(obj) {
|
|
213
213
|
if (!obj) {
|
|
214
|
-
return obj
|
|
214
|
+
return obj
|
|
215
215
|
}
|
|
216
216
|
if (obj instanceof Date) {
|
|
217
|
-
return new Date(obj.getTime())
|
|
217
|
+
return new Date(obj.getTime())
|
|
218
218
|
}
|
|
219
|
-
if (typeof obj !==
|
|
220
|
-
return obj
|
|
219
|
+
if (typeof obj !== "object") {
|
|
220
|
+
return obj
|
|
221
221
|
}
|
|
222
222
|
if (Array.isArray(obj)) {
|
|
223
|
-
var arr = []
|
|
223
|
+
var arr = []
|
|
224
224
|
for (var _i = 0, obj_1 = obj; _i < obj_1.length; _i++) {
|
|
225
|
-
var sub = obj_1[_i]
|
|
226
|
-
var c = clone(sub)
|
|
227
|
-
arr.push(c)
|
|
225
|
+
var sub = obj_1[_i]
|
|
226
|
+
var c = clone(sub)
|
|
227
|
+
arr.push(c)
|
|
228
228
|
}
|
|
229
|
-
return arr
|
|
229
|
+
return arr
|
|
230
230
|
}
|
|
231
|
-
var x = {}
|
|
232
|
-
var keys = Object.keys(obj)
|
|
231
|
+
var x = {}
|
|
232
|
+
var keys = Object.keys(obj)
|
|
233
233
|
for (var _a = 0, keys_1 = keys; _a < keys_1.length; _a++) {
|
|
234
|
-
var k = keys_1[_a]
|
|
235
|
-
var v = obj[k]
|
|
234
|
+
var k = keys_1[_a]
|
|
235
|
+
var v = obj[k]
|
|
236
236
|
if (v instanceof Date) {
|
|
237
|
-
x[k] = new Date(v.getTime())
|
|
237
|
+
x[k] = new Date(v.getTime())
|
|
238
238
|
} else {
|
|
239
239
|
switch (typeof v) {
|
|
240
|
-
case
|
|
241
|
-
x[k] = clone(v)
|
|
242
|
-
break
|
|
240
|
+
case "object":
|
|
241
|
+
x[k] = clone(v)
|
|
242
|
+
break
|
|
243
243
|
default:
|
|
244
|
-
x[k] = v
|
|
245
|
-
break
|
|
244
|
+
x[k] = v
|
|
245
|
+
break
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
|
-
return x
|
|
249
|
+
return x
|
|
250
250
|
}
|
|
251
|
-
exports.clone = clone
|
|
251
|
+
exports.clone = clone
|
|
252
252
|
function cloneFilter(obj, limit, page) {
|
|
253
|
-
var f = clone(obj)
|
|
253
|
+
var f = clone(obj)
|
|
254
254
|
if (!obj.hasOwnProperty(resources_1.resources.page)) {
|
|
255
|
-
obj[resources_1.resources.page] = page
|
|
255
|
+
obj[resources_1.resources.page] = page
|
|
256
256
|
}
|
|
257
257
|
if (!obj.hasOwnProperty(resources_1.resources.limit)) {
|
|
258
|
-
obj[resources_1.resources.limit] = limit
|
|
258
|
+
obj[resources_1.resources.limit] = limit
|
|
259
259
|
}
|
|
260
|
-
return f
|
|
260
|
+
return f
|
|
261
261
|
}
|
|
262
|
-
exports.cloneFilter = cloneFilter
|
|
262
|
+
exports.cloneFilter = cloneFilter
|
|
263
263
|
function jsonResult(res, result, quick, fields, config) {
|
|
264
264
|
if (quick && fields && fields.length > 0) {
|
|
265
|
-
res.status(200).json(toCsv(fields, result)).end()
|
|
265
|
+
res.status(200).json(toCsv(fields, result)).end()
|
|
266
266
|
} else {
|
|
267
|
-
res.status(200).json(buildResult(result, config)).end()
|
|
267
|
+
res.status(200).json(buildResult(result, config)).end()
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
|
-
exports.jsonResult = jsonResult
|
|
270
|
+
exports.jsonResult = jsonResult
|
|
271
271
|
function buildResult(r, conf) {
|
|
272
272
|
if (!conf) {
|
|
273
|
-
return r
|
|
273
|
+
return r
|
|
274
274
|
}
|
|
275
|
-
var x = {}
|
|
276
|
-
var li = conf.list ? conf.list :
|
|
277
|
-
x[li] = http_1.minimizeArray(r.list)
|
|
278
|
-
var to = conf.total ? conf.total :
|
|
279
|
-
x[to] = r.total
|
|
275
|
+
var x = {}
|
|
276
|
+
var li = conf.list ? conf.list : "list"
|
|
277
|
+
x[li] = http_1.minimizeArray(r.list)
|
|
278
|
+
var to = conf.total ? conf.total : "total"
|
|
279
|
+
x[to] = r.total
|
|
280
280
|
if (r.nextPageToken && r.nextPageToken.length > 0) {
|
|
281
|
-
var t = conf.token ? conf.token :
|
|
282
|
-
x[t] = r.nextPageToken
|
|
281
|
+
var t = conf.token ? conf.token : "token"
|
|
282
|
+
x[t] = r.nextPageToken
|
|
283
283
|
}
|
|
284
284
|
if (r.last) {
|
|
285
|
-
var l = conf.last ? conf.last :
|
|
286
|
-
x[l] = r.last
|
|
285
|
+
var l = conf.last ? conf.last : "last"
|
|
286
|
+
x[l] = r.last
|
|
287
287
|
}
|
|
288
|
-
return x
|
|
288
|
+
return x
|
|
289
289
|
}
|
|
290
|
-
exports.buildResult = buildResult
|
|
290
|
+
exports.buildResult = buildResult
|
|
291
291
|
function initializeConfig(conf) {
|
|
292
292
|
if (!conf) {
|
|
293
|
-
return undefined
|
|
293
|
+
return undefined
|
|
294
294
|
}
|
|
295
295
|
var c = {
|
|
296
296
|
excluding: conf.excluding,
|
|
297
|
-
fields: conf.fields,
|
|
298
297
|
list: conf.list,
|
|
299
298
|
total: conf.total,
|
|
300
299
|
token: conf.token,
|
|
301
300
|
last: conf.last,
|
|
302
301
|
csv: conf.csv,
|
|
303
|
-
page: conf.page,
|
|
304
|
-
limit: conf.limit,
|
|
305
|
-
skip: conf.skip,
|
|
306
|
-
refId: conf.refId,
|
|
307
|
-
firstLimit: conf.firstLimit,
|
|
308
|
-
};
|
|
309
|
-
if (!c.excluding || c.excluding.length === 0) {
|
|
310
|
-
c.excluding = 'excluding';
|
|
311
302
|
}
|
|
312
|
-
if (!c.
|
|
313
|
-
c.
|
|
303
|
+
if (!c.excluding || c.excluding.length === 0) {
|
|
304
|
+
c.excluding = "excluding"
|
|
314
305
|
}
|
|
315
306
|
if (!c.list || c.list.length === 0) {
|
|
316
|
-
c.list =
|
|
307
|
+
c.list = "list"
|
|
317
308
|
}
|
|
318
309
|
if (!c.total || c.total.length === 0) {
|
|
319
|
-
c.total =
|
|
310
|
+
c.total = "total"
|
|
320
311
|
}
|
|
321
312
|
if (!c.last || c.last.length === 0) {
|
|
322
|
-
c.last =
|
|
313
|
+
c.last = "last"
|
|
323
314
|
}
|
|
324
315
|
if (!c.token || c.token.length === 0) {
|
|
325
|
-
c.token =
|
|
326
|
-
}
|
|
327
|
-
if (!c.page || c.page.length === 0) {
|
|
328
|
-
c.page = 'page';
|
|
329
|
-
}
|
|
330
|
-
if (!c.limit || c.limit.length === 0) {
|
|
331
|
-
c.limit = 'limit';
|
|
316
|
+
c.token = "nextPageToken"
|
|
332
317
|
}
|
|
333
|
-
|
|
334
|
-
c.skip = 'skip';
|
|
335
|
-
}
|
|
336
|
-
if (!c.refId || c.refId.length === 0) {
|
|
337
|
-
c.refId = 'refId';
|
|
338
|
-
}
|
|
339
|
-
if (!c.firstLimit || c.firstLimit.length === 0) {
|
|
340
|
-
c.firstLimit = 'firstLimit';
|
|
341
|
-
}
|
|
342
|
-
return c;
|
|
318
|
+
return c
|
|
343
319
|
}
|
|
344
|
-
exports.initializeConfig = initializeConfig
|
|
320
|
+
exports.initializeConfig = initializeConfig
|
|
345
321
|
function fromRequest(req, arr) {
|
|
346
|
-
var s = req.method ===
|
|
347
|
-
return s
|
|
322
|
+
var s = req.method === "GET" ? fromUrl(req, arr) : req.body
|
|
323
|
+
return s
|
|
348
324
|
}
|
|
349
|
-
exports.fromRequest = fromRequest
|
|
325
|
+
exports.fromRequest = fromRequest
|
|
350
326
|
function buildArray(arr, s0, s1, s2) {
|
|
351
|
-
var r = []
|
|
327
|
+
var r = []
|
|
352
328
|
if (arr && arr.length > 0) {
|
|
353
329
|
for (var _i = 0, arr_1 = arr; _i < arr_1.length; _i++) {
|
|
354
|
-
var a = arr_1[_i]
|
|
355
|
-
r.push(a)
|
|
330
|
+
var a = arr_1[_i]
|
|
331
|
+
r.push(a)
|
|
356
332
|
}
|
|
357
333
|
}
|
|
358
334
|
if (s0 && s0.length > 0) {
|
|
359
|
-
r.push(s0)
|
|
335
|
+
r.push(s0)
|
|
360
336
|
}
|
|
361
337
|
if (s1 && s1.length > 0) {
|
|
362
|
-
r.push(s1)
|
|
338
|
+
r.push(s1)
|
|
363
339
|
}
|
|
364
340
|
if (s2 && s2.length > 0) {
|
|
365
|
-
r.push(s2)
|
|
341
|
+
r.push(s2)
|
|
366
342
|
}
|
|
367
|
-
return r
|
|
343
|
+
return r
|
|
368
344
|
}
|
|
369
|
-
exports.buildArray = buildArray
|
|
345
|
+
exports.buildArray = buildArray
|
|
370
346
|
function fromUrl(req, arr) {
|
|
371
|
-
var s = {}
|
|
372
|
-
var obj = req.query
|
|
373
|
-
var keys = Object.keys(obj)
|
|
347
|
+
var s = {}
|
|
348
|
+
var obj = req.query
|
|
349
|
+
var keys = Object.keys(obj)
|
|
374
350
|
for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
|
|
375
|
-
var key = keys_2[_i]
|
|
351
|
+
var key = keys_2[_i]
|
|
376
352
|
if (inArray(key, arr)) {
|
|
377
|
-
var x = obj[key].split(
|
|
378
|
-
setValue(s, key, x)
|
|
353
|
+
var x = obj[key].split(",")
|
|
354
|
+
setValue(s, key, x)
|
|
379
355
|
} else {
|
|
380
|
-
setValue(s, key, obj[key])
|
|
356
|
+
setValue(s, key, obj[key])
|
|
381
357
|
}
|
|
382
358
|
}
|
|
383
|
-
return s
|
|
359
|
+
return s
|
|
384
360
|
}
|
|
385
|
-
exports.fromUrl = fromUrl
|
|
361
|
+
exports.fromUrl = fromUrl
|
|
386
362
|
function inArray(s, arr) {
|
|
387
363
|
if (!arr || arr.length === 0) {
|
|
388
|
-
return false
|
|
364
|
+
return false
|
|
389
365
|
}
|
|
390
366
|
for (var _i = 0, arr_2 = arr; _i < arr_2.length; _i++) {
|
|
391
|
-
var a = arr_2[_i]
|
|
367
|
+
var a = arr_2[_i]
|
|
392
368
|
if (s === a) {
|
|
393
|
-
return true
|
|
369
|
+
return true
|
|
394
370
|
}
|
|
395
371
|
}
|
|
396
|
-
return false
|
|
372
|
+
return false
|
|
397
373
|
}
|
|
398
|
-
exports.inArray = inArray
|
|
374
|
+
exports.inArray = inArray
|
|
399
375
|
function setValue(o, key, value) {
|
|
400
|
-
var obj = o
|
|
401
|
-
var replaceKey = key.replace(/\[/g,
|
|
402
|
-
if (replaceKey.indexOf(
|
|
403
|
-
replaceKey = replaceKey.slice(1, replaceKey.length)
|
|
376
|
+
var obj = o
|
|
377
|
+
var replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
|
|
378
|
+
if (replaceKey.indexOf(".") === 0) {
|
|
379
|
+
replaceKey = replaceKey.slice(1, replaceKey.length)
|
|
404
380
|
}
|
|
405
|
-
var keys = replaceKey.split(
|
|
406
|
-
var firstKey = keys.shift()
|
|
381
|
+
var keys = replaceKey.split(".")
|
|
382
|
+
var firstKey = keys.shift()
|
|
407
383
|
if (!firstKey) {
|
|
408
|
-
return
|
|
384
|
+
return
|
|
409
385
|
}
|
|
410
|
-
var isArrayKey = /\[([0-9]+)\]/.test(firstKey)
|
|
386
|
+
var isArrayKey = /\[([0-9]+)\]/.test(firstKey)
|
|
411
387
|
if (keys.length > 0) {
|
|
412
|
-
var firstKeyValue = obj[firstKey] || {}
|
|
413
|
-
var returnValue = setValue(firstKeyValue, keys.join(
|
|
414
|
-
return setKey(obj, isArrayKey, firstKey, returnValue)
|
|
388
|
+
var firstKeyValue = obj[firstKey] || {}
|
|
389
|
+
var returnValue = setValue(firstKeyValue, keys.join("."), value)
|
|
390
|
+
return setKey(obj, isArrayKey, firstKey, returnValue)
|
|
415
391
|
}
|
|
416
|
-
return setKey(obj, isArrayKey, firstKey, value)
|
|
392
|
+
return setKey(obj, isArrayKey, firstKey, value)
|
|
417
393
|
}
|
|
418
|
-
exports.setValue = setValue
|
|
394
|
+
exports.setValue = setValue
|
|
419
395
|
var setKey = function (_object, _isArrayKey, _key, _nextValue) {
|
|
420
396
|
if (_isArrayKey) {
|
|
421
397
|
if (_object.length > _key) {
|
|
422
|
-
_object[_key] = _nextValue
|
|
398
|
+
_object[_key] = _nextValue
|
|
423
399
|
} else {
|
|
424
|
-
_object.push(_nextValue)
|
|
400
|
+
_object.push(_nextValue)
|
|
425
401
|
}
|
|
426
402
|
} else {
|
|
427
|
-
_object[_key] = _nextValue
|
|
403
|
+
_object[_key] = _nextValue
|
|
428
404
|
}
|
|
429
|
-
return _object
|
|
430
|
-
}
|
|
405
|
+
return _object
|
|
406
|
+
}
|
|
431
407
|
function getParameters(obj, config) {
|
|
432
|
-
var o = obj
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
if (!
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
var pageSize = o['limit'];
|
|
447
|
-
if (!pageSize) {
|
|
448
|
-
pageSize = o['pageSize'];
|
|
449
|
-
}
|
|
450
|
-
if (pageSize && !isNaN(pageSize)) {
|
|
451
|
-
var ipageSize = Math.floor(parseFloat(pageSize));
|
|
452
|
-
if (ipageSize > 0) {
|
|
453
|
-
r.limit = ipageSize;
|
|
454
|
-
var pageIndex = o['page'];
|
|
455
|
-
if (!pageIndex) {
|
|
456
|
-
pageIndex = o['pageIndex'];
|
|
457
|
-
if (!pageIndex) {
|
|
458
|
-
pageIndex = o['pageNo'];
|
|
459
|
-
}
|
|
460
|
-
}
|
|
461
|
-
if (pageIndex && !isNaN(pageIndex)) {
|
|
462
|
-
var ipageIndex = Math.floor(parseFloat(pageIndex));
|
|
463
|
-
if (ipageIndex < 1) {
|
|
464
|
-
ipageIndex = 1;
|
|
465
|
-
}
|
|
466
|
-
r.page = ipageIndex;
|
|
467
|
-
r.pageOrNextPageToken = r.page;
|
|
468
|
-
deletePageInfo(o);
|
|
469
|
-
return r;
|
|
470
|
-
}
|
|
471
|
-
r.page = 1;
|
|
472
|
-
if (r.nextPageToken && r.nextPageToken.length > 0) {
|
|
473
|
-
r.pageOrNextPageToken = r.nextPageToken;
|
|
474
|
-
}
|
|
475
|
-
deletePageInfo(o);
|
|
476
|
-
return r;
|
|
408
|
+
var o = obj
|
|
409
|
+
var fields
|
|
410
|
+
var fs = o[resources_1.resources.fields]
|
|
411
|
+
if (fs && Array.isArray(fs)) {
|
|
412
|
+
fields = fs
|
|
413
|
+
}
|
|
414
|
+
var nextPageToken = o[resources_1.resources.nextPageToken]
|
|
415
|
+
var page = 1
|
|
416
|
+
var spage = o[resources_1.resources.page]
|
|
417
|
+
if (spage && typeof spage === "string") {
|
|
418
|
+
if (!isNaN(spage)) {
|
|
419
|
+
var ipage = Math.floor(parseFloat(spage))
|
|
420
|
+
if (ipage > 1) {
|
|
421
|
+
page = ipage
|
|
477
422
|
}
|
|
478
423
|
}
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
var sfield = config.fields;
|
|
486
|
-
if (!sfield || sfield.length === 0) {
|
|
487
|
-
sfield = 'fields';
|
|
488
|
-
}
|
|
489
|
-
var fields = void 0;
|
|
490
|
-
var fs = o[sfield];
|
|
491
|
-
if (fs && Array.isArray(fs)) {
|
|
492
|
-
fields = fs;
|
|
493
|
-
delete o[sfield];
|
|
494
|
-
}
|
|
495
|
-
var strRefId = config.refId;
|
|
496
|
-
if (!strRefId || strRefId.length === 0) {
|
|
497
|
-
strRefId = 'refId';
|
|
498
|
-
}
|
|
499
|
-
var refId = o[strRefId];
|
|
500
|
-
var r = { fields: fields, nextPageToken: refId };
|
|
501
|
-
var strLimit = config.limit;
|
|
502
|
-
if (!strLimit || strLimit.length === 0) {
|
|
503
|
-
strLimit = 'limit';
|
|
504
|
-
}
|
|
505
|
-
var pageSize = o[strLimit];
|
|
506
|
-
var arr = [config.page, config.limit, config.skip, config.refId, config.firstLimit];
|
|
507
|
-
if (pageSize && !isNaN(pageSize)) {
|
|
508
|
-
var ipageSize = Math.floor(parseFloat(pageSize));
|
|
424
|
+
}
|
|
425
|
+
var pageSize = resources_1.resources.defaultLimit
|
|
426
|
+
var spageSize = o[resources_1.resources.limit]
|
|
427
|
+
if (spageSize && typeof spageSize === "string") {
|
|
428
|
+
if (!isNaN(spageSize)) {
|
|
429
|
+
var ipageSize = Math.floor(parseFloat(spageSize))
|
|
509
430
|
if (ipageSize > 0) {
|
|
510
|
-
|
|
511
|
-
var strSkip = config.skip;
|
|
512
|
-
if (!strSkip || strSkip.length === 0) {
|
|
513
|
-
strSkip = 'skip';
|
|
514
|
-
}
|
|
515
|
-
var skip = o[strSkip];
|
|
516
|
-
if (skip && !isNaN(skip)) {
|
|
517
|
-
var iskip = Math.floor(parseFloat(skip));
|
|
518
|
-
if (iskip >= 0) {
|
|
519
|
-
r.page = iskip;
|
|
520
|
-
r.pageOrNextPageToken = r.page;
|
|
521
|
-
deletePageInfo(o, arr);
|
|
522
|
-
return r;
|
|
523
|
-
}
|
|
524
|
-
}
|
|
525
|
-
var strPage = config.page;
|
|
526
|
-
if (!strPage || strPage.length === 0) {
|
|
527
|
-
strPage = 'page';
|
|
528
|
-
}
|
|
529
|
-
var pageIndex = o[strPage];
|
|
530
|
-
if (pageIndex && !isNaN(pageIndex)) {
|
|
531
|
-
var ipageIndex = Math.floor(parseFloat(pageIndex));
|
|
532
|
-
if (ipageIndex < 1) {
|
|
533
|
-
ipageIndex = 1;
|
|
534
|
-
}
|
|
535
|
-
var strFirstLimit = config.firstLimit;
|
|
536
|
-
if (!strFirstLimit || strFirstLimit.length === 0) {
|
|
537
|
-
strFirstLimit = 'firstLimit';
|
|
538
|
-
}
|
|
539
|
-
var firstPageSize = o[strFirstLimit];
|
|
540
|
-
if (firstPageSize && !isNaN(firstPageSize)) {
|
|
541
|
-
var ifirstPageSize = Math.floor(parseFloat(firstPageSize));
|
|
542
|
-
if (ifirstPageSize > 0) {
|
|
543
|
-
r.page = ipageSize * (ipageIndex - 2) + ifirstPageSize;
|
|
544
|
-
r.pageOrNextPageToken = r.page;
|
|
545
|
-
deletePageInfo(o, arr);
|
|
546
|
-
return r;
|
|
547
|
-
}
|
|
548
|
-
}
|
|
549
|
-
r.page = ipageSize * (ipageIndex - 1);
|
|
550
|
-
r.pageOrNextPageToken = r.page;
|
|
551
|
-
deletePageInfo(o, arr);
|
|
552
|
-
return r;
|
|
553
|
-
}
|
|
554
|
-
r.page = 0;
|
|
555
|
-
if (r.nextPageToken && r.nextPageToken.length > 0) {
|
|
556
|
-
r.pageOrNextPageToken = r.nextPageToken;
|
|
557
|
-
}
|
|
558
|
-
deletePageInfo(o, arr);
|
|
559
|
-
return r;
|
|
431
|
+
pageSize = ipageSize
|
|
560
432
|
}
|
|
561
433
|
}
|
|
562
|
-
if (r.nextPageToken && r.nextPageToken.length > 0) {
|
|
563
|
-
r.pageOrNextPageToken = r.nextPageToken;
|
|
564
|
-
}
|
|
565
|
-
deletePageInfo(o, arr);
|
|
566
|
-
return r;
|
|
567
434
|
}
|
|
435
|
+
var r = { limit: pageSize, fields: fields, page: page, nextPageToken: nextPageToken, pageOrNextPageToken: page }
|
|
436
|
+
if (r.nextPageToken && r.nextPageToken.length > 0) {
|
|
437
|
+
r.pageOrNextPageToken = r.nextPageToken
|
|
438
|
+
}
|
|
439
|
+
deletePageInfo(o)
|
|
440
|
+
return r
|
|
568
441
|
}
|
|
569
|
-
exports.getParameters = getParameters
|
|
442
|
+
exports.getParameters = getParameters
|
|
570
443
|
function deletePageInfo(obj, arr) {
|
|
571
444
|
if (!arr || arr.length === 0) {
|
|
572
|
-
delete obj[
|
|
573
|
-
delete obj[
|
|
574
|
-
delete obj[
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
delete obj['refId'];
|
|
582
|
-
delete obj['nextPageToken'];
|
|
445
|
+
delete obj[resources_1.resources.fields]
|
|
446
|
+
delete obj[resources_1.resources.limit]
|
|
447
|
+
delete obj[resources_1.resources.page]
|
|
448
|
+
if (resources_1.resources.nextPageToken && resources_1.resources.nextPageToken.length > 0) {
|
|
449
|
+
delete obj[resources_1.resources.nextPageToken]
|
|
450
|
+
}
|
|
451
|
+
if (resources_1.resources.partial && resources_1.resources.partial.length > 0) {
|
|
452
|
+
delete obj[resources_1.resources.partial]
|
|
453
|
+
}
|
|
583
454
|
} else {
|
|
584
455
|
for (var _i = 0, arr_3 = arr; _i < arr_3.length; _i++) {
|
|
585
|
-
var o = arr_3[_i]
|
|
456
|
+
var o = arr_3[_i]
|
|
586
457
|
if (o && o.length > 0) {
|
|
587
|
-
delete obj[o]
|
|
458
|
+
delete obj[o]
|
|
588
459
|
}
|
|
589
460
|
}
|
|
590
461
|
}
|
|
591
462
|
}
|
|
592
|
-
exports.deletePageInfo = deletePageInfo
|
|
593
|
-
var re = /"/g
|
|
463
|
+
exports.deletePageInfo = deletePageInfo
|
|
464
|
+
var re = /"/g
|
|
594
465
|
function toCsv(fields, r) {
|
|
595
466
|
if (!r || r.list.length === 0) {
|
|
596
|
-
return
|
|
467
|
+
return "0"
|
|
597
468
|
} else {
|
|
598
|
-
var e =
|
|
599
|
-
var s =
|
|
600
|
-
var n =
|
|
601
|
-
var b = '""'
|
|
602
|
-
var rows = []
|
|
603
|
-
rows.push(
|
|
469
|
+
var e = ""
|
|
470
|
+
var s = "string"
|
|
471
|
+
var n = "number"
|
|
472
|
+
var b = '""'
|
|
473
|
+
var rows = []
|
|
474
|
+
rows.push("" + (r.total ? r.total : "") + "," + (r.nextPageToken ? r.nextPageToken : "") + "," + (r.last ? "1" : ""))
|
|
604
475
|
for (var _i = 0, _a = r.list; _i < _a.length; _i++) {
|
|
605
|
-
var item = _a[_i]
|
|
606
|
-
var cols = []
|
|
476
|
+
var item = _a[_i]
|
|
477
|
+
var cols = []
|
|
607
478
|
for (var _b = 0, fields_1 = fields; _b < fields_1.length; _b++) {
|
|
608
|
-
var name = fields_1[_b]
|
|
609
|
-
var v = item[name]
|
|
479
|
+
var name = fields_1[_b]
|
|
480
|
+
var v = item[name]
|
|
610
481
|
if (!v) {
|
|
611
|
-
cols.push(e)
|
|
482
|
+
cols.push(e)
|
|
612
483
|
} else {
|
|
613
484
|
if (typeof v === s) {
|
|
614
|
-
if (s.indexOf(
|
|
615
|
-
cols.push('"' + v.replace(re, b) + '"')
|
|
485
|
+
if (s.indexOf(",") >= 0) {
|
|
486
|
+
cols.push('"' + v.replace(re, b) + '"')
|
|
616
487
|
} else {
|
|
617
|
-
cols.push(v)
|
|
488
|
+
cols.push(v)
|
|
618
489
|
}
|
|
619
490
|
} else if (v instanceof Date) {
|
|
620
|
-
cols.push(v.toISOString())
|
|
491
|
+
cols.push(v.toISOString())
|
|
621
492
|
} else if (typeof v === n) {
|
|
622
|
-
cols.push(v.toString())
|
|
493
|
+
cols.push(v.toString())
|
|
623
494
|
} else {
|
|
624
|
-
cols.push(
|
|
495
|
+
cols.push("")
|
|
625
496
|
}
|
|
626
497
|
}
|
|
627
498
|
}
|
|
628
|
-
rows.push(cols.join(
|
|
499
|
+
rows.push(cols.join(","))
|
|
629
500
|
}
|
|
630
|
-
return rows.join(
|
|
501
|
+
return rows.join("\n")
|
|
631
502
|
}
|
|
632
503
|
}
|
|
633
|
-
exports.toCsv = toCsv
|
|
504
|
+
exports.toCsv = toCsv
|
|
634
505
|
function buildMetadata(attributes, includeDate) {
|
|
635
|
-
var keys = Object.keys(attributes)
|
|
636
|
-
var dates = []
|
|
637
|
-
var numbers = []
|
|
506
|
+
var keys = Object.keys(attributes)
|
|
507
|
+
var dates = []
|
|
508
|
+
var numbers = []
|
|
638
509
|
for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
|
|
639
|
-
var key = keys_3[_i]
|
|
640
|
-
var attr = attributes[key]
|
|
641
|
-
if (attr.type ===
|
|
642
|
-
numbers.push(key)
|
|
643
|
-
} else if (attr.type ===
|
|
644
|
-
dates.push(key)
|
|
510
|
+
var key = keys_3[_i]
|
|
511
|
+
var attr = attributes[key]
|
|
512
|
+
if (attr.type === "number" || attr.type === "integer") {
|
|
513
|
+
numbers.push(key)
|
|
514
|
+
} else if (attr.type === "datetime" || (includeDate === true && attr.type === "date")) {
|
|
515
|
+
dates.push(key)
|
|
645
516
|
}
|
|
646
517
|
}
|
|
647
|
-
var m = {}
|
|
518
|
+
var m = {}
|
|
648
519
|
if (dates.length > 0) {
|
|
649
|
-
m.dates = dates
|
|
520
|
+
m.dates = dates
|
|
650
521
|
}
|
|
651
522
|
if (numbers.length > 0) {
|
|
652
|
-
m.numbers = numbers
|
|
523
|
+
m.numbers = numbers
|
|
653
524
|
}
|
|
654
|
-
return m
|
|
525
|
+
return m
|
|
655
526
|
}
|
|
656
|
-
exports.buildMetadata = buildMetadata
|
|
657
|
-
var _datereg =
|
|
658
|
-
var _re = /-?\d
|
|
527
|
+
exports.buildMetadata = buildMetadata
|
|
528
|
+
var _datereg = "/Date("
|
|
529
|
+
var _re = /-?\d+/
|
|
659
530
|
function toDate(v) {
|
|
660
531
|
if (!v) {
|
|
661
|
-
return null
|
|
532
|
+
return null
|
|
662
533
|
}
|
|
663
534
|
if (v instanceof Date) {
|
|
664
|
-
return v
|
|
665
|
-
} else if (typeof v ===
|
|
666
|
-
return new Date(v)
|
|
535
|
+
return v
|
|
536
|
+
} else if (typeof v === "number") {
|
|
537
|
+
return new Date(v)
|
|
667
538
|
}
|
|
668
|
-
var i = v.indexOf(_datereg)
|
|
539
|
+
var i = v.indexOf(_datereg)
|
|
669
540
|
if (i >= 0) {
|
|
670
|
-
var m = _re.exec(v)
|
|
541
|
+
var m = _re.exec(v)
|
|
671
542
|
if (m !== null) {
|
|
672
|
-
var d = parseInt(m[0], 10)
|
|
673
|
-
return new Date(d)
|
|
543
|
+
var d = parseInt(m[0], 10)
|
|
544
|
+
return new Date(d)
|
|
674
545
|
} else {
|
|
675
|
-
return null
|
|
546
|
+
return null
|
|
676
547
|
}
|
|
677
548
|
} else {
|
|
678
549
|
if (isNaN(v)) {
|
|
679
|
-
return new Date(v)
|
|
550
|
+
return new Date(v)
|
|
680
551
|
} else {
|
|
681
|
-
var d = parseInt(v, 10)
|
|
682
|
-
return new Date(d)
|
|
552
|
+
var d = parseInt(v, 10)
|
|
553
|
+
return new Date(d)
|
|
683
554
|
}
|
|
684
555
|
}
|
|
685
556
|
}
|
|
686
557
|
function format(obj, dates, nums) {
|
|
687
|
-
var o = obj
|
|
558
|
+
var o = obj
|
|
688
559
|
if (dates && dates.length > 0) {
|
|
689
560
|
for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
|
|
690
|
-
var s = dates_1[_i]
|
|
691
|
-
var v = o[s]
|
|
561
|
+
var s = dates_1[_i]
|
|
562
|
+
var v = o[s]
|
|
692
563
|
if (v) {
|
|
693
564
|
if (v instanceof Date) {
|
|
694
|
-
continue
|
|
565
|
+
continue
|
|
695
566
|
}
|
|
696
|
-
if (typeof v ===
|
|
697
|
-
var d = toDate(v)
|
|
567
|
+
if (typeof v === "string" || typeof v === "number") {
|
|
568
|
+
var d = toDate(v)
|
|
698
569
|
if (d) {
|
|
699
|
-
if (!(d instanceof Date) || d.toString() ===
|
|
700
|
-
delete o[s]
|
|
570
|
+
if (!(d instanceof Date) || d.toString() === "Invalid Date") {
|
|
571
|
+
delete o[s]
|
|
701
572
|
} else {
|
|
702
|
-
o[s] = d
|
|
573
|
+
o[s] = d
|
|
703
574
|
}
|
|
704
575
|
}
|
|
705
|
-
} else if (typeof v ===
|
|
706
|
-
var keys = Object.keys(v)
|
|
576
|
+
} else if (typeof v === "object") {
|
|
577
|
+
var keys = Object.keys(v)
|
|
707
578
|
for (var _a = 0, keys_4 = keys; _a < keys_4.length; _a++) {
|
|
708
|
-
var key = keys_4[_a]
|
|
709
|
-
var v2 = v[key]
|
|
579
|
+
var key = keys_4[_a]
|
|
580
|
+
var v2 = v[key]
|
|
710
581
|
if (v2 instanceof Date) {
|
|
711
|
-
continue
|
|
582
|
+
continue
|
|
712
583
|
}
|
|
713
|
-
if (typeof v2 ===
|
|
714
|
-
var d2 = toDate(v2)
|
|
584
|
+
if (typeof v2 === "string" || typeof v2 === "number") {
|
|
585
|
+
var d2 = toDate(v2)
|
|
715
586
|
if (d2) {
|
|
716
|
-
if (!(d2 instanceof Date) || d2.toString() ===
|
|
717
|
-
delete v[key]
|
|
587
|
+
if (!(d2 instanceof Date) || d2.toString() === "Invalid Date") {
|
|
588
|
+
delete v[key]
|
|
718
589
|
} else {
|
|
719
|
-
v[key] = d2
|
|
590
|
+
v[key] = d2
|
|
720
591
|
}
|
|
721
592
|
}
|
|
722
593
|
}
|
|
@@ -727,42 +598,42 @@ function format(obj, dates, nums) {
|
|
|
727
598
|
}
|
|
728
599
|
if (nums && nums.length > 0) {
|
|
729
600
|
for (var _b = 0, nums_1 = nums; _b < nums_1.length; _b++) {
|
|
730
|
-
var s = nums_1[_b]
|
|
731
|
-
var v = o[s]
|
|
601
|
+
var s = nums_1[_b]
|
|
602
|
+
var v = o[s]
|
|
732
603
|
if (v) {
|
|
733
604
|
if (v instanceof Date) {
|
|
734
|
-
delete o[s]
|
|
735
|
-
continue
|
|
605
|
+
delete o[s]
|
|
606
|
+
continue
|
|
736
607
|
}
|
|
737
|
-
if (typeof v ===
|
|
738
|
-
continue
|
|
608
|
+
if (typeof v === "number") {
|
|
609
|
+
continue
|
|
739
610
|
}
|
|
740
|
-
if (typeof v ===
|
|
611
|
+
if (typeof v === "string") {
|
|
741
612
|
if (!isNaN(v)) {
|
|
742
|
-
delete o[s]
|
|
743
|
-
continue
|
|
613
|
+
delete o[s]
|
|
614
|
+
continue
|
|
744
615
|
} else {
|
|
745
|
-
var i = parseFloat(v)
|
|
746
|
-
o[s] = i
|
|
616
|
+
var i = parseFloat(v)
|
|
617
|
+
o[s] = i
|
|
747
618
|
}
|
|
748
|
-
} else if (typeof v ===
|
|
749
|
-
var keys = Object.keys(v)
|
|
619
|
+
} else if (typeof v === "object") {
|
|
620
|
+
var keys = Object.keys(v)
|
|
750
621
|
for (var _c = 0, keys_5 = keys; _c < keys_5.length; _c++) {
|
|
751
|
-
var key = keys_5[_c]
|
|
752
|
-
var v2 = v[key]
|
|
622
|
+
var key = keys_5[_c]
|
|
623
|
+
var v2 = v[key]
|
|
753
624
|
if (v2 instanceof Date) {
|
|
754
|
-
delete o[key]
|
|
755
|
-
continue
|
|
625
|
+
delete o[key]
|
|
626
|
+
continue
|
|
756
627
|
}
|
|
757
|
-
if (typeof v2 ===
|
|
758
|
-
continue
|
|
628
|
+
if (typeof v2 === "number") {
|
|
629
|
+
continue
|
|
759
630
|
}
|
|
760
|
-
if (typeof v2 ===
|
|
631
|
+
if (typeof v2 === "string") {
|
|
761
632
|
if (!isNaN(v2)) {
|
|
762
|
-
delete v[key]
|
|
633
|
+
delete v[key]
|
|
763
634
|
} else {
|
|
764
|
-
var i = parseFloat(v2)
|
|
765
|
-
v[key] = i
|
|
635
|
+
var i = parseFloat(v2)
|
|
636
|
+
v[key] = i
|
|
766
637
|
}
|
|
767
638
|
}
|
|
768
639
|
}
|
|
@@ -770,25 +641,25 @@ function format(obj, dates, nums) {
|
|
|
770
641
|
}
|
|
771
642
|
}
|
|
772
643
|
}
|
|
773
|
-
return o
|
|
644
|
+
return o
|
|
774
645
|
}
|
|
775
|
-
exports.format = format
|
|
646
|
+
exports.format = format
|
|
776
647
|
function getMetadataFunc(viewService, dates, numbers, keys) {
|
|
777
|
-
var m = { dates: dates, numbers: numbers }
|
|
648
|
+
var m = { dates: dates, numbers: numbers }
|
|
778
649
|
if ((m.dates && m.dates.length > 0) || (m.numbers && m.numbers.length > 0)) {
|
|
779
|
-
return m
|
|
650
|
+
return m
|
|
780
651
|
}
|
|
781
652
|
if (keys) {
|
|
782
653
|
if (!Array.isArray(keys)) {
|
|
783
|
-
return buildMetadata(keys)
|
|
654
|
+
return buildMetadata(keys)
|
|
784
655
|
}
|
|
785
656
|
}
|
|
786
|
-
if (typeof viewService !==
|
|
787
|
-
var metadata = viewService.metadata()
|
|
657
|
+
if (typeof viewService !== "function" && viewService.metadata) {
|
|
658
|
+
var metadata = viewService.metadata()
|
|
788
659
|
if (metadata) {
|
|
789
|
-
return buildMetadata(metadata)
|
|
660
|
+
return buildMetadata(metadata)
|
|
790
661
|
}
|
|
791
662
|
}
|
|
792
|
-
return undefined
|
|
663
|
+
return undefined
|
|
793
664
|
}
|
|
794
|
-
exports.getMetadataFunc = getMetadataFunc
|
|
665
|
+
exports.getMetadataFunc = getMetadataFunc
|