From 520816399e6303f64a712dcda70573f8322084ce Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Tue, 1 Apr 2025 13:36:36 -0400 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/java/README.md | 24 ++++++++++++++++++ packages/java/index.d.ts | 10 ++++++++ packages/java/index.js | 9 +++++++ packages/java/nursery.js | 12 +++++++++ packages/java/package.json | 47 ++++++++++++++++++++++++++++++++++++ packages/java/postinstall.js | 4 +++ pnpm-lock.yaml | 31 ++++++++++++++++++++++++ 7 files changed, 137 insertions(+) create mode 100644 packages/java/README.md create mode 100644 packages/java/index.d.ts create mode 100644 packages/java/index.js create mode 100644 packages/java/nursery.js create mode 100644 packages/java/package.json create mode 100644 packages/java/postinstall.js diff --git a/packages/java/README.md b/packages/java/README.md new file mode 100644 index 00000000..f0f4b4aa --- /dev/null +++ b/packages/java/README.md @@ -0,0 +1,24 @@ +# ast-grep napi language for java + +## Installation + +In a pnpm project, run: + +```bash +pnpm install @ast-grep/lang-java +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 java from '@ast-grep/lang-java' +import { registerDynamicLanguage, parse } from '@ast-grep/napi' + +registerDynamicLanguage({ java }) + +const sg = parse('java', `your code`) +sg.root().kind() +``` diff --git a/packages/java/index.d.ts b/packages/java/index.d.ts new file mode 100644 index 00000000..11140a65 --- /dev/null +++ b/packages/java/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/java/index.js b/packages/java/index.js new file mode 100644 index 00000000..3455a227 --- /dev/null +++ b/packages/java/index.js @@ -0,0 +1,9 @@ +const path = require('node:path') +const libPath = path.join(__dirname, 'parser.so') + +module.exports = { + libraryPath: libPath, + extensions: ['java'], + languageSymbol: 'tree_sitter_java', + expandoChar: '$', +} diff --git a/packages/java/nursery.js b/packages/java/nursery.js new file mode 100644 index 00000000..0eec5c39 --- /dev/null +++ b/packages/java/nursery.js @@ -0,0 +1,12 @@ +const { setup } = require('@ast-grep/nursery') +const languageRegistration = require('./index') + +setup({ + dirname: __dirname, + name: 'java', + treeSitterPackage: 'tree-sitter-java', + languageRegistration, + testRunner: parse => { + // add test here + }, +}) diff --git a/packages/java/package.json b/packages/java/package.json new file mode 100644 index 00000000..e889509d --- /dev/null +++ b/packages/java/package.json @@ -0,0 +1,47 @@ +{ + "name": "@ast-grep/lang-java", + "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-java": "0.23.5" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "pnpm": { + "onlyBuiltDependencies": ["@ast-grep/lang-java", "tree-sitter-cli"] + } +} diff --git a/packages/java/postinstall.js b/packages/java/postinstall.js new file mode 100644 index 00000000..b9141ffc --- /dev/null +++ b/packages/java/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 25a339ee..3a1c3491 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -162,6 +162,22 @@ importers: specifier: 0.23.1 version: 0.23.1(tree-sitter@0.21.1) + packages/java: + 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-java: + specifier: 0.23.5 + version: 0.23.5(tree-sitter@0.21.1) + packages/python: dependencies: '@ast-grep/setup-lang': @@ -929,6 +945,14 @@ packages: tree_sitter: optional: true + tree-sitter-java@0.23.5: + resolution: {integrity: sha512-Yju7oQ0Xx7GcUT01mUglPP+bYfvqjNCGdxqigTnew9nLGoII42PNVP3bHrYeMxswiCRM0yubWmN5qk+zsg0zMA==} + peerDependencies: + tree-sitter: ^0.21.1 + peerDependenciesMeta: + tree-sitter: + optional: true + tree-sitter-python@0.23.6: resolution: {integrity: sha512-yIM9z0oxKIxT7bAtPOhgoVl6gTXlmlIhue7liFT4oBPF/lha7Ha4dQBS82Av6hMMRZoVnFJI8M6mL+SwWoLD3A==} peerDependencies: @@ -1599,6 +1623,13 @@ snapshots: node-gyp-build: 4.8.4 tree-sitter: 0.21.1 + tree-sitter-java@0.23.5(tree-sitter@0.21.1): + dependencies: + node-addon-api: 8.3.1 + node-gyp-build: 4.8.4 + optionalDependencies: + tree-sitter: 0.21.1 + tree-sitter-python@0.23.6: dependencies: node-addon-api: 8.3.0 From 67dc0799a94fc638194e8e27c5bb2f0e43656bd1 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Wed, 2 Apr 2025 14:28:16 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=20Add=20test=20for=20Java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/java/nursery.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/java/nursery.js b/packages/java/nursery.js index 0eec5c39..ce236dcc 100644 --- a/packages/java/nursery.js +++ b/packages/java/nursery.js @@ -1,5 +1,6 @@ const { setup } = require('@ast-grep/nursery') const languageRegistration = require('./index') +const assert = require('node:assert') setup({ dirname: __dirname, @@ -7,6 +8,9 @@ setup({ treeSitterPackage: 'tree-sitter-java', languageRegistration, testRunner: parse => { - // add test here + const sg = parse('int a = 123;') + const root = sg.root() + const node = root.find('int a = 123') + assert.equal(node.kind(), 'local_variable_declaration') }, }) From 4a2ffdb091dd8a713143c4c953be84224c4770f7 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Fri, 4 Apr 2025 15:22:02 -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/solid-donkeys-pump.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/solid-donkeys-pump.md diff --git a/.changeset/solid-donkeys-pump.md b/.changeset/solid-donkeys-pump.md new file mode 100644 index 00000000..d5a0f503 --- /dev/null +++ b/.changeset/solid-donkeys-pump.md @@ -0,0 +1,5 @@ +--- +"@ast-grep/lang-java": patch +--- + +Add @ast-grep/lang-java