@fern-api/fern-api-dev 4.76.0 → 4.76.1

package/cli.cjs

@@ -345167,6 +345167,7 @@ var require_GithubStep = __commonJS({
     exports2.GithubStep = void 0;
     exports2.enrichPrBodyForAutomation = enrichPrBodyForAutomation;
     exports2.shouldEnableAutomerge = shouldEnableAutomerge;
+    exports2.shouldPushGenerationBaseTag = shouldPushGenerationBaseTag;
     exports2.resolveBranchAction = resolveBranchAction;
     var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
     var github_1 = (init_lib7(), __toCommonJS(lib_exports3));
@@ -345246,7 +345247,11 @@ var require_GithubStep = __commonJS({
         });
         switch (branchAction) {
           case "replay-branch":
-            generationBaseSha = await (0, createReplayBranch_1.createReplayBranch)(repository, prBranch, this.config.commitMessage, replayConflictInfo, this.logger);
+            if (shouldPushGenerationBaseTag(replayResult)) {
+              generationBaseSha = await (0, createReplayBranch_1.createReplayBranch)(repository, prBranch, this.config.commitMessage, replayConflictInfo, this.logger);
+            } else {
+              await repository.createBranchFromHead(prBranch);
+            }
             break;
           case "create-from-head":
             await repository.createBranchFromHead(prBranch);
@@ -345444,6 +345449,9 @@ _Fern Run ID: \`${config5.runId}\`_`;
     function shouldEnableAutomerge(config5) {
       return config5.automationMode === true && config5.autoMerge === true && config5.hasBreakingChanges !== true;
     }
+    function shouldPushGenerationBaseTag(replayResult) {
+      return (replayResult?.patchesWithConflicts ?? 0) > 0;
+    }
     function resolveBranchAction({ automationMode, skipCommit, existingPR }) {
       if (skipCommit) {
         return "replay-branch";
@@ -354642,6 +354650,7 @@ var require_replay_run = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.replayRun = replayRun;
+    exports2.isTagMergedIntoHead = isTagMergedIntoHead;
     var replay_1 = require_dist14();
     var child_process_1 = require("child_process");
     var fs_1 = require("fs");
@@ -354686,18 +354695,22 @@ var require_replay_run = __commonJS({
           }
         }
         if (shouldSync && tagSha != null) {
-          const syncService = new replay_1.ReplayService(outputDir, { enabled: true });
-          await syncService.syncFromDivergentMerge(tagSha, {
-            cliVersion,
-            generatorVersions,
-            baseBranchHead: baseBranchHead ?? void 0
-          });
-          try {
-            const freshLockManager = new replay_1.LockfileManager(outputDir);
-            if (freshLockManager.exists()) {
-              previousGenerationSha = freshLockManager.read().current_generation;
+          if (!isTagMergedIntoHead(outputDir, tagSha)) {
+            logger4?.warn(`fern-generation-base tag ${tagSha} is not reachable from HEAD \u2014 skipping divergent-merge sync. The tag likely points at an unmerged generation (PR closed without merge).`);
+          } else {
+            const syncService = new replay_1.ReplayService(outputDir, { enabled: true });
+            await syncService.syncFromDivergentMerge(tagSha, {
+              cliVersion,
+              generatorVersions,
+              baseBranchHead: baseBranchHead ?? void 0
+            });
+            try {
+              const freshLockManager = new replay_1.LockfileManager(outputDir);
+              if (freshLockManager.exists()) {
+                previousGenerationSha = freshLockManager.read().current_generation;
+              }
+            } catch {
             }
-          } catch {
           }
         }
       }
@@ -354747,6 +354760,30 @@ var require_replay_run = __commonJS({
         baseBranchHead: resolvedBaseBranchHead
       };
     }
+    function isTagMergedIntoHead(cwd2, tagSha) {
+      try {
+        (0, child_process_1.execFileSync)("git", ["merge-base", "--is-ancestor", tagSha, "HEAD"], {
+          cwd: cwd2,
+          stdio: "pipe"
+        });
+        return true;
+      } catch {
+      }
+      const tagTree = gitRevParse(cwd2, `${tagSha}^{tree}`);
+      if (tagTree == null) {
+        return false;
+      }
+      try {
+        const trees = (0, child_process_1.execFileSync)("git", ["log", "HEAD", "--format=%T", "--max-count=500"], {
+          cwd: cwd2,
+          encoding: "utf-8",
+          stdio: "pipe"
+        });
+        return trees.split("\n").some((t3) => t3.trim() === tagTree);
+      } catch {
+        return false;
+      }
+    }
     function gitRevParse(cwd2, rev) {
       try {
         return (0, child_process_1.execFileSync)("git", ["rev-parse", "--verify", rev], {
@@ -522266,9 +522303,7 @@ function convertQueryParameterExample2(namedFullExamples) {
   const result = {};
   namedFullExamples.forEach((namedFullExample) => {
     const convertedExample = convertFullExample2(namedFullExample.value);
-    if (Array.isArray(convertedExample)) {
-      result[namedFullExample.name] = convertedExample[0];
-    } else if (convertedExample != null) {
+    if (convertedExample != null) {
       result[namedFullExample.name] = convertedExample;
     }
   });
@@ -533560,8 +533595,8 @@ var ExampleEndpointFactory = class {
           ignoreOptionals: true
         }
       });
-      if (example != null && !isExamplePrimitive(example)) {
-        this.logger.debug(`Expected a primitive example but got ${example.type} for query parameter ${queryParameter.name} for ${endpoint3.method.toUpperCase()} ${endpoint3.path}`);
+      if (example != null && !isExamplePrimitive(example) && example.type !== "array") {
+        this.logger.debug(`Expected a primitive or array example but got ${example.type} for query parameter ${queryParameter.name} for ${endpoint3.method.toUpperCase()} ${endpoint3.path}`);
         example = void 0;
       }
       if (required6 && example == null) {
@@ -540070,10 +540105,7 @@ function convertParameters({ path: path98, httpMethod, parameters: parameters2,
     const generatedName = getGeneratedTypeName(parameterBreadcrumbs, context3.options.preserveSchemaIds);
     const isHeader = resolvedParameter.in === "header";
     const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable && !isHeader ? [false, !isRequired2] : [!isRequired2, false];
-    let schema2 = resolvedParameter.schema != null ? convertSchema2(resolvedParameter.schema, isOptional, isNullable, context3, parameterBreadcrumbs, source2, context3.namespace, false, /* @__PURE__ */ new Set(), getExamplesString({
-      schema: resolvedParameter,
-      logger: context3.logger
-    })) : isRequired2 ? SchemaWithExample.primitive({
+    let schema2 = resolvedParameter.schema != null ? convertSchema2(resolvedParameter.schema, isOptional, isNullable, context3, parameterBreadcrumbs, source2, context3.namespace, false, /* @__PURE__ */ new Set(), getParameterExample(resolvedParameter, context3)) : isRequired2 ? SchemaWithExample.primitive({
       nameOverride: void 0,
       generatedName,
       title: void 0,
@@ -540192,6 +540224,13 @@ function getExplodeForQueryParameter(parameter6) {
   }
   return explode === false ? void 0 : explode;
 }
+function getParameterExample(parameter6, context3) {
+  const arrayExample = getExampleAsArray({ schema: parameter6, logger: context3.logger });
+  if (arrayExample != null) {
+    return arrayExample;
+  }
+  return getExamplesString({ schema: parameter6, logger: context3.logger });
+}
 function getExplodeForPathParameter(parameter6) {
   const explode = parameter6.explode;
   if (explode === void 0) {
@@ -562065,6 +562104,37 @@ function convertExampleEndpointCall2({ service, endpoint: endpoint3, example, ty
       if (queryParameterDeclaration == null) {
         throw new Error(`Query parameter ${wireKey} does not exist`);
       }
+      const isAllowMultiple = typeof queryParameterDeclaration !== "string" && queryParameterDeclaration["allow-multiple"] === true;
+      const rawType = typeof queryParameterDeclaration === "string" ? queryParameterDeclaration : queryParameterDeclaration.type;
+      let convertedValue;
+      if (isAllowMultiple && Array.isArray(value)) {
+        const items = value.map((item) => convertTypeReferenceExample({
+          example: item,
+          rawTypeBeingExemplified: rawType,
+          typeResolver,
+          exampleResolver,
+          fileContainingRawTypeReference: file4,
+          fileContainingExample: file4,
+          workspace
+        }));
+        convertedValue = {
+          jsonExample: value,
+          shape: ExampleTypeReferenceShape.container(ExampleContainer.list({
+            list: items,
+            itemType: file4.parseTypeReference(rawType)
+          }))
+        };
+      } else {
+        convertedValue = convertTypeReferenceExample({
+          example: value,
+          rawTypeBeingExemplified: rawType,
+          typeResolver,
+          exampleResolver,
+          fileContainingRawTypeReference: file4,
+          fileContainingExample: file4,
+          workspace
+        });
+      }
       return {
         name: file4.casingsGenerator.generateNameAndWireValue({
           name: getQueryParameterName({
@@ -562073,15 +562143,7 @@ function convertExampleEndpointCall2({ service, endpoint: endpoint3, example, ty
           }).name,
           wireValue: wireKey
         }),
-        value: convertTypeReferenceExample({
-          example: value,
-          rawTypeBeingExemplified: typeof queryParameterDeclaration === "string" ? queryParameterDeclaration : queryParameterDeclaration.type,
-          typeResolver,
-          exampleResolver,
-          fileContainingRawTypeReference: file4,
-          fileContainingExample: file4,
-          workspace
-        }),
+        value: convertedValue,
         shape: getQueryParamaterDeclationShape({ queryParameter: queryParameterDeclaration })
       };
     }) : [],
@@ -569530,7 +569592,7 @@ var ValidEndpointPathRule = {
 };
 
 // ../fern-definition/validator/lib/rules/valid-example-endpoint-call/validateExampleEndpointCallParameters.js
-function validateExampleEndpointCallParameters({ allDeclarations = {}, examples, parameterDisplayName, typeResolver, exampleResolver, workspace, getRawType, breadcrumbs }) {
+function validateExampleEndpointCallParameters({ allDeclarations = {}, examples, parameterDisplayName, typeResolver, exampleResolver, workspace, getRawType, isAllowMultiple, breadcrumbs }) {
   const violations = [];
   const requiredParameters = Object.entries(allDeclarations).reduce((acc, [key2, parameter6]) => {
     const rawType = getRawType(parameter6);
@@ -569565,18 +569627,21 @@ function validateExampleEndpointCallParameters({ allDeclarations = {}, examples,
       } else {
         const rawType = getRawType(expectedType);
         if (rawType != null) {
-          violations.push(...examples_exports6.validateTypeReferenceExample({
-            rawTypeReference: rawType.rawType,
-            example: exampleParameter,
-            file: rawType.file,
-            workspace,
-            typeResolver,
-            exampleResolver,
-            breadcrumbs,
-            depth: 0
-          }).map((val) => {
-            return { severity: val.severity ?? "fatal", message: val.message };
-          }));
+          const examplesToValidate = isAllowMultiple?.(expectedType) && Array.isArray(exampleParameter) ? exampleParameter : [exampleParameter];
+          for (const singleExample of examplesToValidate) {
+            violations.push(...examples_exports6.validateTypeReferenceExample({
+              rawTypeReference: rawType.rawType,
+              example: singleExample,
+              file: rawType.file,
+              workspace,
+              typeResolver,
+              exampleResolver,
+              breadcrumbs,
+              depth: 0
+            }).map((val) => {
+              return { severity: val.severity ?? "fatal", message: val.message };
+            }));
+          }
         }
       }
     }
@@ -569865,6 +569930,7 @@ var ValidExampleEndpointCallRule = {
               }),
               rawType: typeof queryParameter === "string" ? queryParameter : queryParameter.type
             }),
+            isAllowMultiple: (queryParameter) => typeof queryParameter !== "string" && queryParameter["allow-multiple"] === true,
             breadcrumbs: ["query-parameters"]
           });
         },
@@ -621915,7 +621981,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.76.0",
+          version: "4.76.1",
           usingAccessToken: true
         }
       });
@@ -621969,7 +622035,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.76.0",
+        version: "4.76.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -839179,7 +839245,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.76.0";
+  const version7 = "4.76.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -850494,7 +850560,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.76.0"
+        cliVersion: "4.76.1"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -924952,7 +925018,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.76.0";
+    return "4.76.1";
   }
   getCliName() {
     if (false) {

package/package.json

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