@fern-api/generator-cli 0.1.2 → 0.1.4

package/dist/cli.cjs

@@ -11969,34 +11969,16 @@ var ClonedRepository = class {
     await this.git.cwd(this.clonePath);
     await this.git.add(files);
   }
+  async fileExists({ relativeFilePath }) {
+    return await doesPathExist2(import_path6.default.join(this.clonePath, relativeFilePath));
+  }
   async restoreFiles({ files, staged }) {
     await this.git.cwd(this.clonePath);
-    const fileArray = Array.isArray(files) ? files : [files];
-    const existingFiles = [];
-    for (const file of fileArray) {
-      try {
-        const status = await this.git.raw([
-          "ls-files",
-          "--error-unmatch",
-          file
-        ]);
-        if (status.trim()) {
-          existingFiles.push(file);
-        }
-      } catch (error) {
-        if (error?.exitCode === 1) {
-          continue;
-        }
-        throw error;
-      }
-    }
-    if (existingFiles.length > 0) {
-      const args = ["restore"];
-      if (staged) {
-        args.push("--staged");
-      }
-      await this.git.raw([...args, ...existingFiles]);
+    const args = ["restore --source=HEAD"];
+    if (staged) {
+      args.push("--staged");
     }
+    await this.git.raw([...args, ...Array.isArray(files) ? files : [files]]);
   }
   async commit(message) {
     await this.git.cwd(this.clonePath);
@@ -12129,10 +12111,10 @@ var GitHub = class {
       const branch = this.githubConfig.branch ?? await repository.getDefaultBranch();
       await repository.checkout(branch);
       await repository.pull(branch);
-      const fernIgnore = await repository.getFernignore();
+      const fernIgnoreFiles = await this.getFernignoreFiles(repository);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFernignoreFiles(repository, fernIgnore);
+      await this.restoreFiles(repository, fernIgnoreFiles);
       await repository.commit("SDK Generation");
       await repository.push();
     } catch (error) {
@@ -12155,10 +12137,10 @@ var GitHub = class {
       await repository.checkout(baseBranch);
       await repository.pull(baseBranch);
       await repository.checkout(prBranch);
-      const fernIgnore = await repository.getFernignore();
+      const fernIgnoreFiles = await this.getFernignoreFiles(repository);
       await repository.overwriteLocalContents(sourceDirectory);
       await repository.add(".");
-      await this.restoreFernignoreFiles(repository, fernIgnore);
+      await this.restoreFiles(repository, fernIgnoreFiles);
       await repository.commit("SDK Generation");
       await repository.push();
       const octokit = new import_rest.Octokit({
@@ -12194,22 +12176,25 @@ var GitHub = class {
   async release() {
     console.log("TODO: Implement release");
   }
-  getFernignoreFiles(fernignore) {
+  async getFernignoreFiles(repository) {
+    const fernignore = await repository.getFernignore();
+    if (fernignore === void 0) {
+      return [];
+    }
     const fernignoreLines = fernignore.split("\n");
     const fernignoreFiles = [];
     for (const line of fernignoreLines) {
       const trimmedLine = line.trim();
-      if (!trimmedLine.startsWith("#") && trimmedLine.length > 0) {
+      if (!trimmedLine.startsWith("#") && trimmedLine.length > 0 && await repository.fileExists({ relativeFilePath: trimmedLine })) {
         fernignoreFiles.push(trimmedLine);
       }
     }
     return fernignoreFiles;
   }
-  async restoreFernignoreFiles(repository, fernignore) {
-    if (fernignore === void 0) {
+  async restoreFiles(repository, files) {
+    if (files.length === 0) {
       return;
     }
-    const files = this.getFernignoreFiles(fernignore);
     await repository.restoreFiles({ files, staged: true });
     await repository.restoreFiles({ files });
   }

package/package.json

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