@player-ui/common-types-plugin 0.4.0-next.7 → 0.4.0-next.9

package/dist/index.esm.js

@@ -1,4 +1,5 @@
 import { TypesProviderPlugin } from '@player-ui/types-provider-plugin';
+import { resolveDataRefs } from '@player-ui/player';
 
 const EMAIL_REGEX = /^((([a-z]|\d|[!#$%&'*+\-/=?^_`{|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#$%&'*+-/=?^_`{|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i;
 const PHONE_REGEX = /^\+?[1]?[- ]?\(?\d{3}[)\- ]?\s?\d{3}[ -]?\d{4}$/;
@@ -76,8 +77,9 @@ const regex = skipNullish((context, value, options) => {
   if (value === void 0 || value === null || value === "" || typeof (options == null ? void 0 : options.regex) !== "string") {
     return;
   }
-  const patternMatch = options.regex.match(/^\/(.*)\/(\w)*$/);
-  const regexp = patternMatch ? new RegExp(patternMatch[1], patternMatch[2]) : new RegExp(options.regex);
+  const resolvedRegex = resolveDataRefs(options.regex, context);
+  const patternMatch = resolvedRegex.match(/^\/(.*)\/(\w)*$/);
+  const regexp = patternMatch ? new RegExp(patternMatch[1], patternMatch[2]) : new RegExp(resolvedRegex);
   if (!regexp.test(value)) {
     const message = context.constants.getConstants("validation.regex", "constants", "Invalid entry");
     return { message };
@@ -338,9 +340,22 @@ var dataTypes = /*#__PURE__*/Object.freeze({
 
 const PLACEHOLDER = "#";
 const removeFormatCharactersFromMaskedString = (value, mask, reserved = [PLACEHOLDER]) => {
+  const reservedMatchesLength = mask.split("").filter((val) => reserved.includes(val)).length;
+  let replacements = 0;
   return value.split("").reduce((newString, nextChar, nextIndex) => {
     const maskedVal = mask[nextIndex];
+    if (maskedVal === void 0) {
+      return newString;
+    }
+    if (reservedMatchesLength === replacements) {
+      return newString;
+    }
     if (reserved.includes(maskedVal)) {
+      replacements++;
+      return newString + nextChar;
+    }
+    if (maskedVal !== nextChar) {
+      replacements++;
       return newString + nextChar;
     }
     return newString;
@@ -419,7 +434,7 @@ const createMaskedNumericFormatter = (name, mask) => {
           return usingExceptions;
         }
       }
-      return removeFormatCharactersFromMaskedString(value, mask);
+      return formatAsMasked(value, /\d/g, mask.replace(/[^#]/g, ""));
     }
   };
 };

package/dist/xlr/BooleanType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "BooleanType",
     "type": "object",
     "properties": {

package/dist/xlr/CollectionType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "CollectionType",
     "type": "object",
     "properties": {

package/dist/xlr/DateType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "DateType",
     "type": "object",
     "properties": {

package/dist/xlr/IntegerNNType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "IntegerNNType",
     "type": "object",
     "properties": {

package/dist/xlr/IntegerPosType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "IntegerPosType",
     "type": "object",
     "properties": {

package/dist/xlr/IntegerType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "IntegerType",
     "type": "object",
     "properties": {

package/dist/xlr/PhoneType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "PhoneType",
     "type": "object",
     "properties": {

package/dist/xlr/StringType.json

@@ -1,5 +1,5 @@
 {
-    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2654/execroot/player/plugins/common-types/core/src/data-types/types.ts",
+    "source": "/home/circleci/.cache/bazel/_bazel_circleci/e8362d362e14c7d23506d1dfa3aea8b8/sandbox/processwrapper-sandbox/2395/execroot/player/plugins/common-types/core/src/data-types/types.ts",
     "name": "StringType",
     "type": "object",
     "properties": {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@player-ui/common-types-plugin",
-  "version": "0.4.0-next.7",
+  "version": "0.4.0-next.9",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "@player-ui/player": "0.4.0-next.7"
+    "@player-ui/player": "0.4.0-next.9"
   },
   "dependencies": {
-    "@player-ui/types-provider-plugin": "0.4.0-next.7",
+    "@player-ui/types-provider-plugin": "0.4.0-next.9",
     "@babel/runtime": "7.15.4"
   },
   "main": "dist/index.cjs.js",
@@ -53,6 +53,14 @@
     {
       "name": "Kelly Harrop",
       "url": "https://github.com/kharrop"
+    },
+    {
+      "name": "Alejandro Fimbres",
+      "url": "https://github.com/lexfm"
+    },
+    {
+      "name": "Rafael Campos",
+      "url": "https://github.com/rafbcampos"
     }
   ],
   "bundle": "./dist/common-types-plugin.prod.js"

package/src/formats/utils.ts

@@ -17,10 +17,34 @@ export const removeFormatCharactersFromMaskedString = (
   mask: string,
   reserved: string[] = [PLACEHOLDER]
 ): string => {
+  const reservedMatchesLength = mask
+    .split('')
+    .filter((val) => reserved.includes(val)).length;
+  let replacements = 0;
+
   return value.split('').reduce((newString, nextChar, nextIndex) => {
     const maskedVal = mask[nextIndex];
 
+    if (maskedVal === undefined) {
+      return newString;
+    }
+
+    if (reservedMatchesLength === replacements) {
+      return newString;
+    }
+
     if (reserved.includes(maskedVal)) {
+      replacements++;
+      return newString + nextChar;
+    }
+
+    /**
+     * Characters will match when the incoming value is formatted, but in cases
+     * where it's being pulled from the model and deformatted again, ensure we
+     * don't skip over characters.
+     */
+    if (maskedVal !== nextChar) {
+      replacements++;
       return newString + nextChar;
     }
 
@@ -186,7 +210,7 @@ export const createMaskedNumericFormatter = (
         }
       }
 
-      return removeFormatCharactersFromMaskedString(value, mask);
+      return formatAsMasked(value, /\d/g, mask.replace(/[^#]/g, ''));
     },
   };
 };

package/src/validators/index.ts

@@ -1,4 +1,5 @@
 import type { Expression } from '@player-ui/types';
+import { resolveDataRefs } from '@player-ui/player';
 import type { ValidatorFunction } from '@player-ui/player';
 
 // Shamelessly lifted from Scott Gonzalez via the Bassistance Validation plugin http://projects.scottsplayground.com/email_address_validation/
@@ -177,12 +178,13 @@ export const regex: ValidatorFunction<{
     return;
   }
 
+  const resolvedRegex = resolveDataRefs(options.regex, context);
   // Split up /pattern/flags into [pattern, flags]
-  const patternMatch = options.regex.match(/^\/(.*)\/(\w)*$/);
+  const patternMatch = resolvedRegex.match(/^\/(.*)\/(\w)*$/);
 
   const regexp = patternMatch
     ? new RegExp(patternMatch[1], patternMatch[2])
-    : new RegExp(options.regex);
+    : new RegExp(resolvedRegex);
 
   if (!regexp.test(value)) {
     const message = context.constants.getConstants(