starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-06-14 09:34:37 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Change loading of external readers (#1394)

Browse Source 
This introduces breaking changes for external readers are loaded:

1. In PklProject, relative paths are resolved relative to the enclosing
PklProject file (make behavior consistent with how other settings work)
2. Make CLI flags blow away any settings set on a PklProject
3. Introduce a new `workingDir` property, which defaults to the
PklProject dir

The overall goal is to make this behavior consistent with how other
settings work.
For example, relative paths for other evaluator settings are already
relative to the project directory.
Additionally, in every other case, CLI flags will overwrite any setting
set within PklProject.
This commit is contained in:
Daniel Chao
2026-06-02 11:02:52 -07:00
committed by GitHub
parent c9f3823952
commit 035ef0a789
51 changed files with 1880 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stdlib/Project.pkl
+16 -6
View File
@@ -191,23 +191,32 @@ local isFileBasedProject = projectFileUri.startsWith("file:")
/// Evaluator settings do not get published as part of a package.
/// It is not possible for a package dependency to influence the evaluator settings of a project.
///
/// The following values can only be set if this is a file-based project.
/// The following values can only be set if this is a file-based project:
///
/// - [modulePath][EvaluatorSettings.modulePath]
/// - [rootDir][EvaluatorSettings.rootDir]
/// - [moduleCacheDir][EvaluatorSettings.moduleCacheDir]
///
/// For each of these, relative paths are resolved against the project's enclosing directory.
/// - [externalModuleReaders][EvaluatorSettings.externalModuleReaders]
/// - [externalResourceReaders][EvaluatorSettings.externalResourceReaders]
evaluatorSettings: EvaluatorSettingsModule(
(modulePath != null).implies(isFileBasedProject),
(rootDir != null).implies(isFileBasedProject),
(moduleCacheDir != null).implies(isFileBasedProject),
(externalModuleReaders != null).implies(isFileBasedProject),
(externalResourceReaders != null).implies(isFileBasedProject),
)
/// The [evaluatorSettings] resolved against the project dir.
@Since { version = "0.32.0" }
fixed resolvedEvaluatorSettings: EvaluatorSettingsModule = evaluatorSettings.resolve(projectFileUri)
/// The URI of the PklProject file.
///
/// This value is used to resolve relative paths when importing another local project as a
/// dependency.
/// This value is used to:
///
/// * Resolve relative paths when importing another local project as a
/// dependency.
/// * Resolve relative paths declared within [evaluatorSettings].
projectFileUri: String = reflect.Module(module).uri
/// Instantiates a project definition within the enclosing module.
@@ -229,7 +238,8 @@ local const hasVersion = (it: Uri) ->
if (versionSep == -1)
false
else
let (version = it.drop(versionSep + 1)) semver.parseOrNull(version) != null
let (version = it.drop(versionSep + 1))
semver.parseOrNull(version) != null
typealias PackageUri = Uri(startsWith("package:"), hasVersion)