@vscode/tree-sitter-wasm 0.2.0 → 0.3.0

package/README.md

@@ -20,7 +20,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 
 > Note: If you're using Windows, you'll need to use WSL. Ensure Docker integration for WSL is enabled before attempting to build. Without this integration, the build process may encounter errors.
 
-First, install all of the dependencies using `npm install`. You will also need to install [emscripten](https://emscripten.org/docs/getting_started/downloads.html). 
+First, install all of the dependencies using `npm install`, use the `--force` flag if needed. You will also need to install [emscripten](https://emscripten.org/docs/getting_started/downloads.html). 
 
 Then, build the the wasm files using `npm run build-wasm`, which will do the following:
 - Clone the tree-sitter repository

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/tree-sitter-wasm",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Pre-built WASM files for Tree-Sitter and Tree-Sitter languages that VS Code uses",
   "scripts": {
     "build-wasm": "ts-node ./build/main.ts",
@@ -19,20 +19,17 @@
   "types": "wasm/web-tree-sitter.d.ts",
   "devDependencies": {
     "@types/node": "^20.14.6",
-    "tree-sitter-bash": "^0.23.0",
-    "tree-sitter-c-sharp": "^0.23.0",
-    "tree-sitter-cli": "^0.23.0",
-    "tree-sitter-cpp": "^0.23.1",
-    "tree-sitter-css": "^0.23.0",
-    "tree-sitter-go": "^0.23.1",
-    "tree-sitter-java": "^0.23.2",
-    "tree-sitter-javascript": "^0.23.0",
-    "tree-sitter-php": "0.23.4",
-    "tree-sitter-python": "^0.23.2",
-    "tree-sitter-regex": "^0.23.0",
-    "tree-sitter-ruby": "^0.23.0",
-    "tree-sitter-rust": "^0.23.0",
-    "tree-sitter-typescript": "^0.23.0",
+    "tree-sitter-bash": "^0.25.0",
+    "tree-sitter-cli": "^0.25.10",
+    "tree-sitter-css": "^0.25.0",
+    "tree-sitter-go": "^0.25.0",
+    "tree-sitter-java": "^0.23.5",
+    "tree-sitter-javascript": "^0.25.0",
+    "tree-sitter-php": "0.24.2",
+    "tree-sitter-python": "^0.25.0",
+    "tree-sitter-regex": "^0.25.0",
+    "tree-sitter-ruby": "^0.23.1",
+    "tree-sitter-typescript": "^0.23.2",
     "ts-node": "^10.9.2"
   },
   "repository": {

package/wasm/tree-sitter.js

@@ -22,12 +22,6 @@
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/constants.ts
 var SIZE_OF_SHORT = 2;
@@ -255,17 +249,21 @@ var TreeCursor = class _TreeCursor {
     __name(this, "TreeCursor");
   }
   /** @internal */
+  // @ts-expect-error: never read
   [0] = 0;
-  // Internal handle for WASM
+  // Internal handle for Wasm
   /** @internal */
+  // @ts-expect-error: never read
   [1] = 0;
-  // Internal handle for WASM
+  // Internal handle for Wasm
   /** @internal */
+  // @ts-expect-error: never read
   [2] = 0;
-  // Internal handle for WASM
+  // Internal handle for Wasm
   /** @internal */
+  // @ts-expect-error: never read
   [3] = 0;
-  // Internal handle for WASM
+  // Internal handle for Wasm
   /** @internal */
   tree;
   /** @internal */
@@ -538,8 +536,9 @@ var Node = class {
     __name(this, "Node");
   }
   /** @internal */
+  // @ts-expect-error: never read
   [0] = 0;
-  // Internal handle for WASM
+  // Internal handle for Wasm
   /** @internal */
   _children;
   /** @internal */
@@ -888,6 +887,11 @@ var Node = class {
     if (!Array.isArray(types)) types = [types];
     const symbols = [];
     const typesBySymbol = this.tree.language.types;
+    for (const node_type of types) {
+      if (node_type == "ERROR") {
+        symbols.push(65535);
+      }
+    }
     for (let i2 = 0, n = typesBySymbol.length; i2 < n; i2++) {
       if (types.includes(typesBySymbol[i2])) {
         symbols.push(i2);
@@ -974,7 +978,7 @@ var Node = class {
    */
   childWithDescendant(descendant) {
     marshalNode(this);
-    marshalNode(descendant);
+    marshalNode(descendant, 1);
     C._ts_node_child_with_descendant_wasm(this.tree[0]);
     return unmarshalNode(this.tree);
   }
@@ -1095,8 +1099,8 @@ function unmarshalCaptures(query, tree, address, patternIndex, result) {
   return address;
 }
 __name(unmarshalCaptures, "unmarshalCaptures");
-function marshalNode(node) {
-  let address = TRANSFER_BUFFER;
+function marshalNode(node, index = 0) {
+  let address = TRANSFER_BUFFER + index * SIZE_OF_NODE;
   C.setValue(address, node.id, "i32");
   address += SIZE_OF_INT;
   C.setValue(address, node.startIndex, "i32");
@@ -1195,13 +1199,10 @@ function marshalEdit(edit, address = TRANSFER_BUFFER) {
 }
 __name(marshalEdit, "marshalEdit");
 function unmarshalLanguageMetadata(address) {
-  const result = {};
-  result.major_version = C.getValue(address, "i32");
-  address += SIZE_OF_INT;
-  result.minor_version = C.getValue(address, "i32");
-  address += SIZE_OF_INT;
-  result.field_count = C.getValue(address, "i32");
-  return result;
+  const major_version = C.getValue(address, "i32");
+  const minor_version = C.getValue(address += SIZE_OF_INT, "i32");
+  const patch_version = C.getValue(address += SIZE_OF_INT, "i32");
+  return { major_version, minor_version, patch_version };
 }
 __name(unmarshalLanguageMetadata, "unmarshalLanguageMetadata");
 
@@ -2052,7 +2053,7 @@ var Language = class _Language {
       bytes = Promise.resolve(input);
     } else {
       if (globalThis.process?.versions.node) {
-        const fs2 = __require("fs/promises");
+        const fs2 = await import("fs/promises");
         bytes = fs2.readFile(input);
       } else {
         bytes = fetch(input).then((response) => response.arrayBuffer().then((buffer) => {
@@ -2692,7 +2693,7 @@ var Module2 = (() => {
         newDSO("__main__", 0, wasmImports);
       }
     };
-    var ___heap_base = 78160;
+    var ___heap_base = 78240;
     var zeroMemory = /* @__PURE__ */ __name((address, size) => {
       HEAPU8.fill(0, address, address + size);
       return address;
@@ -3301,7 +3302,7 @@ var Module2 = (() => {
     var ___stack_pointer = new WebAssembly.Global({
       "value": "i32",
       "mutable": true
-    }, 78160);
+    }, 78240);
     var ___table_base = new WebAssembly.Global({
       "value": "i32",
       "mutable": false
@@ -3590,6 +3591,7 @@ var Module2 = (() => {
     var _calloc = Module["_calloc"] = (a0, a1) => (_calloc = Module["_calloc"] = wasmExports["calloc"])(a0, a1);
     var _realloc = Module["_realloc"] = (a0, a1) => (_realloc = Module["_realloc"] = wasmExports["realloc"])(a0, a1);
     var _free = Module["_free"] = (a0) => (_free = Module["_free"] = wasmExports["free"])(a0);
+    var _memcmp = Module["_memcmp"] = (a0, a1, a2) => (_memcmp = Module["_memcmp"] = wasmExports["memcmp"])(a0, a1, a2);
     var _ts_language_symbol_count = Module["_ts_language_symbol_count"] = (a0) => (_ts_language_symbol_count = Module["_ts_language_symbol_count"] = wasmExports["ts_language_symbol_count"])(a0);
     var _ts_language_state_count = Module["_ts_language_state_count"] = (a0) => (_ts_language_state_count = Module["_ts_language_state_count"] = wasmExports["ts_language_state_count"])(a0);
     var _ts_language_version = Module["_ts_language_version"] = (a0) => (_ts_language_version = Module["_ts_language_version"] = wasmExports["ts_language_version"])(a0);
@@ -3618,7 +3620,6 @@ var Module2 = (() => {
     var _ts_parser_set_timeout_micros = Module["_ts_parser_set_timeout_micros"] = (a0, a1, a2) => (_ts_parser_set_timeout_micros = Module["_ts_parser_set_timeout_micros"] = wasmExports["ts_parser_set_timeout_micros"])(a0, a1, a2);
     var _ts_parser_set_included_ranges = Module["_ts_parser_set_included_ranges"] = (a0, a1, a2) => (_ts_parser_set_included_ranges = Module["_ts_parser_set_included_ranges"] = wasmExports["ts_parser_set_included_ranges"])(a0, a1, a2);
     var _memmove = Module["_memmove"] = (a0, a1, a2) => (_memmove = Module["_memmove"] = wasmExports["memmove"])(a0, a1, a2);
-    var _memcmp = Module["_memcmp"] = (a0, a1, a2) => (_memcmp = Module["_memcmp"] = wasmExports["memcmp"])(a0, a1, a2);
     var _ts_query_new = Module["_ts_query_new"] = (a0, a1, a2, a3, a4) => (_ts_query_new = Module["_ts_query_new"] = wasmExports["ts_query_new"])(a0, a1, a2, a3, a4);
     var _ts_query_delete = Module["_ts_query_delete"] = (a0) => (_ts_query_delete = Module["_ts_query_delete"] = wasmExports["ts_query_delete"])(a0);
     var _iswspace = Module["_iswspace"] = (a0) => (_iswspace = Module["_iswspace"] = wasmExports["iswspace"])(a0);