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

Fix spelling errors (#846)

Browse Source 
Also: change checksums due to filename and content changes, and fix language snippet test output to produce correct error messages
This commit is contained in:
Josh Soref
2024-12-23 15:49:56 -05:00
committed by GitHub
parent a014e8d1d1
commit d9c65d484a
53 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkl-core/src/main/java/org/pkl/core/Evaluator.java
View File

@@ -170,7 +170,7 @@ public interface Evaluator extends AutoCloseable {
String evaluateExpressionString(ModuleSource moduleSource, String expression);
/**
* Evalautes the module's schema, which describes the properties, methods, and classes of a
* Evaluates the module's schema, which describes the properties, methods, and classes of a
* module.
*
* @throws PklException if an error occurs during evaluation

2
pkl-core/src/main/java/org/pkl/core/NoSuchPropertyException.java
View File

@@ -16,7 +16,7 @@
package org.pkl.core;
/**
* Indicates that a non-existent property was requested for a {@link Composite}. To check if a
* Indicates that a nonexistent property was requested for a {@link Composite}. To check if a
* property exists, use {@link Composite#hasProperty(String)}.
*/
public final class NoSuchPropertyException extends RuntimeException {

2
pkl-core/src/main/java/org/pkl/core/ast/member/ClassNode.java
View File

@@ -106,7 +106,7 @@ public final class ClassNode extends ExpressionNode {
new VmTyped(
frame.materialize(),
null, // initialized later by VmClass
null, // initialized later by Vmclass
null, // initialized later by VmClass
prototypeMembers);
}

2
pkl-core/src/main/java/org/pkl/core/ast/type/TypeNode.java
View File

@@ -114,7 +114,7 @@ public abstract class TypeNode extends PklNode {
}
/**
* Visit child type nodes; but not paramaterized types (does not visit {@code String} in {@code
* Visit child type nodes; but not parameterized types (does not visit {@code String} in {@code
* Listing<String>}).
*/
protected abstract boolean acceptTypeNode(TypeNodeConsumer consumer);

2
pkl-core/src/main/java/org/pkl/core/module/ModuleKeys.java
View File

@@ -534,7 +534,7 @@ public final class ModuleKeys {
conn.connect();
if (conn instanceof JarURLConnection && IoUtils.isWindows()) {
// On Windows, opening a JarURLConnection prevents the jar file from being deleted, unless
// cacheing is disabled.
// caching is disabled.
// See https://bugs.openjdk.org/browse/JDK-8239054
conn.setUseCaches(false);
}

2
pkl-core/src/main/java/org/pkl/core/packages/PackageResolvers.java
View File

@@ -333,7 +333,7 @@ final class PackageResolvers {
throw fileIsADirectory();
}
var entries = cachedEntries.get(packageUri);
// need to normalize here but not in `doListElments` nor `doHasElement` because
// need to normalize here but not in `doListElements` nor `doHasElement` because
// `TreePathElement.getElement` does normalization already.
var path = IoUtils.toNormalizedPathString(Path.of(uri.getAssetPath()).normalize());
return entries.get(path).array();

2
pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java
View File

@@ -434,7 +434,7 @@ public final class GlobResolver {
}
}
/** Split a glob pattern into the base, non-wildard parts, and the wildcard parts. */
/** Split a glob pattern into the base, non-wildcard parts, and the wildcard parts. */
private static Pair<String, String[]> splitGlobPatternIntoBaseAndWildcards(
ReaderBase reader, String globPattern, boolean hasAbsoluteGlob) {
var effectiveGlobPattern = globPattern;

8
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java
View File

@@ -483,8 +483,8 @@ public final class IoUtils {
start++;
}
var uriPartsRemaining = uriParts.subList(start, uriParts.size());
var basePartsRemainig = baseParts.subList(start, baseParts.size());
if (basePartsRemainig.isEmpty()) {
var basePartsRemaining = baseParts.subList(start, baseParts.size());
if (basePartsRemaining.isEmpty()) {
return new URI(
null,
null,
@@ -495,7 +495,7 @@ public final class IoUtils {
uri.getFragment());
}
var resultingPath =
"../".repeat(basePartsRemainig.size()) + String.join("/", uriPartsRemaining);
"../".repeat(basePartsRemaining.size()) + String.join("/", uriPartsRemaining);
return new URI(null, null, null, -1, resultingPath, uri.getQuery(), uri.getFragment());
} catch (URISyntaxException e) {
// Impossible; started from a valid URI to begin with.
@@ -716,7 +716,7 @@ public final class IoUtils {
* URI#resolve(URI)}
*/
public static URI fixTripleSlashUri(URI baseUri, URI newUri) {
// `getHost()` is erroroneously `null` when parsing triple-slash URIs.
// `getHost()` is erroneously `null` when parsing triple-slash URIs.
// Ensure that they are preserved during resolution.
if (baseUri.getScheme() != null
&& baseUri.getScheme().equalsIgnoreCase(newUri.getScheme())

2
pkl-core/src/main/java/org/pkl/core/util/json/Json.java
View File

@@ -32,7 +32,7 @@ import org.pkl.core.util.Nullable;
/**
* Parser for JSON.
*
* <p>JSON types are paresd into the following Java types:
* <p>JSON types are parsed into the following Java types:
*
* <table>
* <thead>

6
pkl-core/src/main/resources/org/pkl/core/errorMessages.properties
View File

@@ -675,7 +675,7 @@ invalidGlobInvalidCharacterInCharacterClass=\
The character `{0}` is not valid in a character class.
invalidGlobExtGlob=\
Extebded globbing features are not supported.
Extended globbing features are not supported.
invalidGlobNestedSubpattern=\
Sub-patterns cannot be nested. To fix, remove or escape the inner `{` character.
@@ -750,7 +750,7 @@ Failed to resolve type required for rendering protobuf.\n\
Consider adding a type annotation.
cannotRenderSubtypeForProtobuf=\
Can not render subtype {0} of specified type {1} in protobuf.
Cannot render subtype {0} of specified type {1} in protobuf.
cannotExportValue=\
A value of type `{0}` cannot be exported.
@@ -1079,7 +1079,7 @@ Certificates can only be loaded from `jar:` or `file:` URLs, but got:\n\
cannotFindBuiltInCertificates=\
Cannot find Pkl's trusted CA certificates on the class path.\n\
To fix this problem, add dependendy `org.pkl:pkl-certs`.
To fix this problem, add dependency `org.pkl:pkl-certs`.
# suppress inspection "HttpUrlsUsage"
malformedProxyAddress=\

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

@@ -15,21 +15,21 @@ parrot {
new {
// multiline string that is a property within an element
lastName = """
Flinstone
Flintstone
Flinstone
Flintstone
"""
"""
Flinstone
Flintstone
Flinstone
Flintstone
"""
}
// multiline string that is an element
"""
Flistone
Flintstone
Flistone
Flintstone
"""
}

2
pkl-core/src/test/files/LanguageSnippetTests/input/classes/class3.pkl vendored
View File

@@ -8,5 +8,5 @@ class Person {
person = new Person {
name = "Pigeon"
// typo
adress = "Howdy St."
address_ = "Howdy St."
}

6
pkl-core/src/test/files/LanguageSnippetTests/input/listings/listing5.pkl vendored
View File

@@ -26,14 +26,14 @@ examples {
module.catch(() -> l[0])
}
["type check: local paramaterized property type, unparamaterized new with explicit parent"] {
["type check: local parameterized property type, unparameterized new with explicit parent"] {
local m: Listing<String> = new Listing {
1
}
module.catch(() -> m[0])
}
["type check: local unparameterized property type, paramaterized new with explicit parent"] {
["type check: local unparameterized property type, parameterized new with explicit parent"] {
local m: Listing = new Listing<String> {
1
}
@@ -105,7 +105,7 @@ examples {
"Ba" // fails `length.isOdd`
"bar" // fails `this == capitalize()`
}
// type check String(length.isOdd) should be propagated to the listing via a paramater type
// type check String(length.isOdd) should be propagated to the listing via a parameter type
// annotation
local function func1(listing: Listing<String(length.isOdd)>) = listing
// type check String(length.isOdd) should be propagated to the listing via a return type

2
pkl-core/src/test/files/LanguageSnippetTests/input/listings/typeCheck.pkl vendored
View File

@@ -35,7 +35,7 @@ local x7 = new Listing {
}
local x8 = new Listing<String> {
throw("element unneccessarily evaluated")
throw("element unnecessarily evaluated")
}
res5 = x4.length == 1

2
pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead8.error.pkl vendored
View File

@@ -1 +1 @@
res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl")
res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyRead.pkl")

2
pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead9.error.pkl vendored
View File

@@ -1 +1 @@
res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl")
res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathRead.pkl")

6
pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages1.pkl vendored
View File

@@ -13,14 +13,14 @@ examples {
}
}
import("package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl")
import("package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl")
import("package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl")
}
["importing while specifying checksum"] {
import("package://localhost:0/birds@0.5.0::sha256:bfaf5281613d170a740505cc87561041f4e0cad1f0e6938bf94f7609f9a4673d#/catalog/Swallow.pkl")
import("package://localhost:0/birds@0.5.0::sha256:6f18af649b47986530cd6dc39abe17888db2701bc5381c385fb86a32fda2685e#/catalog/Swallow.pkl")
}
["reads"] {
read("package://localhost:0/birds@0.5.0#/Bird.pkl")
read("package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl")
read("package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl")
read("package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl")
}
}

2
pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages2.pkl vendored
View File

@@ -20,6 +20,6 @@ examples {
import("package://localhost:0/birds@0.5.0#/allFruit.pkl").fruitFiles
}
["glob import while specifying checksum"] {
import*("package://localhost:0/birds@0.5.0::sha256:bfaf5281613d170a740505cc87561041f4e0cad1f0e6938bf94f7609f9a4673d#/catalog/*.pkl")
import*("package://localhost:0/birds@0.5.0::sha256:6f18af649b47986530cd6dc39abe17888db2701bc5381c385fb86a32fda2685e#/catalog/*.pkl")
}
}

4
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/basic.pkl vendored
View File

@@ -1,11 +1,11 @@
amends ".../snippetTest.pkl"
import "@birds/catalog/Ostritch.pkl"
import "@birds/catalog/Ostrich.pkl"
import "@birds/catalog/Swallow.pkl"
examples {
["import package"] {
Ostritch
Ostrich
Swallow
}

12
pkl-core/src/test/files/LanguageSnippetTests/output/api/pcfRenderer1.pcf vendored
View File

@@ -11,19 +11,19 @@ barnOwl {
parrot {
new {
lastName = """
Flinstone
Flintstone
Flinstone
Flintstone
"""
"""
Flinstone
Flintstone
Flinstone
Flintstone
"""
}
"""
Flistone
Flintstone
Flistone
Flintstone
"""
}

2
pkl-core/src/test/files/LanguageSnippetTests/output/api/protobuf.pcf vendored
View File

@@ -199,7 +199,7 @@ examples {
foo: "renders"
}
"""
"Can not render subtype protobuf#Foo of specified type protobuf#Bar in protobuf."
"Cannot render subtype protobuf#Foo of specified type protobuf#Bar in protobuf."
"""
myFoo: {
foo: "renders"

10
pkl-core/src/test/files/LanguageSnippetTests/output/basic/importGlob.pcf vendored
View File

@@ -84,8 +84,8 @@ examples {
}
["package"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
name = "Ostritch"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -101,7 +101,7 @@ examples {
"package://localhost:0/birds@0.5.0#/Bird.pkl"
"package://localhost:0/birds@0.5.0#/allFruit.pkl"
"package://localhost:0/birds@0.5.0#/catalog.pkl"
"package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
"package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
"package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
"package://localhost:0/birds@0.5.0#/some/dir/Bird.pkl"
}
@@ -116,8 +116,8 @@ examples {
}
["package glob and up one level"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/../catalog/Ostritch.pkl"] {
name = "Ostritch"
["package://localhost:0/birds@0.5.0#/catalog/../catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}

8
pkl-core/src/test/files/LanguageSnippetTests/output/basic/readGlob.pcf vendored
View File

@@ -156,19 +156,19 @@ examples {
"""
base64 = "bW9kdWxlIGJpcmRzLmNhdGFsb2cKCmNhdGFsb2cgPSBpbXBvcnQqKCJjYXRhbG9nLyoucGtsIikKY2F0YWxvZ0ZpbGVzID0gcmVhZCooImNhdGFsb2cvKi5wa2wiKQo="
}
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"

6
pkl-core/src/test/files/LanguageSnippetTests/output/classes/class3.err vendored
View File

@@ -1,8 +1,8 @@
–– Pkl Error ––
Cannot find property `adress` in object of type `class3#Person`.
Cannot find property `address_` in object of type `class3#Person`.
xx | adress = "Howdy St."
^^^^^^
xx | address_ = "Howdy St."
^^^^^^^^
at class3#person (file:///$snippetsDir/input/classes/class3.pkl)
Did you mean any of the following?

4
pkl-core/src/test/files/LanguageSnippetTests/output/listings/listing5.pcf vendored
View File

@@ -10,10 +10,10 @@ examples {
["type check: local new with inferred parent"] {
"Expected value of type `String`, but got type `Int`. Value: 1"
}
["type check: local paramaterized property type, unparamaterized new with explicit parent"] {
["type check: local parameterized property type, unparameterized new with explicit parent"] {
"Expected value of type `String`, but got type `Int`. Value: 1"
}
["type check: local unparameterized property type, paramaterized new with explicit parent"] {
["type check: local unparameterized property type, parameterized new with explicit parent"] {
"Expected value of type `String`, but got type `Int`. Value: 1"
}
["amending listings does not require type checks on amending object members"] {

8
pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead8.err vendored
View File

@@ -1,9 +1,9 @@
–– Pkl Error ––
Cannot find module `package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl`.
Cannot find dependency named `notapackage`, because it was not declared in package `package://localhost:0/badImportsWithinPackage@1.0.0`.
x | res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
at badRead8.error#res (file:///$snippetsDir/input/packages/badRead8.error.pkl)
x | res = read("@notapackage/Foo.txt")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
at unknownDependencyRead#res (package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyRead.pkl)
xxx | text = renderer.renderDocument(value)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

8
pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead9.err vendored
View File

@@ -1,9 +1,9 @@
–– Pkl Error ––
Cannot find module `package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl`.
I/O error reading resource `package://localhost:0/badImportsWithinPackage@1.0.0#/not/a/valid/path.txt`.
x | res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
at badRead9.error#res (file:///$snippetsDir/input/packages/badRead9.error.pkl)
x | res = read("not/a/valid/path.txt")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
at invalidPathRead#res (package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathRead.pkl)
xxx | text = renderer.renderDocument(value)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

8
pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages1.pcf vendored
View File

@@ -13,7 +13,7 @@ examples {
}
}
new {
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -57,18 +57,18 @@ examples {
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCmltcG9ydCAiQGZydWl0aWVzL2NhdGFsb2cvYXBwbGUucGtsIgoKbmFtZSA9ICJTd2FsbG93IgoKZmF2b3JpdGVGcnVpdCA9IGFwcGxlCg=="
}
new {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
}
}

30
pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages2.pcf vendored
View File

@@ -1,8 +1,8 @@
examples {
["glob import"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
name = "Ostritch"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -17,8 +17,8 @@ examples {
}
["glob import within package"] {
new {
["catalog/Ostritch.pkl"] {
name = "Ostritch"
["catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -40,19 +40,19 @@ examples {
}
["glob read"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
@@ -72,19 +72,19 @@ examples {
}
["glob read within package"] {
new {
["catalog/Ostritch.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["catalog/Ostrich.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["catalog/Swallow.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
@@ -118,13 +118,13 @@ examples {
}
["glob import while specifying checksum"] {
new {
["package://localhost:0/birds@0.5.0::sha256:bfaf5281613d170a740505cc87561041f4e0cad1f0e6938bf94f7609f9a4673d#/catalog/Ostritch.pkl"] {
name = "Ostritch"
["package://localhost:0/birds@0.5.0::sha256:6f18af649b47986530cd6dc39abe17888db2701bc5381c385fb86a32fda2685e#/catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
}
["package://localhost:0/birds@0.5.0::sha256:bfaf5281613d170a740505cc87561041f4e0cad1f0e6938bf94f7609f9a4673d#/catalog/Swallow.pkl"] {
["package://localhost:0/birds@0.5.0::sha256:6f18af649b47986530cd6dc39abe17888db2701bc5381c385fb86a32fda2685e#/catalog/Swallow.pkl"] {
name = "Swallow"
favoriteFruit {
name = "Apple"

6
pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/basic.pcf vendored
View File

@@ -16,7 +16,7 @@ facts {
examples {
["import package"] {
new {
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -40,11 +40,11 @@ examples {
new {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog"
text = """
Ostritch.pkl
Ostrich.pkl
Swallow.pkl
"""
base64 = "T3N0cml0Y2gucGtsClN3YWxsb3cucGtsCg=="
base64 = "T3N0cmljaC5wa2wKU3dhbGxvdy5wa2wK"
}
new {
uri = "projectpackage://localhost:0/birds@0.5.0#/"

44
pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/globbing.pcf vendored
View File

@@ -1,8 +1,8 @@
examples {
["glob-import within package"] {
new {
["catalog/Ostritch.pkl"] {
name = "Ostritch"
["catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -17,8 +17,8 @@ examples {
}
["glob-import absolute package uri"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
name = "Ostritch"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
@@ -44,25 +44,25 @@ examples {
}
}
["glob-import using dependency notation"] {
Set("@birds/catalog/Ostritch.pkl", "@birds/catalog/Swallow.pkl")
Set("@birds/catalog/Ostrich.pkl", "@birds/catalog/Swallow.pkl")
Set("@birds/Bird.pkl", "@birds/allFruit.pkl", "@birds/catalog.pkl")
Set("@birds/Bird.pkl", "@birds/allFruit.pkl", "@birds/catalog.pkl", "@birds/catalog/Ostritch.pkl", "@birds/catalog/Swallow.pkl", "@birds/some/dir/Bird.pkl")
Set("@birds/Bird.pkl", "@birds/allFruit.pkl", "@birds/catalog.pkl", "@birds/catalog/Ostrich.pkl", "@birds/catalog/Swallow.pkl", "@birds/some/dir/Bird.pkl")
}
["glob-read using dependency notation"] {
new {
["@birds/catalog/Ostritch.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["@birds/catalog/Ostrich.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["@birds/catalog/Swallow.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
@@ -154,19 +154,19 @@ examples {
"""
base64 = "bW9kdWxlIGJpcmRzLmNhdGFsb2cKCmNhdGFsb2cgPSBpbXBvcnQqKCJjYXRhbG9nLyoucGtsIikKY2F0YWxvZ0ZpbGVzID0gcmVhZCooImNhdGFsb2cvKi5wa2wiKQo="
}
["@birds/catalog/Ostritch.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["@birds/catalog/Ostrich.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["@birds/catalog/Swallow.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
@@ -200,19 +200,19 @@ examples {
}
["glob-read within package"] {
new {
["catalog/Ostritch.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["catalog/Ostrich.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["catalog/Swallow.pkl"] {
uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"
@@ -232,19 +232,19 @@ examples {
}
["glob-read absolute package uri"] {
new {
["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"
["package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Ostrich.pkl"
text = """
amends "../Bird.pkl"
name = "Ostritch"
name = "Ostrich"
favoriteFruit {
name = "Orange"
}
"""
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo="
base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cmljaCIKCmZhdm9yaXRlRnJ1aXQgewogIG5hbWUgPSAiT3JhbmdlIgp9Cg=="
}
["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] {
uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"

2
pkl-core/src/test/kotlin/org/pkl/core/EvaluatorTest.kt
View File

@@ -407,7 +407,7 @@ class EvaluatorTest {
.trimIndent()
} else
"""
birds = import("@birds/catalog/Ostritch.pkl")
birds = import("@birds/catalog/Ostrich.pkl")
"""
.trimIndent()

2
pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt
View File

@@ -152,7 +152,7 @@ class PackageResolversTest {
assertThat(elements)
.isEqualTo(
setOf(
PathElement("Ostritch.pkl", false),
PathElement("Ostrich.pkl", false),
PathElement("Swallow.pkl", false),
)
)