wrip

go.work

@@ -4,7 +4,6 @@ use (
 	./parser
 	./registry
 	./renderer
-	./server
 	./server-new
 	./template
 	./testdata

go.work.sum

@@ -1,4 +1,8 @@
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+git.max-richter.dev/max/marka/parser v0.0.0-20250819170608-69c2550f448e/go.mod h1:xQK6tsgr9BOoeFw8JxjBwDkVENlOqapmcRkYyf/L+SQ=
+git.max-richter.dev/max/marka/registry v0.0.0-20250819170608-69c2550f448e/go.mod h1:n793S7TENIfgHpZLz0lm0qorM7eCx3zBLby3Fb++hZA=
+git.max-richter.dev/max/marka/template v0.0.0-20250819170608-69c2550f448e/go.mod h1:Uxi5xcxtnjopsIZjjMlFaWJGuglB9JNL++FuaSbOf6U=
+git.max-richter.dev/max/marka/testdata v0.0.0-20250819195334-b3c01bb43d9a/go.mod h1:88SkY5pTONkgfBy1FT10LoqRC8rt36iF1fk/rupjuJY=
+git.max-richter.dev/max/marka/validator v0.0.0-20250819170608-69c2550f448e/go.mod h1:qdGfCFRzsGedmnd77vb7pu/EMx0W0DcQBMEfvNxMYsw=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=

server-new/.air.toml

@@ -1,29 +0,0 @@
-root = "."
-tmp_dir = "tmp"
-
-[build]
-# Command to build the application.
-cmd = "go build -o ./tmp/marka-server ./cmd/marka-server"
-
-# The binary to run.
-bin = "./tmp/marka-server"
-
-# Command to run the application with arguments.
-full_bin = "./tmp/marka-server -root=../examples -addr=:8080"
-
-# Watch these file extensions.
-include_ext = ["go", "http"]
-
-# Ignore these directories.
-exclude_dir = ["tmp"]
-
-# Log file for build errors.
-log = "air_errors.log"
-
-[log]
-# Show time in logs.
-time = true
-
-[misc]
-# Delete tmp directory on exit.
-clean_on_exit = true

server-new/.gitignore

@@ -1 +0,0 @@
-tmp/

server-new/cmd/marka-server/main.go

@@ -1,41 +0,0 @@
-package main
-
-import (
-	"flag"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"git.max-richter.dev/max/marka/server-new/internal/adapters"
-	"git.max-richter.dev/max/marka/server-new/internal/handler"
-)
-
-func main() {
-	root := flag.String("root", ".", "filesystem root to serve")
-	addr := flag.String("addr", ":8080", "listen address")
-	flag.Parse()
-
-	absRoot, err := filepath.Abs(*root)
-	must(err)
-
-	info, err := os.Stat(absRoot)
-	must(err)
-	if !info.IsDir() {
-		log.Fatal("root is not a directory")
-	}
-
-	fsAdapter, err := adapters.NewLocalFsAdapter(absRoot)
-	must(err)
-
-	http.Handle("/", handler.NewHandler(fsAdapter))
-
-	log.Printf("listening on %s, root=%s", *addr, absRoot)
-	log.Fatal(http.ListenAndServe(*addr, nil))
-}
-
-func must(err error) {
-	if err != nil {
-		log.Fatal(err)
-	}
-}

server-new/go.mod

@@ -1,3 +0,0 @@
-module git.max-richter.dev/max/marka/server-new
-
-go 1.25.1

server/.air.toml

@@ -1,6 +1,3 @@
-# Config file for Air - https://github.com/air-verse/air
-# This file is for the marka-server application.
-
 root = "."
 tmp_dir = "tmp"
 

server/cmd/marka-server/main.go

@@ -7,7 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.max-richter.dev/max/marka/server/internal/handlers"
+	"git.max-richter.dev/max/marka/server-new/internal/adapters"
+	"git.max-richter.dev/max/marka/server-new/internal/handler"
 )
 
 func main() {
@@ -24,7 +25,10 @@ func main() {
 		log.Fatal("root is not a directory")
 	}
 
-	http.Handle("/", handlers.NewFile(absRoot))
+	fsAdapter, err := adapters.NewLocalFsAdapter(absRoot)
+	must(err)
+
+	http.Handle("/", handler.NewHandler(fsAdapter))
 
 	log.Printf("listening on %s, root=%s", *addr, absRoot)
 	log.Fatal(http.ListenAndServe(*addr, nil))

server/go.mod

@@ -1,16 +1,3 @@
-module git.max-richter.dev/max/marka/server
+module git.max-richter.dev/max/marka/server-new
 
 go 1.25.1
-
-require git.max-richter.dev/max/marka/parser v0.0.0-20250819170608-69c2550f448e
-
-require (
-	git.max-richter.dev/max/marka/registry v0.0.0-20250817132016-6db87db32567 // indirect
-	git.max-richter.dev/max/marka/renderer v0.0.0-20250819170608-69c2550f448e // indirect
-	git.max-richter.dev/max/marka/template v0.0.0-20250817132016-6db87db32567 // indirect
-	git.max-richter.dev/max/marka/testdata v0.0.0-20250819195334-b3c01bb43d9a // indirect
-	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
-	go.yaml.in/yaml/v4 v4.0.0-rc.1 // indirect
-	golang.org/x/text v0.14.0 // indirect
-)

server/internal/fsx/contenttype.go

@@ -1,33 +0,0 @@
-package fsx
-
-import (
-	"mime"
-	"path/filepath"
-	"strings"
-)
-
-var textPlainExtensions = map[string]bool{
-	".txt":  true,
-	".log":  true,
-	".json": true,
-	".yaml": true,
-	".yml":  true,
-	".toml": true,
-	".xml":  true,
-	".csv":  true,
-}
-
-func ContentTypeFor(name string) string {
-	ext := strings.ToLower(filepath.Ext(name))
-	switch ext {
-	case ".md", ".markdown", ".mdown":
-		return "application/markdown"
-	}
-	if ct := mime.TypeByExtension(ext); ct != "" {
-		return ct
-	}
-	if textPlainExtensions[ext] {
-		return "text/plain; charset=utf-8"
-	}
-	return "application/octet-stream"
-}

server/internal/fsx/path.go

@@ -1,56 +0,0 @@
-package fsx
-
-import (
-	"errors"
-	"path/filepath"
-	"strings"
-)
-
-func CleanURLLike(p string) string {
-	p = strings.TrimSpace(p)
-	if p == "" || p == "/" {
-		return "/"
-	}
-	parts := []string{}
-	for seg := range strings.SplitSeq(p, "/") {
-		switch seg {
-		case "", ".":
-			continue
-		case "..":
-			if len(parts) > 0 {
-				parts = parts[:len(parts)-1]
-			}
-		default:
-			parts = append(parts, seg)
-		}
-	}
-	return "/" + strings.Join(parts, "/")
-}
-
-func SafeRel(root, requested string) (string, error) {
-	s := CleanURLLike(requested)
-	if after, ok := strings.CutPrefix(s, "/"); ok {
-		s = after
-	}
-	full := filepath.Join(root, filepath.FromSlash(s))
-	rel, err := filepath.Rel(root, full)
-	if err != nil {
-		return "", err
-	}
-	if rel == "." {
-		return "/", nil
-	}
-	sep := string(filepath.Separator)
-	if strings.HasPrefix(rel, "..") || strings.Contains(rel, ".."+sep) {
-		return "", errors.New("path escapes root")
-	}
-	return "/" + filepath.ToSlash(rel), nil
-}
-
-func ResponsePath(root, full string) string {
-	rel, err := filepath.Rel(root, full)
-	if err != nil || rel == "." {
-		return "/"
-	}
-	return "/" + filepath.ToSlash(rel)
-}

server/internal/handlers/file.go

@@ -1,38 +0,0 @@
-// Package handlers provides HTTP handlers for the file system.
-package handlers
-
-import (
-	"errors"
-	"net/http"
-	"path/filepath"
-
-	"git.max-richter.dev/max/marka/server/internal/fsx"
-	"git.max-richter.dev/max/marka/server/internal/httpx"
-)
-
-type File struct{ root string }
-
-func NewFile(root string) http.Handler { return &File{root: root} }
-
-func (h *File) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	reqPath := r.URL.Path
-	if reqPath == "" {
-		reqPath = "/"
-	}
-	cleanRel, err := fsx.SafeRel(h.root, reqPath)
-	if err != nil {
-		httpx.WriteError(w, http.StatusBadRequest, err)
-		return
-	}
-	target := filepath.Join(h.root, filepath.FromSlash(cleanRel))
-
-	switch r.Method {
-	case http.MethodGet:
-		h.get(w, r, target)
-	case http.MethodPost:
-		h.post(w, r, target)
-	default:
-		httpx.WriteError(w, http.StatusMethodNotAllowed, errors.New("method not allowed"))
-	}
-}
-

