Resolve JSON-LD @id references, accept schema.org type IRIs, refuse empty durations

Review findings on the Recipe extractor:

- An image or publisher given as an {"@id": ...} reference now resolves to
  the node with that @id at a script's top level, in a top-level array or
  in an @graph, in any of the page's scripts. An image reference no node
  has, or one naming two nodes, is ErrMalformedRecipe; an unresolved
  publisher falls through to og:site_name and the host as before.
- @type matches the term or the absolute https:// or http://schema.org IRI,
  as a string or in an array, for Recipe, HowToStep and HowToSection.
- A present but empty or blank prepTime, cookTime or totalTime is an invalid
  ISO-8601 duration (ErrMalformedRecipe); an absent or null one is still
  nil.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

docs/ARCHITECTURE.md

@@ -227,16 +227,18 @@ automatic** (D-021).
   (`recipes.Extract`): a small targeted scan of the page's
   `application/ld+json` scripts and `og:site_name` (no HTML parser
   dependency), finding the Recipe node at a script's top level, in a
-  top-level array or in an `@graph`, with `@type` a string or an array. The
-  largest image (by ImageObject width × height; the first of equals) is
+  top-level array or in an `@graph`, with `@type` a string or an array of
+  terms or absolute schema.org IRIs (`https://schema.org/Recipe`). An image
+  or publisher given as an `{"@id": ...}` reference resolves to the node
+  with that `@id` anywhere in the page's JSON-LD. The largest image (by ImageObject width × height; the first of equals) is
   resolved to an absolute URL; instructions — one string of lines, or a
   list of strings, HowToSteps and HowToSections — are flattened in order;
   ISO-8601 prep/cook/total times become minutes, total derived as prep +
   cook when only those are given; the site name is the publisher's, else
   `og:site_name`, else the host. A page with no Recipe is `ErrNoRecipe`,
   with two is `ErrManyRecipes`; a shape schema.org does not allow — such as
-  a non-ISO-8601 duration like "20 minutes" — is `ErrMalformedRecipe`,
-  never guessed at.
+  a non-ISO-8601 duration like "20 minutes" or an empty one, or an image
+  `@id` no node has — is `ErrMalformedRecipe`, never guessed at.
 - Photos are cached locally (`photos`) and processed with
   `golang.org/x/image`.
 

internal/recipes/extract.go

