@apple/tree-sitter-pkl 0.18.1 → 0.19.0

package/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 = Changelog
 
+[[release-0.19.0]]
+== 0.19.0 (2025-10-30)
+
+=== Additions
+
+* Allow trailing commas in comma-separated syntax elements (https://github.com/apple/tree-sitter-pkl/pull/45[#45]).
+
 [[release-0.18.1]]
 == 0.18.1 (2025-04-07)
 
@@ -75,8 +82,7 @@ It changes the parse tree to match other Pkl parsers, and also fixes all known p
 
 === Fixes
 
-* Fix parsing of parenthesized expressions in object 
-elements
+* Fix parsing of parenthesized expressions in object elements
 * Fix parsing of union types with default markers
 * Add missing `else` in when generators
 * Add missing module type
@@ -93,4 +99,4 @@ Thanks to all the contributors for this release!
 [[release-0.16.0]]
 == 0.16.0 (2024-02-02)
 
-Initial release
+Initial release

package/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project(tree-sitter-pkl
-        VERSION "0.18.1"
+        VERSION "0.19.0"
         DESCRIPTION "Parser for Pkl programming language"
         HOMEPAGE_URL "https://github.com/apple/tree-sitter-pkl"
         LANGUAGES C)

package/Cargo.lock

@@ -1,36 +1,42 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.14"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
- "shlex",
+ "libc",
 ]
 
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -40,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -51,15 +57,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "tree-sitter"
@@ -73,7 +73,7 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-pkl"
-version = "0.18.1"
+version = "0.19.0"
 dependencies = [
  "cc",
  "tree-sitter",

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-pkl"
 description = "Pkl grammar for the tree-sitter parsing library"
-version = "0.18.1"
+version = "0.19.0"
 keywords = ["incremental", "parsing", "pkl"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/apple/tree-sitter-pkl"

package/MAINTAINERS.adoc

@@ -8,4 +8,5 @@ See link:CONTRIBUTING.adoc[] for general contribution guidelines.
 
 * https://github.com/bioball[Daniel Chao]
 * https://github.com/stackoverflow[Islon Scherer]
+* https://github.com/HT154[Jen Basch]
 * https://github.com/holzensp[Philip Hölzenspies]

package/Makefile

@@ -4,7 +4,7 @@ endif
 
 LANGUAGE_NAME := tree-sitter-pkl
 HOMEPAGE_URL := https://github.com/apple/tree-sitter-pkl
-VERSION := 0.18.1
+VERSION := 0.19.0
 
 # repository
 SRC_DIR := src

package/SECURITY.adoc

@@ -4,7 +4,7 @@ For the protection of our community, the Pkl team does not disclose, discuss, or
 
 == Reporting a security vulnerability
 
-If you have discovered a security vulnerability within the Pkl Pantry project, please report it to us.
+If you have discovered a security vulnerability within the Tree-sitter Pkl project, please report it to us.
 We welcome reports from everyone, including security researchers, developers, and users.
 
 Security vulnerabilities may be reported on the link:https://security.apple.com/submit[Report a vulnerability] form.

package/grammar.js

@@ -805,7 +805,7 @@ module.exports = grammar({
     logicalAndExpr: $ => prec.left(PREC.AND, seq($._expr, field('operator', "&&"), $._expr)),
 
     logicalOrExpr: $ => prec.left(PREC.OR, seq($._expr, field('operator', "||"), $._expr)),
-    
+
     pipeExpr: $ => prec.left(PREC.PIPE, seq($._expr, field('operator', "|>"), $._expr)),
 
     typeTestExpr: $ => prec(PREC.IS, seq($._expr, field("operator", "is"), $._type)),
@@ -877,7 +877,7 @@ module.exports = grammar({
 });
 
 function commaSep1 (rule) {
-  return seq(rule, repeat(seq(',', rule)));
+  return seq(rule, repeat(seq(',', rule)), optional(','));
 }
 
 function commaSep (rule) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apple/tree-sitter-pkl",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "description": "Pkl grammar for node-tree-sitter",
   "repository": {
     "type": "git",

package/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-pkl"
 description = "Parser for Pkl programming language"
-version = "0.18.1"
+version = "0.19.0"
 keywords = ["incremental", "parsing", "tree-sitter", "pkl"]
 classifiers = [
   "Intended Audience :: Developers",

package/src/grammar.json

@@ -1055,6 +1055,18 @@
                   }
                 ]
               }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": ","
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         },
@@ -1245,6 +1257,18 @@
                     }
                   ]
                 }
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
               }
             ]
           },
@@ -1328,6 +1352,18 @@
                         }
                       ]
                     }
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
                   }
                 ]
               },
@@ -1380,6 +1416,18 @@
                   }
                 ]
               }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": ","
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         },
@@ -1418,6 +1466,18 @@
                   }
                 ]
               }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": ","
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         },
@@ -1489,6 +1549,18 @@
                       }
                     ]
                   }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             },
@@ -1578,6 +1650,18 @@
                       }
                     ]
                   }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             },