@player-tools/dsl 0.4.1-next.0 → 0.5.0--canary.62.1176

package/dist/index.cjs.js

@@ -12,7 +12,26 @@ var sourceMapJs = require('source-map-js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
 const IDSuffixContext = React__default["default"].createContext("root");
@@ -100,7 +119,7 @@ var __spreadValues$5 = (a, b) => {
 var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const OpaqueIdentifier = Symbol("TemplateStringType");
 const TemplateStringComponent = (props) => {
-  return React__default["default"].createElement("value", {
+  return React__namespace.createElement("value", {
     value: props.value
   }, null);
 };
@@ -125,7 +144,7 @@ const createTemplateInstance = (options) => {
   const toValue = () => {
     return value;
   };
-  const element = React__default["default"].createElement(TemplateStringComponent, {
+  const element = React__namespace.createElement(TemplateStringComponent, {
     value: toString()
   }, null);
   return __spreadProps$4(__spreadValues$5({}, element), {
@@ -203,27 +222,27 @@ function toJsonElement(value, indexOrKey, options) {
   var _a;
   const indexProp = typeof indexOrKey === "number" ? { key: indexOrKey } : null;
   if (Array.isArray(value)) {
-    return /* @__PURE__ */ React__default["default"].createElement("array", __spreadValues$4({}, indexProp), value.map((item, idx) => toJsonElement(item, idx, options)));
+    return /* @__PURE__ */ React__namespace.createElement("array", __spreadValues$4({}, indexProp), value.map((item, idx) => toJsonElement(item, idx, options)));
   }
   if (isTemplateStringInstance(value)) {
     if (typeof indexOrKey === "string" && ((_a = options == null ? void 0 : options.propertiesToSkip) == null ? void 0 : _a.includes(indexOrKey))) {
-      return /* @__PURE__ */ React__default["default"].createElement("value", __spreadValues$4({}, indexProp), value.toValue());
+      return /* @__PURE__ */ React__namespace.createElement("value", __spreadValues$4({}, indexProp), value.toValue());
     }
-    return /* @__PURE__ */ React__default["default"].createElement("value", __spreadValues$4({}, indexProp), value.toRefString());
+    return /* @__PURE__ */ React__namespace.createElement("value", __spreadValues$4({}, indexProp), value.toRefString());
   }
   if (typeof value === "object" && value !== null) {
-    return /* @__PURE__ */ React__default["default"].createElement("obj", __spreadValues$4({}, indexProp), Object.keys(value).map((key) => /* @__PURE__ */ React__default["default"].createElement("property", {
+    return /* @__PURE__ */ React__namespace.createElement("obj", __spreadValues$4({}, indexProp), Object.keys(value).map((key) => /* @__PURE__ */ React__namespace.createElement("property", {
       key,
       name: key
     }, toJsonElement(value[key], key, options))));
   }
-  return /* @__PURE__ */ React__default["default"].createElement("value", __spreadProps$3(__spreadValues$4({}, indexProp), {
+  return /* @__PURE__ */ React__namespace.createElement("value", __spreadProps$3(__spreadValues$4({}, indexProp), {
     value
   }));
 }
 function toJsonProperties(value, options = { propertiesToSkip: ["applicability"] }) {
   return Object.keys(value).map((key) => {
-    return /* @__PURE__ */ React__default["default"].createElement("property", {
+    return /* @__PURE__ */ React__namespace.createElement("property", {
       key,
       name: key
     }, toJsonElement(value[key], key, options));
@@ -231,29 +250,29 @@ function toJsonProperties(value, options = { propertiesToSkip: ["applicability"]
 }
 function normalizeText(options) {
   const { node, TextComp } = options;
-  const nodeArr = React__default["default"].Children.toArray(node);
-  if (nodeArr.every((n) => React__default["default"].isValidElement(n) && n.type !== TemplateStringComponent)) {
+  const nodeArr = React__namespace.Children.toArray(node);
+  if (nodeArr.every((n) => React__namespace.isValidElement(n) && n.type !== TemplateStringComponent)) {
     return node;
   }
   if (TextComp) {
-    return /* @__PURE__ */ React__default["default"].createElement(TextComp, null, nodeArr);
+    return /* @__PURE__ */ React__namespace.createElement(TextComp, null, nodeArr);
   }
   throw new Error(`Tried to convert node to Text Asset, but no Component was supplied.`);
 }
 function normalizeToCollection(options) {
   const { node, CollectionComp } = options;
-  if (React__default["default"].Children.count(node) > 1 && React__default["default"].Children.toArray(node).every((n) => typeof n !== "string")) {
+  if (React__namespace.Children.count(node) > 1 && React__namespace.Children.toArray(node).every((n) => typeof n !== "string")) {
     if (!CollectionComp) {
       throw new Error(`Tried to convert array to a collection asset, but no Component was given.`);
     }
-    return /* @__PURE__ */ React__default["default"].createElement(CollectionComp, null, node);
+    return /* @__PURE__ */ React__namespace.createElement(CollectionComp, null, node);
   }
   return normalizeText(__spreadProps$3(__spreadValues$4({}, options), { node }));
 }
 function flattenChildren(children) {
-  const childrenArray = React__default["default"].Children.toArray(children);
+  const childrenArray = React__namespace.Children.toArray(children);
   return childrenArray.reduce((flatChildren, child) => {
-    if (child.type === React__default["default"].Fragment) {
+    if (child.type === React__namespace.Fragment) {
       return flatChildren.concat(flattenChildren(child.props.children));
     }
     flatChildren.push(child);

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as _player_ui_types from '@player-ui/types';
 import { Asset as Asset$1, Navigation as Navigation$1, Expression, Schema, NavigationFlowViewState, NavigationFlowState, NavigationFlow, ExpressionObject, Flow } from '@player-ui/types';
-import React$1, { PropsWithChildren } from 'react';
+import * as React$1 from 'react';
+import React__default, { PropsWithChildren } from 'react';
 import { PropertyNode, ObjectNode, JsonNode, JsonType } from 'react-json-reconciler';
 export * from 'react-json-reconciler';
 import { SyncWaterfallHook, SyncHook, AsyncSeriesWaterfallHook, AsyncSeriesHook } from 'tapable-ts';
@@ -97,11 +98,11 @@ declare type AssetProps = PlayerApplicability & {
     /** the asset type */
     type: string;
     /** Any other properties on the asset */
-    children?: React$1.ReactNode;
+    children?: React__default.ReactNode;
     /** other things that we don't know about */
     [key: string]: unknown;
 };
-declare const SlotContext: React$1.Context<{
+declare const SlotContext: React__default.Context<{
     /** The property name for the slot */
     propertyName: string;
     /** If the slot represents an array */
@@ -111,37 +112,37 @@ declare const SlotContext: React$1.Context<{
     /** Other props to add to the slot */
     additionalProperties?: any;
     /** The ref to the property node */
-    ref: React$1.RefObject<PropertyNode>;
+    ref: React__default.RefObject<PropertyNode>;
     /** A text component if we hit a string but expect an asset */
-    TextComp?: React$1.ComponentType<{}> | undefined;
+    TextComp?: React__default.ComponentType<{}> | undefined;
     /** A component to create a collection asset is we get an array but need a single element */
-    CollectionComp?: React$1.ComponentType<{}> | undefined;
+    CollectionComp?: React__default.ComponentType<{}> | undefined;
 } | undefined>;
 /**
  * Wraps the children in an `asset` object.
  * Additional props are added to the top level object
  */
-declare const AssetWrapper: React$1.ForwardRefExoticComponent<Pick<WithChildren<{
+declare const AssetWrapper: React__default.ForwardRefExoticComponent<Omit<WithChildren<{
     [key: string]: any;
-}>, string | number> & React$1.RefAttributes<ObjectNode>>;
+}>, "ref"> & React__default.RefAttributes<ObjectNode>>;
 /** Create a ID property for a node */
 declare const GeneratedIDProperty: (props: {
     /** the id to use if supplied by the user */
     id?: string;
-}) => JSX.Element;
+}) => React__default.JSX.Element;
 /** An asset */
-declare const Asset: React$1.ForwardRefExoticComponent<Pick<AssetProps, string | number> & React$1.RefAttributes<ObjectNode>>;
-declare const View: React$1.ForwardRefExoticComponent<Pick<PlayerApplicability & {
+declare const Asset: React__default.ForwardRefExoticComponent<Omit<AssetProps, "ref"> & React__default.RefAttributes<ObjectNode>>;
+declare const View: React__default.ForwardRefExoticComponent<Omit<PlayerApplicability & {
     [key: string]: unknown;
     /** id of the asset */
     id?: string | undefined;
     /** the asset type */
     type: string;
     /** Any other properties on the asset */
-    children?: React$1.ReactNode;
+    children?: React__default.ReactNode;
 } & _player_ui_types.Asset<string> & {
     validation?: _player_ui_types.Validation.CrossfieldReference[] | undefined;
-}, keyof _player_ui_types.Asset<string>> & React$1.RefAttributes<ObjectNode>>;
+}, "ref"> & React__default.RefAttributes<ObjectNode>>;
 /** A component to generate a named property slot */
 declare const Slot: (props: {
     /** The name of the slot */
@@ -151,14 +152,14 @@ declare const Slot: (props: {
     /** if each item should be wrapped in an asset */
     wrapInAsset?: boolean;
     /** Any children to render in the slot */
-    children?: React$1.ReactNode;
+    children?: React__default.ReactNode;
     /** Other properties to add to the slot */
     additionalProperties?: any;
     /** A text component if we hit a string but expect an asset */
-    TextComp?: React$1.ComponentType;
+    TextComp?: React__default.ComponentType;
     /** A component to create a collection asset is we get an array but need a single element */
-    CollectionComp?: React$1.ComponentType;
-}) => JSX.Element;
+    CollectionComp?: React__default.ComponentType;
+}) => React__default.JSX.Element;
 /** Create a slot for a given property */
 declare function createSlot<SlotProps = unknown>(options: {
     /** The name of the slot */
@@ -168,58 +169,58 @@ declare function createSlot<SlotProps = unknown>(options: {
     /** if each item should be wrapped in an asset */
     wrapInAsset?: boolean;
     /** Any children to render in the slot */
-    children?: React$1.ReactNode;
+    children?: React__default.ReactNode;
     /** A text component if we hit a string but expect an asset */
-    TextComp?: React$1.ComponentType;
+    TextComp?: React__default.ComponentType;
     /** A component to create a collection asset is we get an array but need a single element */
-    CollectionComp?: React$1.ComponentType;
+    CollectionComp?: React__default.ComponentType;
 }): (props: {
     /** An object to include in this property */
-    children?: React$1.ReactNode;
-} & SlotProps) => JSX.Element;
+    children?: React__default.ReactNode;
+} & SlotProps) => React__default.JSX.Element;
 
-declare const IndexSuffixStopContext: React$1.Context<boolean>;
+declare const IndexSuffixStopContext: React__default.Context<boolean>;
 /** Get the generated id */
 declare const useGetIdPrefix: () => string;
 /** Add a suffix to a generated id */
 declare const IDSuffixProvider: (props: WithChildren<{
     /** The suffix to append */
     suffix: string;
-}>) => JSX.Element;
+}>) => React__default.JSX.Element;
 /** Override the generated id with the supplied one */
 declare const IDProvider: (props: WithChildren<{
     /** The new id to use  */
     id?: string;
-}>) => JSX.Element;
+}>) => React__default.JSX.Element;
 /** Get the index of an item in a slot */
-declare const useIndexInSlot: (ref: React$1.RefObject<JsonNode>) => number;
+declare const useIndexInSlot: (ref: React__default.RefObject<JsonNode>) => number;
 /** Add the index to the id path when in an array slot */
 declare const IDSuffixIndexProvider: (props: WithChildren<{
     /** The ref to use */
-    wrapperRef: React$1.RefObject<JsonNode>;
+    wrapperRef: React__default.RefObject<JsonNode>;
     /** if the suffix is in a template, the id to use */
     templateIndex?: string;
-}>) => JSX.Element;
+}>) => React__default.JSX.Element;
 /** Wrap a slot with the index if in an array slot */
 declare const OptionalIDSuffixProvider: (props: WithChildren<{
     /** The ref to walk upwards and use as an index */
-    wrapperRef: React$1.RefObject<JsonNode>;
+    wrapperRef: React__default.RefObject<JsonNode>;
     /** if the suffix is in a template, the id to use */
     templateIndex?: string;
-}>) => JSX.Element;
+}>) => React__default.JSX.Element;
 
 /** Get an array version of the value */
 declare function toArray<T>(val: T | Array<T>): Array<T>;
 /** Create a component version  */
 declare function toJsonElement(value: any, indexOrKey?: number | string, options?: toJsonOptions): React$1.ReactElement;
 /** Create a fragment for the properties */
-declare function toJsonProperties(value: Record<string, any>, options?: toJsonOptions): JSX.Element[];
+declare function toJsonProperties(value: Record<string, any>, options?: toJsonOptions): React$1.JSX.Element[];
 /** Create a text asset if needed */
 declare function normalizeText(options: {
     /** The current node */
     node: React$1.ReactNode;
     /** A component to render a text asset */
-    TextComp?: React$1.ComponentType;
+    TextComp?: React$1.ComponentType<any>;
 }): React$1.ReactNode;
 /** Create a collection if needed */
 declare function normalizeToCollection(options: {
@@ -228,8 +229,8 @@ declare function normalizeToCollection(options: {
     /** A Text asset */
     TextComp?: React$1.ComponentType;
     /** A collection asset */
-    CollectionComp?: React$1.ComponentType;
-}): React$1.ReactNode;
+    CollectionComp?: React$1.ComponentType<any>;
+}): string | number | boolean | Iterable<React$1.ReactNode> | React$1.JSX.Element | null | undefined;
 declare type ReactChildArray = ReturnType<typeof React$1.Children.toArray>;
 /**
  *
@@ -246,8 +247,8 @@ interface SwitchProps {
  * Switches allow users to fork content between 1 or more assets
  */
 declare const Switch: {
-    (props: PropsWithChildren<SwitchProps>): JSX.Element;
-    Case: (props: PropsWithChildren<CaseProps>) => JSX.Element;
+    (props: PropsWithChildren<SwitchProps>): React__default.JSX.Element;
+    Case: (props: PropsWithChildren<CaseProps>) => React__default.JSX.Element;
 };
 interface CaseProps {
     /** the test for this case statement */
@@ -258,19 +259,19 @@ interface TemplateContextType {
     /** The number of nested templates */
     depth: number;
 }
-declare const TemplateContext: React$1.Context<TemplateContextType>;
+declare const TemplateContext: React__default.Context<TemplateContextType>;
 interface TemplateProps {
     /** The source binding */
     data: BindingTemplateInstance;
     /** The target property */
     output?: string;
     /** The template value */
-    children: React$1.ReactNode;
+    children: React__default.ReactNode;
     /** boolean that specifies whether template should recompute when data changes */
     dynamic?: boolean;
 }
 /** A template allows users to dynamically map over an array of data */
-declare const Template: (props: TemplateProps) => JSX.Element;
+declare const Template: (props: TemplateProps) => React__default.JSX.Element;
 
 declare const SchemaTypeName: unique symbol;
 /**

package/dist/index.esm.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import * as React from 'react';
+import React__default from 'react';
 import mergeRefs from 'react-merge-refs';
 import { flattenNodes, ProxyNode, createPortal, PropertyNode, ValueNode, ArrayNode, toJSON, render } from 'react-json-reconciler';
 export * from 'react-json-reconciler';
@@ -7,14 +8,14 @@ import { dequal } from 'dequal';
 import { SyncWaterfallHook, SyncHook, AsyncSeriesWaterfallHook, AsyncSeriesHook } from 'tapable-ts';
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map-js';
 
-const IDSuffixContext = React.createContext("root");
-const IndexSuffixStopContext = React.createContext(false);
+const IDSuffixContext = React__default.createContext("root");
+const IndexSuffixStopContext = React__default.createContext(false);
 const useGetIdPrefix = () => {
-  return React.useContext(IDSuffixContext);
+  return React__default.useContext(IDSuffixContext);
 };
 const IDSuffixProvider = (props) => {
   const currentPrefix = useGetIdPrefix();
-  return /* @__PURE__ */ React.createElement(IDSuffixContext.Provider, {
+  return /* @__PURE__ */ React__default.createElement(IDSuffixContext.Provider, {
     value: [
       currentPrefix === "root" ? void 0 : currentPrefix,
       props.suffix
@@ -23,16 +24,16 @@ const IDSuffixProvider = (props) => {
 };
 const IDProvider = (props) => {
   if (props.id) {
-    return /* @__PURE__ */ React.createElement(IDSuffixContext.Provider, {
+    return /* @__PURE__ */ React__default.createElement(IDSuffixContext.Provider, {
       value: props.id
     }, props.children);
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, props.children);
 };
 const useIndexInSlot = (ref) => {
-  const [index, setIndex] = React.useState(-1);
-  const slotContext = React.useContext(SlotContext);
-  React.useEffect(() => {
+  const [index, setIndex] = React__default.useState(-1);
+  const slotContext = React__default.useContext(SlotContext);
+  React__default.useEffect(() => {
     var _a, _b;
     if (!(slotContext == null ? void 0 : slotContext.isArray)) {
       throw new Error("Cannot get index in non-array slot");
@@ -50,25 +51,25 @@ const useIndexInSlot = (ref) => {
 const IDSuffixIndexProvider = (props) => {
   var _a;
   const slotIndex = useIndexInSlot(props.wrapperRef);
-  const stopIndex = React.useContext(IndexSuffixStopContext);
+  const stopIndex = React__default.useContext(IndexSuffixStopContext);
   if (stopIndex) {
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, props.children);
   }
-  return /* @__PURE__ */ React.createElement(IDSuffixProvider, {
+  return /* @__PURE__ */ React__default.createElement(IDSuffixProvider, {
     suffix: (_a = props.templateIndex) != null ? _a : String(slotIndex)
-  }, /* @__PURE__ */ React.createElement(IndexSuffixStopContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(IndexSuffixStopContext.Provider, {
     value: true
   }, props.children));
 };
 const OptionalIDSuffixProvider = (props) => {
-  const slotContext = React.useContext(SlotContext);
+  const slotContext = React__default.useContext(SlotContext);
   if (slotContext == null ? void 0 : slotContext.isArray) {
-    return /* @__PURE__ */ React.createElement(IDSuffixIndexProvider, {
+    return /* @__PURE__ */ React__default.createElement(IDSuffixIndexProvider, {
       wrapperRef: props.wrapperRef,
       templateIndex: props.templateIndex
     }, props.children);
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, props.children);
 };
 
 var __defProp$5 = Object.defineProperty;
@@ -284,44 +285,44 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-const SlotContext = React.createContext(void 0);
-const AssetWrapper = React.forwardRef((props, ref) => {
+const SlotContext = React__default.createContext(void 0);
+const AssetWrapper = React__default.forwardRef((props, ref) => {
   const _a = props, { children } = _a, rest = __objRest(_a, ["children"]);
-  return /* @__PURE__ */ React.createElement("obj", {
+  return /* @__PURE__ */ React__default.createElement("obj", {
     ref
-  }, toJsonProperties(rest), /* @__PURE__ */ React.createElement("property", {
+  }, toJsonProperties(rest), /* @__PURE__ */ React__default.createElement("property", {
     name: "asset"
   }, children));
 });
 const GeneratedIDProperty = (props) => {
   var _a;
   const currentPrefixId = useGetIdPrefix();
-  return /* @__PURE__ */ React.createElement("property", {
+  return /* @__PURE__ */ React__default.createElement("property", {
     name: "id"
   }, (_a = props.id) != null ? _a : currentPrefixId);
 };
-const Asset = React.forwardRef((props, ref) => {
+const Asset = React__default.forwardRef((props, ref) => {
   const _a = props, { id, type, applicability, children } = _a, rest = __objRest(_a, ["id", "type", "applicability", "children"]);
-  const slotContext = React.useContext(SlotContext);
-  const localRef = React.useRef(null);
-  const Wrapper = (slotContext == null ? void 0 : slotContext.wrapInAsset) ? AssetWrapper : React.Fragment;
-  return /* @__PURE__ */ React.createElement(Wrapper, __spreadValues$3({
+  const slotContext = React__default.useContext(SlotContext);
+  const localRef = React__default.useRef(null);
+  const Wrapper = (slotContext == null ? void 0 : slotContext.wrapInAsset) ? AssetWrapper : React__default.Fragment;
+  return /* @__PURE__ */ React__default.createElement(Wrapper, __spreadValues$3({
     ref: (slotContext == null ? void 0 : slotContext.wrapInAsset) ? mergeRefs([ref, localRef]) : void 0
-  }, (slotContext == null ? void 0 : slotContext.wrapInAsset) && (slotContext == null ? void 0 : slotContext.additionalProperties) ? slotContext == null ? void 0 : slotContext.additionalProperties : {}), /* @__PURE__ */ React.createElement(OptionalIDSuffixProvider, {
+  }, (slotContext == null ? void 0 : slotContext.wrapInAsset) && (slotContext == null ? void 0 : slotContext.additionalProperties) ? slotContext == null ? void 0 : slotContext.additionalProperties : {}), /* @__PURE__ */ React__default.createElement(OptionalIDSuffixProvider, {
     wrapperRef: localRef
-  }, /* @__PURE__ */ React.createElement(SlotContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(SlotContext.Provider, {
     value: void 0
-  }, /* @__PURE__ */ React.createElement(IDProvider, {
+  }, /* @__PURE__ */ React__default.createElement(IDProvider, {
     id
-  }, /* @__PURE__ */ React.createElement("obj", {
+  }, /* @__PURE__ */ React__default.createElement("obj", {
     ref: (slotContext == null ? void 0 : slotContext.wrapInAsset) ? void 0 : mergeRefs([ref, localRef])
-  }, /* @__PURE__ */ React.createElement(GeneratedIDProperty, {
+  }, /* @__PURE__ */ React__default.createElement(GeneratedIDProperty, {
     id
-  }), /* @__PURE__ */ React.createElement("property", {
+  }), /* @__PURE__ */ React__default.createElement("property", {
     name: "type"
-  }, type), applicability !== void 0 && /* @__PURE__ */ React.createElement("property", {
+  }, type), applicability !== void 0 && /* @__PURE__ */ React__default.createElement("property", {
     name: "applicability"
-  }, /* @__PURE__ */ React.createElement("value", {
+  }, /* @__PURE__ */ React__default.createElement("value", {
     value: typeof applicability === "boolean" ? applicability : applicability.toValue()
   })), toJsonProperties(rest), children)))));
 });
@@ -329,11 +330,11 @@ Asset.defaultProps = {
   id: void 0,
   children: void 0
 };
-const View = React.forwardRef((props, ref) => {
+const View = React__default.forwardRef((props, ref) => {
   const _a = props, { validation, children } = _a, rest = __objRest(_a, ["validation", "children"]);
-  return /* @__PURE__ */ React.createElement(Asset, __spreadValues$3({
+  return /* @__PURE__ */ React__default.createElement(Asset, __spreadValues$3({
     ref
-  }, rest), validation && /* @__PURE__ */ React.createElement("property", {
+  }, rest), validation && /* @__PURE__ */ React__default.createElement("property", {
     key: "validation",
     name: "validation"
   }, toJsonElement(validation, "validation", {
@@ -348,15 +349,15 @@ const Slot = (props) => {
   var _a, _b;
   const { TextComp, CollectionComp } = props;
   const children = flattenChildren(props.children);
-  const propRef = React.useRef(null);
-  return /* @__PURE__ */ React.createElement("property", {
+  const propRef = React__default.useRef(null);
+  return /* @__PURE__ */ React__default.createElement("property", {
     ref: propRef,
     name: props.name
-  }, /* @__PURE__ */ React.createElement(IDSuffixProvider, {
+  }, /* @__PURE__ */ React__default.createElement(IDSuffixProvider, {
     suffix: props.name
-  }, /* @__PURE__ */ React.createElement(IndexSuffixStopContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(IndexSuffixStopContext.Provider, {
     value: false
-  }, /* @__PURE__ */ React.createElement(SlotContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(SlotContext.Provider, {
     value: {
       ref: propRef,
       propertyName: props.name,
@@ -366,8 +367,8 @@ const Slot = (props) => {
       TextComp,
       CollectionComp
     }
-  }, props.isArray && /* @__PURE__ */ React.createElement("array", null, React.Children.map(children, (child, index) => {
-    return /* @__PURE__ */ React.createElement(React.Fragment, {
+  }, props.isArray && /* @__PURE__ */ React__default.createElement("array", null, React__default.Children.map(children, (child, index) => {
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, {
       key: `${props.name}-${index}`
     }, normalizeText({ node: child, TextComp }));
   })), !props.isArray && normalizeToCollection({
@@ -379,7 +380,7 @@ const Slot = (props) => {
 function createSlot(options) {
   return (props) => {
     const _a = props, { children } = _a, other = __objRest(_a, ["children"]);
-    return /* @__PURE__ */ React.createElement(Slot, __spreadProps$2(__spreadValues$3({}, options), {
+    return /* @__PURE__ */ React__default.createElement(Slot, __spreadProps$2(__spreadValues$3({}, options), {
       additionalProperties: other
     }), children);
   };
@@ -404,24 +405,24 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-const SwitchContext = React.createContext({});
+const SwitchContext = React__default.createContext({});
 const Switch = (props) => {
-  const slotContext = React.useContext(SlotContext);
-  const propertyNode = React.useRef(null);
-  return /* @__PURE__ */ React.createElement("obj", {
+  const slotContext = React__default.useContext(SlotContext);
+  const propertyNode = React__default.useRef(null);
+  return /* @__PURE__ */ React__default.createElement("obj", {
     ref: propertyNode
-  }, /* @__PURE__ */ React.createElement(SwitchContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(SwitchContext.Provider, {
     value: __spreadProps$1(__spreadValues$2({}, props), {
       TextComp: slotContext == null ? void 0 : slotContext.TextComp,
       CollectionComp: slotContext == null ? void 0 : slotContext.CollectionComp
     })
-  }, /* @__PURE__ */ React.createElement(OptionalIDSuffixProvider, {
+  }, /* @__PURE__ */ React__default.createElement(OptionalIDSuffixProvider, {
     wrapperRef: propertyNode
-  }, /* @__PURE__ */ React.createElement("property", {
+  }, /* @__PURE__ */ React__default.createElement("property", {
     name: props.isDynamic ? "dynamicSwitch" : "staticSwitch"
-  }, /* @__PURE__ */ React.createElement(SlotContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(SlotContext.Provider, {
     value: void 0
-  }, /* @__PURE__ */ React.createElement("array", null, props.children))))), (slotContext == null ? void 0 : slotContext.additionalProperties) && toJsonProperties(slotContext.additionalProperties));
+  }, /* @__PURE__ */ React__default.createElement("array", null, props.children))))), (slotContext == null ? void 0 : slotContext.additionalProperties) && toJsonProperties(slotContext.additionalProperties));
 };
 const findParentArray = (node) => {
   if (node.type === "array") {
@@ -438,11 +439,11 @@ const findArrayIndex = (node) => {
   return allSearch.indexOf(node);
 };
 const Case = (props) => {
-  const slotContext = React.useContext(SlotContext);
-  const switchContext = React.useContext(SwitchContext);
-  const [caseIndex, setCaseIndex] = React.useState(-1);
-  const caseNode = React.useRef(null);
-  React.useLayoutEffect(() => {
+  const slotContext = React__default.useContext(SlotContext);
+  const switchContext = React__default.useContext(SwitchContext);
+  const [caseIndex, setCaseIndex] = React__default.useState(-1);
+  const caseNode = React__default.useRef(null);
+  React__default.useLayoutEffect(() => {
     if (caseNode.current) {
       const index = findArrayIndex(caseNode.current);
       if (index !== caseIndex) {
@@ -454,17 +455,17 @@ const Case = (props) => {
   if (props.exp !== void 0) {
     expValue = isTemplateStringInstance(props.exp) ? props.exp.toValue() : props.exp;
   }
-  return /* @__PURE__ */ React.createElement("obj", {
+  return /* @__PURE__ */ React__default.createElement("obj", {
     ref: caseNode
-  }, /* @__PURE__ */ React.createElement("property", {
+  }, /* @__PURE__ */ React__default.createElement("property", {
     name: "case"
-  }, /* @__PURE__ */ React.createElement("value", {
+  }, /* @__PURE__ */ React__default.createElement("value", {
     value: expValue
-  })), /* @__PURE__ */ React.createElement(IDSuffixProvider, {
+  })), /* @__PURE__ */ React__default.createElement(IDSuffixProvider, {
     suffix: `${switchContext.isDynamic ? "dynamicSwitch" : "staticSwitch"}-${caseIndex}`
-  }, /* @__PURE__ */ React.createElement(SlotContext.Provider, {
+  }, /* @__PURE__ */ React__default.createElement(SlotContext.Provider, {
     value: slotContext ? __spreadProps$1(__spreadValues$2({}, slotContext), { wrapInAsset: false }) : void 0
-  }, /* @__PURE__ */ React.createElement("property", {
+  }, /* @__PURE__ */ React__default.createElement("property", {
     name: "asset"
   }, normalizeToCollection({
     node: props.children,
@@ -474,7 +475,7 @@ const Case = (props) => {
 };
 Switch.Case = Case;
 
-const TemplateContext = React.createContext({
+const TemplateContext = React__default.createContext({
   depth: 0
 });
 function addTemplateToObject(obj, templateObj, templateParentNodeType) {
@@ -513,8 +514,8 @@ function addTemplateToObject(obj, templateObj, templateParentNodeType) {
   };
 }
 const TemplateProvider = (props) => {
-  const baseContext = React.useContext(TemplateContext);
-  return /* @__PURE__ */ React.createElement(TemplateContext.Provider, {
+  const baseContext = React__default.useContext(TemplateContext);
+  return /* @__PURE__ */ React__default.createElement(TemplateContext.Provider, {
     value: { depth: baseContext.depth + 1 }
   }, props.children);
 };
@@ -536,19 +537,19 @@ const getParentProperty = (node) => {
 };
 const Template = (props) => {
   var _a;
-  const baseContext = React.useContext(TemplateContext);
+  const baseContext = React__default.useContext(TemplateContext);
   const dynamicProp = (_a = props.dynamic) != null ? _a : false;
-  const [outputProp, setOutputProp] = React.useState(props.output);
-  const proxyRef = React.useRef(null);
-  const valueRef = React.useRef(null);
-  const outputElement = React.useMemo(() => new ProxyNode(), []);
-  React.useLayoutEffect(() => {
+  const [outputProp, setOutputProp] = React__default.useState(props.output);
+  const proxyRef = React__default.useRef(null);
+  const valueRef = React__default.useRef(null);
+  const outputElement = React__default.useMemo(() => new ProxyNode(), []);
+  React__default.useLayoutEffect(() => {
     const propNode = proxyRef.current && getParentProperty(proxyRef.current);
     if (outputProp === void 0 && propNode) {
       setOutputProp(propNode.keyNode.value);
     }
   }, [proxyRef, outputProp]);
-  React.useEffect(() => {
+  React__default.useEffect(() => {
     const templateObj = outputElement.items[0];
     if (proxyRef.current) {
       const parentObject = getParentObject(proxyRef.current);
@@ -561,20 +562,20 @@ const Template = (props) => {
       return addTemplateToObject(parentObject, templateObj, outputProp);
     }
   }, [proxyRef, outputProp, outputElement.items]);
-  return /* @__PURE__ */ React.createElement("proxy", {
+  return /* @__PURE__ */ React__default.createElement("proxy", {
     ref: proxyRef
-  }, createPortal(/* @__PURE__ */ React.createElement(OptionalIDSuffixProvider, {
+  }, createPortal(/* @__PURE__ */ React__default.createElement(OptionalIDSuffixProvider, {
     wrapperRef: valueRef,
     templateIndex: `_index${baseContext.depth === 0 ? "" : baseContext.depth}_`
-  }, /* @__PURE__ */ React.createElement(TemplateProvider, null, /* @__PURE__ */ React.createElement("object", null, /* @__PURE__ */ React.createElement("property", {
+  }, /* @__PURE__ */ React__default.createElement(TemplateProvider, null, /* @__PURE__ */ React__default.createElement("object", null, /* @__PURE__ */ React__default.createElement("property", {
     name: "data"
-  }, props.data.toValue()), /* @__PURE__ */ React.createElement("property", {
+  }, props.data.toValue()), /* @__PURE__ */ React__default.createElement("property", {
     name: "output"
-  }, outputProp), /* @__PURE__ */ React.createElement("property", {
+  }, outputProp), /* @__PURE__ */ React__default.createElement("property", {
     name: "value"
-  }, props.children), dynamicProp && /* @__PURE__ */ React.createElement("property", {
+  }, props.children), dynamicProp && /* @__PURE__ */ React__default.createElement("property", {
     name: "dynamic"
-  }, toJsonElement(dynamicProp))))), outputElement), /* @__PURE__ */ React.createElement("value", {
+  }, toJsonElement(dynamicProp))))), outputElement), /* @__PURE__ */ React__default.createElement("value", {
     ref: valueRef,
     value: void 0
   }));
@@ -734,7 +735,7 @@ const getRefStringFromObject = (obj) => {
 
 const fingerprintContent = (content, filename) => {
   if (content !== null || content !== void 0) {
-    if (React.isValidElement(content)) {
+    if (React__default.isValidElement(content)) {
       return "view";
     }
     if (typeof content === "object" && "navigation" in content) {
@@ -857,7 +858,7 @@ class DSLCompiler {
         const allSourceMaps = [];
         const copiedValue = __spreadValues({}, value);
         copiedValue.views = yield Promise.all((_b = (_a = copiedValue == null ? void 0 : copiedValue.views) == null ? void 0 : _a.map((node) => __async(this, null, function* () {
-          if (React.isValidElement(node)) {
+          if (React__default.isValidElement(node)) {
             const { jsonValue, sourceMap, stringValue } = yield render(node, {
               collectSourceMap: true
             });
@@ -880,7 +881,7 @@ class DSLCompiler {
             if (typeof node === "object") {
               Object.entries(node).forEach(([nodeKey, flowNode]) => {
                 var _a2, _b2, _c, _d;
-                if (flowNode && typeof flowNode === "object" && "state_type" in flowNode && flowNode.state_type === "VIEW" && React.isValidElement(flowNode.ref)) {
+                if (flowNode && typeof flowNode === "object" && "state_type" in flowNode && flowNode.state_type === "VIEW" && React__default.isValidElement(flowNode.ref)) {
                   const actualViewIndex = (_b2 = (_a2 = value.views) == null ? void 0 : _a2.indexOf) == null ? void 0 : _b2.call(_a2, flowNode.ref);
                   if (actualViewIndex !== void 0 && actualViewIndex > -1) {
                     const actualId = (_d = (_c = copiedValue.views) == null ? void 0 : _c[actualViewIndex]) == null ? void 0 : _d.id;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@player-tools/dsl",
-  "version": "0.4.1-next.0",
+  "version": "0.5.0--canary.62.1176",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "react": "^17.0.2"
+    "react": "^18.2.0",
+    "@types/react": "^18.2.45"
   },
   "dependencies": {
     "@player-ui/types": "0.4.3",
@@ -19,7 +20,7 @@
     "jsonc-parser": "^2.3.1",
     "mkdirp": "^1.0.4",
     "react-flatten-children": "^1.1.2",
-    "react-json-reconciler": "^2.0.0",
+    "react-json-reconciler": "^3.0.1",
     "react-merge-refs": "^1.1.0",
     "source-map-js": "^1.0.2",
     "ts-node": "^10.4.0",

package/src/compiler/compiler.ts

@@ -142,7 +142,7 @@ export class DSLCompiler {
     this.hooks.schemaGenerator.call(schemaGenerator);
 
     if (type === 'view') {
-      const { jsonValue, sourceMap } = await render(value, {
+      const { jsonValue, sourceMap } = await render(value as any, {
         collectSourceMap: true,
       });
 

package/src/string-templates/index.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { parseExpression } from '@player-ui/player';
 
 export type TemplateInstanceRefStringContext = 'binding' | 'expression';

package/src/utils.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import {
   isTemplateStringInstance,
   TemplateStringComponent,
@@ -73,7 +73,7 @@ export function normalizeText(options: {
   node: React.ReactNode;
 
   /** A component to render a text asset */
-  TextComp?: React.ComponentType;
+  TextComp?: React.ComponentType<any>;
 }): React.ReactNode {
   const { node, TextComp } = options;
 
@@ -105,7 +105,7 @@ export function normalizeToCollection(options: {
   TextComp?: React.ComponentType;
 
   /** A collection asset */
-  CollectionComp?: React.ComponentType;
+  CollectionComp?: React.ComponentType<any>;
 }) {
   const { node, CollectionComp } = options;