@player-tools/dsl 0.4.0-next.2 → 0.4.0-next.3

package/dist/index.esm.js

@@ -4,9 +4,8 @@ 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';
+import { SyncWaterfallHook, SyncHook, AsyncSeriesWaterfallHook, AsyncSeriesHook } from 'tapable-ts';
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map-js';
 
 const IDSuffixContext = React.createContext("root");
@@ -73,25 +72,25 @@ const OptionalIDSuffixProvider = (props) => {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const OpaqueIdentifier = Symbol("TemplateStringType");
 const TemplateStringComponent = (props) => {
   return React.createElement("value", {
@@ -122,7 +121,7 @@ const createTemplateInstance = (options) => {
   const element = React.createElement(TemplateStringComponent, {
     value: toString()
   }, null);
-  return __spreadProps$3(__spreadValues$4({}, element), {
+  return __spreadProps$4(__spreadValues$5({}, element), {
     [OpaqueIdentifier]: true,
     toString,
     toValue,
@@ -132,7 +131,7 @@ const createTemplateInstance = (options) => {
   });
 };
 const createBindingTemplateInstance = (options) => {
-  const templateInstance = createTemplateInstance(__spreadProps$3(__spreadValues$4({}, options), {
+  const templateInstance = createTemplateInstance(__spreadProps$4(__spreadValues$5({}, options), {
     toRefString: (context, value) => {
       return `{{${value}}}`;
     }
@@ -141,7 +140,7 @@ const createBindingTemplateInstance = (options) => {
   return templateInstance;
 };
 const createExpressionTemplateInstance = (options) => {
-  const templateInstance = createTemplateInstance(__spreadProps$3(__spreadValues$4({}, options), {
+  const templateInstance = createTemplateInstance(__spreadProps$4(__spreadValues$5({}, options), {
     toRefString: (contextOptions, value) => {
       if ((contextOptions == null ? void 0 : contextOptions.nestedContext) === "expression") {
         return value;
@@ -168,54 +167,60 @@ const expression = (strings, ...nested) => {
   });
 };
 const isTemplateStringInstance = (val) => {
-  return typeof val === "object" && val[OpaqueIdentifier] === true;
+  return val !== null && typeof val === "object" && val[OpaqueIdentifier] === true;
 };
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 function toArray(val) {
   return Array.isArray(val) ? val : [val];
 }
-function toJsonElement(value, index) {
-  const keyProp = index === void 0 ? null : { key: index };
+function toJsonElement(value, indexOrKey, options) {
+  var _a;
+  const indexProp = typeof indexOrKey === "number" ? { key: indexOrKey } : null;
   if (Array.isArray(value)) {
-    return /* @__PURE__ */ React.createElement("array", __spreadValues$3({}, keyProp), value.map((item, idx) => toJsonElement(item, idx)));
+    return /* @__PURE__ */ React.createElement("array", __spreadValues$4({}, indexProp), value.map((item, idx) => toJsonElement(item, idx, options)));
   }
   if (isTemplateStringInstance(value)) {
-    return /* @__PURE__ */ React.createElement("value", __spreadValues$3({}, keyProp), value.toRefString());
+    if (typeof indexOrKey === "string" && ((_a = options == null ? void 0 : options.propertiesToSkip) == null ? void 0 : _a.includes(indexOrKey))) {
+      return /* @__PURE__ */ React.createElement("value", __spreadValues$4({}, indexProp), value.toValue());
+    }
+    return /* @__PURE__ */ React.createElement("value", __spreadValues$4({}, indexProp), value.toRefString());
   }
   if (typeof value === "object" && value !== null) {
-    return /* @__PURE__ */ React.createElement("obj", __spreadValues$3({}, keyProp), Object.keys(value).map((key) => /* @__PURE__ */ React.createElement("property", {
+    return /* @__PURE__ */ React.createElement("obj", __spreadValues$4({}, indexProp), Object.keys(value).map((key) => /* @__PURE__ */ React.createElement("property", {
       key,
       name: key
-    }, toJsonElement(value[key]))));
+    }, toJsonElement(value[key], key, options))));
   }
-  return /* @__PURE__ */ React.createElement("value", __spreadProps$2(__spreadValues$3({}, keyProp), {
+  return /* @__PURE__ */ React.createElement("value", __spreadProps$3(__spreadValues$4({}, indexProp), {
     value
   }));
 }
-function toJsonProperties(value) {
-  return Object.keys(value).map((key) => /* @__PURE__ */ React.createElement("property", {
-    key,
-    name: key
-  }, toJsonElement(value[key])));
+function toJsonProperties(value, options = { propertiesToSkip: ["applicability"] }) {
+  return Object.keys(value).map((key) => {
+    return /* @__PURE__ */ React.createElement("property", {
+      key,
+      name: key
+    }, toJsonElement(value[key], key, options));
+  });
 }
 function normalizeText(options) {
   const { node, TextComp } = options;
@@ -236,36 +241,36 @@ function normalizeToCollection(options) {
     }
     return /* @__PURE__ */ React.createElement(CollectionComp, null, node);
   }
-  return normalizeText(__spreadProps$2(__spreadValues$3({}, options), { node }));
+  return normalizeText(__spreadProps$3(__spreadValues$4({}, options), { node }));
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
+var __defProp$3 = Object.defineProperty;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
+  if (source != null && __getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$3.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -291,7 +296,7 @@ const Asset = React.forwardRef((props, ref) => {
   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$2({
+  return /* @__PURE__ */ React.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, {
     wrapperRef: localRef
@@ -308,13 +313,28 @@ const Asset = React.forwardRef((props, ref) => {
   }, type), applicability !== void 0 && /* @__PURE__ */ React.createElement("property", {
     name: "applicability"
   }, /* @__PURE__ */ React.createElement("value", {
-    value: typeof applicability === "boolean" ? applicability : applicability.toRefString()
+    value: typeof applicability === "boolean" ? applicability : applicability.toValue()
   })), toJsonProperties(rest), children)))));
 });
 Asset.defaultProps = {
   id: void 0,
   children: void 0
 };
+const View = React.forwardRef((props, ref) => {
+  const _a = props, { validation, children } = _a, rest = __objRest(_a, ["validation", "children"]);
+  return /* @__PURE__ */ React.createElement(Asset, __spreadValues$3({
+    ref
+  }, rest), validation && /* @__PURE__ */ React.createElement("property", {
+    key: "validation",
+    name: "validation"
+  }, toJsonElement(validation, "validation", {
+    propertiesToSkip: ["ref"]
+  })), children);
+});
+View.defaultProps = {
+  id: void 0,
+  children: void 0
+};
 const Slot = (props) => {
   var _a, _b;
   const { TextComp, CollectionComp } = props;
@@ -350,31 +370,31 @@ const Slot = (props) => {
 function createSlot(options) {
   return (props) => {
     const _a = props, { children } = _a, other = __objRest(_a, ["children"]);
-    return /* @__PURE__ */ React.createElement(Slot, __spreadProps$1(__spreadValues$2({}, options), {
+    return /* @__PURE__ */ React.createElement(Slot, __spreadProps$2(__spreadValues$3({}, options), {
       additionalProperties: other
     }), children);
   };
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __defProp$2 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 const SwitchContext = React.createContext({});
 const Switch = (props) => {
   const slotContext = React.useContext(SlotContext);
@@ -382,7 +402,7 @@ const Switch = (props) => {
   return /* @__PURE__ */ React.createElement("obj", {
     ref: propertyNode
   }, /* @__PURE__ */ React.createElement(SwitchContext.Provider, {
-    value: __spreadProps(__spreadValues$1({}, props), {
+    value: __spreadProps$1(__spreadValues$2({}, props), {
       TextComp: slotContext == null ? void 0 : slotContext.TextComp,
       CollectionComp: slotContext == null ? void 0 : slotContext.CollectionComp
     })
@@ -434,7 +454,7 @@ const Case = (props) => {
   })), /* @__PURE__ */ React.createElement(IDSuffixProvider, {
     suffix: `${switchContext.isDynamic ? "dynamicSwitch" : "staticSwitch"}-${caseIndex}`
   }, /* @__PURE__ */ React.createElement(SlotContext.Provider, {
-    value: slotContext ? __spreadProps(__spreadValues$1({}, slotContext), { wrapInAsset: false }) : void 0
+    value: slotContext ? __spreadProps$1(__spreadValues$2({}, slotContext), { wrapInAsset: false }) : void 0
   }, /* @__PURE__ */ React.createElement("property", {
     name: "asset"
   }, normalizeToCollection({
@@ -506,7 +526,9 @@ const getParentProperty = (node) => {
   }
 };
 const Template = (props) => {
+  var _a;
   const baseContext = React.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);
@@ -541,19 +563,40 @@ const Template = (props) => {
     name: "output"
   }, outputProp), /* @__PURE__ */ React.createElement("property", {
     name: "value"
-  }, props.children)))), outputElement), /* @__PURE__ */ React.createElement("value", {
+  }, props.children), dynamicProp && /* @__PURE__ */ React.createElement("property", {
+    name: "dynamic"
+  }, toJsonElement(dynamicProp))))), outputElement), /* @__PURE__ */ React.createElement("value", {
     ref: valueRef,
     value: void 0
   }));
 };
 
+var __defProp$1 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b2) => {
+  for (var prop in b2 || (b2 = {}))
+    if (__hasOwnProp$1.call(b2, prop))
+      __defNormalProp$1(a, prop, b2[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b2)) {
+      if (__propIsEnum$1.call(b2, prop))
+        __defNormalProp$1(a, prop, b2[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b2) => __defProps(a, __getOwnPropDescs(b2));
 const bindingSymbol = Symbol("binding");
 const SchemaTypeName = Symbol("Schema Rename");
 const isTypeDef = (property) => {
   return property.type !== void 0;
 };
 class SchemaGenerator {
-  constructor() {
+  constructor(logger) {
     this.hooks = {
       createSchemaNode: new SyncWaterfallHook()
     };
@@ -562,10 +605,10 @@ class SchemaGenerator {
         ROOT: {}
       };
       this.children = [];
-      this.generatedDataTypeNames.clear();
+      this.generatedDataTypes.clear();
       Object.keys(schema).forEach((property) => {
         const subType = schema[property];
-        newSchema.ROOT[property] = this.hooks.createSchemaNode.call(this.processChildren(property, subType), subType);
+        newSchema.ROOT[property] = this.hooks.createSchemaNode.call(this.processChild(property, subType), subType);
       });
       while (this.children.length > 0) {
         const c = this.children.pop();
@@ -576,7 +619,7 @@ class SchemaGenerator {
         const typeDef = {};
         Object.keys(child).forEach((property) => {
           const subType = child[property];
-          typeDef[property] = this.hooks.createSchemaNode.call(this.processChildren(property, subType), subType);
+          typeDef[property] = this.hooks.createSchemaNode.call(this.processChild(property, subType), subType);
         });
         newSchema[name] = typeDef;
       }
@@ -588,17 +631,18 @@ class SchemaGenerator {
       };
     };
     this.children = [];
-    this.generatedDataTypeNames = new Map();
+    this.generatedDataTypes = new Map();
+    this.logger = logger != null ? logger : console;
   }
-  processChildren(property, subType) {
-    var _a, _b;
+  processChild(property, subType) {
+    var _a, _b, _c;
     if (isTypeDef(subType)) {
       return subType;
     }
     let intermediateType;
     if (Array.isArray(subType)) {
       if (subType.length > 1) {
-        signale.warn(`Type ${property} has multiple types in array, should only contain one top level object type. Only taking first defined type`);
+        this.logger.warn(`Type ${property} has multiple types in array, should only contain one top level object type. Only taking first defined type`);
       }
       const subTypeName = (_a = subType[0][SchemaTypeName]) != null ? _a : property;
       intermediateType = this.makePlaceholderArrayType(subTypeName);
@@ -608,13 +652,23 @@ class SchemaGenerator {
       intermediateType = this.makePlaceholderType(subTypeName);
       this.children.push({ name: intermediateType.type, child: subType });
     }
-    if (this.generatedDataTypeNames.has(intermediateType.type)) {
-      if (!dequal(subType, this.generatedDataTypeNames.get(intermediateType.type))) {
-        throw new Error(`Error: Generated two intermediate types with the name: ${intermediateType.type} that are of different shapes`);
+    if (this.generatedDataTypes.has(intermediateType.type)) {
+      const generatedType = this.generatedDataTypes.get(intermediateType.type);
+      if (!dequal(subType, (_c = this.generatedDataTypes.get(intermediateType.type)) == null ? void 0 : _c.node)) {
+        generatedType.count += 1;
+        const newIntermediateType = __spreadProps(__spreadValues$1({}, intermediateType), {
+          type: `${intermediateType.type}${generatedType.count}`
+        });
+        this.logger.warn(`WARNING: Generated two intermediate types with the name: ${intermediateType.type} that are of different shapes, using artificial type ${newIntermediateType.type}`);
+        intermediateType = newIntermediateType;
+        this.children.pop();
+        this.children.push({ name: intermediateType.type, child: subType });
       }
-      this.children.pop();
     }
-    this.generatedDataTypeNames.set(intermediateType.type, subType);
+    this.generatedDataTypes.set(intermediateType.type, {
+      node: subType,
+      count: 1
+    });
     return intermediateType;
   }
   makePlaceholderArrayType(typeName) {
@@ -746,10 +800,14 @@ const mergeSourceMaps = (sourceMaps, generated) => {
   return generator.toString();
 };
 class DSLCompiler {
-  constructor() {
+  constructor(logger) {
     this.hooks = {
-      schemaGenerator: new SyncHook()
+      schemaGenerator: new SyncHook(),
+      preProcessFlow: new AsyncSeriesWaterfallHook(),
+      postProcessFlow: new AsyncSeriesWaterfallHook(),
+      onEnd: new AsyncSeriesHook()
     };
+    this.logger = logger != null ? logger : console;
   }
   serialize(value) {
     return __async(this, null, function* () {
@@ -757,6 +815,8 @@ class DSLCompiler {
       if (typeof value !== "object" || value === null) {
         throw new Error("Unable to serialize non-object");
       }
+      const schemaGenerator = new SchemaGenerator(this.logger);
+      this.hooks.schemaGenerator.call(schemaGenerator);
       if (React.isValidElement(value)) {
         const { jsonValue, sourceMap } = yield render(value, {
           collectSourceMap: true
@@ -767,9 +827,10 @@ class DSLCompiler {
           contentType: "view"
         };
       }
-      if ("navigation" in value) {
+      const preProcessedValue = yield this.hooks.preProcessFlow.call(value);
+      if ("navigation" in preProcessedValue) {
         const allSourceMaps = [];
-        const copiedValue = __spreadValues({}, value);
+        const copiedValue = __spreadValues({}, preProcessedValue);
         copiedValue.views = yield Promise.all((_b = (_a = copiedValue == null ? void 0 : copiedValue.views) == null ? void 0 : _a.map((node) => __async(this, null, function* () {
           const { jsonValue, sourceMap, stringValue } = yield render(node, {
             collectSourceMap: true
@@ -786,13 +847,13 @@ class DSLCompiler {
           }
           return jsonValue;
         }))) != null ? _b : []);
-        if ("navigation" in value) {
-          Object.entries(value.navigation).forEach(([navKey, node]) => {
+        if ("navigation" in preProcessedValue) {
+          Object.entries(preProcessedValue.navigation).forEach(([navKey, node]) => {
             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)) {
-                  const actualViewIndex = (_b2 = (_a2 = value.views) == null ? void 0 : _a2.indexOf) == null ? void 0 : _b2.call(_a2, flowNode.ref);
+                  const actualViewIndex = (_b2 = (_a2 = preProcessedValue.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;
                     copiedValue.navigation[navKey][nodeKey].ref = actualId;
@@ -801,25 +862,27 @@ class DSLCompiler {
               });
             }
           });
+          if ("schema" in preProcessedValue) {
+            copiedValue.schema = schemaGenerator.toSchema(copiedValue.schema);
+          }
           copiedValue.navigation = parseNavigationExpressions(copiedValue.navigation);
         }
         if (value) {
+          const postProcessFlow = yield this.hooks.postProcessFlow.call(copiedValue);
           return {
-            value: copiedValue,
+            value: postProcessFlow,
             contentType: "flow",
             sourceMap: mergeSourceMaps(allSourceMaps, JSON.stringify(copiedValue, null, 2))
           };
         }
       }
-      const schemaGenerator = new SchemaGenerator();
-      this.hooks.schemaGenerator.call(schemaGenerator);
       return {
-        value: schemaGenerator.toSchema(value),
+        value: schemaGenerator.toSchema(preProcessedValue),
         contentType: "schema"
       };
     });
   }
 }
 
-export { Asset, AssetWrapper, DSLCompiler, GeneratedIDProperty, IDProvider, IDSuffixIndexProvider, IDSuffixProvider, IndexSuffixStopContext, OptionalIDSuffixProvider, SchemaGenerator, SchemaTypeName, Slot, SlotContext, Switch, Template, TemplateContext, TemplateStringComponent, binding, createSlot, expression, getBindingFromObject, getBindingStringFromObject, getRefStringFromObject, isTemplateStringInstance, makeBindingsForObject, normalizeText, normalizeToCollection, toArray, toJsonElement, toJsonProperties, useGetIdPrefix, useIndexInSlot };
+export { Asset, AssetWrapper, DSLCompiler, GeneratedIDProperty, IDProvider, IDSuffixIndexProvider, IDSuffixProvider, IndexSuffixStopContext, OptionalIDSuffixProvider, SchemaGenerator, SchemaTypeName, Slot, SlotContext, Switch, Template, TemplateContext, TemplateStringComponent, View, binding, createSlot, expression, getBindingFromObject, getBindingStringFromObject, getRefStringFromObject, isTemplateStringInstance, makeBindingsForObject, normalizeText, normalizeToCollection, toArray, toJsonElement, toJsonProperties, useGetIdPrefix, useIndexInSlot };
 //# sourceMappingURL=index.esm.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/dsl",
-  "version": "0.4.0-next.2",
+  "version": "0.4.0-next.3",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -12,7 +12,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",
     "command-line-application": "^0.10.1",
     "fs-extra": "^10.0.0",
@@ -23,7 +22,6 @@
     "react-json-reconciler": "^2.0.0",
     "react-merge-refs": "^1.1.0",
     "source-map-js": "^1.0.2",
-    "signale": "^1.4.0",
     "ts-node": "^10.4.0",
     "typescript": "4.8.4",
     "tapable-ts": "^0.1.0",