@fern-api/fern-api-dev 5.65.5 → 5.65.7

package/cli.cjs

@@ -89377,6 +89377,26 @@ var init_ClonedRepository = __esm({
         const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
         return result.trim();
       }
+      async getCommitMessage(commitSha) {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["log", "-1", "--format=%B", commitSha]);
+        return result.replace(/\n$/, "");
+      }
+      async getCommitParents(commitSha) {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["rev-list", "--parents", "-n", "1", commitSha]);
+        const parts = result.trim().split(/\s+/);
+        return parts.slice(1);
+      }
+      /**
+       * Returns the SHAs of commits reachable from HEAD but not from any remote-tracking ref,
+       * ordered oldest-first. These are the commits created locally that have not been pushed.
+       */
+      async getLocalOnlyCommits() {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["rev-list", "--reverse", "HEAD", "--not", "--remotes=origin"]);
+        return result.trim().split("\n").filter((line) => line.length > 0);
+      }
       /**
        * Returns true if the working tree has uncommitted changes (staged or unstaged).
        */
@@ -581439,29 +581459,24 @@ var require_pushSignedCommit = __commonJS({
     exports2.isNonFastForwardError = isNonFastForwardError;
     var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
     var MAX_CONCURRENT_PUSH_RETRIES = 3;
+    var MAX_SIGNED_CHAIN_LENGTH = 20;
     async function pushSignedCommit({ repository, octokit, owner, repo, branch, force, rebaseOnConflict = false, author, logger: logger4 }) {
       const tempRef = `refs/temp/fern-${Date.now()}`;
       let tempRefPushed = false;
       try {
-        let [localHeadSha, treeSha, message, parents] = await Promise.all([
-          repository.getHeadSha(),
-          repository.getHeadTreeHash(),
-          repository.getHeadCommitMessage(),
-          repository.getHeadParents()
-        ]);
+        let localHeadSha = await repository.getHeadSha();
         await repository.pushObjectToRef(localHeadSha, tempRef);
         tempRefPushed = true;
         for (let attempt = 0; attempt < MAX_CONCURRENT_PUSH_RETRIES; attempt++) {
-          const identityFields = author != null ? { author, committer: author } : {};
-          const { data: signedCommit } = await octokit.git.createCommit({
+          const signedSha = await signLocalCommitChain({
+            repository,
+            octokit,
             owner,
             repo,
-            message,
-            tree: treeSha,
-            parents,
-            ...identityFields
+            localHeadSha,
+            author,
+            logger: logger4
           });
-          const signedSha = signedCommit.sha;
           try {
             await upsertBranchRef({ octokit, owner, repo, branch, sha: signedSha, force });
             logger4.debug(`Updated refs/heads/${branch} to signed commit ${signedSha}`);
@@ -581474,12 +581489,7 @@ var require_pushSignedCommit = __commonJS({
             if (rebaseOnConflict) {
               logger4.warn(`Non-fast-forward on refs/heads/${branch} (attempt ${attempt + 1}/${MAX_CONCURRENT_PUSH_RETRIES}); rebasing locally and retrying.`);
               await repository.pullWithRebase(branch);
-              [localHeadSha, treeSha, message, parents] = await Promise.all([
-                repository.getHeadSha(),
-                repository.getHeadTreeHash(),
-                repository.getHeadCommitMessage(),
-                repository.getHeadParents()
-              ]);
+              localHeadSha = await repository.getHeadSha();
               await repository.pushObjectToRef(localHeadSha, tempRef, { force: true });
             } else {
               throw err;
@@ -581497,6 +581507,39 @@ var require_pushSignedCommit = __commonJS({
         }
       }
     }
+    async function signLocalCommitChain({ repository, octokit, owner, repo, localHeadSha, author, logger: logger4 }) {
+      let chain = await repository.getLocalOnlyCommits();
+      if (chain.length === 0 || chain[chain.length - 1] !== localHeadSha) {
+        chain = [localHeadSha];
+      } else if (chain.length > MAX_SIGNED_CHAIN_LENGTH) {
+        logger4.warn(`Local commit chain has ${chain.length} commits (limit ${MAX_SIGNED_CHAIN_LENGTH}); signing HEAD only.`);
+        chain = [localHeadSha];
+      }
+      const identityFields = author != null ? { author, committer: author } : {};
+      const signedShaByLocalSha = /* @__PURE__ */ new Map();
+      let signedSha = localHeadSha;
+      for (const sha of chain) {
+        const [treeSha, message, parents] = await Promise.all([
+          repository.getCommitTreeHash(sha),
+          repository.getCommitMessage(sha),
+          repository.getCommitParents(sha)
+        ]);
+        const { data: signedCommit } = await octokit.git.createCommit({
+          owner,
+          repo,
+          message,
+          tree: treeSha,
+          parents: parents.map((parent) => signedShaByLocalSha.get(parent) ?? parent),
+          ...identityFields
+        });
+        signedShaByLocalSha.set(sha, signedCommit.sha);
+        signedSha = signedCommit.sha;
+      }
+      if (chain.length > 1) {
+        logger4.debug(`Signed ${chain.length} local commits via the GitHub API`);
+      }
+      return signedSha;
+    }
     async function upsertBranchRef({ octokit, owner, repo, branch, sha, force }) {
       try {
         await octokit.git.updateRef({
@@ -688596,7 +688639,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.65.5",
+          version: "5.65.7",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -688662,7 +688705,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.65.5",
+        version: "5.65.7",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -841837,8 +841880,8 @@ __export(rules_exports, {
   CHANGELOG_FEED_ALLOWED_SLUGS: () => CHANGELOG_FEED_ALLOWED_SLUGS,
   FilepathsExistRule: () => FilepathsExistRule,
   MissingRedirectsRule: () => MissingRedirectsRule,
+  NavigationConflicts: () => NavigationConflicts,
   NoCircularRedirectsRule: () => NoCircularRedirectsRule,
-  OnlyVersionedNavigation: () => OnlyVersionedNavigation,
   TabWithHrefRule: () => TabWithHrefRule,
   TranslationDirectoriesExistRule: () => TranslationDirectoriesExistRule,
   ValidChangelogSlugRule: () => ValidChangelogSlugRule,
@@ -842704,6 +842747,31 @@ function makeSkipVisitor(fetchResult) {
   }
 }
 
+// ../yaml/docs-validator/lib/rules/navigation-conflicts/navigation-conflicts.js
+var NavigationConflicts = {
+  name: "navigation-conflicts",
+  create: () => {
+    return {
+      file: async ({ config: config5 }) => {
+        const violations = [];
+        if (config5.navigation != null && config5.versions != null) {
+          violations.push({
+            severity: "fatal",
+            message: "Cannot contain both navigation and versions. If you want versioned docs, use versions. Otherwise use navigation."
+          });
+        }
+        if (config5.navigation != null && config5.products != null) {
+          violations.push({
+            severity: "fatal",
+            message: "Cannot contain both navigation and products. If you want multi-product docs, define navigation inside each product file. Otherwise use navigation."
+          });
+        }
+        return violations;
+      }
+    };
+  }
+};
+
 // ../yaml/docs-validator/lib/rules/no-circular-redirects/no-circular-redirects.js
 function normalizeRedirectPath(path119) {
   if (path119 !== "/" && path119.endsWith("/")) {
@@ -842801,26 +842869,6 @@ var NoCircularRedirectsRule = {
   }
 };
 
-// ../yaml/docs-validator/lib/rules/only-versioned-navigation/only-versioned-navigation.js
-var OnlyVersionedNavigation = {
-  name: "only-versioned-navigation",
-  create: () => {
-    return {
-      file: async ({ config: config5 }) => {
-        if (config5.navigation != null && config5.versions != null) {
-          return [
-            {
-              severity: "fatal",
-              message: "Cannot contain both navigation and versions. If you want versioned docs, use versions. Otherwise use navigation."
-            }
-          ];
-        }
-        return [];
-      }
-    };
-  }
-};
-
 // ../yaml/docs-validator/lib/rules/tab-with-href/index.js
 var TabWithHrefRule = {
   name: "tab-with-href",
@@ -865934,7 +865982,7 @@ var allRules = [
   // Check non-component references (will skip v2 files)
   ValidLocalReferencesRule,
   // Validate that local references actually exist
-  OnlyVersionedNavigation,
+  NavigationConflicts,
   ValidateVersionFileRule,
   ValidateProductFileRule,
   ValidInstanceUrlRule,
@@ -869758,7 +869806,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.65.5";
+  const version7 = "5.65.7";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -902320,7 +902368,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.65.5",
+        cliVersion: "5.65.7",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -921898,8 +921946,22 @@ var Generation = class {
     maxRetries: () => this.customConfig.maxRetries,
     /** Controls which HTTP status codes trigger automatic retries. Default: "legacy". */
     retryStatusCodes: () => this.customConfig.retryStatusCodes ?? "legacy",
-    /** Override the default request timeout (in seconds) for the generated SDK client. `"infinity"` disables the default timeout. Default: 30. */
-    defaultTimeoutInSeconds: () => this.customConfig["default-timeout-in-seconds"],
+    /**
+     * Override the default request timeout (in milliseconds) for the generated SDK client. `"infinity"` disables
+     * the default timeout. Resolves the new `default-timeout-in-milliseconds` key when set, otherwise falls back
+     * to the deprecated `default-timeout-in-seconds` (converted to milliseconds). Default: 30000.
+     */
+    defaultTimeoutInMilliseconds: () => {
+      const milliseconds = this.customConfig["default-timeout-in-milliseconds"];
+      if (milliseconds != null) {
+        return milliseconds;
+      }
+      const seconds = this.customConfig["default-timeout-in-seconds"];
+      if (seconds == null) {
+        return void 0;
+      }
+      return seconds === "infinity" ? "infinity" : seconds * 1e3;
+    },
     /**
      * Output path configuration for generated files.
      * Returns normalized paths for library, test, solution, and other files.
@@ -952263,7 +952325,9 @@ var TypescriptCustomConfigSchema = external_exports2.strictObject({
   bundle: external_exports2.optional(external_exports2.boolean()),
   allowCustomFetcher: external_exports2.optional(external_exports2.boolean()),
   generateWebSocketClients: external_exports2.optional(external_exports2.boolean()),
-  defaultTimeoutInSeconds: external_exports2.optional(external_exports2.union([external_exports2.literal("infinity"), external_exports2.number()])),
+  // Default request timeout, expressed in milliseconds (idiomatic for JS/TS, e.g.
+  // `setTimeout` / `AbortSignal.timeout(ms)`). Use "infinity" to disable the timeout.
+  defaultTimeout: external_exports2.optional(external_exports2.union([external_exports2.literal("infinity"), external_exports2.number()])),
   skipResponseValidation: external_exports2.optional(external_exports2.boolean()),
   extraDependencies: external_exports2.optional(external_exports2.record(external_exports2.string())),
   extraDevDependencies: external_exports2.optional(external_exports2.record(external_exports2.string())),
@@ -952327,6 +952391,9 @@ var TypescriptCustomConfigSchema = external_exports2.strictObject({
   skipNpmPkgFix: external_exports2.optional(external_exports2.boolean()),
   experimentalGenerateReadWriteOnlyTypes: external_exports2.optional(external_exports2.boolean()),
   // deprecated
+  // @deprecated Use `defaultTimeout` (milliseconds) instead. Converted to milliseconds (× 1000).
+  defaultTimeoutInSeconds: external_exports2.optional(external_exports2.union([external_exports2.literal("infinity"), external_exports2.number()])),
+  // @deprecated Use `defaultTimeout` (milliseconds) instead. Converted to milliseconds (× 1000).
   timeoutInSeconds: external_exports2.optional(external_exports2.union([external_exports2.literal("infinity"), external_exports2.number()])),
   includeApiReference: external_exports2.optional(external_exports2.boolean()),
   // @deprecated Use generateWebSocketClients instead
@@ -968630,7 +968697,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.65.5"
+    cli_version: "5.65.7"
   };
 }
 function isAutomationMode() {
@@ -969462,7 +969529,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.65.5";
+    return "5.65.7";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.65.5",
+  "version": "5.65.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",