Ci maintenance and collagraph update (#3)

* Add ci for Python 3.14
* Remove twine from dev dependencies
* Configure trusted publishing to PyPi
* Bump collagraph dependency to 0.8.0 and adjust imports
* Bump version to 0.1.1

Author: berendkleinhaneveld

.github/workflows/ci.yml

@@ -44,6 +44,8 @@ jobs:
             pyversion: "3.12"
           - name: Linux py313
             pyversion: "3.13"
+          - name: Linux py314
+            pyversion: "3.14"
     steps:
       - uses: actions/checkout@v5
       - name: Install uv
@@ -73,7 +75,7 @@ jobs:
       - name: Build wheel
         run: uv build
       - name: Twine check
-        run: uv run twine check dist/*
+        run: uvx twine check dist/*
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
@@ -85,6 +87,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [lint, test, build]
     if: success() && startsWith(github.ref, 'refs/tags/v')
+    environment:
+      name: pypi
+      url: https://pypi.org/p/ruff-cgx
+    permissions:
+      id-token: write
+      contents: write
     steps:
       - uses: actions/checkout@v5
       - name: Download wheel artifact
@@ -102,7 +110,4 @@ jobs:
           draft: true
           prerelease: false
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
+        uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "ruff-cgx"
-version = "0.1.0"
+version = "0.1.1"
 description = "Ruff linter and formatter for collagraph single-file components"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "collagraph>=0.7.0",
+    "collagraph>=0.8.0",
     "ruff"
 ]
 authors = [
@@ -19,7 +19,6 @@ ruff-cgx = "ruff_cgx.__main__:main"
 [dependency-groups]
 dev = [
     "pytest",
-    "twine"
 ]
 ruff = [
     "ruff"

ruff_cgx/formatter.py

@@ -4,7 +4,7 @@
 import tempfile
 from pathlib import Path
 
-from collagraph.cgx import cgx
+from collagraph.sfc.parser import CGXParser
 
 from .template_formatter import format_template
 
@@ -59,7 +59,7 @@ def format_file(path, check=False, write=True):
     if path.suffix != ".cgx":
         return
 
-    parser = cgx.CGXParser()
+    parser = CGXParser()
     parser.feed(path.read_text())
 
     with path.open(mode="r") as fh:

ruff_cgx/linter.py

@@ -7,7 +7,8 @@
 import tokenize
 from pathlib import Path
 
-from collagraph.cgx import cgx
+from collagraph.sfc.compiler import construct_ast
+from collagraph.sfc.parser import CGXParser
 
 
 def escape_ansi(line):
@@ -17,15 +18,15 @@ def escape_ansi(line):
 
 def lint_file(path, fix=False, write=True):
     # plain_result = ast.unparse(tree)
-    parser = cgx.CGXParser()
+    parser = CGXParser()
     parser.feed(Path(path).read_text())
 
     # Read the data from script block
     script_node = parser.root.child_with_tag("script")
     start, end = script_node.location[0], script_node.end[0] - 1
     script_range = range(start, end)
 
-    tree, _ = cgx.construct_ast(path)
+    tree, _ = construct_ast(path)
 
     # The only thing that we can't check is: RUF100: whether
     # there are unneeded noqa statement. That's because we use
@@ -90,7 +91,7 @@ def lint_file(path, fix=False, write=True):
 def read_lines_from_filename_patched(path: Path) -> list[str]:
     """Read the lines for a file."""
     try:
-        parser = cgx.CGXParser()
+        parser = CGXParser()
         parser.feed(Path(path).read_text())
 
         # Read the data from script block

ruff_cgx/template_formatter.py

@@ -1,4 +1,4 @@
-from collagraph.cgx import cgx
+from collagraph.sfc.parser import Comment, TextElement
 
 INDENT = "  "
 SORTING = [
@@ -81,9 +81,9 @@ def format_node(node, depth, parser):
     result = []
     indent = depth * INDENT
 
-    if isinstance(node, cgx.Comment):
+    if isinstance(node, Comment):
         result.append(f"{indent}<!--{node.content}-->")
-    elif isinstance(node, cgx.TextElement):
+    elif isinstance(node, TextElement):
         result.append(f"{indent}{node.content.strip()}")
     else:
         start = f"{indent}<{node.tag}"