@player-tools/dsl 0.4.0--canary.25.914 → 0.4.0-next.1

package/dist/index.cjs.js

@@ -6,6 +6,7 @@ var React = require('react');
 var flattenChildren = require('react-flatten-children');
 var mergeRefs = require('react-merge-refs');
 var reactJsonReconciler = require('react-json-reconciler');
+var player = require('@player-ui/player');
 var signale = require('signale');
 var dequal = require('dequal');
 var tapableTs = require('tapable-ts');
@@ -116,6 +117,12 @@ const createTemplateInstance = (options) => {
     }
     return sum + next + ((_a = element2 == null ? void 0 : element2.toRefString(options)) != null ? _a : "");
   }, "");
+  if (options.nestedContext === "expression") {
+    const parsedExpression = player.parseExpression(value, { strict: false });
+    if (parsedExpression.error) {
+      throw parsedExpression.error;
+    }
+  }
   const toString = () => {
     return options.toRefString({}, value);
   };
@@ -535,7 +542,7 @@ const Template = (props) => {
   }, [proxyRef, outputProp, outputElement.items]);
   return /* @__PURE__ */ React__default["default"].createElement("proxy", {
     ref: proxyRef
-  }, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, reactJsonReconciler.createPortal(/* @__PURE__ */ React__default["default"].createElement(OptionalIDSuffixProvider, {
+  }, reactJsonReconciler.createPortal(/* @__PURE__ */ React__default["default"].createElement(OptionalIDSuffixProvider, {
     wrapperRef: valueRef,
     templateIndex: `_index${baseContext.depth === 0 ? "" : baseContext.depth}_`
   }, /* @__PURE__ */ React__default["default"].createElement(TemplateProvider, null, /* @__PURE__ */ React__default["default"].createElement("object", null, /* @__PURE__ */ React__default["default"].createElement("property", {
@@ -547,7 +554,7 @@ const Template = (props) => {
   }, props.children)))), outputElement), /* @__PURE__ */ React__default["default"].createElement("value", {
     ref: valueRef,
     value: void 0
-  })));
+  }));
 };
 
 const bindingSymbol = Symbol("binding");

package/dist/index.d.ts

@@ -198,7 +198,7 @@ declare function normalizeText(options: {
     /** The current node */
     node: React$1.ReactNode;
     /** A component to render a text asset */
-    TextComp?: React$1.ComponentType<React$1.PropsWithChildren>;
+    TextComp?: React$1.ComponentType;
 }): React$1.ReactNode;
 /** Create a collection if needed */
 declare function normalizeToCollection(options: {
@@ -207,8 +207,8 @@ declare function normalizeToCollection(options: {
     /** A Text asset */
     TextComp?: React$1.ComponentType;
     /** A collection asset */
-    CollectionComp?: React$1.ComponentType<React$1.PropsWithChildren>;
-}): string | number | boolean | React$1.ReactFragment | JSX.Element | null | undefined;
+    CollectionComp?: React$1.ComponentType;
+}): React$1.ReactNode;
 
 interface SwitchProps {
     /** defaults to a staticSwitch */

package/dist/index.esm.js

@@ -3,6 +3,7 @@ import flattenChildren from 'react-flatten-children';
 import mergeRefs from 'react-merge-refs';
 import { flattenNodes, ProxyNode, createPortal, PropertyNode, ValueNode, ArrayNode, toJSON, render } from 'react-json-reconciler';
 export * from 'react-json-reconciler';
+import { parseExpression } from '@player-ui/player';
 import signale from 'signale';
 import { dequal } from 'dequal';
 import { SyncWaterfallHook, SyncHook } from 'tapable-ts';
@@ -106,6 +107,12 @@ const createTemplateInstance = (options) => {
     }
     return sum + next + ((_a = element2 == null ? void 0 : element2.toRefString(options)) != null ? _a : "");
   }, "");
+  if (options.nestedContext === "expression") {
+    const parsedExpression = parseExpression(value, { strict: false });
+    if (parsedExpression.error) {
+      throw parsedExpression.error;
+    }
+  }
   const toString = () => {
     return options.toRefString({}, value);
   };
