Merge pull request #2 from monster010/1-errorexception-undefined-array-key-1

Fixed #1

Author: monster010

src/Vite.php

@@ -106,36 +106,36 @@ public function __invoke($entryPoints, $buildDirectory = null)
                     ];
                 }
             }
-        }
-
-        $tags[] = $this->makeTagForChunk(
-            $epoint,
-            $this->assetPath("{$buildDirectory}/{$chunk['file']}"),
-            $chunk,
-            $manifest
-        );
 
-        foreach ($chunk['css'] ?? [] as $css) {
-            $partialManifest = $this->array_where($manifest, 'file', $css);
-
-            $preloads[] = [
-                array_key_first($partialManifest),
-                $this->assetPath("{$buildDirectory}/{$css}"),
-                $partialManifest[array_key_first($partialManifest)],
-                $manifest
-            ];
-
-            $tags[] = [
-                array_key_first($partialManifest),
-                $this->assetPath("{$buildDirectory}/{$css}"),
-                $partialManifest[array_key_first($partialManifest)],
-                $manifest
-            ];
+			$tags[] = $this->makeTagForChunk(
+				$epoint,
+				$this->assetPath("{$buildDirectory}/{$chunk['file']}"),
+				$chunk,
+				$manifest
+			);
+
+			foreach ($chunk['css'] ?? [] as $css) {
+				$partialManifest = $this->array_where($manifest, 'file', $css);
+
+				$preloads[] = [
+					array_key_first($partialManifest),
+					$this->assetPath("{$buildDirectory}/{$css}"),
+					$partialManifest[array_key_first($partialManifest)],
+					$manifest
+				];
+
+				$tags[] = [
+					array_key_first($partialManifest),
+					$this->assetPath("{$buildDirectory}/{$css}"),
+					$partialManifest[array_key_first($partialManifest)],
+					$manifest
+				];
+			}
         }
 
-        [$stylesheets, $scripts] = $this->array_chunk_by(array_unique($tags), fn ($prev, $tag) => str_starts_with($tag, '<link')); // Rework
+        [$stylesheets, $scripts] = $this->array_partition(array_unique($tags), fn ($prev, $tag) => str_starts_with($tag, '<link')); // Rework
 
-        usort(array_unique($preloads), fn ($args) => $this->isStylesheetPath(...$args));
+        usort($preloads, fn ($args) => $this->isStylesheetPath(...$args));
 
         $preloads = array_map(fn ($args) => $this->makePreloadTagForChunk(...$args), $preloads);
 
@@ -363,44 +363,18 @@ private function array_where($arr, $key, $value)
         });
     }
 
-    private function array_chunk_by(array $array, callable $callback, bool $preserve_keys = false): array
-    {
-        $reducer = function (array $carry, $key) use ($array, $callback, $preserve_keys) {
-            $current = $array[$key];
-            $length  = count($carry);
-
-            if ($length > 0) {
-                $chunk = &$carry[$length - 1];
-                end($chunk);
-                $previous = $chunk[key($chunk)];
-
-                if ($callback($previous, $current)) {
-                    // Split, create a new group.
-                    if ($preserve_keys) {
-                        $carry[] = [$key => $current];
-                    } else {
-                        $carry[] = [$current];
-                    }
-                } else {
-                    // Put into the $currentrent group.
-                    if ($preserve_keys) {
-                        $chunk[$key] = $current;
-                    } else {
-                        $chunk[] = $current;
-                    }
-                }
-            } else {
-                // The first group.
-                if ($preserve_keys) {
-                    $carry[] = [$key => $current];
-                } else {
-                    $carry[] = [$current];
-                }
-            }
-
-            return $carry;
-        };
-
-        return array_reduce(array_keys($array), $reducer, []);
-    }
+    private function array_partition(array $array, callable $callback) {
+		$passed = [];
+		$failed = [];
+		
+		foreach($array as $key => $item) {
+			if($callback($item, $key)) {
+				$passed[$key] = $item;
+			} else {
+				$failed[$key] = $item;
+			}
+		}
+		
+		return [$passed, $failed];
+	}
 }