@anvil-works/anvil-cli 0.7.0-canary.13 → 0.7.0-canary.14

package/dist/cli.js

@@ -17604,6 +17604,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     class SaveProcessor extends Emitter {
         hasPendingChanges = false;
         debounceTimer = null;
+        saveLoopPromise = null;
         saveSequence = 0;
         SAVE_DEBOUNCE_MS = 1000;
         MAX_RETRIES = 3;
@@ -17627,6 +17628,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             if (this.debounceTimer) clearTimeout(this.debounceTimer);
             if (isFirstChange) logger_logger.progress("sync", "Change detected");
             this.debounceTimer = setTimeout(()=>{
+                this.debounceTimer = null;
                 this.processSaveBatchWithEvents().catch((error)=>{
                     logger_logger.error(`Save failed: ${errors_getErrorMessage(error)}`);
                 });
@@ -17651,6 +17653,18 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             }
         }
         async processSaveBatchWithEvents() {
+            if (this.saveLoopPromise) return this.saveLoopPromise;
+            this.saveLoopPromise = this.drainSaveQueue();
+            try {
+                await this.saveLoopPromise;
+            } finally{
+                this.saveLoopPromise = null;
+            }
+        }
+        async drainSaveQueue() {
+            while(this.hasPendingChanges && !this.config.isCleanedUp() && !this.config.isPaused())await this.processOneSaveBatchWithEvents();
+        }
+        async processOneSaveBatchWithEvents() {
             if (this.config.isCleanedUp()) return;
             logger_logger.progressUpdate("sync", "Processing");
             if (!this.hasPendingChanges) return void logger_logger.progressEnd("sync");
@@ -18164,61 +18178,55 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     }
     class SyncManager extends Emitter {
         config;
-        syncInProgress = false;
+        syncQueue = Promise.resolve();
         constructor(config){
             super();
             this.config = config;
         }
         async syncRemoteChanges(knownLocalChanges) {
-            if (this.syncInProgress) {
-                logger_logger.debug("Sync already in progress, skipping");
-                return {
-                    localOnlyChanges: [],
-                    conflicts: []
-                };
+            const runSync = ()=>this.performSyncRemoteChanges(knownLocalChanges);
+            const queuedSync = this.syncQueue.then(runSync, runSync);
+            this.syncQueue = queuedSync.catch(()=>{});
+            return queuedSync;
+        }
+        async performSyncRemoteChanges(knownLocalChanges) {
+            const oldCommitId = this.config.getCommitId();
+            let locallyChangedFiles;
+            let initialStatus;
+            if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
+            else {
+                initialStatus = await this.config.gitService.getStatus();
+                locallyChangedFiles = buildLocalChangesSet(initialStatus);
             }
-            this.syncInProgress = true;
-            try {
-                const oldCommitId = this.config.getCommitId();
-                let locallyChangedFiles;
-                let initialStatus;
-                if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
-                else {
-                    initialStatus = await this.config.gitService.getStatus();
-                    locallyChangedFiles = buildLocalChangesSet(initialStatus);
-                }
-                let syncMode;
-                if (!knownLocalChanges && initialStatus && this.isCleanForFastForward(initialStatus)) syncMode = await this.fetchAndMoveCleanTreeToAnvilHead(oldCommitId, locallyChangedFiles);
-                else {
-                    await this.fetchAndResetFromAnvil(locallyChangedFiles);
-                    syncMode = "preservation";
-                }
-                if ("clean-move" === syncMode) return {
+            let syncMode;
+            if (!knownLocalChanges && initialStatus && this.isCleanForFastForward(initialStatus)) syncMode = await this.fetchAndMoveCleanTreeToAnvilHead(oldCommitId, locallyChangedFiles);
+            else {
+                await this.fetchAndResetFromAnvil(locallyChangedFiles);
+                syncMode = "preservation";
+            }
+            if ("clean-move" === syncMode) return {
+                localOnlyChanges: [],
+                conflicts: []
+            };
+            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(external_chalk_default().gray("   No local changes - working directory is clean"));
+                return {
                     localOnlyChanges: [],
                     conflicts: []
                 };
-                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(external_chalk_default().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;
             }
+            const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
+            await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
+            logConflictResolution(result);
+            return {
+                localOnlyChanges: result.localOnlyChanges,
+                conflicts: result.conflicts
+            };
         }
         async fetchAndResetFromAnvil(localChangesToPreserve = new Set()) {
             const oldCommitId = this.config.getCommitId();

package/dist/index.js

@@ -17632,6 +17632,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     class SaveProcessor extends Emitter {
         hasPendingChanges = false;
         debounceTimer = null;
+        saveLoopPromise = null;
         saveSequence = 0;
         SAVE_DEBOUNCE_MS = 1000;
         MAX_RETRIES = 3;
@@ -17655,6 +17656,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             if (this.debounceTimer) clearTimeout(this.debounceTimer);
             if (isFirstChange) logger_logger.progress("sync", "Change detected");
             this.debounceTimer = setTimeout(()=>{
+                this.debounceTimer = null;
                 this.processSaveBatchWithEvents().catch((error)=>{
                     logger_logger.error(`Save failed: ${errors_getErrorMessage(error)}`);
                 });
@@ -17679,6 +17681,18 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             }
         }
         async processSaveBatchWithEvents() {
+            if (this.saveLoopPromise) return this.saveLoopPromise;
+            this.saveLoopPromise = this.drainSaveQueue();
+            try {
+                await this.saveLoopPromise;
+            } finally{
+                this.saveLoopPromise = null;
+            }
+        }
+        async drainSaveQueue() {
+            while(this.hasPendingChanges && !this.config.isCleanedUp() && !this.config.isPaused())await this.processOneSaveBatchWithEvents();
+        }
+        async processOneSaveBatchWithEvents() {
             if (this.config.isCleanedUp()) return;
             logger_logger.progressUpdate("sync", "Processing");
             if (!this.hasPendingChanges) return void logger_logger.progressEnd("sync");
@@ -18192,61 +18206,55 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     }
     class SyncManager extends Emitter {
         config;
-        syncInProgress = false;
+        syncQueue = Promise.resolve();
         constructor(config){
             super();
             this.config = config;
         }
         async syncRemoteChanges(knownLocalChanges) {
-            if (this.syncInProgress) {
-                logger_logger.debug("Sync already in progress, skipping");
-                return {
-                    localOnlyChanges: [],
-                    conflicts: []
-                };
+            const runSync = ()=>this.performSyncRemoteChanges(knownLocalChanges);
+            const queuedSync = this.syncQueue.then(runSync, runSync);
+            this.syncQueue = queuedSync.catch(()=>{});
+            return queuedSync;
+        }
+        async performSyncRemoteChanges(knownLocalChanges) {
+            const oldCommitId = this.config.getCommitId();
+            let locallyChangedFiles;
+            let initialStatus;
+            if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
+            else {
+                initialStatus = await this.config.gitService.getStatus();
+                locallyChangedFiles = buildLocalChangesSet(initialStatus);
             }
-            this.syncInProgress = true;
-            try {
-                const oldCommitId = this.config.getCommitId();
-                let locallyChangedFiles;
-                let initialStatus;
-                if (knownLocalChanges) locallyChangedFiles = knownLocalChanges;
-                else {
-                    initialStatus = await this.config.gitService.getStatus();
-                    locallyChangedFiles = buildLocalChangesSet(initialStatus);
-                }
-                let syncMode;
-                if (!knownLocalChanges && initialStatus && this.isCleanForFastForward(initialStatus)) syncMode = await this.fetchAndMoveCleanTreeToAnvilHead(oldCommitId, locallyChangedFiles);
-                else {
-                    await this.fetchAndResetFromAnvil(locallyChangedFiles);
-                    syncMode = "preservation";
-                }
-                if ("clean-move" === syncMode) return {
+            let syncMode;
+            if (!knownLocalChanges && initialStatus && this.isCleanForFastForward(initialStatus)) syncMode = await this.fetchAndMoveCleanTreeToAnvilHead(oldCommitId, locallyChangedFiles);
+            else {
+                await this.fetchAndResetFromAnvil(locallyChangedFiles);
+                syncMode = "preservation";
+            }
+            if ("clean-move" === syncMode) return {
+                localOnlyChanges: [],
+                conflicts: []
+            };
+            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(external_chalk_default().gray("   No local changes - working directory is clean"));
+                return {
                     localOnlyChanges: [],
                     conflicts: []
                 };
-                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(external_chalk_default().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;
             }
+            const result = categorizeChanges(newChanges, locallyChangedFiles, remoteChangedFiles);
+            await acceptRemoteChanges(this.config.gitService, result.remoteOnlyChanges);
+            logConflictResolution(result);
+            return {
+                localOnlyChanges: result.localOnlyChanges,
+                conflicts: result.conflicts
+            };
         }
         async fetchAndResetFromAnvil(localChangesToPreserve = new Set()) {
             const oldCommitId = this.config.getCommitId();

package/dist/watch/SaveProcessor.d.ts

@@ -66,6 +66,7 @@ type PostSaveCallback = SyncCallback;
 export declare class SaveProcessor extends Emitter<SaveProcessorEvents> {
     private hasPendingChanges;
     private debounceTimer;
+    private saveLoopPromise;
     private saveSequence;
     private readonly SAVE_DEBOUNCE_MS;
     private readonly MAX_RETRIES;
@@ -83,6 +84,8 @@ export declare class SaveProcessor extends Emitter<SaveProcessorEvents> {
     forceSave(): Promise<void>;
     cleanup(): void;
     private processSaveBatchWithEvents;
+    private drainSaveQueue;
+    private processOneSaveBatchWithEvents;
     private getSuccessMessage;
     private processSaveBatch;
     private getStagedChanges;

package/dist/watch/SaveProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SaveProcessor.d.ts","sourceRoot":"","sources":["../../src/watch/SaveProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SaveProcessor.d.ts","sourceRoot":"","sources":["../../src/watch/SaveProcessor.ts"],"names":[],"mappings":"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"}

package/dist/watch/SyncManager.d.ts

@@ -25,7 +25,7 @@ export interface SyncManagerConfig {
 export declare function stripNonSemanticYamlFields(yamlFile: string, parsed: Record<string, unknown> | undefined): Record<string, unknown>;
 export declare class SyncManager extends Emitter<SyncManagerEvents> {
     private config;
-    private syncInProgress;
+    private syncQueue;
     constructor(config: SyncManagerConfig);
     /**
      * Syncs remote changes while preserving local modifications.
@@ -39,6 +39,7 @@ export declare class SyncManager extends Emitter<SyncManagerEvents> {
         localOnlyChanges: FileChange[];
         conflicts: FileChange[];
     }>;
+    private performSyncRemoteChanges;
     /**
      * Fetch latest from Anvil and reset the working directory.
      * @throws {AuthError | GitError} on failure

package/dist/watch/SyncManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SyncManager.d.ts","sourceRoot":"","sources":["../../src/watch/SyncManager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAQH,KAAK,UAAU,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACrE;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,0BAA0B,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,qBAAa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,cAAc,CAAS;gBAEnB,MAAM,EAAE,iBAAiB;IAKrC;;;;;;;OAOG;IACG,iBAAiB,CACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAChC,OAAO,CAAC;QAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAsDvE;;;OAGG;IACG,sBAAsB,CAAC,sBAAsB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAO9E,gCAAgC;YA2BhC,mBAAmB;YAgBnB,sBAAsB;IAapC,OAAO,CAAC,qBAAqB;YAYf,gCAAgC;YAiBhC,gCAAgC;CAkGjD"}
+{"version":3,"file":"SyncManager.d.ts","sourceRoot":"","sources":["../../src/watch/SyncManager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAQH,KAAK,UAAU,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACrE;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,0BAA0B,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,qBAAa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,SAAS,CAAuC;gBAE5C,MAAM,EAAE,iBAAiB;IAKrC;;;;;;;OAOG;IACG,iBAAiB,CACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAChC,OAAO,CAAC;QAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;YAOzD,wBAAwB;IA8CtC;;;OAGG;IACG,sBAAsB,CAAC,sBAAsB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAO9E,gCAAgC;YA2BhC,mBAAmB;YAgBnB,sBAAsB;IAapC,OAAO,CAAC,qBAAqB;YAYf,gCAAgC;YAiBhC,gCAAgC;CAkGjD"}

package/package.json

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