tree-sitter-kdl 1.0.3 → 1.1.0

package/.github/workflows/publish.yml

@@ -1,12 +1,11 @@
 name: Publish
 
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - "v*"
-  workflow_dispatch:
+  pull_request:
+    types: [closed]
+
+permissions:
+  contents: write
 
 jobs:
   build:
@@ -19,33 +18,64 @@ jobs:
       - run: npm install
       - run: npm test
 
-  publish-npm:
-    if: startsWith(github.ref, 'refs/tags/v')
+  publish:
+    if: github.event.pull_request.merged && startsWith(github.event.pull_request.title, 'chore(master):')
     needs: build
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract version
+        id: extract_version
+        run: |
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          VERSION=$(echo "$PR_TITLE" | grep -oP '(?<=release ).*$')
+          echo "::set-output name=version::$VERSION"
+      - name: Update versions
+        run: |
+          version="${{ steps.extract_version.outputs.version }}"
+          repo_name="${{ github.repository }}"
+          repo_name="${repo_name##*/}"
+
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git fetch origin master
+          git checkout master
+
+          sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/g" package.json
+          sed -i "s/version = \"[^\"]*\"/version = \"$version\"/g" Cargo.toml
+          sed -i "s/$repo_name = \"[^\"]*\"/$repo_name = \"$version\"/g" bindings/rust/README.md
+
+          git add package.json Cargo.toml bindings/rust/README.md
+          git commit -m "chore(manifests): bump version to $version"
+          git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
-      - run: npm install
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-
-  publish-crates:
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: katyo/publish-crates@v2
+      - name: Publish to Crates.io
+        uses: katyo/publish-crates@v2
         with:
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      - uses: actions/checkout@v3
+      - name: Tag stable versions
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
+          git tag -d stable || true
+          git push origin :stable || true
+          git tag -a stable -m "Last Stable Release"
+          git push origin stable

package/.github/workflows/release.yml

@@ -0,0 +1,35 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: npm install
+      - run: npm test
+
+  release:
+    name: release
+    if: ${{ github.ref == 'refs/heads/master' }}
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          release-type: simple
+          package-name: tree-sitter-kdl

