@fern-api/generator-cli 0.12.0 → 0.12.1

package/dist/api.js

@@ -6303,12 +6303,18 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
-      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      const userPrefix = isGithubAppToken(installationToken) ? "x-access-token:" : "";
       return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
+function getGitAuthorizationHeader(installationToken) {
+  const credentials = isGithubAppToken(installationToken) ? `x-access-token:${installationToken}` : `${installationToken}:`;
+  return `Authorization: Basic ${Buffer.from(credentials).toString("base64")}`;
+}
+function isGithubAppToken(token) {
+  return token.startsWith("ghs_") || token.startsWith("ghu_");
+}
 function getRepoUrl({ remote, owner, repo }) {
   return `https://${remote}/${owner}/${repo}`;
 }
@@ -6369,7 +6375,8 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
   });
   const startTime = Date.now();
   try {
-    await git.clone(cloneUrl, ".");
+    const cloneOptions = installationToken != null ? ["--config", `http.extraHeader=${getGitAuthorizationHeader(installationToken)}`] : [];
+    await git.clone(cloneUrl, ".", cloneOptions);
   } catch (error) {
     const elapsed = Date.now() - startTime;
     const errorMessage = extractErrorMessage(error);

package/dist/cli.js

@@ -7176,18 +7176,18 @@ var require_build3 = __commonJS({
 var require_sync = __commonJS({
   "../../node_modules/.pnpm/escalade@3.2.0/node_modules/escalade/sync/index.js"(exports2, module2) {
     "use strict";
-    var { dirname: dirname6, resolve: resolve8 } = require("path");
+    var { dirname: dirname7, resolve: resolve8 } = require("path");
     var { readdirSync: readdirSync2, statSync: statSync4 } = require("fs");
     module2.exports = function(start, callback) {
       let dir = resolve8(".", start);
       let tmp4, stats = statSync4(dir);
       if (!stats.isDirectory()) {
-        dir = dirname6(dir);
+        dir = dirname7(dir);
       }
       while (true) {
         tmp4 = callback(dir, readdirSync2(dir));
         if (tmp4) return resolve8(dir, tmp4);
-        dir = dirname6(tmp4 = dir);
+        dir = dirname7(tmp4 = dir);
         if (tmp4 === dir) break;
       }
     };
@@ -7225,7 +7225,7 @@ var require_require_directory = __commonJS({
     var fs3 = require("fs");
     var join19 = require("path").join;
     var resolve8 = require("path").resolve;
-    var dirname6 = require("path").dirname;
+    var dirname7 = require("path").dirname;
     var defaultOptions2 = {
       extensions: ["js", "json", "coffee"],
       recurse: true,
@@ -7258,7 +7258,7 @@ var require_require_directory = __commonJS({
           options[prop] = defaultOptions2[prop];
         }
       }
-      path5 = !path5 ? dirname6(m.filename) : resolve8(dirname6(m.filename), path5);
+      path5 = !path5 ? dirname7(m.filename) : resolve8(dirname7(m.filename), path5);
       fs3.readdirSync(path5).forEach(function(filename) {
         var joined = join19(path5, filename), files, key, obj;
         if (fs3.statSync(joined).isDirectory() && options.recurse) {
@@ -30515,7 +30515,7 @@ function resolve(...paths) {
 // src/cli.ts
 var import_fs18 = __toESM(require("fs"));
 var import_promises19 = require("fs/promises");
-var import_path27 = __toESM(require("path"));
+var import_path28 = __toESM(require("path"));
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/build/lib/yerror.js
 var YError = class _YError extends Error {
@@ -32530,12 +32530,18 @@ function newRepositoryReference({ remote, owner, repo }) {
     repoUrl,
     cloneUrl,
     getAuthedCloneUrl: (installationToken) => {
-      const isInstallationToken = installationToken.startsWith("ghs_") || installationToken.startsWith("ghu_");
-      const userPrefix = isInstallationToken ? "x-access-token:" : "";
+      const userPrefix = isGithubAppToken(installationToken) ? "x-access-token:" : "";
       return cloneUrl.replace("https://", `https://${userPrefix}${installationToken}@`);
     }
   };
 }
+function getGitAuthorizationHeader(installationToken) {
+  const credentials = isGithubAppToken(installationToken) ? `x-access-token:${installationToken}` : `${installationToken}:`;
+  return `Authorization: Basic ${Buffer.from(credentials).toString("base64")}`;
+}
+function isGithubAppToken(token) {
+  return token.startsWith("ghs_") || token.startsWith("ghu_");
+}
 function getRepoUrl({ remote, owner, repo }) {
   return `https://${remote}/${owner}/${repo}`;
 }
@@ -32596,7 +32602,8 @@ async function cloneRepository({ githubRepository, installationToken, targetDire
   });
   const startTime = Date.now();
   try {
-    await git.clone(cloneUrl, ".");
+    const cloneOptions = installationToken != null ? ["--config", `http.extraHeader=${getGitAuthorizationHeader(installationToken)}`] : [];
+    await git.clone(cloneUrl, ".", cloneOptions);
   } catch (error) {
     const elapsed = Date.now() - startTime;
     const errorMessage = extractErrorMessage(error);
@@ -44379,6 +44386,7 @@ ${stderr}`);
 
 // ../cli/generation/local-generation/docker-utils/lib/runDocker.js
 var import_promises18 = require("fs/promises");
+var import_path26 = require("path");
 var import_tmp_promise3 = __toESM(require_tmp_promise(), 1);
 
 // ../cli/generation/local-generation/docker-utils/lib/buildContainerEnvVars.js
@@ -44454,9 +44462,7 @@ async function execInContainer({ logger, containerId, command, runner, envVars =
   });
   const logs = stdout + stderr;
   if (writeLogsToFile) {
-    const tmpFile = await import_tmp_promise3.default.file();
-    await (0, import_promises18.writeFile)(tmpFile.path, logs);
-    logger.info(`Generator logs here: ${tmpFile.path}`);
+    await writeLogsFile({ logger, logs });
   }
   const resolvedExitCode = exitCode ?? 1;
   if (reject && resolvedExitCode !== 0) {
@@ -44485,6 +44491,21 @@ async function stopContainer({ logger, containerId, runner }) {
     doNotPipeOutput: true
   });
 }
+async function writeLogsFile({ logger, logs, logFilePath }) {
+  if (logFilePath != null) {
+    try {
+      await (0, import_promises18.mkdir)((0, import_path26.dirname)(logFilePath), { recursive: true });
+      await (0, import_promises18.writeFile)(logFilePath, logs);
+      logger.info(`Generator logs here: ${logFilePath}`);
+      return;
+    } catch (error) {
+      logger.warn(`Failed to write logs to ${logFilePath} (${String(error)}); using a temporary file instead.`);
+    }
+  }
+  const tmpFile = await import_tmp_promise3.default.file();
+  await (0, import_promises18.writeFile)(tmpFile.path, logs);
+  logger.info(`Generator logs here: ${tmpFile.path}`);
+}
 
 // ../cli/logger/lib/LogLevel.js
 var LogLevel2 = {
@@ -44542,7 +44563,7 @@ function createLogger4(log) {
 
 // src/pipeline/steps/VerificationStep.ts
 var import_fs17 = require("fs");
-var import_path26 = require("path");
+var import_path27 = require("path");
 var CONTAINER_WORKSPACE_PATH = "/workspace";
 var VERIFY_SCRIPT_RELATIVE_PATH = ".fern/verify.sh";
 var VERIFY_SCRIPT_CONTAINER_PATH = `${CONTAINER_WORKSPACE_PATH}/${VERIFY_SCRIPT_RELATIVE_PATH}`;
@@ -44558,7 +44579,7 @@ var VerificationStep = class extends BaseStep {
   generatorVersions;
   name = "verify";
   async execute(_context) {
-    const verifyScriptHostPath = (0, import_path26.join)(this.outputDir, VERIFY_SCRIPT_RELATIVE_PATH);
+    const verifyScriptHostPath = (0, import_path27.join)(this.outputDir, VERIFY_SCRIPT_RELATIVE_PATH);
     if (!(0, import_fs17.existsSync)(verifyScriptHostPath)) {
       return { executed: true, success: true, skipped: true };
     }
@@ -45258,7 +45279,7 @@ async function createWriteStream(outputPath) {
 }
 async function createWriteStreamFromFile(filepath) {
   if (!await doesPathExist(filepath)) {
-    await (0, import_promises19.mkdir)(import_path27.default.dirname(filepath), { recursive: true });
+    await (0, import_promises19.mkdir)(import_path28.default.dirname(filepath), { recursive: true });
   }
   return import_fs18.default.createWriteStream(filepath);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",