@@ -525,7 +532,7 @@ const Template = (props) => {
   }, [proxyRef, outputProp, outputElement.items]);
   return /* @__PURE__ */ React.createElement("proxy", {
     ref: proxyRef
-  }, /* @__PURE__ */ React.createElement(React.Fragment, null, createPortal(/* @__PURE__ */ React.createElement(OptionalIDSuffixProvider, {
+  }, createPortal(/* @__PURE__ */ React.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", {
@@ -537,7 +544,7 @@ const Template = (props) => {
   }, props.children)))), outputElement), /* @__PURE__ */ React.createElement("value", {
     ref: valueRef,
     value: void 0
-  })));
+  }));
 };
 
 const bindingSymbol = Symbol("binding");

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@player-tools/dsl",
-  "version": "0.4.0--canary.25.914",
+  "version": "0.4.0-next.1",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "react": "^18.2.0",
-    "@types/react": "^18.0.27"
+    "react": "^17.0.2"
   },
   "dependencies": {
-    "@player-ui/types": "0.4.0-next.6",
+    "@player-ui/types": "0.4.0-next.7",
+    "@player-ui/player": "0.4.0-next.7",
     "@types/mkdirp": "^1.0.2",
     "@types/signale": "^1.4.2",
     "chalk": "^4.0.1",

package/src/compiler/schema.ts

@@ -2,7 +2,7 @@ import type { Schema, Language } from '@player-ui/types';
 import signale from 'signale';
 import { dequal } from 'dequal';
 import { SyncWaterfallHook } from 'tapable-ts';
-import { binding as b } from '../string-templates';
+import { binding as b } from '..';
 import type { BindingTemplateInstance } from '../string-templates';
 
 const bindingSymbol = Symbol('binding');

package/src/string-templates/index.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { parseExpression } from '@player-ui/player';
 
 export type TemplateInstanceRefStringContext = 'binding' | 'expression';
 export interface TemplateRefStringOptions {
@@ -71,6 +72,14 @@ const createTemplateInstance = (
     return sum + next + (element?.toRefString(options) ?? '');
   }, '');
 
+  /** Try to parse the expression as valid */
+  if (options.nestedContext === 'expression') {
+    const parsedExpression = parseExpression(value, { strict: false });
+    if (parsedExpression.error) {
+      throw parsedExpression.error;
+    }
+  }
+
   /** get the unwrapped version */
   const toString = () => {
     return options.toRefString({}, value);

package/src/switch.tsx

@@ -1,8 +1,8 @@
 import type { PropsWithChildren } from 'react';
 import React from 'react';
 import type { ArrayNode, JsonNode, ObjectNode } from 'react-json-reconciler';
-import { flattenNodes } from 'react-json-reconciler';
-import { SlotContext } from './components';
+import { flattenNodes, PropertyNode } from 'react-json-reconciler';
+import { SlotContext } from '.';
 import { IDSuffixProvider, OptionalIDSuffixProvider } from './auto-id';
 import type {
   BindingTemplateInstance,

package/src/template.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-no-useless-fragment */
 import React from 'react';
 import type { ObjectNode, JsonNode } from 'react-json-reconciler';
 import {
@@ -164,26 +163,24 @@ export const Template = (props: TemplateProps) => {
 
   return (
     <proxy ref={proxyRef}>
-      <>
-        {createPortal(
-          <OptionalIDSuffixProvider
-            wrapperRef={valueRef}
-            templateIndex={`_index${
-              baseContext.depth === 0 ? '' : baseContext.depth
-            }_`}
-          >
-            <TemplateProvider>
-              <object>
-                <property name="data">{props.data.toValue()}</property>
-                <property name="output">{outputProp}</property>
-                <property name="value">{props.children}</property>
-              </object>
-            </TemplateProvider>
-          </OptionalIDSuffixProvider>,
-          outputElement
-        )}
-        <value ref={valueRef} value={undefined} />
-      </>
+      {createPortal(
+        <OptionalIDSuffixProvider
+          wrapperRef={valueRef}
+          templateIndex={`_index${
+            baseContext.depth === 0 ? '' : baseContext.depth
+          }_`}
+        >
+          <TemplateProvider>
+            <object>
+              <property name="data">{props.data.toValue()}</property>
+              <property name="output">{outputProp}</property>
+              <property name="value">{props.children}</property>
+            </object>
+          </TemplateProvider>
+        </OptionalIDSuffixProvider>,
+        outputElement
+      )}
+      <value ref={valueRef} value={undefined} />
     </proxy>
   );
 };

package/src/utils.tsx

@@ -56,7 +56,7 @@ export function normalizeText(options: {
   node: React.ReactNode;
 
   /** A component to render a text asset */
-  TextComp?: React.ComponentType<React.PropsWithChildren>;
+  TextComp?: React.ComponentType;
 }): React.ReactNode {
   const { node, TextComp } = options;
 
@@ -88,7 +88,7 @@ export function normalizeToCollection(options: {
   TextComp?: React.ComponentType;
 
   /** A collection asset */
-  CollectionComp?: React.ComponentType<React.PropsWithChildren>;
+  CollectionComp?: React.ComponentType;
 }) {
   const { node, CollectionComp } = options;