@willbooster/tree-sitter-typescript 1.2.13 → 1.2.14

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',
@@ -64,6 +65,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,
     ],
 
@@ -473,6 +476,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 +653,8 @@ module.exports = function defineGrammar(dialect) {
           )
         ),
 
+      statement: ($, previous) => choice(previous, alias($.global_declaration, $.internal_module)),
+
       declaration: ($, previous) =>
         choice(
           previous,
@@ -706,7 +712,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,6 +762,12 @@ 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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "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,7 +50,7 @@
   "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",
@@ -58,13 +60,14 @@
     "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",
+    "vitest": "5.0.2",
     "wrangler": "4.135.0"
   },
   "peerDependencies": {

package/tree-sitter.json

@@ -83,7 +83,7 @@
     }
   ],
   "metadata": {
-    "version": "1.2.13",
+    "version": "1.2.14",
     "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",

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",