@willbooster/tree-sitter-typescript 1.2.5 → 1.2.7

package/README.md

@@ -67,7 +67,9 @@ const parser = new Parser();
 parser.setLanguage(await Language.load(typescript));
 ```
 
-The package also ships the node types in `typescript/src/node-types.json` and `tsx/src/node-types.json`.
+The package also ships the node types in `typescript/src/node-types.json` and `tsx/src/node-types.json`, and the
+highlighting, injection, locals, and tags queries that `tree-sitter.json` lists: this grammar's in `queries/` and, in
+`javascript/queries/`, those of the JavaScript grammar it extends.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-typescript) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
@@ -86,6 +88,8 @@ parser.set_language(&tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into())?;
 // or `tree_sitter_typescript::LANGUAGE_TSX` for TSX
 ```
 
+The crate ships the same `tree-sitter.json` and query files as the npm package.
+
 ## Development
 
 ```sh
@@ -116,6 +120,10 @@ cargo test
 - a performance check (`test/unit/performance.test.ts`) that recovering from an error on each of 10,000 lines takes
   linear time with each grammar, since consumers parse files while they are being edited. It loads the Wasm builds
   through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after regenerating the parsers;
+- a check (`test/unit/queries.test.ts`) that the queries `tree-sitter.json` lists compile against each grammar, are
+  published in the npm package and the crate, and that `javascript/queries/` matches the queries of the installed
+  @willbooster/tree-sitter-javascript; after updating that dependency, `script/copy-javascript-queries` refreshes the
+  copies;
 - checks that both Wasm builds load and parse through @willbooster/web-tree-sitter in Chromium
   (`test/unit/browser/`) and in Cloudflare Workers with and without Node.js compatibility
   (`test/unit/workers.test.ts`, running the Worker in `test/fixtures/worker/`).

package/common/defineGrammar.js

@@ -242,7 +242,7 @@ module.exports = function defineGrammar(dialect) {
             prec(
               'generic_call',
               seq(
-                field('function', choice($.primary_expression, $.new_expression)),
+                field('function', $.primary_expression),
                 field('type_arguments', $.type_arguments),
                 field('arguments', choice($.arguments, $.template_string))
               )
@@ -251,7 +251,7 @@ module.exports = function defineGrammar(dialect) {
           prec(
             'template_call',
             seq(
-              field('function', choice($.primary_expression, $.new_expression)),
+              field('function', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
               field('arguments', $.template_string)
             )
           ),
@@ -266,17 +266,29 @@ module.exports = function defineGrammar(dialect) {
           )
         ),
 
+      // As in ECMAScript, a `new` with arguments is a member-level (primary) expression and one without them is not, so a
+      // member access, a call, or a further argument list binds to the nearest `new` with arguments: `new new A().b`
+      // constructs `new A().b`, and `new new A()(2)` constructs `new A()`.
       new_expression: ($) =>
-        prec.right(
+        prec(
           'new',
           seq(
             'new',
-            field('constructor', $.primary_expression),
+            field('constructor', $._new_constructor),
             field('type_arguments', optional($.type_arguments)),
-            field('arguments', optional($.arguments))
+            field('arguments', $.arguments)
           )
         ),
 
+      _argumentless_new_expression: ($) =>
+        prec.right(
+          'new',
+          seq('new', field('constructor', $._new_constructor), field('type_arguments', optional($.type_arguments)))
+        ),
+
+      _new_constructor: ($) =>
+        prec('new', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
+
       assignment_expression: ($) =>
         prec.right(
           'assign',
@@ -287,18 +299,26 @@ module.exports = function defineGrammar(dialect) {
 
       _lhs_expression: ($, previous) => choice(previous, $.non_null_expression),
 
-      primary_expression: ($, previous) => choice(previous, $.non_null_expression),
+      primary_expression: ($, previous) => choice(previous, $.non_null_expression, $.new_expression),
 
       // If the dialect is regular typescript, we exclude JSX expressions and
       // include type assertions. If the dialect is TSX, we do the opposite.
       expression: ($, previous) => {
-        const choices = [$.as_expression, $.satisfies_expression, $.instantiation_expression, $.internal_module];
+        const choices = [
+          $.as_expression,
+          $.satisfies_expression,
+          $.instantiation_expression,
+          $.internal_module,
+          alias($._argumentless_new_expression, $.new_expression),
+        ];
+        // A `new` with arguments is a primary expression (see new_expression).
+        const members = previous.members.filter((member) => member.name !== 'new_expression');
 
         if (dialect === 'typescript') {
           choices.push($.type_assertion);
-          choices.push(...previous.members.filter((member) => member.name !== '_jsx_element'));
+          choices.push(...members.filter((member) => member.name !== '_jsx_element'));
         } else if (dialect === 'tsx') {
-          choices.push(...previous.members);
+          choices.push(...members);
         } else {
           throw new Error(`Unknown dialect ${dialect}`);
         }
@@ -419,7 +439,8 @@ module.exports = function defineGrammar(dialect) {
           ')'
         ),
 
-      non_null_expression: ($) => prec.left('unary', seq($.expression, '!')),
+      // TypeScript parses a postfix `!` as part of a member access chain, so `new A!()` constructs `A!`.
+      non_null_expression: ($) => prec('member', seq($.primary_expression, '!')),
 
       variable_declarator: ($) =>
         choice(
@@ -565,13 +586,7 @@ module.exports = function defineGrammar(dialect) {
       satisfies_expression: ($) => prec.left('binary', seq($.expression, 'satisfies', $.type)),
 
       instantiation_expression: ($) =>
-        prec.dynamic(
-          -1,
-          prec(
-            'instantiation',
-            seq(choice($.primary_expression, $.new_expression), field('type_arguments', $.type_arguments))
-          )
-        ),
+        prec.dynamic(-1, prec('instantiation', seq($.primary_expression, field('type_arguments', $.type_arguments)))),
 
       class_heritage: ($) => choice(seq($.extends_clause, optional($.implements_clause)), $.implements_clause),
 

package/javascript/queries/highlights-jsx.scm

@@ -0,0 +1,8 @@
+(jsx_opening_element (identifier) @tag (#match? @tag "^[a-z][^.]*$"))
+(jsx_closing_element (identifier) @tag (#match? @tag "^[a-z][^.]*$"))
+(jsx_self_closing_element (identifier) @tag (#match? @tag "^[a-z][^.]*$"))
+
+(jsx_attribute (property_identifier) @attribute)
+(jsx_opening_element (["<" ">"]) @punctuation.bracket)
+(jsx_closing_element (["</" ">"]) @punctuation.bracket)
+(jsx_self_closing_element (["<" "/>"]) @punctuation.bracket)

package/javascript/queries/highlights.scm

@@ -0,0 +1,218 @@
+; Variables
+;----------
+
+(identifier) @variable
+
+; Properties
+;-----------
+
+(property_identifier) @property
+
+; Function and method definitions
+;--------------------------------
+
+(function_expression
+  name: (identifier) @function)
+(function_declaration
+  name: (identifier) @function)
+(method_definition
+  name: (property_identifier) @function.method)
+
+(pair
+  key: (property_identifier) @function.method
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (member_expression
+    property: (property_identifier) @function.method)
+  right: [(function_expression) (arrow_function)])
+
+(variable_declarator
+  name: (identifier) @function
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (identifier) @function
+  right: [(function_expression) (arrow_function)])
+
+; Function and method calls
+;--------------------------
+
+(call_expression
+  function: (identifier) @function)
+
+(call_expression
+  function: (member_expression
+    property: (property_identifier) @function.method))
+
+; Special identifiers
+;--------------------
+
+((identifier) @constructor
+ (#match? @constructor "^[A-Z]"))
+
+([
+    (identifier)
+    (shorthand_property_identifier)
+    (shorthand_property_identifier_pattern)
+ ] @constant
+ (#match? @constant "^[A-Z_][A-Z\\d_]+$"))
+
+((identifier) @variable.builtin
+ (#match? @variable.builtin "^(arguments|module|console|window|document)$")
+ (#is-not? local))
+
+((identifier) @function.builtin
+ (#eq? @function.builtin "require")
+ (#is-not? local))
+
+; Literals
+;---------
+
+(this) @variable.builtin
+(super) @variable.builtin
+
+[
+  (true)
+  (false)
+  (null)
+  (undefined)
+] @constant.builtin
+
+(comment) @comment
+
+[
+  (string)
+  (template_string)
+] @string
+
+(regex) @string.special
+(number) @number
+
+; Tokens
+;-------
+
+[
+  ";"
+  (optional_chain)
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "-"
+  "--"
+  "-="
+  "+"
+  "++"
+  "+="
+  "*"
+  "*="
+  "**"
+  "**="
+  "/"
+  "/="
+  "%"
+  "%="
+  "<"
+  "<="
+  "<<"
+  "<<="
+  "="
+  "=="
+  "==="
+  "!"
+  "!="
+  "!=="
+  "=>"
+  ">"
+  ">="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "~"
+  "^"
+  "&"
+  "|"
+  "^="
+  "&="
+  "|="
+  "&&"
+  "||"
+  "??"
+  "&&="
+  "||="
+  "??="
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+]  @punctuation.bracket
+
+(template_substitution
+  "${" @punctuation.special
+  "}" @punctuation.special) @embedded
+
+[
+  "as"
+  "async"
+  "await"
+  "break"
+  "case"
+  "catch"
+  "class"
+  "const"
+  "continue"
+  "debugger"
+  "default"
+  "delete"
+  "do"
+  "else"
+  "export"
+  "extends"
+  "finally"
+  "for"
+  "from"
+  "function"
+  "get"
+  "if"
+  "import"
+  "in"
+  "instanceof"
+  "let"
+  "new"
+  "of"
+  "return"
+  "set"
+  "static"
+  "switch"
+  "target"
+  "throw"
+  "try"
+  "typeof"
+  "var"
+  "void"
+  "while"
+  "with"
+  "yield"
+] @keyword
+
+; `default` as a module export name is an identifier node.
+(export_specifier
+  name: (identifier) @keyword
+  (#eq? @keyword "default"))
+(export_specifier
+  alias: (identifier) @keyword
+  (#eq? @keyword "default"))
+(import_specifier
+  name: (identifier) @keyword
+  (#eq? @keyword "default"))
+(namespace_export
+  (identifier) @keyword
+  (#eq? @keyword "default"))

package/javascript/queries/injections.scm

@@ -0,0 +1,31 @@
+; Parse the contents of tagged template literals using
+; a language inferred from the tag.
+
+(call_expression
+  function: [
+    (identifier) @injection.language
+    (member_expression
+      property: (property_identifier) @injection.language)
+  ]
+  arguments: (template_string (string_fragment) @injection.content)
+  (#set! injection.combined)
+  (#set! injection.include-children))
+
+
+; Parse regex syntax within regex literals
+
+((regex_pattern) @injection.content
+ (#set! injection.language "regex"))
+
+ ; Parse JSDoc annotations in comments
+
+((comment) @injection.content
+ (#set! injection.language "jsdoc"))
+
+; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
+; e.g.: await render(hbs`<SomeComponent />`)
+(call_expression
+  function: ((identifier) @_name
+             (#eq? @_name "hbs"))
+  arguments: ((template_string) @glimmer
+              (#offset! @glimmer 0 1 0 -1)))

package/javascript/queries/locals.scm

@@ -0,0 +1,23 @@
+; Scopes
+;-------
+
+[
+  (statement_block)
+  (function_expression)
+  (arrow_function)
+  (function_declaration)
+  (method_definition)
+] @local.scope
+
+; Definitions
+;------------
+
+(pattern/identifier) @local.definition
+
+(variable_declarator
+  name: (identifier) @local.definition)
+
+; References
+;------------
+
+(identifier) @local.reference

package/javascript/queries/tags.scm

@@ -0,0 +1,99 @@
+(
+  (comment)* @doc
+  .
+  (method_definition
+    name: (property_identifier) @name) @definition.method
+  (#not-eq? @name "constructor")
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.method)
+)
+
+(
+  (comment)* @doc
+  .
+  [
+    (class
+      name: (_) @name)
+    (class_declaration
+      name: (_) @name)
+  ] @definition.class
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.class)
+)
+
+(
+  (comment)* @doc
+  .
+  [
+    (function_expression
+      name: (identifier) @name)
+    (function_declaration
+      name: (identifier) @name)
+    (generator_function
+      name: (identifier) @name)
+    (generator_function_declaration
+      name: (identifier) @name)
+  ] @definition.function
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(
+  (comment)* @doc
+  .
+  (lexical_declaration
+    (variable_declarator
+      name: (identifier) @name
+      value: [(arrow_function) (function_expression)]) @definition.function)
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(
+  (comment)* @doc
+  .
+  (variable_declaration
+    (variable_declarator
+      name: (identifier) @name
+      value: [(arrow_function) (function_expression)]) @definition.function)
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(assignment_expression
+  left: [
+    (identifier) @name
+    (member_expression
+      property: (property_identifier) @name)
+  ]
+  right: [(arrow_function) (function_expression)]
+) @definition.function
+
+(pair
+  key: (property_identifier) @name
+  value: [(arrow_function) (function_expression)]) @definition.function
+
+(
+  (call_expression
+    function: (identifier) @name) @reference.call
+  (#not-match? @name "^(require)$")
+)
+
+(call_expression
+  function: (member_expression
+    property: (property_identifier) @name)
+  arguments: (_) @reference.call)
+
+(new_expression
+  constructor: (_) @name) @reference.class
+
+(export_statement value: (assignment_expression left: (identifier) @name right: ([
+ (number)
+ (string)
+ (identifier)
+ (undefined)
+ (null)
+ (new_expression)
+ (binary_expression)
+ (call_expression)
+]))) @definition.constant

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -22,6 +22,8 @@
     "tree-sitter.json",
     "typescript/src/node-types.json",
     "tsx/src/node-types.json",
+    "queries/*.scm",
+    "javascript/queries/*.scm",
     "*.wasm"
   ],
   "scripts": {
@@ -48,7 +50,7 @@
     "@vitest/browser-playwright": "5.0.1",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/tree-sitter-javascript": "1.0.15",
+    "@willbooster/tree-sitter-javascript": "1.0.16",
     "@willbooster/wb": "22.13.0",
     "@willbooster/web-tree-sitter": "1.0.7",
     "conventional-changelog-conventionalcommits": "10.4.0",

package/queries/highlights.scm

@@ -0,0 +1,35 @@
+; Types
+
+(type_identifier) @type
+(predefined_type) @type.builtin
+
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+
+(type_arguments
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+; Variables
+
+(required_parameter (identifier) @variable.parameter)
+(optional_parameter (identifier) @variable.parameter)
+
+; Keywords
+
+[ "abstract"
+  "declare"
+  "enum"
+  "export"
+  "implements"
+  "interface"
+  "keyof"
+  "namespace"
+  "private"
+  "protected"
+  "public"
+  "type"
+  "readonly"
+  "override"
+  "satisfies"
+] @keyword

package/queries/locals.scm

@@ -0,0 +1,2 @@
+(required_parameter (identifier) @local.definition)
+(optional_parameter (identifier) @local.definition)

package/queries/tags.scm

@@ -0,0 +1,23 @@
+(function_signature
+  name: (identifier) @name) @definition.function
+
+(method_signature
+  name: (property_identifier) @name) @definition.method
+
+(abstract_method_signature
+  name: (property_identifier) @name) @definition.method
+
+(abstract_class_declaration
+  name: (type_identifier) @name) @definition.class
+
+(module
+  name: (identifier) @name) @definition.module
+
+(interface_declaration
+  name: (type_identifier) @name) @definition.interface
+
+(type_annotation
+  (type_identifier) @name) @reference.type
+
+(new_expression
+  constructor: (identifier) @name) @reference.class

package/tree-sitter.json

@@ -14,16 +14,16 @@
       ],
       "highlights": [
         "queries/highlights.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/highlights.scm"
+        "javascript/queries/highlights.scm"
       ],
-      "injections": "node_modules/@willbooster/tree-sitter-javascript/queries/injections.scm",
+      "injections": "javascript/queries/injections.scm",
       "locals": [
         "queries/locals.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/locals.scm"
+        "javascript/queries/locals.scm"
       ],
       "tags": [
         "queries/tags.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/tags.scm"
+        "javascript/queries/tags.scm"
       ],
       "injection-regex": "^(ts|typescript)$"
     },
@@ -40,14 +40,17 @@
       ],
       "highlights": [
         "queries/highlights.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/highlights-jsx.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/highlights.scm"
+        "javascript/queries/highlights-jsx.scm",
+        "javascript/queries/highlights.scm"
+      ],
+      "injections": "javascript/queries/injections.scm",
+      "locals": [
+        "queries/locals.scm",
+        "javascript/queries/locals.scm"
       ],
-      "injections": "node_modules/@willbooster/tree-sitter-javascript/queries/injections.scm",
-      "locals": "node_modules/@willbooster/tree-sitter-javascript/queries/locals.scm",
       "tags": [
         "queries/tags.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/tags.scm"
+        "javascript/queries/tags.scm"
       ],
       "injection-regex": "^(ts|typescript)$"
     },
@@ -64,20 +67,23 @@
       ],
       "highlights": [
         "queries/highlights.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/highlights-jsx.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/highlights.scm"
+        "javascript/queries/highlights-jsx.scm",
+        "javascript/queries/highlights.scm"
+      ],
+      "injections": "javascript/queries/injections.scm",
+      "locals": [
+        "queries/locals.scm",
+        "javascript/queries/locals.scm"
       ],
-      "injections": "node_modules/@willbooster/tree-sitter-javascript/queries/injections.scm",
-      "locals": "node_modules/@willbooster/tree-sitter-javascript/queries/locals.scm",
       "tags": [
         "queries/tags.scm",
-        "node_modules/@willbooster/tree-sitter-javascript/queries/tags.scm"
+        "javascript/queries/tags.scm"
       ],
       "content-regex": "@flow"
     }
   ],
   "metadata": {
-    "version": "1.2.5",
+    "version": "1.2.7",
     "license": "MIT",
     "description": "TypeScript and TSX grammars for tree-sitter",
     "authors": [

package/tsx/src/node-types.json

@@ -221,6 +221,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "non_null_expression",
         "named": true
@@ -3110,10 +3114,6 @@
       "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "new_expression",
-          "named": true
-        },
         {
           "type": "primary_expression",
           "named": true
@@ -4057,7 +4057,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]

package/typescript/src/node-types.json

@@ -217,6 +217,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "non_null_expression",
         "named": true
@@ -3106,10 +3110,6 @@
       "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "new_expression",
-          "named": true
-        },
         {
           "type": "primary_expression",
           "named": true
@@ -3808,7 +3808,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]