don't delete fsl files if user rejects confirmation prompt (#383)

fauna · Oct 9, 2024 · 2decee3 · 2decee3
1 parent f760ba3
commit 2decee3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/commands/schema/diff.ts b/src/commands/schema/diff.ts
@@ -99,16 +99,14 @@ export default class DiffSchemaCommand extends SchemaCommand {
           this.log(
             `Differences from the ${bold()}remote${reset()} schema to the ${bold()}local${reset()} schema:`
           );
+        } else if (source === "active") {
+          this.log(
+            `Differences from the ${bold()}remote, active${reset()} schema to the ${bold()}local${reset()} schema:`
+          );
         } else {
-          if (source === "active") {
-            this.log(
-              `Differences from the ${bold()}remote, active${reset()} schema to the ${bold()}local${reset()} schema:`
-            );
-          } else {
-            this.log(
-              `Differences from the ${bold()}remote, staged${reset()} schema to the ${bold()}local${reset()} schema:`
-            );
-          }
+          this.log(
+            `Differences from the ${bold()}remote, staged${reset()} schema to the ${bold()}local${reset()} schema:`
+          );
         }
         this.log(json.diff ? json.diff : "No schema differences");
       }

diff --git a/src/commands/schema/pull.ts b/src/commands/schema/pull.ts
@@ -99,18 +99,18 @@ export default class PullSchemaCommand extends SchemaCommand {
         console.log(`overwrite: ${overwrite}`);
       }
 
-      if (this.flags?.delete) {
-        // Delete extra .fsl files.
-        for (const deleteme of deletes) {
-          fs.unlinkSync(path.join(this.dir, deleteme));
-        }
-      }
-
       const confirmed = await confirm({
         message: "Accept the changes?",
         default: false,
       });
       if (confirmed) {
+        if (this.flags?.delete) {
+          // Delete extra .fsl files.
+          for (const deleteme of deletes) {
+            fs.unlinkSync(path.join(this.dir, deleteme));
+          }
+        }
+
         for (const filename of filenames) {
           const fileres = await fetch(
             new URL(`/schema/1/files/${encodeURIComponent(filename)}`, url),