@player-ui/player 0.15.5 → 0.15.7

package/package.json

@@ -6,12 +6,12 @@
     "types"
   ],
   "name": "@player-ui/player",
-  "version": "0.15.5",
+  "version": "0.15.7",
   "main": "dist/cjs/index.cjs",
   "dependencies": {
-    "@player-ui/partial-match-registry": "0.15.5",
-    "@player-ui/make-flow": "0.15.5",
-    "@player-ui/types": "0.15.5",
+    "@player-ui/partial-match-registry": "0.15.7",
+    "@player-ui/make-flow": "0.15.7",
+    "@player-ui/types": "0.15.7",
     "@types/dlv": "^1.1.4",
     "dequal": "^2.0.2",
     "dlv": "^1.1.3",

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

@@ -845,4 +845,94 @@ describe("templates", () => {
     // Make sure the ordering is preserved in the snapshot
     expect(resolved.asset.values).toMatchSnapshot();
   });
+
+  it("Should respect placement for a template nested under a non-asset/view value node (e.g. topicGroup.values[x].topics)", () => {
+    const model = withParser(new LocalModel({}), parseBinding);
+    const evaluator = new ExpressionEvaluator({ model });
+    const schema = new SchemaController();
+
+    // "values" here is generated by an outer template, so each item (e.g. the object
+    // at topicGroup.values[x]) is parsed as a plain NodeType.Value node rather than an
+    // Asset/View node. That item has its own static "topics" array plus a nested
+    // template targeting "topics" with a placement - which needs to be sorted just like
+    // it would be on an Asset/View node.
+    const view = new ViewInstance(
+      {
+        id: "my-view",
+        asset: {
+          id: "topicGroup",
+          type: "collection",
+          template: [
+            {
+              dynamic: false,
+              data: "groups",
+              output: "values",
+              value: {
+                id: "group-_index_",
+                topics: [
+                  {
+                    asset: {
+                      id: "static-topic-1-_index_",
+                      type: "text",
+                      value: "static topic 1",
+                    },
+                  },
+                  {
+                    asset: {
+                      id: "static-topic-2-_index_",
+                      type: "text",
+                      value: "static topic 2",
+                    },
+                  },
+                ],
+                template: [
+                  {
+                    dynamic: false,
+                    data: "foo.topics",
+                    output: "topics",
+                    placement: "prepend",
+                    value: {
+                      asset: {
+                        id: "topic-_index1_",
+                        type: "text",
+                        value: "topic {{foo.topics._index1_}}",
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      } as any,
+      {
+        model,
+        parseBinding,
+        evaluator,
+        schema,
+      },
+    );
+
+    const pluginOptions = toNodeResolveOptions(view.resolverOptions);
+    new TemplatePlugin(pluginOptions).apply(view);
+    new StringResolverPlugin().apply(view);
+    new AssetPlugin().apply(view);
+    new MultiNodePlugin().apply(view);
+
+    model.set([
+      ["groups", [{}]],
+      ["foo.topics", ["A", "B"]],
+    ]);
+
+    const resolved: any = view.update();
+    const topics = resolved.asset.values[0].topics;
+
+    expect(topics).toHaveLength(4);
+    // Prepend placement means the templated topics should come before the static ones,
+    // even though "topics" is declared before "template" in the source.
+    expect(topics[0].asset.value).toBe("topic A");
+    expect(topics[1].asset.value).toBe("topic B");
+    expect(topics[2].asset.value).toBe("static topic 1");
+    expect(topics[3].asset.value).toBe("static topic 2");
+  });
 });

package/src/view/plugins/template.ts

@@ -146,7 +146,9 @@ export class TemplatePlugin implements ViewPlugin {
 
       if (
         node &&
-        (node.type === NodeType.View || node.type === NodeType.Asset) &&
+        (node.type === NodeType.View ||
+          node.type === NodeType.Asset ||
+          node.type === NodeType.Value) &&
         Array.isArray(node.children)
       ) {
         node.children = node.children.sort((a, b) => {