feat: update list and collection field matching

Author: chrismclarke

packages/scripts/src/commands/app-data/convert/processors/flowParser/flowParser.ts

@@ -5,7 +5,7 @@ import { arrayToHashmap, groupJsonByKey, IContentsEntry } from "../../utils";
 import BaseProcessor from "../base";
 
 export class FlowParserProcessor extends BaseProcessor<FlowTypes.FlowTypeWithData> {
-  public cacheVersion = 20240315.0;
+  public cacheVersion = 20240402.0;
 
   public parsers: { [flowType in FlowTypes.FlowType]: Parsers.DefaultParser } = {
     data_list: new Parsers.DataListParser(this),
@@ -14,6 +14,7 @@ export class FlowParserProcessor extends BaseProcessor<FlowTypes.FlowTypeWithDat
     global: new Parsers.DefaultParser(this),
     template: new Parsers.TemplateParser(this),
     tour: new Parsers.DefaultParser(this),
+    asset_pack: new Parsers.DefaultParser(this),
   };
 
   /** Keep a track of all processed flows by type and name (used in data_pipes)*/

packages/scripts/src/commands/app-data/convert/processors/flowParser/parsers/default.parser.ts

@@ -235,10 +235,10 @@ class RowProcessor {
       // handle custom fields
       if (!shouldSkip) {
         if (typeof value === "string") {
-          if (field.endsWith("_list")) {
+          if (field.endsWith("_list") || field.includes("_list_")) {
             this.row[field] = parseAppDataListString(value);
           }
-          if (field.endsWith("_collection")) {
+          if (field.endsWith("_collection") || field.includes("_collection_")) {
             this.row[field] = parseAppDataCollectionString(this.row[field]);
           }
           if (field.endsWith("action_list")) {

packages/scripts/src/commands/app-data/convert/processors/flowParser/parsers/template.parser.spec.ts

@@ -48,13 +48,14 @@ describe("Template Parser PostProcessor", () => {
     ]);
   });
 
-  it("Converts rows with _list in name to templated list", () => {
-    // CASE 0 - Do not convert rows without _list in name
-    const case0 = parser.postProcessRow({
+  it("Converts rows ending _list or containing _list_ in name to templated list", () => {
+    // CASE 0 - Do not convert rows unless explicit includes _list_ or ends _list
+    const case0_1 = parser.postProcessRow({
       ...ROW_BASE,
+      name: "test_listen",
       value: "item_1; item_2; item_3;",
     });
-    expect(case0.value).toEqual("item_1; item_2; item_3;");
+    expect(case0_1.value).toEqual("item_1; item_2; item_3;");
 
     // CASE 1 - List items defined inline
     const case1 = parser.postProcessRow({
@@ -66,21 +67,21 @@ describe("Template Parser PostProcessor", () => {
     // CASE 2 - List refers to variable (do not parse)
     const case2 = parser.postProcessRow({
       ...ROW_BASE,
-      name: "test_list",
+      name: "test_list_2",
       value: "@local.some_list",
     });
     expect(case2.value).toEqual("@local.some_list");
     // CASE 3 - List items include variables
     const case3 = parser.postProcessRow({
       ...ROW_BASE,
-      name: "test_list",
+      name: "test_list_3",
       value: "@local.item_1; @local.item_2",
     });
     expect(case3.value).toEqual(["@local.item_1", "@local.item_2"]);
     // CASE 4 - List items as json (mix dynamic and missing)
     const case4 = parser.postProcessRow({
       ...ROW_BASE,
-      name: "test_list",
+      name: "test_list_4",
       value: "key_1a: textValue | key_1b: @local.value; key_2a:  | key_2b: 5",
     });
     expect(case4.value).toEqual([

packages/scripts/src/commands/app-data/convert/processors/flowParser/parsers/template.parser.ts

@@ -32,11 +32,13 @@ export class TemplateParser extends DefaultParser {
     // convert any variables (local/global) list or collection strings (e.g. 'my_list_1')
     // in similar way to how top-level properties get converted by default parser
     if (row.value && typeof row.value === "string") {
-      if (row.name?.includes("_list")) {
+      if (row.name?.endsWith("_list") || row.name?.includes("_list_")) {
         row.value = this.parseTemplateList(row.value);
       }
-      if (row.name?.includes("_collection") && row.value && typeof row.value === "string") {
-        row.value = parseAppDataCollectionString(row.value);
+      if (row.name?.endsWith("_collection") || row.name?.includes("_collection_")) {
+        if (row.value && typeof row.value === "string") {
+          row.value = parseAppDataCollectionString(row.value);
+        }
       }
     }
     if (row.parameter_list) {