npm - @anvil-works/anvil-cli - Versions diffs - 0.3.7 → 0.3.8 - Mend

@anvil-works/anvil-cli 0.3.7 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cli.js CHANGED Viewed

@@ -44512,6 +44512,17 @@ var __webpack_exports__ = {};
         getRepoPath() {
             return this.repoPath;
         }
+        async getGitDir() {
+            try {
+                const gitDir = (await this.git.revparse([
+                    "--git-dir"
+                ])).trim();
+                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
+                return gitDir;
+            } catch (e) {
+                throw createGitError.commandFailed("rev-parse --git-dir", e.message);
+            }
+        }
         async getCurrentBranch() {
             try {
                 const branchRef = await this.git.revparse([
@@ -46195,6 +46206,7 @@ var __webpack_exports__ = {};
     };
     class FileWatcher extends Emitter_Emitter {
         repoPath;
+        gitDir;
         stagedOnly;
         getCurrentBranch;
         headWatcher = null;
@@ -46204,6 +46216,7 @@ var __webpack_exports__ = {};
         constructor(options){
             super();
             this.repoPath = external_path_default().resolve(options.repoPath);
+            this.gitDir = options.gitDir;
             this.stagedOnly = options.stagedOnly ?? false;
             this.getCurrentBranch = options.getCurrentBranch;
             this.sessionId = Math.random().toString(36).substring(2, 10);
@@ -46216,7 +46229,7 @@ var __webpack_exports__ = {};
             else this.startFileWatcher();
         }
         startHeadWatcher() {
-            const headPath = external_path_default().join(this.repoPath, ".git", "HEAD");
+            const headPath = external_path_default().join(this.gitDir, "HEAD");
             logger_logger.debug(`[FileWatcher ${this.sessionId}]`, `Setting up HEAD watcher: ${headPath}`);
             this.headWatcher = chokidar_esm.watch(headPath, {
                 persistent: true,
@@ -46247,7 +46260,7 @@ var __webpack_exports__ = {};
             });
         }
         startIndexWatcher() {
-            const indexPath = external_path_default().join(this.repoPath, ".git", "index");
+            const indexPath = external_path_default().join(this.gitDir, "index");
             logger_logger.verbose(`Setting up watcher for: ${indexPath}`);
             logger_logger.debug(`[FileWatcher ${this.sessionId}]`, `Setting up index watcher (staged-only mode): ${indexPath}`);
             if (!external_fs_.existsSync(indexPath)) return void logger_logger.error(`ERROR: Git index file not found at ${indexPath}`);
@@ -46952,6 +46965,10 @@ var __webpack_exports__ = {};
         metadata: optional(any())
     });
     function validateAnvilYaml(yamlContent) {
+        if (yamlContent.includes("<<<<<<<") || yamlContent.includes(">>>>>>>")) {
+            logger_logger.error("anvil.yaml contains git merge conflict markers. Please resolve conflicts manually.");
+            return false;
+        }
         try {
             const data = js_yaml_load(yamlContent);
             const result = safeParse(AnvilYamlSchema, data);
@@ -48315,47 +48332,61 @@ var __webpack_exports__ = {};
     }
     class SyncManager extends Emitter_Emitter {
         config;
+        syncInProgress = false;
         constructor(config){
             super();
             this.config = config;
         }
         async syncRemoteChanges(knownLocalChanges) {
-            const oldCommitId = this.config.getCommitId();
-            let locallyChangedFiles;
-            if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
-            else {
-                const status = await this.config.gitService.getStatus();
-                locallyChangedFiles = buildLocalChangesSet(status);
-            }
-            await this.fetchAndResetFromAnvil();
-            const newCommitId = await this.config.gitService.getCommitId();
-            this.config.setCommitId(newCommitId);
-            const remoteChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
-            const statusAfter = await this.config.gitService.getStatus();
-            const newChanges = extractChangesFromStatus(statusAfter);
-            if (0 === newChanges.length) {
-                logger_logger.verbose(chalk_source.gray("   No local changes - working directory is clean"));
+            if (this.syncInProgress) {
+                logger_logger.debug("Sync already in progress, skipping");
                 return {
                     localOnlyChanges: [],
                     conflicts: []
                 };
             }
-            const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
-            await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
-            logConflictResolution(result);
-            return {
-                localOnlyChanges: result.localOnlyChanges,
-                conflicts: result.conflicts
-            };
+            this.syncInProgress = true;
+            try {
+                const oldCommitId = this.config.getCommitId();
+                let locallyChangedFiles;
+                if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
+                else {
+                    const status = await this.config.gitService.getStatus();
+                    locallyChangedFiles = buildLocalChangesSet(status);
+                }
+                await this.fetchAndResetFromAnvil();
+                const newCommitId = await this.config.gitService.getCommitId();
+                this.config.setCommitId(newCommitId);
+                const remoteChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
+                const statusAfter = await this.config.gitService.getStatus();
+                const newChanges = extractChangesFromStatus(statusAfter);
+                if (0 === newChanges.length) {
+                    logger_logger.verbose(chalk_source.gray("   No local changes - working directory is clean"));
+                    return {
+                        localOnlyChanges: [],
+                        conflicts: []
+                    };
+                }
+                const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
+                await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
+                logConflictResolution(result);
+                return {
+                    localOnlyChanges: result.localOnlyChanges,
+                    conflicts: result.conflicts
+                };
+            } finally{
+                this.syncInProgress = false;
+            }
         }
         async fetchAndResetFromAnvil() {
             const validToken = await auth_getValidAuthToken(this.config.anvilUrl, this.config.username);
             this.config.setAuthToken(validToken);
             const httpUrl = getGitFetchUrl(this.config.appId, this.config.getAuthToken(), this.config.anvilUrl);
             const currentBranch = this.config.getCurrentBranch();
-            await this.config.gitService.fetch(httpUrl, `+${currentBranch}:anvil-sync-temp`);
-            await this.config.gitService.reset("anvil-sync-temp", "mixed");
-            await this.config.gitService.deleteRef("refs/heads/anvil-sync-temp");
+            const tempRef = `anvil-sync-temp-${Date.now()}`;
+            await this.config.gitService.fetch(httpUrl, `+${currentBranch}:${tempRef}`);
+            await this.config.gitService.reset(tempRef, "mixed");
+            await this.config.gitService.deleteRef(`refs/heads/${tempRef}`);
             await this.config.gitService.checkout([
                 ".anvil_editor.yaml",
                 "anvil.yaml"
@@ -48615,8 +48646,10 @@ var __webpack_exports__ = {};
         }
         async startWatching() {
             logger_logger.debug(`[Session ${this.sessionId}]`, "Starting watchers...");
+            const gitDir = await this.gitService.getGitDir();
             this.fileWatcher = new FileWatcher({
                 repoPath: this.repoPath,
+                gitDir,
                 stagedOnly: this.stagedOnly,
                 getCurrentBranch: async ()=>this.gitService.getCurrentBranch()
             });

package/dist/index.js CHANGED Viewed

@@ -19658,6 +19658,17 @@ var __webpack_exports__ = {};
         getRepoPath() {
             return this.repoPath;
         }
+        async getGitDir() {
+            try {
+                const gitDir = (await this.git.revparse([
+                    "--git-dir"
+                ])).trim();
+                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
+                return gitDir;
+            } catch (e) {
+                throw createGitError.commandFailed("rev-parse --git-dir", e.message);
+            }
+        }
         async getCurrentBranch() {
             try {
                 const branchRef = await this.git.revparse([
@@ -21341,6 +21352,7 @@ var __webpack_exports__ = {};
     };
     class FileWatcher extends Emitter {
         repoPath;
+        gitDir;
         stagedOnly;
         getCurrentBranch;
         headWatcher = null;
@@ -21350,6 +21362,7 @@ var __webpack_exports__ = {};
         constructor(options){
             super();
             this.repoPath = external_path_default().resolve(options.repoPath);
+            this.gitDir = options.gitDir;
             this.stagedOnly = options.stagedOnly ?? false;
             this.getCurrentBranch = options.getCurrentBranch;
             this.sessionId = Math.random().toString(36).substring(2, 10);
@@ -21362,7 +21375,7 @@ var __webpack_exports__ = {};
             else this.startFileWatcher();
         }
         startHeadWatcher() {
-            const headPath = external_path_default().join(this.repoPath, ".git", "HEAD");
+            const headPath = external_path_default().join(this.gitDir, "HEAD");
             logger_logger.debug(`[FileWatcher ${this.sessionId}]`, `Setting up HEAD watcher: ${headPath}`);
             this.headWatcher = chokidar_esm.watch(headPath, {
                 persistent: true,
@@ -21393,7 +21406,7 @@ var __webpack_exports__ = {};
             });
         }
         startIndexWatcher() {
-            const indexPath = external_path_default().join(this.repoPath, ".git", "index");
+            const indexPath = external_path_default().join(this.gitDir, "index");
             logger_logger.verbose(`Setting up watcher for: ${indexPath}`);
             logger_logger.debug(`[FileWatcher ${this.sessionId}]`, `Setting up index watcher (staged-only mode): ${indexPath}`);
             if (!external_fs_.existsSync(indexPath)) return void logger_logger.error(`ERROR: Git index file not found at ${indexPath}`);
@@ -22550,6 +22563,10 @@ var __webpack_exports__ = {};
         metadata: optional(any())
     });
     function validateAnvilYaml(yamlContent) {
+        if (yamlContent.includes("<<<<<<<") || yamlContent.includes(">>>>>>>")) {
+            logger_logger.error("anvil.yaml contains git merge conflict markers. Please resolve conflicts manually.");
+            return false;
+        }
         try {
             const data = load(yamlContent);
             const result = safeParse(AnvilYamlSchema, data);
@@ -23913,47 +23930,61 @@ var __webpack_exports__ = {};
     }
     class SyncManager extends Emitter {
         config;
+        syncInProgress = false;
         constructor(config){
             super();
             this.config = config;
         }
         async syncRemoteChanges(knownLocalChanges) {
-            const oldCommitId = this.config.getCommitId();
-            let locallyChangedFiles;
-            if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
-            else {
-                const status = await this.config.gitService.getStatus();
-                locallyChangedFiles = buildLocalChangesSet(status);
-            }
-            await this.fetchAndResetFromAnvil();
-            const newCommitId = await this.config.gitService.getCommitId();
-            this.config.setCommitId(newCommitId);
-            const remoteChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
-            const statusAfter = await this.config.gitService.getStatus();
-            const newChanges = extractChangesFromStatus(statusAfter);
-            if (0 === newChanges.length) {
-                logger_logger.verbose(chalk_source.gray("   No local changes - working directory is clean"));
+            if (this.syncInProgress) {
+                logger_logger.debug("Sync already in progress, skipping");
                 return {
                     localOnlyChanges: [],
                     conflicts: []
                 };
             }
-            const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
-            await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
-            logConflictResolution(result);
-            return {
-                localOnlyChanges: result.localOnlyChanges,
-                conflicts: result.conflicts
-            };
+            this.syncInProgress = true;
+            try {
+                const oldCommitId = this.config.getCommitId();
+                let locallyChangedFiles;
+                if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
+                else {
+                    const status = await this.config.gitService.getStatus();
+                    locallyChangedFiles = buildLocalChangesSet(status);
+                }
+                await this.fetchAndResetFromAnvil();
+                const newCommitId = await this.config.gitService.getCommitId();
+                this.config.setCommitId(newCommitId);
+                const remoteChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
+                const statusAfter = await this.config.gitService.getStatus();
+                const newChanges = extractChangesFromStatus(statusAfter);
+                if (0 === newChanges.length) {
+                    logger_logger.verbose(chalk_source.gray("   No local changes - working directory is clean"));
+                    return {
+                        localOnlyChanges: [],
+                        conflicts: []
+                    };
+                }
+                const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
+                await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
+                logConflictResolution(result);
+                return {
+                    localOnlyChanges: result.localOnlyChanges,
+                    conflicts: result.conflicts
+                };
+            } finally{
+                this.syncInProgress = false;
+            }
         }
         async fetchAndResetFromAnvil() {
             const validToken = await auth_getValidAuthToken(this.config.anvilUrl, this.config.username);
             this.config.setAuthToken(validToken);
             const httpUrl = getGitFetchUrl(this.config.appId, this.config.getAuthToken(), this.config.anvilUrl);
             const currentBranch = this.config.getCurrentBranch();
-            await this.config.gitService.fetch(httpUrl, `+${currentBranch}:anvil-sync-temp`);
-            await this.config.gitService.reset("anvil-sync-temp", "mixed");
-            await this.config.gitService.deleteRef("refs/heads/anvil-sync-temp");
+            const tempRef = `anvil-sync-temp-${Date.now()}`;
+            await this.config.gitService.fetch(httpUrl, `+${currentBranch}:${tempRef}`);
+            await this.config.gitService.reset(tempRef, "mixed");
+            await this.config.gitService.deleteRef(`refs/heads/${tempRef}`);
             await this.config.gitService.checkout([
                 ".anvil_editor.yaml",
                 "anvil.yaml"
@@ -24213,8 +24244,10 @@ var __webpack_exports__ = {};
         }
         async startWatching() {
             logger_logger.debug(`[Session ${this.sessionId}]`, "Starting watchers...");
+            const gitDir = await this.gitService.getGitDir();
             this.fileWatcher = new FileWatcher({
                 repoPath: this.repoPath,
+                gitDir,
                 stagedOnly: this.stagedOnly,
                 getCurrentBranch: async ()=>this.gitService.getCurrentBranch()
             });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",