feat(libprepare): stripping suffix ".svelte" from page ids.

razshare · Jan 29, 2025 · 10eb1da · 10eb1da
1 parent 5ee00cd
commit 10eb1da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/libprepare.go b/libprepare.go
@@ -26,7 +26,7 @@ func PrepareSveltePages(directoryName string) {
 			}
 
 			fileName := info.Name()
-			id := strings.ReplaceAll(
+			pageId := strings.ReplaceAll(
 				strings.ReplaceAll(
 					strings.TrimSuffix(fileName, ".svelte"),
 					"/",
@@ -36,7 +36,7 @@ func PrepareSveltePages(directoryName string) {
 				"::",
 			)
 
-			PrepareSveltePage(id, filepath.Join(directoryName, fileName))
+			PrepareSveltePage(pageId, filepath.Join(directoryName, fileName))
 
 			return nil
 		},
@@ -49,15 +49,12 @@ func PrepareSveltePages(directoryName string) {
 }
 
 // PrepareSveltePage prepares a svelte page.
-func PrepareSveltePage(id string, fileName string) {
-	if strings.HasSuffix(id, ".svelte") {
-		id = strings.TrimSuffix(id, ".svelte")
-	}
+func PrepareSveltePage(pageId string, fileName string) {
 	relativeFileName, err := filepath.Rel("www/.frizzante/vite-project", fileName)
 	if err != nil {
 		panic(err)
 	}
-	sveltePagesToFileNames[id] = fmt.Sprintf("./%s", relativeFileName)
+	sveltePagesToFileNames[pageId] = fmt.Sprintf("./%s", relativeFileName)
 }
 
 // PrepareStart begins preparation.

diff --git a/libserver.go b/libserver.go
@@ -407,6 +407,9 @@ var pathParametersPattern = regexp.MustCompile(`{([^{}]+)}`)
 
 // ServerWithSveltePage creates a request handler that serves a svelte page.
 func ServerWithSveltePage(self *Server, pattern string, pageId string, configure func(*Request) *SveltePageConfiguration) {
+	if strings.HasSuffix(pageId, ".svelte") {
+		pageId = strings.TrimSuffix(pageId, ".svelte")
+	}
 	patternParts := strings.Split(pattern, " ")
 	if len(patternParts) > 1 {
 		sveltePagesToPaths[pageId] = patternParts[1]