ast-search 0.2.1 → 0.2.3

package/README.md

@@ -92,6 +92,21 @@ The original Vue `this` example using shorthands:
 ast-search 'ObjectMethod[key.name="setup"] this'
 ```
 
+### Optional chaining
+
+Optional chains (`?.`) are normalized transparently — `CallExpression` and `MemberExpression` selectors match both regular and optional-chain variants:
+
+```bash
+# Matches both items.map(...) and items?.map(...)
+ast-search 'CallExpression[callee.property.name="map"]'
+```
+
+The `optional` flag is preserved on matched nodes, so you can still narrow to strictly optional calls:
+
+```bash
+ast-search 'CallExpression[optional=true]'
+```
+
 ## Supported file types
 
 `.js`, `.ts`, `.jsx`, `.tsx`, `.mjs`, `.cjs`, `.vue`

package/build/main.js

@@ -16,10 +16,13 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
 import yargs from "yargs/yargs";
+import { createRequire } from "module";
 import { walkRepoFiles } from "./walk.js";
 import { getAstFromPath } from "./file.js";
 import { runQuery, validateSelector } from "./search.js";
 import { formatMatches } from "./output.js";
+const require = createRequire(import.meta.url);
+const { version } = require("../package.json");
 export function searchRepo(selector, dir) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, e_1, _b, _c;
@@ -115,6 +118,8 @@ const y = yargs(process.argv.slice(2))
         "reformat all files containing async functions",
     ],
 ])
+    .version(version)
+    .alias("version", "V")
     .help();
 if (process.env.NODE_ENV !== "test") {
     y.parse();

package/build/search.js

@@ -52,8 +52,31 @@ function extractFirstLine(source, node) {
 export function validateSelector(selector) {
     esquery.parse(expandShorthands(selector));
 }
+// Normalize Babel's optional-chain node types so esquery selectors like
+// CallExpression[callee.property.name="map"] transparently match optional
+// chains (foo?.bar()). The `optional` flag is preserved, so callers can
+// still narrow to optional-only with [optional=true] or [callee.optional=true].
+export function normalizeOptionalChaining(node) {
+    var _a;
+    if (!node || typeof node !== "object")
+        return;
+    // Capture visitor keys before renaming so we use the original type's keys.
+    const keys = (_a = VISITOR_KEYS[node.type]) !== null && _a !== void 0 ? _a : [];
+    if (node.type === "OptionalCallExpression")
+        node.type = "CallExpression";
+    else if (node.type === "OptionalMemberExpression")
+        node.type = "MemberExpression";
+    for (const key of keys) {
+        const child = node[key];
+        if (Array.isArray(child))
+            child.forEach(normalizeOptionalChaining);
+        else
+            normalizeOptionalChaining(child);
+    }
+}
 export function runQuery(selector, ast, source = "", filename = "") {
     const expanded = expandShorthands(selector);
+    normalizeOptionalChaining(ast);
     // Cast to any: esquery expects estree.Node but Babel AST is structurally
     // compatible; VISITOR_KEYS ensures correct traversal of Babel-specific nodes.
     const nodes = esquery.query(ast, expanded, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ast-search",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "",
   "main": "main.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "license": "ISC",
   "repository": {
     "type": "git",
-    "url": "https://github.com/shiplet/ast-search.git"
+    "url": "https://github.com/willey-shiplet/ast-search.git"
   },
   "packageManager": "pnpm@10.33.0",
   "dependencies": {