ast-search-python 1.0.3 → 1.0.5

package/README.md

@@ -19,6 +19,8 @@ npm install -g ast-search-js
 npm install -g ast-search-python
 ```
 
+> **pnpm users:** `tree-sitter` requires compiling a native addon. pnpm blocks build scripts by default, so the binary won't be built without extra steps. Either run `pnpm approve-builds -g` (select `tree-sitter` and `tree-sitter-python`), then reinstall — or use `npm install -g` instead.
+
 ## Usage
 
 Pass `--plugin ast-search-python` to enable Python file support:

package/build/index.d.ts

@@ -3,9 +3,9 @@ export declare class PythonLanguageBackend implements LanguageBackend {
     readonly langId = "python";
     readonly name = "Python";
     readonly extensions: Set<string>;
-    parse(source: string, _filePath: string): unknown;
-    query(ast: unknown, selector: string, source: string, filePath: string): Match[];
-    validateSelector(selector: string): void;
+    parse(source: string, _filePath: string): Promise<unknown>;
+    query(ast: unknown, selector: string, source: string, filePath: string): Promise<Match[]>;
+    validateSelector(selector: string): Promise<void>;
 }
 /**
  * Register the Python backend with an ast-search LanguageRegistry.

package/build/index.js

@@ -1,28 +1,36 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { createRequire } from "module";
+import path from "path";
 import { expandShorthands } from "./shorthands.js";
 import { runTreeSitterQuery, validateTreeSitterQuery } from "./query.js";
-// tree-sitter is a CommonJS module; use createRequire for ESM compat.
 const _require = createRequire(import.meta.url);
-// Lazy-initialize the parser so the native addon is only loaded when
-// a Python file is actually parsed (not at module import time).
-let _parser;
-let _language;
-let _QueryClass;
+let _runtimePromise = null;
 function getRuntime() {
-    if (!_parser) {
-        const Parser = _require("tree-sitter");
-        const pythonModule = _require("tree-sitter-python");
-        _language = pythonModule.language;
-        _QueryClass = Parser.Query;
-        const p = new Parser();
-        p.setLanguage(pythonModule);
-        _parser = p;
-    }
-    return {
-        parser: _parser,
-        language: _language,
-        QueryClass: _QueryClass,
-    };
+    return __awaiter(this, void 0, void 0, function* () {
+        if (_runtimePromise)
+            return _runtimePromise;
+        _runtimePromise = (() => __awaiter(this, void 0, void 0, function* () {
+            const { default: Parser } = yield import("web-tree-sitter");
+            const wasmDir = path.dirname(_require.resolve("web-tree-sitter"));
+            yield Parser.init({
+                locateFile: (_name) => path.join(wasmDir, "tree-sitter.wasm"),
+            });
+            const wasmPath = path.join(path.dirname(_require.resolve("tree-sitter-wasms/package.json")), "out", "tree-sitter-python.wasm");
+            const Python = yield Parser.Language.load(wasmPath);
+            const parser = new Parser();
+            parser.setLanguage(Python);
+            return { parser: parser, language: Python };
+        }))();
+        return _runtimePromise;
+    });
 }
 export class PythonLanguageBackend {
     constructor() {
@@ -31,17 +39,23 @@ export class PythonLanguageBackend {
         this.extensions = new Set([".py", ".pyw"]);
     }
     parse(source, _filePath) {
-        const { parser } = getRuntime();
-        return parser.parse(source);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { parser } = yield getRuntime();
+            return parser.parse(source);
+        });
     }
     query(ast, selector, source, filePath) {
-        const { language, QueryClass } = getRuntime();
-        const expanded = expandShorthands(selector);
-        return runTreeSitterQuery(ast, expanded, source, filePath, language, QueryClass);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { language } = yield getRuntime();
+            const expanded = expandShorthands(selector);
+            return runTreeSitterQuery(ast, expanded, source, filePath, language);
+        });
     }
     validateSelector(selector) {
-        const { language, QueryClass } = getRuntime();
-        validateTreeSitterQuery(expandShorthands(selector), language, QueryClass);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { language } = yield getRuntime();
+            validateTreeSitterQuery(expandShorthands(selector), language);
+        });
     }
 }
 /**

package/build/query.d.ts

@@ -1,23 +1,3 @@
 import type { Match } from "ast-search-js/plugin";
-interface TSNode {
-    startPosition: {
-        row: number;
-        column: number;
-    };
-    startIndex: number;
-    endIndex: number;
-    type: string;
-}
-interface TSCapture {
-    node: TSNode;
-    name: string;
-}
-interface TSQueryConstructor {
-    new (language: unknown, pattern: string): TSQuery;
-}
-interface TSQuery {
-    captures(node: TSNode): TSCapture[];
-}
-export declare function runTreeSitterQuery(ast: unknown, pattern: string, source: string, filePath: string, language: unknown, QueryClass: TSQueryConstructor): Match[];
-export declare function validateTreeSitterQuery(pattern: string, language: unknown, QueryClass: TSQueryConstructor): void;
-export {};
+export declare function runTreeSitterQuery(ast: unknown, pattern: string, source: string, filePath: string, language: unknown): Match[];
+export declare function validateTreeSitterQuery(pattern: string, language: unknown): void;

package/build/query.js

@@ -7,18 +7,25 @@ function assertValidPattern(pattern) {
             `Use a shorthand (e.g. "fn", "call") or write a full S-expression (e.g. "(function_definition) @fn").`);
     }
 }
-export function runTreeSitterQuery(ast, pattern, source, filePath, language, QueryClass) {
+export function runTreeSitterQuery(ast, pattern, source, filePath, language) {
     assertValidPattern(pattern);
     const tree = ast;
-    const q = new QueryClass(language, pattern);
+    // captures() only returns nodes that have a capture name (@something).
+    // If the user wrote a bare S-expression like (function_definition), add @_
+    // so results are returned.
+    const queryPattern = pattern.includes("@") ? pattern : `${pattern} @_`;
+    const q = language.query(queryPattern);
     const captures = q.captures(tree.rootNode);
+    // web-tree-sitter may return different JS objects for the same node when
+    // multiple capture names match it, so deduplicate by position instead of identity.
     const seen = new Set();
     const results = [];
     for (const capture of captures) {
         const node = capture.node;
-        if (seen.has(node))
+        const key = `${node.startIndex}:${node.endIndex}`;
+        if (seen.has(key))
             continue;
-        seen.add(node);
+        seen.add(key);
         const text = source.slice(node.startIndex, node.endIndex);
         const firstLine = text.split("\n")[0].trimEnd();
         results.push({
@@ -30,10 +37,10 @@ export function runTreeSitterQuery(ast, pattern, source, filePath, language, Que
     }
     return results;
 }
-export function validateTreeSitterQuery(pattern, language, QueryClass) {
+export function validateTreeSitterQuery(pattern, language) {
     try {
         assertValidPattern(pattern);
-        new QueryClass(language, pattern);
+        language.query(pattern);
     }
     catch (e) {
         throw new Error(`Invalid tree-sitter query: ${e instanceof Error ? e.message : String(e)}`);

package/build/shorthands.js

@@ -41,11 +41,14 @@ export const PYTHON_SHORTHANDS = {
     decorated: "(decorated_definition) @_",
 };
 export function expandShorthands(selector) {
-    // Replace bare shorthand words (not inside quotes and not preceded by @)
-    // with their S-expression. The negative lookbehind prevents expanding
-    // capture names like @fn into @(function_definition) @_.
+    // Replace bare shorthand words (not inside quotes and not preceded by @ or ()
+    // with their S-expression. The negative lookbehind prevents expanding:
+    //   - capture names like @fn into @(function_definition) @_
+    //   - node type names inside S-expressions like (call ...) into ((call) @_ ...)
+    //     which matters for shorthands whose name matches the tree-sitter node type
+    //     exactly (call, await, yield, lambda, decorator).
     const keys = Object.keys(PYTHON_SHORTHANDS);
-    const pattern = new RegExp(`(?<!@)\\b(${keys.join("|")})\\b`, "g");
+    const pattern = new RegExp(`(?<![@(])\\b(${keys.join("|")})\\b`, "g");
     const parts = [];
     let i = 0;
     while (i < selector.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ast-search-python",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Python language plugin for ast-search",
   "type": "module",
   "main": "./build/index.js",
@@ -32,19 +32,19 @@
     "provenance": true
   },
   "dependencies": {
-    "tree-sitter": "^0.21.1",
-    "tree-sitter-python": "^0.21.0"
+    "web-tree-sitter": "^0.24.0",
+    "tree-sitter-wasms": "^0.1.12"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.7",
-    "ast-search-js": "1.0.0",
+    "ast-search-js": "1.0.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "ast-search-js": "1.0.0"
+    "ast-search-js": "1.0.1"
   }
 }