@player-ui/common-expressions-plugin 0.3.0-next.2 → 0.3.0-next.4

package/dist/index.cjs.js

@@ -3,8 +3,21 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var expressionPlugin = require('@player-ui/expression-plugin');
-var expressions = require('@player-ui/expressions');
-var utils = require('@player-ui/utils');
+var player = require('@player-ui/player');
+
+function toNum(val, coerceTo0) {
+  if (typeof val === "number") {
+    return val;
+  }
+  if (typeof val === "string" && val.length > 0) {
+    let newVal = val.trim();
+    newVal = newVal.replace(/,/g, "");
+    newVal = newVal.replace(/[¥£$€]/, "");
+    const nVal = Number(newVal);
+    return newVal.match(/^0[xbo]/i) || isNaN(nVal) ? void 0 : nVal;
+  }
+  return coerceTo0 ? 0 : void 0;
+}
 
 function ifString(fn) {
   return (arg) => {
@@ -14,7 +27,7 @@ function ifString(fn) {
     return arg;
   };
 }
-const size = expressions.withoutContext((val) => {
+const size = player.withoutContext((val) => {
   if (typeof val === "string") {
     return val.length;
   }
@@ -36,42 +49,42 @@ const isEmpty = (ctx, val) => {
 const isNotEmpty = (ctx, val) => {
   return !isEmpty(ctx, val);
 };
-const concat = expressions.withoutContext((...args) => {
+const concat = player.withoutContext((...args) => {
   if (args.every((v) => Array.isArray(v))) {
     const arrayArgs = args;
     return arrayArgs.reduce((merged, next) => [...merged, ...next]);
   }
   return args.reduce((merged, next) => merged + (next != null ? next : ""), "");
 });
-const trim = expressions.withoutContext(ifString((str) => str.trim()));
-const upperCase = expressions.withoutContext(ifString((str) => str.toUpperCase()));
-const lowerCase = expressions.withoutContext(ifString((str) => str.toLowerCase()));
-const replace = expressions.withoutContext((str, pattern, replacement = "") => {
+const trim = player.withoutContext(ifString((str) => str.trim()));
+const upperCase = player.withoutContext(ifString((str) => str.toUpperCase()));
+const lowerCase = player.withoutContext(ifString((str) => str.toLowerCase()));
+const replace = player.withoutContext((str, pattern, replacement = "") => {
   if (typeof str === "string" && typeof pattern === "string" && typeof replacement === "string") {
     const replacementRegex = new RegExp(pattern, "g");
     return str.replace(replacementRegex, replacement);
   }
   return str;
 });
-const titleCase = expressions.withoutContext(ifString((str) => str.split(" ").map((word) => word[0].toUpperCase() + word.slice(1)).join(" ")));
-const sentenceCase = expressions.withoutContext(ifString((str) => str.replace(/\b[a-zA-Z]/, (word) => word.toUpperCase())));
-const number = expressions.withoutContext(utils.toNum);
-const round = expressions.withoutContext((num) => {
+const titleCase = player.withoutContext(ifString((str) => str.split(" ").map((word) => word[0].toUpperCase() + word.slice(1)).join(" ")));
+const sentenceCase = player.withoutContext(ifString((str) => str.replace(/\b[a-zA-Z]/, (word) => word.toUpperCase())));
+const number = player.withoutContext(toNum);
+const round = player.withoutContext((num) => {
   var _a;
-  return Math.round((_a = utils.toNum(num, true)) != null ? _a : 0);
+  return Math.round((_a = toNum(num, true)) != null ? _a : 0);
 });
-const floor = expressions.withoutContext((num) => {
+const floor = player.withoutContext((num) => {
   var _a;
-  return Math.floor((_a = utils.toNum(num, true)) != null ? _a : 0);
+  return Math.floor((_a = toNum(num, true)) != null ? _a : 0);
 });
-const ceil = expressions.withoutContext((num) => {
+const ceil = player.withoutContext((num) => {
   var _a;
-  return Math.ceil((_a = utils.toNum(num, true)) != null ? _a : 0);
+  return Math.ceil((_a = toNum(num, true)) != null ? _a : 0);
 });
-const sum = expressions.withoutContext((...args) => {
+const sum = player.withoutContext((...args) => {
   return args.reduce((s, next) => {
     var _a;
-    return s + ((_a = utils.toNum(next)) != null ? _a : 0);
+    return s + ((_a = toNum(next)) != null ? _a : 0);
   }, 0);
 });
 const findPropertyIndex = (context, bindingOrModel, propToCheck, valueToCheck) => {
@@ -102,7 +115,7 @@ const findProperty = (context, bindingOrModel, propToCheck, valueToCheck, propTo
   }
   return foundValue;
 };
-const containsAny = expressions.withoutContext((str, keywords) => {
+const containsAny = player.withoutContext((str, keywords) => {
   if (!(typeof str === "string") || !(typeof keywords === "string" || Array.isArray(keywords))) {
     return false;
   }

package/dist/index.esm.js

@@ -1,6 +1,19 @@
 import { ExpressionPlugin } from '@player-ui/expression-plugin';
-import { withoutContext } from '@player-ui/expressions';
-import { toNum } from '@player-ui/utils';
+import { withoutContext } from '@player-ui/player';
+
+function toNum(val, coerceTo0) {
+  if (typeof val === "number") {
+    return val;
+  }
+  if (typeof val === "string" && val.length > 0) {
+    let newVal = val.trim();
+    newVal = newVal.replace(/,/g, "");
+    newVal = newVal.replace(/[¥£$€]/, "");
+    const nVal = Number(newVal);
+    return newVal.match(/^0[xbo]/i) || isNaN(nVal) ? void 0 : nVal;
+  }
+  return coerceTo0 ? 0 : void 0;
+}
 
 function ifString(fn) {
   return (arg) => {

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@player-ui/common-expressions-plugin",
-  "version": "0.3.0-next.2",
+  "version": "0.3.0-next.4",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "@player-ui/player": "0.3.0-next.2"
+    "@player-ui/player": "0.3.0-next.4"
   },
   "dependencies": {
-    "@player-ui/utils": "0.3.0-next.2",
-    "@player-ui/expression-plugin": "0.3.0-next.2",
+    "@player-ui/expression-plugin": "0.3.0-next.4",
     "@babel/runtime": "7.15.4"
   },
   "main": "dist/index.cjs.js",

package/src/expressions/index.ts

@@ -2,9 +2,9 @@ import type {
   ExpressionHandler,
   ExpressionContext,
 } from '@player-ui/expressions';
-import { withoutContext } from '@player-ui/expressions';
-import { toNum } from '@player-ui/utils';
+import { withoutContext } from '@player-ui/player';
 import type { Binding } from '@player-ui/types';
+import { toNum } from './toNum';
 
 /** Returns a function that executes the given function only if the first argument is a string */
 function ifString(fn: (arg: string) => unknown) {

package/src/expressions/toNum.ts

@@ -0,0 +1,23 @@
+/**
+ * Convert a string that might contain formatting (such as commas and a currency symbol) to a number
+ */
+export function toNum(val: unknown, coerceTo0?: boolean): number | undefined {
+  if (typeof val === 'number') {
+    return val;
+  }
+
+  if (typeof val === 'string' && val.length > 0) {
+    // Trim whitespace
+    let newVal = val.trim();
+    // Remove all commas
+    newVal = newVal.replace(/,/g, '');
+    // Remove up to 1 commonly-used currency symbol
+    newVal = newVal.replace(/[¥£$€]/, '');
+    const nVal = Number(newVal);
+
+    // ignore hex, binary, octal, and values that don't parse
+    return newVal.match(/^0[xbo]/i) || isNaN(nVal) ? undefined : nVal;
+  }
+
+  return coerceTo0 ? 0 : undefined;
+}