soustack 0.4.0 → 0.4.1

package/dist/scrape/index.js

@@ -147,6 +147,7 @@ function normalizeRecipe(input) {
   }
   if (recipe && typeof recipe === "object" && "version" in recipe && !recipe.recipeVersion && typeof recipe.version === "string") {
     recipe.recipeVersion = recipe.version;
+    delete recipe.version;
     warnings.push("'version' is deprecated; mapped to 'recipeVersion'.");
   }
   normalizeTime(recipe);
@@ -216,6 +217,51 @@ function normalizeTime(recipe) {
   });
 }
 
+// src/specVersion.ts
+var SOUSTACK_SPEC_VERSION = "0.0.2";
+
+// src/schemaMetadata.ts
+var CANONICAL_SCHEMA_ID = "https://soustack.spec/soustack.schema.json";
+var LEGACY_SCHEMA_ID = `http://soustack.org/schema/v${SOUSTACK_SPEC_VERSION}`;
+var RAW_SPEC_BASE = "https://raw.githubusercontent.com/soustack/soustack-spec";
+var RAW_SPEC_FORK_BASE = "https://raw.githubusercontent.com/RichardHerold/soustack-spec";
+var SCHEMA_ALIAS_MAP = /* @__PURE__ */ new Map([
+  [CANONICAL_SCHEMA_ID, CANONICAL_SCHEMA_ID],
+  [LEGACY_SCHEMA_ID, CANONICAL_SCHEMA_ID],
+  [`${LEGACY_SCHEMA_ID}/`, CANONICAL_SCHEMA_ID],
+  ["https://soustack.org/schema/v0.0.2", CANONICAL_SCHEMA_ID],
+  ["https://soustack.org/schema/v0.0.2/", CANONICAL_SCHEMA_ID],
+  [`${RAW_SPEC_BASE}/main/soustack.schema.json`, CANONICAL_SCHEMA_ID],
+  [`${RAW_SPEC_BASE}/v${SOUSTACK_SPEC_VERSION}/soustack.schema.json`, CANONICAL_SCHEMA_ID],
+  [`${RAW_SPEC_FORK_BASE}/main/soustack.schema.json`, CANONICAL_SCHEMA_ID],
+  [`${RAW_SPEC_FORK_BASE}/v${SOUSTACK_SPEC_VERSION}/soustack.schema.json`, CANONICAL_SCHEMA_ID]
+]);
+function resolveSchemaHint(value) {
+  if (typeof value !== "string" || !value) {
+    return { canonicalId: void 0, isSoustackSchema: false, wasAlias: false };
+  }
+  const trimmed = value.replace(/#$/, "");
+  const mapped = SCHEMA_ALIAS_MAP.get(trimmed) ?? trimmed;
+  const isSoustackSchema = SCHEMA_ALIAS_MAP.has(trimmed) || mapped.startsWith("http://soustack.org/schema") || mapped.startsWith("https://soustack.org/schema") || mapped.startsWith("https://soustack.spec/") || mapped.startsWith("https://soustack.org/schemas/");
+  return {
+    canonicalId: mapped,
+    isSoustackSchema,
+    wasAlias: mapped !== trimmed || SCHEMA_ALIAS_MAP.has(trimmed)
+  };
+}
+function withCanonicalSchema(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return value;
+  }
+  const existing = typeof value.$schema === "string" ? value.$schema : void 0;
+  const resolved = resolveSchemaHint(existing);
+  const schemaId = resolved.isSoustackSchema ? resolved.canonicalId : CANONICAL_SCHEMA_ID;
+  return {
+    ...value,
+    $schema: schemaId ?? CANONICAL_SCHEMA_ID
+  };
+}
+
 // src/fromSchemaOrg.ts
 function fromSchemaOrg(input) {
   const recipeNode = extractRecipeNode(input);
@@ -231,23 +277,18 @@ function fromSchemaOrg(input) {
   const source = convertSource(recipeNode);
   const dateModified = recipeNode.dateModified || void 0;
   const nutrition = convertNutrition(recipeNode.nutrition);
-  const attribution = convertAttribution(recipeNode);
-  const taxonomy = convertTaxonomy(tags, category, extractFirst(recipeNode.recipeCuisine));
-  const media = convertMedia(recipeNode.image, recipeNode.video);
-  const times = convertTimes(time);
+  const images = toArray(normalizeImage(recipeNode.image));
+  const videos = normalizeMediaList(recipeNode.video);
+  const profile = recipeYield && time ? "base" : "lite";
   const stacks = {};
-  if (attribution) stacks.attribution = 1;
-  if (taxonomy) stacks.taxonomy = 1;
-  if (media) stacks.media = 1;
-  if (nutrition) stacks.nutrition = 1;
-  if (times) stacks.times = 1;
   const rawRecipe = {
     "@type": "Recipe",
-    profile: "minimal",
+    profile,
     stacks,
     name: recipeNode.name.trim(),
     description: recipeNode.description?.trim() || void 0,
-    image: normalizeImage(recipeNode.image),
+    images: images.length ? images : void 0,
+    videos: videos.length ? videos : void 0,
     category,
     tags: tags.length ? tags : void 0,
     source,
@@ -257,14 +298,10 @@ function fromSchemaOrg(input) {
     ingredients,
     instructions,
     ...dateModified ? { dateModified } : {},
-    ...nutrition ? { nutrition } : {},
-    ...attribution ? { attribution } : {},
-    ...taxonomy ? { taxonomy } : {},
-    ...media ? { media } : {},
-    ...times ? { times } : {}
+    ...nutrition ? { nutrition } : {}
   };
   const { recipe } = normalizeRecipe(rawRecipe);
-  return recipe;
+  return withCanonicalSchema(recipe);
 }
 function extractRecipeNode(input) {
   if (!input) return null;
@@ -308,7 +345,10 @@ function isValidName(name) {
 function convertIngredients(value) {
   if (!value) return [];
   const normalized = Array.isArray(value) ? value : [value];
-  return normalized.map((item) => typeof item === "string" ? item.trim() : "").filter(Boolean);
+  return normalized.map((item) => typeof item === "string" ? item.trim() : "").filter(Boolean).map((name) => ({
+    name,
+    scaling: { mode: "linear" }
+  }));
 }
 function convertInstructions(value) {
   if (!value) return [];
@@ -327,8 +367,8 @@ function convertInstructions(value) {
       const subsectionItems = extractSectionItems(entry.itemListElement);
       if (subsectionItems.length) {
         result.push({
-          subsection: entry.name?.trim() || "Section",
-          items: subsectionItems
+          section: entry.name?.trim() || "Section",
+          steps: subsectionItems
         });
       }
       continue;
@@ -384,7 +424,7 @@ function convertHowToStep(step) {
   }
   const instruction = { text };
   if (id) instruction.id = id;
-  if (image) instruction.image = image;
+  if (image) instruction.images = Array.isArray(image) ? image : [image];
   if (timing) instruction.timing = timing;
   return instruction;
 }
@@ -394,7 +434,13 @@ function extractInstructionTiming(step) {
     return void 0;
   }
   const parsed = smartParseDuration(duration);
-  return { duration: parsed ?? duration, type: "active" };
+  if (parsed === null || parsed === void 0) {
+    return void 0;
+  }
+  return {
+    activity: "active",
+    duration: { minutes: parsed }
+  };
 }
 function extractInstructionId(step) {
   const raw = step["@id"] || step.id || step.url;
@@ -411,14 +457,22 @@ function isHowToSection(value) {
   return Boolean(value) && typeof value === "object" && value["@type"] === "HowToSection" && Array.isArray(value.itemListElement);
 }
 function convertTime(recipe) {
+  const total = smartParseDuration(recipe.totalTime ?? "");
   const prep = smartParseDuration(recipe.prepTime ?? "");
   const cook = smartParseDuration(recipe.cookTime ?? "");
-  const total = smartParseDuration(recipe.totalTime ?? "");
-  const structured = {};
-  if (prep !== null && prep !== void 0) structured.prep = prep;
-  if (cook !== null && cook !== void 0) structured.active = cook;
-  if (total !== null && total !== void 0) structured.total = total;
-  return Object.keys(structured).length ? structured : void 0;
+  const minutes = isPositiveDuration(total) ? total : [prep, cook].filter(isPositiveDuration).reduce((sum, value) => {
+    if (sum === null) return value;
+    return sum + value;
+  }, null);
+  if (!isPositiveDuration(minutes)) {
+    return void 0;
+  }
+  return {
+    total: { minutes }
+  };
+}
+function isPositiveDuration(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
 }
 function collectTags(cuisine, keywords) {
   const tags = /* @__PURE__ */ new Set();
@@ -476,23 +530,6 @@ function extractEntityName(value) {
   }
   return void 0;
 }
-function convertAttribution(recipe) {
-  const attribution = {};
-  const url = (recipe.url || recipe.mainEntityOfPage)?.trim();
-  const author = extractEntityName(recipe.author);
-  const datePublished = recipe.datePublished?.trim();
-  if (url) attribution.url = url;
-  if (author) attribution.author = author;
-  if (datePublished) attribution.datePublished = datePublished;
-  return Object.keys(attribution).length ? attribution : void 0;
-}
-function convertTaxonomy(keywords, category, cuisine) {
-  const taxonomy = {};
-  if (keywords.length) taxonomy.keywords = keywords;
-  if (category) taxonomy.category = category;
-  if (cuisine) taxonomy.cuisine = cuisine;
-  return Object.keys(taxonomy).length ? taxonomy : void 0;
-}
 function normalizeMediaList(value) {
   if (!value) return [];
   if (typeof value === "string") return [value.trim()].filter(Boolean);
@@ -503,28 +540,18 @@ function normalizeMediaList(value) {
   return url ? [url] : [];
 }
 function extractMediaUrl(value) {
-  if (value && typeof value === "object" && "url" in value && typeof value.url === "string") {
-    const trimmed = value.url.trim();
-    return trimmed || void 0;
+  if (value && typeof value === "object") {
+    const urlValue = typeof value.url === "string" ? value.url : typeof value.contentUrl === "string" ? value.contentUrl : void 0;
+    if (typeof urlValue === "string") {
+      const trimmed = urlValue.trim();
+      return trimmed || void 0;
+    }
   }
   return void 0;
 }
-function convertMedia(image, video) {
-  const normalizedImage = normalizeImage(image);
-  const images = normalizedImage ? Array.isArray(normalizedImage) ? normalizedImage : [normalizedImage] : [];
-  const videos = normalizeMediaList(video);
-  const media = {};
-  if (images.length) media.images = images;
-  if (videos.length) media.videos = videos;
-  return Object.keys(media).length ? media : void 0;
-}
-function convertTimes(time) {
-  if (!time) return void 0;
-  const times = {};
-  if (typeof time.prep === "number") times.prepMinutes = time.prep;
-  if (typeof time.active === "number") times.cookMinutes = time.active;
-  if (typeof time.total === "number") times.totalMinutes = time.total;
-  return Object.keys(times).length ? times : void 0;
+function toArray(value) {
+  if (!value) return [];
+  return Array.isArray(value) ? value : [value];
 }
 function convertNutrition(nutrition) {
   if (!nutrition || typeof nutrition !== "object") {