Merge f52431b into 7926822

src/utils.ts

@@ -30,7 +30,7 @@ type YAMLMappingValue = {
 }
 
 export function getStaticYAMLValue(
-    node: YAMLMapping | YAMLFlowMapping,
+    node: YAMLMapping | YAMLFlowMapping | YAMLPair,
 ): YAMLMappingValue
 export function getStaticYAMLValue(
     node: YAMLSequence | YAMLFlowSequence,
@@ -45,14 +45,14 @@ export function getStaticYAMLValue(
 ): string | number | boolean | null
 export function getStaticYAMLValue(node: YAMLAlias): YAMLContentValue
 export function getStaticYAMLValue(
-    node: YAMLProgram | YAMLDocument | YAMLContent,
+    node: YAMLProgram | YAMLDocument | YAMLContent | YAMLPair,
 ): YAMLContentValue
 
 /**
  * Gets the static value for the given node.
  */
 export function getStaticYAMLValue(
-    node: YAMLProgram | YAMLDocument | YAMLContent,
+    node: YAMLProgram | YAMLDocument | YAMLContent | YAMLPair,
 ): YAMLContentValue {
     return resolver[node.type](node as any)
 }
@@ -72,26 +72,26 @@ const resolver = {
     YAMLMapping(node: YAMLMapping | YAMLFlowMapping) {
         const result: YAMLMappingValue = {}
         for (const pair of node.pairs) {
-            const key = pair.key ? getStaticYAMLValue(pair.key) : null
-            if (typeof key !== "string" && typeof key !== "number") {
-                // illegal key
-                continue
-            }
-            result[key] = pair.value ? getStaticYAMLValue(pair.value) : null
+            Object.assign(result, getStaticYAMLValue(pair))
         }
         return result
     },
+    YAMLPair(node: YAMLPair) {
+        const result: YAMLMappingValue = {}
+        let key = node.key ? getStaticYAMLValue(node.key) : null
+        if (typeof key !== "string" && typeof key !== "number") {
+            key = String(key)
+        }
+        result[key] = node.value ? getStaticYAMLValue(node.value) : null
+        return result
+    },
     YAMLFlowMapping(node: YAMLFlowMapping) {
         // eslint-disable-next-line new-cap
         return resolver.YAMLMapping(node)
     },
     YAMLSequence(node: YAMLSequence | YAMLFlowSequence) {
         const result: YAMLContentValue[] = []
         for (const entry of node.entries) {
-            if (entry.type === "YAMLPair") {
-                // illegal entry
-                continue
-            }
             result.push(getStaticYAMLValue(entry))
         }
         return result

tests/fixtures/parser/ast/empty-pair01-value.json

@@ -1,3 +1,4 @@
 {
+  "null": null,
   "a": "b"
 }

tests/fixtures/parser/ast/empty-pair03-value.json

@@ -1 +1,3 @@
-{}
+{
+  "null": "a"
+}

tests/fixtures/parser/ast/flow01-value.json

@@ -7,6 +7,9 @@
   [
     1,
     2,
-    3
+    3,
+    {
+      "a": "b"
+    }
   ]
 ]

tests/fixtures/parser/yaml-test-suite/4ABK-value.json

@@ -1,5 +1,6 @@
 {
   "unquoted": "separate",
   "http://foo.com": null,
-  "omitted value": null
+  "omitted value": null,
+  "null": "omitted key"
 }

tests/fixtures/parser/yaml-test-suite/6BFJ-value.json

@@ -1 +1,3 @@
-{}
+{
+  "a,b,c": "value"
+}

tests/fixtures/parser/yaml-test-suite/6M2F-value.json

@@ -1,3 +1,4 @@
 {
-  "a": "b"
+  "a": "b",
+  "null": "a"
 }

tests/fixtures/parser/yaml-test-suite/87E4-value.json

@@ -1,3 +1,7 @@
 {
-  "implicit block key": []
+  "implicit block key": [
+    {
+      "implicit flow key": "value"
+    }
+  ]
 }

tests/fixtures/parser/yaml-test-suite/8UDB-value.json

@@ -4,5 +4,8 @@
   "plain text",
   [
     "nested"
-  ]
+  ],
+  {
+    "single": "pair"
+  }
 ]

tests/fixtures/parser/yaml-test-suite/9MMW-value.json

@@ -1,5 +1,17 @@
 [
-  [],
-  [],
-  []
+  [
+    {
+      "YAML": "separate"
+    }
+  ],
+  [
+    {
+      "null": "empty key entry"
+    }
+  ],
+  [
+    {
+      "JSON like": "adjacent"
+    }
+  ]
 ]

