@fern-api/fern-api-dev 5.23.3-1768-g87d295561fa → 5.23.3-1769-g72dc1333c41

package/cli.cjs

@@ -100959,8 +100959,8 @@ var require_graceful_fs = __commonJS({
         }
       }
       var fs$writeFile = fs35.writeFile;
-      fs35.writeFile = writeFile102;
-      function writeFile102(path120, data2, options2, cb) {
+      fs35.writeFile = writeFile103;
+      function writeFile103(path120, data2, options2, cb) {
         if (typeof options2 === "function")
           cb = options2, options2 = null;
         return go$writeFile(path120, data2, options2, cb);
@@ -460369,13 +460369,13 @@ async function removeInvalidAiExamples({ sourceFilePath, context: context3 }) {
         }
       }
     }
-    const { writeFile: writeFile102 } = await import("fs/promises");
+    const { writeFile: writeFile103 } = await import("fs/promises");
     const yamlContent = index_vite_proxy_tmp_default.dump(parsed, {
       indent: 2,
       lineWidth: -1,
       noRefs: true
     });
-    await writeFile102(overrideFilePath, yamlContent, "utf-8");
+    await writeFile103(overrideFilePath, yamlContent, "utf-8");
     context3.logger.info(`Removed ${validationResult.invalidCount} invalid AI examples from ai_examples_override.yml`);
     return {
       removedCount: validationResult.invalidCount,
@@ -483704,8 +483704,8 @@ var require_graceful_fs2 = __commonJS({
         }
       }
       var fs$writeFile = fs35.writeFile;
-      fs35.writeFile = writeFile102;
-      function writeFile102(path120, data2, options2, cb) {
+      fs35.writeFile = writeFile103;
+      function writeFile103(path120, data2, options2, cb) {
         if (typeof options2 === "function")
           cb = options2, options2 = null;
         return go$writeFile(path120, data2, options2, cb);
@@ -626889,7 +626889,7 @@ var require_jsonfile = __commonJS({
       const str2 = stringify5(obj, options2);
       await universalify.fromCallback(fs34.writeFile)(file4, str2, options2);
     }
-    var writeFile102 = universalify.fromPromise(_writeFile);
+    var writeFile103 = universalify.fromPromise(_writeFile);
     function writeFileSync9(file4, obj, options2 = {}) {
       const fs34 = options2.fs || _fs;
       const str2 = stringify5(obj, options2);
@@ -626898,7 +626898,7 @@ var require_jsonfile = __commonJS({
     module4.exports = {
       readFile: readFile121,
       readFileSync: readFileSync19,
-      writeFile: writeFile102,
+      writeFile: writeFile103,
       writeFileSync: writeFileSync9
     };
   }
@@ -694418,7 +694418,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-1768-g87d295561fa",
+          version: "5.23.3-1769-g72dc1333c41",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -694484,7 +694484,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-1768-g87d295561fa",
+        version: "5.23.3-1769-g72dc1333c41",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -875614,7 +875614,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-1768-g87d295561fa";
+  const version7 = "5.23.3-1769-g72dc1333c41";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -908324,7 +908324,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-1768-g87d295561fa",
+        cliVersion: "5.23.3-1769-g72dc1333c41",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -975214,7 +975214,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-1768-g87d295561fa"
+    cli_version: "5.23.3-1769-g72dc1333c41"
   };
 }
 function isAutomationMode() {
@@ -976046,7 +976046,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-1768-g87d295561fa";
+    return "5.23.3-1769-g72dc1333c41";
   }
   getCliName() {
     if (false) {
@@ -977858,7 +977858,8 @@ async function packLocalOutputForGroup({
   context: context3,
   mode = "host",
   runner,
-  packOnly = false
+  packOnly = false,
+  version: version7
 }) {
   const failures = [];
   for (const generator of group.generators) {
@@ -977880,7 +977881,8 @@ async function packLocalOutputForGroup({
         outputPath,
         context: context3,
         mode,
-        runner: runner ?? "docker"
+        runner: runner ?? "docker",
+        version: version7
       });
       if (packOnly) {
         if (artifactProduced) {
@@ -977907,7 +977909,8 @@ async function packOutputForLanguage({
   outputPath,
   context: context3,
   mode,
-  runner
+  runner,
+  version: version7
 }) {
   const distDir = join8(outputPath, RelativeFilePath2.of(PACK_OUTPUT_DIRECTORY));
   const run = async (commands) => {
@@ -977916,26 +977919,103 @@ async function packOutputForLanguage({
   switch (language) {
     case "typescript": {
       await (0, import_promises168.mkdir)(distDir, { recursive: true });
-      const commands = [["npm", "install"]];
+      await run([["npm", "install"]]);
       if (await hasNpmScript({ outputPath, script: "build" })) {
-        commands.push(["npm", "run", "build"]);
+        await run([["npx", "--yes", "pnpm", "run", "build"]]);
+      } else {
+        const tsconfig = await findTsconfig(outputPath);
+        if (tsconfig != null) {
+          try {
+            await run([["npx", "--yes", "--package", "typescript", "tsc", "--project", tsconfig]]);
+          } catch (error50) {
+            if (!await hasEmittedCompilerOutput({ outputPath, tsconfig })) {
+              throw error50;
+            }
+            context3.logger.warn(
+              `tsc reported errors while compiling ${tsconfig}; packing the emitted output anyway.`
+            );
+          }
+        }
+      }
+      const npmignorePath = join8(outputPath, RelativeFilePath2.of(".npmignore"));
+      const shouldWriteNpmignore = !await doesPathExist(npmignorePath) && !await hasPackageJsonFilesField(outputPath) && await doesPathExist(join8(outputPath, RelativeFilePath2.of(".gitignore")));
+      if (shouldWriteNpmignore) {
+        await (0, import_promises168.writeFile)(npmignorePath, `${PACK_OUTPUT_DIRECTORY}/
+`);
+      }
+      try {
+        await run([["npm", "pack", "--pack-destination", PACK_OUTPUT_DIRECTORY]]);
+      } finally {
+        if (shouldWriteNpmignore) {
+          await (0, import_promises168.rm)(npmignorePath, { force: true });
+        }
       }
-      commands.push(["npm", "pack", "--pack-destination", PACK_OUTPUT_DIRECTORY]);
-      await run(commands);
       logArtifacts({ distDir, context: context3 });
       return true;
     }
     case "python": {
       await (0, import_promises168.mkdir)(distDir, { recursive: true });
-      await run([["python3", "-m", "pip", "wheel", ".", "--no-deps", "--wheel-dir", PACK_OUTPUT_DIRECTORY]]);
+      const pipWheelCommand = [
+        "python3",
+        "-m",
+        "pip",
+        "wheel",
+        ".",
+        "--no-deps",
+        "--wheel-dir",
+        PACK_OUTPUT_DIRECTORY
+      ];
+      if (mode === "host") {
+        try {
+          await run([pipWheelCommand]);
+        } catch {
+          context3.logger.warn(
+            "pip wheel failed on the host toolchain; retrying in an isolated build environment (python -m venv + python -m build)."
+          );
+          const venvDirectory = ".fern-pack-venv";
+          const venvPython = process.platform === "win32" ? `${venvDirectory}/Scripts/python` : `${venvDirectory}/bin/python`;
+          try {
+            await run([
+              ["python3", "-m", "venv", venvDirectory],
+              [venvPython, "-m", "pip", "install", "--quiet", "build"],
+              [venvPython, "-m", "build", "--wheel", "--outdir", PACK_OUTPUT_DIRECTORY]
+            ]);
+          } finally {
+            await (0, import_promises168.rm)(join8(outputPath, RelativeFilePath2.of(venvDirectory)), {
+              recursive: true,
+              force: true
+            });
+          }
+        }
+      } else {
+        await run([pipWheelCommand]);
+      }
       logArtifacts({ distDir, context: context3 });
       return true;
     }
     case "java": {
       await (0, import_promises168.mkdir)(distDir, { recursive: true });
-      await run([["gradle", "jar", "-x", "test"]]);
+      const initScriptName = ".fern-pack-pom-init.gradle";
+      const initScriptPath = join8(outputPath, RelativeFilePath2.of(initScriptName));
+      await (0, import_promises168.writeFile)(initScriptPath, getJavaPomInitScript({ fallbackVersion: version7 ?? "0.0.0" }));
+      try {
+        await run([
+          [
+            "gradle",
+            "--init-script",
+            initScriptName,
+            "jar",
+            `generatePomFileFor${JAVA_POM_PUBLICATION_NAME_CAPITALIZED}Publication`,
+            "-x",
+            "test"
+          ]
+        ]);
+      } finally {
+        await (0, import_promises168.rm)(initScriptPath, { force: true });
+      }
       const libsDir = join8(outputPath, RelativeFilePath2.of("build/libs"));
       await copyMatchingFiles({ fromDir: libsDir, toDir: distDir, extension: ".jar" });
+      await copyGeneratedPom({ outputPath, distDir, context: context3 });
       logArtifacts({ distDir, context: context3 });
       return true;
     }
@@ -978017,7 +978097,8 @@ async function runPackCommands({
     if (image3 == null) {
       throw new Error(`No Docker toolchain image is configured for ${language}.`);
     }
-    const containerArgs = ["run", "--rm", "-v", `${outputPath}:/workspace`, "-w", "/workspace", "-e", "HOME=/tmp"];
+    const workdir = `/workspace/${(0, import_path110.basename)(outputPath)}`;
+    const containerArgs = ["run", "--rm", "-v", `${outputPath}:${workdir}`, "-w", workdir, "-e", "HOME=/tmp"];
     if (process.getuid != null && process.getgid != null) {
       containerArgs.push("--user", `${process.getuid()}:${process.getgid()}`);
     }
@@ -978083,6 +978164,86 @@ async function removeDistDirIfEmpty(outputPath) {
   } catch {
   }
 }
+var JAVA_POM_PUBLICATION_NAME = "fernLocalPack";
+var JAVA_POM_PUBLICATION_NAME_CAPITALIZED = "FernLocalPack";
+function getJavaPomInitScript({ fallbackVersion }) {
+  return `allprojects { project ->
+    project.plugins.withId("java") {
+        project.apply plugin: "maven-publish"
+        project.afterEvaluate {
+            if (project.group == null || project.group.toString().isEmpty()) {
+                project.group = project.name
+            }
+            if (project.version == null || project.version.toString() == "unspecified") {
+                project.version = "${fallbackVersion}"
+            }
+            if (project.publishing.publications.findByName("${JAVA_POM_PUBLICATION_NAME}") == null) {
+                project.publishing.publications.create("${JAVA_POM_PUBLICATION_NAME}", MavenPublication) {
+                    from project.components.java
+                }
+            }
+        }
+    }
+}
+`;
+}
+async function copyGeneratedPom({
+  outputPath,
+  distDir,
+  context: context3
+}) {
+  const pomPath = join8(
+    outputPath,
+    RelativeFilePath2.of(`build/publications/${JAVA_POM_PUBLICATION_NAME}/pom-default.xml`)
+  );
+  if (!await doesPathExist(pomPath)) {
+    context3.logger.warn(
+      "No POM was generated for the Java package; the JAR is packaged without dependency metadata."
+    );
+    return;
+  }
+  const jarNames = (await (0, import_promises168.readdir)(distDir)).filter((file4) => file4.endsWith(".jar"));
+  const jarName = jarNames.find((file4) => !file4.endsWith("-sources.jar") && !file4.endsWith("-javadoc.jar")) ?? jarNames[0];
+  const pomName = jarName != null ? `${jarName.slice(0, -".jar".length)}.pom` : "pom.xml";
+  await (0, import_promises168.copyFile)(pomPath, join8(distDir, RelativeFilePath2.of(pomName)));
+}
+async function hasEmittedCompilerOutput({
+  outputPath,
+  tsconfig
+}) {
+  let outDir = "dist";
+  try {
+    const parsed = JSON.parse(await (0, import_promises168.readFile)(join8(outputPath, RelativeFilePath2.of(tsconfig)), "utf-8"));
+    if (typeof parsed === "object" && parsed != null && "compilerOptions" in parsed) {
+      const compilerOptions = parsed.compilerOptions;
+      if (typeof compilerOptions === "object" && compilerOptions != null && "outDir" in compilerOptions && typeof compilerOptions.outDir === "string") {
+        outDir = compilerOptions.outDir;
+      }
+    }
+  } catch {
+  }
+  const outDirPath = join8(outputPath, RelativeFilePath2.of(outDir));
+  if (!await doesPathExist(outDirPath)) {
+    return false;
+  }
+  return (await (0, import_promises168.readdir)(outDirPath)).length > 0;
+}
+async function findTsconfig(outputPath) {
+  for (const candidate of ["tsconfig.cjs.json", "tsconfig.json"]) {
+    if (await doesPathExist(join8(outputPath, RelativeFilePath2.of(candidate)))) {
+      return candidate;
+    }
+  }
+  return void 0;
+}
+async function hasPackageJsonFilesField(outputPath) {
+  const packageJsonPath = join8(outputPath, RelativeFilePath2.of("package.json"));
+  if (!await doesPathExist(packageJsonPath)) {
+    return false;
+  }
+  const parsed = JSON.parse(await (0, import_promises168.readFile)(packageJsonPath, "utf-8"));
+  return typeof parsed === "object" && parsed != null && "files" in parsed;
+}
 async function hasNpmScript({
   outputPath,
   script
@@ -978376,7 +978537,14 @@ async function generateWorkspace({
           });
         }
         if (pack) {
-          await packLocalOutputForGroup({ group, context: groupContext, mode: packMode, runner, packOnly });
+          await packLocalOutputForGroup({
+            group,
+            context: groupContext,
+            mode: packMode,
+            runner,
+            packOnly,
+            version: version7
+          });
         }
       })
     )

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-1768-g87d295561fa",
+  "version": "5.23.3-1769-g72dc1333c41",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",