diff --git a/lib/binding_web/lib/tree-sitter.c b/lib/binding_web/lib/tree-sitter.c
index 6148e542..5afb76b9 100644
--- a/lib/binding_web/lib/tree-sitter.c
+++ b/lib/binding_web/lib/tree-sitter.c
@@ -876,7 +876,7 @@ void ts_query_matches_wasm(
   uint32_t end_index,
   uint32_t match_limit,
   uint32_t max_start_depth,
-  uint32_t timeout_micros
+  uint64_t timeout_micros
 ) {
   if (!scratch_query_cursor) {
     scratch_query_cursor = ts_query_cursor_new();
@@ -936,7 +936,7 @@ void ts_query_captures_wasm(
   uint32_t end_index,
   uint32_t match_limit,
   uint32_t max_start_depth,
-  uint32_t timeout_micros
+  uint64_t timeout_micros
 ) {
   if (!scratch_query_cursor) {
     scratch_query_cursor = ts_query_cursor_new();
diff --git a/lib/binding_web/lib/web-tree-sitter.d.ts b/lib/binding_web/lib/web-tree-sitter.d.ts
index c437f65d..2e6261b0 100644
--- a/lib/binding_web/lib/web-tree-sitter.d.ts
+++ b/lib/binding_web/lib/web-tree-sitter.d.ts
@@ -1,4 +1,4 @@
-// TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
+// TypeScript bindings for emscripten-generated code.  Automatically generated at compile time (manually edited).
 declare namespace RuntimeExports {
     function AsciiToString(ptr: number): string;
     function stringToUTF8(str: string, outPtr: number, maxBytesToWrite: number): number;
@@ -31,10 +31,10 @@ declare namespace RuntimeExports {
         allowUndefined?: boolean,
         loadAsync?: boolean,
         global?: boolean,
-        nodelete?: boolean;
+        nodelete?: boolean,
       },
       libName?: string,
-      localScope?: Record<string, any>,
+      localScope?: Record<string, unknown>,
       handle?: number
     ): Promise<Record<string, () => number>>;
     /**
@@ -48,10 +48,6 @@ declare namespace RuntimeExports {
      * @param {string} type
      */
     function setValue(ptr: number, value: number, type?: string): void;
-    let currentParseCallback: ((index: number, position: {row: number, column: number}) => string | undefined) | null;
-    let currentLogCallback: ((message: string, isLex: boolean) => void) | null;
-    let currentProgressCallback: ((state: {currentOffset: number, hasError: boolean}) => void) | null;
-    let currentQueryProgressCallback: ((state: {currentOffset: number}) => void) | null;
     let HEAPF32: Float32Array;
     let HEAPF64: Float64Array;
     let HEAP_DATA_VIEW: DataView;
@@ -69,6 +65,7 @@ interface WasmModule {
   _calloc(_0: number, _1: number): number;
   _realloc(_0: number, _1: number): number;
   _free(_0: number): void;
+  _memcmp(_0: number, _1: number, _2: number): number;
   _ts_language_symbol_count(_0: number): number;
   _ts_language_state_count(_0: number): number;
   _ts_language_version(_0: number): number;
@@ -88,16 +85,12 @@ interface WasmModule {
   _ts_lookahead_iterator_reset(_0: number, _1: number, _2: number): number;
   _ts_lookahead_iterator_next(_0: number): number;
   _ts_lookahead_iterator_current_symbol(_0: number): number;
-  _memset(_0: number, _1: number, _2: number): number;
-  _memcpy(_0: number, _1: number, _2: number): number;
   _ts_parser_delete(_0: number): void;
   _ts_parser_reset(_0: number): void;
   _ts_parser_set_language(_0: number, _1: number): number;
-  _ts_parser_timeout_micros(_0: number): number;
-  _ts_parser_set_timeout_micros(_0: number, _1: number, _2: number): void;
+  _ts_parser_timeout_micros(_0: number): bigint;
+  _ts_parser_set_timeout_micros(_0: number, _1: bigint): void;
   _ts_parser_set_included_ranges(_0: number, _1: number, _2: number): number;
-  _memmove(_0: number, _1: number, _2: number): number;
-  _memcmp(_0: number, _1: number, _2: number): number;
   _ts_query_new(_0: number, _1: number, _2: number, _3: number, _4: number): number;
   _ts_query_delete(_0: number): void;
   _iswspace(_0: number): number;
@@ -197,8 +190,11 @@ interface WasmModule {
   _ts_node_is_extra_wasm(_0: number): number;
   _ts_node_parse_state_wasm(_0: number): number;
   _ts_node_next_parse_state_wasm(_0: number): number;
-  _ts_query_matches_wasm(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number, _6: number, _7: number, _8: number, _9: number, _10: number): void;
-  _ts_query_captures_wasm(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number, _6: number, _7: number, _8: number, _9: number, _10: number): void;
+  _ts_query_matches_wasm(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number, _6: number, _7: number, _8: number, _9: number, _10: bigint): void;
+  _ts_query_captures_wasm(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number, _6: number, _7: number, _8: number, _9: number, _10: bigint): void;
+  _memset(_0: number, _1: number, _2: number): number;
+  _memcpy(_0: number, _1: number, _2: number): number;
+  _memmove(_0: number, _1: number, _2: number): number;
   _iswalpha(_0: number): number;
   _iswblank(_0: number): number;
   _iswdigit(_0: number): number;
@@ -212,9 +208,12 @@ interface WasmModule {
   _strncpy(_0: number, _1: number, _2: number): number;
   _towlower(_0: number): number;
   _towupper(_0: number): number;
-  _orig$ts_parser_timeout_micros(_0: number): bigint;
-  _orig$ts_parser_set_timeout_micros(_0: number, _1: bigint): void;
 }
 
-export type MainModule = WasmModule & typeof RuntimeExports;
+export type MainModule = WasmModule & typeof RuntimeExports & {
+    currentParseCallback: ((index: number, position: {row: number, column: number}) => string | undefined) | null;
+    currentLogCallback: ((message: string, isLex: boolean) => void) | null;
+    currentProgressCallback: ((state: {currentOffset: number, hasError: boolean}) => void) | null;
+    currentQueryProgressCallback: ((state: {currentOffset: number}) => void) | null;
+};
 export default function MainModuleFactory(options?: Partial<EmscriptenModule>): Promise<MainModule>;
diff --git a/lib/binding_web/src/parser.ts b/lib/binding_web/src/parser.ts
index 3a49d43f..e60fe2a3 100644
--- a/lib/binding_web/src/parser.ts
+++ b/lib/binding_web/src/parser.ts
@@ -289,7 +289,7 @@ export class Parser {
    *
    * This is set via {@link Parser#setTimeoutMicros}.
    */
-  getTimeoutMicros(): number {
+  getTimeoutMicros(): bigint {
     return C._ts_parser_timeout_micros(this[0]);
   }
 
@@ -302,8 +302,8 @@ export class Parser {
    * If parsing takes longer than this, it will halt early, returning `null`.
    * See {@link Parser#parse} for more information.
    */
-  setTimeoutMicros(timeout: number): void {
-    C._ts_parser_set_timeout_micros(this[0], 0, timeout);
+  setTimeoutMicros(timeout: bigint): void {
+    C._ts_parser_set_timeout_micros(this[0], timeout);
   }
 
   /** Set the logging callback that a parser should use during parsing. */
diff --git a/lib/binding_web/src/query.ts b/lib/binding_web/src/query.ts
index d702db49..635a95dc 100644
--- a/lib/binding_web/src/query.ts
+++ b/lib/binding_web/src/query.ts
@@ -56,7 +56,7 @@ export interface QueryOptions {
    *
    * If query execution takes longer than this, it will halt early, returning an empty array.
    */
-  timeoutMicros?: number;
+  timeoutMicros?: bigint;
 
   /**
    * A function that will be called periodically during the execution of the query to check
@@ -708,7 +708,7 @@ export class Query {
     const endIndex = options.endIndex ?? 0;
     const matchLimit = options.matchLimit ?? 0xFFFFFFFF;
     const maxStartDepth = options.maxStartDepth ?? 0xFFFFFFFF;
-    const timeoutMicros = options.timeoutMicros ?? 0;
+    const timeoutMicros = options.timeoutMicros ?? 0n;
     const progressCallback = options.progressCallback;
 
     if (typeof matchLimit !== 'number') {
@@ -803,7 +803,7 @@ export class Query {
     const endIndex = options.endIndex ?? 0;
     const matchLimit = options.matchLimit ?? 0xFFFFFFFF;
     const maxStartDepth = options.maxStartDepth ?? 0xFFFFFFFF;
-    const timeoutMicros = options.timeoutMicros ?? 0;
+    const timeoutMicros = options.timeoutMicros ?? 0n;
     const progressCallback = options.progressCallback;
 
     if (typeof matchLimit !== 'number') {
diff --git a/lib/binding_web/test/query.test.ts b/lib/binding_web/test/query.test.ts
index 546c2a19..a6924dbf 100644
--- a/lib/binding_web/test/query.test.ts
+++ b/lib/binding_web/test/query.test.ts
@@ -465,9 +465,9 @@ describe('Query', () => {
     it('returns less than the expected matches', { timeout: 10000 }, () => {
       tree = parser.parse('function foo() while (true) { } }\n'.repeat(1000))!;
       query = new Query(JavaScript, '(function_declaration name: (identifier) @function)');
-      const matches = query.matches(tree.rootNode, { timeoutMicros: 1000 });
+      const matches = query.matches(tree.rootNode, { timeoutMicros: 1000n });
       expect(matches.length).toBeLessThan(1000);
-      const matches2 = query.matches(tree.rootNode, { timeoutMicros: 0 });
+      const matches2 = query.matches(tree.rootNode, { timeoutMicros: 0n });
       expect(matches2).toHaveLength(1000);
     });
   });