fix(pgs): handle empty filepaths in calc_route

picosh · Jan 9, 2025 · facce22 · facce22
1 parent 6530b86
commit facce22
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/pgs/calc_route.go b/pgs/calc_route.go
@@ -186,8 +186,11 @@ func genRedirectRoute(actual string, fromStr string, to string) string {
 
 func calcRoutes(projectName, fp string, userRedirects []*RedirectRule) []*HttpReply {
 	rts := []*HttpReply{}
+	if fp == "" {
+		fp = "/"
+	}
 	// add route as-is without expansion
-	if fp != "" && !strings.HasSuffix(fp, "/") {
+	if !strings.HasSuffix(fp, "/") {
 		defRoute := shared.GetAssetFileName(&utils.FileEntry{
 			Filepath: filepath.Join(projectName, fp),
 		})

diff --git a/pgs/calc_route_test.go b/pgs/calc_route_test.go
@@ -212,6 +212,42 @@ func TestCalcRoutes(t *testing.T) {
 				{Filepath: "test/404.html", Status: 404},
 			},
 		},
+		{
+			Name: "redirect-root-full-url",
+			Actual: calcRoutes(
+				"test",
+				"/",
+				[]*RedirectRule{
+					{
+						From:   "/*",
+						To:     "https://pico.sh",
+						Status: 301,
+					},
+				},
+			),
+			Expected: []*HttpReply{
+				{Filepath: "test/index.html", Status: 200},
+				{Filepath: "https://pico.sh", Status: 301},
+			},
+		},
+		{
+			Name: "redirect-empty-route-full-url",
+			Actual: calcRoutes(
+				"test",
+				"",
+				[]*RedirectRule{
+					{
+						From:   "/*",
+						To:     "https://pico.sh",
+						Status: 301,
+					},
+				},
+			),
+			Expected: []*HttpReply{
+				{Filepath: "test/index.html", Status: 200},
+				{Filepath: "https://pico.sh", Status: 301},
+			},
+		},
 		{
 			Name: "redirect-full-url-directory",
 			Actual: calcRoutes(