@aleph-alpha/lib-mcp 1.6.0 → 1.6.1

package/dist/cli.js

@@ -21129,6 +21129,7 @@ import * as path5 from "node:path";
 
 // src/readers/types-reader.ts
 import * as path2 from "node:path";
+var TYPE_OR_INTERFACE = "(?:interface|type)";
 function parseJSDoc(comment) {
   const lines = comment.replace(/\/\*\*|\*\/|\*/g, "").split("\n").map((line) => line.trim()).filter(Boolean);
   let description = "";
@@ -21169,7 +21170,7 @@ function extractType(text2, startIndex) {
 function parseInterface(content, interfaceName) {
   const props = [];
   const interfaceRegex = new RegExp(
-    `export\\s+interface\\s+${interfaceName}\\s*\\{([\\s\\S]*?)\\n\\}`,
+    `(?:export\\s+)?${TYPE_OR_INTERFACE}\\s+${interfaceName}\\s*(?:extends\\s+[^{]+)?(?:=\\s*)?\\{([\\s\\S]*?)\\n\\}`,
     "m"
   );
   const match = content.match(interfaceRegex);
@@ -21201,7 +21202,7 @@ function parseInterface(content, interfaceName) {
 function extractComponentDescription(content, interfaceName) {
   const lines = content.split("\n");
   const interfaceLineIndex = lines.findIndex(
-    (line) => line.match(new RegExp(`export\\s+interface\\s+${interfaceName}`))
+    (line) => line.match(new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+${interfaceName}`))
   );
   if (interfaceLineIndex === -1) {
     return "";
@@ -21226,28 +21227,67 @@ function extractComponentDescription(content, interfaceName) {
   }
   return "";
 }
-function readTypesFile(filePath) {
+function resolveUnionOrIntersectionProps(content, typeName) {
+  const typeDefRegex = new RegExp(`export\\s+type\\s+${typeName}\\s*=\\s*([^;]+)`);
+  const match = content.match(typeDefRegex);
+  if (!match) return [];
+  const referencedTypes = match[1].split(/[|&]/).map((t) => t.trim()).filter((t) => t.endsWith("Props"));
+  if (referencedTypes.length === 0) return [];
+  const firstBranch = referencedTypes[0];
+  const extendsRegex = new RegExp(
+    `(?:export\\s+)?${TYPE_OR_INTERFACE}\\s+${firstBranch}\\s+extends\\s+(\\w+)`
+  );
+  const extendsMatch = content.match(extendsRegex);
+  const allProps = [];
+  if (extendsMatch) {
+    allProps.push(...parseInterface(content, extendsMatch[1]));
+  }
+  allProps.push(...parseInterface(content, firstBranch));
+  const seen = /* @__PURE__ */ new Set();
+  return allProps.filter((p) => {
+    if (seen.has(p.name)) return false;
+    seen.add(p.name);
+    return true;
+  });
+}
+function readTypesFile(filePath, componentName) {
   const content = readTextFile(filePath);
   if (!content) {
     return null;
   }
-  const propsInterfaceMatch = content.match(/export\s+interface\s+(Ui\w+Props)/);
+  const resolvedName = componentName || path2.basename(path2.dirname(filePath));
+  const exactRegex = new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+(${resolvedName}Props)\\b`);
+  let propsInterfaceMatch = content.match(exactRegex);
+  if (!propsInterfaceMatch) {
+    const prefixRegex = new RegExp(
+      `export\\s+${TYPE_OR_INTERFACE}\\s+(${resolvedName}\\w*Props)\\b`
+    );
+    propsInterfaceMatch = content.match(prefixRegex);
+  }
+  if (!propsInterfaceMatch) {
+    propsInterfaceMatch = content.match(
+      new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+(Ui\\w+Props)\\b`)
+    );
+  }
   if (!propsInterfaceMatch) {
     return null;
   }
   const interfaceName = propsInterfaceMatch[1];
-  const componentName = interfaceName.replace("Props", "");
+  const matchedComponentName = interfaceName.replace("Props", "");
   const description = extractComponentDescription(content, interfaceName);
-  const props = parseInterface(content, interfaceName);
+  let props = parseInterface(content, interfaceName);
+  if (props.length === 0) {
+    props = resolveUnionOrIntersectionProps(content, interfaceName);
+  }
   return {
-    name: componentName,
+    name: matchedComponentName,
     description,
     props
   };
 }
 function readComponentTypes(componentDir) {
   const typesPath = path2.join(componentDir, "types.ts");
-  return readTypesFile(typesPath);
+  return readTypesFile(typesPath, path2.basename(componentDir));
 }
 
 // src/constants.ts
@@ -21460,6 +21500,40 @@ function extractStories(content) {
   }
   return stories;
 }
+function extractInlineRenderTemplates(content) {
+  const examples = [];
+  const storyExportRegex = /export\s+const\s+(\w+):\s*Story\s*=/g;
+  let match;
+  while ((match = storyExportRegex.exec(content)) !== null) {
+    const storyName = match[1];
+    if (storyName === "default") continue;
+    const afterEquals = content.indexOf("{", match.index + match[0].length);
+    if (afterEquals === -1) continue;
+    const closingBrace = findMatchingBrace(content, afterEquals);
+    if (closingBrace === -1) continue;
+    const storyBlock = content.slice(afterEquals, closingBrace + 1);
+    if (!storyBlock.includes("template:")) continue;
+    const templateMatch = storyBlock.match(/template:\s*`([\s\S]*?)`/);
+    if (!templateMatch) continue;
+    const template = templateMatch[1].trim();
+    if (!template) continue;
+    const componentsMatch = storyBlock.match(/components:\s*\{([^}]+)\}/);
+    const componentNames = componentsMatch ? componentsMatch[1].split(",").map((c) => c.trim()).filter(Boolean) : [];
+    const imports = componentNames.length > 0 ? `<script setup>
+// Components: ${componentNames.join(", ")}
+</script>
+
+` : "";
+    examples.push({
+      name: storyName,
+      description: "",
+      code: `${imports}<template>
+${template}
+</template>`
+    });
+  }
+  return examples;
+}
 function extractArgTypes(content) {
   const argTypes = [];
   const argTypesKeyIndex = content.indexOf("argTypes");
@@ -21516,6 +21590,56 @@ function extractTitle(content) {
   const titleMatch = content.match(/title:\s*['"]([^'"]+)['"]/);
   return titleMatch ? titleMatch[1] : "";
 }
+function extractMetaArgs(content) {
+  const metaDefaultIndex = content.indexOf("export default");
+  if (metaDefaultIndex === -1) return void 0;
+  const metaSection = content.slice(0, metaDefaultIndex);
+  const argsKeyIndex = metaSection.lastIndexOf("args:");
+  if (argsKeyIndex !== -1) {
+    return extractArgsFromPosition(content, argsKeyIndex);
+  }
+  const afterExport = content.slice(metaDefaultIndex + "export default".length);
+  const trimmed = afterExport.trimStart();
+  if (!trimmed.startsWith("{")) return void 0;
+  const blockStart = content.indexOf("{", metaDefaultIndex);
+  const blockEnd = findMatchingBrace(content, blockStart);
+  if (blockEnd === -1) return void 0;
+  const metaBlock = content.slice(blockStart + 1, blockEnd);
+  const inlineArgsIndex = metaBlock.indexOf("args:");
+  if (inlineArgsIndex === -1) return void 0;
+  return extractArgsFromPosition(content, blockStart + 1 + inlineArgsIndex);
+}
+function extractArgsFromPosition(content, argsKeyIndex) {
+  const colonIndex = content.indexOf(":", argsKeyIndex + 4);
+  if (colonIndex === -1) {
+    return void 0;
+  }
+  const openingBraceIndex = content.indexOf("{", colonIndex);
+  if (openingBraceIndex === -1) {
+    return void 0;
+  }
+  const closingBraceIndex = findMatchingBrace(content, openingBraceIndex);
+  if (closingBraceIndex === -1) {
+    return void 0;
+  }
+  const argsBlock = content.slice(openingBraceIndex + 1, closingBraceIndex);
+  const args = {};
+  const kvRegex = /(\w+)\s*:\s*(?:'([^']*)'|"([^"]*)"|(\d+(?:\.\d+)?)|(\btrue\b|\bfalse\b))/g;
+  let match;
+  while ((match = kvRegex.exec(argsBlock)) !== null) {
+    const key = match[1];
+    if (match[2] !== void 0) {
+      args[key] = match[2];
+    } else if (match[3] !== void 0) {
+      args[key] = match[3];
+    } else if (match[4] !== void 0) {
+      args[key] = Number(match[4]);
+    } else if (match[5] !== void 0) {
+      args[key] = match[5] === "true";
+    }
+  }
+  return Object.keys(args).length > 0 ? args : void 0;
+}
 function readStoriesFile(filePath) {
   const content = readTextFile(filePath);
   if (!content) {
@@ -21527,6 +21651,7 @@ function readStoriesFile(filePath) {
   const storyTemplateMap = extractStories(content);
   const examples = [];
   const usageGuidance = [];
+  const coveredStories = /* @__PURE__ */ new Set();
   for (const [storyName, templateVar] of storyTemplateMap) {
     const code = templateSources.get(templateVar);
     const description = extractStoryJSDoc(content, storyName);
@@ -21536,16 +21661,29 @@ function readStoriesFile(filePath) {
         description,
         code
       });
+      coveredStories.add(storyName);
     }
     if (description) {
       usageGuidance.push(description);
     }
   }
+  const inlineExamples = extractInlineRenderTemplates(content);
+  for (const example of inlineExamples) {
+    if (!coveredStories.has(example.name)) {
+      const description = extractStoryJSDoc(content, example.name);
+      examples.push({ ...example, description });
+      if (description) {
+        usageGuidance.push(description);
+      }
+    }
+  }
+  const defaultArgs = extractMetaArgs(content);
   return {
     title,
     examples,
     argTypes,
-    usageGuidance
+    usageGuidance,
+    defaultArgs
   };
 }
 function readComponentStories(componentDir) {
@@ -21619,7 +21757,8 @@ function getComponentDocs(componentName) {
     examples,
     usageGuidance: [...new Set(usageGuidance)],
     // Remove duplicates
-    subComponents: subComponents && subComponents.length > 0 ? subComponents : void 0
+    subComponents: subComponents && subComponents.length > 0 ? subComponents : void 0,
+    defaultArgs: storiesInfo?.defaultArgs
   };
 }
 
@@ -21665,6 +21804,27 @@ function formatComponentDocs(docs) {
     sections.push("## Props", "");
     docs.props.forEach((prop) => sections.push(...formatProp(prop)));
   }
+  if (docs.defaultArgs && Object.keys(docs.defaultArgs).length > 0) {
+    const filteredArgs = Object.entries(docs.defaultArgs).filter(([key, value]) => {
+      const prop = docs.props.find((p) => p.name === key);
+      if (!prop?.default) return true;
+      return String(value) !== prop.default;
+    });
+    if (filteredArgs.length > 0) {
+      sections.push("## Storybook Defaults", "");
+      sections.push(
+        "These are the recommended prop values used in the component's Storybook stories:",
+        ""
+      );
+      sections.push("| Prop | Value |");
+      sections.push("|------|-------|");
+      for (const [key, value] of filteredArgs) {
+        const formatted = typeof value === "string" ? `"${value}"` : String(value);
+        sections.push(`| \`${key}\` | \`${formatted}\` |`);
+      }
+      sections.push("");
+    }
+  }
   if (docs.subComponents && docs.subComponents.length > 0) {
     sections.push("## Sub-components", "");
     docs.subComponents.forEach((name) => sections.push(`- \`${name}\``));

package/dist/server.js

@@ -21033,6 +21033,7 @@ function findMatchingBrace(text2, openingBraceIndex, openChar = "{", closeChar =
 }
 
 // src/readers/types-reader.ts
+var TYPE_OR_INTERFACE = "(?:interface|type)";
 function parseJSDoc(comment) {
   const lines = comment.replace(/\/\*\*|\*\/|\*/g, "").split("\n").map((line) => line.trim()).filter(Boolean);
   let description = "";
@@ -21073,7 +21074,7 @@ function extractType(text2, startIndex) {
 function parseInterface(content, interfaceName) {
   const props = [];
   const interfaceRegex = new RegExp(
-    `export\\s+interface\\s+${interfaceName}\\s*\\{([\\s\\S]*?)\\n\\}`,
+    `(?:export\\s+)?${TYPE_OR_INTERFACE}\\s+${interfaceName}\\s*(?:extends\\s+[^{]+)?(?:=\\s*)?\\{([\\s\\S]*?)\\n\\}`,
     "m"
   );
   const match = content.match(interfaceRegex);
@@ -21105,7 +21106,7 @@ function parseInterface(content, interfaceName) {
 function extractComponentDescription(content, interfaceName) {
   const lines = content.split("\n");
   const interfaceLineIndex = lines.findIndex(
-    (line) => line.match(new RegExp(`export\\s+interface\\s+${interfaceName}`))
+    (line) => line.match(new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+${interfaceName}`))
   );
   if (interfaceLineIndex === -1) {
     return "";
@@ -21130,28 +21131,67 @@ function extractComponentDescription(content, interfaceName) {
   }
   return "";
 }
-function readTypesFile(filePath) {
+function resolveUnionOrIntersectionProps(content, typeName) {
+  const typeDefRegex = new RegExp(`export\\s+type\\s+${typeName}\\s*=\\s*([^;]+)`);
+  const match = content.match(typeDefRegex);
+  if (!match) return [];
+  const referencedTypes = match[1].split(/[|&]/).map((t) => t.trim()).filter((t) => t.endsWith("Props"));
+  if (referencedTypes.length === 0) return [];
+  const firstBranch = referencedTypes[0];
+  const extendsRegex = new RegExp(
+    `(?:export\\s+)?${TYPE_OR_INTERFACE}\\s+${firstBranch}\\s+extends\\s+(\\w+)`
+  );
+  const extendsMatch = content.match(extendsRegex);
+  const allProps = [];
+  if (extendsMatch) {
+    allProps.push(...parseInterface(content, extendsMatch[1]));
+  }
+  allProps.push(...parseInterface(content, firstBranch));
+  const seen = /* @__PURE__ */ new Set();
+  return allProps.filter((p) => {
+    if (seen.has(p.name)) return false;
+    seen.add(p.name);
+    return true;
+  });
+}
+function readTypesFile(filePath, componentName) {
   const content = readTextFile(filePath);
   if (!content) {
     return null;
   }
-  const propsInterfaceMatch = content.match(/export\s+interface\s+(Ui\w+Props)/);
+  const resolvedName = componentName || path.basename(path.dirname(filePath));
+  const exactRegex = new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+(${resolvedName}Props)\\b`);
+  let propsInterfaceMatch = content.match(exactRegex);
+  if (!propsInterfaceMatch) {
+    const prefixRegex = new RegExp(
+      `export\\s+${TYPE_OR_INTERFACE}\\s+(${resolvedName}\\w*Props)\\b`
+    );
+    propsInterfaceMatch = content.match(prefixRegex);
+  }
+  if (!propsInterfaceMatch) {
+    propsInterfaceMatch = content.match(
+      new RegExp(`export\\s+${TYPE_OR_INTERFACE}\\s+(Ui\\w+Props)\\b`)
+    );
+  }
   if (!propsInterfaceMatch) {
     return null;
   }
   const interfaceName = propsInterfaceMatch[1];
-  const componentName = interfaceName.replace("Props", "");
+  const matchedComponentName = interfaceName.replace("Props", "");
   const description = extractComponentDescription(content, interfaceName);
-  const props = parseInterface(content, interfaceName);
+  let props = parseInterface(content, interfaceName);
+  if (props.length === 0) {
+    props = resolveUnionOrIntersectionProps(content, interfaceName);
+  }
   return {
-    name: componentName,
+    name: matchedComponentName,
     description,
     props
   };
 }
 function readComponentTypes(componentDir) {
   const typesPath = path.join(componentDir, "types.ts");
-  return readTypesFile(typesPath);
+  return readTypesFile(typesPath, path.basename(componentDir));
 }
 
 // src/constants.ts
@@ -21364,6 +21404,40 @@ function extractStories(content) {
   }
   return stories;
 }
+function extractInlineRenderTemplates(content) {
+  const examples = [];
+  const storyExportRegex = /export\s+const\s+(\w+):\s*Story\s*=/g;
+  let match;
+  while ((match = storyExportRegex.exec(content)) !== null) {
+    const storyName = match[1];
+    if (storyName === "default") continue;
+    const afterEquals = content.indexOf("{", match.index + match[0].length);
+    if (afterEquals === -1) continue;
+    const closingBrace = findMatchingBrace(content, afterEquals);
+    if (closingBrace === -1) continue;
+    const storyBlock = content.slice(afterEquals, closingBrace + 1);
+    if (!storyBlock.includes("template:")) continue;
+    const templateMatch = storyBlock.match(/template:\s*`([\s\S]*?)`/);
+    if (!templateMatch) continue;
+    const template = templateMatch[1].trim();
+    if (!template) continue;
+    const componentsMatch = storyBlock.match(/components:\s*\{([^}]+)\}/);
+    const componentNames = componentsMatch ? componentsMatch[1].split(",").map((c) => c.trim()).filter(Boolean) : [];
+    const imports = componentNames.length > 0 ? `<script setup>
+// Components: ${componentNames.join(", ")}
+</script>
+
+` : "";
+    examples.push({
+      name: storyName,
+      description: "",
+      code: `${imports}<template>
+${template}
+</template>`
+    });
+  }
+  return examples;
+}
 function extractArgTypes(content) {
   const argTypes = [];
   const argTypesKeyIndex = content.indexOf("argTypes");
@@ -21420,6 +21494,56 @@ function extractTitle(content) {
   const titleMatch = content.match(/title:\s*['"]([^'"]+)['"]/);
   return titleMatch ? titleMatch[1] : "";
 }
+function extractMetaArgs(content) {
+  const metaDefaultIndex = content.indexOf("export default");
+  if (metaDefaultIndex === -1) return void 0;
+  const metaSection = content.slice(0, metaDefaultIndex);
+  const argsKeyIndex = metaSection.lastIndexOf("args:");
+  if (argsKeyIndex !== -1) {
+    return extractArgsFromPosition(content, argsKeyIndex);
+  }
+  const afterExport = content.slice(metaDefaultIndex + "export default".length);
+  const trimmed = afterExport.trimStart();
+  if (!trimmed.startsWith("{")) return void 0;
+  const blockStart = content.indexOf("{", metaDefaultIndex);
+  const blockEnd = findMatchingBrace(content, blockStart);
+  if (blockEnd === -1) return void 0;
+  const metaBlock = content.slice(blockStart + 1, blockEnd);
+  const inlineArgsIndex = metaBlock.indexOf("args:");
+  if (inlineArgsIndex === -1) return void 0;
+  return extractArgsFromPosition(content, blockStart + 1 + inlineArgsIndex);
+}
+function extractArgsFromPosition(content, argsKeyIndex) {
+  const colonIndex = content.indexOf(":", argsKeyIndex + 4);
+  if (colonIndex === -1) {
+    return void 0;
+  }
+  const openingBraceIndex = content.indexOf("{", colonIndex);
+  if (openingBraceIndex === -1) {
+    return void 0;
+  }
+  const closingBraceIndex = findMatchingBrace(content, openingBraceIndex);
+  if (closingBraceIndex === -1) {
+    return void 0;
+  }
+  const argsBlock = content.slice(openingBraceIndex + 1, closingBraceIndex);
+  const args = {};
+  const kvRegex = /(\w+)\s*:\s*(?:'([^']*)'|"([^"]*)"|(\d+(?:\.\d+)?)|(\btrue\b|\bfalse\b))/g;
+  let match;
+  while ((match = kvRegex.exec(argsBlock)) !== null) {
+    const key = match[1];
+    if (match[2] !== void 0) {
+      args[key] = match[2];
+    } else if (match[3] !== void 0) {
+      args[key] = match[3];
+    } else if (match[4] !== void 0) {
+      args[key] = Number(match[4]);
+    } else if (match[5] !== void 0) {
+      args[key] = match[5] === "true";
+    }
+  }
+  return Object.keys(args).length > 0 ? args : void 0;
+}
 function readStoriesFile(filePath) {
   const content = readTextFile(filePath);
   if (!content) {
@@ -21431,6 +21555,7 @@ function readStoriesFile(filePath) {
   const storyTemplateMap = extractStories(content);
   const examples = [];
   const usageGuidance = [];
+  const coveredStories = /* @__PURE__ */ new Set();
   for (const [storyName, templateVar] of storyTemplateMap) {
     const code = templateSources.get(templateVar);
     const description = extractStoryJSDoc(content, storyName);
@@ -21440,16 +21565,29 @@ function readStoriesFile(filePath) {
         description,
         code
       });
+      coveredStories.add(storyName);
     }
     if (description) {
       usageGuidance.push(description);
     }
   }
+  const inlineExamples = extractInlineRenderTemplates(content);
+  for (const example of inlineExamples) {
+    if (!coveredStories.has(example.name)) {
+      const description = extractStoryJSDoc(content, example.name);
+      examples.push({ ...example, description });
+      if (description) {
+        usageGuidance.push(description);
+      }
+    }
+  }
+  const defaultArgs = extractMetaArgs(content);
   return {
     title,
     examples,
     argTypes,
-    usageGuidance
+    usageGuidance,
+    defaultArgs
   };
 }
 function readComponentStories(componentDir) {
@@ -21523,7 +21661,8 @@ function getComponentDocs(componentName) {
     examples,
     usageGuidance: [...new Set(usageGuidance)],
     // Remove duplicates
-    subComponents: subComponents && subComponents.length > 0 ? subComponents : void 0
+    subComponents: subComponents && subComponents.length > 0 ? subComponents : void 0,
+    defaultArgs: storiesInfo?.defaultArgs
   };
 }
 
@@ -21569,6 +21708,27 @@ function formatComponentDocs(docs) {
     sections.push("## Props", "");
     docs.props.forEach((prop) => sections.push(...formatProp(prop)));
   }
+  if (docs.defaultArgs && Object.keys(docs.defaultArgs).length > 0) {
+    const filteredArgs = Object.entries(docs.defaultArgs).filter(([key, value]) => {
+      const prop = docs.props.find((p) => p.name === key);
+      if (!prop?.default) return true;
+      return String(value) !== prop.default;
+    });
+    if (filteredArgs.length > 0) {
+      sections.push("## Storybook Defaults", "");
+      sections.push(
+        "These are the recommended prop values used in the component's Storybook stories:",
+        ""
+      );
+      sections.push("| Prop | Value |");
+      sections.push("|------|-------|");
+      for (const [key, value] of filteredArgs) {
+        const formatted = typeof value === "string" ? `"${value}"` : String(value);
+        sections.push(`| \`${key}\` | \`${formatted}\` |`);
+      }
+      sections.push("");
+    }
+  }
   if (docs.subComponents && docs.subComponents.length > 0) {
     sections.push("## Sub-components", "");
     docs.subComponents.forEach((name) => sections.push(`- \`${name}\``));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aleph-alpha/lib-mcp",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/server.js",