canvasengine 2.0.0-beta.58 → 2.0.0-beta.59

package/dist/index.js

@@ -3307,56 +3307,105 @@ function H(e, t) {
 				if (!i) throw Error(`attach in ${e.tag} is undefined or null, add a component`);
 				n && V(n), n = i, await l(e, i), t(void 0);
 			}));
-		}) : e.props.children.push(e.props.attach)), e.props.children) for (let t of e.props.children) t && await l(e, t);
+		}) : e.props.children.push(e.props.attach)), e.props.children) for (let t = 0; t < e.props.children.length; t++) {
+			let n = e.props.children[t];
+			n && await l(e, n, t);
+		}
 	}
-	async function l(e, t) {
-		if (fn(t) && (t = await t), t instanceof w) {
-			let n = /* @__PURE__ */ new Map(), r = (t, r) => {
+	async function l(e, t, n) {
+		fn(t) && (t = await t);
+		let r = e.__childGroups ??= [], a = n ?? (e.props.children ? e.props.children.indexOf(t) : -1), o = {
+			order: a >= 0 ? a : r.length,
+			mounted: /* @__PURE__ */ new Map()
+		};
+		r.push(o);
+		let u = (t) => {
+			let n = e.componentInstance?.children;
+			if (!t || !n) return;
+			let r = n.indexOf(t.componentInstance);
+			return r >= 0 ? r : void 0;
+		}, d = () => {
+			let e = r.filter((e) => e !== o && e.order > o.order).sort((e, t) => e.order - t.order);
+			for (let t of e) for (let e of t.mounted.values()) {
+				let t = u(e);
+				if (t !== void 0) return t;
+			}
+		}, f = (e, t) => {
+			for (let n = e + 1; n < t.length; n++) {
+				let e = u(o.mounted.get(t[n]));
+				if (e !== void 0) return e;
+			}
+			return d();
+		};
+		if (t instanceof w) {
+			let n = o.mounted, r = () => ({
+				tag: "fragment",
+				props: { children: [] },
+				componentInstance: {},
+				propSubscriptions: [],
+				effectSubscriptions: [],
+				effectMounts: [],
+				effectUnmounts: [],
+				propObservables: {},
+				parent: e,
+				directives: {},
+				destroy() {
+					V(this);
+				},
+				allElements: new it(),
+				isFrozen: !1
+			}), a = (t, r, i) => {
 				if (n.has(t)) return;
-				let i = ka(e, t);
-				n.set(t, i), s(e, i, r), c(i);
-			}, a = (e) => {
+				let a = ka(e, t);
+				n.set(t, a), s(e, a, f(r, i)), c(a);
+			}, u = (e) => {
 				n.forEach((t, r) => {
 					e.has(r) || (n.delete(r), t !== r && V(t));
 				});
-			}, o = (t, n, i) => {
-				if (t instanceof w) {
-					l(e, t);
+			}, d = (e, t, i, o) => {
+				if (e instanceof w) {
+					if (t.add(e), !n.has(e)) {
+						let t = r();
+						n.set(e, t), l(t, e);
+					}
 					return;
 				}
-				if (Array.isArray(t)) {
-					t.forEach((e) => o(e, n, i));
+				if (Array.isArray(e)) {
+					e.forEach((e) => d(e, t, i, o));
 					return;
 				}
-				R(t) && (n.add(t), r(t, i));
-			}, u = t.subscribe((t) => {
+				R(e) && (t.add(e), a(e, i, o));
+			}, p = t.subscribe((t) => {
 				if (t && typeof t == "object" && "elements" in t) {
-					let { elements: n, prev: r } = t, i = n.filter((e) => e !== null), s = /* @__PURE__ */ new Set();
+					let { elements: n, prev: r } = t, i = n.filter((e) => e !== null), a = /* @__PURE__ */ new Set();
 					if (r) {
 						i.forEach((t) => {
-							o(t, s, e.props.children.indexOf(r.props.key) + 1);
-						}), a(s);
+							d(t, a, e.props.children.indexOf(r.props.key) + 1, i);
+						}), u(a);
 						return;
 					}
 					i.forEach((e, t) => {
-						o(e, s, t);
-					}), a(s);
+						d(e, a, t, i);
+					}), u(a);
 				} else if (R(t)) {
 					let n = ka(e, t);
-					s(e, n), c(n);
-				} else Array.isArray(t) && t.forEach(async (t) => {
-					if (t instanceof w) await l(e, t);
-					else if (R(t)) {
-						let n = ka(e, t);
-						s(e, n), c(n);
-					}
-				});
+					o.mounted.set(t, n), s(e, n, f(0, [t])), c(n);
+				} else if (Array.isArray(t)) {
+					let e = /* @__PURE__ */ new Set();
+					t.forEach((n, r) => {
+						d(n, e, r, t);
+					}), u(e);
+				}
 				i.next(void 0);
 			});
-			e.effectSubscriptions.push(u);
+			p.add(() => {
+				n.forEach((e) => {
+					V(e);
+				}), n.clear();
+			}), e.effectSubscriptions.push(p);
 		} else if (R(t)) {
 			let n = ka(e, t);
-			s(e, n), await c(n);
+			o.mounted.set(t, n), s(e, n, f(0, [t])), await c(n);
 		}
 	}
 	return r;
@@ -6481,7 +6530,9 @@ var bs = console.log, xs = /* @__PURE__ */ function(e) {
 		});
 		L(() => {
 			let e = o();
-			this.isMounted && (e ? this.sheetCurrentAnimation = xs.Walk : this.sheetCurrentAnimation = xs.Stand, this.spritesheet && this.has(this.sheetCurrentAnimation) && this.play(this.sheetCurrentAnimation, [this.sheetParams]));
+			if (!this.isMounted) return;
+			let t = this.getMovementAnimationName(e);
+			t && (this.sheetCurrentAnimation = t, this.spritesheet && this.play(this.sheetCurrentAnimation, [this.sheetParams]));
 		}), super.onMount(e);
 	}
 	async onUpdate(e) {
@@ -6536,6 +6587,18 @@ var bs = console.log, xs = /* @__PURE__ */ function(e) {
 	isPlaying(e) {
 		return e ? this.currentAnimation == null ? !1 : this.currentAnimation.name == e : !!this.currentAnimation;
 	}
+	getFirstAnimationName() {
+		return this.animations.keys().next().value;
+	}
+	getPlayableAnimationName(e) {
+		return e && this.has(e) ? e : this.getFirstAnimationName();
+	}
+	getMovementAnimationName(e) {
+		let t = e ? xs.Walk : xs.Stand;
+		if (this.has(t)) return t;
+		if (this.sheetCurrentAnimation && this.has(this.sheetCurrentAnimation)) return this.sheetCurrentAnimation;
+		if (this.currentAnimation?.name && this.has(this.currentAnimation.name)) return this.currentAnimation.name;
+	}
 	stop() {
 		this.currentAnimation = null;
 	}
@@ -6562,7 +6625,11 @@ var bs = console.log, xs = /* @__PURE__ */ function(e) {
 		}), this.update({ deltaRatio: 1 });
 	}
 	async resetAnimations() {
-		this.stop(), this.animations.clear(), this.currentAnimation = null, this.currentAnimationContainer = null, this.time = 0, this.frameIndex = 0, this.removeChildren(), this.spritesheet && (await this.createAnimations(), this.play(this.sheetCurrentAnimation, [this.sheetParams]));
+		if (this.stop(), this.animations.clear(), this.currentAnimation = null, this.currentAnimationContainer = null, this.time = 0, this.frameIndex = 0, this.removeChildren(), this.spritesheet) {
+			await this.createAnimations();
+			let e = this.getPlayableAnimationName(this.sheetCurrentAnimation);
+			e && (this.sheetCurrentAnimation = e, this.play(e, [this.sheetParams]));
+		}
 	}
 	update({ deltaRatio: e }) {
 		let t = this.getElement();