@willbooster/tree-sitter-go 6.1.0 → 7.0.0

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.48.9-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.51.1-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-go.svg)](https://crates.io/crates/willbooster-tree-sitter-go)
 
 Go grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -17,6 +17,13 @@ This fork extends upstream's version 0.25.0 grammar with method type parameters
 number (`0x5742000b`), so it loads only with the WillBooster runtime, version 15.0.0 or later within 15.x
 (`willbooster-tree-sitter`, `@willbooster/web-tree-sitter`), and not with upstream's tree-sitter.
 
+## Support Scope
+
+This fork maintains only full parsing: valid input yields a correct tree, and invalid input yields `ERROR` or `MISSING`
+nodes without crashing, hanging, or taking more than linear time. Incremental parsing works as in upstream tree-sitter
+but is not tested here, and no queries (highlights, locals, injections, tags) are shipped. Node types, field names, and
+the trees that error recovery produces may change; such changes are released as new major versions.
+
 ## Usage
 
 The npm package ships `tree-sitter-go.wasm` for
@@ -59,7 +66,7 @@ const parser = new Parser();
 parser.setLanguage(await Language.load(go));
 ```
 
-The package also ships `grammar.js`, the queries in `queries/`, and the node types in `src/node-types.json`.
+The package also ships `grammar.js` and the node types in `src/node-types.json`.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-go) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
@@ -68,7 +75,7 @@ fuzzed with:
 ```toml
 [dependencies]
 tree-sitter = { package = "willbooster-tree-sitter", version = "15.0.0" }
-tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "6" }
+tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "7" }
 ```
 
 ```rust
@@ -104,9 +111,6 @@ and the release build regenerate the parsers before compiling them.
 `bun run test` runs:
 
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);
-- an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
-  edits each corpus case at random, reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`,
-  `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits;
 - a check that the real-world Go files in `examples/`, the checked-in ones and those of the cloned repositories, fail to
   parse exactly as listed in `script/known-failures.txt`. Many of the listed files are test data that is invalid Go on
   purpose. The first run clones the repositories. The example repositories are pinned to commits in
@@ -122,8 +126,7 @@ and the release build regenerate the parsers before compiling them.
   Cloudflare Workers with and without Node.js compatibility (`test/e2e/workers.test.ts`).
 
 The tests and `script/parse-examples` compile the parser into `.tmp/tree-sitter-lib` rather than the CLI's cache shared
-by every checkout; `script/fuzz-corpus` builds a parser of its own in `.tmp/fuzz` for each run and deletes it
-afterwards.
+by every checkout.
 
 CI also runs these tests on Linux arm64 and macOS, where the CLI compiles the parser natively, and fuzzes the parser
 with libFuzzer and sanitizers (`.github/workflows/robustness.yml`).

package/grammar.js

