Merge pull request #1166 from microsoft/andrueastman/multiDimensionAr…

…rays Validates multidimensional collections scenarios using UntypedNode
microsoft · May 6, 2024 · d05233a · d05233a
2 parents 7782053 + ddfdfed
commit d05233a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/packages/serialization/json/test/common/JsonParseNode.ts b/packages/serialization/json/test/common/JsonParseNode.ts
@@ -211,6 +211,11 @@ describe("JsonParseNode", () => {
           },
         },
       },
+      table: [
+        [1, 2, 3],
+        [4, 5, 6],
+        [7, 8, 9],
+      ],
     };
 
     const result = new JsonParseNode(jsonObject).getObjectValue(
@@ -237,5 +242,19 @@ describe("JsonParseNode", () => {
       locationProperties["displayName"].getValue(),
       "Microsoft Building 25",
     );
+    const table = result.table as UntypedNode;
+    if (isUntypedArray(table)) {
+      table.getValue().forEach((row) => {
+        if (isUntypedArray(row)) {
+          row.getValue().forEach((cell) => {
+            assert.isTrue(isUntypedNumber(cell));
+          });
+        } else {
+          assert.fail("Expected row to be an array");
+        }
+      });
+    } else {
+      assert.fail("Expected table to be an array");
+    }
   });
 });
diff --git a/packages/serialization/json/test/common/untypedTestEntiy.ts b/packages/serialization/json/test/common/untypedTestEntiy.ts
@@ -11,6 +11,7 @@ export interface UntypedTestEntity {
   location?: UntypedNode | undefined;
   keywords?: UntypedNode | undefined;
   detail?: UntypedNode | undefined;
+  table?: UntypedNode | undefined;
   additionalData?: Record<string, unknown>;
 }
 
@@ -46,6 +47,11 @@ export function deserializeUntypedTestEntity(
         createUntypedNodeFromDiscriminatorValue,
       );
     },
+    table: (n) => {
+      untypedTestEntity.table = n.getObjectValue<UntypedNode>(
+        createUntypedNodeFromDiscriminatorValue,
+      );
+    },
   };
 }
 
@@ -58,5 +64,6 @@ export function serializeUntypedTestEntity(
   writer.writeObjectValue("location", untypedTestEntity.location);
   writer.writeObjectValue("keywords", untypedTestEntity.keywords);
   writer.writeObjectValue("detail", untypedTestEntity.detail);
+  writer.writeObjectValue("table", untypedTestEntity.table);
   writer.writeAdditionalData(untypedTestEntity.additionalData);
 }