@player-ui/player 0.8.0-next.0 → 0.8.0-next.10

package/package.json

@@ -1,20 +1,16 @@
 {
   "name": "@player-ui/player",
-  "version": "0.8.0-next.0",
+  "version": "0.8.0-next.10",
   "main": "dist/cjs/index.cjs",
   "dependencies": {
-    "@player-ui/partial-match-registry": "0.8.0-next.0",
-    "@player-ui/make-flow": "0.8.0-next.0",
-    "@player-ui/types": "0.8.0-next.0",
+    "@player-ui/partial-match-registry": "0.8.0-next.10",
+    "@player-ui/make-flow": "0.8.0-next.10",
+    "@player-ui/types": "0.8.0-next.10",
     "@types/dlv": "^1.1.4",
-    "@types/parsimmon": "^1.10.0",
-    "arr-flatten": "^1.1.0",
     "dequal": "^2.0.2",
     "dlv": "^1.1.3",
-    "ebnf": "^1.9.0",
     "error-polyfill": "^0.1.3",
     "p-defer": "^3.0.0",
-    "parsimmon": "^1.12.0",
     "queue-microtask": "^1.2.3",
     "tapable-ts": "^0.2.3",
     "timm": "^1.6.2",

package/src/binding/__tests__/resolver.test.ts

@@ -1,7 +1,7 @@
 import { describe, test, expect, vitest } from "vitest";
 import get from "dlv";
 import type { ParserSuccessResult } from "../../binding-grammar";
-import { parseParsimmon } from "../../binding-grammar";
+import { parseCustom } from "../../binding-grammar";
 import { resolveBindingAST } from "../resolver";
 import { getBindingSegments } from "../utils";
 
@@ -33,7 +33,7 @@ const testCases: Array<[string, string]> = [
 ];
 
 test.each(testCases)("Resolving binding: %s", (binding, expectedResolved) => {
-  const parsedBinding = parseParsimmon(binding);
+  const parsedBinding = parseCustom(binding);
   expect(parsedBinding.status).toBe(true);
   const actual = resolveBindingAST(
     (parsedBinding as ParserSuccessResult).path,
@@ -48,7 +48,7 @@ test.each(testCases)("Resolving binding: %s", (binding, expectedResolved) => {
 });
 
 test("works for nested keys", () => {
-  const parsedBinding = parseParsimmon("foo.{{BASE_PATH}}.bar");
+  const parsedBinding = parseCustom("foo.{{BASE_PATH}}.bar");
   expect(parsedBinding.status).toBe(true);
 
   const resolved = resolveBindingAST(
@@ -65,7 +65,7 @@ test("works for nested keys", () => {
 
 describe("expressions", () => {
   test("evaluates expressions as paths", () => {
-    const parsedBinding = parseParsimmon("foo.bar.`exp()`");
+    const parsedBinding = parseCustom("foo.bar.`exp()`");
 
     const evaluate = vitest.fn().mockReturnValue(100);
     const resolved = resolveBindingAST(

package/src/binding-grammar/{ebnf → __tests__/ebnf}/index.ts

@@ -8,14 +8,14 @@ import type {
   ConcatenatedNode,
   QueryNode,
   ExpressionNode,
-} from "../ast";
+} from "../../ast";
 import {
   toValue,
   toQuery,
   toPath,
   toConcatenatedNode,
   toExpression,
-} from "../ast";
+} from "../../ast";
 import type {
   ValueToken,
   ModelRefToken,

package/src/binding-grammar/__tests__/parser.test.ts

@@ -6,8 +6,8 @@ import {
   VALID_AST_PARSER_CUSTOM_TESTS,
 } from "./test-utils/ast-cases";
 import type { ParserSuccessResult, ParserFailureResult } from "../ast";
-import { parse as parseParsimmon } from "../parsimmon";
-import { parse as parseEBNF } from "../ebnf";
+import { parse as parseParsimmon } from "./parsimmon";
+import { parse as parseEBNF } from "./ebnf";
 import { parse as parseCustom } from "../custom";
 
 describe("parsimmon", () => {

package/src/binding-grammar/{parsimmon → __tests__/parsimmon}/index.ts

@@ -1,14 +1,14 @@
 import flatten from "arr-flatten";
 import type { Parser } from "parsimmon";
 import P from "parsimmon";
-import type { Parser as BindingParser } from "../ast";
+import type { Parser as BindingParser } from "../../ast";
 import {
   toValue,
   toConcatenatedNode,
   toQuery,
   toPath,
   toExpression,
-} from "../ast";
+} from "../../ast";
 
 const doubleQuote = P.string('"');
 const singleQuote = P.string("'");

package/src/binding-grammar/index.ts

@@ -1,4 +1,2 @@
 export * from "./ast";
-export { parse as parseParsimmon } from "./parsimmon";
-export { parse as parseEBNF } from "./ebnf";
 export { parse as parseCustom } from "./custom";

package/src/plugins/default-view-plugin.ts

@@ -1,6 +1,8 @@
 import type { Player, PlayerPlugin } from "../player";
 import {
   ApplicabilityPlugin,
+  AssetPlugin,
+  MultiNodePlugin,
   StringResolverPlugin,
   SwitchPlugin,
   TemplatePlugin,
@@ -17,12 +19,14 @@ export class DefaultViewPlugin implements PlayerPlugin {
     player.hooks.viewController.tap(this.name, (viewController) => {
       viewController.hooks.view.tap(this.name, (view) => {
         const pluginOptions = toNodeResolveOptions(view.resolverOptions);
+        new AssetPlugin().apply(view);
         new SwitchPlugin(pluginOptions).apply(view);
         new ApplicabilityPlugin().apply(view);
         new StringResolverPlugin().apply(view);
         const templatePlugin = new TemplatePlugin(pluginOptions);
         templatePlugin.apply(view);
         view.hooks.onTemplatePluginCreated.call(templatePlugin);
+        new MultiNodePlugin().apply(view);
       });
     });
   }

package/src/view/__tests__/view.immutable.test.ts

@@ -3,7 +3,12 @@ import { LocalModel, withParser, PipelinedDataModel } from "../../data";
 import { ExpressionEvaluator } from "../../expressions";
 import { BindingParser } from "../../binding";
 import { SchemaController } from "../../schema";
-import { ApplicabilityPlugin, StringResolverPlugin, ViewInstance } from "..";
+import {
+  ApplicabilityPlugin,
+  AssetPlugin,
+  StringResolverPlugin,
+  ViewInstance,
+} from "..";
 import { NodeType } from "../parser";
 
 const parseBinding = new BindingParser().parse;
@@ -34,6 +39,7 @@ test("uses the exact same object if nothing changes", () => {
   );
 
   new StringResolverPlugin().apply(view);
+  new AssetPlugin().apply(view);
 
   view.hooks.resolver.tap("input", (resolver) => {
     resolver.hooks.resolve.tap("input", (value, astNode, options) => {
@@ -205,6 +211,7 @@ test("hardcore immutability", () => {
   );
 
   new StringResolverPlugin().apply(view);
+  new AssetPlugin().apply(view);
 
   const resolved = view.update();
 

package/src/view/__tests__/view.test.ts

@@ -4,6 +4,7 @@ import { ExpressionEvaluator } from "../../expressions";
 import { BindingParser } from "../../binding";
 import { SchemaController } from "../../schema";
 import {
+  MultiNodePlugin,
   StringResolverPlugin,
   SwitchPlugin,
   ViewInstance,
@@ -80,7 +81,7 @@ describe("view", () => {
       expect(updated).toBe(resolved);
     });
 
-    test("works with no valid switch cases in an array", () => {
+    test("works with no valid static switch cases in an array", () => {
       const model = withParser(new LocalModel({}), parseBinding);
       const evaluator = new ExpressionEvaluator({ model });
       const schema = new SchemaController();
@@ -122,6 +123,7 @@ describe("view", () => {
 
       const pluginOptions = toNodeResolveOptions(view.resolverOptions);
       new SwitchPlugin(pluginOptions).apply(view);
+      new MultiNodePlugin().apply(view);
       new StringResolverPlugin().apply(view);
 
       const resolved = view.update();
@@ -132,6 +134,60 @@ describe("view", () => {
       });
     });
 
+    test("works with no valid dynamic switch cases in an array", () => {
+      const model = withParser(new LocalModel({}), parseBinding);
+      const evaluator = new ExpressionEvaluator({ model });
+      const schema = new SchemaController();
+
+      const view = new ViewInstance(
+        {
+          id: "test",
+          type: "view",
+          title: [
+            {
+              dynamicSwitch: [
+                {
+                  case: false,
+                  asset: {
+                    id: "false-case",
+                    type: "text",
+                    value: "some text",
+                  },
+                },
+                {
+                  case: false,
+                  asset: {
+                    id: "false-case-2",
+                    type: "text",
+                    value: "some text",
+                  },
+                },
+              ],
+            },
+          ],
+        },
+        {
+          model,
+          parseBinding,
+          evaluator,
+          schema,
+        },
+      );
+
+      const pluginOptions = toNodeResolveOptions(view.resolverOptions);
+      new SwitchPlugin(pluginOptions).apply(view);
+      new MultiNodePlugin().apply(view);
+      new StringResolverPlugin().apply(view);
+
+      const resolved = view.update();
+
+      expect(resolved).toStrictEqual({
+        id: "test",
+        title: [],
+        type: "view",
+      });
+    });
+
     it("does not return a field object if the case does not resolve an asset", () => {
       const model = withParser(
         new LocalModel({
@@ -381,6 +437,7 @@ describe("view", () => {
 
       const pluginOptions = toNodeResolveOptions(view.resolverOptions);
       new SwitchPlugin(pluginOptions).apply(view);
+      new MultiNodePlugin().apply(view);
       new StringResolverPlugin().apply(view);
 
       const resolved = view.update();
@@ -735,6 +792,7 @@ describe("view", () => {
 
       const pluginOptions = toNodeResolveOptions(view.resolverOptions);
       new SwitchPlugin(pluginOptions).apply(view);
+      new MultiNodePlugin().apply(view);
       new StringResolverPlugin().apply(view);
 
       const resolved = view.update();

package/src/view/parser/__tests__/parser.test.ts

@@ -3,7 +3,13 @@ import { BindingParser } from "../../../binding";
 import { LocalModel, withParser } from "../../../data";
 import { SchemaController } from "../../../schema";
 import { NodeType, Parser } from "../index";
-import { SwitchPlugin, ApplicabilityPlugin, TemplatePlugin } from "../..";
+import {
+  SwitchPlugin,
+  ApplicabilityPlugin,
+  TemplatePlugin,
+  MultiNodePlugin,
+  AssetPlugin,
+} from "../..";
 import type { Options } from "../../plugins/options";
 import { ExpressionEvaluator } from "../../../expressions";
 import type { DataModelWithParser } from "../../../data";
@@ -30,9 +36,11 @@ describe("generates the correct AST", () => {
         model,
       },
     };
+    new AssetPlugin().applyParser(parser);
     new TemplatePlugin(options).applyParser(parser);
     new ApplicabilityPlugin().applyParser(parser);
     new SwitchPlugin(options).applyParser(parser);
+    new MultiNodePlugin().applyParser(parser);
   });
 
   test("works with basic objects", () => {
@@ -154,8 +162,10 @@ describe("parseView", () => {
         model,
       },
     };
+    new AssetPlugin().applyParser(parser);
     new TemplatePlugin(options).applyParser(parser);
     new ApplicabilityPlugin().applyParser(parser);
+    new MultiNodePlugin().applyParser(parser);
     new SwitchPlugin(options).applyParser(parser);
   });
 
@@ -249,8 +259,13 @@ describe("generates the correct AST when using switch plugin", () => {
       return true;
     },
   } as any);
+  const multiNodePlugin = new MultiNodePlugin();
+  const assetPlugin = new AssetPlugin();
+
   const parser = new Parser();
   switchPlugin.applyParser(parser);
+  multiNodePlugin.applyParser(parser);
+  assetPlugin.applyParser(parser);
 
   test("works with asset wrapped objects", () => {
     expect(parser.parseObject(toughStaticSwitchView)).toMatchSnapshot();