@fern-api/fern-api-dev 5.23.3-647-gfeaa92717c9 → 5.23.3-649-ge2d80d45a25

package/cli.cjs

@@ -669270,7 +669270,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-647-gfeaa92717c9",
+          version: "5.23.3-649-ge2d80d45a25",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669334,7 +669334,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-647-gfeaa92717c9",
+        version: "5.23.3-649-ge2d80d45a25",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -856705,7 +856705,7 @@ function createDocsConfigFileAstVisitorForRules({ relativeFilepath, allRulesWith
           const ruleViolations = await visitFromRule(node4);
           const severityOverride = severityOverrides?.get(ruleName);
           addViolations(ruleViolations.map((violation) => ({
-            name: violation.name,
+            name: violation.name ?? ruleName,
             severity: severityOverride ?? violation.severity,
             relativeFilepath: violation.relativeFilepath ?? RelativeFilePath2.of(""),
             nodePath: violation.nodePath ?? nodePath,
@@ -861072,7 +861072,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.23.3-647-gfeaa92717c9";
+  const version7 = "5.23.3-649-ge2d80d45a25";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -892164,7 +892164,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-647-gfeaa92717c9",
+        cliVersion: "5.23.3-649-ge2d80d45a25",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -943601,13 +943601,19 @@ function getGithubPublishConfig(githubPublishInfo) {
         secretKeyEnvironmentVariable: (0, import_api50.EnvironmentVariable)(value2.signature.secretKey ?? "")
       } : void 0
     }),
-    pypi: (value2) => import_generator_exec_sdk.FernGeneratorExec.GithubPublishInfo.pypi({
-      registryUrl: value2.registryUrl,
-      packageName: value2.packageName,
-      usernameEnvironmentVariable: (0, import_api50.EnvironmentVariable)("PYPI_USERNAME"),
-      passwordEnvironmentVariable: (0, import_api50.EnvironmentVariable)("PYPI_PASSWORD"),
-      pypiMetadata: value2.pypiMetadata
-    }),
+    pypi: (value2) => {
+      const password = (value2.credentials?.password ?? "").trim();
+      const useOidc = password === "<USE_OIDC>" || password === "OIDC";
+      const hasCredentials = value2.credentials != null;
+      return import_generator_exec_sdk.FernGeneratorExec.GithubPublishInfo.pypi({
+        registryUrl: value2.registryUrl,
+        packageName: value2.packageName,
+        usernameEnvironmentVariable: (0, import_api50.EnvironmentVariable)("PYPI_USERNAME"),
+        passwordEnvironmentVariable: (0, import_api50.EnvironmentVariable)(useOidc ? "OIDC" : "PYPI_PASSWORD"),
+        shouldGeneratePublishWorkflow: useOidc || hasCredentials,
+        pypiMetadata: value2.pypiMetadata
+      });
+    },
     rubygems: (value2) => import_generator_exec_sdk.FernGeneratorExec.GithubPublishInfo.rubygems({
       registryUrl: value2.registryUrl,
       packageName: value2.packageName,
@@ -943729,10 +943735,11 @@ function getGeneratorConfig({ generatorInvocation, customConfig, workspaceName,
       });
     }
   });
+  const publishConfig = getPublishConfigForGithubOidc(generatorInvocation, outputVersion);
   return {
     irFilepath: irPath,
     output: output2,
-    publish: void 0,
+    publish: publishConfig,
     customConfig,
     workspaceName,
     organization,
@@ -943923,6 +943930,42 @@ function getPublishTargetFromPublishModeV2(mode) {
     _other: () => void 0
   });
 }
+function getPublishConfigForGithubOidc(generatorInvocation, version7) {
+  const publishInfo = generatorInvocation.outputMode._visit({
+    publish: () => void 0,
+    publishV2: () => void 0,
+    downloadFiles: () => void 0,
+    github: (value2) => value2.publishInfo,
+    githubV2: (value2) => value2._visit({
+      push: (v9) => v9.publishInfo,
+      commitAndRelease: (v9) => v9.publishInfo,
+      pullRequest: (v9) => v9.publishInfo,
+      _other: () => void 0
+    }),
+    _other: () => void 0
+  });
+  if (publishInfo == null || publishInfo.type !== "pypi") {
+    return void 0;
+  }
+  const password = (publishInfo.credentials?.password ?? "").trim();
+  if (password !== "OIDC" && password !== "<USE_OIDC>") {
+    return void 0;
+  }
+  const registriesV2 = structuredClone(emptyRegistriesConfigV2);
+  registriesV2.pypi = {
+    registryUrl: publishInfo.registryUrl,
+    username: "__token__",
+    password: "OIDC",
+    packageName: publishInfo.packageName,
+    pypiMetadata: publishInfo.pypiMetadata
+  };
+  return {
+    registries: structuredClone(emptyRegistriesConfig),
+    registriesV2,
+    publishTarget: void 0,
+    version: version7
+  };
+}
 var emptyRegistriesConfig = {
   maven: { registryUrl: "", username: "", password: "", group: "", signature: void 0 },
   npm: { registryUrl: "", token: "", scope: "" }
@@ -957305,7 +957348,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.23.3-647-gfeaa92717c9"
+    cli_version: "5.23.3-649-ge2d80d45a25"
   };
 }
 function isAutomationMode() {
@@ -958131,7 +958174,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-647-gfeaa92717c9";
+    return "5.23.3-649-ge2d80d45a25";
   }
   getCliName() {
     if (false) {
@@ -972847,101 +972890,132 @@ async function validateWorkspaces({
   const apiResults = [];
   let docsResult;
   let hasAnyErrors = false;
+  let abortReason;
   const apiWorkspacesToValidate = commandLineApiWorkspace != null ? project.apiWorkspaces.filter((workspace) => workspace.workspaceName === commandLineApiWorkspace) : project.apiWorkspaces;
-  const docsWorkspace = project.docsWorkspaces;
-  if (docsWorkspace != null) {
-    const excludeRules = brokenLinks || errorOnBrokenLinks ? [] : ["valid-markdown-links"];
-    const ossWorkspaces = await filterOssWorkspaces(project);
-    let collected;
-    await cliContext.runTaskForWorkspace(docsWorkspace, async (context3) => {
-      collected = await collectDocsWorkspaceViolations({
-        workspace: docsWorkspace,
-        context: context3,
-        apiWorkspaces: project.apiWorkspaces,
-        ossWorkspaces,
-        errorOnBrokenLinks,
-        excludeRules
-      });
-    });
-    if (collected != null) {
-      docsResult = {
-        violations: collected.violations,
-        elapsedMillis: collected.elapsedMillis
-      };
-      if (collected.hasErrors) {
-        hasAnyErrors = true;
-      }
-    }
-  }
-  await Promise.all(
-    apiWorkspacesToValidate.map(async (workspace) => {
-      if (workspace.generatorsConfiguration?.groups.length === 0 && workspace.type !== "fern") {
-        return;
-      }
-      if (workspace instanceof OSSWorkspace && directFromOpenapi) {
-        await cliContext.runTaskForWorkspace(workspace, async (context3) => {
-          await workspace.getIntermediateRepresentation({
-            context: context3,
-            audiences: { type: "all" },
-            enableUniqueErrorsPerEndpoint: false,
-            generateV1Examples: false,
-            logWarnings
-          });
-        });
-        return;
-      }
-      if (workspace instanceof LazyFernWorkspace) {
-        const absolutePathToApiYml = join8(
-          workspace.absoluteFilePath,
-          RelativeFilePath2.of(DEFINITION_DIRECTORY),
-          RelativeFilePath2.of(ROOT_API_FILENAME)
-        );
-        const apiYmlExists = await doesPathExist(absolutePathToApiYml);
-        if (!apiYmlExists) {
-          await cliContext.runTask(async (context3) => {
-            context3.logger.error(`Missing file: ${ROOT_API_FILENAME}`);
-            return context3.failAndThrow(void 0, void 0, { code: CliError.Code.ValidationError });
-          });
-          return;
-        }
-      }
+  let hasErrors = false;
+  try {
+    const docsWorkspace = project.docsWorkspaces;
+    if (docsWorkspace != null) {
+      const excludeRules = brokenLinks || errorOnBrokenLinks ? [] : ["valid-markdown-links"];
+      const ossWorkspaces = await filterOssWorkspaces(project);
       let collected;
-      await cliContext.runTaskForWorkspace(workspace, async (context3) => {
-        const fernWorkspace = await workspace.toFernWorkspace({ context: context3 });
-        collected = await collectAPIWorkspaceViolations({
-          workspace: fernWorkspace,
+      await cliContext.runTaskForWorkspace(docsWorkspace, async (context3) => {
+        collected = await collectDocsWorkspaceViolations({
+          workspace: docsWorkspace,
           context: context3,
-          ossWorkspace: workspace instanceof OSSWorkspace ? workspace : void 0
+          apiWorkspaces: project.apiWorkspaces,
+          ossWorkspaces,
+          errorOnBrokenLinks,
+          excludeRules
         });
       });
       if (collected != null) {
-        apiResults.push({
-          apiName: collected.apiName,
+        docsResult = {
           violations: collected.violations,
           elapsedMillis: collected.elapsedMillis
-        });
+        };
         if (collected.hasErrors) {
           hasAnyErrors = true;
         }
       }
-    })
-  );
-  const { hasErrors } = await cliContext.runTask((context3) => {
-    return printCheckReport({
-      apiResults,
-      docsResult,
-      logWarnings,
-      context: context3
-    });
-  });
-  if (cliContext.isJsonMode) {
-    const showApiNames = apiResults.length > 1;
-    cliContext.writeJsonToStdout(
-      buildCheckJsonResult({ apiResults, docsResult, hasErrors: hasErrors || hasAnyErrors, showApiNames })
+    }
+    await Promise.all(
+      apiWorkspacesToValidate.map(async (workspace) => {
+        if (workspace.generatorsConfiguration?.groups.length === 0 && workspace.type !== "fern") {
+          return;
+        }
+        if (workspace instanceof OSSWorkspace && directFromOpenapi) {
+          await cliContext.runTaskForWorkspace(workspace, async (context3) => {
+            await workspace.getIntermediateRepresentation({
+              context: context3,
+              audiences: { type: "all" },
+              enableUniqueErrorsPerEndpoint: false,
+              generateV1Examples: false,
+              logWarnings
+            });
+          });
+          return;
+        }
+        if (workspace instanceof LazyFernWorkspace) {
+          const absolutePathToApiYml = join8(
+            workspace.absoluteFilePath,
+            RelativeFilePath2.of(DEFINITION_DIRECTORY),
+            RelativeFilePath2.of(ROOT_API_FILENAME)
+          );
+          const apiYmlExists = await doesPathExist(absolutePathToApiYml);
+          if (!apiYmlExists) {
+            abortReason = "missing api.yml";
+            await cliContext.runTask(async (context3) => {
+              context3.logger.error(`Missing file: ${ROOT_API_FILENAME}`);
+              return context3.failAndThrow(void 0, void 0, {
+                code: CliError.Code.ValidationError
+              });
+            });
+            return;
+          }
+        }
+        let collected;
+        await cliContext.runTaskForWorkspace(workspace, async (context3) => {
+          const fernWorkspace = await workspace.toFernWorkspace({ context: context3 });
+          collected = await collectAPIWorkspaceViolations({
+            workspace: fernWorkspace,
+            context: context3,
+            ossWorkspace: workspace instanceof OSSWorkspace ? workspace : void 0
+          });
+        });
+        if (collected != null) {
+          apiResults.push({
+            apiName: collected.apiName,
+            violations: collected.violations,
+            elapsedMillis: collected.elapsedMillis
+          });
+          if (collected.hasErrors) {
+            hasAnyErrors = true;
+          }
+        }
+      })
     );
-  }
-  if (hasErrors || hasAnyErrors) {
-    cliContext.failAndThrow(void 0, void 0, { code: CliError.Code.ValidationError });
+    const reportResult = await cliContext.runTask((context3) => {
+      return printCheckReport({
+        apiResults,
+        docsResult,
+        logWarnings,
+        context: context3
+      });
+    });
+    hasErrors = reportResult.hasErrors;
+    if (cliContext.isJsonMode) {
+      const showApiNames = apiResults.length > 1;
+      cliContext.writeJsonToStdout(
+        buildCheckJsonResult({ apiResults, docsResult, hasErrors: hasErrors || hasAnyErrors, showApiNames })
+      );
+    }
+    if (hasErrors || hasAnyErrors) {
+      abortReason = "validation errors";
+      cliContext.failAndThrow(void 0, void 0, { code: CliError.Code.ValidationError });
+    }
+  } catch (error50) {
+    if (abortReason == null) {
+      abortReason = error50 instanceof Error ? error50.message.slice(0, 100) : "unexpected error";
+    }
+    throw error50;
+  } finally {
+    const allViolations = [...apiResults.flatMap((r5) => r5.violations), ...docsResult?.violations ?? []];
+    const firedRules = [
+      ...new Set(allViolations.map((v9) => v9.name).filter((name2) => name2 != null))
+    ];
+    const numErrors = allViolations.filter((v9) => v9.severity === "fatal" || v9.severity === "error").length;
+    const numWarnings = allViolations.filter((v9) => v9.severity === "warning").length;
+    cliContext.instrumentPostHogEvent({
+      command: "fern check",
+      properties: {
+        validationRules: firedRules,
+        numErrors,
+        numWarnings,
+        passed: !hasErrors && !hasAnyErrors,
+        abortReason
+      }
+    });
   }
 }
 
@@ -974295,24 +974369,46 @@ function addValidateCommand(cli, cliContext) {
       default: false
     }),
     async (argv) => {
-      const project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
-        commandLineApiWorkspace: void 0,
-        defaultToAllApiWorkspaces: true
-      });
-      if (argv.api != null && !project.apiWorkspaces.some((ws5) => ws5.workspaceName === argv.api)) {
-        cliContext.failAndThrow(`API does not exist: ${argv.api}`, void 0, {
-          code: CliError.Code.ConfigError
+      let project;
+      try {
+        project = await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
+          commandLineApiWorkspace: void 0,
+          defaultToAllApiWorkspaces: true
+        });
+        if (argv.api != null && !project.apiWorkspaces.some((ws5) => ws5.workspaceName === argv.api)) {
+          cliContext.instrumentPostHogEvent({
+            command: "fern check",
+            properties: {
+              passed: false,
+              abortReason: `API does not exist: ${argv.api}`
+            }
+          });
+          cliContext.failAndThrow(`API does not exist: ${argv.api}`, void 0, {
+            code: CliError.Code.ConfigError
+          });
+        }
+        await validateWorkspaces({
+          project,
+          cliContext,
+          logWarnings: argv.warnings,
+          brokenLinks: argv.brokenLinks,
+          errorOnBrokenLinks: argv.strictBrokenLinks,
+          directFromOpenapi: argv.fromOpenapi,
+          commandLineApiWorkspace: argv.api
         });
+      } catch (error50) {
+        if (project == null) {
+          const reason = error50 instanceof Error ? error50.message.slice(0, 100) : "project load failed";
+          cliContext.instrumentPostHogEvent({
+            command: "fern check",
+            properties: {
+              passed: false,
+              abortReason: reason
+            }
+          });
+        }
+        throw error50;
       }
-      await validateWorkspaces({
-        project,
-        cliContext,
-        logWarnings: argv.warnings,
-        brokenLinks: argv.brokenLinks,
-        errorOnBrokenLinks: argv.strictBrokenLinks,
-        directFromOpenapi: argv.fromOpenapi,
-        commandLineApiWorkspace: argv.api
-      });
     }
   );
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-647-gfeaa92717c9",
+  "version": "5.23.3-649-ge2d80d45a25",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",