Common Types Plugin restoring old dataRefs

plugins/common-types/core/src/data-types/types.ts

@@ -1,17 +1,7 @@
 import type { Schema } from '@player-ui/types';
-import {
-  BooleanTypeRef,
-  CollectionTypeRef,
-  DateTypeRef,
-  IntegerPosTypeRef,
-  IntegerTypeRef,
-  PhoneTypeRef,
-  StringTypeRef,
-  IntegerNNTypeRef,
-} from './refs';
 
 export const BooleanType: Schema.DataType<boolean> = {
-  ...BooleanTypeRef,
+  type: 'BooleanType',
   default: false,
   validation: [
     {
@@ -23,7 +13,7 @@ export const BooleanType: Schema.DataType<boolean> = {
 };
 
 export const IntegerType: Schema.DataType<number> = {
-  ...IntegerTypeRef,
+  type: 'IntegerType',
   validation: [
     {
       type: 'integer',
@@ -35,7 +25,7 @@ export const IntegerType: Schema.DataType<number> = {
 };
 
 export const IntegerPosType: Schema.DataType<number> = {
-  ...IntegerPosTypeRef,
+  type: 'IntegerPosType',
   validation: [
     {
       type: 'integer',
@@ -51,7 +41,7 @@ export const IntegerPosType: Schema.DataType<number> = {
 };
 
 export const IntegerNNType: Schema.DataType<number> = {
-  ...IntegerNNTypeRef,
+  type: 'IntegerNNType',
   validation: [
     {
       type: 'integer',
@@ -67,7 +57,7 @@ export const IntegerNNType: Schema.DataType<number> = {
 };
 
 export const StringType: Schema.DataType<string> = {
-  ...StringTypeRef,
+  type: 'StringType',
   default: '',
   validation: [
     {
@@ -80,7 +70,7 @@ export const StringType: Schema.DataType<string> = {
 };
 
 export const CollectionType: Schema.DataType<Array<unknown>> = {
-  ...CollectionTypeRef,
+  type: 'CollectionType',
   validation: [
     {
       type: 'collection',
@@ -89,7 +79,7 @@ export const CollectionType: Schema.DataType<Array<unknown>> = {
 };
 
 export const DateType: Schema.DataType<string> = {
-  ...DateTypeRef,
+  type: 'DateType',
   validation: [
     {
       type: 'string',
@@ -101,7 +91,7 @@ export const DateType: Schema.DataType<string> = {
 };
 
 export const PhoneType: Schema.DataType<string> = {
-  ...PhoneTypeRef,
+  type: 'PhoneType',
   validation: [
     {
       type: 'phone',

plugins/common-types/core/src/index.ts

@@ -3,7 +3,6 @@ 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,
@@ -16,7 +15,8 @@ import type {
   PhoneType,
 } from './data-types/types';
 
-export { validators, dataTypes, dataRefs, formats };
+export { validators, dataTypes, formats };
+
 export * from './formats/utils';
 
 /**

plugins/reference-assets/components/BUILD

@@ -3,6 +3,7 @@ load("//:index.bzl", "javascript_pipeline")
 javascript_pipeline(
     name = "@player-ui/reference-assets-components",
     dependencies = [
+      "//plugins/common-types/core:@player-ui/common-types-plugin",
       "//plugins/reference-assets/core:@player-ui/reference-assets-plugin"
     ],
 

plugins/reference-assets/components/src/index.tsx

@@ -3,8 +3,17 @@ import type {
   AssetPropsWithChildren,
   BindingTemplateInstance,
   ExpressionTemplateInstance,
+  DSLSchema as PlayerDSLSchema,
+  DataTypeReference,
+  DataTypeRefs,
+  ValidatorFunctionRefs,
+} from '@player-tools/dsl';
+import {
+  createSlot,
+  Asset,
+  View,
+  getObjectReferences,
 } from '@player-tools/dsl';
-import { createSlot, Asset, View } from '@player-tools/dsl';
 import type { Asset as AssetType } from '@player-ui/player';
 import type {
   ActionAsset,
@@ -13,6 +22,21 @@ import type {
   InfoAsset,
   InputAsset,
 } from '@player-ui/reference-assets-plugin';
+import { dataTypes, validators } from '@player-ui/common-types-plugin';
+
+export const dataRefs = getObjectReferences<
+  typeof dataTypes,
+  DataTypeRefs<typeof dataTypes>
+>(dataTypes);
+
+export const validationRefs = getObjectReferences<
+  typeof validators,
+  ValidatorFunctionRefs<typeof validators>
+>(validators);
+
+export type DSLSchema = PlayerDSLSchema<
+  DataTypeReference<typeof dataTypes, ValidatorFunctionRefs<typeof validators>>
+>;
 
 export const Text = (
   props: Omit<AssetPropsWithChildren<TextAsset>, 'value'> & {