Update CSS parser (#4)

* Seperate update into script

* Update to the latest parser version

* Update

* Fix scanner

* Rename script to build

.github/workflows/update-css-parser.yml

@@ -1,5 +1,6 @@
 name: Update Dependencies
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 6 * * MON" # every monday at midnight
 jobs:
@@ -10,21 +11,10 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - name: Update CSS parser
-        run: npm update tree-sitter-css
-      - name: Install dependencies
-        run: npm ci
-      - name: Regenerate Source Files
-        run: npm run generate
-      - name: Generate parser
-        run: npm install
-      - name: Run tests
-        run: |
-          git submodule init
-          git submodule update
-          cd tree-sitter-css && git checkout origin/master && cd ..
-          cp tree-sitter-css/corpus/* test/corpus
-          npm test
+      - name: Update parser
+        run: ./scripts/update-parser.sh
+      - name: Test
+        run: npm test
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:

.ignore

@@ -1 +1,2 @@
-src/
+src/*
+!src/scanner.c

.node-version

@@ -0,0 +1 @@
+18

.npmignore

@@ -1,4 +1,4 @@
-corpus
-examples
 build
+examples
 target
+test

grammar.js

@@ -29,32 +29,5 @@ module.exports = grammar(CSS, {
     _js_block: $ => seq("{", repeat($._js_statement), "}"),
 
     _js_statement: $ => /[^{}]+/,
-
-    // FIXME: Remove once https://github.com/tree-sitter/tree-sitter-css/pull/30 is merged
-    pseudo_element_selector: $ =>
-      seq(
-        optional($._selector),
-        "::",
-        alias($.identifier, $.tag_name),
-        optional(alias($.pseudo_element_arguments, $.arguments))
-      ),
-
-    // FIXME: Remove once https://github.com/tree-sitter/tree-sitter-css/pull/30 is merged
-    pseudo_element_arguments: $ =>
-      seq(
-        token.immediate("("),
-        sep(",", choice($._selector, repeat1($._value))),
-        ")"
-      ),
   },
 })
-
-// FIXME: Remove once https://github.com/tree-sitter/tree-sitter-css/pull/30 is merged
-function sep(separator, rule) {
-  return optional(sep1(separator, rule))
-}
-
-// FIXME: Remove once https://github.com/tree-sitter/tree-sitter-css/pull/30 is merged
-function sep1(separator, rule) {
-  return seq(rule, repeat(seq(separator, rule)))
-}

package.json

@@ -13,15 +13,15 @@
   "author": "Mark Skelton",
   "license": "ISC",
   "scripts": {
-    "generate": "tree-sitter generate",
+    "build": "tree-sitter generate",
     "test": "tree-sitter test && tree-sitter parse examples/* --quiet --time"
   },
   "dependencies": {
     "nan": "^2.17.0"
   },
   "devDependencies": {
-    "prettier": "^2.8.1",
-    "tree-sitter-cli": "^0.20.7",
+    "prettier": "^3.1.0",
+    "tree-sitter-cli": "^0.20.8",
     "tree-sitter-css": "git://github.com/tree-sitter/tree-sitter-css.git"
   },
   "tree-sitter": [

scripts/update-parser.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euo pipefail
+
+npm update tree-sitter-css
+npm ci
+
+npm run build
+npm install
+
+git submodule init
+git submodule update
+
+cd tree-sitter-css && git checkout origin/master && cd ..
+cp tree-sitter-css/test/corpus/* test/corpus