@apple/tree-sitter-pkl 0.20.0 → 0.21.0

package/Cargo.lock

@@ -1,42 +1,89 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
 dependencies = [
- "libc",
+ "find-msvc-tools",
+ "shlex",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.152"
+name = "equivalent"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
+[[package]]
+name = "indexmap"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+dependencies = [
+ "proc-macro2",
+]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -46,9 +93,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -57,24 +104,113 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+
+[[package]]
+name = "syn"
+version = "2.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.10"
+version = "0.25.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
+checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87"
 dependencies = [
  "cc",
  "regex",
+ "regex-syntax",
+ "serde_json",
+ "streaming-iterator",
+ "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
+
 [[package]]
 name = "tree-sitter-pkl"
 version = "0.20.0"
 dependencies = [
  "cc",
  "tree-sitter",
+ "tree-sitter-language",
 ]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"

package/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "tree-sitter-pkl"
-description = "Pkl grammar for the tree-sitter parsing library"
-version = "0.20.0"
-keywords = ["incremental", "parsing", "pkl"]
-categories = ["parsing", "text-editors"]
-repository = "https://github.com/apple/tree-sitter-pkl"
-edition = "2018"
+description = "Parser for Pkl programming language"
+version = "0.21.0"
+authors = ["The Pkl Authors <pkl-oss@group.apple.com>"]
 license = "Apache-2.0"
-authors = [
-  "pkl-oss@group.apple.com"
-]
+readme = "README.md"
+keywords = ["incremental", "parsing", "tree-sitter", "pkl"]
+categories = ["parser-implementations", "parsing", "text-editors"]
+repository = "https://github.com/apple/tree-sitter-pkl"
+edition = "2021"
+autoexamples = false
 
 build = "bindings/rust/build.rs"
 include = [
@@ -17,13 +17,18 @@ include = [
   "grammar.js",
   "queries/*",
   "src/*",
+  "tree-sitter.json",
+  "LICENSE.txt",
 ]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.20.6"
+tree-sitter-language = "0.1"
 
 [build-dependencies]
-cc = "1.0"
+cc = "1.2"
+
+[dev-dependencies]
+tree-sitter = "0.25.10"

package/Makefile

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

package/{SECURITY.adoc → SECURITY.md}

@@ -1,13 +1,13 @@
-= Security
+# Security
 
 For the protection of our community, the Pkl team does not disclose, discuss, or confirm security issues until our investigation is complete and any necessary updates are generally available.
 
-== Reporting a security vulnerability
+## Reporting a security vulnerability
 
 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.
+Security vulnerabilities may be reported on the [Report a vulnerability](https://security.apple.com/submit) form.
 When submitting a vulnerability, select "Apple Devices and Software" as the affected platform, and "Open Source" as the affected area.
 
 For more information, see https://pkl-lang.org/security.html.

package/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

package/gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package/grammar.js

@@ -1,7 +1,5 @@
-// noinspection JSUnusedLocalSymbols
-
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -633,6 +631,7 @@ module.exports = grammar({
         '"""',
         repeat(choice(
           $.mlStringLiteralPart,
+          $.mlStringContinuation,
           $.escapeSequence,
           $.stringInterpolation
         )),
@@ -643,6 +642,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart1, $.mlStringLiteralPart),
           alias($.escapeSequence1, $.escapeSequence),
+          alias($.mlStringContinuation1, $.mlStringContinuation),
           alias($.stringInterpolation1, $.stringInterpolation)
         )),
         '"""#'
@@ -652,6 +652,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart2, $.mlStringLiteralPart),
           alias($.escapeSequence2, $.escapeSequence),
+          alias($.mlStringContinuation2, $.mlStringContinuation),
           alias($.stringInterpolation2, $.stringInterpolation)
         )),
         '"""##'
@@ -661,6 +662,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart3, $.mlStringLiteralPart),
           alias($.escapeSequence3, $.escapeSequence),
+          alias($.mlStringContinuation3, $.mlStringContinuation),
           alias($.stringInterpolation3, $.stringInterpolation)
         )),
         '"""###'
@@ -670,6 +672,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart4, $.mlStringLiteralPart),
           alias($.escapeSequence4, $.escapeSequence),
+          alias($.mlStringContinuation4, $.mlStringContinuation),
           alias($.stringInterpolation4, $.stringInterpolation)
         )),
         '"""####'
@@ -679,6 +682,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart5, $.mlStringLiteralPart),
           alias($.escapeSequence5, $.escapeSequence),