tests/fixtures/parser/yaml-test-suite/CN3R-value.json

@@ -1,4 +1,10 @@
 [
+  {
+    "a": "b"
+  },
+  {
+    "c": "d"
+  },
   {
     "e": "f"
   },

tests/fixtures/parser/yaml-test-suite/CT4Q-value.json

@@ -1 +1,5 @@
-[]
+[
+  {
+    "foo bar": "baz"
+  }
+]

tests/fixtures/parser/yaml-test-suite/DFF7-value.json

@@ -1,4 +1,5 @@
 {
   "explicit": "entry",
-  "implicit": "entry"
+  "implicit": "entry",
+  "null": null
 }

tests/fixtures/parser/yaml-test-suite/FH7J-value.json

@@ -1,6 +1,7 @@
 [
   "",
   {
+    "null": "a",
     "b": ""
   },
   {

tests/fixtures/parser/yaml-test-suite/FRK4-value.json

@@ -1,3 +1,4 @@
 {
-  "foo": null
+  "foo": null,
+  "null": "bar"
 }

tests/fixtures/parser/yaml-test-suite/KZN9-value.json

@@ -1,5 +1,17 @@
 [
-  [],
-  [],
-  []
+  [
+    {
+      "YAML": "separate"
+    }
+  ],
+  [
+    {
+      "null": "empty key entry"
+    }
+  ],
+  [
+    {
+      "[object Object]": "adjacent"
+    }
+  ]
 ]

tests/fixtures/parser/yaml-test-suite/L9U5-value.json

@@ -1,3 +1,7 @@
 {
-  "implicit block key": []
+  "implicit block key": [
+    {
+      "implicit flow key": "value"
+    }
+  ]
 }

tests/fixtures/parser/yaml-test-suite/LQZ7-value.json

@@ -1,3 +1,7 @@
 {
-  "implicit block key": []
+  "implicit block key": [
+    {
+      "implicit flow key": "value"
+    }
+  ]
 }

tests/fixtures/parser/yaml-test-suite/LX3P-value.json

@@ -1 +1,3 @@
-{}
+{
+  "flow": "block"
+}

tests/fixtures/parser/yaml-test-suite/M5DY-value.json

@@ -1 +1,10 @@
-{}
+{
+  "Detroit Tigers,Chicago cubs": [
+    "2001-07-23"
+  ],
+  "New York Yankees,Atlanta Braves": [
+    "2001-07-02",
+    "2001-08-12",
+    "2001-08-14"
+  ]
+}

tests/fixtures/parser/yaml-test-suite/NHX8-value.json

@@ -1 +1,3 @@
-{}
+{
+  "null": null
+}

tests/fixtures/parser/yaml-test-suite/Q9WF-value.json

@@ -1 +1,6 @@
-{}
+{
+  "[object Object]": {
+    "hr": 65,
+    "avg": 0.278
+  }
+}

tests/fixtures/parser/yaml-test-suite/QF4Y-value.json

@@ -1 +1,5 @@
-[]
+[
+  {
+    "foo": "bar"
+  }
+]

tests/fixtures/parser/yaml-test-suite/RZP5-value.json

@@ -2,6 +2,9 @@
   "a": "double quotes",
   "b": "plain value",
   "c": "d",
+  "seq1": [
+    "seq2"
+  ],
   "e": [
     {
       "x": "y"

tests/fixtures/parser/yaml-test-suite/S3PD-value.json

@@ -1,5 +1,6 @@
 {
   "plain key": "in-line value",
+  "null": null,
   "quoted key": [
     "entry"
   ]

tests/fixtures/parser/yaml-test-suite/SBG9-value.json

@@ -2,5 +2,6 @@
   "a": [
     "b",
     "c"
-  ]
+  ],
+  "d,e": "f"
 }

tests/fixtures/parser/yaml-test-suite/V9D5-value.json

@@ -2,5 +2,9 @@
   {
     "sun": "yellow"
   },
-  {}
+  {
+    "[object Object]": {
+      "moon": "white"
+    }
+  }
 ]

tests/fixtures/parser/yaml-test-suite/X38W-value.json

@@ -1 +1,7 @@
-{}
+{
+  "a,b": [
+    "c",
+    "b",
+    "d"
+  ]
+}

tests/fixtures/parser/yaml-test-suite/XW4D-value.json

@@ -2,6 +2,9 @@
   "a": "double quotes",
   "b": "plain value",
   "c": "d",
+  "seq1": [
+    "seq2"
+  ],
   "e": [
     {
       "x": "y"