@elyx-code/project-logic-tree 0.0.6624 → 0.0.6625

package/dist/index.d.ts

@@ -11120,7 +11120,7 @@ export declare class DefaultProjectLogicContext extends ExtensionContextBase<Ext
     toLatestChangeSet(author: string, timestamp: string, // ISO 8601 format
     self: UserManagedEntityState | null, autoclose?: boolean, autoCloseActionName?: string): ChangeSet;
     addChangeSet(changeSet: ChangeSet): ChangeSet;
-    discardChangeSet(changeSet: ChangeSet | null): ProjectState;
+    discardChangeSet(changeSet: ChangeSet): ProjectState;
     subscribeDependents(dependencies: {
         entity: UserManagedEntityState;
         field: string;
@@ -28404,7 +28404,7 @@ export declare function getReferencedEntityStateOrErrors(data: ElementGeneration
      toLatestChangeSet(author: string, timestamp: string, // ISO 8601 format
      self: UserManagedEntityState | null, autoclose?: boolean, autoCloseActionName?: string): ChangeSet;
      addChangeSet(changeSet: ChangeSet): ChangeSet;
-     discardChangeSet(changeSet: ChangeSet | null): ProjectState;
+     discardChangeSet(changeSet: ChangeSet): ProjectState;
      validateGeneratedUpdate(data: Partial<IProjectGenerationTarget>): {
          errors: EntityGenerationError[];
          modifiedData: Partial<IProjectGenerationTarget>;

package/dist/index.js

@@ -93338,7 +93338,7 @@ class S extends qf {
     const n = i.awaitBeforeClose ?? !0, l = i.awaitExtenalClosing ?? !0;
     return this.startedClose || (this.startedClose = !0, n ? await this.beforeCloseAsync() : this.beforeCloseAsync()), !this.isValid && this.self && !this.added[this.self.id] && !this.updated[this.self.id] && this.removed[this.self.id], this.discardOrphans(), this.sanitize(), this.recursiveCaptureUpstreamVersions(), this.lockedVersions || (this.captureAllChangesInVersionInstances(), this.recursiveCaptureUpstreamVersions()), this.open = !1, this.isEmpty ? (ne.warn(
       `[ChangeSet.closeAsync] Empty change-set (${this.id}) discarded upon closing.`
-    ), this.project.discardChangeSet(this), console.log("[ChangeSet.closeAsync] Closing pending change-sets..."), this.project.closePendingChangeSets(), this) : (l ? await this.project.closeChangeSet(this) : this.project.closeChangeSet(this), this);
+    ), this.dirty = !1, this.project.discardChangeSet(this), console.log("[ChangeSet.closeAsync] Closing pending change-sets..."), this.project.closePendingChangeSets(), this) : (l ? await this.project.closeChangeSet(this) : this.project.closeChangeSet(this), this);
   }
   attemptAutoclose(i, n) {
     var l;
@@ -192926,7 +192926,7 @@ const o6 = {
   async closePendingChangeSets() {
     console.log("[ProjectState.closePendingChangeSets] called");
     const i = this.history.find(
-      (n) => n.dirty && !n.open
+      (n) => n.dirty && !n.open && !n.startedClose
     );
     i && (console.log(
       `[ProjectState.closePendingChangeSets] closing pending change-set ${i.id} - ${i.autoCloseActionName}`
@@ -192944,9 +192944,14 @@ const o6 = {
     this.onDiscardChangeSetCallback = i;
   }
   async closeChangeSet(i) {
-    console.log(
+    if (console.log(
       `[ProjectState.closeChangeSet] called for change-set ${i.id} - ${i.autoCloseActionName}`
-    );
+    ), !i.open || i.startedClose || !i.dirty) {
+      console.log(
+        `[ProjectState.closeChangeSet] change-set ${i.id} - ${i.autoCloseActionName} is not open, started closing, or not dirty.`
+      );
+      return;
+    }
     const n = this.history.findIndex((e) => e.id === i.id), l = this.history.slice(0, n), c = l[l.length - 1];
     if (c != null && c.dirty) {
       console.log(
@@ -193015,8 +193020,13 @@ const o6 = {
   // So we remove them from the state
   discardChangeSet(i) {
     var l;
+    console.log(
+      `[ProjectState.discardChangeSet] called for change-set ${i.id} - ${i.autoCloseActionName}`
+    );
     const n = this.history.findIndex((c) => c.id === (i == null ? void 0 : i.id));
-    return n !== -1 && (this.history.splice(n, 1), this.undoableStackValueIndex = this.undoableStackValueIndex - 1, (l = this.onDiscardChangeSetCallback) == null || l.call(this, i), i == null || i.teardown()), this;
+    return n !== -1 && (this.history.splice(n, 1), console.log(
+      `[ProjectState.discardChangeSet] Removed change-set ${i.id} - ${i.autoCloseActionName} from history.`
+    ), this.undoableStackValueIndex = this.undoableStackValueIndex - 1, (l = this.onDiscardChangeSetCallback) == null || l.call(this, i), i == null || i.teardown()), this;
   }
   validateGeneratedUpdate(i) {
     return { errors: [], modifiedData: i };