v1.1.4

New Features

Author: Manered

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'dev.manere.inscript'
-version = '1.1.3'
+version = '1.1.4'
 
 repositories {
     mavenCentral()

src/main/java/dev/manere/inscript/ConfigSection.java

@@ -16,13 +16,20 @@ public interface ConfigSection {
     @NotNull
     @Unmodifiable
     default Set<ConfigNode> getChildren() {
-        return Set.copyOf(getSection().getChildren());
+        return new LinkedHashSet<>(getSection().getChildren());
+    }
+
+    @NotNull
+    @CanIgnoreReturnValue
+    default ConfigSection copy(final @NotNull ConfigSection other) {
+        getSection().getChildren().addAll(other.getChildren());
+        return this;
     }
 
     @NotNull
     @Unmodifiable
     default Set<String> getKeys() {
-        final Set<String> keys = new HashSet<>();
+        final Set<String> keys = new LinkedHashSet<>();
 
         for (final ConfigNode node : getChildren()) {
             keys.add(node.getKey());

src/main/java/dev/manere/inscript/ErrorContext.java

@@ -0,0 +1,62 @@
+package dev.manere.inscript;
+
+import dev.manere.inscript.format.Line;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class ErrorContext {
+    private final Inscript inscript;
+    private final int position;
+    private final String line;
+    private final String error;
+
+    public ErrorContext(final @NotNull Inscript inscript, final int position, final @NotNull String line, final @NotNull String error) {
+        this.inscript = inscript;
+        this.position = position;
+        this.line = line;
+        this.error = error;
+    }
+
+    @NotNull
+    public static ErrorContext create(final @NotNull Line line, final @NotNull Inscript inscript, final @NotNull String error) {
+        return new ErrorContext(inscript, line.getPosition() + 1, line.getText(), error);
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    @NotNull
+    public String getLine() {
+        return line;
+    }
+
+    @NotNull
+    public String getError() {
+        return error;
+    }
+
+    @NotNull
+    public String buildDefault() {
+        if (inscript.getPath().isPresent()) {
+            final Path path = inscript.getPath().get();
+            final String name = path.getFileName().toString();
+
+            return String.join("\n", List.of(
+                "Failed to parse " + name + ":" + position,
+                " " + error + ": " + line
+            ));
+        } else {
+            return String.join("\n", List.of(
+                "Failed to parse line " + position,
+                " " + error + ": " + line
+            ));
+        }
+    }
+
+    public void handle() {
+        InscriptConstants.ERROR_HANDLER.getValue().accept(this);
+    }
+}

src/main/java/dev/manere/inscript/Inscript.java

@@ -3,6 +3,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import dev.manere.inscript.format.FileFormat;
 import dev.manere.inscript.format.FileFormats;
+import dev.manere.inscript.format.InscriptReader;
 import dev.manere.inscript.node.RootSectionNode;
 import dev.manere.inscript.value.ValueRegistry;
 import org.jetbrains.annotations.NotNull;
@@ -111,17 +112,27 @@ public void loadFromDisk() {
 
         try (final BufferedReader reader = Files.newBufferedReader(getPath().get())) {
             root.reset();
-            format.load(reader, root);
+
+            final List<ErrorContext> errors = format.load(InscriptReader.reader(reader.lines().toList()), this);
+
+            for (final ErrorContext error : errors) {
+                error.handle();
+            }
         } catch (final Exception e) {
             throw new InscriptException(e);
         }
     }
 
     public void loadFromString(final @NotNull String configString) {
-        try (final BufferedReader reader = new BufferedReader(new StringReader(configString))) {
+        try {
             root.reset();
-            format.load(reader, root);
-        } catch (Exception e) {
+
+            final List<ErrorContext> errors = format.load(InscriptReader.reader(configString.lines().toList()), this);
+
+            for (final ErrorContext error : errors) {
+                error.handle();
+            }
+        } catch (final Exception e) {
             throw new InscriptException(e);
         }
     }

src/main/java/dev/manere/inscript/InscriptConstant.java

@@ -12,7 +12,7 @@ public InscriptConstant(final @NotNull T value) {
 
     @NotNull
     @CanIgnoreReturnValue
-    public InscriptConstant<T> value(final @NotNull T value) {
+    public InscriptConstant<T> edit(final @NotNull T value) {
         this.value = value;
         return this;
     }

src/main/java/dev/manere/inscript/InscriptConstants.java

@@ -3,6 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -16,4 +17,7 @@ public interface InscriptConstants {
 
     @NotNull
     InscriptConstant<Supplier<Optional<String>>> VERSION = new InscriptConstant<>(() -> Optional.ofNullable(InscriptConstants.class.getPackage().getImplementationVersion()));
+
+    @NotNull
+    InscriptConstant<Consumer<ErrorContext>> ERROR_HANDLER = new InscriptConstant<>(context -> System.err.println(context.buildDefault()));
 }

src/main/java/dev/manere/inscript/SimpleConfigSection.java

@@ -31,7 +31,7 @@ public record SimpleConfigSection(@NotNull SectionNode sectionNode) implements C
         if (sectionFound.isPresent()) return sectionFound.get();
 
         final SectionNode created = new SectionNode() {
-            private final Set<ConfigNode> nodes = Collections.newSetFromMap(new ConcurrentHashMap<>());
+            private final Set<ConfigNode> nodes = new LinkedHashSet<>();
 
             @NotNull
             public Set<ConfigNode> getChildren() {