@esri/hub-common 14.54.0 → 14.54.1
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/dist/esm/core/schemas/internal/metrics/editorToMetric.js +10 -4
- package/dist/esm/core/schemas/internal/metrics/editorToMetric.js.map +1 -1
- package/dist/esm/util.js +4 -0
- package/dist/esm/util.js.map +1 -1
- package/dist/node/core/schemas/internal/metrics/editorToMetric.js +10 -4
- package/dist/node/core/schemas/internal/metrics/editorToMetric.js.map +1 -1
- package/dist/node/util.js +4 -0
- package/dist/node/util.js.map +1 -1
- package/package.json +1 -1
|
@@ -68,7 +68,12 @@ export function buildWhereClause(expressionSet = []) {
|
|
|
68
68
|
return (expressionSet
|
|
69
69
|
.map((expression) => {
|
|
70
70
|
const { field, values, relationship } = expression;
|
|
71
|
-
const escape = (value) =>
|
|
71
|
+
const escape = (value) => {
|
|
72
|
+
// Ensure that the value has a .replace method
|
|
73
|
+
// We encountered a case where the value was an empty object (unclear how this happened)
|
|
74
|
+
// and it caused the site to go into an infinite loop and crash. This is a safeguard.
|
|
75
|
+
return value.replace && value.replace(/(['])/g, "$1$1"); // currently only handles single quotes
|
|
76
|
+
};
|
|
72
77
|
// if we don't have values or field, or if it is an "incomplete" expression, do not include
|
|
73
78
|
if (!values || !values.length || !field || !field.name) {
|
|
74
79
|
return false;
|
|
@@ -86,15 +91,16 @@ export function buildWhereClause(expressionSet = []) {
|
|
|
86
91
|
break;
|
|
87
92
|
case "esriFieldTypeDate":
|
|
88
93
|
// just the second bounding value
|
|
89
|
-
if (
|
|
94
|
+
if (typeof values[0] === "string") {
|
|
90
95
|
clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00'`;
|
|
91
96
|
}
|
|
92
97
|
// just the first bounding value
|
|
93
|
-
if (
|
|
98
|
+
if (typeof values[1] === "string") {
|
|
94
99
|
clause = `${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
|
|
95
100
|
}
|
|
96
101
|
// if we have both, rewrite clause
|
|
97
|
-
if (
|
|
102
|
+
if (typeof values[0] === "string" &&
|
|
103
|
+
typeof values[1] === "string") {
|
|
98
104
|
clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00' AND ${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
|
|
99
105
|
}
|
|
100
106
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAIL,uBAAuB,GAIxB,MAAM,wBAAwB,CAAC;AAGhC;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,SAA8B;IAC5B,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,SAAS;CACpB,EACD,QAAgB,EAChB,IAAwD;IAExD,MAAM,EAAE,KAAK,EAAE,aAAa,KAAgB,MAAM,EAAjB,MAAM,UAAK,MAAM,EAA5C,0BAAmC,CAAS,CAAC;IACnD,MAAM,EACJ,OAAO,EACP,KAAK,EACL,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,WAAW,GACZ,GAAG,aAAa,IAAI,EAAE,CAAC;IACxB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAE9C,gBAAgB;IAChB,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,eAAe;YACrB,UAAU;YACV,OAAO;YACP,KAAK;YACL,SAAS,EAAE,SAA+B;YAC1C,KAAK,EAAE,WAAW;gBAChB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9D;QACH,CAAC,CAAC;YACE,IAAI,EAAE,cAAc;YACpB,KAAK;SACN,CAAC;IAER,gBAAgB;IAChB,MAAM,MAAM,GAAY;QACtB,MAAM;QACN,IAAI,EAAE,UAAU,IAAI,QAAQ;QAC5B,UAAU,EAAE,UAAU,IAAI;YACxB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;SAChB;QACD,EAAE,EAAE,QAAQ;KACb,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC;IAErB,qBAAqB;IACrB,MAAM,aAAa,mCACd,MAAM,KACT,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,WAAW,EAC9C,QAAQ;QACR,SAAS;QACT,SAAS;QACT,mEAAmE;QACnE,4DAA4D;QAC5D,UAAU,EACR,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAC1E,WAAW,EACT,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,MAAM,CAAC,WAAW,EACxB,SAAS,EACP,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,GACzE,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACnC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAAC,gBAA+B,EAAE;IAChE,OAAO,CACL,aAAa;SACV,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;QAEnD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,uCAAuC;
|
|
1
|
+
{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/util.js
CHANGED
|
@@ -18,6 +18,10 @@ export function cloneObject(obj) {
|
|
|
18
18
|
clone = obj.map(cloneObject);
|
|
19
19
|
}
|
|
20
20
|
else if (typeof obj === "object") {
|
|
21
|
+
// allow nulls to carry through
|
|
22
|
+
if (obj === null) {
|
|
23
|
+
return obj;
|
|
24
|
+
}
|
|
21
25
|
for (const i in obj) {
|
|
22
26
|
if (obj.hasOwnProperty(i)) {
|
|
23
27
|
const value = obj[i];
|
package/dist/esm/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,12 @@ function buildWhereClause(expressionSet = []) {
|
|
|
72
72
|
return (expressionSet
|
|
73
73
|
.map((expression) => {
|
|
74
74
|
const { field, values, relationship } = expression;
|
|
75
|
-
const escape = (value) =>
|
|
75
|
+
const escape = (value) => {
|
|
76
|
+
// Ensure that the value has a .replace method
|
|
77
|
+
// We encountered a case where the value was an empty object (unclear how this happened)
|
|
78
|
+
// and it caused the site to go into an infinite loop and crash. This is a safeguard.
|
|
79
|
+
return value.replace && value.replace(/(['])/g, "$1$1"); // currently only handles single quotes
|
|
80
|
+
};
|
|
76
81
|
// if we don't have values or field, or if it is an "incomplete" expression, do not include
|
|
77
82
|
if (!values || !values.length || !field || !field.name) {
|
|
78
83
|
return false;
|
|
@@ -90,15 +95,16 @@ function buildWhereClause(expressionSet = []) {
|
|
|
90
95
|
break;
|
|
91
96
|
case "esriFieldTypeDate":
|
|
92
97
|
// just the second bounding value
|
|
93
|
-
if (
|
|
98
|
+
if (typeof values[0] === "string") {
|
|
94
99
|
clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00'`;
|
|
95
100
|
}
|
|
96
101
|
// just the first bounding value
|
|
97
|
-
if (
|
|
102
|
+
if (typeof values[1] === "string") {
|
|
98
103
|
clause = `${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
|
|
99
104
|
}
|
|
100
105
|
// if we have both, rewrite clause
|
|
101
|
-
if (
|
|
106
|
+
if (typeof values[0] === "string" &&
|
|
107
|
+
typeof values[1] === "string") {
|
|
102
108
|
clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00' AND ${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
|
|
103
109
|
}
|
|
104
110
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,oDAQgC;AAGhC;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,SAA8B;IAC5B,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,SAAS;CACpB,EACD,QAAgB,EAChB,IAAwD;IAExD,MAAM,EAAE,KAAK,EAAE,aAAa,KAAgB,MAAM,EAAjB,MAAM,kBAAK,MAAM,EAA5C,0BAAmC,CAAS,CAAC;IACnD,MAAM,EACJ,OAAO,EACP,KAAK,EACL,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,WAAW,GACZ,GAAG,aAAa,IAAI,EAAE,CAAC;IACxB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAE9C,gBAAgB;IAChB,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,eAAe;YACrB,UAAU;YACV,OAAO;YACP,KAAK;YACL,SAAS,EAAE,SAA+B;YAC1C,KAAK,EAAE,WAAW;gBAChB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9D;QACH,CAAC,CAAC;YACE,IAAI,EAAE,cAAc;YACpB,KAAK;SACN,CAAC;IAER,gBAAgB;IAChB,MAAM,MAAM,GAAY;QACtB,MAAM;QACN,IAAI,EAAE,UAAU,IAAI,QAAQ;QAC5B,UAAU,EAAE,UAAU,IAAI;YACxB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;SAChB;QACD,EAAE,EAAE,QAAQ;KACb,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC;IAErB,qBAAqB;IACrB,MAAM,aAAa,mCACd,MAAM,KACT,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,WAAW,EAC9C,QAAQ;QACR,SAAS;QACT,SAAS;QACT,mEAAmE;QACnE,4DAA4D;QAC5D,UAAU,EACR,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAC1E,WAAW,EACT,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,MAAM,CAAC,WAAW,EACxB,SAAS,EACP,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,GACzE,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACnC,CAAC;AA3ED,wCA2EC;AAED;;;;;;;;;GASG;AACH,SAAgB,gBAAgB,CAAC,gBAA+B,EAAE;IAChE,OAAO,CACL,aAAa;SACV,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;QAEnD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,uCAAuC;
|
|
1
|
+
{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":"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"}
|
package/dist/node/util.js
CHANGED
|
@@ -21,6 +21,10 @@ function cloneObject(obj) {
|
|
|
21
21
|
clone = obj.map(cloneObject);
|
|
22
22
|
}
|
|
23
23
|
else if (typeof obj === "object") {
|
|
24
|
+
// allow nulls to carry through
|
|
25
|
+
if (obj === null) {
|
|
26
|
+
return obj;
|
|
27
|
+
}
|
|
24
28
|
for (const i in obj) {
|
|
25
29
|
if (obj.hasOwnProperty(i)) {
|
|
26
30
|
const value = obj[i];
|
package/dist/node/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;AAAA;gBACgB;AAChB,iDAA6C;AAE7C;;;;;;;;;GASG;AACH,SAAgB,WAAW,CAAI,GAAM;IACnC,IAAI,KAAK,GAA6B,EAAE,CAAC;IACzC,oBAAoB;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KAC9B;SAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAClC,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACnB,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;gBACzB,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9C,IAAI,KAAK,YAAY,IAAI,EAAE;wBACzB,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;qBACtC;yBAAM,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,KAAK,YAAY,IAAI,EAAE;wBAC/D,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;qBACpD;yBAAM;wBACL,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;qBAC/B;iBACF;qBAAM;oBACL,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;iBAClB;aACF;SACF;KACF;SAAM;QACL,KAAK,GAAG,GAAG,CAAC;KACb;IACD,OAAO,KAAU,CAAC;AACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|