Merge pull request #24 from gopherguides/better-errors

better errors and go 1.22

Author: markbates

.github/workflows/tests.yml

@@ -6,30 +6,29 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.21.x]
+        go-version: [1.22.x]
         os: [macos-latest, ubuntu-latest]
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: "1.21.x"
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.22.x"
 
-    - name: Go Environment
-      run: go env
+      - name: Go Environment
+        run: go env
 
-    - name: Verify Go Modules
-      run: go mod verify
+      - name: Verify Go Modules
+        run: go mod verify
 
-    - name: Build
-      run: go build -v ./...
+      - name: Build
+        run: go build -v ./...
 
-    - name: Run tests with Race Detector
-      run: go test -race -vet=off ./...
+      - name: Run tests with Race Detector
+        run: go test -race -vet=off ./...
 
-    - name: Install staticcheck
-      run: go install honnef.co/go/tools/cmd/staticcheck@latest
-
-    - name: Run staticcheck
-      run: staticcheck ./...
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
 
+      - name: Run staticcheck
+        run: staticcheck ./...

.gitignore

@@ -4,6 +4,7 @@ tmp
 *.pid
 coverage
 coverage.data
+coverage.out
 build/*
 *.pbxuser
 *.mode1v3

Makefile

@@ -3,6 +3,14 @@ default: test install hype
 test:
 	go test -timeout 10s -race -cover ./...
 
+cov:
+	go test -coverprofile=coverage.out ./...
+	go tool cover -html=coverage.out
+
+hypecov:
+	go test -coverprofile=coverage.out .
+	go tool cover -html=coverage.out
+
 install:
 	go install -v ./cmd/hype
 

binding/testdata/toc/01-one/simple/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

binding/testdata/toc/01-one/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

binding/testdata/toc/02-two/simple/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

binding/testdata/toc/02-two/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

binding/testdata/toc/03-three/simple/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

binding/testdata/toc/03-three/src/greet/go.mod

@@ -1,3 +1,3 @@
 module demo
 
-go 1.18
+go 1.22

body.go

@@ -2,7 +2,6 @@ package hype
 
 import (
 	"encoding/json"
-	"fmt"
 )
 
 // Body is a container for all the elements in a document.
@@ -23,9 +22,9 @@ func (b *Body) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	m["type"] = fmt.Sprintf("%T", b)
+	m["type"] = toType(b)
 
-	return json.Marshal(m)
+	return json.MarshalIndent(m, "", "  ")
 }
 
 // AsPage returns the body as a Page.