@dra2020/baseclient 1.0.145 → 1.0.147

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 {
@@ -12044,7 +12049,7 @@ function deepEqual(o1, o2, options) {
         if (o1.hasOwnProperty(p)) {
             if (options && options.omitKey && options.omitKey[p])
                 continue;
-            if (o2[p] === undefined)
+            if (o2[p] === undefined && o1[p] !== undefined)
                 return false;
             if (!deepEqual(o1[p], o2[p], options))
                 return false;
@@ -12054,7 +12059,7 @@ function deepEqual(o1, o2, options) {
         if (o2.hasOwnProperty(p)) {
             if (options && options.omitKey && options.omitKey[p])
                 continue;
-            if (o1[p] === undefined)
+            if (o1[p] === undefined && o2[p] !== undefined)
                 return false;
         }
     return true;