@fern-api/generator-cli 0.0.23 → 0.0.25

package/dist/cli.cjs

@@ -12569,8 +12569,12 @@ var import_path6 = __toESM(require("path"), 1);
 // ../commons/github/dist/constants.js
 var DEFAULT_REMOTE = "github.com";
 var README_FILEPATH = "README.md";
+var FERNIGNORE = ".fernignore";
+var GITIGNORE = ".gitignore";
+var GIT_DIR = ".git";
 
 // ../commons/github/dist/ClonedRepository.js
+var DEFAULT_IGNORED_FILES = [FERNIGNORE, GITIGNORE, GIT_DIR];
 var ClonedRepository = class {
   clonePath;
   git;
@@ -12593,13 +12597,26 @@ var ClonedRepository = class {
   async getReadme() {
     return await this.readFile({ relativeFilePath: README_FILEPATH });
   }
+  async getFernignore() {
+    return await this.readFile({ relativeFilePath: FERNIGNORE });
+  }
   async add(files) {
     await this.git.cwd(this.clonePath);
     await this.git.add(files);
   }
+  async restoreFiles({ files, staged }) {
+    await this.git.cwd(this.clonePath);
+    const args = ["restore"];
+    if (staged) {
+      args.push("--staged");
+    }
+    await this.git.raw([...args, ...Array.isArray(files) ? files : [files]]);
+  }
   async commit(message) {
     await this.git.cwd(this.clonePath);
-    await this.git.commit(message ?? `Automated commit message at ${(/* @__PURE__ */ new Date()).toISOString()}`);
+    await this.git.commit(message ?? `Automated commit`, void 0, {
+      "--allow-empty": null
+    });
   }
   async checkout(branch) {
     await this.git.cwd(this.clonePath);
@@ -12623,13 +12640,13 @@ var ClonedRepository = class {
       (0, import_promises5.readdir)(sourceDirectoryPath),
       (0, import_promises5.readdir)(this.clonePath)
     ]);
-    await Promise.all(destContents.filter((content) => content !== ".git").map(async (content) => {
+    await Promise.all(destContents.filter((content) => !DEFAULT_IGNORED_FILES.includes(content)).map(async (content) => {
       await (0, import_promises5.rm)((0, import_path6.resolve)(this.clonePath, content), {
         recursive: true,
         force: true
       });
     }));
-    await Promise.all(sourceContents.filter((content) => content !== ".git").map(async (content) => {
+    await Promise.all(sourceContents.filter((content) => !DEFAULT_IGNORED_FILES.includes(content)).map(async (content) => {
       const path4 = (0, import_path6.resolve)(sourceDirectoryPath, content);
       await (0, import_promises5.cp)(path4, (0, import_path6.resolve)(this.clonePath, content), { recursive: true });
     }));
@@ -12653,7 +12670,7 @@ async function doesPathExist2(filepath) {
 
 // ../commons/github/dist/parseRepository.js
 function parseRepository(githubRepository) {
-  const remote = DEFAULT_REMOTE;
+  let remote = DEFAULT_REMOTE;
   let owner;
   let repo;
   if (githubRepository.startsWith("https://")) {
@@ -12665,8 +12682,8 @@ function parseRepository(githubRepository) {
   const parts = githubRepository.split("/");
   if (parts.length === 2 && parts[0] != null && parts[1] != null) {
     [owner, repo] = parts;
-  } else if (parts.length === 3 && parts[0] === DEFAULT_REMOTE && parts[1] != null && parts[2] != null) {
-    [, owner, repo] = parts;
+  } else if (parts.length === 3 && parts[0] != null && parts[1] != null && parts[2] != null) {
+    [remote, owner, repo] = parts;
   } else {
     throw new Error(`Failed to parse GitHub repostiory ${githubRepository}`);
   }
@@ -12726,12 +12743,14 @@ var GitHub = class {
       const branch = this.githubConfig.branch ?? await repository.getDefaultBranch();
       await repository.checkout(branch);
       await repository.pull(branch);
+      const fernIgnore = await repository.getFernignore();
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await repository.commit();
+      await this.restoreFernignoreFiles(repository, fernIgnore);
+      await repository.commit("SDK Generation");
       await repository.push();
     } catch (error) {
-      console.error(error);
+      console.error("Error during GitHub push:", error);
       throw error;
     }
   }
@@ -12741,6 +12760,25 @@ var GitHub = class {
   async release() {
     console.log("TODO: Implement release");
   }
+  getFernignoreFiles(fernignore) {
+    const fernignoreLines = fernignore.split("\n");
+    const fernignoreFiles = [];
+    for (const line of fernignoreLines) {
+      const trimmedLine = line.trim();
+      if (!trimmedLine.startsWith("#") && trimmedLine.length > 0) {
+        fernignoreFiles.push(trimmedLine);
+      }
+    }
+    return fernignoreFiles;
+  }
+  async restoreFernignoreFiles(repository, fernignore) {
+    if (fernignore === void 0) {
+      return;
+    }
+    const files = this.getFernignoreFiles(fernignore);
+    await repository.restoreFiles({ files, staged: true });
+    await repository.restoreFiles({ files });
+  }
 };
 
 // src/readme/ReadmeGenerator.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "type": "module",
   "main": "dist/cli.cjs",
   "source": "src/index.ts",