align expected output with latest ASG schema

- condense location data to start/end tuple
- remove object wrapper around inlines in value of title and principal properties
- remove blocks property when value is empty

harness/lib/test-framework.js

@@ -14,7 +14,7 @@ export function stringifyASG (asg) {
   return JSON.stringify(asg, (key, val) => (key === 'location' ? locations.push(val) - 1 : val), 2).replace(
     /("location": )(\d+)/g,
     (_, key, idx) => {
-      return key + JSON.stringify(locations[Number(idx)], null, 2).replace(/\n */g, ' ')
+      return key + JSON.stringify(locations[Number(idx)], null, 2).replace(/\n */g, ' ').replace(/(\[) | (\])/g, '$1$2')
     }
   )
 }

tests/block/header/attribute-entries-below-title-output.json

@@ -3,15 +3,15 @@
   "type": "block",
   "attributes": { "icons": "font", "toc": "" },
   "header": {
-    "title": {
-      "inlines": [{
+    "title": [
+      {
         "name": "text",
         "type": "string",
         "value": "Document Title",
-        "location": { "start": { "line": 1, "column": 3 }, "end": { "line": 1, "column": 16 } }
-      }]
-    }
+        "location": [{ "line": 1, "col": 3 }, { "line": 1, "col": 16 }]
+      }
+    ],
+    "location": [{ "line": 1, "col": 1 }, { "line": 3, "col": 5 }]
   },
-  "blocks": [],
-  "location": { "start": { "line": 1,"column": 1 }, "end": { "line": 3, "column": 5 } }
+  "location": [{ "line": 1, "col": 1 }, { "line": 3, "col": 5 }]
 }

tests/block/list/unordered/single-item-output.json

@@ -12,22 +12,19 @@
           "name": "listItem",
           "type": "block",
           "marker": "*",
-          "principal": {
-            "inlines": [
-              {
-                "name": "text",
-                "type": "string",
-                "value": "water",
-                "location": { "start": { "line": 1, "column": 3 }, "end": { "line": 1, "column": 7 } }
-              }
-            ]
-          },
-          "blocks": [],
-          "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 7 } }
+          "principal": [
+            {
+              "name": "text",
+              "type": "string",
+              "value": "water",
+              "location": [{ "line": 1, "col": 3 }, { "line": 1, "col": 7 }]
+            }
+          ],
+          "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 7 }]
         }
       ],
-      "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 7 } }
+      "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 7 }]
     }
   ],
-  "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 7 } }
+  "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 7 }]
 }

tests/block/paragraph/single-line-output.json

@@ -10,11 +10,11 @@
           "name": "text",
           "type": "string",
           "value": "A paragraph that consists of a single line.",
-          "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 43 } }
+          "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 43 }]
         }
       ],
-      "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 43 } }
+      "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 43 }]
     }
   ],
-  "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 43 } }
+  "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 43 }]
 }

tests/block/section/title-body-output.json

@@ -5,18 +5,16 @@
     {
       "name": "section",
       "type": "block",
-      "title": {
-        "inlines": [
-          {
-            "name": "text",
-            "type": "string",
-            "value": "Section Title",
-            "location": { "start": { "line": 1, "column": 4 }, "end": { "line": 1, "column": 16 } }
-          }
-        ]
-      },
+      "title": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "Section Title",
+          "location": [{ "line": 1, "col": 4 }, { "line": 1, "col": 16 }]
+        }
+      ],
       "level": 1,
-      "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 16 } },
+      "location": [{ "line": 1, "col": 1 }, { "line": 3, "col": 9 }],
       "blocks": [
         {
           "name": "paragraph",
@@ -26,13 +24,13 @@
               "name": "text",
               "type": "string",
               "value": "paragraph",
-              "location": { "start": { "line": 3, "column": 1 }, "end": { "line": 3, "column": 9 } }
+              "location": [{ "line": 3, "col": 1 }, { "line": 3, "col": 9 }]
             }
           ],
-          "location": { "start": { "line": 3, "column": 1 }, "end": { "line": 3, "column": 9 } }
+          "location": [{ "line": 3, "col": 1 }, { "line": 3, "col": 9 }]
         }
       ]
     }
   ],
-  "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 3, "column": 9 } }
+  "location": [{ "line": 1, "col": 1 }, { "line": 3, "col": 9 }]
 }

tests/inline/no-markup/single-word-output.json

@@ -3,6 +3,6 @@
     "name": "text",
     "type": "string",
     "value": "hello",
-    "location": { "start": { "line": 1, "column": 1 },"end": { "line": 1, "column": 5 } }
+    "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 5 }]
   }
 ]

tests/inline/span/strong/constrained-single-char-output.json

@@ -9,9 +9,9 @@
         "name": "text",
         "type": "string",
         "value": "s",
-        "location": { "start": { "line": 1, "column": 2 }, "end": { "line": 1, "column": 2 } }
+        "location": [{ "line": 1, "col": 2 }, { "line": 1, "col": 2 }]
       }
     ],
-    "location": { "start": { "line": 1, "column": 1 }, "end": { "line": 1, "column": 3 } }
+    "location": [{ "line": 1, "col": 1 }, { "line": 1, "col": 3 }]
   }
 ]