revert api change

Author: pelikhan

docs/src/content/docs/reference/scripts/ast-grep.mdx

@@ -24,13 +24,13 @@ The first argument is the language, the second argument is the file globs, and t
 
 ```ts
 // matches is an array of AST (immutable) nodes
-const { matches } = await sg.search("src/*.ts", "console.log($META)")
+const { matches } = await sg.search("ts", "src/*.ts", "console.log($META)")
 ```
 
 - find all TypeScript functions without comments. This example uses the [rule syntax](https://ast-grep.github.io/reference/rule.html).
 
 ```ts
-const { matches } = await sg.search("src/fib.ts", {
+const { matches } = await sg.search("ts", "src/fib.ts", {
     rule: {
         kind: "function_declaration",
         not: {
@@ -74,7 +74,7 @@ that do not intersect with the `to` files of the diff.
 
 ```ts "{ diff }" wrap
 const diff = await git.diff({ base: "main" })
-const { matches } = await sg.search("src/fib.ts", {...}, { diff })
+const { matches } = await sg.search("ts", "src/fib.ts", {...}, { diff })
 ```
 
 ## Changesets
@@ -155,19 +155,28 @@ If your language is not supported, go to [ast-grep langs](https://github.com/ast
 
 :::
 
+### Filename extension mapping
+
+The following file extensions are mapped to the corresponding languages:
+
+- HTML: `html`, `htm`
+- JavaScript: `cjs`, `mjs`, `js`
+- TypeScript: `cts`, `mts`, `ts`
+- TSX: `tsx`
+- CSS: `css`    
+- c: `c`
+- cpp: `cpp`, `cxx`, `h`, `hpp`, `hxx`
+- python: `py`
+- C#: `cs`
+- sql: `sql`
+
 ### Overriding the language selection
 
 GenAIScript has default mappings from well-known file extensions to languages.
 However, you can override this by passing the `lang` option to the `search` method.
 
 ```ts "{ lang: "ts" }"
-const { matches } = await sg.search("src/fib.ts", {...}, { lang: "ts" })
-```
-
-or if you want to search multiple languages, by providing a `extension` to `lang` mapping.
-
-```ts 'lang: { "ttts": "ts", "jjjs":"js" }'
-const { matches } = await sg.search("src/*", {...}, { lang: { "ttts": "ts", "jjjs":"js" } })
+const { matches } = await sg.search("ts", "src/fib.ts", {...}, { lang: "ts" })
 ```
 
 ## Learning ast-grep

packages/core/src/astgrep.test.ts

@@ -2,6 +2,7 @@ import { beforeEach, describe, test } from "node:test"
 import assert from "node:assert/strict"
 import { astGrepFindFiles, astGrepParse } from "./astgrep"
 import { TestHost } from "./testhost"
+import { dedent } from "./indent"
 
 describe("astgrep", () => {
     beforeEach(() => {
@@ -11,6 +12,7 @@ describe("astgrep", () => {
     test("finds matches in files", async () => {
         console.log("Hello, world!")
         const result = await astGrepFindFiles(
+            "ts",
             "src/astgrep.test.ts",
             "console.log($GREETING)"
         )
@@ -34,4 +36,44 @@ describe("astgrep", () => {
         const result = await astGrepParse(file, { lang: "js" })
         assert.equal(result, undefined)
     })
+
+    test("parse C++ file", async () => {
+        const file: WorkspaceFile = {
+            filename: "test.cpp",
+            content: dedent`
+            #include <iostream>
+            
+            int main() {
+                std::cout << 'Hello, world!' << std::endl;
+                return 0;
+            }
+            `,
+        }
+        const result = await astGrepParse(file)
+        assert(result)
+    })
+    test("parse TypeScript file", async () => {
+        const file: WorkspaceFile = {
+            filename: "test.ts",
+            content: "const x: number = 1;",
+        }
+        const result = await astGrepParse(file)
+        assert(result)
+    })
+    test("parse python file", async () => {
+        const file: WorkspaceFile = {
+            filename: "test.py",
+            content: "x = 1",
+        }
+        const result = await astGrepParse(file)
+        assert(result)
+    })
+    test("parse C file", async () => {
+        const file: WorkspaceFile = {
+            filename: "test.c",
+            content: "#include <stdio.h>",
+        }
+        const result = await astGrepParse(file)
+        assert(result)
+    })
 })

packages/core/src/astgrep.ts

@@ -81,11 +81,12 @@ export function astGrepCreateChangeSet(): SgChangeSet {
  * @throws An error if `glob` or `matcher` is not provided.
  */
 export async function astGrepFindFiles(
+    lang: SgLang,
     glob: ElementOrArray<string>,
     matcher: string | SgMatcher,
     options?: SgSearchOptions & CancellationOptions
 ): ReturnType<Sg["search"]> {
-    const { cancellationToken, diff, lang } = options || {}
+    const { cancellationToken, diff } = options || {}
     if (!glob) {
         throw new Error("glob is required")
     }
@@ -248,7 +249,6 @@ export async function astGrepParse(
     dbg(`parsing file: ${filename}`)
     const { parseAsync } = await import("@ast-grep/napi")
     const lang = await resolveLang(options?.lang, filename)
-    dbg(`resolving language for file: ${filename}`)
     if (!lang) {
         return undefined
     }
@@ -292,6 +292,8 @@ async function resolveLang(
         sql: "sql",
     }
 
+    const forbidden = ["bin", "exe", "dll"]
+
     // user provided a string
     if (typeof lang === "string") {
         lang = norm(lang)
@@ -301,26 +303,30 @@ async function resolveLang(
         else return await loadDynamicLanguage(lang)
     }
 
+    if (!filename) {
+        dbgLang(`filename not provided`)
+        throw new Error("filename is required to resolve language")
+    }
+
     if (filename) {
-        const ext = norm(path.extname(filename))
+        const ext = norm(extname(filename))
         dbgLang(`resolving language for ${ext}`)
 
-        if (typeof lang === "object") {
-            const l = lang[ext]
-            if (l) return await loadDynamicLanguage(l)
-        }
-
+        // known builtins
         const builtin = builtins[ext]
         if (builtin) return builtin
 
         // known dynamics
         const dynamic = dynamics[ext]
         if (dynamic) return await loadDynamicLanguage(dynamic)
 
+        if (forbidden.includes(ext)) return undefined
+
         // try our luck
         return await loadDynamicLanguage(ext)
     }
 
+    dbgLang(`language not resolved`, { lang, filename })
     throw new Error("language not resolved")
 }
 

packages/core/src/promptcontext.ts

@@ -343,8 +343,8 @@ export async function createPromptContext(
         astGrep: async () =>
             Object.freeze<Sg>({
                 changeset: astGrepCreateChangeSet,
-                search: (glob, matcher, sgOptions) =>
-                    astGrepFindFiles(glob, matcher, {
+                search: (lang, glob, matcher, sgOptions) =>
+                    astGrepFindFiles(lang, glob, matcher, {
                         ...(sgOptions || {}),
                         cancellationToken,
                     }),

packages/core/src/types/prompt_template.d.ts

@@ -4340,11 +4340,6 @@ interface SgChangeSet {
 }
 
 interface SgSearchOptions extends Omit<FindFilesOptions, "readText"> {
-    /**
-     * The language, or a mapping of languages, of the source code
-     */
-    lang?: SgLang | Record<string, SgLang>
-
     /**
      * Restrict matches that are part of the diff.
      */
@@ -4358,6 +4353,7 @@ interface Sg {
     changeset(): SgChangeSet
     parse(file: WorkspaceFile, options: { lang?: SgLang }): Promise<SgRoot>
     search(
+        lang: SgLang,
         glob: ElementOrArray<string>,
         matcher: string | SgMatcher,
         options?: SgSearchOptions

packages/sample/genaisrc/astgrep.genai.mjs

@@ -5,15 +5,15 @@ script({
     tests: {},
 })
 const sg = await host.astGrep()
-const { matches } = await sg.search("src/*.ts", "console.log($META)")
+const { matches } = await sg.search("ts", "src/*.ts", "console.log($META)")
 if (matches.length < 2) throw new Error("No matches src/*.ts found")
 for (const match of matches) {
     const t = match.text()
     console.log(match.getRoot().filename() + " " + match.text())
     if (!t.includes("console.log")) throw new Error("console.log found")
 }
 
-const { matches: matches2 } = await sg.search("src/fib.ts", {
+const { matches: matches2 } = await sg.search("ts", "src/fib.ts", {
     rule: {
         kind: "function_declaration",
         not: {

packages/sample/package.json

@@ -19,6 +19,9 @@
     "@agentic/core": "v7.5.3",
     "@agentic/weather": "v7.5.3",
     "@ast-grep/lang-c": "^0.0.1",
+    "@ast-grep/lang-cpp": "^0.0.1",
+    "@ast-grep/lang-csharp": "^0.0.1",
+    "@ast-grep/lang-python": "^0.0.1",
     "@azure/identity": "^4.8.0",
     "@azure/storage-blob": "^12.27.0",
     "@huggingface/transformers": "^3.4.0",

yarn.lock

@@ -82,6 +82,27 @@
   dependencies:
     "@ast-grep/setup-lang" "0.0.3"
 
+"@ast-grep/lang-cpp@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@ast-grep/lang-cpp/-/lang-cpp-0.0.1.tgz#8964ad2d635f11bc6183a0660b6e581db35a2ef2"
+  integrity sha512-mtjdHPKtyIuPza6Shh7ZDfYHGUhjJMhwy3mD1aDZyimZJe3H/ODb8FJg/n5wquqjDa3K+OyHDHHS+dgcMqCj0g==
+  dependencies:
+    "@ast-grep/setup-lang" "0.0.3"
+
+"@ast-grep/lang-csharp@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@ast-grep/lang-csharp/-/lang-csharp-0.0.1.tgz#7f7ebc493c52fb59fb99b9caeed4f0b8150290df"
+  integrity sha512-hqRnrHkBYTMFo7cV6L6QqWGvdwahZLpo2MI33cMa2i6UFO+6xTUPB0wJx5xELvMz457tKjO8ljKwSh3a/kiryA==
+  dependencies:
+    "@ast-grep/setup-lang" "0.0.3"
+
+"@ast-grep/lang-python@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@ast-grep/lang-python/-/lang-python-0.0.1.tgz#e00ece849f67850ad73097dc3048678ebbd1bfd8"
+  integrity sha512-RUtQKM5msT2Jdwu6q9rW5qVh2S5X3iBAGj6Zoct1CAHEGHIpkOFa+jLvJpVeLxVOqq0U9jRX+7G1keuqgn7daQ==
+  dependencies:
+    "@ast-grep/setup-lang" "0.0.3"
+
 "@ast-grep/napi-darwin-arm64@0.36.2":
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/@ast-grep/napi-darwin-arm64/-/napi-darwin-arm64-0.36.2.tgz#4d0344c05852824f047785b19f6a49fd005b7c63"