ast-search-python 1.5.0 → 1.6.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Michael Shiplet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/build/shorthands.js

@@ -41,14 +41,27 @@ export const PYTHON_SHORTHANDS = {
     decorated: "(decorated_definition) @_",
 };
 export function expandShorthands(selector) {
-    // 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).
+    // Expand shorthand words to their tree-sitter S-expression equivalents, outside
+    // quoted strings. Two expansion contexts:
+    //
+    // 1. Inside S-expressions — after `(`: expand to just the node type name so that
+    //    `(fn body: ...)` becomes `(function_definition body: ...)`. Shorthands whose
+    //    name already matches the tree-sitter node type (call, await, yield, lambda,
+    //    decorator) are no-ops here — expanding `call` → `call` is harmless.
+    //
+    // 2. Standalone — not preceded by `(` or `@`: expand to the full S-expression
+    //    so that bare `fn` becomes `(function_definition) @_`.
+    //
+    // Capture names like `@fn` are left untouched by both patterns.
     const keys = Object.keys(PYTHON_SHORTHANDS);
-    const pattern = new RegExp(`(?<![@(])\\b(${keys.join("|")})\\b`, "g");
+    // Map each shorthand to its bare node type name: "(function_definition) @_" → "function_definition"
+    const nodeTypes = {};
+    for (const [key, val] of Object.entries(PYTHON_SHORTHANDS)) {
+        const m = val.match(/^\((\w+)\)\s*@_$/);
+        nodeTypes[key] = m ? m[1] : key;
+    }
+    const innerPattern = new RegExp(`(?<=\\()\\b(${keys.join("|")})\\b`, "g");
+    const standalonePattern = new RegExp(`(?<![@(])\\b(${keys.join("|")})\\b`, "g");
     const parts = [];
     let i = 0;
     while (i < selector.length) {
@@ -63,7 +76,10 @@ export function expandShorthands(selector) {
         else {
             const nextQuote = selector.slice(i).search(/['"]/);
             const segment = nextQuote === -1 ? selector.slice(i) : selector.slice(i, i + nextQuote);
-            parts.push(segment.replace(pattern, (m) => { var _a; return (_a = PYTHON_SHORTHANDS[m]) !== null && _a !== void 0 ? _a : m; }));
+            // Inner pass first: (fn → (function_definition
+            const afterInner = segment.replace(innerPattern, (m) => { var _a; return (_a = nodeTypes[m]) !== null && _a !== void 0 ? _a : m; });
+            // Standalone pass: bare fn → (function_definition) @_
+            parts.push(afterInner.replace(standalonePattern, (m) => { var _a; return (_a = PYTHON_SHORTHANDS[m]) !== null && _a !== void 0 ? _a : m; }));
             i = nextQuote === -1 ? selector.length : i + nextQuote;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ast-search-python",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Python language plugin for ast-search",
   "type": "module",
   "main": "./build/index.js",
@@ -10,11 +10,6 @@
       "types": "./build/index.d.ts"
     }
   },
-  "scripts": {
-    "build": "tsc",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "prepublishOnly": "tsc"
-  },
   "author": "shiplet",
   "license": "MIT",
   "repository": {
@@ -47,6 +42,10 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "ast-search-js": "1.9.0"
+    "ast-search-js": "1.10.0-beta.1"
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   }
-}
+}