starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Add isNotEmpty, isNotBlank methods (#1396)

Browse Source 
Adds convenience methods `isNotEmpty` and `isNotBlank`. This borrows the
same methods from Kotlin.

This helps users write more fluent constraints, for example,
`foo.isNotEmpty.implies(bar)`.

Adds:

* List#isNotEmpty
* Map#isNotEmpty
* Set#isNotEmpty
* Mapping#isNotEmpty
* Listing#isNotEmpty
* String#isNotEmpty
* String#isNotBlank
This commit is contained in:
Daniel Chao
2026-01-08 13:22:43 -08:00
committed by GitHub
parent 14d58a17b0
commit ac4f2fd9a6
23 changed files with 1133 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkl-core/src/main/java/org/pkl/core/runtime/VmMapping.java
View File

@@ -181,4 +181,8 @@ public final class VmMapping extends VmListingOrMapping {
cachedLength = count.get();
return cachedLength;
}
public boolean isEmpty() {
return getLength() == 0;
}
}

9
pkl-core/src/main/java/org/pkl/core/stdlib/base/ListNodes.java
View File

@@ -1,5 +1,5 @@
/*
* 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.
@@ -56,6 +56,13 @@ public final class ListNodes {
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmList self) {
return !self.isEmpty();
}
}
public abstract static class lastIndex extends ExternalPropertyNode {
@Specialization
protected long eval(VmList self) {

9
pkl-core/src/main/java/org/pkl/core/stdlib/base/ListingNodes.java
View File

@@ -1,5 +1,5 @@
/*
* 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.
@@ -46,6 +46,13 @@ public final class ListingNodes {
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmListing self) {
return !self.isEmpty();
}
}
public abstract static class lastIndex extends ExternalPropertyNode {
@Specialization
protected long eval(VmListing self) {

9
pkl-core/src/main/java/org/pkl/core/stdlib/base/MapNodes.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2024 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.
@@ -52,6 +52,13 @@ public final class MapNodes {
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmMap self) {
return !self.isEmpty();
}
}
public abstract static class keys extends ExternalPropertyNode {
@Specialization
protected VmSet eval(VmMap self) {

20
pkl-core/src/main/java/org/pkl/core/stdlib/base/MappingNodes.java
View File

@@ -1,5 +1,5 @@
/*
* 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.
@@ -15,7 +15,6 @@
*/
package org.pkl.core.stdlib.base;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.nodes.IndirectCallNode;
import org.pkl.core.ast.lambda.ApplyVmFunction1Node;
@@ -28,7 +27,6 @@ import org.pkl.core.stdlib.ExternalMethod0Node;
import org.pkl.core.stdlib.ExternalMethod1Node;
import org.pkl.core.stdlib.ExternalMethod2Node;
import org.pkl.core.stdlib.ExternalPropertyNode;
import org.pkl.core.util.EconomicMaps;
import org.pkl.core.util.MutableBoolean;
import org.pkl.core.util.MutableReference;
@@ -37,15 +35,15 @@ public final class MappingNodes {
public abstract static class isEmpty extends ExternalPropertyNode {
@Specialization
@TruffleBoundary
protected boolean eval(VmMapping self) {
for (VmObjectLike curr = self; curr != null; curr = curr.getParent()) {
var cursor = EconomicMaps.getEntries(curr.getMembers());
while (cursor.advance()) {
if (!(cursor.getKey() instanceof Identifier)) return false;
}
}
return true;
return self.isEmpty();
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmMapping self) {
return !self.isEmpty();
}
}

9
pkl-core/src/main/java/org/pkl/core/stdlib/base/SetNodes.java
View File

@@ -1,5 +1,5 @@
/*
* 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.
@@ -46,6 +46,13 @@ public final class SetNodes {
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmSet self) {
return !self.isEmpty();
}
}
public abstract static class isEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(VmSet self) {

16
pkl-core/src/main/java/org/pkl/core/stdlib/base/StringNodes.java
View File

@@ -1,5 +1,5 @@
/*
* 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.
@@ -131,6 +131,13 @@ public final class StringNodes {
}
}
public abstract static class isNotEmpty extends ExternalPropertyNode {
@Specialization
protected boolean eval(String self) {
return !self.isEmpty();
}
}
public abstract static class isBlank extends ExternalPropertyNode {
@Specialization
protected boolean eval(String self) {
@@ -138,6 +145,13 @@ public final class StringNodes {
}
}
public abstract static class isNotBlank extends ExternalPropertyNode {
@Specialization
protected boolean eval(String self) {
return !StringUtils.isBlank(self);
}
}
public abstract static class isRegex extends ExternalPropertyNode {
@Specialization
@TruffleBoundary

5
pkl-core/src/test/files/LanguageSnippetTests/input/api/list.pkl vendored
View File

@@ -12,6 +12,11 @@ facts {
!list1.isEmpty
}
["isNotEmpty"] {
!List().isNotEmpty
list1.isNotEmpty
}
["every()"] {
list1.every((x) -> x <= 3)
!list1.every((x) -> x > 2)

11
pkl-core/src/test/files/LanguageSnippetTests/input/api/listing.pkl vendored
View File

@@ -42,7 +42,16 @@ facts {
!altered.isEmpty
!computedIndex.isEmpty
}
["isNotEmpty"] {
!empty.isNotEmpty
!empty2.isNotEmpty
base.isNotEmpty
derived.isNotEmpty
altered.isNotEmpty
computedIndex.isNotEmpty
}
["lastIndex"] {
empty.lastIndex == -1
empty2.lastIndex == -1

5
pkl-core/src/test/files/LanguageSnippetTests/input/api/map.pkl vendored
View File

@@ -8,6 +8,11 @@ facts {
!map1.isEmpty
}
["isNotEmpty"] {
!Map().isNotEmpty
map1.isNotEmpty
}
["containsKey()"] {
map1.containsKey("two")
!Map().containsKey("two")

7
pkl-core/src/test/files/LanguageSnippetTests/input/api/mapping.pkl vendored
View File

@@ -48,6 +48,13 @@ facts {
empty2.isEmpty
}
["isNotEmpty"] {
base.isNotEmpty
derived.isNotEmpty
!empty.isNotEmpty
!empty2.isNotEmpty
}
["containsKey()"] {
base.containsKey("Pigeon")
base.containsKey("Parrot")

5
pkl-core/src/test/files/LanguageSnippetTests/input/api/set.pkl vendored
View File

@@ -12,6 +12,11 @@ facts {
!set1.isEmpty
}
["isNotEmpty"] {
!Set().isNotEmpty
set1.isNotEmpty
}
["every()"] {
set1.every((x) -> x <= 3)
!set1.every((x) -> x > 2)

12
pkl-core/src/test/files/LanguageSnippetTests/input/api/string.pkl vendored
View File

@@ -11,6 +11,11 @@ facts {
!str1.isEmpty
}
["isNotEmpty"] {
!"".isNotEmpty
str1.isNotEmpty
}
["isBlank"] {
"".isBlank
" ".isBlank
@@ -18,6 +23,13 @@ facts {
!str1.isBlank
}
["isNotBlank"] {
!"".isNotBlank
!" ".isNotBlank
!"\t\n\r".isNotBlank
str1.isNotBlank
}
["isBase64"] {
"".isBase64
"AQIDBA==".isBase64

4
pkl-core/src/test/files/LanguageSnippetTests/output/api/list.pcf vendored
View File

@@ -3,6 +3,10 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
}
["every()"] {
true
true

8
pkl-core/src/test/files/LanguageSnippetTests/output/api/listing.pcf vendored
View File

@@ -7,6 +7,14 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
true
true
true
true
}
["lastIndex"] {
true
true

4
pkl-core/src/test/files/LanguageSnippetTests/output/api/map.pcf vendored
View File

@@ -3,6 +3,10 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
}
["containsKey()"] {
true
true

6
pkl-core/src/test/files/LanguageSnippetTests/output/api/mapping.pcf vendored
View File

@@ -5,6 +5,12 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
true
true
}
["containsKey()"] {
true
true

100
pkl-core/src/test/files/LanguageSnippetTests/output/api/reflectedDeclaration.pcf vendored
View File

@@ -830,6 +830,30 @@ alias {
name = "isEmpty"
allModifiers = Set()
allAnnotations = List()
}, "isNotEmpty", new {
location {
line = XXXX
column = 3
displayUri = "https://github.com/apple/pkl/blob/$commitId/stdlib/base.pkl#LXXXX"
}
docComment = """
Tells whether this string is not empty.
Facts:
```
!"".isNotEmpty
"abc".isNotEmpty
```
"""
annotations = List(new {
version = "0.31.0"
})
modifiers = Set()
name = "isNotEmpty"
allModifiers = Set()
allAnnotations = List(new {
version = "0.31.0"
})
}, "isBlank", new {
location {
line = XXXX
@@ -852,6 +876,32 @@ alias {
name = "isBlank"
allModifiers = Set()
allAnnotations = List()
}, "isNotBlank", new {
location {
line = XXXX
column = 3
displayUri = "https://github.com/apple/pkl/blob/$commitId/stdlib/base.pkl#LXXXX"
}
docComment = """
Tells if at least one character is not Unicode "White_Space".
Facts:
```
!"".isNotBlank
!" ".isNotBlank
"\\t\\n\\r".isNotBlank
"abc".isNotBlank
```
"""
annotations = List(new {
version = "0.31.0"
})
modifiers = Set()
name = "isNotBlank"
allModifiers = Set()
allAnnotations = List(new {
version = "0.31.0"
})
}, "isRegex", new {
location {
line = XXXX
@@ -1124,6 +1174,30 @@ alias {
name = "isEmpty"
allModifiers = Set()
allAnnotations = List()
}, "isNotEmpty", new {
location {
line = XXXX
column = 3
displayUri = "https://github.com/apple/pkl/blob/$commitId/stdlib/base.pkl#LXXXX"
}
docComment = """
Tells whether this string is not empty.
Facts:
```
!"".isNotEmpty
"abc".isNotEmpty
```
"""
annotations = List(new {
version = "0.31.0"
})
modifiers = Set()
name = "isNotEmpty"
allModifiers = Set()
allAnnotations = List(new {
version = "0.31.0"
})
}, "isBlank", new {
location {
line = XXXX
@@ -1146,6 +1220,32 @@ alias {
name = "isBlank"
allModifiers = Set()
allAnnotations = List()
}, "isNotBlank", new {
location {
line = XXXX
column = 3
displayUri = "https://github.com/apple/pkl/blob/$commitId/stdlib/base.pkl#LXXXX"
}
docComment = """
Tells if at least one character is not Unicode "White_Space".
Facts:
```
!"".isNotBlank
!" ".isNotBlank
"\\t\\n\\r".isNotBlank
"abc".isNotBlank
```
"""
annotations = List(new {
version = "0.31.0"
})
modifiers = Set()
name = "isNotBlank"
allModifiers = Set()
allAnnotations = List(new {
version = "0.31.0"
})
}, "isRegex", new {
location {
line = XXXX

4
pkl-core/src/test/files/LanguageSnippetTests/output/api/set.pcf vendored
View File

@@ -3,6 +3,10 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
}
["every()"] {
true
true

10
pkl-core/src/test/files/LanguageSnippetTests/output/api/string.pcf vendored
View File

@@ -3,12 +3,22 @@ facts {
true
true
}
["isNotEmpty"] {
true
true
}
["isBlank"] {
true
true
true
true
}
["isNotBlank"] {
true
true
true
true
}
["isBase64"] {
true
true