Skip to content

Add traceMode support to PklEvaluatorSettings #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
Merged

Add traceMode support to PklEvaluatorSettings #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/PklSwift/EvaluatorOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ extension EvaluatorOptions {
}
options.externalModuleReaders = evaluatorSettings.externalModuleReaders ?? options.externalModuleReaders
options.externalResourceReaders = evaluatorSettings.externalResourceReaders ?? options.externalResourceReaders
options.traceMode = evaluatorSettings.traceMode ?? options.traceMode
return options
}

Expand Down
3 changes: 3 additions & 0 deletions Sources/PklSwift/PklEvaluatorSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public struct PklEvaluatorSettings: Decodable, Hashable, Sendable {
///
/// Added in Pkl 0.27
let color: PklEvaluatorSettingsColor?

/// Added in Pkl 0.30
let traceMode: TraceMode?
}

public enum PklEvaluatorSettingsColor: String, CaseIterable, Decodable, Hashable, Sendable {
Expand Down
9 changes: 7 additions & 2 deletions Tests/PklSwiftTests/ProjectTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class ProjectTest: XCTestCase {
}
"""
let colorSetting = version < pklVersion0_27 ? "" : #"color = "always""#
let traceModeSetting = version < pklVersion0_30 ? "" : #"traceMode = "pretty""#
let httpExpectation = version < pklVersion0_26 ? nil : Http(
caCertificates: nil,
proxy: .init(address: "http://localhost:1", noProxy: ["example.com", "foo.bar.org"])
Expand All @@ -86,6 +87,7 @@ class ProjectTest: XCTestCase {
"scheme4": ExternalReader(executable: "reader4", arguments: ["with", "args"]),
]
let color: PklEvaluatorSettingsColor? = version < pklVersion0_27 ? nil : .always
let traceMode: TraceMode? = version < pklVersion0_30 ? nil : .pretty
try #"""
amends "pkl:Project"

Expand Down Expand Up @@ -133,6 +135,7 @@ class ProjectTest: XCTestCase {
\#(externalReaderSettings)
\#(httpSetting)
\#(colorSetting)
\#(traceModeSetting)
}

dependencies {
Expand Down Expand Up @@ -160,7 +163,8 @@ class ProjectTest: XCTestCase {
http: httpExpectation,
externalModuleReaders: externalModuleReadersExpectation,
externalResourceReaders: externalResourceReadersExpectation,
color: color
color: color,
traceMode: traceMode
)
let expectedPackage = PklSwift.Project.Package(
name: "hawk",
Expand Down Expand Up @@ -218,7 +222,8 @@ class ProjectTest: XCTestCase {
http: nil,
externalModuleReaders: nil,
externalResourceReaders: nil,
color: nil
color: nil,
traceMode: nil
),
projectFileUri: "\(otherProjectFile)",
tests: [],
Expand Down