@fern-api/fern-api-dev 4.74.0-11-g4d0b805a133 → 4.74.0-4-g87a8686e04a

package/cli.cjs

@@ -621394,7 +621394,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.74.0-11-g4d0b805a133",
+          version: "4.74.0-4-g87a8686e04a",
           usingAccessToken: true
         }
       });
@@ -621448,7 +621448,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.74.0-11-g4d0b805a133",
+        version: "4.74.0-4-g87a8686e04a",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -838658,7 +838658,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 = "4.74.0-11-g4d0b805a133";
+  const version7 = "4.74.0-4-g87a8686e04a";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -849958,7 +849958,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.74.0-11-g4d0b805a133"
+        cliVersion: "4.74.0-4-g87a8686e04a"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -924416,7 +924416,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.74.0-11-g4d0b805a133";
+    return "4.74.0-4-g87a8686e04a";
   }
   getCliName() {
     if (false) {
@@ -936585,98 +936585,39 @@ function overrideGroupOutputForPreview({
   group,
   packageName,
   token,
-  registryUrl: registryUrl2
-}) {
-  const modifiedGenerators = group.generators.map((generator) => ({
-    ...generator,
-    outputMode: createNpmOverrideOutputMode({ registryUrl: registryUrl2, packageName, token }),
-    absolutePathToLocalOutput: void 0
-  }));
-  return {
-    ...group,
-    generators: modifiedGenerators
-  };
-}
-function getGithubPublishInfoWithoutToken(outputMode) {
-  const publishInfo = outputMode._visit({
-    downloadFiles: () => void 0,
-    github: () => void 0,
-    githubV2: (val) => val._visit({
-      push: (v23) => v23.publishInfo,
-      commitAndRelease: (v23) => v23.publishInfo,
-      pullRequest: (v23) => v23.publishInfo,
-      _other: () => void 0
-    }),
-    publish: () => void 0,
-    publishV2: () => void 0,
-    _other: () => void 0
-  });
-  if (publishInfo == null) {
-    return void 0;
-  }
-  return stripPublishInfoCredentials(publishInfo);
-}
-function stripPublishInfoCredentials(publishInfo) {
-  return publishInfo._visit({
-    npm: (val) => api_exports5.GithubPublishInfo.npm({
-      registryUrl: val.registryUrl,
-      packageName: val.packageName,
-      token: void 0
-    }),
-    maven: (val) => api_exports5.GithubPublishInfo.maven({
-      registryUrl: val.registryUrl,
-      coordinate: val.coordinate,
-      credentials: void 0,
-      signature: void 0
-    }),
-    postman: () => void 0,
-    pypi: (val) => api_exports5.GithubPublishInfo.pypi({
-      registryUrl: val.registryUrl,
-      packageName: val.packageName,
-      credentials: void 0,
-      pypiMetadata: val.pypiMetadata
-    }),
-    nuget: (val) => api_exports5.GithubPublishInfo.nuget({
-      registryUrl: val.registryUrl,
-      packageName: val.packageName,
-      apiKey: void 0
-    }),
-    rubygems: (val) => api_exports5.GithubPublishInfo.rubygems({
-      registryUrl: val.registryUrl,
-      packageName: val.packageName,
-      apiKey: void 0
-    }),
-    crates: (val) => api_exports5.GithubPublishInfo.crates({
-      registryUrl: val.registryUrl,
-      packageName: val.packageName,
-      token: void 0
-    }),
-    _other: () => void 0
-  });
-}
-function overrideGroupOutputForDiffBranch({
-  group
+  registryUrl: registryUrl2,
+  pushDiff
 }) {
   const modifiedGenerators = group.generators.map((generator) => {
-    const githubInfo = getGithubOwnerRepo(generator.outputMode);
-    if (githubInfo == null) {
-      return void 0;
+    if (pushDiff === true) {
+      const githubInfo = getGithubOwnerRepo(generator.outputMode);
+      if (githubInfo != null) {
+        return {
+          ...generator,
+          outputMode: api_exports5.OutputMode.githubV2(
+            api_exports5.GithubOutputModeV2.push({
+              owner: githubInfo.owner,
+              repo: githubInfo.repo,
+              branch: void 0,
+              license: void 0,
+              publishInfo: api_exports5.GithubPublishInfo.npm({
+                registryUrl: registryUrl2,
+                packageName,
+                token
+              }),
+              downloadSnippets: false
+            })
+          ),
+          absolutePathToLocalOutput: void 0
+        };
+      }
     }
     return {
       ...generator,
-      outputMode: api_exports5.OutputMode.githubV2(
-        api_exports5.GithubOutputModeV2.push({
-          owner: githubInfo.owner,
-          repo: githubInfo.repo,
-          branch: void 0,
-          license: void 0,
-          publishInfo: getGithubPublishInfoWithoutToken(generator.outputMode),
-          downloadSnippets: false
-        })
-      ),
+      outputMode: createNpmOverrideOutputMode({ registryUrl: registryUrl2, packageName, token }),
       absolutePathToLocalOutput: void 0
     };
-  }).filter((g19) => g19 != null);
+  });
   return {
     ...group,
     generators: modifiedGenerators
@@ -936823,78 +936764,62 @@ async function sdkPreview({
         const previewVersion = computePreviewVersion({ previewId });
         cliContext.logger.info(`Preview version: ${previewVersion}`);
         const singleGeneratorGroup = { ...group, generators: [generator] };
-        const githubInfo = getGithubOwnerRepo(generator.outputMode);
-        if (pushDiff && useRemoteGeneration && githubInfo == null) {
+        if (pushDiff && useRemoteGeneration && getGithubOwnerRepo(generator.outputMode) == null) {
           cliContext.logger.warn(
             `Generator '${generator.name}' has no github output configuration. --push-diff will be ignored; falling back to registry-only publish.`
           );
         }
-        const shouldRunTwoJobs = pushDiff && useRemoteGeneration && publishToRegistry && registryUrl2 != null && githubInfo != null;
-        let publishGroup;
+        let modifiedGroup;
         if (publishToRegistry && registryUrl2 != null) {
-          publishGroup = overrideGroupOutputForPreview({
+          modifiedGroup = overrideGroupOutputForPreview({
             group: singleGeneratorGroup,
             packageName: previewPackageName,
             token: token.value,
-            registryUrl: registryUrl2
+            registryUrl: registryUrl2,
+            pushDiff: useRemoteGeneration ? pushDiff : void 0
           });
         } else if (useRemoteGeneration) {
-          publishGroup = overrideGroupOutputForDownload({ group: singleGeneratorGroup });
+          modifiedGroup = overrideGroupOutputForDownload({ group: singleGeneratorGroup });
         } else {
-          publishGroup = singleGeneratorGroup;
+          modifiedGroup = singleGeneratorGroup;
         }
         if (useRemoteGeneration) {
-          const commonRemoteArgs = {
-            projectConfig: project.config,
-            organization: project.config.organization,
-            workspace,
-            shouldLogS3Url: false,
-            token,
-            whitelabel: workspace.generatorsConfiguration?.whitelabel,
-            mode: void 0,
-            fernignorePath: void 0,
-            skipFernignore: false,
-            dynamicIrOnly: false,
-            validateWorkspace: true,
-            retryRateLimited: false,
-            requireEnvVars: false
-          };
           await cliContext.runTaskForWorkspace(workspace, async (context3) => {
             await runRemoteGenerationForAPIWorkspace({
-              ...commonRemoteArgs,
+              projectConfig: project.config,
+              organization: project.config.organization,
+              workspace,
               context: context3,
-              generatorGroup: publishGroup,
+              generatorGroup: modifiedGroup,
               version: previewVersion,
+              shouldLogS3Url: false,
+              token,
+              whitelabel: workspace.generatorsConfiguration?.whitelabel,
               absolutePathToPreview: absolutePathToOutput,
+              // isPreview controls CLI-side behavior: lenient env var substitution,
+              // skip version availability check, skip dynamic IR upload.
               isPreview: true,
+              // fiddlePreview controls what's sent to Fiddle as the `preview` flag.
+              // We explicitly send false so Fiddle doesn't set dryRun=true (which
+              // would cause `npm publish --dry-run` instead of actually publishing).
               fiddlePreview: false,
-              pushPreviewBranch: false
+              pushPreviewBranch: pushDiff,
+              mode: void 0,
+              fernignorePath: void 0,
+              skipFernignore: false,
+              dynamicIrOnly: false,
+              validateWorkspace: true,
+              retryRateLimited: false,
+              requireEnvVars: false
             });
           });
-          if (shouldRunTwoJobs) {
-            const diffGroup = overrideGroupOutputForDiffBranch({ group: singleGeneratorGroup });
-            if (diffGroup.generators.length > 0) {
-              await cliContext.runTaskForWorkspace(workspace, async (context3) => {
-                await runRemoteGenerationForAPIWorkspace({
-                  ...commonRemoteArgs,
-                  context: context3,
-                  generatorGroup: diffGroup,
-                  version: previewVersion,
-                  absolutePathToPreview: void 0,
-                  isPreview: true,
-                  fiddlePreview: true,
-                  pushPreviewBranch: true
-                });
-              });
-            }
-          }
         } else {
           await cliContext.runTaskForWorkspace(workspace, async (context3) => {
             await runLocalGenerationForWorkspace({
               token,
               projectConfig: project.config,
               workspace,
-              generatorGroup: publishGroup,
+              generatorGroup: modifiedGroup,
               version: previewVersion,
               keepDocker: false,
               context: context3,
@@ -936911,6 +936836,7 @@ async function sdkPreview({
           });
         }
         const actualOutputPath = absolutePathToOutput != null ? join8(absolutePathToOutput, RelativeFilePath2.of(getGeneratorOutputSubfolder(generator.name))) : void 0;
+        const githubInfo = getGithubOwnerRepo(generator.outputMode);
         const previewBranch = `fern-preview-${previewVersion}`;
         const diffUrl = pushDiff && githubInfo != null ? `https://github.com/${githubInfo.owner}/${githubInfo.repo}/compare/${previewBranch}` : void 0;
         if (publishToRegistry && registryUrl2 != null) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.74.0-11-g4d0b805a133",
+  "version": "4.74.0-4-g87a8686e04a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",