modern-canvas 0.17.2 → 0.18.0

package/dist/asset/Assets.d.ts

@@ -30,7 +30,7 @@ export declare class Assets extends Observable<AssetsEvents> {
     fetchImageBitmap(url: string | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
     get<T>(id: string): T | undefined;
     set(id: string, value: any): void;
-    awaitBy(handler: () => Promise<void>): Promise<string>;
+    awaitBy<T = any>(handler: () => Promise<T>): Promise<T>;
     loadBy<T = Blob>(id: string, handler?: () => Promise<T>): Promise<T>;
     load<T>(url: string, options?: any): Promise<T>;
     waitUntilLoad(): Promise<void>;

package/dist/index.js

@@ -1077,12 +1077,12 @@ var ft = class {
 	}
 };
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/decorateMetadata.js
+//#region \0@oxc-project+runtime@0.130.0/helpers/decorateMetadata.js
 function O(e, t) {
 	if (typeof Reflect == "object" && typeof Reflect.metadata == "function") return Reflect.metadata(e, t);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.130.0/helpers/decorate.js
 function k(e, t, n, r) {
 	var i = arguments.length, a = i < 3 ? t : r === null ? r = Object.getOwnPropertyDescriptor(t, n) : r, o;
 	if (typeof Reflect == "object" && typeof Reflect.decorate == "function") a = Reflect.decorate(e, t, n, r);
@@ -1127,6 +1127,7 @@ k([_({ fallback: 60 }), O("design:type", Number)], ht.prototype, "fps", void 0),
 var gt = /* @__PURE__ */ function(e) {
 	return e[e.elementArrayBuffer = 34963] = "elementArrayBuffer", e[e.arrayBuffer = 34962] = "arrayBuffer", e[e.uniformBuffer = 35345] = "uniformBuffer", e;
 }({}), _t = class {
+	native;
 	target = gt.arrayBuffer;
 	byteLength = 0;
 	dirty = !0;
@@ -1539,6 +1540,7 @@ function zt(e, t) {
 //#endregion
 //#region src/core/renderers/gl/shader/GlProgramData.ts
 var Bt = class {
+	native;
 	constructor(e) {
 		this.native = e;
 	}
@@ -2108,7 +2110,7 @@ function $t(e) {
 var M = /* @__PURE__ */ function(e) {
 	return e[e.disabled = 0] = "disabled", e[e.renderingMaskAdd = 1] = "renderingMaskAdd", e[e.maskActive = 2] = "maskActive", e[e.inverseMaskActive = 3] = "inverseMaskActive", e[e.renderingMaskRemove = 4] = "renderingMaskRemove", e[e.none = 5] = "none", e;
 }({}), en = /* @__PURE__ */ function(e) {
-	return e[e.none = 0] = "none", e[e.color = 16384] = "color", e[e.stencil = 1024] = "stencil", e[e.depth = 256] = "depth", e[e.colorDepth = e.color | e.depth] = "colorDepth", e[e.colorStencil = e.color | e.stencil] = "colorStencil", e[e.depthStencil = e.depth | e.stencil] = "depthStencil", e[e.all = e.color | e.depth | e.stencil] = "all", e;
+	return e[e.none = 0] = "none", e[e.color = 16384] = "color", e[e.stencil = 1024] = "stencil", e[e.depth = 256] = "depth", e[e.colorDepth = 16640] = "colorDepth", e[e.colorStencil = 17408] = "colorStencil", e[e.depthStencil = 1280] = "depthStencil", e[e.all = 17664] = "all", e;
 }({}), tn = class extends j {
 	install(e) {
 		super.install(e), e.mask = this;
@@ -2251,6 +2253,7 @@ var rn = class extends j {
 		t.x === n && t.y === r && t.width === i && t.height === a || (this._gl.viewport(n, r, i, a), t.x = n, t.y = r, t.width = i, t.height = a);
 	}
 }, on = class {
+	framebuffer;
 	width = -1;
 	height = -1;
 	msaa = !1;
@@ -2390,6 +2393,7 @@ var rn = class extends j {
 }({}), N = /* @__PURE__ */ function(e) {
 	return e[e.UNSIGNED_BYTE = 5121] = "UNSIGNED_BYTE", e[e.UNSIGNED_SHORT = 5123] = "UNSIGNED_SHORT", e[e.UNSIGNED_SHORT_5_6_5 = 33635] = "UNSIGNED_SHORT_5_6_5", e[e.UNSIGNED_SHORT_4_4_4_4 = 32819] = "UNSIGNED_SHORT_4_4_4_4", e[e.UNSIGNED_SHORT_5_5_5_1 = 32820] = "UNSIGNED_SHORT_5_5_5_1", e[e.UNSIGNED_INT = 5125] = "UNSIGNED_INT", e[e.UNSIGNED_INT_10F_11F_11F_REV = 35899] = "UNSIGNED_INT_10F_11F_11F_REV", e[e.UNSIGNED_INT_2_10_10_10_REV = 33640] = "UNSIGNED_INT_2_10_10_10_REV", e[e.UNSIGNED_INT_24_8 = 34042] = "UNSIGNED_INT_24_8", e[e.UNSIGNED_INT_5_9_9_9_REV = 35902] = "UNSIGNED_INT_5_9_9_9_REV", e[e.BYTE = 5120] = "BYTE", e[e.SHORT = 5122] = "SHORT", e[e.INT = 5124] = "INT", e[e.FLOAT = 5126] = "FLOAT", e[e.FLOAT_32_UNSIGNED_INT_24_8_REV = 36269] = "FLOAT_32_UNSIGNED_INT_24_8_REV", e[e.HALF_FLOAT = 36193] = "HALF_FLOAT", e;
 }({}), un = class {
+	native;
 	target = ln.TEXTURE_2D;
 	width = -1;
 	height = -1;
@@ -3692,6 +3696,7 @@ var er = class e extends z {
 	_requestId;
 	_resolve;
 	_reject;
+	_seekResolves = [];
 	constructor(t, n) {
 		let r = $n(n);
 		if (!Ke(t)) {
@@ -3741,8 +3746,24 @@ var er = class e extends z {
 		this.source.removeEventListener("error", this._onError, !0), this.emit("error", e), this._reject && (this._reject(e), this._reject = void 0, this._resolve = void 0);
 	};
 	_onSeeked = () => {
-		this.autoUpdate && !this.isPlaying && (this._nextTime = 0, this.requestUpload(), this._nextTime = 0);
+		this.autoUpdate && !this.isPlaying && (this._nextTime = 0, this.requestUpload(), this._nextTime = 0), this._flushSeekResolves();
 	};
+	_flushSeekResolves() {
+		if (this._seekResolves.length === 0) return;
+		let e = this._seekResolves;
+		this._seekResolves = [], e.forEach((e) => e());
+	}
+	waitSeek(e) {
+		return !this.seeking || e?.aborted ? Promise.resolve() : new Promise((t) => {
+			let n, r = () => {
+				n && e?.removeEventListener("abort", n), t();
+			};
+			n = () => {
+				let e = this._seekResolves.indexOf(r);
+				e >= 0 && this._seekResolves.splice(e, 1), t();
+			}, e?.addEventListener("abort", n, { once: !0 }), this._seekResolves.push(r);
+		});
+	}
 	_setupAutoUpdate() {
 		this.autoUpdate && this.isPlaying ? !this.fps && this.source.requestVideoFrameCallback ? (this._connected && (S.off(this.requestUpload), this._connected = !1, this._nextTime = 0), this._requestId === void 0 && (this._requestId = this.source.requestVideoFrameCallback(this._videoFrameRequestCallback))) : (this._requestId !== void 0 && (this.source.cancelVideoFrameCallback(this._requestId), this._requestId = void 0), this._connected || (S.on(this.requestUpload), this._connected = !0, this._nextTime = 0)) : (this._requestId !== void 0 && (this.source.cancelVideoFrameCallback(this._requestId), this._requestId = void 0), this._connected && (S.off(this.requestUpload), this._connected = !1, this._nextTime = 0));
 	}
@@ -3763,7 +3784,7 @@ var er = class e extends z {
 		return this._sourceLoad;
 	}
 	_destroy() {
-		this._setupAutoUpdate();
+		this._setupAutoUpdate(), this._flushSeekResolves();
 		let e = this.source;
 		e && (e.removeEventListener("play", this._onPlayStart), e.removeEventListener("pause", this._onPlayStop), e.removeEventListener("seeked", this._onSeeked), e.removeEventListener("canplay", this._onCanPlay), e.removeEventListener("canplaythrough", this._onCanPlay), e.removeEventListener("error", this._onError, !0), e.pause(), e.src = "", e.load());
 	}
@@ -3921,6 +3942,7 @@ var tr = class extends z {}, nr = class extends oe {
 		return [...this.default];
 	}
 }, ir = class extends C {
+	parent;
 	getPropertyDeclarations() {
 		super.getPropertyDeclarations();
 		let e = {};
@@ -6051,6 +6073,7 @@ function wi(e, t) {
 //#endregion
 //#region src/scene/2d/element/Element2DFill.ts
 var Y = class extends C {
+	_parent;
 	texture;
 	animatedTexture;
 	constructor(e) {
@@ -6163,6 +6186,7 @@ k([_(), O("design:type", Object)], Ti.prototype, "fillWithShape", void 0);
 //#endregion
 //#region src/scene/2d/element/Element2DConnection.ts
 var Ei = class extends C {
+	_parent;
 	constructor(e) {
 		super(), this._parent = e;
 	}
@@ -6248,6 +6272,7 @@ k([_(), O("design:type", Object)], Oi.prototype, "color", void 0), k([_(), O("de
 //#endregion
 //#region src/scene/2d/element/Element2DShadow.ts
 var ki = class extends C {
+	_parent;
 	constructor(e) {
 		super(), this._parent = e;
 	}
@@ -6274,6 +6299,7 @@ k([_({ fallback: !0 }), O("design:type", Boolean)], ki.prototype, "enabled", voi
 //#endregion
 //#region src/scene/2d/element/Element2DShape.ts
 var Ai = class extends C {
+	_parent;
 	_path2DSet = new se();
 	constructor(e) {
 		super(), this._parent = e, this._updatePath2DSet();
@@ -6353,6 +6379,7 @@ for (let e in Mi) i(ji, e, { fallback: Mi[e] });
 //#endregion
 //#region src/scene/2d/element/Element2DText.ts
 var Ni, X = class extends C {
+	_parent;
 	base;
 	get textContent() {
 		return this._textContent;
@@ -6567,6 +6594,7 @@ var Z = {
 	"border-box": 0,
 	"content-box": 1
 }, Ui = class e {
+	_parent;
 	static _yoga;
 	static async load() {
 		let { loadYoga: e } = await import("yoga-layout/load");
@@ -7143,6 +7171,7 @@ var Qi, $i = class extends Ji {
 		return (this.texture?.duration ?? 0) * 1e3;
 	}
 	_wait = Promise.resolve();
+	_loadAbort;
 	constructor(e, t = []) {
 		super(), this.setProperties(e), this.append(t);
 	}
@@ -7157,7 +7186,14 @@ var Qi, $i = class extends Ji {
 		return this._wait;
 	}
 	async _load(e) {
-		this.texture = await $.video.load(e), this.requestDraw();
+		this._loadAbort?.abort();
+		let t = new AbortController();
+		this._loadAbort = t;
+		let { signal: n } = t, r = await $.video.load(e);
+		n.aborted || (this.texture = r, this._updateVideoCurrentTime(), !(r.seeking && (await $.awaitBy(() => r.waitSeek(n)), n.aborted)) && this.requestDraw());
+	}
+	_destroy() {
+		this._loadAbort?.abort(), super._destroy();
 	}
 	_updateVideoCurrentTime() {
 		let e = this.texture;
@@ -7529,6 +7565,7 @@ var la = class t extends e {
 		e && (e.onended = null, e.onplay = null, e.onpause = null, this._stop()), this._source = null, this._playbackRate = 1, this._volume = 1, this._loop = !1, this._end = 0, this._start = 0, this._duration = 0, this._playing = !1, this._pausedReal = !1, this._paused = !1, this._muted = !1, this._audio &&= (this._audio.context.off("refresh", this.refresh), this._audio.context.off("refreshPaused", this.refreshPaused), null);
 	}
 }, da = class {
+	parent;
 	source = new globalThis.Audio();
 	_src = "";
 	get src() {
@@ -7558,6 +7595,8 @@ var la = class t extends e {
 		return new ua();
 	}
 }, fa = class extends e {
+	_input;
+	_output;
 	_processers = [];
 	constructor(e, t) {
 		super(), this._input = e, this._output = t;
@@ -7578,6 +7617,8 @@ var la = class t extends e {
 		return this._input;
 	}
 }, pa = class {
+	destination;
+	source;
 	constructor(e, t = null) {
 		this.destination = e, this.source = t;
 	}
@@ -7820,6 +7861,7 @@ var ga = class e extends fa {
 		super.destroy(), this._stop(), this._gain?.disconnect(), this._gain = null, this._audio?.context.off("refresh", this.refresh), this._audio?.context.off("refreshPaused", this.refreshPaused), this._audio = null, this._processors.forEach((e) => e.disconnect()), this._processors.length = 0, this._end = 0, this._playbackRate = 1, this._volume = 1, this._loop = !1, this._elapsed = 0, this._duration = 0, this._paused = !1, this._muted = !1, this._pausedReal = !1;
 	}
 }, va = class extends fa {
+	parent;
 	_sourceBuffer;
 	_sourceNode;
 	_sourceLoad;
@@ -8250,7 +8292,7 @@ var Ma = class extends An {
 	}
 }, La = class extends An {
 	install(e) {
-		return this.load = (e) => new er(e).load(), e.video = this, this;
+		return this.load = (t) => e.awaitBy(() => new er(t).load()), e.video = this, this;
 	}
 }, Ra = Object.entries({
 	"font/woff": ["woff"],
@@ -8344,7 +8386,7 @@ var Va = "WeakRef" in globalThis, Ha = class extends e {
 	}
 	async awaitBy(e) {
 		let t = e(), n = c();
-		return t.finally(() => this._handleing.delete(n)), this._handleing.set(n, t), await t, n;
+		return t.finally(() => this._handleing.delete(n)), this._handleing.set(n, t), await t;
 	}
 	async loadBy(e, t = () => this.fetch(e).then((e) => e.blob())) {
 		let n = this.get(e) ?? this._handleing.get(e);

package/dist/scene/2d/Video2D.d.ts

@@ -9,10 +9,12 @@ export declare class Video2D extends TextureRect2D<VideoTexture> {
     src: string;
     get videoDuration(): number;
     protected _wait: Promise<void>;
+    protected _loadAbort?: AbortController;
     constructor(properties?: Partial<Video2DProperties>, children?: Node[]);
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     waitLoad(): Promise<void>;
     protected _load(src: string): Promise<void>;
+    protected _destroy(): void;
     protected _updateVideoCurrentTime(): void;
     protected _process(delta: number): void;
 }

package/dist/scene/resources/textures/VideoTexture.d.ts

@@ -30,6 +30,7 @@ export declare class VideoTexture extends Texture2D<HTMLVideoElement> {
     protected _requestId?: number;
     protected _resolve?: (val: this) => void;
     protected _reject?: (event: ErrorEvent) => void;
+    protected _seekResolves: Array<() => void>;
     constructor(source: HTMLVideoElement | (string | VideoTextureLike)[] | string, options?: VideoTextureOptions);
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     protected _onPlayStart: () => void;
@@ -38,6 +39,8 @@ export declare class VideoTexture extends Texture2D<HTMLVideoElement> {
     protected _onError: (event: ErrorEvent) => void;
     /** Fired when the video is completed seeking to the current playback position. */
     protected _onSeeked: () => void;
+    protected _flushSeekResolves(): void;
+    waitSeek(signal?: AbortSignal): Promise<void>;
     protected _setupAutoUpdate(): void;
     protected _videoFrameRequestCallback: () => void;
     requestUpload: () => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "packageManager": "pnpm@10.19.0",
   "description": "A JavaScript WebGL rendering engine. only the ESM.",
   "author": "wxm",
@@ -64,8 +64,8 @@
     "earcut": "^3.0.2",
     "modern-font": "^0.5.0",
     "modern-idoc": "^0.11.4",
-    "modern-path2d": "^1.5.6",
-    "modern-text": "^1.11.0"
+    "modern-path2d": "^1.6.0",
+    "modern-text": "^1.11.1"
   },
   "peerDependencies": {
     "lottie-web": "^5",
@@ -84,18 +84,18 @@
     }
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^8.2.0",
+    "@antfu/eslint-config": "^9.0.0",
     "@types/earcut": "^3.0.0",
-    "@types/node": "^25.6.2",
+    "@types/node": "^25.9.0",
     "bumpp": "^11.1.0",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.0",
     "lottie-web": "^5.13.0",
     "modern-gif": "^2.1.0",
     "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
-    "vite": "^8.0.11",
-    "vitest": "^4.1.5",
+    "vite": "^8.0.13",
+    "vitest": "^4.1.6",
     "yoga-layout": "^3.2.1"
   }
 }