@apple/tree-sitter-pkl 0.17.0 → 0.18.1

package/test/corpus/object/objectMember.txt

@@ -26,65 +26,65 @@ res12 {1.2;.3;.4;.5}
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectElement
-        (intLiteral))
+        (intLiteralExpr))
       (objectElement
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectProperty
         (identifier)
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
       (objectProperty
         (identifier)
-        (intLiteral))
+        (intLiteralExpr))
       (objectProperty
         (identifier)
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
@@ -92,18 +92,18 @@ res12 {1.2;.3;.4;.5}
         (identifier)
         (objectBody
           (objectElement
-            (intLiteral))))))
+            (intLiteralExpr))))))
   (classProperty
     (identifier)
     (objectBody
       (objectEntry
-        (slStringLiteral
+        (slStringLiteralExpr
           (slStringLiteralPart))
-        (intLiteral))
+        (intLiteralExpr))
       (objectEntry
-        (slStringLiteral
+        (slStringLiteralExpr
           (slStringLiteralPart))
-        (intLiteral))))
+        (intLiteralExpr))))
   (classProperty
     (identifier)
     (objectBody
@@ -120,10 +120,10 @@ res12 {1.2;.3;.4;.5}
     (identifier)
     (objectBody
       (objectElement
-        (floatLiteral))
+        (floatLiteralExpr))
       (objectElement
-        (floatLiteral))
+        (floatLiteralExpr))
       (objectElement
-        (floatLiteral))
+        (floatLiteralExpr))
       (objectElement
-        (floatLiteral)))))
+        (floatLiteralExpr)))))

package/test/corpus/object/objectMemberPredicate.txt

@@ -17,25 +17,25 @@ foo {
   (classProperty
     (identifier)
     (objectBody
-      (objectPredicate
-        (binaryExpr
-          (variableExpr
+      (memberPredicate
+        (equalityExpr
+          (unqualifiedAccessExpr
             (identifier))
-          (intLiteral))
+          (intLiteralExpr))
         (objectBody
           (objectProperty
             (identifier)
-            (intLiteral))))
-      (objectPredicate
-        (binaryExpr
-          (variableExpr
+            (intLiteralExpr))))
+      (memberPredicate
+        (equalityExpr
+          (unqualifiedAccessExpr
             (identifier))
-          (intLiteral))
-        (intLiteral))
-      (objectPredicate
+          (intLiteralExpr))
+        (intLiteralExpr))
+      (memberPredicate
         (subscriptExpr
-          (variableExpr
+          (unqualifiedAccessExpr
             (identifier))
-          (variableExpr
+          (unqualifiedAccessExpr
             (identifier)))
-        (trueLiteral)))))
+        (trueLiteralExpr)))))

package/test/corpus/object/objectSpread.txt

@@ -22,30 +22,30 @@ res {
     (identifier)
     (objectBody
       (objectSpread
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier)))
       (objectSpread
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier)))
       (objectSpread
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier)))
       (objectSpread
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier)))
       (forGenerator
         (typedIdentifier
           (identifier))
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectSpread
-            (variableExpr
+            (unqualifiedAccessExpr
               (identifier)))))
       (whenGenerator
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectSpread
-            (variableExpr
+            (unqualifiedAccessExpr
               (identifier))))))))

package/test/corpus/object/objectWhenGenerator.txt

@@ -31,41 +31,41 @@ res4 {
     (identifier)
     (objectBody
       (whenGenerator
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectElement
-            (intLiteral))))))
+            (intLiteralExpr))))))
   (classProperty
     (identifier)
     (objectBody
       (whenGenerator
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectElement
-            (intLiteral)))
+            (intLiteralExpr)))
         (objectBody
           (objectElement
-            (intLiteral))))))
+            (intLiteralExpr))))))
   (classProperty
     (identifier)
     (objectBody
       (whenGenerator
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectElement
-            (intLiteral))))))
+            (intLiteralExpr))))))
   (classProperty
     (identifier)
     (objectBody
       (whenGenerator
-        (variableExpr
+        (unqualifiedAccessExpr
           (identifier))
         (objectBody
           (objectElement
-            (intLiteral)))
+            (intLiteralExpr)))
         (objectBody
           (objectElement
-            (intLiteral)))))))
+            (intLiteralExpr)))))))

