@dra2020/baseclient 1.0.146 → 1.0.148

package/dist/geo/geo.d.ts

@@ -20,6 +20,8 @@ export interface NormalizeOptions {
     checkRewind?: boolean;
     ensureID?: boolean;
 }
+export declare function applyCanonicalID(col: GeoFeatureCollection): void;
+export declare function isValidId(col: GeoFeatureCollection): boolean;
 export declare function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOptions): void;
 export declare function geoNormalizeFeature(f: any, options?: NormalizeOptions): GeoFeature;
 export declare function geoNormalizeCollection(col: GeoFeatureCollection, options?: NormalizeOptions): GeoFeatureCollection;

package/lib/detail/detail.ts

@@ -14,8 +14,8 @@
 import * as Util from '../util/all';
 //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 = /^['"]/;
 
@@ -73,10 +73,12 @@ class Evaluator
       let safenames = names.map(n => namemap[n]);
 
       // Replace valid identifiers with safe version
-      safeexpr = safeexpr.replace(reIdentifierOrString,
+      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
@@ -87,9 +89,12 @@ class Evaluator
                                     });
 
       // Remove any identifiers that aren't the simple parameters to prevent out-of-sandbox execution
-      safeexpr = safeexpr.replace(reIdentifierOrString,
+      safeexpr = safeexpr.replace(reIdentifierOrStringOrNumber,
                                   (match) => {
-                                      let valid = reParam.test(match) || match === '__format' || reString.test(match);
+                                      let valid = reParam.test(match)
+                                                  || match === '__format'
+                                                  || reString.test(match)
+                                                  || reNumber.test(match);
                                       if (valid)
                                         return match;
                                       else

package/lib/geo/geo.ts

@@ -44,6 +44,27 @@ export interface NormalizeOptions
 }
 const NormalizeAll: NormalizeOptions = { joinPolygons: true, checkRewind: true, ensureID: true };
 
+export function applyCanonicalID(col: GeoFeatureCollection): void
+{
+  if (col && Array.isArray(col.features))
+    col.features.forEach((f: GeoFeature, n: number) => { f.properties.id = String(n+1) });
+}
+
+export function isValidId(col: GeoFeatureCollection): boolean
+{
+  if (! col || ! Array.isArray(col.features)) return true;
+
+  let set = new Set<string>();
+  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;
+}
+
 // set the canonical 'id' property from the best property value.
 // if joinPolygons is true, we do not enforce uniqueness.
 //
@@ -58,7 +79,6 @@ export function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOption
   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)
@@ -71,12 +91,13 @@ export function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOption
           }
       });
     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++) });
+      col.features.forEach(f => { f.properties.id = f.properties[prop] });
+      if (! isValidId(col))
+        applyCanonicalID(col);
     }
+    else
+      applyCanonicalID(col);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.146",
+  "version": "1.0.148",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",