@dra2020/baseclient 1.0.146 → 1.0.148

package/dist/baseclient.js

@@ -1245,8 +1245,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FormatDetail = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 //import { Util } from '@dra2020/baseclient';
-const reIdentifier = /\b[a-zA-Z_$][a-zA-Z0-9_$]*\b/g;
-const reIdentifierOrString = /([a-zA-Z_$][a-zA-Z0-9_$]*)|(['"])(?:(?=(\\?))\3.)*?\2/g;
+const reIdentifierOrStringOrNumber = /([a-zA-Z0-9_$][a-zA-Z0-9_$]*)|(['"])(?:(?=(\\?))\3.)*?\2/g;
+const reNumber = /[0-9][0-9]*/;
 const reParam = /^__\d+$/;
 const reString = /^['"]/;
 // Number format: (locale|general|integer|currency).precision
@@ -1284,9 +1284,11 @@ class Evaluator {
             let safeexpr = this.expr;
             let safenames = names.map(n => namemap[n]);
             // Replace valid identifiers with safe version
-            safeexpr = safeexpr.replace(reIdentifierOrString, (match) => {
+            safeexpr = safeexpr.replace(reIdentifierOrStringOrNumber, (match) => {
                 if (namemap[match])
                     return namemap[match];
+                else if (reNumber.test(match))
+                    return match;
                 else if (match === '__format' || reString.test(match))
                     return match;
                 else {
@@ -1295,8 +1297,11 @@ class Evaluator {
                 }
             });
             // Remove any identifiers that aren't the simple parameters to prevent out-of-sandbox execution
-            safeexpr = safeexpr.replace(reIdentifierOrString, (match) => {
-                let valid = reParam.test(match) || match === '__format' || reString.test(match);
+            safeexpr = safeexpr.replace(reIdentifierOrStringOrNumber, (match) => {
+                let valid = reParam.test(match)
+                    || match === '__format'
+                    || reString.test(match)
+                    || reNumber.test(match);
                 if (valid)
                     return match;
                 else {
@@ -2597,7 +2602,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = exports.hidemapConcat = exports.dumpMetrics = void 0;
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = exports.isValidId = exports.applyCanonicalID = exports.hidemapConcat = exports.dumpMetrics = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
 // Tracing/debugging aid
@@ -2623,6 +2628,26 @@ function hidemapConcat(...args) {
 }
 exports.hidemapConcat = hidemapConcat;
 const NormalizeAll = { joinPolygons: true, checkRewind: true, ensureID: true };
+function applyCanonicalID(col) {
+    if (col && Array.isArray(col.features))
+        col.features.forEach((f, n) => { f.properties.id = String(n + 1); });
+}
+exports.applyCanonicalID = applyCanonicalID;
+function isValidId(col) {
+    if (!col || !Array.isArray(col.features))
+        return true;
+    let set = new Set();
+    for (let i = 0; i < col.features.length; i++) {
+        let f = col.features[i];
+        if (typeof f.properties.id !== 'string')
+            return false; // id must be string
+        if (set.has(f.properties.id))
+            return false; // id must be unique
+        set.add(f.properties.id);
+    }
+    return true;
+}
+exports.isValidId = isValidId;
 // set the canonical 'id' property from the best property value.
 // if joinPolygons is true, we do not enforce uniqueness.
 //
@@ -2632,8 +2657,6 @@ function geoEnsureID(col, options) {
     const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30', 'DISTRICT', 'DISTRICTNO', 'DISTRICTNAME'];
     if (col && col.features && col.features.length > 0) {
         let f = col.features[0];
-        if (f.properties.id !== undefined)
-            return; // short-cut - assume if 'id' is set, we're all good.
         props.forEach(p => {
             if (prop === undefined)
                 if (f.properties[p] !== undefined)
@@ -2644,12 +2667,13 @@ function geoEnsureID(col, options) {
                         prop = p;
                 }
         });
-        if (prop)
+        if (prop) {
             col.features.forEach(f => { f.properties.id = f.properties[prop]; });
-        else {
-            let n = 1;
-            col.features.forEach(f => { f.properties.id = String(n++); });
+            if (!isValidId(col))
+                applyCanonicalID(col);
         }
+        else
+            applyCanonicalID(col);
     }
 }
 exports.geoEnsureID = geoEnsureID;