@elyx-code/project-logic-tree 0.0.6623 → 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>;
@@ -31623,7 +31623,7 @@ export declare function getReferencedEntityStateOrErrors(data: ElementGeneration
      visitAsync(callback: (entity: Element_2 | ElementTransfer | EntityState | ElementShallowTransfer, knownEntitiesRecord: Record<EntityId, Element_2 | ElementTransfer | EntityState | ElementShallowTransfer>) => any, { yieldEvery }?: {
          yieldEvery?: number;
      }): Promise<Traverser>;
-     reverseVisitAsync(callback: (entity: Element_2 | ElementTransfer | EntityState | ElementShallowTransfer, knownEntitiesRecord: Record<EntityId, Element_2 | ElementTransfer | EntityState | ElementShallowTransfer>) => Promise<any>, { yieldEvery }?: {
+     reverseVisitAsync(callback: (entity: Element_2 | ElementTransfer | EntityState | ElementShallowTransfer, knownEntitiesRecord: Record<EntityId, Element_2 | ElementTransfer | EntityState | ElementShallowTransfer>) => any, { yieldEvery }?: {
          yieldEvery?: number;
      }): Promise<Traverser>;
  }

package/dist/index.js

@@ -93331,8 +93331,14 @@ class S extends qf {
     return this.autoclose && this.autoCloseActionName && this.autoCloseActionName === i && (this.self && n === ((l = this.self) == null ? void 0 : l.id) || !this.self) && await this.closeAsync(), this;
   }
   async closeAsync(i = {}) {
+    if (!this.open || this.startedClose)
+      return ne.warn(
+        `Change-set (${this.id}) is already closed or in the process of closing.`
+      ), this;
     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(`Empty change-set (${this.id}) discarded upon closing.`), this.project.discardChangeSet(this), this.project.closePendingChangeSets(), this) : (l ? await this.project.closeChangeSet(this) : this.project.closeChangeSet(this), this);
+    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.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;
@@ -93403,8 +93409,14 @@ class S extends qf {
     return aAi(this);
   }
   close() {
+    if (!this.open || this.startedClose)
+      return ne.warn(
+        `Change-set (${this.id}) is already closed or in the process of closing.`
+      ), this;
     if (this.startedClose || (this.startedClose = !0, this.beforeClose()), !this.isValid && this.self && !this.added[this.self.id] && !this.updated[this.self.id] && this.removed[this.self.id], this.discardOrphans(), this.sanitize(), this.captureAllChangesInVersionInstances(), this.lockedVersions || (this.recursiveCaptureUpstreamVersions(), this.captureAllChangesInVersionInstances()), this.open = !1, this.isEmpty)
-      return ne.warn(`Empty change-set (${this.id}) discarded upon closing.`), this.project.discardChangeSet(this), this.project.closePendingChangeSets(), this;
+      return ne.warn(
+        `[ChangeSet.close] Empty change-set (${this.id}) discarded upon closing.`
+      ), this.project.discardChangeSet(this), console.log("[ChangeSet.close] Closing pending change-sets..."), this.project.closePendingChangeSets(), this;
     if (this.added[this.project.id] && this.updatedIds.length)
       throw new Error(
         "No 'updated' entities should be present in the change-set when the project entity is in the 'added' list. New projects can only have newly added entities"
@@ -192912,13 +192924,18 @@ const o6 = {
     return this.parentContext.events.emitAsyncSequentiallyAllSettled;
   }
   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 && await this.closeChangeSet(i);
+    i && (console.log(
+      `[ProjectState.closePendingChangeSets] closing pending change-set ${i.id} - ${i.autoCloseActionName}`
+    ), await this.closeChangeSet(i));
   }
   async onCloseChangeSet(i) {
-    this.onCloseChangeSetCallback = i, await this.closePendingChangeSets();
+    this.onCloseChangeSetCallback = i, console.log(
+      "[ProjectState.onCloseChangeSet] onCloseChangeSetCallback has been set. Checking for pending change-sets."
+    ), await this.closePendingChangeSets();
   }
   onAddChangeSet(i) {
     this.onAddChangeSetCallback = i;
@@ -192927,11 +192944,26 @@ const o6 = {
     this.onDiscardChangeSetCallback = i;
   }
   async closeChangeSet(i) {
+    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) && this.onCloseChangeSetCallback) {
-      (await this.onCloseChangeSetCallback(i)).success && (i.dirty = !1, this.emit("change-set-closed", i), this.closePendingChangeSets());
+    if (c != null && c.dirty) {
+      console.log(
+        `[ProjectState.closeChangeSet] lastBeforeSelf is dirty: ${c.id} - ${c.autoCloseActionName}, closing it first.`
+      );
       return;
     }
+    this.onCloseChangeSetCallback && (console.log(
+      `[ProjectState.closeChangeSet] invoking onCloseChangeSetCallback for change-set ${i.id} - ${i.autoCloseActionName}`
+    ), (await this.onCloseChangeSetCallback(i)).success && (i.dirty = !1, this.emit("change-set-closed", i), console.log(
+      `[ProjectState.closeChangeSet] change-set ${i.id} - ${i.autoCloseActionName} closed successfully, checking for pending change-sets to close.`
+    ), this.closePendingChangeSets()));
   }
   // Returns the last open change set or creates a new one with the information provided
   toLatestChangeSet(i, n, l, c = !1, e = "here-this") {
@@ -192988,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 };