modern-canvas 0.4.43 → 0.4.45

package/dist/index.mjs

@@ -239,12 +239,13 @@ function defineProperty(constructor, name, declaration = {}) {
       }
     };
   }
+  const getDefaultValue = () => typeof defaultValue === "function" ? defaultValue() : defaultValue;
   Object.defineProperty(constructor.prototype, name, {
     get() {
-      return descriptor.get?.call(this) ?? defaultValue;
+      return descriptor.get?.call(this) ?? getDefaultValue();
     },
     set(value) {
-      const oldValue = descriptor.get?.call(this) ?? defaultValue;
+      const oldValue = descriptor.get?.call(this) ?? getDefaultValue();
       descriptor.set?.call(this, value);
       this.requestUpdate?.(name, oldValue, declaration);
     },
@@ -505,7 +506,7 @@ class CoreObject extends EventEmitter {
       this._defaultProperties = {};
       for (const [name, property] of this.getPropertyDeclarations()) {
         if (!property.protected && !property.alias) {
-          this._defaultProperties[name] = property.default;
+          this._defaultProperties[name] = typeof property.default === "function" ? property.default() : property.default;
         }
       }
     }
@@ -537,6 +538,12 @@ class CoreObject extends EventEmitter {
     }
     return this;
   }
+  resetProperties() {
+    for (const [name, property] of this.getPropertyDeclarations()) {
+      this.setProperty(name, property.default);
+    }
+    return this;
+  }
   requestUpdate(key, oldValue, declaration) {
     if (key !== void 0) {
       const newValue = this[key];
@@ -559,8 +566,12 @@ class CoreObject extends EventEmitter {
     const properties = this.getProperties(Array.from(this._changedProperties));
     for (const key in properties) {
       const value = properties[key];
-      if (value && typeof value === "object" && "toJSON" in value && typeof value.toJSON === "function") {
-        json[key] = value.toJSON();
+      if (value && typeof value === "object") {
+        if ("toJSON" in value && typeof value.toJSON === "function") {
+          json[key] = value.toJSON();
+        } else {
+          json[key] = { ...value };
+        }
       } else {
         json[key] = value;
       }
@@ -5155,7 +5166,8 @@ class GradientTexture extends Texture2D {
     if (!ctx) {
       throw new Error("Failed to parse linear gradient, get canvas context is null.");
     }
-    const { angle, stops } = linearGradient;
+    let { angle = 0, stops } = linearGradient;
+    angle -= Math.PI / 2;
     const halfWidth = width / 2;
     const halfHeight = height / 2;
     const length = Math.sqrt(width * width + height * height) / 2;
@@ -5592,6 +5604,56 @@ class ViewportTexture extends PixelsTexture {
   //
 }
 
+class Children extends Array {
+  front = [];
+  back = [];
+  get internal() {
+    return [
+      ...this.front,
+      ...this,
+      ...this.back
+    ];
+  }
+  constructor(...items) {
+    super();
+    this.set(items);
+  }
+  set(items) {
+    this.front.length = 0;
+    this.length = 0;
+    this.back.length = 0;
+    items.forEach((item) => {
+      switch (item.internalMode) {
+        case "front":
+          this.front.push(item);
+          break;
+        case "default":
+          this.push(item);
+          break;
+        case "back":
+          this.back.push(item);
+          break;
+      }
+    });
+    return this;
+  }
+  getInternal(includeInternal) {
+    switch (includeInternal) {
+      case "front":
+        return this.front;
+      case "default":
+        return this;
+      case "back":
+        return this.back;
+      default:
+        throw new Error(`Unknown internal mode: ${includeInternal}`);
+    }
+  }
+  toJSON() {
+    return [...this];
+  }
+}
+
 var __defProp$J = Object.defineProperty;
 var __getOwnPropDesc$I = Object.getOwnPropertyDescriptor;
 var __decorateClass$R = (decorators, target, key, kind) => {
@@ -5633,7 +5695,7 @@ let Node = class extends CoreObject {
       } = properties;
       if (meta) {
         for (const key in meta) {
-          this.setMeta(key, meta[key]);
+          this.meta[key] = meta[key];
         }
       }
       super.setProperties(restProperties);
@@ -5678,8 +5740,9 @@ let Node = class extends CoreObject {
       if (tree) {
         this.emit("treeEnter", tree);
       }
-      for (let len = this._children.length, i = 0; i < len; i++) {
-        const node = this._children[i];
+      const children = this._children.internal;
+      for (let len = children.length, i = 0; i < len; i++) {
+        const node = children[i];
         !tree && this.emit("childExitingTree", node);
         node.setTree(tree);
         tree && this.emit("childEnteredTree", node);
@@ -5703,7 +5766,7 @@ let Node = class extends CoreObject {
     this.setParent(parent);
   }
   hasParent() {
-    return !!this._parent;
+    return Boolean(this._parent);
   }
   getParent() {
     return this._parent;
@@ -5723,7 +5786,13 @@ let Node = class extends CoreObject {
     return this;
   }
   /** Children */
-  _children = [];
+  _children = new Children();
+  get children() {
+    return this._children;
+  }
+  set children(value) {
+    value instanceof Children ? this._children = value : this._children.set(value);
+  }
   get siblingIndex() {
     return this.getIndex();
   }
@@ -5731,35 +5800,18 @@ let Node = class extends CoreObject {
     this._parent?.moveChild(this, toIndex);
   }
   get previousSibling() {
-    return this._parent?.getChildren()[this.getIndex() - 1];
+    return this._parent?.children[this.getIndex() - 1];
   }
   get nextSibling() {
-    return this._parent?.getChildren()[this.getIndex() + 1];
+    return this._parent?.children[this.getIndex() + 1];
   }
   get firstSibling() {
-    return this._parent?.getChildren()[0];
+    return this._parent?.children[0];
   }
   get lastSibling() {
-    const children = this._parent?.getChildren();
+    const children = this._parent?.children;
     return children ? children[children.length - 1] : void 0;
   }
-  /** Meta */
-  _meta = /* @__PURE__ */ new Map();
-  hasMeta(name) {
-    return this._meta.has(name);
-  }
-  getMeta(name, defaultVal) {
-    return this._meta.get(name) ?? defaultVal;
-  }
-  setMeta(name, value) {
-    this._meta.set(name, value);
-  }
-  deleteMeta(name) {
-    this._meta.delete(name);
-  }
-  clearMeta() {
-    this._meta.clear();
-  }
   canProcess() {
     if (!this._tree)
       return false;
@@ -5820,8 +5872,7 @@ let Node = class extends CoreObject {
     const canProcess = this.canProcess();
     const childrenInBefore = [];
     const childrenInAfter = [];
-    for (let len = this._children.length, i = 0; i < len; i++) {
-      const child = this._children[i];
+    this._children.internal.forEach((child) => {
       switch (child.processSortMode) {
         case "default":
           childrenInAfter.push(child);
@@ -5830,7 +5881,7 @@ let Node = class extends CoreObject {
           childrenInBefore.push(child);
           break;
       }
-    }
+    });
     childrenInBefore.forEach((child) => {
       child.emit("process", delta);
     });
@@ -5881,27 +5932,14 @@ let Node = class extends CoreObject {
     }
   }
   input(event, key) {
-    for (let i = this._children.length - 1; i >= 0; i--) {
-      this._children[i].input(event, key);
-    }
+    this._children.internal.forEach((child) => child.input(event, key));
     this._input(event, key);
   }
-  /** Children */
-  getChildren(includeInternal = false) {
-    switch (includeInternal) {
-      case true:
-        return this._children;
-      case false:
-        return this._children.filter((child) => child.internalMode === "default");
-      default:
-        return this._children.filter((child) => child.internalMode === includeInternal);
-    }
-  }
-  getIndex(includeInternal = false) {
-    return this._parent?.getChildren(includeInternal).indexOf(this) ?? 0;
+  getIndex() {
+    return this._parent?.children.getInternal(this.internalMode).indexOf(this) ?? 0;
   }
   getNode(path) {
-    return this._children.find((child) => child.name === path);
+    return this._children.internal.find((child) => child.name === path);
   }
   removeNode(path) {
     this.getNode(path)?.remove();
@@ -5911,7 +5949,7 @@ let Node = class extends CoreObject {
       return this;
     }
     sibling.internalMode = this.internalMode;
-    this._parent.moveChild(sibling, this.getIndex(true) + 1);
+    this._parent.moveChild(sibling, this.getIndex() + 1);
     return this;
   }
   prepend(...nodes) {
@@ -5944,7 +5982,7 @@ let Node = class extends CoreObject {
       _nodes = nodes;
     }
     _nodes.forEach((node) => {
-      this._parent?.moveChild(node, this.getIndex(true));
+      this._parent?.moveChild(node, this.getIndex());
     });
   }
   after(...nodes) {
@@ -5955,128 +5993,83 @@ let Node = class extends CoreObject {
       _nodes = nodes;
     }
     _nodes.forEach((node) => {
-      this._parent?.moveChild(node, this.getIndex(true) + 1);
+      this._parent?.moveChild(node, this.getIndex() + 1);
     });
   }
   insertBefore(node, child) {
     if (!child.hasParent() || !this.is(child.parent)) {
       return node;
     }
-    this.moveChild(node, child.getIndex(true));
+    this.moveChild(node, child.getIndex());
     return node;
   }
   appendChild(node, internalMode = node.internalMode) {
     if (this.is(node) || node.hasParent()) {
       return node;
     }
-    let index = -1;
     switch (internalMode) {
-      case "default":
-        index = this._children.findLastIndex((node2) => node2.internalMode === "default");
-        if (index > -1) {
-          index += 1;
-        } else {
-          index = this._children.findIndex((node2) => node2.internalMode === "back");
-        }
+      case "front":
+        this._children.front.push(node);
         break;
-      case "front": {
-        index = this._children.findLastIndex((node2) => node2.internalMode === "front");
-        if (index > -1) {
-          index += 1;
-        } else {
-          index = this._children.findIndex((node2) => node2.internalMode === "default");
-        }
-        if (index > -1) {
-          index += 1;
-        } else {
-          index = this._children.findIndex((node2) => node2.internalMode === "back");
-        }
+      case "default":
+        this._children.push(node);
         break;
-      }
       case "back":
-        this._children.push(node);
+        this._children.back.push(node);
         break;
     }
-    if (index > -1) {
-      this._children.splice(index, 0, node);
-    } else {
-      this._children.push(node);
-    }
     node.internalMode = internalMode;
     node.setParent(this);
     this.emit("appendChild", node);
     return node;
   }
-  moveChild(child, toIndex, internalMode = child.internalMode) {
-    if (this.is(child) || child.hasParent() && !this.is(child.parent)) {
+  moveChild(node, toIndex, internalMode = node.internalMode) {
+    if (this.is(node) || node.hasParent() && !this.is(node.parent)) {
       return this;
     }
-    child.internalMode = internalMode;
-    const oldIndex = this._children.indexOf(child);
-    let minIndex = this._children.findIndex((_child) => {
-      switch (internalMode) {
-        case "default":
-          return _child.internalMode !== "front";
-        case "back":
-          return _child.internalMode === "back";
-        case "front":
-        default:
-          return true;
-      }
-    });
-    minIndex = minIndex > -1 ? minIndex : Math.max(0, this._children.length - 1);
-    let maxIndex = this._children.slice(minIndex).findIndex((_child) => {
-      switch (internalMode) {
-        case "front":
-          return _child.internalMode !== "front";
-        case "default":
-          return _child.internalMode === "back";
-        case "back":
-        default:
-          return false;
+    const fromArray = this._children.getInternal(node.internalMode);
+    const fromIndex = fromArray.indexOf(node);
+    const toArray = this._children.getInternal(internalMode);
+    if (node.internalMode !== internalMode || toIndex !== fromIndex) {
+      if (fromIndex > -1) {
+        fromArray.splice(fromIndex, 1);
       }
-    });
-    maxIndex = maxIndex > -1 ? minIndex + maxIndex : Math.max(0, this._children.length);
-    const newIndex = clamp(minIndex, toIndex > -1 ? toIndex : maxIndex, maxIndex);
-    if (newIndex !== oldIndex) {
-      if (oldIndex > -1) {
-        this._children.splice(oldIndex, 1);
-      }
-      child.setParent(this);
-      if (newIndex > -1 && newIndex < this._children.length) {
-        this._children.splice(newIndex, 0, child);
+      node.setParent(this);
+      if (toIndex > -1 && toIndex < toArray.length) {
+        toArray.splice(toIndex, 0, node);
       } else {
-        this._children.push(child);
+        toArray.push(node);
       }
-      if (oldIndex > -1) {
-        this.emit("moveChild", child, newIndex, oldIndex);
+      if (fromIndex > -1) {
+        this.emit("moveChild", node, toIndex, fromIndex);
       } else {
-        this.emit("appendChild", child);
+        this.emit("appendChild", node);
       }
     }
+    node.internalMode = internalMode;
     return this;
   }
   removeChild(child) {
-    const index = child.getIndex(true);
+    const index = child.getIndex();
     if (this.is(child.parent) && index > -1) {
-      this._children.splice(index, 1);
+      this._children.internal.splice(index, 1);
       child.setParent(void 0);
       this.emit("removeChild", child, index);
     }
     return child;
   }
   removeChildren() {
-    this.getChildren().forEach((child) => this.removeChild(child));
+    this._children.forEach((child) => this.removeChild(child));
   }
   remove() {
     this._parent?.removeChild(this);
   }
   forEachChild(callbackfn) {
-    this.getChildren().forEach(callbackfn);
+    this._children.forEach(callbackfn);
     return this;
   }
   forEachDescendant(callbackfn) {
-    this.getChildren().forEach((child) => {
+    this._children.forEach((child) => {
       callbackfn(child);
       child.forEachDescendant(callbackfn);
     });
@@ -6109,18 +6102,14 @@ let Node = class extends CoreObject {
   clone() {
     return new this.constructor(
       this.toJSON().props,
-      this.getChildren(true)
+      this._children.internal
     );
   }
   toJSON() {
     return {
       tag: this.tag,
-      props: {
-        name: this.name,
-        ...super.toJSON()
-      },
-      meta: Object.fromEntries(this._meta.entries()),
-      children: this.getChildren().map((child) => child.toJSON())
+      props: super.toJSON(),
+      children: [...this._children.map((child) => child.toJSON())]
     };
   }
   static parse(JSON) {
@@ -6135,7 +6124,7 @@ let Node = class extends CoreObject {
   }
 };
 __decorateClass$R([
-  protectedProperty()
+  property()
 ], Node.prototype, "name", 2);
 __decorateClass$R([
   property()
@@ -6152,6 +6141,9 @@ __decorateClass$R([
 __decorateClass$R([
   property({ default: "default" })
 ], Node.prototype, "internalMode", 2);
+__decorateClass$R([
+  property({ default: () => ({}) })
+], Node.prototype, "meta", 2);
 Node = __decorateClass$R([
   customNode("Node")
 ], Node);
@@ -6940,7 +6932,7 @@ void main(void) {
 }`
 }));
 __decorateClass$L([
-  property({ default: [] })
+  property({ default: () => [] })
 ], ColorOverlayEffect.prototype, "colors", 2);
 __decorateClass$L([
   property({ default: 0.5 })
@@ -7025,7 +7017,7 @@ void main(void) {
 }`
 }));
 __decorateClass$K([
-  property({ default: [] })
+  property({ default: () => [] })
 ], ColorRemoveEffect.prototype, "colors", 2);
 __decorateClass$K([
   property({ default: 0.5 })
@@ -7667,7 +7659,7 @@ class SceneTree extends MainLoop {
   }
   free() {
     super.free();
-    this.root.getChildren(true).forEach((node) => this.root.removeChild(node));
+    this.root.children.internal.forEach((node) => this.root.removeChild(node));
     this.input.removeEventListeners();
   }
 }
@@ -8393,7 +8385,7 @@ __decorateClass$A([
   property({ default: true })
 ], GodrayEffect.prototype, "parallel", 2);
 __decorateClass$A([
-  property({ default: [0, 0] })
+  property({ default: () => [0, 0] })
 ], GodrayEffect.prototype, "center", 2);
 __decorateClass$A([
   property({ default: 1 })
@@ -8968,7 +8960,9 @@ class BaseElement2DFill extends CoreObject {
     return super.setProperties(properties);
   }
   setProperties(properties) {
-    return this._setProperties(isNone(properties) ? void 0 : normalizeFill(properties));
+    return this._setProperties(
+      isNone(properties) ? void 0 : normalizeFill(properties)
+    );
   }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
@@ -9099,7 +9093,9 @@ var __decorateClass$t = (decorators, target, key, kind) => {
 };
 class BaseElement2DBackground extends BaseElement2DFill {
   setProperties(properties) {
-    return super._setProperties(isNone(properties) ? void 0 : normalizeBackground(properties));
+    return super._setProperties(
+      isNone(properties) ? void 0 : normalizeBackground(properties)
+    );
   }
 }
 __decorateClass$t([
@@ -9117,7 +9113,9 @@ var __decorateClass$s = (decorators, target, key, kind) => {
 };
 class BaseElement2DForeground extends BaseElement2DFill {
   setProperties(properties) {
-    return super._setProperties(isNone(properties) ? void 0 : normalizeForeground(properties));
+    return super._setProperties(
+      isNone(properties) ? void 0 : normalizeForeground(properties)
+    );
   }
 }
 __decorateClass$s([
@@ -9135,7 +9133,9 @@ var __decorateClass$r = (decorators, target, key, kind) => {
 };
 class BaseElement2DOutline extends BaseElement2DFill {
   setProperties(properties) {
-    return super._setProperties(isNone(properties) ? void 0 : normalizeOutline(properties));
+    return super._setProperties(
+      isNone(properties) ? void 0 : normalizeOutline(properties)
+    );
   }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
@@ -9185,7 +9185,9 @@ class BaseElement2DShadow extends CoreObject {
     this.parent = parent;
   }
   setProperties(properties) {
-    return super.setProperties(isNone(properties) ? void 0 : normalizeShadow(properties));
+    return super.setProperties(
+      isNone(properties) ? void 0 : normalizeShadow(properties)
+    );
   }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
@@ -9244,7 +9246,9 @@ class BaseElement2DShape extends CoreObject {
   }
   _path2DSet = new Path2DSet();
   setProperties(properties) {
-    return super.setProperties(isNone(properties) ? void 0 : normalizeShape(properties));
+    return super.setProperties(
+      isNone(properties) ? void 0 : normalizeShape(properties)
+    );
   }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
@@ -9309,10 +9313,10 @@ __decorateClass$p([
   property()
 ], BaseElement2DShape.prototype, "svg");
 __decorateClass$p([
-  property({ default: [0, 0, 1, 1] })
+  property({ default: () => [0, 0, 1, 1] })
 ], BaseElement2DShape.prototype, "viewBox");
 __decorateClass$p([
-  property({ default: [] })
+  property({ default: () => [] })
 ], BaseElement2DShape.prototype, "data");
 
 class BaseElement2DStyle extends Resource {
@@ -9353,7 +9357,9 @@ class BaseElement2DText extends CoreObject {
   baseText = new Text();
   measureResult;
   setProperties(properties) {
-    return super.setProperties(isNone(properties) ? void 0 : normalizeText(properties));
+    return super.setProperties(
+      isNone(properties) ? void 0 : normalizeText(properties)
+    );
   }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
@@ -9538,49 +9544,49 @@ let BaseElement2D = class extends Node2D {
     return this._background;
   }
   set background(value) {
-    this._background.setProperties(value);
+    this._background.resetProperties().setProperties(value);
   }
   _shape = new BaseElement2DShape(this);
   get shape() {
     return this._shape;
   }
   set shape(value) {
-    this._shape.setProperties(value);
+    this._shape.resetProperties().setProperties(value);
   }
   _fill = new BaseElement2DFill(this);
   get fill() {
     return this._fill;
   }
   set fill(value) {
-    this._fill.setProperties(value);
+    this._fill.resetProperties().setProperties(value);
   }
   _outline = new BaseElement2DOutline(this);
   get outline() {
     return this._outline;
   }
   set outline(value) {
-    this._outline.setProperties(value);
+    this._outline.resetProperties().setProperties(value);
   }
   _foreground = new BaseElement2DForeground(this);
   get foreground() {
     return this._foreground;
   }
   set foreground(value) {
-    this._foreground.setProperties(value);
+    this._foreground.resetProperties().setProperties(value);
   }
   _text = new BaseElement2DText(this);
   get text() {
     return this._text;
   }
   set text(value) {
-    this._text.setProperties(value);
+    this._text.resetProperties().setProperties(value);
   }
   _shadow = new BaseElement2DShadow(this);
   get shadow() {
     return this._shadow;
   }
   set shadow(value) {
-    this._shadow.setProperties(value);
+    this._shadow.resetProperties().setProperties(value);
   }
   constructor(properties, nodes = []) {
     super();
@@ -10690,7 +10696,7 @@ let Text2D = class extends TextureRect2D {
     }
   }
   _getSubTexts() {
-    return this.getChildren("front").filter((node) => node instanceof Text2D);
+    return this.children.front.filter((node) => node instanceof Text2D);
   }
   _updateSubTexts() {
     const subTexts = this._getSubTexts();
@@ -10726,7 +10732,7 @@ let Text2D = class extends TextureRect2D {
   }
   _updateSplit() {
     if (this._subTextsCount) {
-      this.getChildren("front").forEach((child) => this.removeChild(child));
+      this.children.front.forEach((child) => this.removeChild(child));
       this._subTextsCount = 0;
     }
     if (this.split) {
@@ -10760,7 +10766,7 @@ let Text2D = class extends TextureRect2D {
   }
   _drawContent() {
     if (!this.split) {
-      const onText2DRender = this.getChildren()?.find((child) => "onText2DRender" in child)?.onText2DRender;
+      const onText2DRender = this.children?.find((child) => "onText2DRender" in child)?.onText2DRender;
       if (onText2DRender) {
         onText2DRender();
       } else {
@@ -11019,7 +11025,7 @@ let Animation = class extends TimelineNode {
     let targets;
     switch (this.effectMode) {
       case "sibling":
-        targets = this.getParent()?.getChildren(true).filter((val) => val instanceof CanvasItem) ?? [];
+        targets = this.getParent()?.children.internal.filter((val) => val instanceof CanvasItem) ?? [];
         break;
       case "parent":
       default:
@@ -11250,7 +11256,7 @@ __decorateClass$d([
   property({ default: false })
 ], Animation.prototype, "loop", 2);
 __decorateClass$d([
-  property({ default: [] })
+  property({ default: () => [] })
 ], Animation.prototype, "keyframes", 2);
 __decorateClass$d([
   property()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.4.43",
+  "version": "0.4.45",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",