@willbooster/tree-sitter-typescript 1.2.13 → 1.3.0

package/README.md

@@ -108,7 +108,12 @@ runtime this package ships. The first run downloads that CLI from its GitHub Rel
 `cargo` (with the `cmake` that `mise.toml` pins) when the download fails or the release has no binary that runs here.
 
 `bun run test/ci-setup` installs Chromium for the browser tests. `bun run build/ci` regenerates `typescript/src/` and
-`tsx/src/` and builds both Wasm files. `bun run test` runs:
+`tsx/src/` and builds both Wasm files. It also refreshes `common/typeScriptKeywords.h` from the pinned
+`typescript-reference` API (TypeScript 5.9.3), which supplies the global-augmentation lookahead vocabulary.
+The native TypeScript package remains the type checker. Run `bun run generate-keywords` after changing the reference;
+verification checks the committed header with `bun run check-keywords`.
+
+`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).
   Cases run with the `typescript` grammar unless they carry `:language(tsx)`;

package/common/defineGrammar.js

@@ -4,6 +4,7 @@ const JavaScript = require('@willbooster/tree-sitter-javascript/grammar');
 // Words that are keywords only in some positions and identifiers elsewhere, besides the JavaScript grammar's.
 const TYPESCRIPT_CONTEXTUAL_KEYWORDS = [
   'declare',
+  'global',
   'namespace',
   'type',
   'public',
@@ -18,6 +19,7 @@ const TYPESCRIPT_CONTEXTUAL_KEYWORDS = [
   'string',
   'symbol',
   'object',
+  'out',
   'new',
 ];
 
@@ -64,6 +66,8 @@ module.exports = function defineGrammar(dialect) {
       $._type_arguments_end,
       $._type_arguments_end_before_expression,
       $._new_type_arguments_end,
+      $._global_declaration_start,
+      $._global_declaration_end,
       $.__error_recovery,
     ],
 
@@ -118,7 +122,7 @@ module.exports = function defineGrammar(dialect) {
       [$.type_query, $._type_query_subscript_expression],
       [$.nested_type_identifier, $.generic_type, $.primary_type, $.lookup_type, $.index_type_query, $.type],
       // A qualified type name takes every `.` and name that follow it: `x as a.b.C` is not `(x as a.b).C`.
-      [$.nested_identifier, $.nested_type_identifier],
+      [$.nested_identifier, $._in_nested_identifier, $.nested_type_identifier],
       [$.as_expression, $.satisfies_expression, $.primary_type],
       [$._type_query_member_expression, $.member_expression],
       [$.member_expression, $._type_query_member_expression_in_type_annotation],
@@ -189,6 +193,7 @@ module.exports = function defineGrammar(dialect) {
         ? [[$.primary_type, $.type_parameter]]
         : [
             [$.jsx_opening_element, $.type_parameter],
+            [$.jsx_opening_element, $.jsx_self_closing_element, $.type_parameter],
             [$.jsx_namespace_name, $.primary_type],
           ]),
       [
@@ -205,6 +210,7 @@ module.exports = function defineGrammar(dialect) {
     inline: ($, previous) => [
       ...previous.filter((rule) => !['_formal_parameter', '_call_signature'].includes(rule.name)),
       $._type_identifier,
+      $._type_reference_identifier,
       $._jsx_start_opening_element,
     ],
 
@@ -410,6 +416,35 @@ module.exports = function defineGrammar(dialect) {
         return choice(...choices);
       },
 
+      _jsx_identifier: ($, previous) => choice(previous, alias(choice('in', 'out'), $.identifier)),
+
+      nested_identifier: ($) =>
+        prec(
+          'member',
+          seq(
+            field(
+              'object',
+              choice(
+                reserved('properties', $.identifier),
+                alias('out', $.identifier),
+                alias($.nested_identifier, $.member_expression)
+              )
+            ),
+            ...nestedIdentifierTail($)
+          )
+        ),
+
+      _in_nested_identifier: ($) =>
+        prec(
+          'member',
+          seq(
+            field('object', choice(alias('in', $.identifier), alias($._in_nested_identifier, $.member_expression))),
+            ...nestedIdentifierTail($)
+          )
+        ),
+
+      _jsx_element_name: ($, previous) => choice(previous, alias($._in_nested_identifier, $.member_expression)),
+
       _jsx_start_opening_element: ($) =>
         seq(
           '<',
@@ -418,7 +453,14 @@ module.exports = function defineGrammar(dialect) {
               choice(
                 field('name', choice($._jsx_identifier, $.jsx_namespace_name)),
                 seq(
-                  field('name', choice($.identifier, alias($.nested_identifier, $.member_expression))),
+                  field(
+                    'name',
+                    choice(
+                      $._jsx_identifier,
+                      alias($.nested_identifier, $.member_expression),
+                      alias($._in_nested_identifier, $.member_expression)
+                    )
+                  ),
                   field('type_arguments', optional($.type_arguments))
                 )
               ),
@@ -473,6 +515,7 @@ module.exports = function defineGrammar(dialect) {
       export_statement: ($, previous) =>
         choice(
           previous,
+          seq('export', field('declaration', alias($.global_declaration, $.internal_module))),
           seq('export', 'type', $.export_clause, optional($._from_clause), $._semicolon),
           seq('export', 'type', choice('*', $.namespace_export), $._from_clause, $._semicolon),
           seq('export', '=', $.expression, $._semicolon),
@@ -649,6 +692,8 @@ module.exports = function defineGrammar(dialect) {
           )
         ),
 
+      statement: ($, previous) => choice(previous, alias($.global_declaration, $.internal_module)),
+
       declaration: ($, previous) =>
         choice(
           previous,
@@ -706,7 +751,7 @@ module.exports = function defineGrammar(dialect) {
           'declare',
           choice(
             $.declaration,
-            seq('global', $.statement_block),
+            seq(alias($._global_declaration_start, 'global'), choice($.statement_block, $._global_declaration_end)),
             seq('module', '.', alias($.identifier, $.property_identifier), ':', $.type, $._semicolon)
           )
         ),
@@ -756,22 +801,50 @@ module.exports = function defineGrammar(dialect) {
 
       internal_module: ($) => seq('namespace', $._module),
 
+      global_declaration: ($) =>
+        seq(
+          field('name', alias($._global_declaration_start, $.identifier)),
+          choice(field('body', $.statement_block), $._global_declaration_end)
+        ),
+
       _module: ($) =>
         prec.right(
           seq(
-            field('name', choice($.string, reserved('properties', $.identifier), $.nested_identifier)),
+            field(
+              'name',
+              choice($.string, reserved('properties', $.identifier), alias('out', $.identifier), $.nested_identifier)
+            ),
             // On .d.ts files "declare module foo" desugars to "declare module foo {}",
             // hence why it is optional here
             field('body', optional($.statement_block))
           )
         ),
 
-      import_alias: ($) => seq('import', $.identifier, '=', choice($.identifier, $.nested_identifier), $._semicolon),
+      import_alias: ($) =>
+        seq(
+          'import',
+          $.identifier,
+          '=',
+          choice($.identifier, alias('out', $.identifier), $.nested_identifier),
+          $._semicolon
+        ),
 
       nested_type_identifier: ($) =>
         prec(
           'member',
-          seq(field('module', choice($.identifier, $.nested_identifier)), '.', field('name', $._type_identifier))
+          seq(
+            field(
+              'module',
+              choice(
+                $.identifier,
+                alias(choice('in', 'out'), $.identifier),
+                $.nested_identifier,
+                alias($._in_nested_identifier, $.nested_identifier)
+              )
+            ),
+            '.',
+            field('name', $._type_reference_identifier)
+          )
         ),
 
       interface_declaration: ($) =>
@@ -862,7 +935,7 @@ module.exports = function defineGrammar(dialect) {
           field('arguments', $.arguments)
         ),
 
-      asserts: ($) => seq('asserts', choice($.type_predicate, $.identifier, $.this)),
+      asserts: ($) => seq('asserts', choice($.type_predicate, $.identifier, alias('out', $.identifier), $.this)),
 
       asserts_annotation: ($) => seq(seq(':', $.asserts)),
 
@@ -885,11 +958,8 @@ module.exports = function defineGrammar(dialect) {
 
       optional_tuple_parameter: ($) => seq(field('name', $._tuple_label), '?', field('type', $.type_annotation)),
 
-      _tuple_rest_label: ($) => seq('...', $._tuple_label),
+      _tuple_rest_label: ($) => seq('...', choice($._tuple_label, alias('in', $.identifier))),
 
-      // TypeScript accepts any identifier name as a tuple label, but where a tuple member begins, the keywords that
-      // can begin a type are lexed as those keywords, so they are listed here. Keywords that are rules of their own
-      // are aliased as rules: repeating their strings would turn those rules into nodes that wrap a token.
       _tuple_label: ($) =>
         choice(
           $.identifier,
@@ -905,6 +975,7 @@ module.exports = function defineGrammar(dialect) {
               'never',
               'object',
               'readonly',
+              'out',
               'keyof',
               'infer',
               'typeof',
@@ -948,7 +1019,7 @@ module.exports = function defineGrammar(dialect) {
         choice(
           $.parenthesized_type,
           $.predefined_type,
-          $._type_identifier,
+          $._type_reference_identifier,
           $.nested_type_identifier,
           $.generic_type,
           $.object_type,
@@ -995,7 +1066,7 @@ module.exports = function defineGrammar(dialect) {
             field(
               'name',
               choice(
-                $._type_identifier,
+                $._type_reference_identifier,
                 $.nested_type_identifier,
                 alias($._type_query_member_expression_in_type_annotation, $.member_expression)
               )
@@ -1010,6 +1081,7 @@ module.exports = function defineGrammar(dialect) {
             'name',
             choice(
               $.identifier,
+              alias('out', $.identifier),
               $.this,
               // Sometimes tree-sitter contextual lexing is not good enough to know
               // that 'object' in ':object is foo' is really an identifier and not
@@ -1189,7 +1261,7 @@ module.exports = function defineGrammar(dialect) {
 
       type_parameter: ($) =>
         seq(
-          optional('const'),
+          repeat(choice('const', 'in', 'out')),
           field('name', $._type_identifier),
           field('constraint', optional($.constraint)),
           field('value', optional($.default_type))
@@ -1252,13 +1324,28 @@ module.exports = function defineGrammar(dialect) {
 
       // A type name may be a reserved word, which TypeScript reports only as a semantic error. The reserved words must be
       // allowed on the identifier inside the alias: around the alias, the keyword token still wins in the lexer.
-      _type_identifier: ($) => alias(reserved('properties', $.identifier), $.type_identifier),
+      _type_identifier: ($) => alias(choice(reserved('properties', $.identifier), 'out'), $.type_identifier),
+
+      _type_reference_identifier: ($) => choice($._type_identifier, alias('in', $.type_identifier)),
 
       _reserved_identifier: (_, previous) => choice(...TYPESCRIPT_CONTEXTUAL_KEYWORDS, previous),
     },
   });
 };
 
+function nestedIdentifierTail($) {
+  return [
+    '.',
+    field(
+      'property',
+      choice(
+        reserved('properties', alias($.identifier, $.property_identifier)),
+        alias(choice('in', 'out'), $.property_identifier)
+      )
+    ),
+  ];
+}
+
 /**
  * Creates a rule to match one or more of the rules separated by a comma
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.13",
+  "version": "1.3.0",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -28,9 +28,11 @@
   ],
   "scripts": {
     "build-wasm": "script/tree-sitter build --wasm typescript && script/tree-sitter build --wasm tsx",
-    "build/ci": "script/tree-sitter generate typescript/grammar.js && script/tree-sitter generate tsx/grammar.js && bun run build-wasm",
-    "cleanup": "bun wb lint --fix --format",
+    "build/ci": "bun run generate-keywords && script/tree-sitter generate typescript/grammar.js && script/tree-sitter generate tsx/grammar.js && bun run build-wasm",
+    "check-keywords": "bun scripts/generateGlobalKeywords.ts --check",
+    "cleanup": "bun run check-keywords && bun wb lint --fix --format",
     "format": "bun wb lint --format",
+    "generate-keywords": "bun scripts/generateGlobalKeywords.ts",
     "lint": "bun wb lint",
     "lint-fix": "bun wb lint --fix",
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
@@ -48,24 +50,25 @@
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
     "@types/bun": "1.4.2",
-    "@vitest/browser-playwright": "5.0.1",
+    "@vitest/browser-playwright": "5.0.2",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/tree-sitter-javascript": "1.0.21",
-    "@willbooster/wb": "22.13.1",
+    "@willbooster/wb": "22.18.0",
     "@willbooster/web-tree-sitter": "1.0.17",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
     "oxlint": "1.85.0",
-    "oxlint-tsgolint": "7.0.2002",
+    "oxlint-tsgolint": "7.0.2003",
     "playwright": "1.63.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
     "typescript": "7.0.2",
+    "typescript-reference": "npm:typescript@5.9.3",
     "vite": "8.3.0",
-    "vitest": "5.0.1",
-    "wrangler": "4.135.0"
+    "vitest": "5.0.2",
+    "wrangler": "4.141.0"
   },
   "peerDependencies": {
     "@willbooster/web-tree-sitter": "^1.0.0"

package/queries/highlights.scm

@@ -33,3 +33,6 @@
   "override"
   "satisfies"
 ] @keyword
+
+(type_parameter
+  ["in" "out"] @keyword)

package/tree-sitter.json

@@ -83,7 +83,7 @@
     }
   ],
   "metadata": {
-    "version": "1.2.13",
+    "version": "1.3.0",
     "license": "MIT",
     "description": "TypeScript and TSX grammars for tree-sitter",
     "authors": [

package/tsx/src/node-types.json

@@ -413,6 +413,10 @@
         "type": "import_statement",
         "named": true
       },
+      {
+        "type": "internal_module",
+        "named": true
+      },
       {
         "type": "labeled_statement",
         "named": true
@@ -647,7 +651,7 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "declaration",
@@ -6238,6 +6242,10 @@
     "type": "optional_chain",
     "named": true
   },
+  {
+    "type": "out",
+    "named": false
+  },
   {
     "type": "override",
     "named": false

package/typescript/src/node-types.json

@@ -409,6 +409,10 @@
         "type": "import_statement",
         "named": true
       },
+      {
+        "type": "internal_module",
+        "named": true
+      },
       {
         "type": "labeled_statement",
         "named": true
@@ -643,7 +647,7 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "declaration",
@@ -5988,6 +5992,10 @@
     "type": "optional_chain",
     "named": true
   },
+  {
+    "type": "out",
+    "named": false
+  },
   {
     "type": "override",
     "named": false