@fern-api/generator-cli 0.10.0 → 0.10.1

package/dist/cli.js

@@ -42211,7 +42211,8 @@ var AutoVersionStep = class extends BaseStep {
     };
   }
   async finalizeWithBump(params) {
-    const { service, language, mappedMagicVersion, previousVersion, analysis } = params;
+    const { service, language, mappedMagicVersion, previousVersion } = params;
+    const analysis = this.withChangelogFallback(params.analysis);
     const newVersion = incrementVersion(previousVersion, analysis.versionBump);
     this.logger.info(`AutoVersionStep: ${analysis.versionBump} bump: ${previousVersion} \u2192 ${newVersion}`);
     await service.replaceMagicVersion(this.outputDir, mappedMagicVersion, newVersion);
@@ -42265,7 +42266,8 @@ var AutoVersionStep = class extends BaseStep {
    * the bumped version but does NOT commit — GithubStep handles the commit.
    */
   async finalizeWithBumpNonReplay(params) {
-    const { service, language, mappedMagicVersion, previousVersion, analysis } = params;
+    const { service, language, mappedMagicVersion, previousVersion } = params;
+    const analysis = this.withChangelogFallback(params.analysis);
     const newVersion = incrementVersion(previousVersion, analysis.versionBump);
     this.logger.info(
       `AutoVersionStep (non-replay): ${analysis.versionBump} bump: ${previousVersion} \u2192 ${newVersion}`
@@ -42572,6 +42574,26 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
     }
     await (0, import_promises16.writeFile)(changelogPath, prependChangelogBlock({ existingContent: existing, version: version2, entry }), "utf-8");
   }
+  /**
+   * MAJOR/MINOR bumps must ship a changelog entry. FAI occasionally returns a
+   * bump with a populated `pr_description` / `version_bump_reason` but an empty
+   * `changelog_entry`; reuse that text rather than writing a version-only block.
+   */
+  withChangelogFallback(analysis) {
+    const fallback = resolveChangelogEntryFallbackWithSource(analysis);
+    if (fallback == null) {
+      if (analysis.versionBump !== "PATCH" && !hasText(analysis.changelogEntry)) {
+        this.logger.warn(
+          `AutoVersionStep: FAI returned a ${analysis.versionBump} bump without a changelog entry and no fallback text.`
+        );
+      }
+      return analysis;
+    }
+    this.logger.warn(
+      `AutoVersionStep: FAI returned a ${analysis.versionBump} bump without a changelog entry; using the ${fallback.source} instead.`
+    );
+    return { ...analysis, changelogEntry: fallback.text };
+  }
   brandMessage(message) {
     if (this.config.isWhitelabel) {
       return message;
@@ -42602,10 +42624,7 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
   }
   async analyzeChunks(chunks, language, previousVersion) {
     const { client, VersionBump: VersionBump4 } = await this.loadBaml();
-    let bestBump = VersionBump4.NO_CHANGE;
-    let bestMessage = "";
-    let bestVersionBumpReason;
-    const changelogEntries = [];
+    const chunkAnalyses = [];
     for (let i2 = 0; i2 < chunks.length; i2++) {
       const chunk = chunks[i2];
       if (!chunk) {
@@ -42621,20 +42640,22 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
       if (analysis.version_bump === VersionBump4.NO_CHANGE) {
         continue;
       }
-      const prev = bestBump;
-      bestBump = maxVersionBump(bestBump, analysis.version_bump);
-      if (bestBump !== prev) {
-        bestMessage = analysis.message;
-        bestVersionBumpReason = analysis.version_bump_reason;
-      }
-      const entry = analysis.changelog_entry?.trim();
-      if (entry) {
-        changelogEntries.push(entry);
-      }
+      chunkAnalyses.push({
+        versionBump: analysis.version_bump,
+        message: analysis.message,
+        changelogEntry: analysis.changelog_entry,
+        versionBumpReason: analysis.version_bump_reason
+      });
     }
-    if (bestBump === VersionBump4.NO_CHANGE) {
+    if (chunkAnalyses.length === 0) {
       return null;
     }
+    const { bestBump, bestMessage, bestVersionBumpReason, changelogEntries, usedBumpReasonAsEntry } = aggregateChunkAnalyses(chunkAnalyses);
+    if (usedBumpReasonAsEntry) {
+      this.logger.warn(
+        `AutoVersionStep: no chunk produced a changelog entry for the ${bestBump} bump; using its version bump reason instead.`
+      );
+    }
     if (changelogEntries.length <= 1) {
       return {
         versionBump: bestBump,
@@ -42750,6 +42771,57 @@ ${body}` : `${COMMIT_MARKER} ${subject}`;
     return adapter;
   }
 };
+function aggregateChunkAnalyses(chunkAnalyses) {
+  let bestBump = "NO_CHANGE";
+  let bestMessage = "";
+  let bestVersionBumpReason;
+  const entries2 = [];
+  for (const analysis of chunkAnalyses) {
+    const prev = bestBump;
+    bestBump = maxVersionBump(bestBump, analysis.versionBump);
+    if (bestBump !== prev) {
+      bestMessage = analysis.message;
+      bestVersionBumpReason = analysis.versionBumpReason;
+    }
+    const text = analysis.changelogEntry?.trim();
+    if (text) {
+      entries2.push({ bump: analysis.versionBump, text });
+    }
+  }
+  const changelogEntries = entries2.map((entry) => entry.text);
+  const hasEntryAtBestBump = entries2.some((entry) => entry.bump === bestBump);
+  const usedBumpReasonAsEntry = bestBump !== "PATCH" && !hasEntryAtBestBump && hasText(bestVersionBumpReason);
+  if (usedBumpReasonAsEntry && bestVersionBumpReason != null) {
+    changelogEntries.unshift(bestVersionBumpReason.trim());
+  }
+  return { bestBump, bestMessage, bestVersionBumpReason, changelogEntries, usedBumpReasonAsEntry };
+}
+function hasText(value) {
+  return value != null && value.trim().length > 0;
+}
+function commitMessageBody(message) {
+  const trimmed2 = message.trimEnd();
+  const withoutTrailer = trimmed2.endsWith(FERN_TRAILER) ? trimmed2.slice(0, -FERN_TRAILER.length) : trimmed2;
+  const [, ...rest] = withoutTrailer.split("\n");
+  const body = rest.join("\n").trim();
+  return body.length > 0 ? body : void 0;
+}
+function resolveChangelogEntryFallbackWithSource(analysis) {
+  if (hasText(analysis.changelogEntry) || analysis.versionBump === "PATCH") {
+    return void 0;
+  }
+  const candidates = [
+    ["PR description", analysis.prDescription],
+    ["version bump reason", analysis.versionBumpReason],
+    ["commit message body", commitMessageBody(analysis.message)]
+  ];
+  for (const [source, text] of candidates) {
+    if (hasText(text)) {
+      return { source, text: text.trim() };
+    }
+  }
+  return void 0;
+}
 var FAI_VERSION_BUMPS = ["MAJOR", "MINOR", "PATCH", "NO_CHANGE"];
 function isFaiAnalyzeResponse(value) {
   if (typeof value !== "object" || value == null) {
@@ -43921,6 +43993,66 @@ var ReplayStep = class extends BaseStep {
   }
 };
 
+// ../cli/generation/local-generation/docker-utils/lib/dockerHubOatLogin.js
+var DOCKERHUB_OAT_ENV_VAR = "DOCKERHUB_OAT";
+var DOCKERHUB_OAT_USERNAME_ENV_VAR = "DOCKERHUB_OAT_USERNAME";
+var DEFAULT_DOCKERHUB_OAT_USERNAME = "fernenterprise";
+var DOCKER_HUB_HOSTS = /* @__PURE__ */ new Set([
+  "docker.io",
+  "index.docker.io",
+  "registry-1.docker.io",
+  "registry.hub.docker.com"
+]);
+function getDockerHubNamespace(imageName) {
+  const parts = imageName.split("/");
+  const [first2] = parts;
+  if (first2 == null || parts.length < 2) {
+    return void 0;
+  }
+  const host = first2.toLowerCase();
+  const isRegistryHost = host.includes(".") || host.includes(":") || host === "localhost";
+  if (!isRegistryHost) {
+    return first2;
+  }
+  if (!DOCKER_HUB_HOSTS.has(host)) {
+    return void 0;
+  }
+  return parts.length >= 3 ? parts[1] : void 0;
+}
+function resolveDockerHubOatLogin(imageName, env3 = process.env) {
+  const token = env3[DOCKERHUB_OAT_ENV_VAR]?.trim();
+  if (token == null || token === "") {
+    return void 0;
+  }
+  const username = env3[DOCKERHUB_OAT_USERNAME_ENV_VAR]?.trim() || DEFAULT_DOCKERHUB_OAT_USERNAME;
+  if (getDockerHubNamespace(imageName) !== username) {
+    return void 0;
+  }
+  return { username, token };
+}
+async function ensureDockerHubOatLogin({ imageName, runner, logger, signal, env: env3 = process.env }) {
+  const credentials = resolveDockerHubOatLogin(imageName, env3);
+  if (credentials == null) {
+    return;
+  }
+  logger?.debug(`Logging in to Docker Hub as ${credentials.username} with ${DOCKERHUB_OAT_ENV_VAR} to pull ${imageName}`);
+  const { exitCode, stdout, stderr } = await loggingExeca(logger, runner ?? "docker", ["login", "--username", credentials.username, "--password-stdin"], {
+    input: credentials.token,
+    reject: false,
+    doNotPipeOutput: true,
+    secrets: [credentials.token],
+    signal
+  });
+  if (exitCode !== 0) {
+    if (signal?.aborted === true) {
+      throw new Error(`Docker Hub login as ${credentials.username} was cancelled.`);
+    }
+    throw new Error(`Failed to log in to Docker Hub as ${credentials.username} using ${DOCKERHUB_OAT_ENV_VAR}. Check that the token is a valid organization access token for ${credentials.username} with pull access to ${imageName}.
+${stdout}
+${stderr}`);
+  }
+}
+
 // ../cli/generation/local-generation/docker-utils/lib/runDocker.js
 var import_promises18 = require("fs/promises");
 var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
@@ -43955,6 +44087,7 @@ async function pullImage(imageName, runner, signal) {
 }
 async function startContainer({ logger, imageName, runner }) {
   const containerRunner = runner ?? "docker";
+  await ensureDockerHubOatLogin({ imageName, runner, logger });
   const tryStart = async () => {
     const { stdout, exitCode, stderr } = await loggingExeca(logger, containerRunner, ["run", "--user", "root", "-dit", "--entrypoint", "/bin/sh", imageName], {
       reject: false,

package/package.json

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