@fern-api/fern-api-dev 4.63.0 → 4.63.1-2-g7eec44a362b

package/cli.cjs

@@ -48230,7 +48230,7 @@ var require_polyfills = __commonJS({
       }
       if (platform3 === "win32") {
         fs28.rename = typeof fs28.rename !== "function" ? fs28.rename : (function(fs$rename) {
-          function rename8(from4, to8, cb2) {
+          function rename7(from4, to8, cb2) {
             var start2 = Date.now();
             var backoff = 0;
             fs$rename(from4, to8, function CB(er19) {
@@ -48250,8 +48250,8 @@ var require_polyfills = __commonJS({
               if (cb2) cb2(er19);
             });
           }
-          if (Object.setPrototypeOf) Object.setPrototypeOf(rename8, fs$rename);
-          return rename8;
+          if (Object.setPrototypeOf) Object.setPrototypeOf(rename7, fs$rename);
+          return rename7;
         })(fs28.rename);
       }
       fs28.read = typeof fs28.read !== "function" ? fs28.read : (function(fs$read) {
@@ -48710,8 +48710,8 @@ var require_graceful_fs = __commonJS({
       }
       var fs$copyFile = fs29.copyFile;
       if (fs$copyFile)
-        fs29.copyFile = copyFile4;
-      function copyFile4(src, dest, flags2, cb2) {
+        fs29.copyFile = copyFile5;
+      function copyFile5(src, dest, flags2, cb2) {
         if (typeof flags2 === "function") {
           cb2 = flags2;
           flags2 = 0;
@@ -306276,7 +306276,7 @@ var require_polyfills2 = __commonJS({
       }
       if (platform3 === "win32") {
         fs28.rename = typeof fs28.rename !== "function" ? fs28.rename : (function(fs$rename) {
-          function rename8(from4, to8, cb2) {
+          function rename7(from4, to8, cb2) {
             var start2 = Date.now();
             var backoff = 0;
             fs$rename(from4, to8, function CB(er19) {
@@ -306296,8 +306296,8 @@ var require_polyfills2 = __commonJS({
               if (cb2) cb2(er19);
             });
           }
-          if (Object.setPrototypeOf) Object.setPrototypeOf(rename8, fs$rename);
-          return rename8;
+          if (Object.setPrototypeOf) Object.setPrototypeOf(rename7, fs$rename);
+          return rename7;
         })(fs28.rename);
       }
       fs28.read = typeof fs28.read !== "function" ? fs28.read : (function(fs$read) {
@@ -306756,8 +306756,8 @@ var require_graceful_fs2 = __commonJS({
       }
       var fs$copyFile = fs29.copyFile;
       if (fs$copyFile)
-        fs29.copyFile = copyFile4;
-      function copyFile4(src, dest, flags2, cb2) {
+        fs29.copyFile = copyFile5;
+      function copyFile5(src, dest, flags2, cb2) {
         if (typeof flags2 === "function") {
           cb2 = flags2;
           flags2 = 0;
@@ -359558,12 +359558,12 @@ var require_cjs6 = __commonJS({
         target.push(buffer);
       };
     }
-    var import_child_process11;
+    var import_child_process12;
     var GitExecutorChain2;
     var init_git_executor_chain2 = __esm3({
       "src/lib/runners/git-executor-chain.ts"() {
         "use strict";
-        import_child_process11 = require("child_process");
+        import_child_process12 = require("child_process");
         init_git_error2();
         init_task2();
         init_utils9();
@@ -359713,7 +359713,7 @@ var require_cjs6 = __commonJS({
                   rejection = reason || rejection;
                 }
               });
-              const spawned = (0, import_child_process11.spawn)(command3, args, spawnOptions);
+              const spawned = (0, import_child_process12.spawn)(command3, args, spawnOptions);
               spawned.stdout.on(
                 "data",
                 onDataReceived2(stdOut, "stdOut", logger4, outputLogger.step("stdOut"))
@@ -366942,16 +366942,16 @@ var require_copy = __commonJS({
       throw new Error(`Unknown file: ${src}`);
     }
     async function onFile(srcStat, destStat, src, dest, opts) {
-      if (!destStat) return copyFile4(srcStat, src, dest, opts);
+      if (!destStat) return copyFile5(srcStat, src, dest, opts);
       if (opts.overwrite) {
         await fs28.unlink(dest);
-        return copyFile4(srcStat, src, dest, opts);
+        return copyFile5(srcStat, src, dest, opts);
       }
       if (opts.errorOnExist) {
         throw new Error(`'${dest}' already exists`);
       }
     }
-    async function copyFile4(srcStat, src, dest, opts) {
+    async function copyFile5(srcStat, src, dest, opts) {
       await fs28.copyFile(src, dest);
       if (opts.preserveTimestamps) {
         if (fileIsNotWritable(srcStat.mode)) {
@@ -367059,18 +367059,18 @@ var require_copy_sync = __commonJS({
       throw new Error(`Unknown file: ${src}`);
     }
     function onFile(srcStat, destStat, src, dest, opts) {
-      if (!destStat) return copyFile4(srcStat, src, dest, opts);
+      if (!destStat) return copyFile5(srcStat, src, dest, opts);
       return mayCopyFile(srcStat, src, dest, opts);
     }
     function mayCopyFile(srcStat, src, dest, opts) {
       if (opts.overwrite) {
         fs28.unlinkSync(dest);
-        return copyFile4(srcStat, src, dest, opts);
+        return copyFile5(srcStat, src, dest, opts);
       } else if (opts.errorOnExist) {
         throw new Error(`'${dest}' already exists`);
       }
     }
-    function copyFile4(srcStat, src, dest, opts) {
+    function copyFile5(srcStat, src, dest, opts) {
       fs28.copyFileSync(src, dest);
       if (opts.preserveTimestamps) handleTimestamps(srcStat.mode, src, dest);
       return setDestMode(dest, srcStat.mode);
@@ -367813,15 +367813,15 @@ var require_move_sync = __commonJS({
       return parsedPath.root === parent;
     }
     function doRename(src, dest, overwrite, isChangingCase) {
-      if (isChangingCase) return rename8(src, dest, overwrite);
+      if (isChangingCase) return rename7(src, dest, overwrite);
       if (overwrite) {
         removeSync(dest);
-        return rename8(src, dest, overwrite);
+        return rename7(src, dest, overwrite);
       }
       if (fs28.existsSync(dest)) throw new Error("dest already exists.");
-      return rename8(src, dest, overwrite);
+      return rename7(src, dest, overwrite);
     }
-    function rename8(src, dest, overwrite) {
+    function rename7(src, dest, overwrite) {
       try {
         fs28.renameSync(src, dest);
       } catch (err) {
@@ -593681,7 +593681,8 @@ var ProtobufOpenAPIGenerator = class {
     }
     const outputPath = join2(preparedDir.cwd, RelativeFilePath2.of(PROTOBUF_GENERATOR_OUTPUT_FILEPATH2));
     const uniqueOutput = AbsoluteFilePath2.of((await import_tmp_promise7.default.file({ postfix: ".yaml" })).path);
-    await (0, import_promises35.rename)(outputPath, uniqueOutput);
+    await (0, import_promises35.copyFile)(outputPath, uniqueOutput);
+    await (0, import_promises35.unlink)(outputPath);
     return { absoluteFilepath: uniqueOutput };
   }
   async generateLocal({ absoluteFilepathToProtobufRoot, absoluteFilepathToProtobufTarget, relativeFilepathToProtobufRoot, deps, existingBufLockContents }) {
@@ -603120,7 +603121,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.63.0",
+          version: "4.63.1-2-g7eec44a362b",
           usingAccessToken: true
         }
       });
@@ -603171,7 +603172,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.63.0",
+        version: "4.63.1-2-g7eec44a362b",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -838081,6 +838082,7 @@ async function getPorts(options2) {
 init_lib4();
 init_js();
 init_lib6();
+var import_child_process6 = require("child_process");
 var import_cors = __toESM(require_lib14(), 1);
 var import_express2 = __toESM(require_express3(), 1);
 var import_fs25 = __toESM(require("fs"), 1);
@@ -839763,7 +839765,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.63.0";
+  const version7 = "4.63.1-2-g7eec44a362b";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -840953,6 +840955,33 @@ function cleanFernDocsCacheSync(bundleRoot, context3) {
     context3.logger.debug(`Failed to clean Fern Docs cache: ${err}`);
   }
 }
+function killProcessesOnPort(targetPort, context3) {
+  context3.logger.debug(`Killing any leftover processes on port ${targetPort}`);
+  const isWindows = process.platform === "win32";
+  const command3 = isWindows ? `netstat -ano | findstr :${targetPort} | findstr LISTENING` : `lsof -ti tcp:${targetPort}`;
+  try {
+    const output2 = (0, import_child_process6.execSync)(command3, { encoding: "utf-8", timeout: 5e3 });
+    let pids;
+    if (isWindows) {
+      pids = output2.trim().split("\n").map((line) => line.trim().split(/\s+/).pop() ?? "").filter((pid) => pid.length > 0 && pid !== String(process.pid));
+      pids = [...new Set(pids)];
+    } else {
+      pids = output2.trim().split("\n").map((pid) => pid.trim()).filter((pid) => pid.length > 0 && pid !== String(process.pid));
+    }
+    for (const pid of pids) {
+      try {
+        context3.logger.debug(`Killing leftover process ${pid} on port ${targetPort}`);
+        if (isWindows) {
+          (0, import_child_process6.execSync)(`taskkill /F /PID ${pid}`, { timeout: 5e3 });
+        } else {
+          process.kill(Number(pid), "SIGKILL");
+        }
+      } catch {
+      }
+    }
+  } catch {
+  }
+}
 async function runAppPreviewServer({ initialProject, reloadProject, validateProject, context: context3, port, bundlePath, backendPort, forceDownload }) {
   if (forceDownload) {
     const appPreviewFolder = getPathToPreviewFolder({ app: true });
@@ -841234,6 +841263,7 @@ ${err.stack}`);
     NODE_OPTIONS: "--max-old-space-size=8096 --enable-source-maps"
   };
   let serverProcess = null;
+  let actualPort = port;
   const startNextJsServer = () => {
     return new Promise((resolve13) => {
       serverProcess = runExeca(context3.logger, "node", [serverPath], {
@@ -841243,6 +841273,10 @@ ${err.stack}`);
       const checkReady = (data2) => {
         const output2 = data2.toString();
         context3.logger.debug(`[Next.js] ${output2}`);
+        const portMatch = output2.match(/localhost:(\d+)/);
+        if (portMatch != null) {
+          actualPort = Number(portMatch[1]);
+        }
         if (output2.includes("Ready in") || output2.includes("\u2713 Ready")) {
           resolve13();
         }
@@ -841343,6 +841377,7 @@ ${err.stack}`);
         context3.logger.error(`Failed to kill server process: ${err}`);
       }
     }
+    killProcessesOnPort(actualPort, context3);
     cleanFernDocsCacheSync(bundleRoot, context3);
     context3.logger.debug("Cleaning up WebSocket connections...");
     for (const [ws8, metadata] of connections) {
@@ -850637,6 +850672,9 @@ async function generateLanguageSpecificDynamicIRs({ workspace, organization, con
         if (generatorInvocation.language === "php" && generatorInvocation.config && typeof generatorInvocation.config === "object" && "packageName" in generatorInvocation.config) {
           packageName = generatorInvocation.config.packageName ?? "";
         }
+        if (generatorInvocation.language === "go" && packageName) {
+          packageName = normalizeGoPackageForLookup(packageName);
+        }
         if (!generatorInvocation.language) {
           continue;
         }
@@ -850878,7 +850916,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.63.0"
+        cliVersion: "4.63.1-2-g7eec44a362b"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -851956,7 +851994,7 @@ components:
 // ../cli-v2/lib/init/Wizard.js
 init_lib4();
 init_lib6();
-var import_child_process6 = require("child_process");
+var import_child_process7 = require("child_process");
 var import_path58 = __toESM(require("path"), 1);
 
 // ../cli-v2/lib/ui/withSpinner.js
@@ -852598,7 +852636,7 @@ var Wizard = class {
    */
   openMacOsFinderDialog() {
     try {
-      const result = (0, import_child_process6.execSync)(`osascript -e 'POSIX path of (choose file with prompt "Select your API spec:" of type {"json", "yml", "yaml"})'`, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+      const result = (0, import_child_process7.execSync)(`osascript -e 'POSIX path of (choose file with prompt "Select your API spec:" of type {"json", "yml", "yaml"})'`, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
       return result.trim();
     } catch {
       return void 0;
@@ -852764,7 +852802,7 @@ function addCreateCommand(cli) {
 }
 
 // ../cli-v2/lib/commands/org/list/command.js
-var import_child_process7 = require("child_process");
+var import_child_process8 = require("child_process");
 var ListCommand = class {
   async handle(context3) {
     const token = await context3.getTokenOrPrompt();
@@ -852875,7 +852913,7 @@ var ListCommand = class {
   getPager() {
     const defaultPager = process.platform === "win32" ? "more" : "less";
     const pagerCmd = process.env.PAGER ?? defaultPager;
-    return (0, import_child_process7.spawn)(pagerCmd, {
+    return (0, import_child_process8.spawn)(pagerCmd, {
       stdio: ["pipe", "inherit", "inherit"],
       env: {
         ...process.env,
@@ -877689,9 +877727,10 @@ var DynamicTypeLiteralMapper = class {
     }
   }
   convertObject({ object_, value, as: as8, inUndiscriminatedUnion }) {
+    const valueRecord = this.context.getRecord(value) ?? {};
     const properties7 = this.context.associateByWireValue({
       parameters: object_.properties,
-      values: this.context.getRecord(value) ?? {}
+      values: valueRecord
     });
     const existingWireValues = new Set(properties7.map((p10) => p10.name.wireValue));
     for (const param of object_.properties) {
@@ -877710,8 +877749,10 @@ var DynamicTypeLiteralMapper = class {
       }
     }
     const paramOrderMap = /* @__PURE__ */ new Map();
+    const declaredWireValues = /* @__PURE__ */ new Set();
     object_.properties.forEach((param, index3) => {
       paramOrderMap.set(param.name.wireValue, index3);
+      declaredWireValues.add(param.name.wireValue);
     });
     properties7.sort((a10, b19) => (paramOrderMap.get(a10.name.wireValue) ?? 0) - (paramOrderMap.get(b19.name.wireValue) ?? 0));
     const filteredProperties = as8 === "request" ? properties7.filter((property23) => !this.context.isDirectLiteral(property23.typeReference)) : properties7;
@@ -877739,6 +877780,17 @@ var DynamicTypeLiteralMapper = class {
         this.context.errors.unscope();
       }
     }
+    for (const [key2, val] of Object.entries(valueRecord)) {
+      if (!declaredWireValues.has(key2) && val !== void 0) {
+        const rawValue = this.convertToRawJavaLiteral(val);
+        if (rawValue != null) {
+          builderParameters.push({
+            name: "additionalProperty",
+            value: java_exports.TypeLiteral.raw(`"${this.escapeJavaString(key2)}", ${rawValue}`)
+          });
+        }
+      }
+    }
     return java_exports.TypeLiteral.builder({
       classReference: this.context.getJavaClassReferenceFromDeclaration({
         declaration: object_.declaration
@@ -877746,6 +877798,24 @@ var DynamicTypeLiteralMapper = class {
       parameters: builderParameters
     });
   }
+  convertToRawJavaLiteral(value) {
+    if (typeof value === "string") {
+      return `"${this.escapeJavaString(value)}"`;
+    }
+    if (typeof value === "number") {
+      return value.toString();
+    }
+    if (typeof value === "boolean") {
+      return value.toString();
+    }
+    if (value === null) {
+      return "null";
+    }
+    return null;
+  }
+  escapeJavaString(s11) {
+    return s11.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\t/g, "\\t").replace(/\r/g, "\\r");
+  }
   getDefaultValueForTypeReference(typeReference2) {
     switch (typeReference2.type) {
       case "primitive":
@@ -884892,7 +884962,7 @@ var DynamicTypeLiteralMapper3 = class {
       const errorsBefore = this.context.errors.size();
       try {
         const instantiation = this.convert({ typeReference: typeReference2, value });
-        if (python_exports2.TypeInstantiation.isNop(instantiation)) {
+        if (python_exports2.TypeInstantiation.isNop(instantiation) || this.context.errors.size() > errorsBefore) {
           this.context.errors.truncate(errorsBefore);
           continue;
         }
@@ -889294,10 +889364,10 @@ function generateDefaultCrateName(organization, apiName) {
 }
 
 // ../../../generators/rust/base/lib/formatter/RustFormatter.js
-var import_child_process8 = require("child_process");
+var import_child_process9 = require("child_process");
 function formatRustSnippet(code5, logger4) {
   try {
-    const result = (0, import_child_process8.spawnSync)("rustfmt", ["--edition=2021"], {
+    const result = (0, import_child_process9.spawnSync)("rustfmt", ["--edition=2021"], {
       input: code5,
       encoding: "utf8",
       timeout: 5e3
@@ -889316,7 +889386,7 @@ function formatRustSnippet(code5, logger4) {
 }
 async function formatRustSnippetAsync(code5, logger4) {
   return new Promise((resolve13) => {
-    const rustfmt = (0, import_child_process8.spawn)("rustfmt", ["--edition=2021"], {
+    const rustfmt = (0, import_child_process9.spawn)("rustfmt", ["--edition=2021"], {
       stdio: "pipe"
     });
     rustfmt.stdin.write(code5);
@@ -902802,11 +902872,11 @@ generators:
         await fs18.mkdir(absolutePathToLocalOutput, { recursive: true });
         interactiveTaskContext.logger.debug(`Self-hosted GitHub mode: cloning ${selfhostedGithubConfig.uri} to ${absolutePathToLocalOutput}`);
         try {
-          const { execSync: execSync5 } = await import("child_process");
-          const gitPath = execSync5("which git 2>/dev/null || echo 'not found'", {
+          const { execSync: execSync6 } = await import("child_process");
+          const gitPath = execSync6("which git 2>/dev/null || echo 'not found'", {
             encoding: "utf-8"
           }).trim();
-          const gitVersion = execSync5("git --version 2>/dev/null || echo 'unknown'", {
+          const gitVersion = execSync6("git --version 2>/dev/null || echo 'unknown'", {
             encoding: "utf-8"
           }).trim();
           interactiveTaskContext.logger.debug(`Git environment: path=${gitPath}, version=${gitVersion}, PATH=${process.env.PATH ?? "unset"}`);
@@ -924224,7 +924294,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.63.0";
+    return "4.63.1-2-g7eec44a362b";
   }
   getCliName() {
     if (false) {
@@ -935761,9 +935831,9 @@ function getAIEnhancerConfig2() {
 // src/commands/sdk-diff/sdkDiffCommand.ts
 init_lib4();
 init_lib6();
-var import_child_process9 = require("child_process");
+var import_child_process10 = require("child_process");
 var import_util70 = require("util");
-var execAsync = (0, import_util70.promisify)(import_child_process9.exec);
+var execAsync = (0, import_util70.promisify)(import_child_process10.exec);
 async function getClientRegistry(context3, project) {
   const workspace = project.apiWorkspaces[0];
   if (workspace == null) {
@@ -935943,10 +936013,10 @@ function computePreviewVersion({ previewId }) {
 }
 
 // src/commands/sdk-preview/getPreviewId.ts
-var import_child_process10 = require("child_process");
+var import_child_process11 = require("child_process");
 var import_crypto12 = require("crypto");
 var import_util71 = require("util");
-var execAsync2 = (0, import_util71.promisify)(import_child_process10.exec);
+var execAsync2 = (0, import_util71.promisify)(import_child_process11.exec);
 var MAX_PREVIEW_ID_LENGTH = 40;
 async function getPreviewId() {
   try {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.63.0",
+  "version": "4.63.1-2-g7eec44a362b",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",