@cgasgarth/opencode-for-rust 1.0.6 → 1.0.10-next.1

package/dist/index.js

@@ -12331,23 +12331,48 @@ function tool(input) {
 }
 tool.schema = exports_external;
 // src/lib/extractor.ts
-import Parser from "tree-sitter";
-import Rust from "tree-sitter-rust";
+import { Parser, Language, Query } from "web-tree-sitter";
+import * as path from "path";
 import * as fs from "fs/promises";
+var __dirname = "/home/runner/work/opencode-for-rust/opencode-for-rust/src/lib";
+var WASM_PATH = path.resolve(__dirname, "tree-sitter-rust.wasm");
 
 class RustTypeExtractor {
   config;
-  parser;
+  parser = null;
+  language = null;
   constructor(config2) {
     this.config = config2;
+  }
+  async init() {
+    if (this.parser)
+      return;
+    await Parser.init();
     this.parser = new Parser;
-    this.parser.setLanguage(Rust);
+    try {
+      this.language = await Language.load(WASM_PATH);
+      this.parser.setLanguage(this.language);
+    } catch (e) {
+      if (this.config.debug) {
+        console.error("Failed to load WASM language:", e);
+      }
+      throw e;
+    }
   }
   async extract(filePath, content) {
+    if (!this.parser) {
+      await this.init();
+    }
+    if (!this.parser || !this.language) {
+      return [];
+    }
     const _fileContent = content || await fs.readFile(filePath, "utf-8");
     const tree = this.parser.parse(_fileContent);
+    if (!tree) {
+      return [];
+    }
     const types = [];
-    const query = new Parser.Query(Rust, `
+    const query = new Query(this.language, `
       (struct_item
         name: (type_identifier) @name
       ) @struct
@@ -12451,7 +12476,7 @@ class RustTypeExtractor {
 
 // src/lib/lookup.ts
 var {Glob } = globalThis.Bun;
-import * as path from "path";
+import * as path2 from "path";
 class RustTypeLookup {
   directory;
   config;
@@ -12477,7 +12502,7 @@ class RustTypeLookup {
     for await (const filePath of glob.scan(this.directory)) {
       if (this.shouldExclude(filePath))
         continue;
-      const absolutePath = path.join(this.directory, filePath);
+      const absolutePath = path2.join(this.directory, filePath);
       try {
         const types = await this.extractor.extract(absolutePath);
         for (const type of types) {

package/dist/lib/extractor.d.ts

@@ -2,7 +2,9 @@ import { ExtractedType, TypeInjectionConfig } from './types';
 export declare class RustTypeExtractor {
     private config;
     private parser;
+    private language;
     constructor(config: TypeInjectionConfig);
+    init(): Promise<void>;
     extract(filePath: string, content?: string): Promise<ExtractedType[]>;
     private mapNodeToKind;
     private isExported;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgasgarth/opencode-for-rust",
-  "version": "1.0.6",
+  "version": "1.0.10-next.1",
   "description": "OpenCode plugin for Rust",
   "author": {
     "name": "Sisyphus",
@@ -27,21 +27,22 @@
   ],
   "dependencies": {
     "@opencode-ai/plugin": "1.0.85",
-    "tree-sitter": "^0.22.1",
-    "tree-sitter-rust": "^0.24.0"
+    "web-tree-sitter": "^0.26.3"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
-    "@types/node": "^20.11.5",
+    "@types/bun": "latest",
+    "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "8.47.0",
     "@typescript-eslint/parser": "8.47.0",
     "bun-types": "latest",
     "eslint": "^9.39.1",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
-    "prettier": "^3.2.4",
+    "prettier": "^3.3.3",
+    "tree-sitter-rust": "^0.24.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.47.0",
     "vitest": "^3.2.4"
@@ -49,7 +50,7 @@
   "scripts": {
     "test": "bun test tests/",
     "typecheck": "tsc --noEmit",
-    "build": "bun build ./src/index.ts --outdir dist --target bun --external tree-sitter --external tree-sitter-rust && tsc --project tsconfig.build.json",
+    "build": "bun build ./src/index.ts --outdir dist --target bun --external web-tree-sitter && cp node_modules/tree-sitter-rust/tree-sitter-rust.wasm dist/ && tsc --project tsconfig.build.json",
     "lint": "eslint src --max-warnings 0",
     "format": "prettier --check .",
     "prepare": "husky"