package/test/corpus/snippetTests/annotation/annotation1.txt

@@ -0,0 +1,284 @@
+===
+annotation/annotation1.pkl
+===
+
+/// doc comment
+/// doc comment
+@Ann
+@Ann2 { x = "foo" }
+@Ann3 {
+  x = "foo"
+  y = 1
+}
+module some.mod
+
+/// doc comment
+/// doc comment
+@Ann
+@Ann2 { x = "foo" }
+@Ann3 {
+  x = "foo"
+  y = 1
+}
+class SomeClass {
+  /// doc comment
+  /// doc comment
+  @Ann
+  @Ann2 { x = "foo" }
+  @Ann3 {
+    x = "foo"
+    y = 1
+  }
+  function someMethod() = "hi"
+
+  /// doc comment
+  /// doc comment
+  @Ann
+  @Ann2 { x = "foo" }
+  @Ann3 {
+    x = "foo"
+    y = 1
+  }
+  someProperty: String = "hi"
+}
+
+/// doc comment
+/// doc comment
+@Ann
+@Ann2 { x = "foo" }
+@Ann3 {
+  x = "foo"
+  y = 1
+}
+function someMethod() = "hi"
+
+/// doc comment
+/// doc comment
+@Ann
+@Ann2 { x = "foo" }
+@Ann3 {
+  x = "foo"
+  y = 1
+}
+someProperty: String = "hi"
+
+class Ann extends Annotation
+
+class Ann2 extends Annotation {
+  x: String
+}
+
+class Ann3 extends Annotation {
+  x: String
+  y: Int
+}
+---
+
+(module
+  (moduleHeader
+    (docComment)
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))
+        (objectProperty
+          (identifier)
+          (intLiteralExpr))))
+    (moduleClause
+
+      (qualifiedIdentifier
+        (identifier)
+        (identifier))))
+  (clazz
+    (docComment)
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))
+        (objectProperty
+          (identifier)
+          (intLiteralExpr))))
+    (identifier)
+    (classBody
+      (classMethod
+        (docComment)
+        (annotation
+          (qualifiedIdentifier
+            (identifier)))
+        (annotation
+          (qualifiedIdentifier
+            (identifier))
+          (objectBody
+            (objectProperty
+              (identifier)
+              (slStringLiteralExpr
+                (slStringLiteralPart)))))
+        (annotation
+          (qualifiedIdentifier
+            (identifier))
+          (objectBody
+            (objectProperty
+              (identifier)
+              (slStringLiteralExpr
+                (slStringLiteralPart)))
+            (objectProperty
+              (identifier)
+              (intLiteralExpr))))
+        (methodHeader
+          (identifier)
+          (parameterList))
+        (slStringLiteralExpr
+          (slStringLiteralPart)))
+      (classProperty
+        (docComment)
+        (annotation
+          (qualifiedIdentifier
+            (identifier)))
+        (annotation
+          (qualifiedIdentifier
+            (identifier))
+          (objectBody
+            (objectProperty
+              (identifier)
+              (slStringLiteralExpr
+                (slStringLiteralPart)))))
+        (annotation
+          (qualifiedIdentifier
+            (identifier))
+          (objectBody
+            (objectProperty
+              (identifier)
+              (slStringLiteralExpr
+                (slStringLiteralPart)))
+            (objectProperty
+              (identifier)
+              (intLiteralExpr))))
+        (identifier)
+        (typeAnnotation
+          (declaredType
+            (qualifiedIdentifier
+              (identifier))))
+        (slStringLiteralExpr
+          (slStringLiteralPart)))))
+  (classMethod
+    (docComment)
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))
+        (objectProperty
+          (identifier)
+          (intLiteralExpr))))
+    (methodHeader
+      (identifier)
+      (parameterList))
+    (slStringLiteralExpr
+      (slStringLiteralPart)))
+  (classProperty
+    (docComment)
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))))
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))
+        (objectProperty
+          (identifier)
+          (intLiteralExpr))))
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (slStringLiteralExpr
+      (slStringLiteralPart)))
+  (clazz
+    (identifier)      (classExtendsClause
+      (qualifiedIdentifier
+        (identifier))))
+  (clazz
+    (identifier)      (classExtendsClause
+      (qualifiedIdentifier
+        (identifier)))
+    (classBody
+      (classProperty
+        (identifier)
+        (typeAnnotation
+          (declaredType
+            (qualifiedIdentifier
+              (identifier)))))))
+  (clazz
+    (identifier)      (classExtendsClause
+      (qualifiedIdentifier
+        (identifier)))
+    (classBody
+      (classProperty
+        (identifier)
+        (typeAnnotation
+          (declaredType
+            (qualifiedIdentifier
+              (identifier)))))
+      (classProperty
+        (identifier)
+        (typeAnnotation
+          (declaredType
+            (qualifiedIdentifier
+              (identifier))))))))

