@fern-api/generator-cli 0.10.4 → 0.11.0

package/dist/cli.js

@@ -42811,8 +42811,8 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
       analysis: {
         versionBump: bestBump,
         message: bestMessage,
-        changelogEntry: changelogEntries.length > 0 ? changelogEntries.join("\n\n") : void 0,
-        prDescription: prDescriptions.length > 0 ? prDescriptions.join("\n\n") : void 0,
+        changelogEntry: changelogEntries.length > 0 ? mergeMarkdownSections(changelogEntries) : void 0,
+        prDescription: prDescriptions.length > 0 ? mergeMarkdownSections(prDescriptions) : void 0,
         versionBumpReason: bestVersionBumpReason
       },
       analysisWarning
@@ -42830,7 +42830,8 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
       method: "POST",
       headers: {
         Authorization: `Bearer ${this.config.fernToken}`,
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        ...this.config.faiOrgId != null ? { "X-Fern-Org-Id": this.config.faiOrgId } : {}
       },
       body: JSON.stringify({
         diff: cleanedDiff,
@@ -42928,6 +42929,117 @@ function aggregateChunkAnalyses(chunkAnalyses) {
   }
   return { bestBump, bestMessage, bestVersionBumpReason, changelogEntries, usedBumpReasonAsEntry };
 }
+var MARKDOWN_HEADING = /^(#{1,6})\s+(.+?)\s*#*\s*$/;
+var MARKDOWN_FENCE = /^\s*(`{3,}|~{3,})(.*)$/;
+var MARKDOWN_LIST_ITEM = /^\s*(?:[-*+]|\d+[.)])\s/;
+function parseMarkdownSections(text) {
+  const sections = [];
+  const stack = [];
+  let intro = "";
+  let current;
+  let fence;
+  let buffer = [];
+  const closeBody = () => {
+    const body = buffer.join("\n").trim();
+    buffer = [];
+    if (current != null) {
+      current.body = body;
+    } else {
+      intro = body;
+    }
+  };
+  for (const line of text.trim().split("\n")) {
+    const fenceMatch = MARKDOWN_FENCE.exec(line);
+    if (fenceMatch != null) {
+      const marker = fenceMatch[1] ?? "";
+      if (fence == null) {
+        fence = marker;
+      } else if (marker[0] === fence[0] && marker.length >= fence.length && (fenceMatch[2] ?? "").trim() === "") {
+        fence = void 0;
+      }
+    }
+    const match2 = fence == null ? MARKDOWN_HEADING.exec(line) : null;
+    if (match2 == null) {
+      buffer.push(line);
+      continue;
+    }
+    closeBody();
+    const level = match2[1]?.length ?? 1;
+    const section = {
+      heading: `${match2[1]} ${match2[2]?.trim()}`,
+      level,
+      body: "",
+      children: []
+    };
+    while (stack.length > 0 && (stack[stack.length - 1]?.level ?? 0) >= level) {
+      stack.pop();
+    }
+    const parent = stack[stack.length - 1];
+    (parent != null ? parent.children : sections).push(section);
+    stack.push(section);
+    current = section;
+  }
+  closeBody();
+  return { intro, sections };
+}
+function mergeParsedSections(target, parsed, intro) {
+  parsed.forEach((section, index) => {
+    const key = `${section.level} ${section.heading.toLowerCase().replace(/\s+/g, " ")}`;
+    let node = target.get(key);
+    if (node == null) {
+      node = { heading: section.heading, bodies: [], children: /* @__PURE__ */ new Map() };
+      target.set(key, node);
+    }
+    if (index === 0 && hasText(intro)) {
+      node.bodies.push(intro);
+    }
+    if (section.body.length > 0) {
+      node.bodies.push(section.body);
+    }
+    mergeParsedSections(node.children, section.children, "");
+  });
+}
+function renderMergedSection(node) {
+  return [
+    node.heading,
+    ...node.bodies.length > 0 ? [joinSectionBodies(node.bodies)] : [],
+    ...[...node.children.values()].map(renderMergedSection)
+  ].join("\n\n");
+}
+function mergeMarkdownSections(texts) {
+  const order = [];
+  const roots = /* @__PURE__ */ new Map();
+  for (const text of texts) {
+    const { intro, sections } = parseMarkdownSections(text);
+    if (sections.length === 0) {
+      if (hasText(intro)) {
+        order.push(intro);
+      }
+      continue;
+    }
+    mergeParsedSections(roots, sections, intro);
+    for (const node of roots.values()) {
+      if (!order.includes(node)) {
+        order.push(node);
+      }
+    }
+  }
+  return order.map((item) => typeof item === "string" ? item : renderMergedSection(item)).join("\n\n");
+}
+function joinSectionBodies(bodies) {
+  let joined = "";
+  for (const body of bodies) {
+    if (joined.length === 0) {
+      joined = body;
+      continue;
+    }
+    const lastLine = joined.slice(joined.lastIndexOf("\n") + 1);
+    const firstLine = body.slice(0, body.indexOf("\n") === -1 ? body.length : body.indexOf("\n"));
+    const bothLists = MARKDOWN_LIST_ITEM.test(lastLine) && MARKDOWN_LIST_ITEM.test(firstLine);
+    joined += `${bothLists ? "\n" : "\n\n"}${body}`;
+  }
+  return joined;
+}
 function hasText(value) {
   return value != null && value.trim().length > 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.10.4",
+  "version": "0.11.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",