@player-tools/dsl 0.10.0-next.0 → 0.10.1

package/src/__tests__/jsx.test.tsx

@@ -46,7 +46,7 @@ test("works with JSX", async () => {
   );
 
   expect((await render(element)).jsonValue).toStrictEqual(
-    expectedBasicCollection
+    expectedBasicCollection,
   );
 });
 
@@ -57,7 +57,7 @@ test("works for any json props", async () => {
     other: "",
   };
   expect(
-    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue
+    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue,
   ).toStrictEqual(testObj);
 });
 
@@ -67,7 +67,7 @@ test("works for BindingTemplateInstances and ExpressionTemplateInstances", async
     page_experience: e`foo.bar.GetDataResult`,
   };
   expect(
-    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue
+    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue,
   ).toStrictEqual(expectedTemplateInstanceObjects);
 });
 
@@ -103,7 +103,7 @@ test("flattens fragments", async () => {
   );
 
   expect((await render(element)).jsonValue).toStrictEqual(
-    expectedBasicCollection
+    expectedBasicCollection,
   );
 });
 
@@ -124,15 +124,15 @@ test("can ignore json props", async () => {
     other: "",
   };
   expect(
-    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue
+    (await render(<object>{toJsonProperties(testObj)}</object>)).jsonValue,
   ).toStrictEqual(processedTestObj);
   expect(
     (
       await render(
         <object>
           {toJsonProperties(testObj, { propertiesToSkip: ["foo"] })}
-        </object>
+        </object>,
       )
-    ).jsonValue
+    ).jsonValue,
   ).toStrictEqual(unprocessedTestObj);
 });

package/src/__tests__/schema.test.tsx

@@ -37,20 +37,18 @@ describe("Schema Bindings Generate Properly", () => {
     expect(schema.main.sub2.toRefString()).toStrictEqual("{{main.sub2}}");
     expect(schema.main.sub2[0].toRefString()).toStrictEqual("{{main.sub2.0}}");
     expect(schema.main.sub2._index_.toRefString()).toStrictEqual(
-      "{{main.sub2._index_}}"
+      "{{main.sub2._index_}}",
     );
 
     expect(schema.main.sub2[0].val.toRefString()).toStrictEqual(
-      "{{main.sub2.0.val}}"
+      "{{main.sub2.0.val}}",
+    );
+    expect(schema.main.sub2["_index_"].toRefString()).toStrictEqual(
+      "{{main.sub2._index_}}",
+    );
+    expect(schema.main.sub2["_index_"].val.toRefString()).toStrictEqual(
+      "{{main.sub2._index_.val}}",
     );
-    expect(
-      // eslint-disable-next-line dot-notation
-      schema.main.sub2["_index_"].toRefString()
-    ).toStrictEqual("{{main.sub2._index_}}");
-    expect(
-      // eslint-disable-next-line dot-notation
-      schema.main.sub2["_index_"].val.toRefString()
-    ).toStrictEqual("{{main.sub2._index_.val}}");
   });
 
   test("is able to serialize to a schema object", () => {
@@ -191,7 +189,7 @@ describe("Schema Bindings Generate Properly", () => {
     const results = g.toSchema(badObj);
     expect(mockLogger.warn).toHaveBeenCalledTimes(1);
     expect(mockLogger.warn).toHaveBeenCalledWith(
-      "WARNING: Generated two intermediate types with the name: subType that are of different shapes, using artificial type subType2"
+      "WARNING: Generated two intermediate types with the name: subType that are of different shapes, using artificial type subType2",
     );
     expect(results).toMatchInlineSnapshot(`
     {
@@ -292,7 +290,7 @@ describe("Schema Bindings Generate Properly", () => {
     const content = await render(
       <obj>
         <property name="test">{schema.main.sub.a}</property>
-      </obj>
+      </obj>,
     );
 
     expect(content.jsonValue).toMatchInlineSnapshot(`
@@ -332,7 +330,7 @@ describe("Schema Bindings Generate Properly", () => {
     expect(schema.main.sub.c.enum).toStrictEqual(["A", "B", "C"]);
     // make sure iterable method is still there and works
     expect(
-      schema.main.sub.c.enum.every((it: any) => typeof it === "string")
+      schema.main.sub.c.enum.every((it: any) => typeof it === "string"),
     ).toStrictEqual(true);
   });
 });

package/src/__tests__/view-api.test.tsx

@@ -20,7 +20,7 @@ describe("View", () => {
           ]}
         >
           <Info.Title>Cool Title</Info.Title>
-        </Info>
+        </Info>,
       )
     ).jsonValue;
 

package/src/auto-id.tsx

@@ -18,7 +18,7 @@ export const IDSuffixProvider = (
   props: WithChildren<{
     /** The suffix to append */
     suffix: string;
-  }>
+  }>,
 ) => {
   const currentPrefix = useGetIdPrefix();
 
@@ -41,7 +41,7 @@ export const IDProvider = (
   props: WithChildren<{
     /** The new id to use  */
     id?: string;
-  }>
+  }>,
 ) => {
   if (props.id) {
     return (
@@ -51,7 +51,6 @@ export const IDProvider = (
     );
   }
 
-  // eslint-disable-next-line react/jsx-no-useless-fragment
   return <>{props.children}</>;
 };
 
@@ -67,7 +66,7 @@ export const useIndexInSlot = (ref: React.RefObject<JsonNode>) => {
 
     if (ref.current && slotContext?.ref.current?.valueNode?.type === "array") {
       const allChildren = flattenNodes(
-        slotContext.ref.current.valueNode.children
+        slotContext.ref.current.valueNode.children,
       );
       const foundIndex = allChildren.indexOf(ref.current);
 
@@ -88,14 +87,13 @@ export const IDSuffixIndexProvider = (
 
     /** if the suffix is in a template, the id to use */
     templateIndex?: string;
-  }>
+  }>,
 ) => {
   const slotIndex = useIndexInSlot(props.wrapperRef);
 
   const stopIndex = React.useContext(IndexSuffixStopContext);
 
   if (stopIndex) {
-    // eslint-disable-next-line react/jsx-no-useless-fragment
     return <>{props.children}</>;
   }
 
@@ -116,7 +114,7 @@ export const OptionalIDSuffixProvider = (
 
     /** if the suffix is in a template, the id to use */
     templateIndex?: string;
-  }>
+  }>,
 ) => {
   const slotContext = React.useContext(SlotContext);
 
@@ -131,7 +129,6 @@ export const OptionalIDSuffixProvider = (
     );
   }
 