package/test/corpus/snippetTests/annotation/annotation2.txt

@@ -0,0 +1,20 @@
+===
+annotation/annotation2.pkl
+===
+
+class NoAnn
+
+@NoAnn
+invalidAnnotationOnTypeCheckedProperty = "hi"
+---
+
+(module
+  (clazz
+    (identifier))
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (identifier)
+    (slStringLiteralExpr
+      (slStringLiteralPart))))

package/test/corpus/snippetTests/annotation/annotation3.txt

@@ -0,0 +1,24 @@
+===
+annotation/annotation3.pkl
+===
+
+class NoAnn
+
+@NoAnn
+invalidAnnotationOnTypedProperty: String = "hi"
+---
+
+(module
+  (clazz
+    (identifier))
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (slStringLiteralExpr
+      (slStringLiteralPart))))

package/test/corpus/snippetTests/annotation/annotation4.txt

@@ -0,0 +1,32 @@
+===
+annotation/annotation4.pkl
+===
+
+@Mapping {
+  a = "hi"
+  b = "hi"
+}
+someProperty: String = "hi"
+---
+
+(module
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier))
+      (objectBody
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))
+        (objectProperty
+          (identifier)
+          (slStringLiteralExpr
+            (slStringLiteralPart)))))
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (slStringLiteralExpr
+      (slStringLiteralPart))))

package/test/corpus/snippetTests/annotation/annotation5.txt

@@ -0,0 +1,28 @@
+===
+annotation/annotation5.pkl
+===
+
+integer: Int = 1
+
+@integer someProperty: String = "hi"
+---
+
+(module
+  (classProperty
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (intLiteralExpr))
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (slStringLiteralExpr
+      (slStringLiteralPart))))

package/test/corpus/snippetTests/annotation/annotation6.txt

@@ -0,0 +1,19 @@
+===
+annotation/annotation6.pkl
+===
+
+@Int someProperty: String = "hi"
+---
+
+(module
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (identifier)
+    (typeAnnotation
+      (declaredType
+        (qualifiedIdentifier
+          (identifier))))
+    (slStringLiteralExpr
+      (slStringLiteralPart))))

package/test/corpus/snippetTests/annotation/annotationIsNotExpression.txt

@@ -0,0 +1,29 @@
+===
+annotation/annotationIsNotExpression.pkl
+===
+
+class MyAnn extends Annotation
+
+local myAnn = MyAnn
+
+@myAnn
+foo = 1
+
+---
+
+(module
+  (clazz
+    (identifier)      (classExtendsClause
+      (qualifiedIdentifier
+        (identifier))))
+  (classProperty
+    (modifier)
+    (identifier)
+    (unqualifiedAccessExpr
+      (identifier)))
+  (classProperty
+    (annotation
+      (qualifiedIdentifier
+        (identifier)))
+    (identifier)
+    (intLiteralExpr)))