server/internal/handlers/get.go

@@ -1,93 +0,0 @@
-package handlers
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"time"
-
-	"git.max-richter.dev/max/marka/server/internal/fsx"
-	"git.max-richter.dev/max/marka/server/internal/httpx"
-)
-
-func (h *File) get(w http.ResponseWriter, r *http.Request, target string) {
-	fi, err := os.Stat(target)
-	if err != nil {
-		if os.IsNotExist(err) {
-			httpx.WriteError(w, http.StatusNotFound, errors.New("not found"))
-		} else {
-			httpx.WriteError(w, http.StatusInternalServerError, err)
-		}
-		return
-	}
-
-	if fi.IsDir() {
-		h.handleDir(w, r, target)
-	} else {
-		h.handleFile(w, r, target, fi)
-	}
-}
-
-func (h *File) handleDir(w http.ResponseWriter, r *http.Request, dirPath string) {
-	entries, err := os.ReadDir(dirPath)
-	if err != nil {
-		httpx.WriteError(w, http.StatusInternalServerError, err)
-		return
-	}
-
-	type item struct {
-		Name    string    `json:"name"`
-		Path    string    `json:"path"`
-		Content any       `json:"content,omitempty"`
-		IsDir   bool      `json:"isDir"`
-		Size    int64     `json:"size"`
-		ModTime time.Time `json:"modTime"`
-	}
-
-	out := make([]item, 0, len(entries))
-	for _, e := range entries {
-		info, _ := e.Info() // As in original, ignore error to get partial info
-		entryPath := filepath.Join(dirPath, e.Name())
-
-		var content any
-		if !e.IsDir() && fsx.ContentTypeFor(e.Name()) == "application/markdown" {
-			content, _ = parseMarkdownFile(entryPath) // As in original, ignore error
-		}
-
-		out = append(out, item{
-			Name:    e.Name(),
-			Path:    fsx.ResponsePath(h.root, entryPath),
-			IsDir:   e.IsDir(),
-			Content: content,
-			Size:    sizeOrZero(info),
-			ModTime: modTimeOrZero(info),
-		})
-	}
-	httpx.WriteJSON(w, http.StatusOK, out)
-}
-
-func (h *File) handleFile(w http.ResponseWriter, r *http.Request, target string, fi os.FileInfo) {
-	contentType := fsx.ContentTypeFor(target)
-
-	if contentType == "application/markdown" {
-		res, err := parseMarkdownFile(target)
-		if err != nil {
-			httpx.WriteError(w, http.StatusInternalServerError, fmt.Errorf("failed to parse markdown: %w", err))
-			return
-		}
-		httpx.WriteJSON(w, http.StatusOK, res)
-		return
-	}
-
-	f, err := os.Open(target)
-	if err != nil {
-		httpx.WriteError(w, http.StatusInternalServerError, err)
-		return
-	}
-	defer f.Close()
-
-	w.Header().Set("Content-Type", contentType)
-	http.ServeContent(w, r, filepath.Base(target), fi.ModTime(), f)
-}