@@ -86,6 +86,7 @@ module.exports = grammar({
   word: $ => $.identifier,
 
   conflicts: $ => [
+    [$._raw_struct_tag, $.struct_tag_pair],
     [$._generic_function, $._expression],
     [$._generic_function, $._simple_type, $._expression],
     [$._generic_function, $._simple_type, $.generic_type, $._expression],
@@ -393,9 +394,58 @@ module.exports = grammar({
           )),
         ),
       ),
-      field('tag', optional($._string_literal)),
+      field('tag', optional(choice(
+        $.interpreted_string_literal,
+        alias($._raw_struct_tag, $.raw_string_literal),
+      ))),
+    ),
+
+    _raw_struct_tag: $ => seq(
+      '`',
+      repeat(choice(
+        $.struct_tag_pair,
+        alias($._struct_tag_key_content, $.raw_string_literal_content),
+        alias($._struct_tag_percent, $.raw_string_literal_content),
+        alias($._struct_tag_key_format_specifier, $.format_specifier),
+        $.format_specifier,
+        alias($._struct_tag_colon, $.raw_string_literal_content),
+        alias($._struct_tag_quote, $.raw_string_literal_content),
+        alias(token.immediate(/[\x00-\x20\x7f]/), $.raw_string_literal_content),
+      )),
+      token.immediate('`'),
+    ),
+
+    struct_tag_pair: $ => prec.dynamic(1, seq(
+      field('key', alias($._struct_tag_key, $.tag_name)),
+      alias($._struct_tag_colon, ':'),
+      field('value', alias($._struct_tag_value, $.interpreted_string_literal)),
+    )),
+
+    _struct_tag_key: $ => repeat1(choice(
+      $._struct_tag_key_content,
+      alias($._struct_tag_percent, $.raw_string_literal_content),
+      alias($._struct_tag_key_format_specifier, $.format_specifier),
+    )),
+
+    _struct_tag_key_content: _ => token.immediate(/[^\x00-\x20\x7f:"`%]+/),
+
+    _struct_tag_percent: _ => token.immediate(/%/),
+
+    _struct_tag_key_format_specifier: _ => formatSpecifier(/[+#0-]*/, 3),
+
+    _struct_tag_value: $ => interpretedStringLiteral(
+      $,
+      alias($._struct_tag_quote, '"'),
+      alias($._struct_tag_quote, '"'),
+      true,
     ),
 
+    _struct_tag_escape_sequence: _ => escapeSequence(/[^xuU`\n]/),
+
+    _struct_tag_colon: _ => token.immediate(':'),
+
+    _struct_tag_quote: _ => token.immediate('"'),
+
     interface_type: $ => seq(
       'interface',
       '{',
@@ -895,36 +945,11 @@ module.exports = grammar({
       token.immediate('`'),
     ),
 
-    interpreted_string_literal: $ => seq(
-      '"',
-      repeat(choice(
-        alias(token.immediate(prec(1, /[^"\n\\%]+/)), $.interpreted_string_literal_content),
-        alias(token.immediate('%'), $.interpreted_string_literal_content),
-        $.format_specifier,
-        $.escape_sequence,
-      )),
-      token.immediate('"'),
-    ),
+    interpreted_string_literal: $ => interpretedStringLiteral($, '"'),
 
-    format_specifier: _ => token.immediate(prec(2, seq(
-      '%',
-      /[+#0 -]*/,
-      optional(choice(/[0-9]+/, seq(optional(formatArgumentIndex), '*'))),
-      optional(seq('.', choice(/[0-9]*/, seq(optional(formatArgumentIndex), '*')))),
-      optional(formatArgumentIndex),
-      /[vTtbcdoOqxXUeEfFgGspw%]/,
-    ))),
+    format_specifier: _ => formatSpecifier(/[+#0 -]*/),
 
-    escape_sequence: _ => token.immediate(seq(
-      '\\',
-      choice(
-        /[^xuU]/,
-        /\d{2,3}/,
-        /x[0-9a-fA-F]{2,}/,
-        /u[0-9a-fA-F]{4}/,
-        /U[0-9a-fA-F]{8}/,
-      ),
-    )),
+    escape_sequence: _ => escapeSequence(/[^xuU]/),
 
     int_literal: _ => token(intLiteral),
 
@@ -1013,3 +1038,40 @@ function commaSep1(rule) {
 function commaSep(rule) {
   return optional(commaSep1(rule));
 }
+
+function interpretedStringLiteral($, openingQuote, closingQuote = token.immediate('"'), insideRawTag = false) {
+  return seq(
+    openingQuote,
+    repeat(choice(
+      alias(token.immediate(prec(1, insideRawTag ? /[^"`\n\\%]+/ : /[^"\n\\%]+/)), $.interpreted_string_literal_content),
+      alias(token.immediate('%'), $.interpreted_string_literal_content),
+      $.format_specifier,
+      insideRawTag ? alias($._struct_tag_escape_sequence, $.escape_sequence) : $.escape_sequence,
+    )),
+    closingQuote,
+  );
+}
+
+function escapeSequence(simpleEscape) {
+  return token.immediate(seq(
+    '\\',
+    choice(
+      simpleEscape,
+      /\d{2,3}/,
+      /x[0-9a-fA-F]{2,}/,
+      /u[0-9a-fA-F]{4}/,
+      /U[0-9a-fA-F]{8}/,
+    ),
+  ));
+}
+
+function formatSpecifier(flags, precedence = 2) {
+  return token.immediate(prec(precedence, seq(
+    '%',
+    flags,
+    optional(choice(/[0-9]+/, seq(optional(formatArgumentIndex), '*'))),
+    optional(seq('.', choice(/[0-9]*/, seq(optional(formatArgumentIndex), '*')))),
+    optional(formatArgumentIndex),
+    /[vTtbcdoOqxXUeEfFgGspw%]/,
+  )));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-go",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "description": "Go grammar for tree-sitter",
   "keywords": [
     "go",
@@ -16,7 +16,6 @@
   },
   "files": [
     "grammar.js",
-    "queries/*.scm",
     "src/node-types.json",
     "tree-sitter.json",
     "*.wasm"
@@ -46,15 +45,15 @@
   },
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
-    "@types/bun": "1.4.3",
+    "@types/bun": "1.4.4",
     "@vitest/browser-playwright": "5.0.5",
     "@willbooster/oxlint-config": "1.4.9",
-    "@willbooster/wb": "22.29.3",
-    "@willbooster/web-tree-sitter": "15.0.0",
+    "@willbooster/wb": "22.32.3",
+    "@willbooster/web-tree-sitter": "15.5.4",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.2",
-    "oxlint": "1.88.0",
-    "oxlint-tsgolint": "7.0.2004",
+    "oxlint": "1.89.0",
+    "oxlint-tsgolint": "7.0.2005",
     "playwright": "1.64.1",
     "semantic-release": "25.0.9",
     "vitest": "5.0.5",

package/src/node-types.json

@@ -263,6 +263,16 @@
       }
     ]
   },
+  {
+    "type": "\"",
+    "named": false,
+    "fields": {}
+  },
+  {
+    "type": ":",
+    "named": false,
+    "fields": {}
+  },
   {
     "type": "argument_list",
     "named": true,
@@ -1893,10 +1903,19 @@
         {
           "type": "raw_string_literal_content",
           "named": true
+        },
+        {
+          "type": "struct_tag_pair",
+          "named": true
         }
       ]
     }
   },
+  {
+    "type": "raw_string_literal_content",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "receive_statement",
     "named": true,
@@ -2148,6 +2167,32 @@
       ]
     }
   },
+  {
+    "type": "struct_tag_pair",
+    "named": true,
+    "fields": {
+      "key": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "tag_name",
+            "named": true
+          }
+        ]
+      },
+      "value": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "interpreted_string_literal",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "struct_type",
     "named": true,
@@ -2163,6 +2208,25 @@
       ]
     }
   },
+  {
+    "type": "tag_name",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "format_specifier",
+          "named": true
+        },
+        {
+          "type": "raw_string_literal_content",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "type_alias",
     "named": true,
@@ -2715,10 +2779,6 @@
     "type": "!=",
     "named": false
   },
-  {
-    "type": "\"",
-    "named": false
-  },
   {
     "type": "%",
     "named": false
@@ -2807,10 +2867,6 @@
     "type": "/=",
     "named": false
   },
-  {
-    "type": ":",
-    "named": false
-  },
   {
     "type": ":=",
     "named": false
@@ -3020,10 +3076,6 @@
     "type": "range",
     "named": false
   },
-  {
-    "type": "raw_string_literal_content",
-    "named": true
-  },
   {
     "type": "return",
     "named": false

package/tree-sitter.json

@@ -8,13 +8,11 @@
       "path": ".",
       "file-types": [
         "go"
-      ],
-      "highlights": "queries/highlights.scm",
-      "tags": "queries/tags.scm"
+      ]
     }
   ],
   "metadata": {
-    "version": "6.1.0",
+    "version": "7.0.0",
     "license": "MIT",
     "description": "Go grammar for tree-sitter",
     "authors": [

package/queries/highlights.scm

@@ -1,167 +0,0 @@
-(type_identifier) @type
-(field_identifier) @property
-(identifier) @variable
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (identifier) @function.builtin
-  (#match? @function.builtin "^(append|cap|clear|close|complex|copy|delete|imag|len|make|max|min|new|panic|print|println|real|recover)$"))
-
-(call_expression
-  function: (selector_expression
-    field: (field_identifier) @function.method))
-
-(function_declaration
-  name: (identifier) @function)
-
-(method_declaration
-  name: (field_identifier) @function.method)
-
-[
-  "--"
-  "-"
-  "-="
-  ":="
-  "!"
-  "!="
-  "..."
-  "*"
-  "*"
-  "*="
-  "/"
-  "/="
-  "&"
-  "&&"
-  "&="
-  "%"
-  "%="
-  "^"
-  "^="
-  "+"
-  "++"
-  "+="
-  "<-"
-  "<"
-  "<<"
-  "<<="
-  "<="
-  "="
-  "=="
-  ">"
-  ">="
-  ">>"
-  ">>="
-  "|"
-  "|="
-  "||"
-  "~"
-] @operator
-
-[
-  "break"
-  "case"
-  "chan"
-  "const"
-  "continue"
-  "default"
-  "defer"
-  "else"
-  "fallthrough"
-  "for"
-  "func"
-  "go"
-  "goto"
-  "if"
-  "import"
-  "interface"
-  "map"
-  "package"
-  "range"
-  "return"
-  "select"
-  "struct"
-  "switch"
-  "type"
-  "var"
-] @keyword
-
-[
-  (interpreted_string_literal)
-  (raw_string_literal)
-  (rune_literal)
-] @string
-
-((call_expression
-  function: (identifier) @function
-  arguments: (argument_list
-    . (comment)*
-    . [
-      (interpreted_string_literal
-        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
-      (raw_string_literal
-        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
-    ]))
-  (#match? @function "^(Printf|Sprintf|Errorf|Scanf|Fatalf|Panicf|Skipf|Logf|Debugf|Infof|Warnf|Warningf|Tracef)$"))
-
-((call_expression
-  function: (selector_expression field: (field_identifier) @function.method)
-  arguments: (argument_list
-    . (comment)*
-    . [
-      (interpreted_string_literal
-        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
-      (raw_string_literal
-        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
-    ]))
-  (#match? @function.method "^(Printf|Sprintf|Errorf|Scanf|Fatalf|Panicf|Skipf|Logf|Debugf|Infof|Warnf|Warningf|Tracef)$"))
-
-((call_expression
-  function: (identifier) @function
-  arguments: (argument_list
-    . (comment)*
-    . (_)
-    . (comment)*
-    . ","
-    . (comment)*
-    . [
-      (interpreted_string_literal
-        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
-      (raw_string_literal
-        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
-    ]))
-  (#match? @function "^(Fprintf|Appendf|Fscanf|Sscanf)$"))
-
-((call_expression
-  function: (selector_expression field: (field_identifier) @function.method)
-  arguments: (argument_list
-    . (comment)*
-    . (_)
-    . (comment)*
-    . ","
-    . (comment)*
-    . [
-      (interpreted_string_literal
-        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
-      (raw_string_literal
-        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
-    ]))
-  (#match? @function.method "^(Fprintf|Appendf|Fscanf|Sscanf)$"))
-
-(escape_sequence) @escape
-
-[
-  (int_literal)
-  (float_literal)
-  (imaginary_literal)
-] @number
-
-[
-  (true)
-  (false)
-  (nil)
-  (iota)
-] @constant.builtin
-
-(comment) @comment

package/queries/tags.scm

@@ -1,70 +0,0 @@
-(
-  (comment)* @doc
-  .
-  (function_declaration
-    name: (identifier) @name) @definition.function
-  (#strip! @doc "^//\\s*")
-  (#select-adjacent! @doc @definition.function)
-)
-
-(
-  (comment)* @doc
-  .
-  (method_declaration
-    name: (field_identifier) @name) @definition.method
-  (#strip! @doc "^//\\s*")
-  (#select-adjacent! @doc @definition.method)
-)
-
-(call_expression
-  function: [
-    (identifier) @name
-    (parenthesized_expression (identifier) @name)
-    (selector_expression field: (field_identifier) @name)
-    (parenthesized_expression (selector_expression field: (field_identifier) @name))
-  ]) @reference.call
-
-(
-  (type_spec
-    name: (type_identifier) @name) @definition.type
-  (#not-eq? @name "_")
-)
-
-(
-  (type_alias
-    name: (type_identifier) @name) @definition.type
-  (#not-eq? @name "_")
-)
-
-(type_identifier) @name @reference.type
-
-(package_clause "package" (package_identifier) @name)
-
-(method_elem
-  name: (field_identifier) @name) @definition.method
-
-(
-  (field_declaration
-    name: (field_identifier) @name) @definition.field
-  (#not-eq? @name "_")
-)
-
-(import_declaration (import_spec) @name)
-
-(
-  (source_file
-    (var_declaration
-      [
-        (var_spec name: (identifier) @name) @definition.variable
-        (var_spec_list
-          (var_spec name: (identifier) @name) @definition.variable)
-      ]))
-  (#not-eq? @name "_")
-)
-
-(
-  (source_file
-    (const_declaration
-      (const_spec name: (identifier) @name) @definition.constant))
-  (#not-eq? @name "_")
-)