@player-ui/common-types-plugin 0.4.0 → 0.4.1-next.0

package/src/index.ts

@@ -1,10 +1,20 @@
-import type { Player, PlayerPlugin } from '@player-ui/player';
+import type { Player, ExtendedPlayerPlugin } from '@player-ui/player';
 import { TypesProviderPlugin } from '@player-ui/types-provider-plugin';
 
 import * as validators from './validators';
 import * as dataTypes from './data-types/types';
 import * as dataRefs from './data-types/refs';
 import * as formats from './formats';
+import type {
+  BooleanType,
+  IntegerType,
+  IntegerPosType,
+  IntegerNNType,
+  StringType,
+  CollectionType,
+  DateType,
+  PhoneType,
+} from './data-types/types';
 
 export { validators, dataTypes, dataRefs, formats };
 export * from './formats/utils';
@@ -12,7 +22,24 @@ export * from './formats/utils';
 /**
  * Exposes a lot of common DataTypes, validations, and formats to Player instance.
  */
-export class CommonTypesPlugin implements PlayerPlugin {
+export class CommonTypesPlugin
+  implements
+    ExtendedPlayerPlugin<
+      [],
+      [],
+      [],
+      [
+        typeof BooleanType,
+        typeof IntegerType,
+        typeof IntegerPosType,
+        typeof IntegerNNType,
+        typeof StringType,
+        typeof CollectionType,
+        typeof DateType,
+        typeof PhoneType
+      ]
+    >
+{
   name = 'CommonTypes';
 
   apply(player: Player) {

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(