@konomanoasa/tree-sitter-yaml 0.3.0 → 0.5.0

package/grammar.js

@@ -91,45 +91,53 @@ const structuredProblems = [
   {
     name: "unexpected_document_content",
     reason: "unexpected_document_content",
-    start: "_unexpected_content_start",
+    start: [
+      "_unexpected_document_content_start",
+      "_unfinished_unexpected_document_content_start",
+    ],
     body: ($) => seq(field("content", $._node), $._document_content_end),
   },
+  extraContent("unexpected_collection_content", "_node"),
+  extraContent("unexpected_sequence_content", "_sequence_node"),
+  extraContent("unexpected_shared_content", "_shared_node"),
   {
     name: "invalid_document_collection",
     reason: "invalid_compact_collection",
-    start: "_document_compact_start",
+    start: [
+      "_document_compact_start",
+      "_unfinished_invalid_document_collection_start",
+    ],
     body: ($) => field("content", $._node),
   },
   {
     name: "duplicate_anchor",
     reason: "duplicate_anchor",
-    start: "_duplicate_anchor_start",
+    start: ["_duplicate_anchor_start", "_unfinished_duplicate_anchor_start"],
     body: ($) => field("property", $.anchor),
   },
   {
     name: "duplicate_tag",
     reason: "duplicate_tag",
-    start: "_duplicate_tag_start",
+    start: ["_duplicate_tag_start", "_unfinished_duplicate_tag_start"],
     body: ($) => field("property", $._tag),
   },
   {
     name: "properties_on_alias",
     reason: "properties_on_alias",
-    start: "_property_alias_start",
+    start: ["_property_alias_start", "_unfinished_properties_on_alias_start"],
     body: ($) => field("content", $.alias),
   },
-  {
-    name: "invalid_property_collection",
-    reason: "invalid_compact_collection",
-    start: "_property_compact_start",
-    body: ($) => field("content", $._node_content),
-  },
-  {
-    name: "invalid_compact_collection",
-    reason: "invalid_compact_collection",
-    start: "_invalid_compact_start",
-    body: ($) => field("value", $._node),
-  },
+  propertyCollection("invalid_property_collection", "_node_content"),
+  propertyCollection(
+    "invalid_sequence_property_collection",
+    "_sequence_node_content",
+  ),
+  propertyCollection(
+    "invalid_shared_property_collection",
+    "_shared_node_content",
+  ),
+  compactCollection("invalid_compact_collection", "_node"),
+  compactCollection("invalid_shared_compact_collection", "_shared_node"),
   {
     name: "invalid_implicit_key",
     reason: "invalid_implicit_key",
@@ -138,56 +146,9 @@ const structuredProblems = [
   },
 ];
 
-const problemRules = Object.fromEntries(
-  problems.flatMap(([name, outcome, reason, leaf]) => [
-    ...(leaf
-      ? [[`_${name}_reason`, ($) => alias($[`_${name}`], $[leaf])]]
-      : []),
-    [
-      `_${name}_outcome`,
-      ($) => alias($[leaf ? `_${name}_reason` : `_${name}`], $[reason]),
-    ],
-    [`_${name}_issue`, ($) => alias($[`_${name}_outcome`], $[outcome])],
-  ]),
-);
-
-for (const { name, reason, start, end, body } of structuredProblems) {
-  for (const unfinished of [false, true]) {
-    const id = unfinished ? `unfinished_${name}` : name;
-    problemRules[`_${id}_reason`] = ($) =>
-      end
-        ? seq(body($), $[end[Number(unfinished)]])
-        : seq($[unfinished ? `_${id}_start` : start], body($));
-    problemRules[`_${id}_outcome`] = ($) =>
-      alias($[`_${id}_reason`], $[reason]);
-    problemRules[`_${id}_issue`] = ($) =>
-      alias(
-        $[`_${id}_outcome`],
-        unfinished ? $.incomplete_syntax : $.invalid_syntax,
-      );
-  }
-}
-
-const issue = ($, name) =>
-  field("issue", alias($[`_${name}_issue`], $.syntax_issue));
-
-const missing = ($, name) =>
-  choice(issue($, `missing_${name}`), issue($, `incomplete_${name}`));
-
-const closing = ($, name) =>
-  choice(field("closing", $[name]), missing($, name));
-
-const invalid = ($) =>
-  choice(issue($, "invalid_encoding"), issue($, "invalid_character"));
-
-const unfinishedIssue = ($, name) =>
-  choice(issue($, name), issue($, `unfinished_${name}`));
-
-const indentationIssue = ($) =>
-  choice(
-    unfinishedIssue($, "invalid_indentation"),
-    unfinishedIssue($, "tab_in_indentation"),
-  );
+const unfinishedStarts = [
+  ...new Set(structuredProblems.flatMap(({ start = [] }) => start.slice(1))),
+];
 
 export default grammar({
   name: "yaml",
@@ -205,12 +166,18 @@ export default grammar({
     $._restore_indent,
     $._mapping_start,
     $._mapping_end,
+    $._mapping_in_mapping_end,
+    $._mapping_in_sequence_end,
+    $._mapping_in_shared_end,
     $._pair_start,
     $._sequence_start,
     $._sequence_end,
+    $._sequence_in_mapping_end,
+    $._sequence_in_sequence_end,
+    $._sequence_in_shared_end,
     $._entry_start,
-    $._value_start,
-    $._sequence_value_start,
+    $._block_out_value_start,
+    $._block_in_value_start,
     $._empty_block_node,
     $._explicit_value_start,
     $._invalid_compact_start,
@@ -272,7 +239,9 @@ export default grammar({
     $._boundary_check,
     $._document_content_end,
     $._document_compact_start,
-    $._unexpected_content_start,
+    $._unexpected_document_content_start,
+    $._unexpected_collection_content_start,
+    $._collection_content_end,
     $._properties_start,
     $._properties_end,
     $._block_properties_end,
@@ -320,9 +289,7 @@ export default grammar({
     $._tag_prefix_start,
     $._tag_prefix_end,
     $.directive_parameter,
-    ...structuredProblems
-      .filter(({ start }) => start)
-      .map(({ name }) => $[`_unfinished_${name}_start`]),
+    ...unfinishedStarts.map((name) => $[name]),
     ...problems.map(([name]) => $[`_${name}`]),
     $._undecodable_escape_prefix,
     $._error_sentinel,
@@ -359,82 +326,111 @@ export default grammar({
             repeat1(
               choice($.yaml_directive, $.tag_directive, $.reserved_directive),
             ),
-            choice($.document_start, missing($, "document_start")),
-          ),
-          optional(choice($.document_start, missing($, "document_start"))),
-        ),
-        optional(
-          seq(
-            choice(
-              field("content", $._node),
-              unfinishedIssue($, "invalid_document_collection"),
-            ),
-            $._document_content_end,
+            $._document_start,
           ),
+          optional($._document_start),
         ),
+        optional($._document_content),
         repeat(unfinishedIssue($, "unexpected_document_content")),
         $._document_close,
       ),
-    yaml_directive: ($) =>
+    _document_start: ($) =>
+      choice($.document_start, missing($, "document_start")),
+    _document_content: ($) =>
       seq(
-        directiveHead($, $._yaml_directive_start),
-        repeat(invalid($)),
         choice(
-          field("version", $.yaml_version),
-          missing($, "yaml_version"),
-          issue($, "invalid_yaml_version"),
-          issue($, "unfinished_yaml_version"),
+          field("content", $._node),
+          unfinishedIssue($, "invalid_document_collection"),
         ),
-        directiveTail($),
+        $._document_content_end,
+      ),
+    yaml_directive: ($) =>
+      seq(
+        $._yaml_directive_start,
+        $._directive_head,
+        repeat(invalid($)),
+        $._yaml_directive_version,
+        $._directive_tail,
+      ),
+    _yaml_directive_version: ($) =>
+      choice(
+        field("version", $.yaml_version),
+        missing($, "yaml_version"),
+        issue($, "invalid_yaml_version"),
+        issue($, "unfinished_yaml_version"),
       ),
     tag_directive: ($) =>
       seq(
-        directiveHead($, $._tag_directive_start),
+        $._tag_directive_start,
+        $._directive_head,
         repeat(invalid($)),
-        choice(
-          seq(
-            $._tag_handle_start,
-            field(
-              "handle",
-              choice(
-                $.primary_tag_handle,
-                $.secondary_tag_handle,
-                alias($._directive_named_handle, $.named_tag_handle),
-              ),
+        $._tag_directive_handle,
+        optional(issue($, "missing_separation")),
+        $._tag_directive_prefix,
+        $._directive_tail,
+      ),
+    _tag_directive_handle: ($) =>
+      choice(
+        seq(
+          $._tag_handle_start,
+          field(
+            "handle",
+            choice(
+              $.primary_tag_handle,
+              $.secondary_tag_handle,
+              alias($._directive_named_handle, $.named_tag_handle),
             ),
           ),
-          missing($, "tag_handle"),
-          issue($, "invalid_tag_handle"),
         ),
-        optional(issue($, "missing_separation")),
-        choice(field("prefix", $.tag_prefix), missing($, "tag_prefix")),
-        directiveTail($),
+        missing($, "tag_handle"),
+        issue($, "invalid_tag_handle"),
       ),
+    _tag_directive_prefix: ($) =>
+      choice(field("prefix", $.tag_prefix), missing($, "tag_prefix")),
     reserved_directive: ($) =>
       seq(
-        directiveHead($, $._reserved_directive_start),
+        $._reserved_directive_start,
+        $._directive_head,
         repeat(choice(field("parameter", $.directive_parameter), invalid($))),
         $._directive_end,
       ),
+    _directive_head: ($) =>
+      seq(
+        field("indicator", $.directive_indicator),
+        names($, "directive_name", $._directive_name_end),
+      ),
+    _directive_tail: ($) =>
+      seq(
+        repeat(choice(issue($, "unexpected_directive_parameter"), invalid($))),
+        $._directive_end,
+      ),
     _directive_named_handle: ($) =>
       namedTagHandle($, closing($, "tag_handle_close")),
     tag_prefix: ($) =>
       seq(
         $._tag_prefix_start,
-        repeat1(uriPart($, $.uri_text, true)),
+        repeat1(uriPart($, $.uri_text, issue($, "invalid_tag_prefix_start"))),
         $._tag_prefix_end,
       ),
     _node: ($) => choice($._node_content, $.alias, $.node_with_properties),
     _node_content: ($) =>
+      nodeContent($, $._mapping_in_mapping, $._sequence_in_mapping),
+    _sequence_node: ($) =>
       choice(
-        $._flow_content,
-        $._indented_node,
-        $._dedented_node,
-        $.block_mapping,
-        $.block_sequence,
-        $.literal_scalar,
-        $.folded_scalar,
+        $._sequence_node_content,
+        $.alias,
+        alias($._sequence_properties, $.node_with_properties),
+      ),
+    _sequence_node_content: ($) =>
+      nodeContent($, $._mapping_in_sequence, $._sequence_in_sequence),
+    _shared_node: ($) =>
+      choice(
+        $._shared_node_content,
+        $.alias,
+        alias($._shared_properties, $.node_with_properties),
       ),
+    _shared_node_content: ($) =>
+      nodeContent($, $._mapping_in_shared, $._sequence_in_shared),
     _flow_node: ($) =>
       choice(
         $._flow_content,
@@ -450,38 +446,41 @@ export default grammar({
         $.flow_mapping,
       ),
     node_with_properties: ($) =>
-      propertyNode(
+      blockProperties($, $._node_content, "invalid_property_collection"),
+    _sequence_properties: ($) =>
+      blockProperties(
+        $,
+        $._sequence_node_content,
+        "invalid_sequence_property_collection",
+      ),
+    _shared_properties: ($) =>
+      blockProperties(
         $,
-        seq($._block_property_content_start, field("content", $._node_content)),
-        true,
+        $._shared_node_content,
+        "invalid_shared_property_collection",
       ),
     _flow_properties: ($) =>
       propertyNode(
         $,
+        $._properties_end,
         choice(
           seq($._property_content_start, field("content", $._flow_content)),
           seq($._block_key_content_start, field("content", $._node_content)),
         ),
+        "invalid_property_collection",
       ),
+    _property_list: ($) => propertyList($),
     _tag: ($) => choice($.non_specific_tag, $.shorthand_tag, $.verbatim_tag),
     anchor: ($) =>
       seq(
         field("indicator", $.anchor_indicator),
-        choice(
-          repeat1(choice(field("name", $.anchor_name), invalid($))),
-          missing($, "anchor_name"),
-        ),
-        $._name_end,
+        names($, "anchor_name", $._name_end),
       ),
     alias: ($) =>
       seq(
         $._alias_start,
         field("indicator", $.alias_indicator),
-        choice(
-          repeat1(choice(field("name", $.alias_name), invalid($))),
-          missing($, "alias_name"),
-        ),
-        $._name_end,
+        names($, "alias_name", $._name_end),
       ),
     shorthand_tag: ($) =>
       seq(
@@ -523,57 +522,76 @@ export default grammar({
         choice($._dedented_node, $.block_mapping, $.block_sequence),
         $._restore_indent,
       ),
-    block_mapping: ($) =>
-      seq($._mapping_start, repeat1($.block_mapping_pair), $._mapping_end),
+    block_mapping: ($) => blockMapping($, $._mapping_pairs, $._mapping_end),
+    _mapping_in_mapping: ($) =>
+      blockMapping($, $._mapping_pairs, $._mapping_in_mapping_end),
+    _mapping_in_sequence: ($) =>
+      blockMapping($, $._shared_pairs, $._mapping_in_sequence_end),
+    _mapping_in_shared: ($) =>
+      blockMapping($, $._shared_pairs, $._mapping_in_shared_end),
+    _mapping_layout: ($) =>
+      choice(
+        alias($._mapping_prefix, $.line_prefix),
+        alias($._mapping_comment, $.comment),
+      ),
+    _mapping_pairs: ($) =>
+      mappingPairs(
+        $,
+        $._mapping_pairs,
+        $.block_mapping_pair,
+        "unexpected_collection_content",
+      ),
+    _shared_pairs: ($) =>
+      mappingPairs(
+        $,
+        $._shared_pairs,
+        alias($._shared_pair, $.block_mapping_pair),
+        "unexpected_shared_content",
+      ),
     block_mapping_pair: ($) =>
-      seq(
-        $._pair_start,
-        choice(
-          seq(
-            field("key_indicator", $.key_indicator),
-            choice(
-              seq($._value_start, field("key", $._node)),
-              $._empty_block_node,
-            ),
-            choice(
-              seq(
-                $._explicit_value_start,
-                field("indicator", $.value_indicator),
-                choice(
-                  seq($._value_start, field("value", $._node)),
-                  $._empty_block_node,
-                ),
-              ),
-              $._empty_block_node,
-            ),
-          ),
-          seq(
-            optional($._implicit_key),
-            choice(
-              seq(
-                field("indicator", $.value_indicator),
-                choice(
-                  seq($._value_start, field("value", $._node)),
-                  unfinishedIssue($, "invalid_compact_collection"),
-                  $._empty_block_node,
-                ),
-              ),
-              missing($, "value_indicator"),
-            ),
-          ),
-        ),
+      mappingPair(
+        $,
+        $._block_out_value_start,
+        $._node,
+        "invalid_compact_collection",
+      ),
+    _shared_pair: ($) =>
+      mappingPair(
+        $,
+        $._block_in_value_start,
+        $._shared_node,
+        "invalid_shared_compact_collection",
       ),
     block_sequence: ($) =>
-      seq($._sequence_start, repeat1($.block_sequence_entry), $._sequence_end),
-    block_sequence_entry: ($) =>
-      seq(
-        $._entry_start,
-        field("indicator", $.sequence_indicator),
-        choice(
-          seq($._sequence_value_start, field("value", $._node)),
-          $._empty_block_node,
-        ),
+      blockSequence(
+        $,
+        $.block_sequence_entry,
+        "unexpected_sequence_content",
+        $._sequence_end,
+      ),
+    _sequence_in_mapping: ($) =>
+      blockSequence(
+        $,
+        alias($._shared_entry, $.block_sequence_entry),
+        "unexpected_shared_content",
+        $._sequence_in_mapping_end,
+      ),
+    _sequence_in_sequence: ($) =>
+      blockSequence(
+        $,
+        $.block_sequence_entry,
+        "unexpected_sequence_content",
+        $._sequence_in_sequence_end,
+      ),
+    _sequence_in_shared: ($) =>
+      blockSequence(
+        $,
+        alias($._shared_entry, $.block_sequence_entry),
+        "unexpected_shared_content",
+        $._sequence_in_shared_end,
       ),
+    block_sequence_entry: ($) => blockSequenceEntry($, $._sequence_node),
+    _shared_entry: ($) => blockSequenceEntry($, $._shared_node),
     literal_scalar: ($) => blockScalar($, $._literal_start),
     folded_scalar: ($) => blockScalar($, $._folded_start),
     block_scalar_header: ($) =>
@@ -626,7 +644,6 @@ export default grammar({
             $.scalar_line_prefix,
             $.scalar_line_suffix,
             indentationIssue($),
-            unfinishedIssue($, "missing_indentation"),
             invalid($),
             issue($, "invalid_scalar_start"),
             issue($, "incomplete_scalar_start"),
@@ -653,25 +670,28 @@ export default grammar({
         ),
       ),
     flow_sequence: ($) =>
-      seq(
+      flowCollection(
+        $,
         $._flow_sequence_start,
-        field("opening", $.flow_sequence_open),
-        flowContent(
-          $,
-          choice(
-            seq($._implicit_key_start, $._flow_node, $._flow_node_end),
-            alias($._flow_sequence_pair, $.flow_mapping_pair),
-          ),
-        ),
-        closing($, "flow_sequence_close"),
+        $.flow_sequence_open,
+        $._flow_sequence_entries,
+        "flow_sequence_close",
+      ),
+    _flow_sequence_entries: ($) => flowEntries($, $._flow_sequence_entry),
+    _flow_sequence_entry: ($) =>
+      choice(
+        seq($._implicit_key_start, $._flow_node, $._flow_node_end),
+        alias($._flow_sequence_pair, $.flow_mapping_pair),
       ),
     flow_mapping: ($) =>
-      seq(
+      flowCollection(
+        $,
         $._flow_mapping_start,
-        field("opening", $.flow_mapping_open),
-        flowContent($, $.flow_mapping_pair),
-        closing($, "flow_mapping_close"),
+        $.flow_mapping_open,
+        $._flow_mapping_entries,
+        "flow_mapping_close",
       ),
+    _flow_mapping_entries: ($) => flowEntries($, $.flow_mapping_pair),
     flow_mapping_pair: ($) => seq($._flow_map_pair_start, $._flow_pair_body),
     _flow_sequence_pair: ($) =>
       choice(
@@ -689,52 +709,138 @@ export default grammar({
         seq(field("key", $._flow_node), optional(flowValue($))),
         flowValue($),
       ),
-    comment: ($) =>
-      seq(
-        $._comment_start,
-        optional(issue($, "missing_separation")),
-        $.comment_marker,
-        repeat(choice($.comment_text, invalid($))),
-        $._comment_end,
-      ),
-    line_prefix: ($) =>
-      seq(
-        $._line_prefix_start,
-        repeat1(
-          choice(
-            $.indentation,
-            $.separation,
-            indentationIssue($),
-            unfinishedIssue($, "missing_indentation"),
-          ),
-        ),
-        $._line_prefix_end,
-      ),
+    comment,
+    line_prefix: linePrefix,
+    _mapping_comment: comment,
+    _mapping_prefix: linePrefix,
     // Prevents lexer fallback from accepting EOF mid-input.
     _unmatchable: () => token(seq(/[\s\S]/, /[^\s\S]/)),
-    ...problemRules,
+    ...issueRules(),
   },
 });
 
-function flowContent($, entry) {
-  const unexpectedSeparators = repeat(issue($, "unexpected_flow_separator"));
+function issueRules() {
+  const rules = Object.fromEntries(
+    problems.flatMap(([name, outcome, reason, leaf]) => [
+      ...(leaf
+        ? [[`_${name}_reason`, ($) => alias($[`_${name}`], $[leaf])]]
+        : []),
+      [
+        `_${name}_outcome`,
+        ($) => alias($[leaf ? `_${name}_reason` : `_${name}`], $[reason]),
+      ],
+      [`_${name}_issue`, ($) => alias($[`_${name}_outcome`], $[outcome])],
+    ]),
+  );
+  for (const { name, reason, start, end, body } of structuredProblems) {
+    for (const unfinished of [false, true]) {
+      const id = unfinished ? `unfinished_${name}` : name;
+      rules[`_${id}_reason`] = ($) =>
+        end
+          ? seq(body($), $[end[Number(unfinished)]])
+          : seq($[start[Number(unfinished)]], body($));
+      rules[`_${id}_outcome`] = ($) => alias($[`_${id}_reason`], $[reason]);
+      rules[`_${id}_issue`] = ($) =>
+        alias(
+          $[`_${id}_outcome`],
+          unfinished ? $.incomplete_syntax : $.invalid_syntax,
+        );
+    }
+  }
+  return rules;
+}
+
+function extraContent(name, node) {
+  return {
+    name,
+    reason: "unexpected_collection_content",
+    start: [
+      "_unexpected_collection_content_start",
+      "_unfinished_unexpected_collection_content_start",
+    ],
+    body: ($) => seq(field("content", $[node]), $._collection_content_end),
+  };
+}
+
+function propertyCollection(name, content) {
+  return {
+    name,
+    reason: "invalid_compact_collection",
+    start: [
+      "_property_compact_start",
+      "_unfinished_invalid_property_collection_start",
+    ],
+    body: ($) => field("content", $[content]),
+  };
+}
+
+function compactCollection(name, node) {
+  return {
+    name,
+    reason: "invalid_compact_collection",
+    start: [
+      "_invalid_compact_start",
+      "_unfinished_invalid_compact_collection_start",
+    ],
+    body: ($) => field("value", $[node]),
+  };
+}
+
+function issue($, name) {
+  return field("issue", alias($[`_${name}_issue`], $.syntax_issue));
+}
+
+function missing($, name) {
+  return choice(issue($, `missing_${name}`), issue($, `incomplete_${name}`));
+}
+
+function closing($, name) {
+  return choice(field("closing", $[name]), missing($, name));
+}
+
+function invalid($) {
+  return choice(issue($, "invalid_encoding"), issue($, "invalid_character"));
+}
+
+function unfinishedIssue($, name) {
+  return choice(issue($, name), issue($, `unfinished_${name}`));
+}
+
+function indentationIssue($) {
+  return choice(
+    unfinishedIssue($, "invalid_indentation"),
+    unfinishedIssue($, "tab_in_indentation"),
+    unfinishedIssue($, "missing_indentation"),
+  );
+}
+
+function flowCollection($, start, opening, entries, closingName) {
   return seq(
-    unexpectedSeparators,
-    optional(
-      seq(
-        entry,
-        repeat(
-          seq(
-            choice(
-              $.flow_separator,
-              unfinishedIssue($, "missing_flow_separator"),
-            ),
-            unexpectedSeparators,
-            entry,
+    start,
+    field("opening", opening),
+    optional(entries),
+    closing($, closingName),
+  );
+}
+
+function flowEntries($, entry) {
+  const unexpectedSeparator = issue($, "unexpected_flow_separator");
+  return choice(
+    repeat1(unexpectedSeparator),
+    seq(
+      repeat(unexpectedSeparator),
+      entry,
+      repeat(
+        seq(
+          choice(
+            $.flow_separator,
+            unfinishedIssue($, "missing_flow_separator"),
           ),
+          repeat(unexpectedSeparator),
+          entry,
         ),
-        optional(seq($.flow_separator, unexpectedSeparators)),
       ),
+      optional(seq($.flow_separator, repeat(unexpectedSeparator))),
     ),
   );
 }
@@ -746,6 +852,7 @@ function explicitFlowPair($) {
     optional(flowValue($)),
   );
 }
+
 function flowValue($) {
   return seq(
     field("indicator", $.value_indicator),
@@ -754,6 +861,90 @@ function flowValue($) {
   );
 }
 
+function blockMapping($, pairs, end) {
+  return seq($._mapping_start, pairs, repeat($._mapping_layout), end);
+}
+
+function mappingPairs($, pairs, pair, content) {
+  return choice(
+    pair,
+    seq(
+      pairs,
+      repeat($._mapping_layout),
+      choice(pair, unfinishedIssue($, content)),
+    ),
+  );
+}
+
+function mappingPair($, valueStart, node, compact) {
+  return seq(
+    $._pair_start,
+    choice(
+      seq(
+        field("key_indicator", $.key_indicator),
+        blockNode("key", valueStart, node, $._empty_block_node),
+        choice(
+          seq(
+            $._explicit_value_start,
+            field("indicator", $.value_indicator),
+            blockNode("value", valueStart, node, $._empty_block_node),
+          ),
+          $._empty_block_node,
+        ),
+      ),
+      seq(
+        optional($._implicit_key),
+        choice(
+          seq(
+            field("indicator", $.value_indicator),
+            blockNode(
+              "value",
+              valueStart,
+              node,
+              $._empty_block_node,
+              unfinishedIssue($, compact),
+            ),
+          ),
+          missing($, "value_indicator"),
+        ),
+      ),
+    ),
+  );
+}
+
+function blockSequence($, entry, content, end) {
+  return seq(
+    $._sequence_start,
+    entry,
+    repeat(choice(entry, unfinishedIssue($, content))),
+    end,
+  );
+}
+
+function nodeContent($, sameIndentMapping, sameIndentSequence) {
+  return choice(
+    $._flow_content,
+    $._indented_node,
+    $._dedented_node,
+    alias(sameIndentMapping, $.block_mapping),
+    alias(sameIndentSequence, $.block_sequence),
+    $.literal_scalar,
+    $.folded_scalar,
+  );
+}
+
+function blockSequenceEntry($, node) {
+  return seq(
+    $._entry_start,
+    field("indicator", $.sequence_indicator),
+    blockNode("value", $._block_in_value_start, node, $._empty_block_node),
+  );
+}
+
+function blockNode(name, start, node, empty, ...issues) {
+  return choice(seq(start, choice(field(name, node), ...issues)), empty);
+}
+
 function blockScalar($, start) {
   return seq(
     start,
@@ -769,27 +960,48 @@ function blockScalar($, start) {
     $._block_scalar_end,
   );
 }
+
 function blockLine($, start) {
   return seq(
     start,
     optional(field("prefix", $.scalar_line_prefix)),
-    repeat(
-      choice(
-        $.scalar_text,
-        unfinishedIssue($, "missing_indentation"),
-        indentationIssue($),
-        invalid($),
-      ),
-    ),
+    repeat(choice($.scalar_text, indentationIssue($), invalid($))),
     optional($.scalar_line_break),
     $._block_line_end,
   );
 }
 
-function propertyNode($, content, block = false) {
+function blockProperties($, content, compact) {
+  return propertyNode(
+    $,
+    $._block_properties_end,
+    seq($._block_property_content_start, field("content", content)),
+    compact,
+  );
+}
+
+function propertyNode($, end, content, compact) {
+  return seq(
+    $._property_list,
+    choice(
+      $._empty_properties_end,
+      seq(
+        end,
+        optional(issue($, "missing_separation")),
+        choice(
+          content,
+          unfinishedIssue($, "properties_on_alias"),
+          unfinishedIssue($, compact),
+        ),
+      ),
+    ),
+  );
+}
+
+function propertyList($) {
   const duplicate = (name) => unfinishedIssue($, `duplicate_${name}`);
-  const separation = issue($, "missing_separation");
-  const next = (rule) => seq($._property_continue, optional(separation), rule);
+  const next = (rule) =>
+    seq($._property_continue, optional(issue($, "missing_separation")), rule);
   const both = repeat(next(choice(duplicate("anchor"), duplicate("tag"))));
   const ordered = (first, second, rule) =>
     seq(
@@ -808,38 +1020,20 @@ function propertyNode($, content, block = false) {
       ordered("anchor", "tag", $.anchor),
       ordered("tag", "anchor", $._tag),
     ),
-    choice(
-      $._empty_properties_end,
-      seq(
-        block ? $._block_properties_end : $._properties_end,
-        optional(separation),
-        choice(
-          content,
-          unfinishedIssue($, "properties_on_alias"),
-          unfinishedIssue($, "invalid_property_collection"),
-        ),
-      ),
-    ),
   );
 }
-function directiveHead($, start) {
+
+function names($, name, end) {
   return seq(
-    start,
-    field("indicator", $.directive_indicator),
     choice(
-      repeat1(choice(field("name", $.directive_name), invalid($))),
-      missing($, "directive_name"),
+      repeat1(choice(field("name", $[name]), invalid($))),
+      missing($, name),
     ),
-    $._directive_name_end,
-  );
-}
-function directiveTail($) {
-  return seq(
-    repeat(choice(issue($, "unexpected_directive_parameter"), invalid($))),
-    $._directive_end,
+    end,
   );
 }
-function uriPart($, text, prefix = false) {
+
+function uriPart($, text, ...issues) {
   return choice(
     text,
     $.uri_escape,
@@ -847,7 +1041,7 @@ function uriPart($, text, prefix = false) {
     issue($, "incomplete_uri_escape"),
     seq($._undecodable_escape_prefix, issue($, "invalid_encoding")),
     issue($, "invalid_tag_character"),
-    ...(prefix ? [issue($, "invalid_tag_prefix_start")] : []),
+    ...issues,
     invalid($),
   );
 }
@@ -877,7 +1071,6 @@ function quotedScalar($, start, opening, escapes) {
         $.scalar_line_prefix,
         $.scalar_line_suffix,
         indentationIssue($),
-        unfinishedIssue($, "missing_indentation"),
         invalid($),
         ...escapes,
       ),
@@ -885,3 +1078,21 @@ function quotedScalar($, start, opening, escapes) {
     closing($, "quote_close"),
   );
 }
+
+function comment($) {
+  return seq(
+    $._comment_start,
+    optional(issue($, "missing_separation")),
+    $.comment_marker,
+    repeat(choice($.comment_text, invalid($))),
+    $._comment_end,
+  );
+}
+
+function linePrefix($) {
+  return seq(
+    $._line_prefix_start,
+    repeat1(choice($.indentation, $.separation, indentationIssue($))),
+    $._line_prefix_end,
+  );
+}