feat: multi-file desugar と router catch-all を追加

.gitignore

@@ -29,3 +29,5 @@ libtest_gawk_import.a
 .code-review-graph/
 
 docs/superpowers/
+
+dist/

Makefile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-.PHONY: run dev bench check emit test test-unit test-dsl test-dsl2 test-cli test-e2e lint clean help ci build-libs fetch-libs test-libs libs-clean ci-full
+.PHONY: run dev bench check emit test test-unit test-dsl test-dsl2 test-cli test-desugar test-e2e lint clean help ci build-libs fetch-libs test-libs libs-clean ci-full
 
 APP     ?= app.awk
 WORKERS ?= 4
@@ -38,7 +38,7 @@ check: ## DSL 型検査のみ (サーバー起動なし)
 emit: ## desugar 済み AWK を stdout 出力
 	./bin/hawk emit $(if $(STRICT),--strict) $(APP)
 
-test: test-unit test-dsl test-dsl2 test-cli test-e2e ## 全テスト
+test: test-unit test-dsl test-dsl2 test-cli test-desugar test-e2e ## 全テスト
 
 test-unit: ## awk 内 assert
 	@libs_args=""; libs_vars=""; \
@@ -67,6 +67,9 @@ test-dsl2: ## DSL v2 工程別 golden テスト
 test-cli: ## CLI 単体テスト
 	./tests/unit/cli/run.sh
 
+test-desugar: ## multi-file desugar テスト
+	./tests/unit/desugar/run.sh
+
 test-e2e: ## サーバー起動 + curl
 	./tests/e2e/run.sh
 

core/router.awk

@@ -29,6 +29,10 @@ function _route_add(method, path, handler,    pattern, params, parts, n, i, seg)
     if (substr(seg, 1, 1) == ":") {
       pattern = pattern "([^/]+)"
       params = params (params == "" ? "" : ",") substr(seg, 2)
+    } else if (i == n && substr(seg, 1, 1) == "*" && length(seg) > 1) {
+      # 末尾セグメント *name -- catch-all。残りパス全体を 1 パラメータで捕捉
+      pattern = pattern "(.+)"
+      params = params (params == "" ? "" : ",") substr(seg, 2)
     } else {
       pattern = pattern _route_escape_re(seg)
     }

docs/routing.md

@@ -88,6 +88,19 @@ BEGIN {
 }
 ```
 
+### Catch-all parameters
+
+A trailing segment of the form `*name` matches the rest of the path
+(one or more characters, including `/`):
+
+```awk
+hawk.app.get("/docs/*path", "docs_handler")
+# GET /docs/guide/routing -> req["params:path"] = "guide/routing"
+```
+
+`*name` is only special in the final segment. Anywhere else it is
+matched literally.
+
 ---
 
 *For the full routing method reference, see [API Reference](api.md).*

libexec/hawk-check

@@ -27,8 +27,14 @@ if [[ -f .env ]]; then
   set +a
 fi
 
+# check は検証のみが目的。永続 dist に publish した後で strict 検証が走ると、
+# 検証失敗でも成果物が更新済みになり、稼働中の hawk-serve が失敗した check の
+# 出力を読んでしまう。呼び出し元の HAWK_DIST も使わず隔離した一時 dist に出す
+HAWK_DIST="$(mktemp -d /tmp/hawk-check.XXXXXX)"
+export HAWK_DIST
+trap 'rm -rf "$HAWK_DIST"' EXIT
+
 APP_AWK="$("$LIBS" desugar "$APP")"
-trap "rm -f '$APP_AWK'" EXIT
 
 if [[ "$STRICT" -eq 1 ]]; then
   if ! gawk --sandbox -f "${HAWK_LIB}/dsl/adt.awk" -f "${HAWK_LIB}/dsl/type.awk" -f "${HAWK_LIB}/dsl/strict_stubs.awk" -f "$APP_AWK" < /dev/null >/dev/null 2>&1; then

libexec/hawk-emit

@@ -27,8 +27,14 @@ if [[ -f .env ]]; then
   set +a
 fi
 
+# emit は desugar 結果の出力のみが目的。永続 dist に publish した後で strict 検証が
+# 走ると、検証失敗でも成果物が更新済みになり、稼働中の hawk-serve が失敗した emit の
+# 出力を読んでしまう。呼び出し元の HAWK_DIST も使わず隔離した一時 dist に出す
+HAWK_DIST="$(mktemp -d /tmp/hawk-emit.XXXXXX)"
+export HAWK_DIST
+trap 'rm -rf "$HAWK_DIST"' EXIT
+
 APP_AWK="$("$LIBS" desugar "$APP")"
-trap "rm -f '$APP_AWK'" EXIT
 
 if [[ "$STRICT" -eq 1 ]]; then
   if ! gawk --sandbox -f "${HAWK_LIB}/dsl/adt.awk" -f "${HAWK_LIB}/dsl/type.awk" -f "${HAWK_LIB}/dsl/strict_stubs.awk" -f "$APP_AWK" < /dev/null >/dev/null 2>&1; then
@@ -37,4 +43,26 @@ if [[ "$STRICT" -eq 1 ]]; then
   fi
 fi
 
-cat "$APP_AWK"
+# desugar はローカル include を隔離 dist 内の絶対パスへ書き換えるが、
+# emit の stdout は一時 dist を trap で削除した後も単独で実行できる必要がある。
+# dist 内の include だけを再帰展開し、外部 include は gawk に任せてそのまま残す。
+EMIT_SEEN=" "
+EMIT_INCLUDE_RE='^[[:space:]]*@include[[:space:]]+"([^"]+)"'
+
+emit_file() {
+  local file="$1" line inc
+  case "$EMIT_SEEN" in *" $file "*) return 0 ;; esac
+  EMIT_SEEN="$EMIT_SEEN$file "
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    if [[ "$line" =~ $EMIT_INCLUDE_RE ]]; then
+      inc="${BASH_REMATCH[1]}"
+      if [[ "$inc" == "$HAWK_DIST"/* && -f "$inc" ]]; then
+        emit_file "$inc"
+        continue
+      fi
+    fi
+    printf '%s\n' "$line"
+  done < "$file"
+}
+
+emit_file "$APP_AWK"