mcp-marmiton 1.7.0 → 1.8.1

package/README.md

@@ -5,6 +5,8 @@
 [![license](https://img.shields.io/npm/l/mcp-marmiton.svg)](./LICENSE)
 [![MCP Registry](https://img.shields.io/badge/MCP_Registry-listed-6E56CF)](https://registry.modelcontextprotocol.io/v0/servers?search=io.github.smeet666/mcp-marmiton)
 [![Glama](https://glama.ai/mcp/servers/smeet666/mcp-marmiton/badges/score.svg)](https://glama.ai/mcp/servers/smeet666/mcp-marmiton)
+[![Install in Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en/install-mcp?name=marmiton&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsIm1jcC1tYXJtaXRvbiJdfQ%3D%3D)
+[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=marmiton&config=%7B%22name%22%3A%22marmiton%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22mcp-marmiton%22%5D%7D)
 
 An [MCP](https://modelcontextprotocol.io) server for [Marmiton](https://www.marmiton.org),
 the French recipe site. Search recipes, read their ingredients and steps, and

package/dist/index.js

@@ -4,7 +4,7 @@
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 // src/version.ts
-var PKG_VERSION = "1.7.0";
+var PKG_VERSION = "1.8.1";
 var REPO_URL = "https://github.com/smeet666/mcp-marmiton";
 
 // src/config.ts
@@ -113,44 +113,6 @@ function createLogger(level) {
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z as z6 } from "zod";
 
-// src/marmiton/cache.ts
-var TtlLruCache = class {
-  constructor(maxEntries, ttlMs) {
-    this.maxEntries = maxEntries;
-    this.ttlMs = ttlMs;
-  }
-  maxEntries;
-  ttlMs;
-  store = /* @__PURE__ */ new Map();
-  get(key) {
-    const entry = this.store.get(key);
-    if (!entry) return void 0;
-    if (Date.now() >= entry.expiresAt) {
-      this.store.delete(key);
-      return void 0;
-    }
-    this.store.delete(key);
-    this.store.set(key, entry);
-    return entry.value;
-  }
-  set(key, value) {
-    if (this.maxEntries <= 0 || this.ttlMs <= 0) return;
-    this.store.delete(key);
-    this.store.set(key, { value, expiresAt: Date.now() + this.ttlMs });
-    while (this.store.size > this.maxEntries) {
-      const oldest = this.store.keys().next();
-      if (oldest.done) break;
-      this.store.delete(oldest.value);
-    }
-  }
-  get size() {
-    return this.store.size;
-  }
-  clear() {
-    this.store.clear();
-  }
-};
-
 // src/errors.ts
 var MarmitonError = class extends Error {
   constructor(code, message, details = {}) {
@@ -199,6 +161,44 @@ function upstreamError(url, status) {
   });
 }
 
+// src/marmiton/cache.ts
+var TtlLruCache = class {
+  constructor(maxEntries, ttlMs) {
+    this.maxEntries = maxEntries;
+    this.ttlMs = ttlMs;
+  }
+  maxEntries;
+  ttlMs;
+  store = /* @__PURE__ */ new Map();
+  get(key) {
+    const entry = this.store.get(key);
+    if (!entry) return void 0;
+    if (Date.now() >= entry.expiresAt) {
+      this.store.delete(key);
+      return void 0;
+    }
+    this.store.delete(key);
+    this.store.set(key, entry);
+    return entry.value;
+  }
+  set(key, value) {
+    if (this.maxEntries <= 0 || this.ttlMs <= 0) return;
+    this.store.delete(key);
+    this.store.set(key, { value, expiresAt: Date.now() + this.ttlMs });
+    while (this.store.size > this.maxEntries) {
+      const oldest = this.store.keys().next();
+      if (oldest.done) break;
+      this.store.delete(oldest.value);
+    }
+  }
+  get size() {
+    return this.store.size;
+  }
+  clear() {
+    this.store.clear();
+  }
+};
+
 // src/marmiton/rateLimiter.ts
 var DEFAULT_MAX_INTERVAL_MS = 1e4;
 var RateLimiter = class {
@@ -647,7 +647,14 @@ var MarmitonClient = class {
    */
   async search(query) {
     const url = buildSearchUrl(query);
-    return this.fetchParsed(url, (html) => parseSearchPage(html, url));
+    try {
+      return await this.fetchParsed(url, (html) => parseSearchPage(html, url));
+    } catch (error) {
+      if (error instanceof MarmitonError && error.code === "not_found") {
+        return { data: [], cached: false };
+      }
+      throw error;
+    }
   }
   async getRecipe(ref) {
     const { id, url } = resolveRecipeRef(ref);
@@ -1024,6 +1031,21 @@ function matchLeadingUnit(text, partitive = false) {
   return null;
 }
 var AMBIGUOUS_COMMA = /^\s*\d+,\d+,\d/;
+var CONTAINER_CONTENTS = /^\s*(?:de\s|d'|du\s|des\s)/i;
+function statesItemSize(item) {
+  const attached = /\s+de\s+(?=\d)/i.exec(item);
+  if (!attached) return false;
+  const named = item.slice(0, attached.index).trim();
+  if (!named || /\d/.test(named)) return false;
+  return isStatedSize(item.slice(attached.index + attached[0].length));
+}
+function isStatedSize(text) {
+  const size = parseLeadingQuantity(text);
+  if (!size) return false;
+  const measure = matchLeadingUnit(text.slice(size.length).trimStart());
+  if (!measure || measure.unit.kind !== "measured") return false;
+  return !CONTAINER_CONTENTS.test(measure.rest);
+}
 var PER_PERSON = /\bpar\s+(?:personne|convive|part|tête)\b/i;
 var APPROXIMATION_PREFIX = /^(?:~|≈|environ|approximativement|à peu près|a peu pres)\s*/i;
 var MEASURE_ADJECTIVES = /* @__PURE__ */ new Set([
@@ -1093,6 +1115,10 @@ function parseIngredient(line) {
   rest = bracketed.rest;
   const slashed = bracketed.measures.length > 0 ? null : takeSlashAlternates(rest);
   if (slashed) rest = slashed.rest;
+  const item = rest.replace(/^(?:de\s+la\s+|de\s+l'|d'|de\s+|du\s+|des\s+)/i, "").replace(/^(?:une|un)\s+/i, "").trim();
+  if (!unit && statesItemSize(item)) return empty("itemSize");
+  const readForItsPosition = unitText !== null && lookupUnit(normalizeUnitKey(unitText)) === null;
+  if (unit && readForItsPosition && isStatedSize(item)) return empty("itemSize");
   return {
     original,
     heldBack: PER_PERSON.test(text) ? "perPerson" : null,
@@ -1105,13 +1131,7 @@ function parseIngredient(line) {
     unitText,
     alternates: slashed ? slashed.measures : bracketed.measures,
     alternateStyle: slashed ? "slash" : bracketed.measures.length > 0 ? "bracket" : null,
-    // "200 g de farine" reads better as item "farine" than "de farine".
-    //
-    // The article a partitive introduces goes with it: "2/3 d'un flacon" names a
-    // share of one flacon, and once the share has been multiplied the count sits
-    // where "un" stood. Leaving the article behind produces "4 un flacon", which
-    // reads as broken text rather than as a quantity.
-    item: rest.replace(/^(?:de\s+la\s+|de\s+l'|d'|de\s+|du\s+|des\s+)/i, "").replace(/^(?:une|un)\s+/i, "").trim(),
+    item,
     articleWord: fromArticle ? article?.word ?? null : null,
     countMultiplier: multiplier?.times ?? null
   };
@@ -1507,6 +1527,7 @@ function scaleAlternative(tail, options) {
 }
 var HELD_BACK_NOTE = {
   sizeQualifier: "The figures here give the size of one item rather than how many, so the line is left as published.",
+  itemSize: "The measure standing behind the item gives the size of one of them rather than how many, so the line is left as published. Serving more people is a matter of taking a bigger one, and serving fewer a smaller one.",
   perPerson: "This line already states an amount for one person, and the factor is what changes how many people the recipe serves, so the line is left as published.",
   ambiguousDecimal: "The comma in this number marks thousands in one convention and the decimal point in another, and the line gives no sign which was meant, so it is left as published."
 };
@@ -2073,6 +2094,13 @@ var searchRecipesOutputShape = {
   source: z5.literal("marmiton.org"),
   notes: z5.array(z5.string())
 };
+function titleCarries(title, query) {
+  const fold2 = (text) => text.normalize("NFD").replace(/[̀-ͯ]/g, "").replace(/œ/g, "oe").toLowerCase().replace(/[^a-z0-9]+/g, " ");
+  const haystack = ` ${fold2(title)} `;
+  const words = fold2(query).split(" ").filter((word) => word.length > 2);
+  if (words.length === 0) return true;
+  return words.some((word) => haystack.includes(` ${word}`));
+}
 async function runSearchRecipes(client, args) {
   try {
     const query = args.query.trim();
@@ -2099,6 +2127,11 @@ async function runSearchRecipes(client, args) {
       url: recipe.url,
       image_url: recipe.imageUrl
     }));
+    if (results.length > 0 && !results.some((recipe) => titleCarries(recipe.title, query))) {
+      notes.push(
+        `No title here carries a word of "${query}". Marmiton ranks a title on the letters it opens with, so these rows are what the site offered for that spelling. Read them as candidates to check rather than as recipes for the dish.`
+      );
+    }
     const structured = {
       query,
       results,