@player-tools/dsl 0.4.0-next.4 → 0.4.0

package/dist/index.cjs.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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');
@@ -14,7 +13,6 @@ var sourceMapJs = require('source-map-js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var flattenChildren__default = /*#__PURE__*/_interopDefaultLegacy(flattenChildren);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
 const IDSuffixContext = React__default["default"].createContext("root");
@@ -252,6 +250,16 @@ function normalizeToCollection(options) {
   }
   return normalizeText(__spreadProps$3(__spreadValues$4({}, options), { node }));
 }
+function flattenChildren(children) {
+  const childrenArray = React__default["default"].Children.toArray(children);
+  return childrenArray.reduce((flatChildren, child) => {
+    if (child.type === React__default["default"].Fragment) {
+      return flatChildren.concat(flattenChildren(child.props.children));
+    }
+    flatChildren.push(child);
+    return flatChildren;
+  }, []);
+}
 
 var __defProp$3 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
@@ -347,7 +355,7 @@ View.defaultProps = {
 const Slot = (props) => {
   var _a, _b;
   const { TextComp, CollectionComp } = props;
-  const children = flattenChildren__default["default"](props.children);
+  const children = flattenChildren(props.children);
   const propRef = React__default["default"].useRef(null);
   return /* @__PURE__ */ React__default["default"].createElement("property", {
     ref: propRef,
@@ -696,6 +704,9 @@ function makeBindingsForObject(obj, arrayAccessorKeys = ["_index_"]) {
       },
       get(target, key) {
         const bindingKeys = Object.keys(target);
+        if (Array.isArray(target[key]) && target[key].length > 0 && target[key].every((it) => typeof it !== "object")) {
+          return [...target[key]];
+        }
         if (!bindingMap.has(target)) {
           bindingMap.set(target, binding`${paths.join(".")}`);
         }
@@ -729,6 +740,20 @@ const getRefStringFromObject = (obj) => {
   return getBindingFromObject(obj).toRefString();
 };
 
+const fingerprintContent = (content, filename) => {
+  if (content !== null || content !== void 0) {
+    if (React__default["default"].isValidElement(content)) {
+      return "view";
+    }
+    if (typeof content === "object" && "navigation" in content) {
+      return "flow";
+    }
+    if (!filename || filename.includes("schema")) {
+      return "schema";
+    }
+  }
+};
+
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -818,51 +843,53 @@ class DSLCompiler {
     };
     this.logger = logger != null ? logger : console;
   }
-  serialize(value) {
+  serialize(value, context) {
     return __async(this, null, function* () {
       var _a, _b;
       if (typeof value !== "object" || value === null) {
         throw new Error("Unable to serialize non-object");
       }
+      const type = (context == null ? void 0 : context.type) ? context.type : fingerprintContent(value);
       const schemaGenerator = new SchemaGenerator(this.logger);
       this.hooks.schemaGenerator.call(schemaGenerator);
-      if (React__default["default"].isValidElement(value)) {
+      if (type === "view") {
         const { jsonValue, sourceMap } = yield reactJsonReconciler.render(value, {
           collectSourceMap: true
         });
         return {
           value: jsonValue,
-          sourceMap,
-          contentType: "view"
+          sourceMap
         };
       }
-      const preProcessedValue = yield this.hooks.preProcessFlow.call(value);
-      if ("navigation" in preProcessedValue) {
+      if (type === "flow") {
         const allSourceMaps = [];
-        const copiedValue = __spreadValues({}, preProcessedValue);
+        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* () {
-          const { jsonValue, sourceMap, stringValue } = yield reactJsonReconciler.render(node, {
-            collectSourceMap: true
-          });
-          if (sourceMap) {
-            const searchIdLine = stringValue.split("\n").find((line) => line.includes(`"id": "${jsonValue.id}"`));
-            if (searchIdLine) {
-              allSourceMaps.push({
-                sourceMap,
-                offsetIndexSearch: searchIdLine,
-                source: stringValue
-              });
+          if (React__default["default"].isValidElement(node)) {
+            const { jsonValue, sourceMap, stringValue } = yield reactJsonReconciler.render(node, {
+              collectSourceMap: true
+            });
+            if (sourceMap) {
+              const searchIdLine = stringValue.split("\n").find((line) => line.includes(`"id": "${jsonValue.id}"`));
+              if (searchIdLine) {
+                allSourceMaps.push({
+                  sourceMap,
+                  offsetIndexSearch: searchIdLine,
+                  source: stringValue
+                });
+              }
             }
+            return jsonValue;
           }
-          return jsonValue;
+          return node;
         }))) != null ? _b : []);
-        if ("navigation" in preProcessedValue) {
-          Object.entries(preProcessedValue.navigation).forEach(([navKey, node]) => {
+        if ("navigation" in value) {
+          Object.entries(value.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__default["default"].isValidElement(flowNode.ref)) {
-                  const actualViewIndex = (_b2 = (_a2 = preProcessedValue.views) == null ? void 0 : _a2.indexOf) == null ? void 0 : _b2.call(_a2, 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;
                     copiedValue.navigation[navKey][nodeKey].ref = actualId;
@@ -871,7 +898,7 @@ class DSLCompiler {
               });
             }
           });
-          if ("schema" in preProcessedValue) {
+          if ("schema" in copiedValue) {
             copiedValue.schema = schemaGenerator.toSchema(copiedValue.schema);
           }
           copiedValue.navigation = parseNavigationExpressions(copiedValue.navigation);
@@ -880,19 +907,25 @@ class DSLCompiler {
           const postProcessFlow = yield this.hooks.postProcessFlow.call(copiedValue);
           return {
             value: postProcessFlow,
-            contentType: "flow",
             sourceMap: mergeSourceMaps(allSourceMaps, JSON.stringify(copiedValue, null, 2))
           };
         }
       }
-      return {
-        value: schemaGenerator.toSchema(preProcessedValue),
-        contentType: "schema"
-      };
+      if (type === "schema") {
+        return {
+          value: schemaGenerator.toSchema(value)
+        };
+      }
+      throw Error("DSL Compiler Error: Unable to determine type to compile as");
     });
   }
 }
 
+const DefaultCompilerContentTypes = ["view", "flow", "schema"];
+function isDefaultCompilerContentType(t) {
+  return DefaultCompilerContentTypes.includes(t);
+}
+
 exports.Asset = Asset;
 exports.AssetWrapper = AssetWrapper;
 exports.DSLCompiler = DSLCompiler;
@@ -914,9 +947,12 @@ exports.View = View;
 exports.binding = binding;
 exports.createSlot = createSlot;
 exports.expression = expression;
+exports.fingerprintContent = fingerprintContent;
+exports.flattenChildren = flattenChildren;
 exports.getBindingFromObject = getBindingFromObject;
 exports.getBindingStringFromObject = getBindingStringFromObject;
 exports.getRefStringFromObject = getRefStringFromObject;
+exports.isDefaultCompilerContentType = isDefaultCompilerContentType;
 exports.isTemplateStringInstance = isTemplateStringInstance;
 exports.makeBindingsForObject = makeBindingsForObject;
 exports.normalizeText = normalizeText;

package/dist/index.d.ts

@@ -230,6 +230,13 @@ declare function normalizeToCollection(options: {
     /** A collection asset */
     CollectionComp?: React$1.ComponentType;
 }): React$1.ReactNode;
+declare type ReactChildArray = ReturnType<typeof React$1.Children.toArray>;
+/**
+ *
+ * Hoisted from https://github.com/gregberge/react-flatten-children/blob/master/src/index.tsx
+ * Peer dependencies were wrong and can't be reasonably patch it everywhere
+ */
+declare function flattenChildren(children: React$1.ReactNode): ReactChildArray;
 
 interface SwitchProps {
     /** defaults to a staticSwitch */
@@ -302,7 +309,7 @@ declare type MakeArrayIntoIndexRef<T extends any[]> = {
     _index_: MakeBindingRefable<T[0]>;
 } & BindingTemplateInstance;
 declare type MakeBindingRefable<T> = {
-    [P in keyof T]: T[P] extends any[] ? MakeArrayIntoIndexRef<T[P]> : MakeBindingRefable<T[P]>;
+    [P in keyof T]: T[P] extends object[] ? MakeArrayIntoIndexRef<T[P]> : T[P] extends unknown[] ? T[P] : MakeBindingRefable<T[P]>;
 } & BindingTemplateInstance;
 /**
  * Adds bindings to an object so that the object can be directly used in JSX
@@ -344,6 +351,29 @@ interface DSLSchema {
 declare type SerializeType = 'view' | 'flow' | 'schema' | 'navigation';
 declare type SerializablePlayerExportTypes = React.ReactElement | FlowWithReactViews | Schema.Schema | Navigation$1;
 declare type LoggingInterface = Pick<Console, 'warn' | 'error' | 'log'>;
+declare type CompilationResult = {
+    /** What type of file is generated */
+    contentType: string;
+    /** The output path */
+    outputFile: string;
+    /** the input file */
+    inputFile: string;
+};
+declare type CompilerReturn = {
+    /** the JSON value of the source */
+    value: JsonType | undefined;
+    /** The sourcemap of the content */
+    sourceMap?: string;
+};
+/** The different type of default content items the compiler handles */
+declare const DefaultCompilerContentTypes: readonly ["view", "flow", "schema"];
+declare type DefaultCompilerContentType = typeof DefaultCompilerContentTypes[number];
+/** Helper function to determine whether a content type is compiler default */
+declare function isDefaultCompilerContentType(t: string): t is DefaultCompilerContentType;
+interface SerializeContext {
+    /** The type of the content being compiled */
+    type: DefaultCompilerContentType;
+}
 
 /**
  * Argument passed to the DSLCompiler onEnd hook
@@ -364,14 +394,10 @@ declare class DSLCompiler {
     };
     constructor(logger?: LoggingInterface);
     /** Convert an object (flow, view, schema, etc) into it's JSON representation */
-    serialize(value: unknown): Promise<{
-        /** the JSON value of the source */
-        value: JsonType | undefined;
-        /** the fingerprinted content type of the source */
-        contentType: SerializeType;
-        /** The sourcemap of the content */
-        sourceMap?: string;
-    }>;
+    serialize(value: unknown, context?: SerializeContext): Promise<CompilerReturn | undefined>;
 }
 
-export { AddUnknownIndex, Asset, AssetProps, AssetPropsWithChildren, AssetWrapper, BindingTemplateInstance, CaseProps, DSLCompiler, DSLFlow, DSLSchema, ExpressionTemplateInstance, FlowWithReactViews, FlowWithoutUnknown, GeneratedIDProperty, IDProvider, IDSuffixIndexProvider, IDSuffixProvider, IndexSuffixStopContext, LoggingInterface, MakeArrayIntoIndexRef, MakeBindingRefable, NavFlowState, Navigation, NavigationFlowReactViewState, NavigationFlowWithReactView, NavigationWithReactViews, OmitProp, OnEndArg, OptionalIDSuffixProvider, PlayerApplicability, RemoveUnknownIndex, SchemaGenerator, SchemaTypeName, SerializablePlayerExportTypes, SerializeType, Slot, SlotContext, SwapKeysToType, Switch, SwitchProps, Template, TemplateContext, TemplateContextType, TemplateInstanceRefStringContext, TemplateInstanceRefStringOptions, TemplateProps, TemplateRefStringOptions, TemplateStringComponent, TemplateStringType, View, WithChildren, WithTemplateTypes, binding, createSlot, expression, getBindingFromObject, getBindingStringFromObject, getRefStringFromObject, isTemplateStringInstance, makeBindingsForObject, normalizeText, normalizeToCollection, toArray, toJsonElement, toJsonOptions, toJsonProperties, useGetIdPrefix, useIndexInSlot };
+/** Basic way of identifying the type of file based on the default content export */
+declare const fingerprintContent: (content: unknown, filename?: string) => DefaultCompilerContentType | undefined;
+
+export { AddUnknownIndex, Asset, AssetProps, AssetPropsWithChildren, AssetWrapper, BindingTemplateInstance, CaseProps, CompilationResult, CompilerReturn, DSLCompiler, DSLFlow, DSLSchema, DefaultCompilerContentType, ExpressionTemplateInstance, FlowWithReactViews, FlowWithoutUnknown, GeneratedIDProperty, IDProvider, IDSuffixIndexProvider, IDSuffixProvider, IndexSuffixStopContext, LoggingInterface, MakeArrayIntoIndexRef, MakeBindingRefable, NavFlowState, Navigation, NavigationFlowReactViewState, NavigationFlowWithReactView, NavigationWithReactViews, OmitProp, OnEndArg, OptionalIDSuffixProvider, PlayerApplicability, RemoveUnknownIndex, SchemaGenerator, SchemaTypeName, SerializablePlayerExportTypes, SerializeContext, SerializeType, Slot, SlotContext, SwapKeysToType, Switch, SwitchProps, Template, TemplateContext, TemplateContextType, TemplateInstanceRefStringContext, TemplateInstanceRefStringOptions, TemplateProps, TemplateRefStringOptions, TemplateStringComponent, TemplateStringType, View, WithChildren, WithTemplateTypes, binding, createSlot, expression, fingerprintContent, flattenChildren, getBindingFromObject, getBindingStringFromObject, getRefStringFromObject, isDefaultCompilerContentType, isTemplateStringInstance, makeBindingsForObject, normalizeText, normalizeToCollection, toArray, toJsonElement, toJsonOptions, toJsonProperties, useGetIdPrefix, useIndexInSlot };

package/dist/index.esm.js

@@ -1,5 +1,4 @@
 import React from 'react';
-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';
@@ -243,6 +242,16 @@ function normalizeToCollection(options) {
   }
   return normalizeText(__spreadProps$3(__spreadValues$4({}, options), { node }));
 }
+function flattenChildren(children) {
+  const childrenArray = React.Children.toArray(children);
+  return childrenArray.reduce((flatChildren, child) => {
+    if (child.type === React.Fragment) {
+      return flatChildren.concat(flattenChildren(child.props.children));
+    }
+    flatChildren.push(child);
+    return flatChildren;
+  }, []);
+}
 
 var __defProp$3 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
@@ -687,6 +696,9 @@ function makeBindingsForObject(obj, arrayAccessorKeys = ["_index_"]) {
       },
       get(target, key) {
         const bindingKeys = Object.keys(target);
+        if (Array.isArray(target[key]) && target[key].length > 0 && target[key].every((it) => typeof it !== "object")) {
+          return [...target[key]];
+        }
         if (!bindingMap.has(target)) {
           bindingMap.set(target, binding`${paths.join(".")}`);
         }
@@ -720,6 +732,20 @@ const getRefStringFromObject = (obj) => {
   return getBindingFromObject(obj).toRefString();
 };
 
+const fingerprintContent = (content, filename) => {
+  if (content !== null || content !== void 0) {
+    if (React.isValidElement(content)) {
+      return "view";
+    }
+    if (typeof content === "object" && "navigation" in content) {
+      return "flow";
+    }
+    if (!filename || filename.includes("schema")) {
+      return "schema";
+    }
+  }
+};
+
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -809,51 +835,53 @@ class DSLCompiler {
     };
     this.logger = logger != null ? logger : console;
   }
-  serialize(value) {
+  serialize(value, context) {
     return __async(this, null, function* () {
       var _a, _b;
       if (typeof value !== "object" || value === null) {
         throw new Error("Unable to serialize non-object");
       }
+      const type = (context == null ? void 0 : context.type) ? context.type : fingerprintContent(value);
       const schemaGenerator = new SchemaGenerator(this.logger);
       this.hooks.schemaGenerator.call(schemaGenerator);
-      if (React.isValidElement(value)) {
+      if (type === "view") {
         const { jsonValue, sourceMap } = yield render(value, {
           collectSourceMap: true
         });
         return {
           value: jsonValue,
-          sourceMap,
-          contentType: "view"
+          sourceMap
         };
       }
-      const preProcessedValue = yield this.hooks.preProcessFlow.call(value);
-      if ("navigation" in preProcessedValue) {
+      if (type === "flow") {
         const allSourceMaps = [];
-        const copiedValue = __spreadValues({}, preProcessedValue);
+        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* () {
-          const { jsonValue, sourceMap, stringValue } = yield render(node, {
-            collectSourceMap: true
-          });
-          if (sourceMap) {
-            const searchIdLine = stringValue.split("\n").find((line) => line.includes(`"id": "${jsonValue.id}"`));
-            if (searchIdLine) {
-              allSourceMaps.push({
-                sourceMap,
-                offsetIndexSearch: searchIdLine,
-                source: stringValue
-              });
+          if (React.isValidElement(node)) {
+            const { jsonValue, sourceMap, stringValue } = yield render(node, {
+              collectSourceMap: true
+            });
+            if (sourceMap) {
+              const searchIdLine = stringValue.split("\n").find((line) => line.includes(`"id": "${jsonValue.id}"`));
+              if (searchIdLine) {
+                allSourceMaps.push({
+                  sourceMap,
+                  offsetIndexSearch: searchIdLine,
+                  source: stringValue
+                });
+              }
             }
+            return jsonValue;
           }
-          return jsonValue;
+          return node;
         }))) != null ? _b : []);
-        if ("navigation" in preProcessedValue) {
-          Object.entries(preProcessedValue.navigation).forEach(([navKey, node]) => {
+        if ("navigation" in value) {
+          Object.entries(value.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 = preProcessedValue.views) == null ? void 0 : _a2.indexOf) == null ? void 0 : _b2.call(_a2, 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;
                     copiedValue.navigation[navKey][nodeKey].ref = actualId;
@@ -862,7 +890,7 @@ class DSLCompiler {
               });
             }
           });
-          if ("schema" in preProcessedValue) {
+          if ("schema" in copiedValue) {
             copiedValue.schema = schemaGenerator.toSchema(copiedValue.schema);
           }
           copiedValue.navigation = parseNavigationExpressions(copiedValue.navigation);
@@ -871,18 +899,24 @@ class DSLCompiler {
           const postProcessFlow = yield this.hooks.postProcessFlow.call(copiedValue);
           return {
             value: postProcessFlow,
-            contentType: "flow",
             sourceMap: mergeSourceMaps(allSourceMaps, JSON.stringify(copiedValue, null, 2))
           };
         }
       }
-      return {
-        value: schemaGenerator.toSchema(preProcessedValue),
-        contentType: "schema"
-      };
+      if (type === "schema") {
+        return {
+          value: schemaGenerator.toSchema(value)
+        };
+      }
+      throw Error("DSL Compiler Error: Unable to determine type to compile as");
     });
   }
 }
 
-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 };
+const DefaultCompilerContentTypes = ["view", "flow", "schema"];
+function isDefaultCompilerContentType(t) {
+  return DefaultCompilerContentTypes.includes(t);
+}
+
+export { Asset, AssetWrapper, DSLCompiler, GeneratedIDProperty, IDProvider, IDSuffixIndexProvider, IDSuffixProvider, IndexSuffixStopContext, OptionalIDSuffixProvider, SchemaGenerator, SchemaTypeName, Slot, SlotContext, Switch, Template, TemplateContext, TemplateStringComponent, View, binding, createSlot, expression, fingerprintContent, flattenChildren, getBindingFromObject, getBindingStringFromObject, getRefStringFromObject, isDefaultCompilerContentType, 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.4",
+  "version": "0.4.0",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -9,8 +9,8 @@
     "react": "^17.0.2"
   },
   "dependencies": {
-    "@player-ui/types": "0.4.0-next.7",
-    "@player-ui/player": "0.4.0-next.7",
+    "@player-ui/types": "0.4.1",
+    "@player-ui/player": "0.4.1",
     "@types/mkdirp": "^1.0.2",
     "chalk": "^4.0.1",
     "command-line-application": "^0.10.1",
@@ -24,7 +24,7 @@
     "source-map-js": "^1.0.2",
     "ts-node": "^10.4.0",
     "typescript": "4.8.4",
-    "tapable-ts": "^0.1.0",
+    "tapable-ts": "^0.2.4",
     "dequal": "^2.0.2",
     "@babel/runtime": "7.15.4"
   },

package/src/compiler/compiler.ts

@@ -8,7 +8,12 @@ import {
   AsyncSeriesWaterfallHook,
   SyncHook,
 } from 'tapable-ts';
-import type { LoggingInterface, SerializeType } from './types';
+import { fingerprintContent } from './utils';
+import type {
+  LoggingInterface,
+  CompilerReturn,
+  SerializeContext,
+} from './types';
 import type { Navigation } from '../types';
 import { SchemaGenerator } from './schema';
 
@@ -123,24 +128,20 @@ export class DSLCompiler {
   }
 
   /** Convert an object (flow, view, schema, etc) into it's JSON representation */
-  async serialize(value: unknown): Promise<{
-    /** the JSON value of the source */
-    value: JsonType | undefined;
-
-    /** the fingerprinted content type of the source */
-    contentType: SerializeType;
-
-    /** The sourcemap of the content */
-    sourceMap?: string;
-  }> {
+  async serialize(
+    value: unknown,
+    context?: SerializeContext
+  ): Promise<CompilerReturn | undefined> {
     if (typeof value !== 'object' || value === null) {
       throw new Error('Unable to serialize non-object');
     }
 
+    const type = context?.type ? context.type : fingerprintContent(value);
+
     const schemaGenerator = new SchemaGenerator(this.logger);
     this.hooks.schemaGenerator.call(schemaGenerator);
 
-    if (React.isValidElement(value)) {
+    if (type === 'view') {
       const { jsonValue, sourceMap } = await render(value, {
         collectSourceMap: true,
       });
@@ -148,82 +149,81 @@ export class DSLCompiler {
       return {
         value: jsonValue,
         sourceMap,
-        contentType: 'view',
       };
     }
 
-    const preProcessedValue = await this.hooks.preProcessFlow.call(value);
-
-    if ('navigation' in preProcessedValue) {
+    if (type === 'flow') {
       // Source maps from all the nested views
       // Merge these together before returning
       const allSourceMaps: SourceMapList = [];
 
       // Assume this is a flow
       const copiedValue: Flow = {
-        ...(preProcessedValue as any),
+        ...(value as any),
       };
 
       copiedValue.views = (await Promise.all(
         copiedValue?.views?.map(async (node: any) => {
-          const { jsonValue, sourceMap, stringValue } = await render(node, {
-            collectSourceMap: true,
-          });
-
-          if (sourceMap) {
-            // Find the line that is the id of the view
-            // Use that as the identifier for the sourcemap offset calc
-            const searchIdLine = stringValue
-              .split('\n')
-              .find((line) =>
-                line.includes(
-                  `"id": "${(jsonValue as Record<string, string>).id}"`
-                )
-              );
-
-            if (searchIdLine) {
-              allSourceMaps.push({
-                sourceMap,
-                offsetIndexSearch: searchIdLine,
-                source: stringValue,
-              });
+          if (React.isValidElement(node)) {
+            const { jsonValue, sourceMap, stringValue } = await render(node, {
+              collectSourceMap: true,
+            });
+
+            if (sourceMap) {
+              // Find the line that is the id of the view
+              // Use that as the identifier for the sourcemap offset calc
+              const searchIdLine = stringValue
+                .split('\n')
+                .find((line) =>
+                  line.includes(
+                    `"id": "${(jsonValue as Record<string, string>).id}"`
+                  )
+                );
+
+              if (searchIdLine) {
+                allSourceMaps.push({
+                  sourceMap,
+                  offsetIndexSearch: searchIdLine,
+                  source: stringValue,
+                });
+              }
             }
+
+            return jsonValue;
           }
 
-          return jsonValue;
+          return node;
         }) ?? []
       )) as View[];
 
       // Go through the flow and sub out any view refs that are react elements w/ the right id
-      if ('navigation' in preProcessedValue) {
-        Object.entries((preProcessedValue as Flow).navigation).forEach(
-          ([navKey, node]) => {
-            if (typeof node === 'object') {
-              Object.entries(node).forEach(([nodeKey, flowNode]) => {
-                if (
-                  flowNode &&
-                  typeof flowNode === 'object' &&
-                  'state_type' in flowNode &&
-                  flowNode.state_type === 'VIEW' &&
-                  React.isValidElement(flowNode.ref)
-                ) {
-                  const actualViewIndex = (
-                    preProcessedValue as Flow
-                  ).views?.indexOf?.(flowNode.ref as any);
-
-                  if (actualViewIndex !== undefined && actualViewIndex > -1) {
-                    const actualId = copiedValue.views?.[actualViewIndex]?.id;
-
-                    (copiedValue as any).navigation[navKey][nodeKey].ref =
-                      actualId;
-                  }
+      if ('navigation' in value) {
+        Object.entries((value as Flow).navigation).forEach(([navKey, node]) => {
+          if (typeof node === 'object') {
+            Object.entries(node).forEach(([nodeKey, flowNode]) => {
+              if (
+                flowNode &&
+                typeof flowNode === 'object' &&
+                'state_type' in flowNode &&
+                flowNode.state_type === 'VIEW' &&
+                React.isValidElement(flowNode.ref)
+              ) {
+                const actualViewIndex = (value as Flow).views?.indexOf?.(
+                  flowNode.ref as any
+                );
+
+                if (actualViewIndex !== undefined && actualViewIndex > -1) {
+                  const actualId = copiedValue.views?.[actualViewIndex]?.id;
+
+                  (copiedValue as any).navigation[navKey][nodeKey].ref =
+                    actualId;
                 }
-              });
-            }
+              }
+            });
           }
-        );
+        });
 
-        if ('schema' in preProcessedValue) {
+        if ('schema' in copiedValue) {
           copiedValue.schema = schemaGenerator.toSchema(copiedValue.schema);
         }
 
@@ -239,7 +239,6 @@ export class DSLCompiler {
 
         return {
           value: postProcessFlow as JsonType,
-          contentType: 'flow',
           sourceMap: mergeSourceMaps(
             allSourceMaps,
             JSON.stringify(copiedValue, null, 2)
@@ -248,9 +247,12 @@ export class DSLCompiler {
       }
     }
 
-    return {
-      value: schemaGenerator.toSchema(preProcessedValue) as JsonType,
-      contentType: 'schema',
-    };
+    if (type === 'schema') {
+      return {
+        value: schemaGenerator.toSchema(value) as JsonType,
+      };
+    }
+
+    throw Error('DSL Compiler Error: Unable to determine type to compile as');
   }
 }

package/src/compiler/index.ts

@@ -1,2 +1,3 @@
 export * from './compiler';
 export * from './types';
+export * from './utils';

package/src/compiler/schema.ts

@@ -188,8 +188,10 @@ export type MakeArrayIntoIndexRef<T extends any[]> = {
 } & BindingTemplateInstance;
 
 export type MakeBindingRefable<T> = {
-  [P in keyof T]: T[P] extends any[]
+  [P in keyof T]: T[P] extends object[]
     ? MakeArrayIntoIndexRef<T[P]>
+    : T[P] extends unknown[]
+    ? T[P]
     : MakeBindingRefable<T[P]>;
 } & BindingTemplateInstance;
 
@@ -212,6 +214,15 @@ export function makeBindingsForObject<Type>(
       get(target: any, key: any): any {
         const bindingKeys = Object.keys(target);
 
+        // If there is an array of primitives, just return a copy of that array
+        if (
+          Array.isArray(target[key]) &&
+          target[key].length > 0 &&
+          target[key].every((it: any) => typeof it !== 'object')
+        ) {
+          return [...target[key]];
+        }
+
         if (!bindingMap.has(target)) {
           bindingMap.set(target, b`${paths.join('.')}`);
         }

package/src/compiler/types.ts

@@ -8,6 +8,7 @@ import type {
   NavigationFlowState,
   NavigationFlowViewState,
 } from '@player-ui/types';
+import type { JsonType } from 'react-json-reconciler';
 import type { RemoveUnknownIndex, AddUnknownIndex } from '../types';
 
 export type NavigationFlowReactViewState = Omit<
@@ -63,3 +64,38 @@ export type SerializablePlayerExportTypes =
   | Navigation;
 
 export type LoggingInterface = Pick<Console, 'warn' | 'error' | 'log'>;
+
+export type CompilationResult = {
+  /** What type of file is generated */
+  contentType: string;
+  /** The output path */
+  outputFile: string;
+  /** the input file */
+  inputFile: string;
+};
+
+export type CompilerReturn = {
+  /** the JSON value of the source */
+  value: JsonType | undefined;
+
+  /** The sourcemap of the content */
+  sourceMap?: string;
+};
+
+/** The different type of default content items the compiler handles */
+const DefaultCompilerContentTypes = ['view', 'flow', 'schema'] as const;
+
+export type DefaultCompilerContentType =
+  typeof DefaultCompilerContentTypes[number];
+
+/** Helper function to determine whether a content type is compiler default */
+export function isDefaultCompilerContentType(
+  t: string
+): t is DefaultCompilerContentType {
+  return DefaultCompilerContentTypes.includes(t as DefaultCompilerContentType);
+}
+
+export interface SerializeContext {
+  /** The type of the content being compiled */
+  type: DefaultCompilerContentType;
+}

package/src/compiler/utils.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+import type { DefaultCompilerContentType } from './types';
+
+/** Basic way of identifying the type of file based on the default content export */
+export const fingerprintContent = (
+  content: unknown,
+  filename?: string
+): DefaultCompilerContentType | undefined => {
+  if (content !== null || content !== undefined) {
+    if (React.isValidElement(content as any)) {
+      return 'view';
+    }
+
+    if (typeof content === 'object' && 'navigation' in (content as any)) {
+      return 'flow';
+    }
+
+    if (!filename || filename.includes('schema')) {
+      return 'schema';
+    }
+  }
+};

package/src/components.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import flattenChildren from 'react-flatten-children';
 import type { ObjectNode, PropertyNode } from 'react-json-reconciler';
 import mergeRefs from 'react-merge-refs';
 import type { View as ViewType } from '@player-ui/types';
@@ -16,6 +15,7 @@ import {
   normalizeToCollection,
   toJsonElement,
   toJsonProperties,
+  flattenChildren,
 } from './utils';
 
 export type AssetProps = PlayerApplicability & {

package/src/index.ts

@@ -8,3 +8,4 @@ export * from './template';
 export * from 'react-json-reconciler';
 export * from './compiler/schema';
 export * from './compiler';
+export * from './compiler/types';

package/src/utils.tsx

@@ -124,3 +124,25 @@ export function normalizeToCollection(options: {
 
   return normalizeText({ ...options, node });
 }
+
+type ReactChildArray = ReturnType<typeof React.Children.toArray>;
+
+/**
+ *
+ * Hoisted from https://github.com/gregberge/react-flatten-children/blob/master/src/index.tsx
+ * Peer dependencies were wrong and can't be reasonably patch it everywhere
+ */
+export function flattenChildren(children: React.ReactNode): ReactChildArray {
+  const childrenArray = React.Children.toArray(children);
+  return childrenArray.reduce((flatChildren: ReactChildArray, child) => {
+    if ((child as React.ReactElement<any>).type === React.Fragment) {
+      return flatChildren.concat(
+        flattenChildren((child as React.ReactElement<any>).props.children)
+      );
+    }
+
+    flatChildren.push(child);
+
+    return flatChildren;
+  }, []);
+}