delimited path extractor improved

dakujem · Jan 15, 2024 · 5bcd01e · 5bcd01e
1 parent 1474bf2
commit 5bcd01e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/MaterializedPath/TreeBuilder.php b/src/MaterializedPath/TreeBuilder.php
@@ -47,7 +47,7 @@ final class TreeBuilder
 {
     public static function fixed(int $levelWidth, callable $accessor): callable
     {
-        return function (mixed $data) use ($levelWidth, $accessor) {
+        return function (mixed $data) use ($levelWidth, $accessor): array {
             $path = $accessor($data);
             if (null === $path) {
                 return [];
@@ -62,7 +62,10 @@ public static function fixed(int $levelWidth, callable $accessor): callable
 
     public static function delimited(string $delimiter, callable $accessor): callable
     {
-        return function (mixed $data) use ($delimiter, $accessor) {
+        if (strlen($delimiter) !== 1) {
+            throw new LogicException('The delimiter must be a single character.');
+        }
+        return function (mixed $data) use ($delimiter, $accessor): array {
             $path = $accessor($data);
             if (null === $path) {
                 return [];
@@ -71,6 +74,10 @@ public static function delimited(string $delimiter, callable $accessor): callabl
                 // TODO improve exceptions (index/path etc)
                 throw new LogicException('Invalid path returned.');
             }
+            $path = trim($path, $delimiter);
+            if ('' === $path) {
+                return [];
+            }
             return explode($delimiter, $path);
         };
     }