package/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+## [1.1.0](https://github.com/amaanq/tree-sitter-kdl/compare/v1.0.3...v1.1.0) (2023-05-13)
+
+
+### Features
+
+* add release action ([245f6e0](https://github.com/amaanq/tree-sitter-kdl/commit/245f6e0ba4f7a5c81ca0e1075dfc875ff9f4edd0))
+
+
+### Bug Fixes
+
+* add lint script to package.json ([e36f054](https://github.com/amaanq/tree-sitter-kdl/commit/e36f054a60c4d9e5ae29567d439fdb8790b53b30))
+* rename EOF to _EOF to avoid conflicts with stdio.h ([d118f93](https://github.com/amaanq/tree-sitter-kdl/commit/d118f9376ef4f0461975289302fe74a28f073876))

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-kdl"
 description = "KDL grammar for tree-sitter"
-version = "1.0.3"
+version = "1.1.0"
 authors = [
 	"Amaan Qureshi <amaanq12@gmail.com>",
 	"Andrew Hlynskyi <ahlincq@gmail.com>",
@@ -21,7 +21,7 @@ include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.20.3"
+tree-sitter = "~0.20.10"
 
 [build-dependencies]
 cc = "1.0"

package/bindings/node/binding.cc

@@ -11,18 +11,18 @@ namespace {
 NAN_METHOD(New) {}
 
 void Init(Local<Object> exports, Local<Object> module) {
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance =
-      constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_kdl());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(),
-           Nan::New("kdl").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+    Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+    tpl->SetClassName(Nan::New("Language").ToLocalChecked());
+    tpl->InstanceTemplate()->SetInternalFieldCount(1);
+
+    Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
+    Local<Object>   instance =
+        constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+    Nan::SetInternalFieldPointer(instance, 0, tree_sitter_kdl());
+
+    Nan::Set(instance, Nan::New("name").ToLocalChecked(),
+             Nan::New("kdl").ToLocalChecked());
+    Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
 NODE_MODULE(tree_sitter_kdl_binding, Init)

package/bindings/rust/README.md

@@ -8,8 +8,8 @@ way.)
 
 ```toml
 [dependencies]
-tree-sitter = "~0.20.3"
-tree-sitter-kdl = "1.0.2"
+tree-sitter = "~0.20.10"
+tree-sitter-kdl = "1.1.0"
 ```
 
 Typically, you will use the [language][language func] function to add this
@@ -17,9 +17,12 @@ grammar to a tree-sitter [Parser][], and then use the parser to parse some code:
 
 ```rust
 let code = r#"
-    fn double(x: i32) -> i32 {
-        x * 2
-    }
+contents {
+  section "First section" {
+    paragraph "This is the first paragraph"
+    paragraph "This is the second paragraph"
+  }
+}
 "#;
 let mut parser = Parser::new();
 parser.set_language(tree_sitter_kdl::language()).expect("Error loading KDL grammar");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-kdl",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "KDL grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [
@@ -21,20 +21,22 @@
     "nan": "^2.17.0"
   },
   "devDependencies": {
-    "eslint": "^8.32.0",
+    "eslint": "^8.40.0",
     "eslint-config-google": "^0.14.0",
-    "tree-sitter-cli": "^0.20.7"
+    "tree-sitter-cli": "^0.20.8"
   },
   "repository": "https://github.com/amaanq/tree-sitter-kdl",
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
-    "test": "tree-sitter test && script/parse-examples",
+    "lint": "eslint grammar.js",
     "parse": "tree-sitter parse",
+    "test": "tree-sitter test && script/parse-examples",
     "test-windows": "tree-sitter test"
   },
   "tree-sitter": [
     {
       "scope": "source.kdl",
+      "injection-regex": "kdl",
       "file-types": [
         "kdl"
       ],

package/src/scanner.c

@@ -2,7 +2,7 @@
 #include "wctype.h"
 #include <ctype.h>
 
-enum { EOF, MULTI_LINE_COMMENT };
+enum { _EOF, MULTI_LINE_COMMENT };
 
 void *tree_sitter_kdl_external_scanner_create() { return NULL; }
 
@@ -10,67 +10,68 @@ void tree_sitter_kdl_external_scanner_destroy(void *payload) {}
 
 unsigned tree_sitter_kdl_external_scanner_serialize(void *payload,
                                                     char *buffer) {
-  return 0;
+    return 0;
 }
 
-void tree_sitter_kdl_external_scanner_deserialize(void *payload,
+void tree_sitter_kdl_external_scanner_deserialize(void       *payload,
                                                   const char *buffer,
-                                                  unsigned length) {}
+                                                  unsigned    length) {}
 
 static void advance(TSLexer *lexer) { lexer->advance(lexer, false); }
 
 bool tree_sitter_kdl_external_scanner_scan(void *payload, TSLexer *lexer,
                                            const bool *valid_symbols) {
-  // check for End-of-file
-  if (valid_symbols[EOF] && lexer->lookahead == 0) {
-    lexer->result_symbol = EOF;
-    advance(lexer);
-    return true;
-  }
-
-  // multi-line-comment := '/*' commented-block
-  if (lexer->lookahead == '/') {
-    advance(lexer);
-    if (lexer->lookahead != '*')
-      return false;
-    advance(lexer);
+    // check for End-of-file
+    if (valid_symbols[_EOF] && lexer->lookahead == 0) {
+        lexer->result_symbol = _EOF;
+        advance(lexer);
+        return true;
+    }
 
-    bool after_star = false;
-    unsigned nesting_depth = 1;
-    // commented-block := '*/' | (multi-line-comment | '*' | '/' | [^*/]+) commented-block
-    for (;;) {
-      switch (lexer->lookahead) {
-      case '\0':
-        return false;
-      case '*':
+    // multi-line-comment := '/*' commented-block
+    if (lexer->lookahead == '/') {
         advance(lexer);
-        after_star = true;
-        break;
-      case '/':
-        if (after_star) {
-          advance(lexer);
-          after_star = false;
-          nesting_depth--;
-          if (nesting_depth == 0) {
-            lexer->result_symbol = MULTI_LINE_COMMENT;
-            return true;
-          }
-        } else {
-          advance(lexer);
-          after_star = false;
-          if (lexer->lookahead == '*') {
-            nesting_depth++;
-            advance(lexer);
-          }
-        }
-        break;
-      default:
+        if (lexer->lookahead != '*')
+            return false;
         advance(lexer);
-        after_star = false;
-        break;
-      }
+
+        bool     after_star = false;
+        unsigned nesting_depth = 1;
+        // commented-block := '*/' | (multi-line-comment | '*' | '/' | [^*/]+)
+        // commented-block
+        for (;;) {
+            switch (lexer->lookahead) {
+                case '\0':
+                    return false;
+                case '*':
+                    advance(lexer);
+                    after_star = true;
+                    break;
+                case '/':
+                    if (after_star) {
+                        advance(lexer);
+                        after_star = false;
+                        nesting_depth--;
+                        if (nesting_depth == 0) {
+                            lexer->result_symbol = MULTI_LINE_COMMENT;
+                            return true;
+                        }
+                    } else {
+                        advance(lexer);
+                        after_star = false;
+                        if (lexer->lookahead == '*') {
+                            nesting_depth++;
+                            advance(lexer);
+                        }
+                    }
+                    break;
+                default:
+                    advance(lexer);
+                    after_star = false;
+                    break;
+            }
+        }
     }
-  }
 
-  return false;
+    return false;
 }