@elyx-code/project-logic-tree 0.0.6433 → 0.0.6435

package/dist/index.d.ts

@@ -2124,8 +2124,8 @@ export declare class ConditionState extends VersionedState implements ICondition
     getErrors(): EntityError[];
     getShallowErrors(): EntityError[];
     clone(changeSet?: ChangeSet | null, parent?: EntryPointEntityState | ProjectState | ConditionState | null, newId?: string | null, subscribe?: boolean): ConditionState;
-    addToAndGroup(child: ConditionState): ConditionState;
-    addToOrGroup(child: ConditionState): ConditionState;
+    addToAndGroup(child: ConditionState, changeSet?: ChangeSet | null): ConditionState;
+    addToOrGroup(child: ConditionState, changeSet?: ChangeSet | null): ConditionState;
     removeUnrecognizedInputs(changeSet?: ChangeSet | null): IChangeSet<ConditionState>;
     syncInputs(changeSet?: ChangeSet | null): IChangeSet<ConditionState>;
     getUnusedInputs(): ActionInputMapState[];
@@ -2587,8 +2587,8 @@ export declare class DataTypeState extends VersionedState implements IDataType,
     getShallowErrors(): EntityError[];
     clone(changeSet?: ChangeSet | null, parent?: PropertyState | VariableDeclarationState | ArgumentDeclarationState | ReturnDeclarationState | ValueDescriptorState | InputMapState | OutputMapState | DataTypeState | null, newId?: string | null, subscribe?: boolean): DataTypeState;
     merge(sourceEntity: DataTypeState, changeSet?: ChangeSet | null): IChangeSet<DataTypeState>;
-    addToAndGroup(child: DataTypeState): DataTypeState;
-    addToOrGroup(child: DataTypeState): DataTypeState;
+    addToAndGroup(child: DataTypeState, changeSet?: ChangeSet | null): DataTypeState;
+    addToOrGroup(child: DataTypeState, changeSet?: ChangeSet | null): DataTypeState;
     setEntity(entity: DefinitionEntityState | PrimitiveEntityState | ActionDescriptorState | BuiltInBaseEntityState | LiteralValueState | null, changeSet?: ChangeSet | null): DataTypeState;
     isObject(): boolean;
     canBeObject(): boolean;

package/dist/index.js

@@ -35275,37 +35275,38 @@ Alternatively you can update the entity with 'update' action. Or replace it by f
       "update-with-shallow-transfer"
     )
   )) {
+    var o, p;
     if (this.metaSync(i, a), this.version = i.version, this.createdAt = i.createdAt, this.author = i.author, this.deleted = i.deleted, this.previousVersion = i.previousVersion, this.unsubscribeFromDependencies(), i.parent) {
-      const o = Z(i.parent), p = this.project.get(o), e = this.parent;
-      if (e && e.id !== (p == null ? void 0 : p.id) && this.removeFromParent(a), p)
-        this.setParent(p, a), this.addSelfToProject(a);
+      const e = Z(i.parent), y = this.project.get(e), v = this.parent;
+      if (v && v.id !== (y == null ? void 0 : y.id) && this.removeFromParent(a), y)
+        this.setParent(y, a), this.addSelfToProject(a);
       else
         throw a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), new Error(
-          `${this.type} with id '${this.id}' has a 'parent' reference '${o}' that isn't found in the project`
+          `${this.type} with id '${this.id}' has a 'parent' reference '${e}' that isn't found in the project`
         );
     } else
       throw a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), new Error(`${this.type} with id '${this.id}' must have a 'parent'`);
     if (i.entity) {
-      const o = Z(i.entity), p = this.project.get(o);
-      p && (p.type === f.DefinitionEntity && p.parent === this || this.setEntity(p, null));
+      const e = Z(i.entity), y = this.project.get(e);
+      y && (y.type === f.DefinitionEntity && y.parent === this || this.setEntity(y, null));
     }