@@ -50,22 +50,25 @@ type Recipe struct {
 
 // Extract finds the schema.org Recipe in a page's application/ld+json
 // scripts. Recipe nodes are found at the top level of a script, in a
-// top-level array, or in an @graph. pageURL is the page's own absolute URL;
-// relative image URLs resolve against it.
+// top-level array, or in an @graph. An image or publisher given as an
+// {"@id": ...} reference resolves to the node with that @id found in the
+// same places, in any of the page's scripts. pageURL is the page's own
+// absolute URL; relative image URLs resolve against it.
 func Extract(page []byte, pageURL string) (Recipe, error) {
 	base, err := url.Parse(pageURL)
 	if err != nil || !base.IsAbs() || base.Host == "" {
 		return Recipe{}, fmt.Errorf("recipes: page URL %q is not absolute", pageURL)
 	}
 	doc := scanHTML(string(page))
-	var nodes []map[string]any
+	g := graph{ids: map[string][]map[string]any{}}
 	for i, script := range doc.jsonLD {
 		v, err := decodeJSON(script)
 		if err != nil {
 			return Recipe{}, fmt.Errorf("%w: JSON-LD script %d: %v", ErrMalformedRecipe, i+1, err)
 		}
-		collectRecipes(v, &nodes)
+		g.collect(v)
 	}
+	nodes := g.recipes
 	switch len(nodes) {
 	case 0:
 		return Recipe{}, ErrNoRecipe
@@ -73,7 +76,7 @@ func Extract(page []byte, pageURL string) (Recipe, error) {
 	default:
 		return Recipe{}, fmt.Errorf("%w: found %d", ErrManyRecipes, len(nodes))
 	}
-	r, err := recipeFrom(nodes[0], base, doc.ogSiteName)
+	r, err := recipeFrom(nodes[0], g, base, doc.ogSiteName)
 	if err != nil {
 		return Recipe{}, fmt.Errorf("%w: %v", ErrMalformedRecipe, err)
 	}
@@ -93,33 +96,65 @@ func decodeJSON(s string) (any, error) {
 	return v, nil
 }
 
-// collectRecipes appends every Recipe node in v: v itself, the elements of
-// an array, and the members of an @graph.
-func collectRecipes(v any, out *[]map[string]any) {
+// graph holds the page's JSON-LD nodes: the Recipe nodes, and every node
+// with an @id by that @id.
+type graph struct {
+	recipes []map[string]any
+	ids     map[string][]map[string]any
+}
+
+// collect gathers the nodes in v: v itself, the elements of an array, and
+// the members of an @graph. A bare {"@id": ...} reference is not a node.
+func (g *graph) collect(v any) {
 	switch n := v.(type) {
 	case []any:
 		for _, e := range n {
-			collectRecipes(e, out)
+			g.collect(e)
 		}
 	case map[string]any:
 		if hasType(n, "Recipe") {
-			*out = append(*out, n)
+			g.recipes = append(g.recipes, n)
 		}
-		if g, ok := n["@graph"]; ok {
-			collectRecipes(g, out)
+		if id, ok := n["@id"].(string); ok && len(n) > 1 {
+			g.ids[id] = append(g.ids[id], n)
+		}
+		if members, ok := n["@graph"]; ok {
+			g.collect(members)
 		}
 	}
 }
 
+// resolve returns the node a bare {"@id": ...} reference names, and v
+// itself when v is not a reference. found is false for a reference to no
+// node; a reference to more than one node is an error.
+func (g graph) resolve(v any) (node any, found bool, err error) {
+	m, ok := v.(map[string]any)
+	if !ok || len(m) != 1 {
+		return v, true, nil
+	}
+	id, ok := m["@id"].(string)
+	if !ok {
+		return v, true, nil
+	}
+	switch nodes := g.ids[id]; len(nodes) {
+	case 0:
+		return v, false, nil
+	case 1:
+		return nodes[0], true, nil
+	default:
+		return nil, false, fmt.Errorf("@id %q names %d nodes", id, len(nodes))
+	}
+}
+
 // hasType reports whether node's @type, a string or an array of strings,
-// names typ.
+// names the schema.org type typ, as a term or an absolute schema.org IRI.
 func hasType(node map[string]any, typ string) bool {
 	switch t := node["@type"].(type) {
 	case string:
-		return t == typ
+		return isSchemaType(t, typ)
 	case []any:
 		for _, e := range t {
-			if s, ok := e.(string); ok && s == typ {
+			if s, ok := e.(string); ok && isSchemaType(s, typ) {
 				return true
 			}
 		}
@@ -127,15 +162,21 @@ func hasType(node map[string]any, typ string) bool {
 	return false
 }
 
-func recipeFrom(n map[string]any, base *url.URL, ogSiteName string) (Recipe, error) {
+func isSchemaType(s, typ string) bool {
+	return s == typ || s == "https://schema.org/"+typ || s == "http://schema.org/"+typ
+}
+
+func recipeFrom(n map[string]any, g graph, base *url.URL, ogSiteName string) (Recipe, error) {
 	var r Recipe
 	var err error
 	name, ok := n["name"].(string)
 	if r.Title = cleanText(name); !ok || r.Title == "" {
 		return Recipe{}, errors.New("name is missing")
 	}
-	r.SiteName = siteName(n["publisher"], ogSiteName, base)
-	if r.ImageURL, err = imageURL(n["image"], base); err != nil {
+	if r.SiteName, err = siteName(n["publisher"], g, ogSiteName, base); err != nil {
+		return Recipe{}, err
+	}
+	if r.ImageURL, err = imageURL(n["image"], g, base); err != nil {
 		return Recipe{}, err
 	}
 	if r.Ingredients, err = ingredients(n["recipeIngredient"]); err != nil {
@@ -172,28 +213,32 @@ func cleanText(s string) string {
 	return strings.TrimSpace(html.UnescapeString(s))
 }
 
-func siteName(publisher any, ogSiteName string, base *url.URL) string {
+func siteName(publisher any, g graph, ogSiteName string, base *url.URL) (string, error) {
 	pubs, ok := publisher.([]any)
 	if !ok {
 		pubs = []any{publisher}
 	}
 	for _, p := range pubs {
+		p, _, err := g.resolve(p)
+		if err != nil {
+			return "", fmt.Errorf("publisher: %w", err)
+		}
 		if m, ok := p.(map[string]any); ok {
 			if name, ok := m["name"].(string); ok && cleanText(name) != "" {
-				return cleanText(name)
+				return cleanText(name), nil
 			}
 		}
 	}
 	if ogSiteName != "" {
-		return ogSiteName
+		return ogSiteName, nil
 	}
-	return strings.TrimPrefix(base.Hostname(), "www.")
+	return strings.TrimPrefix(base.Hostname(), "www."), nil
 }
 
 // imageURL picks the largest of the recipe's images by width × height;
 // images without both dimensions count as size zero, and the first wins a
 // tie, so a list of bare URLs gives its first.
-func imageURL(v any, base *url.URL) (string, error) {
+func imageURL(v any, g graph, base *url.URL) (string, error) {
 	items, ok := v.([]any)
 	if !ok {
 		if v == nil {
@@ -203,6 +248,13 @@ func imageURL(v any, base *url.URL) (string, error) {
 	}
 	best, bestArea := "", int64(-1)
 	for _, item := range items {
+		item, found, err := g.resolve(item)
+		if err != nil {
+			return "", fmt.Errorf("image: %w", err)
+		}
+		if !found {
+			return "", fmt.Errorf("image references @id %v, which no node on the page has", item.(map[string]any)["@id"])
+		}
 		var u string
 		var area int64
 		switch img := item.(type) {
@@ -345,6 +397,8 @@ func stepList(items []any) ([]string, error) {
 	return out, nil
 }
 
+// minutes reads a duration field: nil when absent or null; any string
+// present, empty included, must be an ISO-8601 duration.
 func minutes(n map[string]any, field string) (*int, error) {
 	v, ok := n[field]
 	if !ok || v == nil {
@@ -354,9 +408,6 @@ func minutes(n map[string]any, field string) (*int, error) {
 	if !ok {
 		return nil, fmt.Errorf("%s is a %T, not an ISO-8601 duration", field, v)
 	}
-	if strings.TrimSpace(s) == "" {
-		return nil, nil
-	}
 	m, err := isoMinutes(s)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", field, err)

internal/recipes/extract_test.go

@@ -277,6 +277,61 @@ func TestExtractShapes(t *testing.T) {
 				}
 			},
 		},
+		{
+			name: "image and publisher resolved by @id within @graph",
+			html: page(`<meta property="og:site_name" content="Not this">`, `{"@context":"https://schema.org","@graph":[
+				{"@type":"Recipe","name":"Stew",
+					"image":{"@id":"https://www.example.com/#primaryimage"},
+					"publisher":{"@id":"https://www.example.com/#organization"}},
+				{"@type":"ImageObject","@id":"https://www.example.com/#primaryimage","url":"/img/stew.jpg","width":1200,"height":800},
+				{"@type":"Organization","@id":"https://www.example.com/#organization","name":"Our Kitchen"}]}`),
+			check: func(t *testing.T, r Recipe) {
+				if r.ImageURL != "https://www.example.com/img/stew.jpg" {
+					t.Errorf("ImageURL = %q", r.ImageURL)
+				}
+				if r.SiteName != "Our Kitchen" {
+					t.Errorf("SiteName = %q", r.SiteName)
+				}
+			},
+		},
+		{
+			name: "image @id resolved from another script",
+			html: page("", `{"@type":"Recipe","name":"Stew","image":[{"@id":"#img"}]}`,
+				`{"@type":"ImageObject","@id":"#img","contentUrl":"stew.jpg"}`),
+			check: func(t *testing.T, r Recipe) {
+				if r.ImageURL != "https://www.example.com/recipes/stew/stew.jpg" {
+					t.Errorf("ImageURL = %q", r.ImageURL)
+				}
+			},
+		},
+		{
+			name: "absolute schema.org type IRIs",
+			html: page("", `{"@type":"https://schema.org/Recipe","name":"Stew","recipeInstructions":[
+				{"@type":"http://schema.org/HowToStep","text":"one"}]}`),
+			check: func(t *testing.T, r Recipe) {
+				if r.Title != "Stew" || strings.Join(r.Steps, "|") != "one" {
+					t.Errorf("Title = %q, Steps = %q", r.Title, r.Steps)
+				}
+			},
+		},
+		{
+			name: "absolute type IRI in a type array",
+			html: page("", `{"@type":["NewsArticle","http://schema.org/Recipe"],"name":"Stew"}`),
+			check: func(t *testing.T, r Recipe) {
+				if r.Title != "Stew" {
+					t.Errorf("Title = %q", r.Title)
+				}
+			},
+		},
+		{
+			name: "null duration is absent",
+			html: page("", `{"@type":"Recipe","name":"Stew","prepTime":null,"cookTime":"PT10M"}`),
+			check: func(t *testing.T, r Recipe) {
+				if r.PrepMinutes != nil || r.TotalMinutes != nil || fmtMinutes(r.CookMinutes) != "10" {
+					t.Errorf("prep %s, cook %s, total %s", fmtMinutes(r.PrepMinutes), fmtMinutes(r.CookMinutes), fmtMinutes(r.TotalMinutes))
+				}
+			},
+		},
 		{
 			name: "JSON-LD text inside comments and other scripts is ignored",
 			html: []byte(`<html><head><!-- <script type="application/ld+json">{"@type":"Recipe","name":"Old"}</script> -->` +
@@ -313,6 +368,12 @@ func TestExtractErrors(t *testing.T) {
 		{"bad step type", page("", `{"@type":"Recipe","name":"A","recipeInstructions":[{"@type":"Thing"}]}`), "https://example.com/", ErrMalformedRecipe},
 		{"step without text", page("", `{"@type":"Recipe","name":"A","recipeInstructions":[{"@type":"HowToStep","name":"x"}]}`), "https://example.com/", ErrMalformedRecipe},
 		{"bad image width", page("", `{"@type":"Recipe","name":"A","image":{"url":"a.jpg","width":"wide"}}`), "https://example.com/", ErrMalformedRecipe},
+		{"empty prepTime", page("", `{"@type":"Recipe","name":"A","prepTime":""}`), "https://example.com/", ErrMalformedRecipe},
+		{"blank cookTime", page("", `{"@type":"Recipe","name":"A","cookTime":"  "}`), "https://example.com/", ErrMalformedRecipe},
+		{"empty totalTime", page("", `{"@type":"Recipe","name":"A","totalTime":""}`), "https://example.com/", ErrMalformedRecipe},
+		{"image @id not on page", page("", `{"@type":"Recipe","name":"A","image":{"@id":"#missing"}}`), "https://example.com/", ErrMalformedRecipe},
+		{"image @id on two nodes", page("", `{"@type":"Recipe","name":"A","image":{"@id":"#img"}}`,
+			`{"@id":"#img","url":"a.jpg"}`, `{"@id":"#img","url":"b.jpg"}`), "https://example.com/", ErrMalformedRecipe},
 		{"non-text ingredient", page("", `{"@type":"Recipe","name":"A","recipeIngredient":[{"name":"salt"}]}`), "https://example.com/", ErrMalformedRecipe},
 	}
 	for _, tt := range tests {