From 50a74171bad57572bb70d78854bff177fbe206a7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 23 Dec 2024 10:45:10 +0000 Subject: Check TOML value types when getting shed.bins --- .../shedlang/compiler/config/ProjectConfig.java | 31 +++++++----- .../config/errors/TomlSyntaxConfigError.java | 11 +--- .../config/errors/UnexpectedTypeConfigError.java | 25 +++++++++ .../shedlang/compiler/config/toml/TomlSource.java | 20 ++++++++ .../compiler/config/toml/TomlTableWithSource.java | 59 ++++++++++++++++++++++ 5 files changed, 124 insertions(+), 22 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java create mode 100644 src/main/java/org/shedlang/compiler/config/toml/TomlSource.java create mode 100644 src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java index 1eacf446..c45725cc 100644 --- a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java +++ b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java @@ -1,11 +1,12 @@ package org.shedlang.compiler.config; import org.shedlang.compiler.config.errors.TomlSyntaxConfigError; +import org.shedlang.compiler.config.toml.TomlTableWithSource; import org.shedlang.compiler.sources.Source; import org.shedlang.compiler.sources.Sources; +import org.shedlang.compiler.util.P; import org.tomlj.Toml; import org.tomlj.TomlParseResult; -import org.tomlj.TomlTable; import java.io.IOException; import java.nio.file.Files; @@ -41,10 +42,10 @@ public record ProjectConfig( throw TomlSyntaxConfigError.fromTomljError(error, source); } - return fromToml(projectPath, result); + return fromToml(projectPath, new TomlTableWithSource(result, P.vector(), source)); } - public static ProjectConfig fromToml(Path root, TomlTable table) { + public static ProjectConfig fromToml(Path root, TomlTableWithSource table) { return new ProjectConfig( root, binsFromToml(table), @@ -53,24 +54,28 @@ public record ProjectConfig( ); } - private static List binsFromToml(TomlTable table) { - var binsArray = table.getArrayOrEmpty(List.of("shed", "bins")); - - return IntStream.range(0, binsArray.size()) - .mapToObj(binIndex -> BinConfig.fromToml(binsArray.getTable(binIndex))) - .toList(); + private static List binsFromToml(TomlTableWithSource table) { + return table + .getTable("shed") + .flatMap(shed -> shed.getArray("bins")) + .map(bins -> + IntStream.range(0, bins.size()) + .mapToObj(binIndex -> BinConfig.fromToml(bins.getTable(binIndex))) + .toList() + ) + .orElseGet(() -> List.of()); } - public static List examplesFromToml(TomlTable table) { - var examplesArray = table.getArrayOrEmpty(List.of("shed", "examples")); + public static List examplesFromToml(TomlTableWithSource table) { + var examplesArray = table.table().getArrayOrEmpty(List.of("shed", "examples")); return IntStream.range(0, examplesArray.size()) .mapToObj(exampleIndex -> ExampleConfig.fromToml(examplesArray.getTable(exampleIndex))) .toList(); } - public static List profilesFromToml(TomlTable table) { - var profilesArray = table.getArrayOrEmpty(List.of("shed", "profiles")); + public static List profilesFromToml(TomlTableWithSource table) { + var profilesArray = table.table().getArrayOrEmpty(List.of("shed", "profiles")); return IntStream.range(0, profilesArray.size()) .mapToObj(profileIndex -> ProfileConfig.fromToml(profilesArray.getTable(profileIndex))) diff --git a/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java b/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java index b4edf660..aa034738 100644 --- a/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java +++ b/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java @@ -1,22 +1,15 @@ package org.shedlang.compiler.config.errors; +import org.shedlang.compiler.config.toml.TomlSource; import org.shedlang.compiler.sources.Source; import org.tomlj.TomlParseError; -import java.util.Arrays; - public class TomlSyntaxConfigError extends ConfigError { public static TomlSyntaxConfigError fromTomljError( TomlParseError error, Source fullSource ) { - var lines = fullSource.contents().split("\n"); - var lineCharacterIndex = Arrays.stream(lines) - .limit(error.position().line() - 1) - .mapToInt(line -> line.length() + 1) - .sum(); - var characterIndex = lineCharacterIndex + error.position().column() - 1; - var source = fullSource.at(characterIndex, characterIndex); + var source = TomlSource.sourceAtTomlPosition(fullSource, error.position()); return new TomlSyntaxConfigError(error.getMessage(), source); } diff --git a/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java b/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java new file mode 100644 index 00000000..4c3ba6c5 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java @@ -0,0 +1,25 @@ +package org.shedlang.compiler.config.errors; + +import org.shedlang.compiler.sources.Source; + +import java.text.MessageFormat; +import java.util.List; + +public class UnexpectedTypeConfigError extends ConfigError { + public UnexpectedTypeConfigError( + List path, + String expectedType, + Class actualType, + Source source + ) { + super( + MessageFormat.format( + "Expected {0} to be {1}, but was {2}", + String.join(".", path), + expectedType, + actualType.getSimpleName() + ), + source + ); + } +} diff --git a/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java b/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java new file mode 100644 index 00000000..e72fbb45 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java @@ -0,0 +1,20 @@ +package org.shedlang.compiler.config.toml; + +import org.shedlang.compiler.sources.Source; +import org.tomlj.TomlPosition; + +import java.util.Arrays; + +public class TomlSource { + private TomlSource() {} + + public static Source sourceAtTomlPosition(Source fullSource, TomlPosition position) { + var lines = fullSource.contents().split("\n"); + var lineCharacterIndex = Arrays.stream(lines) + .limit(position.line() - 1) + .mapToInt(line -> line.length() + 1) + .sum(); + var characterIndex = lineCharacterIndex + position.column() - 1; + return fullSource.at(characterIndex, characterIndex); + } +} diff --git a/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java b/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java new file mode 100644 index 00000000..4fac6f88 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java @@ -0,0 +1,59 @@ +package org.shedlang.compiler.config.toml; + +import org.pcollections.PVector; +import org.shedlang.compiler.config.errors.UnexpectedTypeConfigError; +import org.shedlang.compiler.sources.Source; +import org.tomlj.TomlArray; +import org.tomlj.TomlTable; + +import java.util.Optional; + +public record TomlTableWithSource( + TomlTable table, + PVector path, + Source fullSource +) { + public Optional getTable(String key) { + var value = table.get(key); + var position = table.inputPositionOf(key); + + if (value == null || position == null) { + return Optional.empty(); + } + + if (value instanceof TomlTable valueTable) { + return Optional.of(new TomlTableWithSource( + valueTable, + path.plus(key), + fullSource + )); + } + + throw new UnexpectedTypeConfigError( + path.plus(key), + "a table", + value.getClass(), + TomlSource.sourceAtTomlPosition(fullSource, position) + ); + } + + public Optional getArray(String key) { + var value = table.get(key); + var position = table.inputPositionOf(key); + + if (value == null || position == null) { + return Optional.empty(); + } + + if (value instanceof TomlArray valueArray) { + return Optional.of(valueArray); + } + + throw new UnexpectedTypeConfigError( + path.plus(key), + "an array", + value.getClass(), + TomlSource.sourceAtTomlPosition(fullSource, position) + ); + } +} -- cgit v1.2.3