@fern-api/generator-cli 0.9.53 → 0.9.55

package/dist/api.js

@@ -10834,7 +10834,7 @@ var ReadmeGenerator = class {
         })
       );
     }
-    if (this.readmeConfig.requirements != null) {
+    if (this.readmeConfig.requirements != null && this.readmeConfig.requirements.length > 0) {
       blocks.push(
         await this.generateRequirements({
           requirements: this.readmeConfig.requirements

package/dist/cli.js

@@ -30446,6 +30446,9 @@ function extractErrorMessage(e) {
   return stringified.length > 0 ? stringified : "Unknown error";
 }
 
+// ../commons/core-utils/lib/fernEnvVars.js
+var FERN_JAVA_SKIP_FORMATTING_ENV_VAR = "FERN_JAVA_SKIP_FORMATTING";
+
 // ../commons/path-utils/lib/convertToOsPath.js
 function convertToOsPath(path5) {
   return path5.replace(/\\/g, "/");
@@ -39242,7 +39245,7 @@ var ReadmeGenerator = class {
         })
       );
     }
-    if (this.readmeConfig.requirements != null) {
+    if (this.readmeConfig.requirements != null && this.readmeConfig.requirements.length > 0) {
       blocks.push(
         await this.generateRequirements({
           requirements: this.readmeConfig.requirements
@@ -41843,11 +41846,20 @@ var SEMVER_PATTERN = /^(v)?(\d+)\.(\d+)\.(\d+)(?:-([\w.-]+))?(?:\+([\w.-]+))?$/;
 function isValidSemver(version2) {
   return SEMVER_PATTERN.test(version2);
 }
+function isPlaceholderVersion(version2) {
+  const withoutPrefix = version2.startsWith("v") ? version2.slice(1) : version2;
+  return withoutPrefix === MAGIC_VERSION || withoutPrefix.startsWith(`${MAGIC_VERSION}.`) || withoutPrefix === MAGIC_VERSION_PYTHON || withoutPrefix.startsWith(`${MAGIC_VERSION_PYTHON}.`);
+}
 function incrementVersion(currentVersion, versionBump) {
   const matcher = currentVersion.match(SEMVER_PATTERN);
   if (!matcher) {
     throw new AutoVersioningException("Invalid semantic version format: " + currentVersion);
   }
+  if (isPlaceholderVersion(currentVersion)) {
+    throw new AutoVersioningException(
+      "Refusing to increment the magic placeholder version: " + currentVersion + ". A real previous version must be resolved first."
+    );
+  }
   const prefix = matcher[1] ?? "";
   const versionWithoutPrefix = currentVersion.slice(prefix.length);
   const preRelease = matcher[5];
@@ -41918,7 +41930,8 @@ var AutoVersionStep = class extends BaseStep {
   }
   async handleFirstGeneration(params) {
     const { service, language, mappedMagicVersion, commit } = params;
-    const initialVersion = this.config.baseVersion ?? (mappedMagicVersion.startsWith("v") ? "v0.0.1" : "0.0.1");
+    const configuredBaseVersion = this.usableVersion(this.config.baseVersion, "baseVersion");
+    const initialVersion = configuredBaseVersion ?? (mappedMagicVersion.startsWith("v") ? "v0.0.1" : "0.0.1");
     if (!isValidSemver(initialVersion)) {
       const errorMessage = `AutoVersionStep: baseVersion ${JSON.stringify(initialVersion)} is not a valid semver string (expected e.g. "1.2.3" or "v1.2.3"). Refusing to run.`;
       this.logger.error(errorMessage);
@@ -42252,14 +42265,18 @@ var AutoVersionStep = class extends BaseStep {
    */
   async resolvePreviousVersionNonReplay(params) {
     const { service, rawDiff, mappedMagicVersion, baseVersion } = params;
-    if (baseVersion != null && isValidSemver(baseVersion)) {
+    const usableBaseVersion = this.usableVersion(baseVersion, "baseVersion");
+    if (usableBaseVersion != null && isValidSemver(usableBaseVersion)) {
       this.logger.debug(
-        `AutoVersionStep (non-replay): previous version from pipeline baseVersion: ${baseVersion}`
+        `AutoVersionStep (non-replay): previous version from pipeline baseVersion: ${usableBaseVersion}`
       );
-      return this.normalizeVersionPrefix(baseVersion, mappedMagicVersion);
+      return this.normalizeVersionPrefix(usableBaseVersion, mappedMagicVersion);
     }
     try {
-      const extracted = service.extractPreviousVersion(rawDiff, mappedMagicVersion);
+      const extracted = this.usableVersion(
+        service.extractPreviousVersion(rawDiff, mappedMagicVersion) ?? void 0,
+        "diff"
+      );
       if (extracted != null) {
         this.logger.debug(`AutoVersionStep (non-replay): previous version from diff: ${extracted}`);
         return extracted;
@@ -42270,12 +42287,15 @@ var AutoVersionStep = class extends BaseStep {
       }
       this.logger.info("AutoVersionStep (non-replay): magic version not in diff; trying metadata + git tags.");
     }
-    const metadataVersion = this.readVersionFromMetadataAtHead();
+    const metadataVersion = this.usableVersion(this.readVersionFromMetadataAtHead(), "metadata.json");
     if (metadataVersion != null) {
       return this.normalizeVersionPrefix(metadataVersion, mappedMagicVersion);
     }
     try {
-      const tagVersion = await service.getLatestVersionFromGitTags(this.outputDir);
+      const tagVersion = this.usableVersion(
+        await service.getLatestVersionFromGitTags(this.outputDir) ?? void 0,
+        "git tags"
+      );
       if (tagVersion != null) {
         return this.normalizeVersionPrefix(tagVersion, mappedMagicVersion);
       }
@@ -42286,12 +42306,16 @@ var AutoVersionStep = class extends BaseStep {
   }
   async resolvePreviousVersion(params) {
     const { service, rawDiff, mappedMagicVersion, baseVersion } = params;
-    if (baseVersion != null && isValidSemver(baseVersion)) {
-      this.logger.debug(`AutoVersionStep: previous version from pipeline baseVersion: ${baseVersion}`);
-      return this.normalizeVersionPrefix(baseVersion, mappedMagicVersion);
+    const usableBaseVersion = this.usableVersion(baseVersion, "baseVersion");
+    if (usableBaseVersion != null && isValidSemver(usableBaseVersion)) {
+      this.logger.debug(`AutoVersionStep: previous version from pipeline baseVersion: ${usableBaseVersion}`);
+      return this.normalizeVersionPrefix(usableBaseVersion, mappedMagicVersion);
     }
     try {
-      const extracted = service.extractPreviousVersion(rawDiff, mappedMagicVersion);
+      const extracted = this.usableVersion(
+        service.extractPreviousVersion(rawDiff, mappedMagicVersion) ?? void 0,
+        "diff"
+      );
       if (extracted != null) {
         this.logger.debug(`AutoVersionStep: previous version from diff: ${extracted}`);
         return extracted;
@@ -42302,12 +42326,15 @@ var AutoVersionStep = class extends BaseStep {
       }
       this.logger.info("AutoVersionStep: magic version not found in diff; falling back to metadata + git tags.");
     }
-    const metadataVersion = await this.readVersionFromMetadata();
+    const metadataVersion = this.usableVersion(await this.readVersionFromMetadata(), "metadata.json");
     if (metadataVersion != null) {
       return this.normalizeVersionPrefix(metadataVersion, mappedMagicVersion);
     }
     try {
-      const tagVersion = await service.getLatestVersionFromGitTags(this.outputDir);
+      const tagVersion = this.usableVersion(
+        await service.getLatestVersionFromGitTags(this.outputDir) ?? void 0,
+        "git tags"
+      );
       if (tagVersion != null) {
         return this.normalizeVersionPrefix(tagVersion, mappedMagicVersion);
       }
@@ -42329,6 +42356,27 @@ var AutoVersionStep = class extends BaseStep {
       return void 0;
     }
   }
+  /**
+   * Drops candidate previous versions that are the magic placeholder. SDK repos
+   * that derive their published version at release time keep the placeholder
+   * committed, so every resolution source (baseVersion, diff extraction,
+   * metadata.json, git tags) can hand back the sentinel; incrementing it would
+   * emit a mutated placeholder such as `0.0.0-fern-placeholder.0` instead of a
+   * real version. Returning undefined lets the caller fall through to the next
+   * source, and ultimately to the first-generation path.
+   */
+  usableVersion(version2, source) {
+    if (version2 == null) {
+      return void 0;
+    }
+    if (isPlaceholderVersion(version2)) {
+      this.logger.info(
+        `AutoVersionStep: ignoring placeholder version ${version2} from ${source}; trying the next previous-version source.`
+      );
+      return void 0;
+    }
+    return version2;
+  }
   normalizeVersionPrefix(version2, mappedMagicVersion) {
     const stripped = version2.startsWith("v") ? version2.slice(1) : version2;
     return mappedMagicVersion.startsWith("v") ? `v${stripped}` : stripped;
@@ -43840,6 +43888,28 @@ var ReplayStep = class extends BaseStep {
 // ../cli/generation/local-generation/docker-utils/lib/runDocker.js
 var import_promises18 = require("fs/promises");
 var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
+
+// ../cli/generation/local-generation/docker-utils/lib/buildContainerEnvVars.js
+var FORWARDED_ENV_VARS = ["FERN_STACK_TRACK", FERN_JAVA_SKIP_FORMATTING_ENV_VAR];
+function buildContainerEnvVars({ envVars, processEnv }) {
+  const forwardedEntries = FORWARDED_ENV_VARS.filter((name) => envVars[name] == null).map((name) => [name, processEnv[name]]).filter((entry) => entry[1] != null && entry[1] !== "");
+  return {
+    envVars: { ...Object.fromEntries(forwardedEntries), ...envVars },
+    forwardedFromHost: forwardedEntries.map(([name]) => name)
+  };
+}
+
+// ../cli/generation/local-generation/docker-utils/lib/runDocker.js
+function logForwardedEnvVars({ logger, containerEnvVars, forwardedFromHost }) {
+  for (const name of forwardedFromHost) {
+    logger.info(`Forwarding ${name}=${containerEnvVars[name]} into the generator container`);
+  }
+  for (const name of FORWARDED_ENV_VARS) {
+    if (!forwardedFromHost.includes(name) && containerEnvVars[name] == null) {
+      logger.debug(`${name} is not set on the host; not forwarding it into the generator container`);
+    }
+  }
+}
 async function pullImage(imageName, runner, signal) {
   await loggingExeca(void 0, runner ?? "docker", ["pull", imageName], {
     all: true,
@@ -43877,7 +43947,12 @@ ${stderr}`);
 }
 async function execInContainer({ logger, containerId, command, runner, envVars = {}, writeLogsToFile = true, reject = true }) {
   const containerRunner = runner ?? "docker";
-  const envArgs = Object.entries(envVars).flatMap(([key, value]) => ["-e", `${key}=${value}`]);
+  const { envVars: containerEnvVars, forwardedFromHost } = buildContainerEnvVars({
+    envVars,
+    processEnv: process.env
+  });
+  logForwardedEnvVars({ logger, containerEnvVars, forwardedFromHost });
+  const envArgs = Object.entries(containerEnvVars).flatMap(([key, value]) => ["-e", `${key}=${value}`]);
   const { stdout, stderr, exitCode } = await loggingExeca(logger, containerRunner, ["exec", "--user", "root", ...envArgs, containerId, ...command], {
     reject: false,
     all: true,

package/package.json

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