From d79d51b9b7cb99a50758333e8dcecf2fbc18a68e Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Tue, 1 Apr 2025 13:36:06 -0400 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/html/README.md | 24 ++++++++++++++++++ packages/html/index.d.ts | 10 ++++++++ packages/html/index.js | 9 +++++++ packages/html/nursery.js | 12 +++++++++ packages/html/package.json | 47 ++++++++++++++++++++++++++++++++++++ packages/html/postinstall.js | 4 +++ pnpm-lock.yaml | 31 ++++++++++++++++++++++++ 7 files changed, 137 insertions(+) create mode 100644 packages/html/README.md create mode 100644 packages/html/index.d.ts create mode 100644 packages/html/index.js create mode 100644 packages/html/nursery.js create mode 100644 packages/html/package.json create mode 100644 packages/html/postinstall.js diff --git a/packages/html/README.md b/packages/html/README.md new file mode 100644 index 0000000..6ab7b2c --- /dev/null +++ b/packages/html/README.md @@ -0,0 +1,24 @@ +# ast-grep napi language for html + +## Installation + +In a pnpm project, run: + +```bash +pnpm install @ast-grep/lang-html +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 html from '@ast-grep/lang-html' +import { registerDynamicLanguage, parse } from '@ast-grep/napi' + +registerDynamicLanguage({ html }) + +const sg = parse('html', `your code`) +sg.root().kind() +``` diff --git a/packages/html/index.d.ts b/packages/html/index.d.ts new file mode 100644 index 0000000..11140a6 --- /dev/null +++ b/packages/html/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/html/index.js b/packages/html/index.js new file mode 100644 index 0000000..ec0a422 --- /dev/null +++ b/packages/html/index.js @@ -0,0 +1,9 @@ +const path = require('node:path') +const libPath = path.join(__dirname, 'parser.so') + +module.exports = { + libraryPath: libPath, + extensions: ['html', 'htm', 'xhtml'], + languageSymbol: 'tree_sitter_html', + expandoChar: '$', +} diff --git a/packages/html/nursery.js b/packages/html/nursery.js new file mode 100644 index 0000000..6443ac1 --- /dev/null +++ b/packages/html/nursery.js @@ -0,0 +1,12 @@ +const { setup } = require('@ast-grep/nursery') +const languageRegistration = require('./index') + +setup({ + dirname: __dirname, + name: 'html', + treeSitterPackage: 'tree-sitter-html', + languageRegistration, + testRunner: parse => { + // add test here + }, +}) diff --git a/packages/html/package.json b/packages/html/package.json new file mode 100644 index 0000000..caf8c43 --- /dev/null +++ b/packages/html/package.json @@ -0,0 +1,47 @@ +{ + "name": "@ast-grep/lang-html", + "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-html": "0.23.2" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "pnpm": { + "onlyBuiltDependencies": ["@ast-grep/lang-html", "tree-sitter-cli"] + } +} diff --git a/packages/html/postinstall.js b/packages/html/postinstall.js new file mode 100644 index 0000000..b9141ff --- /dev/null +++ b/packages/html/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..4557b4b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -178,6 +178,22 @@ importers: specifier: 0.23.1 version: 0.23.1(tree-sitter@0.21.1) + packages/html: + 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-html: + specifier: 0.23.2 + version: 0.23.2(tree-sitter@0.21.1) + packages/java: dependencies: '@ast-grep/setup-lang': @@ -982,6 +998,14 @@ packages: tree_sitter: optional: true + tree-sitter-html@0.23.2: + resolution: {integrity: sha512-TN+l+7cCeLx9db/1RhRSqMAZO/266Oh2BHb8J8hMSSFLuzYvFTYP/UnD3S0mny5awzw05KzFNgu2vnwzN9wVJg==} + peerDependencies: + tree-sitter: ^0.21.1 + peerDependenciesMeta: + tree-sitter: + optional: true + tree-sitter-java@0.23.5: resolution: {integrity: sha512-Yju7oQ0Xx7GcUT01mUglPP+bYfvqjNCGdxqigTnew9nLGoII42PNVP3bHrYeMxswiCRM0yubWmN5qk+zsg0zMA==} peerDependencies: @@ -1674,6 +1698,13 @@ snapshots: node-gyp-build: 4.8.4 tree-sitter: 0.21.1 + tree-sitter-html@0.23.2(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-java@0.23.5(tree-sitter@0.21.1): dependencies: node-addon-api: 8.3.1 From 0e7a82068ddcf6bf0b90bc0cffd3acbc152e8b68 Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Wed, 2 Apr 2025 14:24:53 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=20Add=20test=20for=20HTML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/html/nursery.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/html/nursery.js b/packages/html/nursery.js index 6443ac1..1d1236e 100644 --- a/packages/html/nursery.js +++ b/packages/html/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-html', languageRegistration, testRunner: parse => { - // add test here + const sg = parse("
") + const root = sg.root() + const node = root.find("<$TAG class='foo'>$$$") + assert.equal(node.kind(), 'element') }, }) From b8579fa33674dea412423e9cb481ed055a6b013c Mon Sep 17 00:00:00 2001 From: Nathan Gendron Date: Fri, 4 Apr 2025 15:19:31 -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/quick-pillows-find.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/quick-pillows-find.md diff --git a/.changeset/quick-pillows-find.md b/.changeset/quick-pillows-find.md new file mode 100644 index 0000000..a15a734 --- /dev/null +++ b/.changeset/quick-pillows-find.md @@ -0,0 +1,5 @@ +--- +"@ast-grep/lang-html": patch +--- + +Add @ast-grep/lang-html