More CLI external features

Author: ComputerDaddyGuy

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/RecordUtils.java

@@ -25,17 +25,15 @@ public static String toTextBlock(@Nullable Record rec) {
 		return String.join(System.lineSeparator(), lines);
 	}
 
-	private static void toTextBlock(List<String> lines, String shift, @Nullable String attrName, Object value, String indent) {
+	private static void toTextBlock(List<String> lines, String shift, @Nullable String attrName, @Nullable Object value, String indent) {
 		if (value == null) {
-			return;
-		}
-		var nested = value.getClass();
-		if (nested.isRecord()) {
+			return; // do not print null objects, just ignore them
+		} else if (value.getClass().isRecord()) {
 			toTextBlockRecord(lines, shift, attrName, (Record) value, indent);
 		} else if (value instanceof Collection<?> coll) {
 			toTextBlockCollection(lines, shift, attrName, coll, indent);
 		} else {
-			lines.add(String.format("%s%s = %s", shift, attrName, value));
+			lines.add(String.format("%s%s: %s", shift, attrName, toSingleValue(value)));
 		}
 	}
 
@@ -63,7 +61,7 @@ private static void toTextBlockCollection(List<String> lines, String shift, @Nul
 		if (attrName == null) {
 			lines.add(String.format("%s[", shift));
 		} else {
-			lines.add(String.format("%s%s = [", shift, attrName));
+			lines.add(String.format("%s%s: [", shift, attrName));
 		}
 		int i = 0;
 		for (var item : coll) {
@@ -73,4 +71,11 @@ private static void toTextBlockCollection(List<String> lines, String shift, @Nul
 		lines.add(String.format("%s]", shift));
 	}
 
+	private static String toSingleValue(Object value) {
+		if (value instanceof String str) {
+			return String.format("\"%s\"", str);
+		}
+		return String.format("%s", value);
+	}
+
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/exception/ExternalOptionsException.java

@@ -2,22 +2,25 @@
 
 import java.nio.file.Path;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @NullMarked
 public class ExternalOptionsException extends RuntimeException {
 
+	@Nullable
 	private final transient Path optionsPath;
 
-	public ExternalOptionsException(Path optionsPath, String message, Throwable cause) {
+	public ExternalOptionsException(@Nullable Path optionsPath, String message, Throwable cause) {
 		super(message, cause);
 		this.optionsPath = optionsPath;
 	}
 
-	public ExternalOptionsException(Path optionsPath, String message) {
+	public ExternalOptionsException(@Nullable Path optionsPath, String message) {
 		super(message);
 		this.optionsPath = optionsPath;
 	}
 
+	@Nullable
 	public Path getOptionsPath() {
 		return optionsPath;
 	}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/mapper/DefaultExternalOptionsMapper.java

@@ -4,6 +4,7 @@
 import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model.ExternalOptions;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model.Matcher;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.ChildLimits;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.LineExtensions;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PathMatchers;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PrettyPrintOptions;
 import java.nio.file.Path;
@@ -15,7 +16,11 @@ class DefaultExternalOptionsMapper implements ExternalOptionsMapper {
 	public PrettyPrintOptions mapToOptions(Path targetPath, ExternalOptions externalOptions) {
 		var options = PrettyPrintOptions.createDefault();
 		options = mapEmojis(options, externalOptions);
+		options = mapCompactDirectories(options, externalOptions);
+		options = mapMaxDepth(options, externalOptions);
 		options = mapChildLimit(options, externalOptions, targetPath);
+		options = mapFilter(options, externalOptions, targetPath);
+		options = mapLineExtensions(options, externalOptions, targetPath);
 		return options;
 	}
 
@@ -26,6 +31,20 @@ private PrettyPrintOptions mapEmojis(PrettyPrintOptions options, ExternalOptions
 		return options;
 	}
 
+	private PrettyPrintOptions mapCompactDirectories(PrettyPrintOptions options, ExternalOptions externalOptions) {
+		if (Boolean.TRUE.equals(externalOptions.compactDirectories())) {
+			return options.withCompactDirectories(true);
+		}
+		return options;
+	}
+
+	private PrettyPrintOptions mapMaxDepth(PrettyPrintOptions options, ExternalOptions externalOptions) {
+		if (externalOptions.maxDepth() != null) {
+			return options.withMaxDepth(externalOptions.maxDepth());
+		}
+		return options;
+	}
+
 	private PrettyPrintOptions mapChildLimit(PrettyPrintOptions options, ExternalOptions externalOptions, Path targetPath) {
 		if (externalOptions.childLimit() == null) {
 			return options;
@@ -43,6 +62,30 @@ private PrettyPrintOptions mapChildLimit(PrettyPrintOptions options, ExternalOpt
 		};
 	}
 
+	private PrettyPrintOptions mapFilter(PrettyPrintOptions options, ExternalOptions externalOptions, Path targetPath) {
+		if (externalOptions.filter() == null) {
+			return options;
+		}
+		if (externalOptions.filter().dir() != null) {
+			options = options.filterDirectories(mapMatcher(externalOptions.filter().dir(), targetPath));
+		}
+		if (externalOptions.filter().file() != null) {
+			options = options.filterFiles(mapMatcher(externalOptions.filter().file(), targetPath));
+		}
+		return options;
+	}
+
+	private PrettyPrintOptions mapLineExtensions(PrettyPrintOptions options, ExternalOptions externalOptions, Path targetPath) {
+		if (externalOptions.lineExtensions() == null) {
+			return options;
+		}
+		var builder = LineExtensions.builder();
+		for (var extension : externalOptions.lineExtensions()) {
+			builder.add(mapMatcher(extension.matcher(), targetPath), extension.extension());
+		}
+		return options.withLineExtension(builder.build());
+	}
+
 	private PathMatcher mapMatcher(Matcher matcher, Path targetPath) {
 		return switch (matcher) {
 			case Matcher.AlwaysTrue() -> p -> true;

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/model/ExternalOptions.java

@@ -1,11 +1,17 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model;
 
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import org.jspecify.annotations.Nullable;
 
 public record ExternalOptions(
 	@Nullable Boolean emojis,
-	@Valid @Nullable ChildLimit childLimit
+	@Nullable Boolean compactDirectories,
+	@Nullable Integer maxDepth,
+	@Valid @Nullable ChildLimit childLimit,
+	@Valid @Nullable Filter filter,
+	@Valid @Nullable List<@Valid @NotNull LineExtension> lineExtensions
 ) {
 
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/model/Filter.java

@@ -0,0 +1,11 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model;
+
+import jakarta.validation.Valid;
+import org.jspecify.annotations.Nullable;
+
+public record Filter(
+	@Valid @Nullable Matcher dir,
+	@Valid @Nullable Matcher file
+) {
+
+}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/model/LineExtension.java

@@ -0,0 +1,11 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+public record LineExtension(
+	@Valid @NotNull String extension,
+	@Valid @NotNull Matcher matcher
+) {
+
+}

src/main/resources/META-INF/native-image/io.github.computerdaddyguy/jfiletreeprettyprinter/reachability-metadata.json

@@ -47,6 +47,24 @@
 		"allDeclaredFields": true,
 		"allPublicFields": true
 	  },
+	  {
+	    "type": "io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model.Filter",
+	    "allDeclaredConstructors": true,
+	    "allPublicConstructors": true,
+	    "allDeclaredMethods": true,
+	    "allPublicMethods": true,
+		"allDeclaredFields": true,
+		"allPublicFields": true
+	  },
+	  {
+	    "type": "io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model.LineExtension",
+	    "allDeclaredConstructors": true,
+	    "allPublicConstructors": true,
+	    "allDeclaredMethods": true,
+	    "allPublicMethods": true,
+		"allDeclaredFields": true,
+		"allPublicFields": true
+	  },
 	  {
 	    "type": "io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.model.ChildLimit$StaticLimit",
 	    "allDeclaredConstructors": true,