From 221a7773e9c2845c30bdde2f379c33be27106156 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Tue, 1 Apr 2025 13:40:09 -0400 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20rust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rust/README.md | 24 ++++++++++++++++++ packages/rust/index.d.ts | 10 ++++++++ packages/rust/index.js | 9 +++++++ packages/rust/nursery.js | 12 +++++++++ packages/rust/package.json | 47 ++++++++++++++++++++++++++++++++++++ packages/rust/postinstall.js | 4 +++ pnpm-lock.yaml | 29 ++++++++++++++++++++++ 7 files changed, 135 insertions(+) create mode 100644 packages/rust/README.md create mode 100644 packages/rust/index.d.ts create mode 100644 packages/rust/index.js create mode 100644 packages/rust/nursery.js create mode 100644 packages/rust/package.json create mode 100644 packages/rust/postinstall.js diff --git a/packages/rust/README.md b/packages/rust/README.md new file mode 100644 index 0000000..5fc08b0 --- /dev/null +++ b/packages/rust/README.md @@ -0,0 +1,24 @@ +# ast-grep napi language for rust + +## Installation + +In a pnpm project, run: + +```bash +pnpm install @ast-grep/lang-rust +pnpm install @ast-grep/napi +# install the tree-sitter-cli if no prebuild is available +pnpm install @tree-sitter/cli --save-dev +``` + +## Usage + +```js +import rust from '@ast-grep/lang-rust' +import { registerDynamicLanguage, parse } from '@ast-grep/napi' + +registerDynamicLanguage({ rust }) + +const sg = parse('rust', `your code`) +sg.root().kind() +``` diff --git a/packages/rust/index.d.ts b/packages/rust/index.d.ts new file mode 100644 index 0000000..11140a6 --- /dev/null +++ b/packages/rust/index.d.ts @@ -0,0 +1,10 @@ +type LanguageRegistration = { + libraryPath: string + extensions: string[] + languageSymbol?: string + metaVarChar?: string + expandoChar?: string +} + +declare const registration: LanguageRegistration +export default registration diff --git a/packages/rust/index.js b/packages/rust/index.js new file mode 100644 index 0000000..a7ba3aa --- /dev/null +++ b/packages/rust/index.js @@ -0,0 +1,9 @@ +const path = require('node:path') +const libPath = path.join(__dirname, 'parser.so') + +module.exports = { + libraryPath: libPath, + extensions: ['rs'], + languageSymbol: 'tree_sitter_rust', + expandoChar: 'ยต', +} diff --git a/packages/rust/nursery.js b/packages/rust/nursery.js new file mode 100644 index 0000000..a1816f2 --- /dev/null +++ b/packages/rust/nursery.js @@ -0,0 +1,12 @@ +const { setup } = require('@ast-grep/nursery') +const languageRegistration = require('./index') + +setup({ + dirname: __dirname, + name: 'rust', + treeSitterPackage: 'tree-sitter-rust', + languageRegistration, + testRunner: parse => { + // add test here + }, +}) diff --git a/packages/rust/package.json b/packages/rust/package.json new file mode 100644 index 0000000..3dc6d10 --- /dev/null +++ b/packages/rust/package.json @@ -0,0 +1,47 @@ +{ + "name": "@ast-grep/lang-rust", + "version": "0.0.1", + "description": "", + "main": "index.js", + "scripts": { + "build": "tree-sitter build -o parser.so", + "source": "node nursery.js source", + "prepublishOnly": "node nursery.js source", + "postinstall": "node postinstall.js", + "test": "node nursery.js test" + }, + "files": [ + "index.js", + "index.d.ts", + "type.d.ts", + "postinstall.js", + "src", + "prebuilds" + ], + "keywords": ["ast-grep"], + "author": "", + "license": "ISC", + "dependencies": { + "@ast-grep/setup-lang": "0.0.3" + }, + "peerDependencies": { + "tree-sitter-cli": "0.24.6" + }, + "peerDependenciesMeta": { + "tree-sitter-cli": { + "optional": true + } + }, + "devDependencies": { + "@ast-grep/nursery": "0.0.2", + "tree-sitter-cli": "0.24.6", + "tree-sitter-rust": "0.23.2" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "pnpm": { + "onlyBuiltDependencies": ["@ast-grep/lang-rust", "tree-sitter-cli"] + } +} diff --git a/packages/rust/postinstall.js b/packages/rust/postinstall.js new file mode 100644 index 0000000..b9141ff --- /dev/null +++ b/packages/rust/postinstall.js @@ -0,0 +1,4 @@ +const { postinstall } = require('@ast-grep/setup-lang') +postinstall({ + dirname: __dirname, +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9dc4cf..2e19aa8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -210,6 +210,22 @@ importers: specifier: 0.23.6 version: 0.23.6 + packages/rust: + dependencies: + '@ast-grep/setup-lang': + specifier: 0.0.3 + version: 0.0.3 + devDependencies: + '@ast-grep/nursery': + specifier: 0.0.2 + version: 0.0.2 + tree-sitter-cli: + specifier: 0.24.6 + version: 0.24.6 + tree-sitter-rust: + specifier: 0.23.2 + version: 0.23.2 + packages/scala: dependencies: '@ast-grep/setup-lang': @@ -998,6 +1014,14 @@ packages: tree-sitter: optional: true + tree-sitter-rust@0.23.2: + resolution: {integrity: sha512-mpII54xsZxTMdtNFxVk9WqhPTEP7kKEBkZyb8ulWlhnNJIFBQISpfmABpdqXtnaETeduVHEWABQ5H5o7KUH8XA==} + peerDependencies: + tree-sitter: ^0.22.1 + peerDependenciesMeta: + tree-sitter: + optional: true + tree-sitter-scala@0.23.4: resolution: {integrity: sha512-bNUt7ccJVNRXbPno79XEdbECmO8RabVMUgki4oYmndbvOGKqVWTAjaw2lJRENX0NR5tbMPoSfeoX0uJV/15NrA==} peerDependencies: @@ -1686,6 +1710,11 @@ snapshots: node-addon-api: 8.3.0 node-gyp-build: 4.8.4 + tree-sitter-rust@0.23.2: + dependencies: + node-addon-api: 8.3.1 + node-gyp-build: 4.8.4 + tree-sitter-scala@0.23.4(tree-sitter@0.21.1): dependencies: node-addon-api: 8.3.1 From 340a593e1b15c75fa248f2bc20717e2b3ad4f6a4 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Thu, 3 Apr 2025 14:21:16 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=20Add=20a=20test=20for=20Rust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rust/nursery.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/rust/nursery.js b/packages/rust/nursery.js index a1816f2..89f0799 100644 --- a/packages/rust/nursery.js +++ b/packages/rust/nursery.js @@ -1,4 +1,5 @@ const { setup } = require('@ast-grep/nursery') +const assert = require('node:assert') const languageRegistration = require('./index') setup({ @@ -7,6 +8,9 @@ setup({ treeSitterPackage: 'tree-sitter-rust', languageRegistration, testRunner: parse => { - // add test here + const sg = parse('fn test() { Some(123) }') + const root = sg.root() + const node = root.find('Some($A)') + assert.equal(node.kind(), 'call_expression') }, }) From 4bb8d7002975de4b76a98db940ef265b72b11fa7 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Fri, 4 Apr 2025 15:27:39 -0400 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20Add=20changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/nice-eagles-search.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nice-eagles-search.md diff --git a/.changeset/nice-eagles-search.md b/.changeset/nice-eagles-search.md new file mode 100644 index 0000000..37812e8 --- /dev/null +++ b/.changeset/nice-eagles-search.md @@ -0,0 +1,5 @@ +--- +"@ast-grep/lang-rust": patch +--- + +Add @ast-grep/lang-rust