@apple/tree-sitter-pkl 0.17.0 → 0.18.1

package/licenserc.toml

@@ -0,0 +1,23 @@
+headerPath = "scripts/license-header.txt"
+
+includes = [
+    "*.c",
+    "*.cc",
+    "*.h",
+    "*.js",
+    "*.pkl",
+    "PklProject",
+]
+
+excludes = [
+    "bindings/*",
+    "parser.c",
+    "src/tree_sitter/*"
+]
+
+[git]
+attrs = 'auto'
+ignore = 'auto'
+
+[properties]
+copyrightOwner = "Apple Inc. and the Pkl project authors"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apple/tree-sitter-pkl",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "Pkl grammar for node-tree-sitter",
   "repository": {
     "type": "git",
@@ -27,7 +27,8 @@
     "@types/glob": "^8.1.0",
     "@types/node": "^20.4.5",
     "node-gyp": "^9.1.0",
-    "tree-sitter-cli": "^0.22.6",
+    "tree-sitter": "^0.22.4",
+    "tree-sitter-cli": "^0.25.3",
     "typescript": "^4.9.0"
   },
   "scripts": {

package/pyproject.toml

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tree-sitter-pkl"
+description = "Parser for Pkl programming language"
+version = "0.18.1"
+keywords = ["incremental", "parsing", "tree-sitter", "pkl"]
+classifiers = [
+  "Intended Audience :: Developers",
+  "Topic :: Software Development :: Compilers",
+  "Topic :: Text Processing :: Linguistic",
+  "Typing :: Typed",
+]
+authors = [{ name = "The Pkl Authors", email = "pkl-oss@group.apple.com" }]
+requires-python = ">=3.10"
+license.text = "Apache-2.0"
+readme = "README.md"
+
+[project.urls]
+Homepage = "https://github.com/apple/tree-sitter-pkl"
+
+[project.optional-dependencies]
+core = ["tree-sitter~=0.24"]
+
+[tool.cibuildwheel]
+build = "cp310-*"
+build-frontend = "build"

package/queries/highlights.scm

@@ -9,11 +9,6 @@
   "<" @punctuation.bracket
   ">" @punctuation.bracket)
 
-; Method calls
-
-(methodCallExpr
-  (identifier) @function.method)
-
 ; Method definitions
 
 (classMethod (methodHeader (identifier)) @function.method)
@@ -32,23 +27,23 @@
 ; Literals
 
 (stringConstant) @string
-(slStringLiteral) @string
-(mlStringLiteral) @string
+(slStringLiteralExpr) @string
+(mlStringLiteralExpr) @string
 
 (escapeSequence) @escape
 
-(intLiteral) @number
-(floatLiteral) @number
+(intLiteralExpr) @number
+(floatLiteralExpr) @number
 