+          alias($.mlStringContinuation5, $.mlStringContinuation),
           alias($.stringInterpolation5, $.stringInterpolation)
         )),
         '"""#####'
@@ -688,6 +692,7 @@ module.exports = grammar({
         repeat(choice(
           alias($.mlStringLiteralPart6, $.mlStringLiteralPart),
           alias($.escapeSequence6, $.escapeSequence),
+          alias($.mlStringContinuation6, $.mlStringContinuation),
           alias($.stringInterpolation6, $.stringInterpolation)
         )),
         '"""######'
@@ -764,6 +769,20 @@ module.exports = grammar({
       )
     )),
 
+    mlStringContinuation: $ => token.immediate(/\\\r?\n/),
+
+    mlStringContinuation1: $ => token.immediate(/\\#\r?\n/),
+
+    mlStringContinuation2: $ => token.immediate(/\\##\r?\n/),
+
+    mlStringContinuation3: $ => token.immediate(/\\###\r?\n/),
+
+    mlStringContinuation4: $ => token.immediate(/\\####\r?\n/),
+
+    mlStringContinuation5: $ => token.immediate(/\\#####\r?\n/),
+
+    mlStringContinuation6: $ => token.immediate(/\\######\r?\n/),
+
     stringInterpolation: $ => seq(token.immediate("\\("), $._expr, ")"),
 
     stringInterpolation1: $ => seq(token.immediate("\\#("), $._expr, ")"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apple/tree-sitter-pkl",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Pkl grammar for node-tree-sitter",
   "repository": {
     "type": "git",
@@ -17,16 +17,16 @@
     "url": "https://github.com/apple/tree-sitter-pkl/issues"
   },
   "engines": {
-    "node": "^24.11.0",
-    "npm": "^11.6.1"
+    "node": ">= 24",
+    "npm": ">= 11"
   },
   "dependencies": {
     "node-addon-api": "^8.5.0",
     "node-gyp-build": "^4.8.4"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.25.10",
-    "typescript": "^5.9.3"
+    "tree-sitter-cli": "^0.26.8",
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "tree-sitter": "^0.25.0"
@@ -38,7 +38,7 @@
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp-build",
-    "generate": "tree-sitter generate --no-bindings",
+    "generate": "tree-sitter generate",
     "test": "tree-sitter test",
     "getVersion": "node -p \"require('./package.json').version\""
   },

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.20.0"
+version = "0.21.0"
 keywords = ["incremental", "parsing", "tree-sitter", "pkl"]
 classifiers = [
   "Intended Audience :: Developers",

package/src/grammar.json

@@ -2610,6 +2610,10 @@
                     "type": "SYMBOL",
                     "name": "mlStringLiteralPart"
                   },
+                  {
+                    "type": "SYMBOL",
+                    "name": "mlStringContinuation"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "escapeSequence"
@@ -2657,6 +2661,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation1"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -2705,6 +2718,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation2"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -2753,6 +2775,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation3"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -2801,6 +2832,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation4"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -2849,6 +2889,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation5"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -2897,6 +2946,15 @@
                     "named": true,
                     "value": "escapeSequence"
                   },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "mlStringContinuation6"
+                    },
+                    "named": true,
+                    "value": "mlStringContinuation"
+                  },
                   {
                     "type": "ALIAS",
                     "content": {
@@ -3120,6 +3178,55 @@
         ]
       }
     },
+    "mlStringContinuation": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\\\r?\\n"
+      }
+    },
+    "mlStringContinuation1": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\#\\r?\\n"
+      }
+    },
+    "mlStringContinuation2": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\##\\r?\\n"
+      }
+    },
+    "mlStringContinuation3": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\###\\r?\\n"
+      }
+    },
+    "mlStringContinuation4": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\####\\r?\\n"
+      }
+    },
+    "mlStringContinuation5": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\#####\\r?\\n"
+      }
+    },
+    "mlStringContinuation6": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\\\######\\r?\\n"
+      }
+    },
     "stringInterpolation": {
       "type": "SEQ",
       "members": [

package/src/node-types.json

@@ -3430,6 +3430,10 @@
           "type": "escapeSequence",
           "named": true
         },
+        {
+          "type": "mlStringContinuation",
+          "named": true
+        },
         {
           "type": "mlStringLiteralPart",
           "named": true
@@ -8656,6 +8660,10 @@
     "type": "local",
     "named": false
   },
+  {
+    "type": "mlStringContinuation",
+    "named": true
+  },
   {
     "type": "module",
     "named": false