server/internal/handlers/helpers.go

@@ -1,30 +0,0 @@
-package handlers
-
-import (
-	"os"
-	"time"
-
-	"git.max-richter.dev/max/marka/parser"
-)
-
-func parseMarkdownFile(path string) (any, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-	return parser.ParseFile(string(data))
-}
-
-func sizeOrZero(fi os.FileInfo) int64 {
-	if fi == nil {
-		return 0
-	}
-	return fi.Size()
-}
-
-func modTimeOrZero(fi os.FileInfo) time.Time {
-	if fi == nil {
-		return time.Time{}
-	}
-	return fi.ModTime()
-}

server/internal/handlers/post.go

@@ -1,47 +0,0 @@
-package handlers
-
-import (
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"git.max-richter.dev/max/marka/server/internal/httpx"
-)
-
-func (h *File) post(w http.ResponseWriter, r *http.Request, target string) {
-	if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-		httpx.WriteError(w, http.StatusInternalServerError, err)
-		return
-	}
-
-	tmpPath := target + ".tmp~"
-	f, err := os.Create(tmpPath)
-	if err != nil {
-		httpx.WriteError(w, http.StatusInternalServerError, err)
-		return
-	}
-
-	_, copyErr := io.Copy(f, r.Body)
-	closeErr := f.Close()
-
-	if copyErr != nil {
-		os.Remove(tmpPath)
-		httpx.WriteError(w, http.StatusInternalServerError, copyErr)
-		return
-	}
-	if closeErr != nil {
-		os.Remove(tmpPath)
-		httpx.WriteError(w, http.StatusInternalServerError, closeErr)
-		return
-	}
-
-	if err := os.Rename(tmpPath, target); err != nil {
-		os.Remove(tmpPath)
-		httpx.WriteError(w, http.StatusInternalServerError, err)
-		return
-	}
-
-	w.Header().Set("Location", r.URL.Path)
-	w.WriteHeader(http.StatusCreated)
-}

server/internal/httpx/error.go

@@ -1,20 +0,0 @@
-package httpx
-
-import (
-	"encoding/json"
-	"net/http"
-)
-
-type ErrorResponse struct {
-	Error string `json:"error"`
-}
-
-func WriteJSON(w http.ResponseWriter, code int, v any) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(code)
-	_ = json.NewEncoder(w).Encode(v)
-}
-
-func WriteError(w http.ResponseWriter, code int, err error) {
-	WriteJSON(w, code, ErrorResponse{Error: err.Error()})
-}

server/internal/httpx/router.go

@@ -1,11 +0,0 @@
-package httpx
-
-import "net/http"
-
-type Router struct{ mux *http.ServeMux }
-
-func NewRouter() *Router                                { return &Router{mux: http.NewServeMux()} }
-func (r *Router) Handle(pattern string, h http.Handler) { r.mux.Handle(pattern, h) }
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	r.mux.ServeHTTP(w, req)
-}