-    return i.andChildrenGroup && (this.andChildrenGroup = i.andChildrenGroup.map(
-      (o) => {
-        const p = Z(o), e = this.project.get(p);
-        if (e && !(e.type === f.DataType && e.parent === this))
-          return e;
-      }
-    ).filter(
-      (o) => !!o
-    )), i.orChildrenGroup && (this.orChildrenGroup = i.orChildrenGroup.map(
-      (o) => {
-        const p = Z(o), e = this.project.get(p);
-        if (e && !(e.type === f.DataType && e.parent === this))
-          return e;
-      }
-    ).filter(
-      (o) => !!o
-    )), this.captureVersion(), this.subscribeToDependencies(), a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), this;
+    return (o = i.andChildrenGroup) == null || o.forEach((e) => {
+      const y = Z(e), v = this.project.get(y);
+      v && (this.addToAndGroup(v, a), v.setParent(this, a));
+    }), [...this.andChildrenGroup || []].forEach((e) => {
+      var v;
+      ((v = i.andChildrenGroup) == null ? void 0 : v.find(
+        (E) => Z(E) === e.id
+      )) || (this.removeChildGroup(e, a), e.removeFromParent(a));
+    }), (p = i.orChildrenGroup) == null || p.forEach((e) => {
+      const y = Z(e), v = this.project.get(y);
+      v && (this.addToOrGroup(v, a), v.setParent(this, a));
+    }), [...this.orChildrenGroup || []].forEach((e) => {
+      var v;
+      ((v = i.orChildrenGroup) == null ? void 0 : v.find(
+        (E) => Z(E) === e.id
+      )) || (this.removeChildGroup(e, a), e.removeFromParent(a));
+    }), this.captureVersion(), this.subscribeToDependencies(), a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), this;
   }
   hydrateAncestors() {
     const i = [], a = [], o = [], p = [];
@@ -35370,7 +35371,7 @@ Alternatively you can update the entity with 'update' action. Or replace it by f
     )
   )) {
     const a = [this], o = [], p = [], e = [];
-    return this.parent.type === f.DataType ? this.parentRelationType === wi.AndDataTypeGroup ? this.parent.addToAndGroup(this) : this.parentRelationType === wi.OrDataTypeGroup && this.parent.addToOrGroup(this) : this.parent.setDataType(this, i), e.push(this.parent), this.subscribe(), this.subscribeToDependencies(), i == null || i.attemptAutoclose("add-self-to-project", this.id), {
+    return this.parent.type === f.DataType ? this.parentRelationType === wi.AndDataTypeGroup ? this.parent.addToAndGroup(this, i) : this.parentRelationType === wi.OrDataTypeGroup && this.parent.addToOrGroup(this, i) : this.parent.setDataType(this, i), e.push(this.parent), this.subscribe(), this.subscribeToDependencies(), i == null || i.attemptAutoclose("add-self-to-project", this.id), {
       updated: _(a),
       added: _(o),
       removed: _(p),
@@ -36046,12 +36047,30 @@ Alternatively you can update the entity with 'update' action. Or replace it by f
     };
   }
   // Add a child to the 'and' group
-  addToAndGroup(i) {
-    return this.andChildrenGroup || (this.andChildrenGroup = []), this.andChildrenGroup.includes(i) || this.andChildrenGroup.push(i), this;
+  addToAndGroup(i, a = this.project.addChangeSet(
+    new j(
+      this.project,
+      P.sessionAuthor,
+      N().toISOString(),
+      this,
+      !0,
+      "add-to-and-group"
+    )
+  )) {
+    return this.andChildrenGroup || (this.andChildrenGroup = []), this.andChildrenGroup.includes(i) || (this.andChildrenGroup.push(i), a == null || a.add(i, F.Affected)), a == null || a.attemptAutoclose("add-to-and-group", this.id), this;
   }
   // Add a child to the 'or' group
-  addToOrGroup(i) {
-    return this.orChildrenGroup || (this.orChildrenGroup = []), this.orChildrenGroup.includes(i) || this.orChildrenGroup.push(i), this;
+  addToOrGroup(i, a = this.project.addChangeSet(
+    new j(
+      this.project,
+      P.sessionAuthor,
+      N().toISOString(),
+      this,
+      !0,
+      "add-to-or-group"
+    )
+  )) {
+    return this.orChildrenGroup || (this.orChildrenGroup = []), this.orChildrenGroup.includes(i) || (this.orChildrenGroup.push(i), a == null || a.add(i, F.Affected)), a == null || a.attemptAutoclose("add-to-or-group", this.id), this;
   }
   setEntity(i, a = this.project.addChangeSet(
     new j(
@@ -47482,57 +47501,66 @@ If an entity is called by another, they must be in the same scope, which means t
       "update-with-shallow-transfer"
     )
   )) {
+    var o, p;
     if (this.metaSync(i, a), this.version = i.version, this.createdAt = i.createdAt, this.author = i.author, this.deleted = i.deleted, this.previousVersion = i.previousVersion, i.parent) {
-      const o = Z(i.parent), p = this.project.get(o), e = this.parent;
-      if (e && e.id !== (p == null ? void 0 : p.id) && this.removeFromParent(a), p)
-        this.setParent(p, a), this.addSelfToProject(a);
+      const e = Z(i.parent), y = this.project.get(e), v = this.parent;
+      if (v && v.id !== (y == null ? void 0 : y.id) && this.removeFromParent(a), y)
+        this.setParent(y, a), this.addSelfToProject(a);
       else
         throw a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), new Error(
-          `${this.type} with id '${this.id}' has a 'parent' reference '${o}' that isn't found in the project`
+          `${this.type} with id '${this.id}' has a 'parent' reference '${e}' that isn't found in the project`
         );
     } else
       throw a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), new Error(`${this.type} with id '${this.id}' must have a 'parent'`);
     if (i.declaration) {
-      const o = Z(
+      const e = Z(
         i.declaration
-      ), p = this.project.get(
-        o
+      ), y = this.project.get(
+        e
       );
-      p && this.setDeclaration(p);
+      y && this.setDeclaration(y);
     }
-    return i.andChildrenGroup && (this.andChildrenGroup = i.andChildrenGroup.map((o) => {
-      const p = Z(o), e = this.project.get(p);
-      if (e && !(e.type === f.Condition && e.parent === this))
-        return e;
-    }).filter((o) => !!o)), i.orChildrenGroup && (this.orChildrenGroup = i.orChildrenGroup.map((o) => {
-      const p = Z(o), e = this.project.get(p);
-      if (e && !(e.type === f.Condition && e.parent === this))
-        return e;
-    }).filter((o) => !!o)), i.calledByEntry.forEach((o) => {
-      const p = Z(o), e = this.project.get(p);
-      e && (this.addEntryCaller(e, a), e.addCall(this, a));
-    }), [...this.calledByEntry].forEach((o) => {
+    return (o = i.andChildrenGroup) == null || o.forEach((e) => {
+      const y = Z(e), v = this.project.get(y);
+      v && (this.addToAndGroup(v, a), v.setParent(this, a));
+    }), [...this.andChildrenGroup || []].forEach((e) => {
+      var v;
+      ((v = i.andChildrenGroup) == null ? void 0 : v.find(
+        (E) => Z(E) === e.id
+      )) || (this.removeChildGroup(e, a), e.removeFromParent(a));
+    }), (p = i.orChildrenGroup) == null || p.forEach((e) => {
+      const y = Z(e), v = this.project.get(y);
+      v && (this.addToOrGroup(v, a), v.setParent(this, a));
+    }), [...this.orChildrenGroup || []].forEach((e) => {
+      var v;
+      ((v = i.orChildrenGroup) == null ? void 0 : v.find(
+        (E) => Z(E) === e.id
+      )) || (this.removeChildGroup(e, a), e.removeFromParent(a));
+    }), i.calledByEntry.forEach((e) => {
+      const y = Z(e), v = this.project.get(y);
+      v && (this.addEntryCaller(v, a), v.addCall(this, a));
+    }), [...this.calledByEntry].forEach((e) => {
       i.calledByEntry.find(
-        (e) => Z(e) === o.id
-      ) || (this.removeCaller(o, a), o.removeCall(this, a));
-    }), i.calledBySuccess.forEach((o) => {
-      const p = Z(o), e = this.project.get(
-        p
+        (v) => Z(v) === e.id
+      ) || (this.removeCaller(e, a), e.removeCall(this, a));
+    }), i.calledBySuccess.forEach((e) => {
+      const y = Z(e), v = this.project.get(
+        y
       );
-      e && (this.addSuccessCaller(e, a), e.addSuccessCall(this, a));
-    }), [...this.calledBySuccess].forEach((o) => {
+      v && (this.addSuccessCaller(v, a), v.addSuccessCall(this, a));
+    }), [...this.calledBySuccess].forEach((e) => {
       i.calledBySuccess.find(
-        (e) => Z(e) === o.id
-      ) || (this.removeCaller(o, a), o.removeCall(this, a));
-    }), i.calledByError.forEach((o) => {
-      const p = Z(o), e = this.project.get(
-        p
+        (v) => Z(v) === e.id
+      ) || (this.removeCaller(e, a), e.removeCall(this, a));
+    }), i.calledByError.forEach((e) => {
+      const y = Z(e), v = this.project.get(
+        y
       );
-      e && (this.addErrorCaller(e, a), e.addErrorCall(this, a));
-    }), [...this.calledBySuccess].forEach((o) => {
+      v && (this.addErrorCaller(v, a), v.addErrorCall(this, a));
+    }), [...this.calledBySuccess].forEach((e) => {
       i.calledBySuccess.find(
-        (e) => Z(e) === o.id
-      ) || (this.removeCaller(o, a), o.removeCall(this, a));
+        (v) => Z(v) === e.id
+      ) || (this.removeCaller(e, a), e.removeCall(this, a));
     }), this.captureVersion(), this.subscribeToDependencies(), a == null || a.attemptAutoclose("update-with-shallow-transfer", this.id), this;
   }
   hydrateAncestors() {
@@ -47619,7 +47647,7 @@ If an entity is called by another, they must be in the same scope, which means t
     )
   )) {
     const a = [this], o = [], p = [], e = [];
-    return this.parent === this.project ? this.project.addCondition(this) : this.parent.type === f.Condition && (this.parent.declaration.id === Br.And ? this.parent.addToAndGroup(this) : this.parent.declaration.id === Br.Or && this.parent.addToOrGroup(this)), this.successCalls.forEach((y) => {
+    return this.parent === this.project ? this.project.addCondition(this) : this.parent.type === f.Condition && (this.parent.declaration.id === Br.And ? this.parent.addToAndGroup(this, i) : this.parent.declaration.id === Br.Or && this.parent.addToOrGroup(this, i)), this.successCalls.forEach((y) => {
       y.addSuccessCaller(this, i), a.push(y);
     }), this.errorCalls.forEach((y) => {
       y.addErrorCaller(this, i), a.push(y);
@@ -48387,12 +48415,30 @@ If an entity is called by another, they must be in the same scope, which means t
     return A.inputs = x, i == null || i.attemptAutoclose("clone-entity", this.id), A;
   }
   // Add a child to the 'and' group
-  addToAndGroup(i) {
-    return this.andChildrenGroup || (this.andChildrenGroup = []), this.andChildrenGroup.includes(i) || this.andChildrenGroup.push(i), this;
+  addToAndGroup(i, a = this.project.addChangeSet(
+    new j(
+      this.project,
+      P.sessionAuthor,
+      N().toISOString(),
+      this,
+      !0,
+      "add-to-and-group"
+    )
+  )) {
+    return this.andChildrenGroup || (this.andChildrenGroup = []), this.andChildrenGroup.includes(i) || (this.andChildrenGroup.push(i), a == null || a.add(i, F.Affected)), a == null || a.attemptAutoclose("add-to-and-group", this.id), this;
   }
   // Add a child to the 'or' group
-  addToOrGroup(i) {
-    return this.orChildrenGroup || (this.orChildrenGroup = []), this.orChildrenGroup.includes(i) || this.orChildrenGroup.push(i), this;
+  addToOrGroup(i, a = this.project.addChangeSet(
+    new j(
+      this.project,
+      P.sessionAuthor,
+      N().toISOString(),
+      this,
+      !0,
+      "add-to-or-group"
+    )
+  )) {
+    return this.orChildrenGroup || (this.orChildrenGroup = []), this.orChildrenGroup.includes(i) || (this.orChildrenGroup.push(i), a == null || a.add(i, F.Affected)), a == null || a.attemptAutoclose("add-to-or-group", this.id), this;
   }
   removeUnrecognizedInputs(i = this.project.addChangeSet(
     new j(
@@ -102993,6 +103039,8 @@ function w_t(d, u = /* @__PURE__ */ new Set(), i = {
     throw new Error("Entity must be a condition to be flattened");
   return [
     d,
+    ...(d.andChildrenGroup || []).flatMap((a) => ye(a, u, i)),
+    ...(d.orChildrenGroup || []).flatMap((a) => ye(a, u, i)),
     ...(d.inputs || []).flatMap((a) => ye(a, u, i)),
     ...(d.successCalls || []).flatMap((a) => ye(a, u, i)),
     ...(d.errorCalls || []).flatMap((a) => ye(a, u, i)),