-(interpolationExpr
+(stringInterpolation
   "\\(" @punctuation.special
   ")" @punctuation.special) @embedded
 
-(interpolationExpr
+(stringInterpolation
  "\\#(" @punctuation.special
  ")" @punctuation.special) @embedded
 
-(interpolationExpr
+(stringInterpolation
   "\\##(" @punctuation.special
   ")" @punctuation.special) @embedded
 
@@ -101,13 +96,13 @@
 "else" @keyword
 "extends" @keyword
 "external" @keyword
-(falseLiteral) @constant.builtin
+(falseLiteralExpr) @constant.builtin
 "for" @keyword
 "function" @keyword
 "hidden" @keyword
 "if" @keyword
 (importExpr "import" @function.method.builtin)
-(importGlobExpr "import*" @function.method.builtin)
+(importExpr "import*" @function.method.builtin)
 "import" @keyword
 "import*" @keyword
 "in" @keyword
@@ -117,7 +112,7 @@
 (moduleExpr "module" @type.builtin)
 "module" @keyword
 "new" @keyword
-(nullLiteral) @constant.builtin
+(nullLiteralExpr) @constant.builtin
 "open" @keyword
 "out" @keyword
 (outerExpr) @variable.builtin
@@ -128,6 +123,6 @@
 (thisExpr) @variable.builtin
 "throw" @function.method.builtin
 "trace" @function.method.builtin
-(trueLiteral) @constant.builtin
+(trueLiteralExpr) @constant.builtin
 "typealias" @keyword
 "when" @keyword

package/queries/injections.scm

@@ -2,7 +2,7 @@
 ; * any qualified or unqualified call to a method named "Regex" is considered a regex
 ; * string delimiters are considered part of the regex
 (
-  ((methodCallExpr (identifier) @methodName (argumentList (slStringLiteral) @injection.content))
+  ((unqualifiedAccessExpr (identifier) @methodName (argumentList (slStringLiteralExpr) @injection.content))
     (#set! injection.language "regex"))
   (#eq? @methodName "Regex"))
  

package/queries/locals.scm

@@ -4,7 +4,7 @@
 (clazz) @local.scope
 (classMethod) @local.scope
 (objectMethod) @local.scope
-(functionLiteral) @local.scope
+(functionLiteralExpr) @local.scope
 (objectBody) @local.scope
 (letExpr) @local.scope
 (forGenerator) @local.scope
@@ -34,5 +34,5 @@
 
 ; References
 
-(variableExpr 
+(unqualifiedAccessExpr 
   (identifier) @local.reference)

package/scripts/license-header.txt

@@ -0,0 +1,13 @@
+Copyright ©{{ " " }}{%- if attrs.git_file_modified_year != attrs.git_file_created_year -%}{{ attrs.git_file_created_year }}-{{ attrs.git_file_modified_year }}{%- else -%}{{ attrs.git_file_created_year }}{%- endif -%}{{ " " }}{{ props["copyrightOwner"] }}. 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.
+You may obtain a copy of the License at
+
+  https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/setup.py

@@ -0,0 +1,77 @@
+from os import path
+from platform import system
+from sysconfig import get_config_var
+
+from setuptools import Extension, find_packages, setup
+from setuptools.command.build import build
+from setuptools.command.egg_info import egg_info
+from wheel.bdist_wheel import bdist_wheel
+
+sources = [
+    "bindings/python/tree_sitter_pkl/binding.c",
+    "src/parser.c",
+]
+if path.exists("src/scanner.c"):
+    sources.append("src/scanner.c")
+
+macros: list[tuple[str, str | None]] = [
+    ("PY_SSIZE_T_CLEAN", None),
+    ("TREE_SITTER_HIDE_SYMBOLS", None),
+]
+if limited_api := not get_config_var("Py_GIL_DISABLED"):
+    macros.append(("Py_LIMITED_API", "0x030A0000"))
+
+if system() != "Windows":
+    cflags = ["-std=c11", "-fvisibility=hidden"]
+else:
+    cflags = ["/std:c11", "/utf-8"]
+
+
+class Build(build):
+    def run(self):
+        if path.isdir("queries"):
+            dest = path.join(self.build_lib, "tree_sitter_pkl", "queries")
+            self.copy_tree("queries", dest)
+        super().run()
+
+
+class BdistWheel(bdist_wheel):
+    def get_tag(self):
+        python, abi, platform = super().get_tag()
+        if python.startswith("cp"):
+            python, abi = "cp310", "abi3"
+        return python, abi, platform
+
+
+class EggInfo(egg_info):
+    def find_sources(self):
+        super().find_sources()
+        self.filelist.recursive_include("queries", "*.scm")
+        self.filelist.include("src/tree_sitter/*.h")
+
+
+setup(
+    packages=find_packages("bindings/python"),
+    package_dir={"": "bindings/python"},
+    package_data={
+        "tree_sitter_pkl": ["*.pyi", "py.typed"],
+        "tree_sitter_pkl.queries": ["*.scm"],
+    },
+    ext_package="tree_sitter_pkl",
+    ext_modules=[
+        Extension(
+            name="_binding",
+            sources=sources,
+            extra_compile_args=cflags,
+            define_macros=macros,
+            include_dirs=["src"],
+            py_limited_api=limited_api,
+        )
+    ],
+    cmdclass={
+        "build": Build,
+        "bdist_wheel": BdistWheel,
+        "egg_info": EggInfo,
+    },
+    zip_safe=False
+)