-  // eslint-disable-next-line react/jsx-no-useless-fragment
   return <>{props.children}</>;
 };
 

package/src/compiler/__tests__/compiler.test.tsx

@@ -10,7 +10,7 @@ test("treats jsx as view", async () => {
   const result = await compiler.serialize(
     <object>
       <property name="foo">bar</property>
-    </object>
+    </object>,
   );
   expect(result).toBeDefined();
   expect(result?.value).toStrictEqual({

package/src/compiler/__tests__/schema.test.ts

@@ -1,5 +1,5 @@
 import { test, expect } from "vitest";
-import { SchemaGenerator, makeBindingsForObject } from "../schema";
+import { SchemaGenerator } from "../schema";
 
 const BasicDataType = {
   type: "StringType",
@@ -20,7 +20,7 @@ test("generates proper schema", () => {
           item1: BasicDataType,
         },
       ],
-    })
+    }),
   ).toStrictEqual({
     ROOT: {
       foo: {
@@ -75,7 +75,7 @@ test("Edge Case - two artificial array nodes", () => {
           },
         ],
       },
-    })
+    }),
   ).toMatchInlineSnapshot(`
     {
       "ROOT": {

package/src/compiler/compiler.ts

@@ -72,7 +72,7 @@ type SourceMapList = Array<{
 /** Given a list of source maps for all generated views, merge them into 1 */
 const mergeSourceMaps = (
   sourceMaps: SourceMapList,
-  generated: string
+  generated: string,
 ): string => {
   const generator = new SourceMapGenerator();
   sourceMaps.forEach(({ sourceMap, offsetIndexSearch, source }) => {
@@ -135,7 +135,7 @@ export class DSLCompiler {
   /** Convert an object (flow, view, schema, etc) into it's JSON representation */
   async serialize(
     value: unknown,
-    context?: SerializeContext
+    context?: SerializeContext,
   ): Promise<CompilerReturn> {
     if (typeof value !== "object" || value === null) {
       throw new Error("Unable to serialize non-object");
@@ -183,8 +183,8 @@ export class DSLCompiler {
                 .split("\n")
                 .find((line) =>
                   line.includes(
-                    `"id": "${(jsonValue as Record<string, string>).id}"`
-                  )
+                    `"id": "${(jsonValue as Record<string, string>).id}"`,
+                  ),
                 );
 
               if (searchIdLine) {
@@ -200,7 +200,7 @@ export class DSLCompiler {
           }
 
           return node;
-        }) ?? []
+        }) ?? [],
       )) as View[];
 
       // Go through the flow and sub out any view refs that are react elements w/ the right id
@@ -216,7 +216,7 @@ export class DSLCompiler {
                 React.isValidElement(flowNode.ref)
               ) {
                 const actualViewIndex = (value as Flow).views?.indexOf?.(
-                  flowNode.ref as any
+                  flowNode.ref as any,
                 );
 
                 if (actualViewIndex !== undefined && actualViewIndex > -1) {
@@ -236,19 +236,18 @@ export class DSLCompiler {
       }
 
       copiedValue.navigation = parseNavigationExpressions(
-        copiedValue.navigation
+        copiedValue.navigation,
       );
 
       if (value) {
-        const postProcessFlow = await this.hooks.postProcessFlow.call(
-          copiedValue
-        );
+        const postProcessFlow =
+          await this.hooks.postProcessFlow.call(copiedValue);
 
         return {
           value: postProcessFlow as JsonType,
           sourceMap: mergeSourceMaps(
             allSourceMaps,
-            JSON.stringify(copiedValue, null, 2)
+            JSON.stringify(copiedValue, null, 2),
           ),
         };
       }

package/src/compiler/schema.ts

@@ -51,7 +51,7 @@ export class SchemaGenerator {
     createSchemaNode: new SyncWaterfallHook<
       [
         node: Schema.DataType,
-        originalProperty: Record<string | symbol, unknown>
+        originalProperty: Record<string | symbol, unknown>,
       ]
     >(),
   };
@@ -78,7 +78,7 @@ export class SchemaGenerator {
       const subType = schema[property] as SchemaNode;
       newSchema.ROOT[property] = this.hooks.createSchemaNode.call(
         this.processChild(property, subType),
-        subType as any
+        subType as any,
       );
     });
 
@@ -95,7 +95,7 @@ export class SchemaGenerator {
         const subType = (child as any)[property] as SchemaNode;
         typeDef[property] = this.hooks.createSchemaNode.call(
           this.processChild(property, subType),
-          subType as any
+          subType as any,
         );
       });
       newSchema[name] = typeDef;
@@ -119,7 +119,7 @@ export class SchemaGenerator {
     if (Array.isArray(subType)) {
       if (subType.length > 1) {
         this.logger.warn(
-          `Type ${property} has multiple types in array, should only contain one top level object type. Only taking first defined type`
+          `Type ${property} has multiple types in array, should only contain one top level object type. Only taking first defined type`,
         );
       }
 
@@ -136,12 +136,12 @@ export class SchemaGenerator {
 
     if (this.generatedDataTypes.has(intermediateType.type)) {
       const generatedType = this.generatedDataTypes.get(
-        intermediateType.type
+        intermediateType.type,
       ) as GeneratedDataType;
       if (
         !dequal(
           child,
-          this.generatedDataTypes.get(intermediateType.type)?.node as object
+          this.generatedDataTypes.get(intermediateType.type)?.node as object,
         )
       ) {
         generatedType.count += 1;
@@ -150,7 +150,7 @@ export class SchemaGenerator {
           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}`
+          `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();
@@ -195,8 +195,8 @@ export type MakeBindingRefable<T> = {
   [P in keyof T]: T[P] extends object[]
     ? MakeArrayIntoIndexRef<T[P]>
     : T[P] extends unknown[]
-    ? T[P]
-    : MakeBindingRefable<T[P]>;
+      ? T[P]
+      : MakeBindingRefable<T[P]>;
 } & BindingTemplateInstance;
 
 /**
@@ -204,7 +204,7 @@ export type MakeBindingRefable<T> = {
  */
 export function makeBindingsForObject<Type>(
   obj: Type,
-  arrayAccessorKeys = ["_index_"]
+  arrayAccessorKeys = ["_index_"],
 ): MakeBindingRefable<Type> {
   /** Proxy to track binding callbacks */
   const accessor = (paths: string[]) => {

package/src/compiler/types.ts

@@ -90,7 +90,7 @@ export type DefaultCompilerContentType =
 
 /** Helper function to determine whether a content type is compiler default */
 export function isDefaultCompilerContentType(
-  t: string
+  t: string,
 ): t is DefaultCompilerContentType {
   return DefaultCompilerContentTypes.includes(t as DefaultCompilerContentType);
 }

package/src/compiler/utils.ts

@@ -4,7 +4,7 @@ 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
+  filename?: string,
 ): DefaultCompilerContentType | undefined => {
   if (content !== null || content !== undefined) {
     if (React.isValidElement(content as any)) {

package/src/components.tsx

@@ -157,7 +157,7 @@ export const View = React.forwardRef<ObjectNode, AssetProps & ViewType>(
         {children}
       </Asset>
     );
-  }
+  },
 );
 
 View.displayName = "View";
@@ -213,7 +213,6 @@ export const Slot = (props: {
               <array>
                 {React.Children.map(children, (child, index) => {
                   return (
-                    // eslint-disable-next-line react/no-array-index-key
                     <React.Fragment key={`${props.name}-${index}`}>
                       {normalizeText({ node: child, TextComp })}
                     </React.Fragment>
@@ -260,7 +259,7 @@ export function createSlot<SlotProps = unknown>(options: {
     props: {
       /** An object to include in this property */
       children?: React.ReactNode;
-    } & SlotProps
+    } & SlotProps,
   ) => {
     const { children, ...other } = props;
     return (

package/src/string-templates/__tests__/binding.test.ts

@@ -10,7 +10,7 @@ describe("string template binding", () => {
   test("returns string ref versions", () => {
     expect(b`foo.bar.baz`.toRefString()).toBe("{{foo.bar.baz}}");
     expect(b`foo.bar.${b`foo.bar`}`.toRefString()).toBe(
-      "{{foo.bar.{{foo.bar}}}}"
+      "{{foo.bar.{{foo.bar}}}}",
     );
   });
 
@@ -20,13 +20,13 @@ describe("string template binding", () => {
 
     const expr = e`test() == "foo"`;
     expect(b`${expr}.${expr}`.toValue()).toBe(
-      '`test() == "foo"`.`test() == "foo"`'
+      '`test() == "foo"`.`test() == "foo"`',
     );
   });
 
   test("works when in a string", () => {
     expect(`This is a ${b`foo.bar`} reference.`).toBe(
-      "This is a {{foo.bar}} reference."
+      "This is a {{foo.bar}} reference.",
     );
   });
 
@@ -38,11 +38,11 @@ describe("string template binding", () => {
   test("should provide unique identifiers for each _index_ provided for the binding in the template", () => {
     const segments = ["some", "_index_", "data", "_index_", "foo", "_index_"];
     expect(b`${segments.join(".")}`.toValue()).toBe(
-      "some._index_.data._index1_.foo._index2_"
+      "some._index_.data._index1_.foo._index2_",
     );
 
     expect(b`${segments.join(".")}`.toRefString()).toBe(
-      "{{some._index_.data._index1_.foo._index2_}}"
+      "{{some._index_.data._index1_.foo._index2_}}",
     );
   });
 
@@ -57,11 +57,11 @@ describe("string template binding", () => {
     const segments = ["some", "_index_", "data", "_index_", "foo", "_index_"];
 
     const expressionNestedBindings = e`test(${b`${segments.join(
-      "."
+      ".",
     )}`})`.toValue();
 
     expect(expressionNestedBindings).toBe(
-      "test({{some._index_.data._index1_.foo._index2_}})"
+      "test({{some._index_.data._index1_.foo._index2_}})",
     );
   });
 
@@ -77,11 +77,11 @@ describe("string template binding", () => {
     ];
 
     const expressionNestedBindings = e`test(${b`${segments.join(
-      "."
+      ".",
     )}`} == true, ${b`some._index_.data`} = ${b`some._index_.other._index_.data`})`.toValue();
 
     expect(expressionNestedBindings).toBe(
-      "test({{some._index_.data._index1_.foo._index2_.bar}} == true, {{some._index_.data}} = {{some._index_.other._index1_.data}})"
+      "test({{some._index_.data._index1_.foo._index2_.bar}} == true, {{some._index_.data}} = {{some._index_.other._index1_.data}})",
     );
   });
 });

package/src/string-templates/__tests__/edge-cases.test.ts

@@ -1,4 +1,4 @@
-import { test, expect, describe } from "vitest";
+import { test, expect } from "vitest";
 import { isTemplateStringInstance } from "..";
 
 test("isTemplateStringInstance with null", () => {

package/src/string-templates/__tests__/expression.test.ts

@@ -10,6 +10,7 @@ test("works with nested expressions", () => {
 
 test("throws errors for syntactically wrong expressions", () => {
   expect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const exp = e`something(1,2`;
   }).toThrowErrorMatchingInlineSnapshot(`
     [Error: Error: Expected ) at character 13 in expression: 

package/src/string-templates/__tests__/react.test.tsx

@@ -11,7 +11,7 @@ test("can be used as a react child element", async () => {
       <object>
         <property name="expression">{e`test()`}</property>
         <property name="binding">{b`foo.bar`}</property>
-      </object>
+      </object>,
     )
   ).jsonValue;
 
@@ -26,7 +26,7 @@ test("Works when used as a child asset", async () => {
     await render(
       <Collection>
         <Collection.Label>{b`foo.bar`}</Collection.Label>
-      </Collection>
+      </Collection>,
     )
   ).jsonValue;
 
@@ -52,7 +52,7 @@ test("Works as a switch child", async () => {
             <Switch.Case>Testing 123 {b`foo.bar`}</Switch.Case>
           </Switch>
         </Collection.Label>
-      </Collection>
+      </Collection>,
     )
   ).jsonValue;
 

package/src/string-templates/index.ts

@@ -18,7 +18,7 @@ export interface TemplateInstanceRefStringOptions {
   /** Convert the value to a reference nested in the given context */
   toRefString: (
     options: TemplateRefStringOptions | undefined,
-    value: string
+    value: string,
   ) => string;
 }
 
@@ -55,13 +55,13 @@ export const TemplateStringComponent = (props: {
     {
       value: props.value,
     },
-    null
+    null,
   );
 };
 
 /** The generic template string handler */
 const createTemplateInstance = (
-  options: TemplateInstanceRefStringOptions
+  options: TemplateInstanceRefStringOptions,
 ): TemplateStringType => {
   const value = options.strings.reduce((sum, next, i) => {
     const element = options.other[i];
@@ -109,7 +109,7 @@ const createTemplateInstance = (
     {
       value: toString(),
     },
-    null
+    null,
   ) as TemplateStringType;
 
   return {
@@ -137,15 +137,15 @@ const addBindingIndexes = (binding: string): string => {
 
 /** Creating an instance of a handler for bindings */
 const createBindingTemplateInstance = (
-  options: Omit<TemplateInstanceRefStringOptions, "toRefString">
+  options: Omit<TemplateInstanceRefStringOptions, "toRefString">,
 ): BindingTemplateInstance => {
   const templateInstance = createTemplateInstance({
     ...options,
     strings: options.strings.map((element: string) =>
-      addBindingIndexes(element)
+      addBindingIndexes(element),
     ),
     other: options.other.map((element) =>
-      typeof element === "string" ? addBindingIndexes(element) : element
+      typeof element === "string" ? addBindingIndexes(element) : element,
     ),
     toRefString: (context, value) => {
       return `{{${value}}}`;
@@ -159,7 +159,7 @@ const createBindingTemplateInstance = (
 
 /** Creating an instance of a handler for bindings */
 const createExpressionTemplateInstance = (
-  options: Omit<TemplateInstanceRefStringOptions, "toRefString">
+  options: Omit<TemplateInstanceRefStringOptions, "toRefString">,
 ) => {
   const templateInstance = createTemplateInstance({
     ...options,
@@ -206,7 +206,7 @@ export const expression = (
 
 /** Check if a value is a template string */
 export const isTemplateStringInstance = (
-  val: unknown
+  val: unknown,
 ): val is ExpressionTemplateInstance | BindingTemplateInstance => {
   return (
     val !== null &&
@@ -217,7 +217,7 @@ export const isTemplateStringInstance = (
 
 /** Check if a value is a binding */
 export const isBindingTemplateInstance = (
-  val: unknown
+  val: unknown,
 ): val is BindingTemplateInstance => {
   return (
     val !== null &&

package/src/switch.tsx

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