starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-17 22:19:46 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Allow command transformAll functions to perform imports (#1440)

Browse Source
This commit is contained in:
Jen Basch
2026-02-25 08:03:53 -08:00
committed by GitHub
parent 2e4d73b957
commit be21c34938
7 changed files with 91 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/CommandSpec.java
View File

@@ -89,7 +89,7 @@ public record CommandSpec(
@Nullable String helpText,
boolean showAsRequired,
BiFunction<String, URI, Object> transformEach,
Function<List<Object>, Object> transformAll,
BiFunction<List<Object>, URI, Object> transformAll,
@Nullable CompletionCandidates completionCandidates,
@Nullable String shortName,
String metavar,
@@ -134,7 +134,7 @@ public record CommandSpec(
String name,
@Nullable String helpText,
BiFunction<String, URI, Object> transformEach,
Function<List<Object>, Object> transformAll,
BiFunction<List<Object>, URI, Object> transformAll,
@Nullable CompletionCandidates completionCandidates,
boolean repeated)
implements Option {

22
pkl-core/src/main/java/org/pkl/core/runtime/CommandSpecParser.java
View File

@@ -462,7 +462,7 @@ public final class CommandSpecParser {
private class OptionBehavior {
private @Nullable BiFunction<String, URI, Object> each;
private @Nullable Function<List<Object>, Object> all;
private @Nullable BiFunction<List<Object>, URI, Object> all;
private @Nullable Boolean multiple;
private @Nullable String metavar;
private @Nullable CommandSpec.CompletionCandidates completionCandidates;
@@ -471,7 +471,7 @@ public final class CommandSpecParser {
private OptionBehavior(
@Nullable BiFunction<String, URI, Object> each,
@Nullable Function<List<Object>, Object> all,
@Nullable BiFunction<List<Object>, URI, Object> all,
@Nullable Boolean multiple,
@Nullable String metavar,
@Nullable CommandSpec.CompletionCandidates completionCandidates) {
@@ -493,7 +493,9 @@ public final class CommandSpecParser {
annotation == null
? null
: VmUtils.readMember(annotation, Identifier.TRANSFORM_ALL) instanceof VmFunction func
? (it) -> handleBadValue(() -> func.apply(VmList.create(it)))
? (values, workingDirUri) ->
handleBadValue(
() -> handleImports(func.apply(VmList.create(values)), workingDirUri))
: null,
annotation == null
? null
@@ -533,7 +535,7 @@ public final class CommandSpecParser {
all =
!multiple
? this::allChooseLast
: (values) -> {
: (values, workingDirUri) -> {
if (values.isEmpty()) return null;
var builder = new VmObjectBuilder();
values.forEach(builder::addElement);
@@ -547,7 +549,7 @@ public final class CommandSpecParser {
all =
!multiple
? this::allChooseLast
: (values) -> {
: (values, workingDirUri) -> {
if (values.isEmpty()) return null;
var builder = new VmObjectBuilder();
values.forEach(
@@ -563,7 +565,7 @@ public final class CommandSpecParser {
all =
!multiple
? this::allChooseLast
: (values) -> values.isEmpty() ? null : VmList.create(values);
: (values, workingDirUri) -> values.isEmpty() ? null : VmList.create(values);
} else if (typeNode instanceof TypeNode.SetTypeNode setTypeNode) {
handleElement(setTypeNode.getElementTypeNode(), prop);
if (multiple == null) multiple = true;
@@ -571,7 +573,7 @@ public final class CommandSpecParser {
all =
!multiple
? this::allChooseLast
: (values) -> values.isEmpty() ? null : VmSet.create(values);
: (values, workingDirUri) -> values.isEmpty() ? null : VmSet.create(values);
} else if (typeNode instanceof TypeNode.MapTypeNode mapTypeNode) {
handleEntry(mapTypeNode.getKeyTypeNode(), mapTypeNode.getValueTypeNode(), prop);
if (multiple == null) multiple = true;
@@ -579,7 +581,7 @@ public final class CommandSpecParser {
all =
!multiple
? this::allChooseLast
: (values) -> {
: (values, workingDirUri) -> {
if (values.isEmpty()) return null;
var builder = VmMap.builder();
values.forEach(
@@ -860,7 +862,7 @@ public final class CommandSpecParser {
if (metavar == null) metavar = transformKey.getMetavar() + "=" + transformValue.getMetavar();
}
private @Nullable Object allChooseLast(List<Object> values) {
private @Nullable Object allChooseLast(List<Object> values, URI workingDirUri) {
if (!values.isEmpty()) return values.get(values.size() - 1);
if (isOptional()) return null;
throw new MissingOption();
@@ -898,7 +900,7 @@ public final class CommandSpecParser {
return each;
}
public Function<List<Object>, Object> getAll() {
public BiFunction<List<Object>, URI, Object> getAll() {
assert all != null;
return all;
}