@recipe-book/core 0.1.0 → 0.1.1

package/dist/schema-org/find.js

@@ -1,31 +1,38 @@
 // src/schema-org/find.ts
 import { describeValue, RecipeBookError } from "../errors.js";
-import { isRecord } from "../issues.js";
+import { hasOwn, isRecord } from "../issues.js";
 import { asRecord } from "../validation.js";
 var MAX_DEPTH = 32;
 function locate(documents) {
+  const direct = scan(documents, false);
+  return direct.recipes.length > 0 ? direct : scan(documents, true);
+}
+function scan(documents, lists) {
   const recipes = [];
   const ids = /* @__PURE__ */ new Map();
   const recipeIds = /* @__PURE__ */ new Map();
-  const visit = (value, path, mainEntity = false) => {
+  const visit = (value, path, reach = "any") => {
     if (path.length > MAX_DEPTH) {
       return;
     }
     if (Array.isArray(value)) {
-      value.forEach(
-        (entry, i) => visit(entry, [...path, i], mainEntity)
-      );
+      for (const [entry, entryPath] of entriesOf(value, path)) {
+        visit(entry, entryPath, reach);
+      }
       return;
     }
     const fields = asRecord(value);
     if (!fields) {
       return;
     }
-    const type = fields["@type"];
-    const isRecipe = [type].flat().some(
-      (name) => typeof name === "string" && /(?:^|[/:#])Recipe$/.test(name)
-    );
-    if (mainEntity && !isRecipe) {
+    const isRecipe = hasType(fields, "Recipe");
+    const isList = lists && hasType(fields, "ItemList");
+    if (reach !== "any" && !isRecipe) {
+      if (isList && reach === "mainEntity") {
+        visit(fields.itemListElement, [...path, "itemListElement"], "entry");
+      } else if (lists && reach === "entry" && hasType(fields, "ListItem")) {
+        visit(fields.item, [...path, "item"], "item");
+      }
       return;
     }
     const located = { node: value, path };
@@ -46,7 +53,10 @@ function locate(documents) {
       }
     } else {
       visit(fields["@graph"], [...path, "@graph"]);
-      visit(fields.mainEntity, [...path, "mainEntity"], true);
+      visit(fields.mainEntity, [...path, "mainEntity"], "mainEntity");
+      if (isList) {
+        visit(fields.itemListElement, [...path, "itemListElement"], "entry");
+      }
     }
   };
   for (const document of documents) {
@@ -54,8 +64,30 @@ function locate(documents) {
   }
   return { recipes, ids };
 }
+var TYPES = {
+  Recipe: /(?:^|[/:#])Recipe$/,
+  ItemList: /(?:^|[/:#])ItemList$/,
+  ListItem: /(?:^|[/:#])ListItem$/
+};
+function hasType(node, name) {
+  return entriesOf(node["@type"], []).some(
+    ([type]) => typeof type === "string" && TYPES[name].test(type)
+  );
+}
 function hasContent(node) {
-  return Object.keys(node).some((key) => key[0] !== "@");
+  return Object.keys(node).some((key) => !key.startsWith("@"));
+}
+function entriesOf(value, path) {
+  if (!Array.isArray(value)) {
+    return [[value, path]];
+  }
+  const entries = [];
+  for (let i = 0; i < value.length; i++) {
+    if (hasOwn(value, i)) {
+      entries.push([value[i], [...path, i]]);
+    }
+  }
+  return entries;
 }
 function findRecipeJsonLd(html) {
   if (typeof html !== "string") {
@@ -84,7 +116,7 @@ function findRecipeJsonLd(html) {
 }
 function withImages(node, ids) {
   const follow = (value) => {
-    const id = isRecord(value) && Object.keys(value).length === 1 && value["@id"];
+    const id = isRecord(value) && Object.keys(value).join() === "@id" && value["@id"];
     const target = typeof id === "string" && ids.get(id)?.node;
     return target && target !== node ? target : value;
   };
@@ -119,6 +151,7 @@ function parseJson(text) {
 }
 export {
   MAX_DEPTH,
+  entriesOf,
   findRecipeJsonLd,
   locate
 };

package/dist/schema-org/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/schema-org/find.ts"],"sourcesContent":["import { describeValue, RecipeBookError } from '../errors'\nimport { isRecord, type Path } from '../issues'\nimport { asRecord } from '../validation'\n\n/** A JSON-LD node, as passed in, and its path in the input. */\nexport type Located = { node: Record<string, unknown>; path: Path }\n\n/**\n * The longest path read in JSON-LD. Real markup nests about ten levels, and\n * the bound keeps a hostile page from overflowing the stack.\n */\nexport const MAX_DEPTH = 32\n\n/**\n * Finds the Recipe nodes in parsed JSON-LD documents, in order, through arrays,\n * `@graph`, and one level of `mainEntity`. It indexes by `@id` each Recipe, and\n * each node at the top level of the JSON-LD, or reached from there through\n * arrays and `@graph`, so references can be followed. An `@id` names its first\n * node, and a Recipe with the `@id` of an earlier Recipe is left out, unless\n * the earlier one holds nothing but keywords such as `@type`: then it takes\n * that one's place in `recipes`, and in `ids` when that one was the first node\n * with its `@id`. An empty `@id` is no `@id`.\n */\nexport function locate(documents: readonly unknown[]): {\n  recipes: Located[]\n  ids: Map<string, Located>\n} {\n  const recipes: Located[] = []\n  const ids = new Map<string, Located>()\n  // A stub Recipe, or `true` once the `@id`'s Recipe holds content, so a\n  // duplicate never rescans the first one's keys.\n  const recipeIds = new Map<unknown, Located | true>()\n\n  const visit = (value: unknown, path: Path, mainEntity = false): void => {\n    if (path.length > MAX_DEPTH) {\n      return\n    }\n\n    if (Array.isArray(value)) {\n      value.forEach((entry: unknown, i) =>\n        visit(entry, [...path, i], mainEntity),\n      )\n      return\n    }\n\n    const fields = asRecord(value)\n    if (!fields) {\n      return\n    }\n\n    const type = fields['@type']\n    const isRecipe = [type]\n      .flat()\n      .some(\n        (name) => typeof name === 'string' && /(?:^|[/:#])Recipe$/.test(name),\n      )\n\n    if (mainEntity && !isRecipe) {\n      return\n    }\n\n    const located = { node: value as Record<string, unknown>, path }\n    const id = fields['@id'] || undefined\n    if (typeof id === 'string' && !ids.has(id)) {\n      ids.set(id, located)\n    }\n\n    if (isRecipe) {\n      const earlier = recipeIds.get(id)\n      if (!earlier) {\n        recipes.push(located)\n        if (typeof id === 'string') {\n          recipeIds.set(id, hasContent(fields) || located)\n        }\n      } else if (earlier !== true && hasContent(fields)) {\n        // `recipes` holds this same object, and so does `ids` when the stub was\n        // the first node with its `@id`, so a reference to the recipe still\n        // finds the recipe itself.\n        Object.assign(earlier, located)\n        recipeIds.set(id, true)\n      }\n    } else {\n      visit(fields['@graph'], [...path, '@graph'])\n      visit(fields.mainEntity, [...path, 'mainEntity'], true)\n    }\n  }\n\n  for (const document of documents) {\n    visit(document, [])\n  }\n  return { recipes, ids }\n}\n\nfunction hasContent(node: Record<string, unknown>): boolean {\n  return Object.keys(node).some((key) => key[0] !== '@')\n}\n\n/**\n * Finds the schema.org Recipe nodes in a page's\n * `<script type=\"application/ld+json\">` tags, without a DOM. Pass one to\n * `fromJsonLd`.\n *\n * Reads arrays and `@graph`, as Yoast and WP Recipe Maker write them, and a\n * Recipe in a node's `mainEntity`, and matches a node whose `@type` is or\n * includes `\"Recipe\"`. A tag whose JSON doesn't parse is retried with the raw\n * line breaks and tabs inside its strings escaped, as real pages have them,\n * and skipped if it still doesn't. A tag inside an HTML comment is skipped,\n * and a `<!--` in an attribute value or in a `style` or `textarea` element is\n * text, as in a browser. A quote starts an attribute value only right after\n * `=`, so a stray one, as in `content=\"a 9\" pan\"`, doesn't hide later tags. A\n * Recipe node with the `@id` of an earlier one is returned once, where the\n * first appears. When the first holds only keywords, such as a `mainEntity`\n * of `{ \"@type\": \"Recipe\", \"@id\": \"#recipe\" }`, the later node is returned in\n * its place. An empty `@id` is no `@id`, so it merges nothing.\n *\n * In each Recipe node returned, an image that is an `@id` reference to a node\n * at the top level of the JSON-LD, or reached from there through arrays and\n * `@graph`, holds that node instead of the reference, an object that holds only\n * that `@id`. That applies to the recipe's `image` and each step's `image` in\n * `recipeInstructions`, and lets `fromJsonLd` read them. A reference to a node\n * in any other field, such as an `Organization`'s `logo` or an `ImageObject` in\n * a `WebPage`'s `mainEntity`, isn't followed. Other references, such as\n * `author` and `mainEntityOfPage`, and references inside the node an image\n * holds, stay as the page wrote them.\n *\n * @param html - The page's HTML, such as `await response.text()`.\n * @returns Every Recipe node, in document order, or `[]` when there are none.\n * @throws {RecipeBookError} `invalid_argument` when `html` isn't a string.\n *\n * @example\n * const [node] = findRecipeJsonLd(await response.text())\n * const result = fromJsonLd(node)\n */\nexport function findRecipeJsonLd(html: string): Record<string, unknown>[] {\n  if (typeof html !== 'string') {\n    throw new RecipeBookError(\n      'invalid_argument',\n      `findRecipeJsonLd: html must be a string, such as await response.text(), received ${describeValue(html)}.`,\n    )\n  }\n\n  const documents: unknown[] = []\n\n  // At each `<`, in this order: a script, style, or textarea element with its\n  // content; a comment, where `<!-->` and `<!--->` close at once; or any other\n  // tag with its quoted attribute values. What one of these holds, such as a\n  // `<!--` in an attribute value, starts nothing, as in a browser. A quote\n  // starts a value only right after `=`, so a stray one, as in\n  // `content=\"a 9\" pan\"`, is text. The element's attributes are read once, in\n  // a lookahead, then matched by backreference, so a tag with no `>` fails\n  // without retrying other splits of them, which would be exponential.\n  for (const [, element, attributes = '', body = ''] of html.matchAll(\n    /<(script|style|textarea)(?=[\\s/>])(?=((?:=\\s*(?:\"[^\"]*\"|'[^']*')|[^<>])*))\\2>([\\s\\S]*?)(?:<\\/\\1\\s*>|$)|<!--(?:-?>|[\\s\\S]*?(?:--!?>|$))|<\\/?[a-z][^\\s/>]*(?:=\\s*(?:\"[^\"]*\"|'[^']*')|[^<>])*/gi,\n  )) {\n    if (\n      element?.toLowerCase() === 'script' &&\n      /[\\s/]type\\s*=\\s*[\"']?application\\/ld\\+json\\b/i.test(attributes)\n    ) {\n      const text = body\n        .replace(/^\\s*(?:\\/\\/\\s*)?(?:<!--|<!\\[CDATA\\[)/, '')\n        .replace(/(?:\\/\\/\\s*)?(?:-->|\\]\\]>)\\s*$/, '')\n      const json =\n        parseJson(text) ??\n        parseJson(\n          text.replace(/\"(?:[^\"\\\\]|\\\\[\\s\\S]?)*(?:\"|$)/g, (string) =>\n            string.replace(/[\\n\\r\\t]/g, (c) => JSON.stringify(c).slice(1, -1)),\n          ),\n        )\n\n      documents.push(json)\n    }\n  }\n\n  const { recipes, ids } = locate(documents)\n  return recipes.map(({ node }) => withImages(node, ids))\n}\n\n/**\n * A copy of a Recipe node with each image that is a one-hop reference to\n * another node replaced by that node: the recipe's `image`, and each step's\n * `image` in `recipeInstructions`, through sections, `ItemList`s, and\n * `ListItem`s. The fields `fromJsonLd` doesn't read keep their references.\n */\nfunction withImages(\n  node: Record<string, unknown>,\n  ids: Map<string, Located>,\n): Record<string, unknown> {\n  const follow = (value: unknown): unknown => {\n    const id =\n      isRecord(value) && Object.keys(value).length === 1 && value['@id']\n    const target = typeof id === 'string' && ids.get(id)?.node\n    return target && target !== node ? target : value\n  }\n  const images = (value: unknown): unknown =>\n    Array.isArray(value) ? value.map(follow) : follow(value)\n  const copy = (value: unknown, depth: number, keys: string[]): unknown => {\n    if (depth > MAX_DEPTH) {\n      return value\n    }\n    if (Array.isArray(value)) {\n      return value.map((entry: unknown) => copy(entry, depth + 1, keys))\n    }\n\n    const fields = asRecord(value)\n    if (!fields) {\n      return value\n    }\n\n    const result = { ...fields }\n    for (const key of keys) {\n      if (fields[key] !== undefined) {\n        result[key] =\n          key === 'image'\n            ? images(fields[key])\n            : copy(fields[key], depth + 1, ['itemListElement', 'item', 'image'])\n      }\n    }\n    return result\n  }\n\n  return copy(node, 0, ['image', 'recipeInstructions']) as typeof node\n}\n\nfunction parseJson(text: string): unknown {\n  try {\n    return JSON.parse(text)\n  } catch {\n    return undefined\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/schema-org/find.ts"],"sourcesContent":["import { describeValue, RecipeBookError } from '../errors'\nimport { hasOwn, isRecord, type Path } from '../issues'\nimport { asRecord } from '../validation'\n\n/** A JSON-LD node, as passed in, and its path in the input. */\nexport type Located = { node: Record<string, unknown>; path: Path }\n\n/**\n * The longest path read in JSON-LD. Real markup nests about ten levels, and\n * the bound keeps a hostile page from overflowing the stack.\n */\nexport const MAX_DEPTH = 32\n\n/**\n * Finds the Recipe nodes in parsed JSON-LD documents, in order, through arrays,\n * `@graph`, and one level of `mainEntity`, or, when that finds none, also\n * through each `ItemList`'s `itemListElement` and each `ListItem`'s `item`, to\n * `MAX_DEPTH`. It indexes by `@id` each Recipe, and each node at the top level\n * of the JSON-LD, or reached from there through arrays and `@graph`, so\n * references can be followed. An `@id` names its first node, and a Recipe\n * with the `@id` of an earlier Recipe is left out, unless the earlier one\n * holds nothing but keywords such as `@type`: then it takes that one's place\n * in `recipes`, and in `ids` when that one was the first node with its `@id`.\n * An empty `@id` is no `@id`.\n */\nexport function locate(documents: readonly unknown[]): {\n  recipes: Located[]\n  ids: Map<string, Located>\n} {\n  const direct = scan(documents, false)\n  return direct.recipes.length > 0 ? direct : scan(documents, true)\n}\n\n/** How `scan` reached a value, which decides what it reads there. */\ntype Reach = 'any' | 'mainEntity' | 'entry' | 'item'\n\nfunction scan(\n  documents: readonly unknown[],\n  lists: boolean,\n): { recipes: Located[]; ids: Map<string, Located> } {\n  const recipes: Located[] = []\n  const ids = new Map<string, Located>()\n  // A stub Recipe, or `true` once the `@id`'s Recipe holds content, so a\n  // duplicate never rescans the first one's keys.\n  const recipeIds = new Map<unknown, Located | true>()\n\n  const visit = (value: unknown, path: Path, reach: Reach = 'any'): void => {\n    if (path.length > MAX_DEPTH) {\n      return\n    }\n\n    if (Array.isArray(value)) {\n      for (const [entry, entryPath] of entriesOf(value, path)) {\n        visit(entry, entryPath, reach)\n      }\n      return\n    }\n\n    const fields = asRecord(value)\n    if (!fields) {\n      return\n    }\n\n    const isRecipe = hasType(fields, 'Recipe')\n    const isList = lists && hasType(fields, 'ItemList')\n\n    if (reach !== 'any' && !isRecipe) {\n      if (isList && reach === 'mainEntity') {\n        visit(fields.itemListElement, [...path, 'itemListElement'], 'entry')\n      } else if (lists && reach === 'entry' && hasType(fields, 'ListItem')) {\n        visit(fields.item, [...path, 'item'], 'item')\n      }\n      return\n    }\n\n    const located = { node: value as Record<string, unknown>, path }\n    const id = fields['@id'] || undefined\n    if (typeof id === 'string' && !ids.has(id)) {\n      ids.set(id, located)\n    }\n\n    if (isRecipe) {\n      const earlier = recipeIds.get(id)\n      if (!earlier) {\n        recipes.push(located)\n        if (typeof id === 'string') {\n          recipeIds.set(id, hasContent(fields) || located)\n        }\n      } else if (earlier !== true && hasContent(fields)) {\n        // `recipes` holds this same object, and so does `ids` when the stub was\n        // the first node with its `@id`, so a reference to the recipe still\n        // finds the recipe itself.\n        Object.assign(earlier, located)\n        recipeIds.set(id, true)\n      }\n    } else {\n      visit(fields['@graph'], [...path, '@graph'])\n      visit(fields.mainEntity, [...path, 'mainEntity'], 'mainEntity')\n      if (isList) {\n        visit(fields.itemListElement, [...path, 'itemListElement'], 'entry')\n      }\n    }\n  }\n\n  for (const document of documents) {\n    visit(document, [])\n  }\n  return { recipes, ids }\n}\n\nconst TYPES = {\n  Recipe: /(?:^|[/:#])Recipe$/,\n  ItemList: /(?:^|[/:#])ItemList$/,\n  ListItem: /(?:^|[/:#])ListItem$/,\n}\n\nfunction hasType(\n  node: Record<string, unknown>,\n  name: keyof typeof TYPES,\n): boolean {\n  return entriesOf(node['@type'], []).some(\n    ([type]) => typeof type === 'string' && TYPES[name].test(type),\n  )\n}\n\nfunction hasContent(node: Record<string, unknown>): boolean {\n  return Object.keys(node).some((key) => !key.startsWith('@'))\n}\n\n/**\n * An array's elements with their paths, or a value that isn't an array with\n * its own path. A hole in an array, which a program can leave but\n * `JSON.parse` can't, is left out. It reads by index, because a program can\n * also give an array another prototype, or a `constructor` that isn't one,\n * and then array methods such as `flatMap` throw.\n */\nexport function entriesOf(value: unknown, path: Path): [unknown, Path][] {\n  if (!Array.isArray(value)) {\n    return [[value, path]]\n  }\n  const entries: [unknown, Path][] = []\n  for (let i = 0; i < value.length; i++) {\n    if (hasOwn(value, i)) {\n      entries.push([value[i], [...path, i]])\n    }\n  }\n  return entries\n}\n\n/**\n * Finds the schema.org Recipe nodes in a page's\n * `<script type=\"application/ld+json\">` tags, without a DOM. Pass one to\n * `fromJsonLd`.\n *\n * Reads arrays and `@graph`, as Yoast and WP Recipe Maker write them, and the\n * `mainEntity` of a node there, up to 32 levels deep, and matches a node whose\n * `@type` is or includes `\"Recipe\"`. When that finds none, it also reads each\n * `ItemList` in those places, as a roundup page lists its recipes, taking each\n * Recipe in its `itemListElement`, or in a `ListItem`'s `item` there. A\n * `ListItem` with only a `url` is skipped: fetch that page and call\n * `findRecipeJsonLd` on it. A `mainEntity`, or an entry of a `mainEntity`\n * array, that is neither a Recipe nor an `ItemList` is skipped with everything\n * in it, and a Recipe anywhere else, such as inside another Recipe or in a list\n * inside a `ListItem` or another list, isn't found.\n *\n * A tag whose JSON doesn't parse is retried with the raw line breaks and tabs\n * inside its strings escaped, as real pages have them, and skipped if it still\n * doesn't. A tag inside an HTML comment is skipped, and a `<!--` in an\n * attribute value or in a `style` or `textarea` element is text, as in a\n * browser. A quote starts an attribute value only right after `=`, so a stray\n * one, as in `content=\"a 9\" pan\"`, doesn't hide later tags. A Recipe node with\n * the `@id` of an earlier one is returned once, where the first appears. When\n * the first holds only keywords, such as a `mainEntity` of\n * `{ \"@type\": \"Recipe\", \"@id\": \"#recipe\" }`, the later node is returned in its\n * place. An empty `@id` is no `@id`, so it merges nothing.\n *\n * In each Recipe node returned, an image that is an `@id` reference to a node\n * at the top level of the JSON-LD, or reached from there through arrays and\n * `@graph`, holds that node instead of the reference, an object that holds only\n * that `@id`. That applies to the recipe's `image` and each step's `image` in\n * `recipeInstructions`, and lets `fromJsonLd` read them. A reference to a node\n * in any other field, such as an `Organization`'s `logo` or an `ImageObject` in\n * a `WebPage`'s `mainEntity`, isn't followed. Other references, such as\n * `author` and `mainEntityOfPage`, and references inside the node an image\n * holds, stay as the page wrote them.\n *\n * @param html - The page's HTML, such as `await response.text()`.\n * @returns The Recipe nodes it finds, in document order, or `[]` when there\n * are none.\n * @throws {RecipeBookError} `invalid_argument` when `html` isn't a string.\n *\n * @example\n * const [node] = findRecipeJsonLd(await response.text())\n * const result = fromJsonLd(node)\n */\nexport function findRecipeJsonLd(html: string): Record<string, unknown>[] {\n  if (typeof html !== 'string') {\n    throw new RecipeBookError(\n      'invalid_argument',\n      `findRecipeJsonLd: html must be a string, such as await response.text(), received ${describeValue(html)}.`,\n    )\n  }\n\n  const documents: unknown[] = []\n\n  // At each `<`, in this order: a script, style, or textarea element with its\n  // content; a comment, where `<!-->` and `<!--->` close at once; or any other\n  // tag with its quoted attribute values. What one of these holds, such as a\n  // `<!--` in an attribute value, starts nothing, as in a browser. A quote\n  // starts a value only right after `=`, so a stray one, as in\n  // `content=\"a 9\" pan\"`, is text. The element's attributes are read once, in\n  // a lookahead, then matched by backreference, so a tag with no `>` fails\n  // without retrying other splits of them, which would be exponential.\n  for (const [, element, attributes = '', body = ''] of html.matchAll(\n    /<(script|style|textarea)(?=[\\s/>])(?=((?:=\\s*(?:\"[^\"]*\"|'[^']*')|[^<>])*))\\2>([\\s\\S]*?)(?:<\\/\\1\\s*>|$)|<!--(?:-?>|[\\s\\S]*?(?:--!?>|$))|<\\/?[a-z][^\\s/>]*(?:=\\s*(?:\"[^\"]*\"|'[^']*')|[^<>])*/gi,\n  )) {\n    if (\n      element?.toLowerCase() === 'script' &&\n      /[\\s/]type\\s*=\\s*[\"']?application\\/ld\\+json\\b/i.test(attributes)\n    ) {\n      const text = body\n        .replace(/^\\s*(?:\\/\\/\\s*)?(?:<!--|<!\\[CDATA\\[)/, '')\n        .replace(/(?:\\/\\/\\s*)?(?:-->|\\]\\]>)\\s*$/, '')\n      const json =\n        parseJson(text) ??\n        parseJson(\n          text.replace(/\"(?:[^\"\\\\]|\\\\[\\s\\S]?)*(?:\"|$)/g, (string) =>\n            string.replace(/[\\n\\r\\t]/g, (c) => JSON.stringify(c).slice(1, -1)),\n          ),\n        )\n\n      documents.push(json)\n    }\n  }\n\n  const { recipes, ids } = locate(documents)\n  return recipes.map(({ node }) => withImages(node, ids))\n}\n\n/**\n * A copy of a Recipe node with each image that is a one-hop reference to\n * another node replaced by that node: the recipe's `image`, and each step's\n * `image` in `recipeInstructions`, through sections, `ItemList`s, and\n * `ListItem`s. The fields `fromJsonLd` doesn't read keep their references.\n */\nfunction withImages(\n  node: Record<string, unknown>,\n  ids: Map<string, Located>,\n): Record<string, unknown> {\n  const follow = (value: unknown): unknown => {\n    const id =\n      isRecord(value) && Object.keys(value).join() === '@id' && value['@id']\n    const target = typeof id === 'string' && ids.get(id)?.node\n    return target && target !== node ? target : value\n  }\n  const images = (value: unknown): unknown =>\n    Array.isArray(value) ? value.map(follow) : follow(value)\n  const copy = (value: unknown, depth: number, keys: string[]): unknown => {\n    if (depth > MAX_DEPTH) {\n      return value\n    }\n    if (Array.isArray(value)) {\n      return value.map((entry: unknown) => copy(entry, depth + 1, keys))\n    }\n\n    const fields = asRecord(value)\n    if (!fields) {\n      return value\n    }\n\n    const result = { ...fields }\n    for (const key of keys) {\n      if (fields[key] !== undefined) {\n        result[key] =\n          key === 'image'\n            ? images(fields[key])\n            : copy(fields[key], depth + 1, ['itemListElement', 'item', 'image'])\n      }\n    }\n    return result\n  }\n\n  return copy(node, 0, ['image', 'recipeInstructions']) as typeof node\n}\n\nfunction parseJson(text: string): unknown {\n  try {\n    return JSON.parse(text)\n  } catch {\n    return undefined\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/schema-org/from-json-ld.js

@@ -7,10 +7,10 @@ import { parseIngredientLine } from "../ingredient/parse.js";
 import { issue, warning } from "../issues.js";
 import { matchAmount } from "../quantity/parse.js";
 import { parseIsoDuration } from "../recipe/duration.js";
-import { parseRecipe } from "../recipe/parse.js";
+import { parseRecipeWith } from "../recipe/parse.js";
 import { disallowedScheme } from "../recipe/url.js";
 import { asRecord, toResult } from "../validation.js";
-import { locate, MAX_DEPTH } from "./find.js";
+import { entriesOf, locate, MAX_DEPTH } from "./find.js";
 import { NUTRIENTS } from "./nutrients.js";
 import { cleanLines, cleanText } from "./text.js";
 var READ_FIELDS = [
@@ -33,6 +33,7 @@ var TIMES = [
   ["cook", "cookTime"],
   ["total", "totalTime"]
 ];
+var MAX_URL_LENGTH = 4096;
 var SERVINGS_WORD = /^(?:servings?|portions?|(?:serving|portion)\(s\)|people|persons?)\.?$/i;
 function fromJsonLd(input) {
   const { recipes, ids } = locate([input]);
@@ -44,7 +45,7 @@ function fromJsonLd(input) {
           "error",
           "invalid_type",
           [],
-          `Expected a schema.org Recipe, or an array, @graph, or mainEntity that holds one, received ${describeValue(input)}.`
+          `Expected a schema.org Recipe, or an array, @graph, mainEntity, or ItemList that holds one, received ${describeValue(input)}.`
         )
       ]),
       extra: {}
@@ -57,7 +58,9 @@ function fromJsonLd(input) {
     warnings: [],
     sources: /* @__PURE__ */ new Map(),
     droppable: /* @__PURE__ */ new Set(),
-    images: /* @__PURE__ */ new Map()
+    images: [/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map()],
+    repeated: 0,
+    deepest: 0
   };
   const name = text(node.name);
   if (recipes.length > 1) {
@@ -69,14 +72,15 @@ function fromJsonLd(input) {
     );
   }
   const model = readRecipe(reader, node, found.path);
-  const parse = () => parseRecipe(model, { parseIngredientLine });
+  const parse = () => parseRecipeWith(model, parseIngredientLine);
   let result = parse();
   const dropped = [];
   if (!result.success) {
+    const targets = [];
     for (const error of result.error.issues) {
       const target = error.severity === "error" ? droppableAt(reader, error.path) : void 0;
       if (target) {
-        remove(model, target);
+        targets.push(target);
         dropped.push({
           ...error,
           severity: "warning",
@@ -84,12 +88,13 @@ function fromJsonLd(input) {
         });
       }
     }
+    targets.sort((a, b) => b.length - a.length).forEach((target) => remove(model, target));
     if (dropped.length > 0) {
       result = parse();
     }
   }
   const order = ({ code, path }) => [
-    READ_FIELDS.indexOf(String(path[found.path.length])),
+    path.length > found.path.length ? READ_FIELDS.indexOf(String(path[found.path.length])) : -1,
     ...path.slice(found.path.length + 1).filter((key) => typeof key === "number"),
     ...code === "unknown_field" ? [Infinity] : []
   ];
@@ -100,6 +105,25 @@ function fromJsonLd(input) {
       ...result.success ? result.warnings : result.error.issues
     ].map((issue2) => ({ ...issue2, path: sourceOf(reader, issue2.path) }))
   ].sort((a, b) => compareOrder(order(a), order(b)));
+  const checked = /* @__PURE__ */ new Map();
+  const extra = Object.fromEntries(
+    Object.entries(node).filter(([key, value]) => {
+      if (READ_FIELDS.includes(key)) {
+        return false;
+      }
+      const path = [...found.path, key];
+      if (tooDeep(value, path.length, checked)) {
+        warning(
+          issues,
+          "invalid_type",
+          path,
+          `Expected a value to keep in extra, received ${describeValue(value)} nested more than ${MAX_DEPTH} levels deep. It is ignored.`
+        );
+        return false;
+      }
+      return true;
+    })
+  );
   return {
     ...toResult(
       "invalid_recipe",
@@ -107,11 +131,24 @@ function fromJsonLd(input) {
       issues,
       typeof name === "string" ? quote(name) : void 0
     ),
-    extra: Object.fromEntries(
-      Object.entries(node).filter(([key]) => !READ_FIELDS.includes(key))
-    )
+    extra
   };
 }
+function tooDeep(value, length, checked) {
+  if (length > MAX_DEPTH) {
+    return true;
+  }
+  if (typeof value !== "object" || value === null || (checked.get(value) ?? 0) >= length) {
+    return false;
+  }
+  const deep = Object.values(value).some(
+    (child) => tooDeep(child, length + 1, checked)
+  );
+  if (!deep) {
+    checked.set(value, length);
+  }
+  return deep;
+}
 function readRecipe(reader, node, base) {
   const at = (...path) => [...base, ...path];
   const model = {
@@ -159,10 +196,9 @@ function readImage(reader, value, source) {
   if (isAbsent(value)) {
     return void 0;
   }
-  const warnings = reader.warnings.length;
-  reader.repeated = false;
+  const warnings = reader.warnings.length + reader.repeated;
   const image = findImage(reader, value, source);
-  if (!image && !reader.repeated && reader.warnings.length === warnings) {
+  if (!image && reader.warnings.length + reader.repeated === warnings) {
     ignore(
       reader,
       "invalid_type",
@@ -173,6 +209,18 @@ function readImage(reader, value, source) {
   return image;
 }
 function findImage(reader, value, source, referenced = false) {
+  reader.deepest = Math.max(reader.deepest, source.length);
+  if (source.length > MAX_DEPTH) {
+    if (!isAbsent(value)) {
+      ignore(
+        reader,
+        "invalid_type",
+        source,
+        `Expected an image URL, an ImageObject with a url, or a list of them, received ${describeValue(value)} nested more than ${MAX_DEPTH} levels deep.`
+      );
+    }
+    return void 0;
+  }
   if (typeof value === "string") {
     const url = cleanText(value);
     const scheme = disallowedScheme(url);
@@ -185,60 +233,75 @@ function findImage(reader, value, source, referenced = false) {
       );
       return void 0;
     }
+    if (url.length > MAX_URL_LENGTH) {
+      ignore(
+        reader,
+        "invalid_url",
+        source,
+        `Expected a URL of at most ${MAX_URL_LENGTH} UTF-16 code units, received ${url.length}.`
+      );
+      return void 0;
+    }
     return url ? { url, source } : void 0;
   }
-  if (source.length > MAX_DEPTH) {
-    return void 0;
-  }
   if (Array.isArray(value)) {
-    for (const [i, entry] of value.entries()) {
-      const image2 = findImage(reader, entry, [...source, i], referenced);
+    for (const [entry, entrySource] of entriesOf(value, source)) {
+      const image2 = findImage(reader, entry, entrySource, referenced);
       if (image2) {
         return image2;
       }
     }
     return void 0;
   }
+  const images = reader.images[referenced ? 1 : 0];
+  const reads = images.get(value) ?? [];
+  const read = reads.find(
+    ([, , depth, length]) => length === source.length || Math.max(length, source.length) + depth <= MAX_DEPTH
+  );
+  if (read) {
+    reader.repeated += read[1];
+    reader.deepest = Math.max(reader.deepest, source.length + read[2]);
+    return read[0];
+  }
   const record = asRecord(value);
   if (!record) {
     return void 0;
   }
+  images.set(value, reads);
+  const warnings = reader.warnings.length + reader.repeated;
+  const deepest = reader.deepest;
+  reader.deepest = source.length;
   const id = record["@id"];
   const target = typeof id === "string" && !referenced ? reader.ids.get(id) : void 0;
-  const image = findImage(reader, record.url, [...source, "url"], referenced) ?? findImage(reader, record.contentUrl, [...source, "contentUrl"], referenced);
-  if (image || !target) {
-    return image;
-  }
-  if (target.node === reader.recipe) {
+  let image = findImage(reader, record.url, [...source, "url"], referenced) ?? findImage(reader, record.contentUrl, [...source, "contentUrl"], referenced);
+  if (!image && target?.node === reader.recipe) {
     ignore(
       reader,
       "invalid_type",
       source,
       "Expected an image URL, an ImageObject with a url, or a list of them, received a reference to the recipe itself."
     );
-    return void 0;
-  }
-  let read = reader.images.get(target);
-  if (!read) {
-    const warnings = reader.warnings.length;
-    const found = findImage(reader, target.node, target.path, true);
-    read = [found, reader.warnings.length > warnings];
-    reader.images.set(target, read);
-  } else if (read[1]) {
-    reader.repeated = true;
-  }
-  return read[0];
+  } else if (!image && target) {
+    image = findImage(reader, target.node, target.path, true);
+  }
+  reads.push([
+    image,
+    reader.warnings.length + reader.repeated - warnings,
+    reader.deepest - source.length,
+    source.length
+  ]);
+  reader.deepest = Math.max(reader.deepest, deepest);
+  return image;
 }
 function readYield(reader, model, value, source) {
-  const entries = Array.isArray(value) ? value.map((entry, i) => [entry, [...source, i]]) : [[value, source]];
-  const batches = entries.flatMap(
+  const batches = entriesOf(value, source).flatMap(
     ([entry, entrySource]) => (typeof entry === "string" ? entry.split(/,\s+/) : [entry]).map(
       (part) => readBatch(reader, part, entrySource)
     )
   ).filter((batch) => batch !== void 0);
   const yields = batches.filter((batch) => batch.yield !== void 0);
   const servings = batches.filter((batch) => batch.servings !== void 0);
-  const kept = yields.find((batch) => !batch.article) ?? yields[0];
+  const kept = yields.find((batch) => !batch.article) ?? yields.find((batch) => batch.article);
   const keptServings = servings.find((batch) => batch.worded) ?? servings.find((batch) => batch.amount !== kept?.amount);
   for (const batch of servings) {
     if (keptServings && batch.amount !== keptServings.amount && (batch.worded || batch.amount !== kept?.amount)) {
@@ -305,7 +368,7 @@ function readBatch(reader, value, source) {
       amount,
       ...max !== void 0 && max !== amount && { max }
     };
-    const label = `${amount}${range.max ? `\u2013${range.max}` : ""}${unit && ` ${unit}`}`;
+    const label = `${amount}${max !== amount && max ? `\u2013${max}` : ""}${unit && ` ${unit}`}`;
     return !unit || SERVINGS_WORD.test(unit) ? { source, label, amount, servings: range, worded: !!unit } : { source, label, amount, yield: { ...range, unit } };
   }
   if (!isAbsent(value)) {
@@ -351,15 +414,17 @@ function readList(reader, key, value, source, readItem, expected) {
       return;
     }
     if (Array.isArray(entry)) {
-      const positions = entry.map(
-        (element) => toNumber(asRecord(element)?.position)
+      const elements2 = entriesOf(entry, entrySource);
+      const positions = elements2.map(
+        ([element]) => toNumber(asRecord(element)?.position)
       );
-      const order = [...entry.keys()];
+      const order = [...elements2.keys()];
       if (!positions.includes(void 0)) {
         order.sort((a, b) => positions[a] - positions[b]);
       }
       for (const i of order) {
-        add(items, path, entry[i], [...entrySource, i], inSection);
+        const [element, elementSource] = elements2[i];
+        add(items, path, element, elementSource, inSection);
       }
       return;
     }
@@ -385,6 +450,10 @@ function readList(reader, key, value, source, readItem, expected) {
       }
       return;
     }
+    if (record && !isAbsent(record.item)) {
+      add(items, path, record.item, [...entrySource, "item"], inSection);
+      return;
+    }
     const read = readItem(reader, entry, entrySource);
     if (!read) {
       ignore(
@@ -399,7 +468,7 @@ function readList(reader, key, value, source, readItem, expected) {
       const itemPath = [...path, items.length];
       items.push(item.value);
       link(reader, itemPath, item.source, true);
-      for (const [field, fieldSource, droppable] of item.fields ?? []) {
+      for (const [field, fieldSource, droppable] of item.fields) {
         link(reader, [...itemPath, field], fieldSource, droppable);
       }
     }
@@ -409,26 +478,28 @@ function readList(reader, key, value, source, readItem, expected) {
 }
 function readLine(reader, value, source) {
   if (typeof value === "string") {
-    return cleanLines(value).map((line) => ({ value: line, source }));
+    return cleanLines(value).map((line) => ({
+      value: line,
+      source,
+      fields: []
+    }));
   }
   const record = asRecord(value);
-  if (record?.item !== void 0 && source.length < MAX_DEPTH) {
-    return readLine(reader, record.item, [...source, "item"]);
-  }
   const parts = [record?.value, record?.unitText, record?.name ?? record?.text].filter((part) => typeof part === "string" || typeof part === "number").join(" ");
-  return parts ? cleanLines(parts).map((line) => ({ value: line, source })) : void 0;
+  return parts ? cleanLines(parts).map((line) => ({ value: line, source, fields: [] })) : void 0;
 }
 function readStep(reader, value, source) {
   if (typeof value === "string") {
-    return cleanLines(value).map((line) => ({ value: line, source }));
+    return cleanLines(value).map((line) => ({
+      value: line,
+      source,
+      fields: []
+    }));
   }
   const record = asRecord(value);
   if (!record) {
     return void 0;
   }
-  if (record.item !== void 0 && source.length < MAX_DEPTH) {
-    return readStep(reader, record.item, [...source, "item"]);
-  }
   const name = typeof record.name === "string" ? cleanText(record.name) : "";
   const body = text(record.text) ?? name;
   const image = readImage(reader, record.image, [...source, "image"]);
@@ -453,10 +524,9 @@ function readStep(reader, value, source) {
   ];
 }
 function readTools(reader, value, source) {
-  const entries = Array.isArray(value) ? value.map((entry, i) => [entry, [...source, i]]) : [[value, source]];
   const equipment = [];
   link(reader, ["equipment"], source);
-  for (const [entry, entrySource] of entries) {
+  for (const [entry, entrySource] of entriesOf(value, source)) {
     const record = asRecord(entry);
     const item = record ? {
       name: text(record.name),
@@ -543,10 +613,10 @@ function sourceOf(reader, path) {
 }
 function compareOrder(a, b) {
   for (const [i, n] of a.entries()) {
-    const m = b[i];
-    if (m === void 0) {
+    if (i === b.length) {
       return 1;
     }
+    const m = b[i];
     if (n !== m) {
       return n - m;
     }