mcp-recipes 1.3.0 → 2.0.0

package/dist/sources/client.js

@@ -1,5 +1,8 @@
+// src/config.ts
+import process from "process";
+
 // src/version.ts
-var PKG_VERSION = "1.3.0";
+var PKG_VERSION = "2.0.0";
 var REPO_URL = "https://github.com/smeet666/mcp-recipes";
 var ISSUES_URL = "https://github.com/smeet666/mcp-recipes/issues";
 
@@ -12,7 +15,9 @@ var DEFAULT_USER_AGENT = `mcp-recipes/${PKG_VERSION} (+${REPO_URL})`;
 function createLogger(level) {
   const rank = LOG_LEVELS.indexOf(level);
   const write = (at, message) => {
-    if (rank === 0 || LOG_LEVELS.indexOf(at) > rank) return;
+    if (rank === 0 || LOG_LEVELS.indexOf(at) > rank) {
+      return;
+    }
     process.stderr.write(`[mcp-recipes] ${at}: ${message}
 `);
   };
@@ -27,9 +32,11 @@ function createLogger(level) {
 }
 function readInteger(env, name, fallback, min, max) {
   const raw = env[name];
-  if (raw === void 0 || raw.trim() === "") return fallback;
+  if (raw === void 0 || raw.trim() === "") {
+    return fallback;
+  }
   const value = Number(raw);
-  if (!Number.isFinite(value) || !Number.isInteger(value)) {
+  if (!(Number.isFinite(value) && Number.isInteger(value))) {
     process.stderr.write(
       `[mcp-recipes] error: ${name}="${raw}" is not a whole number; using ${fallback}.
 `
@@ -88,14 +95,14 @@ var RecipesError = class extends Error {
   code;
   details;
   constructor(code, message, details = {}) {
-    super(message);
+    super(message, details.cause === void 0 ? void 0 : { cause: details.cause });
     this.name = "RecipesError";
     this.code = code;
     this.details = details;
   }
 };
 var notFound = (message, details) => new RecipesError("not_found", message, details ?? {});
-var invalidInput = (message, hint) => new RecipesError("invalid_input", message, hint ? { hint } : {});
+var invalidInput = (message, hint, cause) => new RecipesError("invalid_input", message, { ...hint ? { hint } : {}, cause });
 var rateLimited = (message, details) => new RecipesError("rate_limited", message, {
   hint: "Wait a moment and ask again. This says nothing about whether the recipe exists.",
   ...details
@@ -107,7 +114,9 @@ var parseFailure = (message, details) => new RecipesError("parse_failure", messa
 var networkError = (message, details) => new RecipesError("network_error", message, details ?? {});
 var timeout = (message, details) => new RecipesError("timeout", message, details ?? {});
 function toRecipesError(error) {
-  if (error instanceof RecipesError) return error;
+  if (error instanceof RecipesError) {
+    return error;
+  }
   const message = error instanceof Error ? error.message : String(error);
   const raw = error;
   const code = typeof raw?.code === "string" ? raw.code : "";
@@ -116,14 +125,20 @@ function toRecipesError(error) {
   return new RecipesError(known ?? "network_error", message, details);
 }
 function fromSource(error, sourceName) {
-  if (error instanceof RecipesError) return error;
+  if (error instanceof RecipesError) {
+    return error;
+  }
   const known = toRecipesError(error);
   const reported = known.message.replace(/\s+/g, " ").trim();
   const opening = known.code === "not_found" ? `${sourceName} holds nothing under this name.` : `${sourceName} could not be read.`;
   const message = reported === "" ? opening : `${opening} It reports: "${reported}"`;
   const details = {};
-  if (known.details.url !== void 0) details.url = known.details.url;
-  if (known.details.status !== void 0) details.status = known.details.status;
+  if (known.details.url !== void 0) {
+    details.url = known.details.url;
+  }
+  if (known.details.status !== void 0) {
+    details.status = known.details.status;
+  }
   switch (known.code) {
     case "not_found":
       return notFound(message, details);
@@ -140,72 +155,6 @@ function fromSource(error, sourceName) {
   }
 }
 
-// src/sources/adapter.ts
-function text(value) {
-  return typeof value === "string" && value.trim() !== "" ? value : null;
-}
-function textList(value) {
-  return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
-}
-function count(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : null;
-}
-function required(value, field, source) {
-  const found = text(value);
-  if (found === null) {
-    throw parseFailure(
-      `${source.name} answered without a readable "${field}", so there is no recipe to return.`
-    );
-  }
-  return found;
-}
-function rowsOf(value, source) {
-  if (!Array.isArray(value)) {
-    throw parseFailure(
-      `${source.name} answered in a shape this server could not read: the list of results was missing.`
-    );
-  }
-  return value;
-}
-function namespacedId(source, reference) {
-  return `${source}:${reference}`;
-}
-function publishedFigures(panel) {
-  if (typeof panel !== "object" || panel === null) return null;
-  const kept = {};
-  for (const [key, value] of Object.entries(panel)) {
-    if (typeof value === "string" && value.trim() !== "") kept[key] = value.trim();
-  }
-  return Object.keys(kept).length > 0 ? kept : null;
-}
-function readYieldSpan(published) {
-  if (published === null) return { count: null, max: null, unit: null };
-  const span = /^\s*(\d+(?:[.,]\d+)?)\s*(?:à|a|to|-|–|—|ou|or)\s*(\d+(?:[.,]\d+)?)\s*(.*)$/i.exec(
-    published
-  );
-  if (span) {
-    const low = Number(span[1].replace(",", "."));
-    const high = Number(span[2].replace(",", "."));
-    if (Number.isFinite(low) && Number.isFinite(high) && high > low) {
-      return { count: low, max: high, unit: text(span[3]) };
-    }
-  }
-  const single = /^\s*(\d+(?:[.,]\d+)?)\s*(.*)$/.exec(published);
-  if (single) {
-    const value = Number(single[1].replace(",", "."));
-    if (Number.isFinite(value)) return { count: value, max: null, unit: text(single[2]) };
-  }
-  return { count: null, max: null, unit: null };
-}
-function detailBase(source) {
-  return {
-    source: source.id,
-    sourceName: source.name,
-    language: source.language,
-    attribution: source.attribution
-  };
-}
-
 // src/sources/ids.ts
 var SEPARATOR = ":";
 function resolveId(rawId, sources) {
@@ -218,7 +167,9 @@ function resolveId(rawId, sources) {
   }
   for (const source of sources) {
     const prefix = `${source.id}${SEPARATOR}`;
-    if (!trimmed.toLowerCase().startsWith(prefix.toLowerCase())) continue;
+    if (!trimmed.toLowerCase().startsWith(prefix.toLowerCase())) {
+      continue;
+    }
     const reference = trimmed.slice(prefix.length).trim();
     if (reference === "") {
       throw invalidInput(
@@ -252,8 +203,10 @@ function resolveId(rawId, sources) {
 }
 function names(sources) {
   const all = sources.map((source) => source.name);
-  if (all.length <= 1) return all.join("");
-  return `${all.slice(0, -1).join(", ")} and ${all[all.length - 1]}`;
+  if (all.length <= 1) {
+    return all.join("");
+  }
+  return `${all.slice(0, -1).join(", ")} and ${all.at(-1)}`;
 }
 function example(sources) {
   const first = sources[0];
@@ -264,6 +217,82 @@ function example(sources) {
 import { MarmitonClient } from "mcp-marmiton/client";
 import { CookbookClient } from "mcp-wikibooks-cookbook/client";
 
+// src/sources/adapter.ts
+var NUMBER_AND_REST = /^\s*(\d+(?:[.,]\d+)?)\s*(.*)$/;
+var RANGE_AND_REST = /^\s*(\d+(?:[.,]\d+)?)\s*(?:à|a|to|-|–|—|ou|or)\s*(\d+(?:[.,]\d+)?)\s*(.*)$/i;
+function text(value) {
+  return typeof value === "string" && value.trim() !== "" ? value : null;
+}
+function textList(value) {
+  return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
+}
+function count(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function required(value, field, source) {
+  const found = text(value);
+  if (found === null) {
+    throw parseFailure(
+      `${source.name} answered without a readable "${field}", so there is no recipe to return.`
+    );
+  }
+  return found;
+}
+function rowsOf(value, source) {
+  if (!Array.isArray(value)) {
+    throw parseFailure(
+      `${source.name} answered in a shape this server could not read: the list of results was missing.`
+    );
+  }
+  return value;
+}
+function namespacedId(source, reference) {
+  return `${source}:${reference}`;
+}
+function publishedFigures(panel) {
+  if (typeof panel !== "object" || panel === null) {
+    return null;
+  }
+  const kept = {};
+  for (const [key, value] of Object.entries(panel)) {
+    if (typeof value === "string" && value.trim() !== "") {
+      kept[key] = value.trim();
+    }
+  }
+  return Object.keys(kept).length > 0 ? kept : null;
+}
+function readYieldSpan(published) {
+  if (published === null) {
+    return { count: null, max: null, unit: null };
+  }
+  const span = RANGE_AND_REST.exec(published);
+  if (span) {
+    const [lowText = "", highText = ""] = span.slice(1);
+    const low = Number(lowText.replace(",", "."));
+    const high = Number(highText.replace(",", "."));
+    if (Number.isFinite(low) && Number.isFinite(high) && high > low) {
+      return { count: low, max: high, unit: text(span[3]) };
+    }
+  }
+  const single = NUMBER_AND_REST.exec(published);
+  if (single) {
+    const [figure = ""] = single.slice(1);
+    const value = Number(figure.replace(",", "."));
+    if (Number.isFinite(value)) {
+      return { count: value, max: null, unit: text(single[2]) };
+    }
+  }
+  return { count: null, max: null, unit: null };
+}
+function detailBase(source) {
+  return {
+    source: source.id,
+    sourceName: source.name,
+    language: source.language,
+    attribution: source.attribution
+  };
+}
+
 // src/sources/cookbook.ts
 var COOKBOOK_PROFILE = {
   id: "cookbook",
@@ -287,10 +316,11 @@ function cookbookAdapter(reader) {
         let key;
         try {
           key = decodeURIComponent(raw.replace(SITE_URL, "")).replace(/_/g, " ");
-        } catch {
+        } catch (cause) {
           throw invalidInput(
             `"${raw}" carries a percent sign that is not a valid escape, so the page name cannot be read.`,
-            "Pass the id search_recipes returned instead of the address."
+            "Pass the id search_recipes returned instead of the address.",
+            cause
           );
         }
         return {
@@ -320,7 +350,7 @@ function cookbookAdapter(reader) {
         const key = text(summary?.key);
         const title = text(summary?.title) ?? key;
         const url = text(summary?.sourceUrl);
-        if (!key || !title || !url) {
+        if (!(key && title && url)) {
           skipped += 1;
           continue;
         }
@@ -393,6 +423,7 @@ function cookbookDetail(payload) {
 }
 
 // src/sources/marmiton.ts
+var ABSOLUTE_URL = /^https?:\/\//i;
 var MARMITON_PROFILE = {
   id: "marmiton",
   name: "Marmiton",
@@ -409,7 +440,9 @@ async function readSearch(reader, query) {
     return await reader.search(query);
   } catch (error) {
     const code = error?.code;
-    if (code === "not_found") return { data: [], cached: false };
+    if (code === "not_found") {
+      return { data: [], cached: false };
+    }
     throw error;
   }
 }
@@ -438,7 +471,7 @@ function marmitonAdapter(reader) {
         const id = text(summary?.id);
         const title = text(summary?.title);
         const url = text(summary?.url);
-        if (!id || !title || !url) {
+        if (!(id && title && url)) {
           skipped += 1;
           continue;
         }
@@ -466,7 +499,7 @@ function marmitonAdapter(reader) {
       };
     },
     async getRecipe(reference) {
-      const ref = /^https?:\/\//i.test(reference) ? { url: reference } : { id: reference };
+      const ref = ABSOLUTE_URL.test(reference) ? { url: reference } : { id: reference };
       const outcome = await reader.getRecipe(ref);
       return { recipe: marmitonDetail(outcome.data), cached: outcome.cached };
     }
@@ -529,7 +562,9 @@ function buildSources(config, readers = {}) {
   ];
 }
 function selectSources(sources, wanted) {
-  if (!wanted) return sources;
+  if (!wanted) {
+    return sources;
+  }
   const unknown = wanted.filter((id) => !sources.some((source) => source.id === id));
   if (unknown.length > 0) {
     throw invalidInput(
@@ -548,6 +583,8 @@ function selectSources(sources, wanted) {
 }
 
 // src/sources/wordings.ts
+var DIGITS_ONLY = /^\d+$/;
+var WORD_SEPARATORS = /[^\p{L}\p{N}-]+/u;
 var MAX_WORDINGS_PER_SOURCE = 3;
 var FRENCH_FRAME = /* @__PURE__ */ new Set([
   "a",
@@ -837,28 +874,41 @@ var CONDITION_JOINERS = /* @__PURE__ */ new Set([
 ]);
 var FOOD_LINKERS = /* @__PURE__ */ new Set(["d", "de", "des", "du", "of"]);
 var CONDITION_WORDS = 3;
-var SERVING_PHRASES = [
-  /\bpour\s+(\d{1,3})\s*(?:personnes?|parts?|couverts?)\b/iu,
-  /\bfor\s+(\d{1,3})\s*(?:people|persons?|servings?|portions?)\b/iu,
-  /\bserves?\s+(\d{1,3})\b/iu,
-  /\b(\d{1,3})\s*(?:personnes?|people|servings?)\b/iu
-];
 var FREE_OF = /\b([\p{L}]{3,})[\s-]?free\b/iu;
 function foldWord(word) {
   return word.toLowerCase().normalize("NFD").replace(new RegExp("\\p{M}+", "gu"), "").replace(/œ/gu, "oe");
 }
+function namesTheDish(word, key) {
+  if (FRENCH_FRAME.has(key) || ENGLISH_FRAME.has(key)) {
+    return false;
+  }
+  if (FRENCH_FRAME.has(word) || ENGLISH_FRAME.has(word)) {
+    return false;
+  }
+  if (DIGITS_ONLY.test(word)) {
+    return false;
+  }
+  if (word.length < 2) {
+    return false;
+  }
+  return !CONDITION_UNITS.has(word);
+}
 function readQuestion(question) {
   const words = tokenise(question);
   const conditions = [];
   const dish = [];
   const state = (named, kind) => {
     const trimmed = named === null ? null : named.trim();
-    if (trimmed === "") return;
-    if (conditions.some((held) => held.named === trimmed && held.kind === kind)) return;
+    if (trimmed === "") {
+      return;
+    }
+    if (conditions.some((held) => held.named === trimmed && held.kind === kind)) {
+      return;
+    }
     conditions.push({ named: trimmed, kind });
   };
   for (let index = 0; index < words.length; index += 1) {
-    const word = words[index];
+    const word = words[index] ?? "";
     const key = foldWord(word);
     const hyphen = word.indexOf("-");
     if (hyphen > 0 && NEGATORS.has(foldWord(word.slice(0, hyphen)))) {
@@ -867,7 +917,7 @@ function readQuestion(question) {
     }
     const free = FREE_OF.exec(word);
     if (free) {
-      state(free[1], "excluded");
+      state(free[1] ?? "", "excluded");
       continue;
     }
     if (key === "free") {
@@ -894,12 +944,9 @@ function readQuestion(question) {
       state(word, "diet");
       continue;
     }
-    if (FRENCH_FRAME.has(key) || ENGLISH_FRAME.has(key)) continue;
-    if (FRENCH_FRAME.has(word) || ENGLISH_FRAME.has(word)) continue;
-    if (/^\d+$/.test(word)) continue;
-    if (word.length < 2) continue;
-    if (CONDITION_UNITS.has(word)) continue;
-    if (!dish.includes(word)) dish.push(word);
+    if (namesTheDish(word, key) && !dish.includes(word)) {
+      dish.push(word);
+    }
   }
   return { dish, conditions };
 }
@@ -920,15 +967,20 @@ function scopeOf(words, marker, dish) {
 }
 function takeFood(words, from) {
   let index = from;
-  while (index < words.length && isFiller(words[index])) index += 1;
+  while (index < words.length && isFiller(words[index] ?? "")) {
+    index += 1;
+  }
   const named = [];
   while (index < words.length && named.length < CONDITION_WORDS) {
-    if (!namesFood(words[index])) break;
-    named.push(words[index]);
+    const word = words[index] ?? "";
+    if (!namesFood(word)) {
+      break;
+    }
+    named.push(word);
     index += 1;
     const beyond = words[index + 1];
     if (named.length + 2 <= CONDITION_WORDS && FOOD_LINKERS.has(foldWord(words[index] ?? "")) && beyond !== void 0 && namesFood(beyond)) {
-      named.push(words[index]);
+      named.push(words[index] ?? "");
       index += 1;
       continue;
     }
@@ -942,28 +994,25 @@ function isFiller(word) {
 }
 function namesFood(word) {
   const key = foldWord(word);
-  if (key.length < 2) return false;
-  if (/^\d+$/.test(key)) return false;
-  if (key === "free") return false;
-  if (CONDITION_ENDS.has(key)) return false;
-  if (NEGATORS.has(key) || HEALTH_MARKERS.has(key)) return false;
-  if (CONDITION_UNITS.has(key)) return false;
-  return !(FRENCH_FRAME.has(key) || ENGLISH_FRAME.has(key));
-}
-function readConditions(question) {
-  const { conditions } = readQuestion(question);
-  let servings = null;
-  for (const phrase of SERVING_PHRASES) {
-    const found = phrase.exec(question);
-    if (found) {
-      const value = Number(found[1]);
-      if (Number.isFinite(value) && value > 0) {
-        servings = value;
-        break;
-      }
-    }
+  if (key.length < 2) {
+    return false;
+  }
+  if (DIGITS_ONLY.test(key)) {
+    return false;
+  }
+  if (key === "free") {
+    return false;
   }
-  return { conditions, servings };
+  if (CONDITION_ENDS.has(key)) {
+    return false;
+  }
+  if (NEGATORS.has(key) || HEALTH_MARKERS.has(key)) {
+    return false;
+  }
+  if (CONDITION_UNITS.has(key)) {
+    return false;
+  }
+  return !(FRENCH_FRAME.has(key) || ENGLISH_FRAME.has(key));
 }
 function deriveWordings(question) {
   const asked = tidy(question);
@@ -971,9 +1020,13 @@ function deriveWordings(question) {
   const seen = /* @__PURE__ */ new Set();
   const offer = (candidate, derivation) => {
     const clean = tidy(candidate);
-    if (clean === "") return;
+    if (clean === "") {
+      return;
+    }
     const key = clean.toLowerCase();
-    if (seen.has(key)) return;
+    if (seen.has(key)) {
+      return;
+    }
     seen.add(key);
     wordings.push({ query: clean, derivation });
   };
@@ -991,7 +1044,9 @@ function deriveWordings(question) {
 }
 function namesDish(title, question) {
   const words = namingWords(question);
-  if (words.length === 0) return true;
+  if (words.length === 0) {
+    return true;
+  }
   return dishWordsMissing(title, question).length < words.length;
 }
 function dishWordsMissing(title, question) {
@@ -1008,19 +1063,22 @@ function dishWords(question) {
   return readQuestion(question).dish;
 }
 function tokenise(value) {
-  return value.toLowerCase().replace(/['’]/gu, " ").split(/[^\p{L}\p{N}-]+/u).map((word) => word.replace(/^-+|-+$/g, "")).filter((word) => word !== "");
+  return value.toLowerCase().replace(/['’]/gu, " ").split(WORD_SEPARATORS).map((word) => word.replace(/^-+|-+$/g, "")).filter((word) => word !== "");
 }
 function tidy(value) {
   return value.replace(/\s+/g, " ").trim();
 }
 
 // src/sources/client.ts
+var LETTER_OR_DIGIT = /[\p{L}\p{N}]/u;
 var MAX_LIMIT_PER_SOURCE = 25;
 function withGuarantees(config) {
   const defaults = loadConfig({});
   const bounded = (value, fallback, min, max) => {
     const parsed = Number(value);
-    if (!Number.isFinite(parsed)) return fallback;
+    if (!Number.isFinite(parsed)) {
+      return fallback;
+    }
     return Math.min(max, Math.max(min, parsed));
   };
   const claimed = typeof config.userAgent === "string" ? config.userAgent.trim() : "";
@@ -1081,13 +1139,31 @@ function heldBack(wording, because) {
     error: null
   };
 }
+function keepNewRows(read, seen, rows, question) {
+  let added = 0;
+  let onTopic = 0;
+  for (const row of read.rows) {
+    if (seen.has(row.id)) {
+      continue;
+    }
+    seen.add(row.id);
+    rows.push(row);
+    added += 1;
+    if (namesDish(row.title, question)) {
+      onTopic += 1;
+    }
+  }
+  return { added, onTopic };
+}
 function interleave(groups) {
   const merged = [];
   const longest = Math.max(0, ...groups.map((group) => group.length));
   for (let index = 0; index < longest; index += 1) {
     for (const group of groups) {
       const row = group[index];
-      if (row) merged.push(row);
+      if (row) {
+        merged.push(row);
+      }
     }
   }
   return merged;
@@ -1143,7 +1219,7 @@ var RecipesClient = class {
     if (trimmed === "") {
       throw invalidInput("A search needs something to look for.", "Name a dish or an ingredient.");
     }
-    if (!/[\p{L}\p{N}]/u.test(trimmed)) {
+    if (!LETTER_OR_DIGIT.test(trimmed)) {
       throw invalidInput(
         `"${trimmed}" carries no letter and no digit, so there is no word to search for.`,
         "Name a dish or an ingredient."
@@ -1155,10 +1231,10 @@ var RecipesClient = class {
     const attempts = await Promise.all(
       chosen.map((source) => this.searchOne(source, trimmed, limit, fanOut))
     );
-    const groups = attempts.map((attempt) => attempt.rows.slice(0, limit));
+    const answered = attempts.map((attempt) => ({ attempt, rows: attempt.rows.slice(0, limit) }));
     return {
-      rows: interleave(groups),
-      reports: attempts.map((attempt, index) => reportOf(attempt, groups[index].length))
+      rows: interleave(answered.map((one) => one.rows)),
+      reports: answered.map(({ attempt, rows }) => reportOf(attempt, rows.length))
     };
   }
   /**
@@ -1235,14 +1311,9 @@ var RecipesClient = class {
             `${source.name} sent ${read.skipped} row(s) this server could not read; they were left out.`
           );
         }
-        let added = 0;
-        for (const row of read.rows) {
-          if (seen.has(row.id)) continue;
-          seen.add(row.id);
-          rows.push(row);
-          added += 1;
-          if (namesDish(row.title, question)) onTopic += 1;
-        }
+        const kept = keepNewRows(read, seen, rows, question);
+        const added = kept.added;
+        onTopic += kept.onTopic;
         wordings.push({
           query: wording.query,
           derivation: wording.derivation,
@@ -1314,14 +1385,7 @@ var RecipesClient = class {
 };
 export {
   MAX_LIMIT_PER_SOURCE,
-  MAX_WORDINGS_PER_SOURCE,
   RecipesClient,
-  SOURCE_IDS,
-  deriveWordings,
-  interleave,
-  namesDish,
-  namespacedId,
-  readConditions,
-  resolveId
+  interleave
 };
 //# sourceMappingURL=client.js.map