modern-canvas 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -340,7 +340,7 @@ class CoreObject extends EventEmitter {
       this._updatingPromise = this._enqueueUpdate();
     }
   }
-  toPropsJSON() {
+  toJSON() {
     const json = {};
     this._properties.forEach((value, key) => {
       if (value === void 0) {
@@ -358,9 +358,6 @@ class CoreObject extends EventEmitter {
     });
     return json;
   }
-  toJSON() {
-    return this.toPropsJSON();
-  }
   clone() {
     return new this.constructor(this.toJSON());
   }
@@ -5660,6 +5657,7 @@ function getNodeIid(key) {
   return iid;
 }
 exports.Node = class Node extends CoreObject {
+  meta = {};
   _readyed = false;
   constructor(properties, nodes = []) {
     super();
@@ -6009,7 +6007,9 @@ exports.Node = class Node extends CoreObject {
         this._children.back.push(node);
         break;
     }
-    node.internalMode = internalMode;
+    if (node.internalMode !== internalMode) {
+      node.internalMode = internalMode;
+    }
     node.setParent(this);
     this.emit("appendChild", node);
     return node;
@@ -6037,7 +6037,9 @@ exports.Node = class Node extends CoreObject {
         this.emit("appendChild", node);
       }
     }
-    node.internalMode = internalMode;
+    if (node.internalMode !== internalMode) {
+      node.internalMode = internalMode;
+    }
     return this;
   }
   removeChild(child) {
@@ -6100,16 +6102,17 @@ exports.Node = class Node extends CoreObject {
   }
   clone() {
     return new this.constructor(
-      this.toPropsJSON(),
+      this.toJSON(),
       this._children.internal
     );
   }
   toJSON() {
-    return {
+    return modernIdoc.clearUndef({
       ...super.toJSON(),
       is: this.is,
-      children: [...this._children.map((child) => child.toJSON())]
-    };
+      children: this._children.length ? [...this._children.map((child) => child.toJSON())] : void 0,
+      meta: Object.keys(this.meta).length ? { ...this.meta } : void 0
+    });
   }
   static parse(value) {
     if (Array.isArray(value)) {
@@ -6140,9 +6143,6 @@ __decorateClass$Q([
 __decorateClass$Q([
   modernIdoc.property({ fallback: "default" })
 ], exports.Node.prototype, "internalMode", 2);
-__decorateClass$Q([
-  modernIdoc.property({ default: () => ({}) })
-], exports.Node.prototype, "meta", 2);
 __decorateClass$Q([
   modernIdoc.property({ protected: true })
 ], exports.Node.prototype, "mask", 2);
@@ -9314,7 +9314,7 @@ __decorateClass$o([
   modernIdoc.property()
 ], BaseElement2DShape.prototype, "viewBox");
 __decorateClass$o([
-  modernIdoc.property({ default: () => [] })
+  modernIdoc.property()
 ], BaseElement2DShape.prototype, "paths");
 
 class BaseElement2DStyle extends Resource {
@@ -9862,19 +9862,20 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
     }
   }
   toJSON() {
-    return {
-      is: this.is,
-      ...this.toPropsJSON(),
-      children: [...this._children.map((child) => child.toJSON())],
-      style: this.style.toJSON(),
-      background: this.background.toJSON(),
-      shape: this.shape.toJSON(),
-      fill: this.fill.toJSON(),
-      outline: this.outline.toJSON(),
-      text: this.text.toJSON(),
-      foreground: this.foreground.toJSON(),
-      shadow: this.shadow.toJSON()
+    const notEmptyObjectOrUndef = (obj) => {
+      return Object.keys(obj).length > 0 ? obj : void 0;
     };
+    return modernIdoc.clearUndef({
+      ...super.toJSON(),
+      style: notEmptyObjectOrUndef(this.style.toJSON()),
+      background: notEmptyObjectOrUndef(this.background.toJSON()),
+      shape: notEmptyObjectOrUndef(this.shape.toJSON()),
+      fill: notEmptyObjectOrUndef(this.fill.toJSON()),
+      outline: notEmptyObjectOrUndef(this.outline.toJSON()),
+      text: notEmptyObjectOrUndef(this.text.toJSON()),
+      foreground: notEmptyObjectOrUndef(this.foreground.toJSON()),
+      shadow: notEmptyObjectOrUndef(this.shadow.toJSON())
+    });
   }
 };
 exports.BaseElement2D = __decorateClass$l([

package/dist/index.d.cts

@@ -104,7 +104,6 @@ declare class CoreObject extends EventEmitter implements Required<ReactiveObject
     resetProperties(): this;
     onUpdateProperty(key: string, newValue: unknown, oldValue: unknown, declaration: PropertyDeclaration): void;
     requestUpdate(key?: string, newValue?: unknown, oldValue?: unknown, declaration?: PropertyDeclaration): void;
-    toPropsJSON(): Record<string, any>;
     toJSON(): Record<string, any>;
     clone(): this;
     free(): void;
@@ -1644,8 +1643,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
-    meta: Record<string, any>;
     mask?: Maskable;
+    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1965,7 +1964,7 @@ declare class BaseElement2DShape extends CoreObject {
     preset: NormalizedShape['preset'];
     svg: NormalizedShape['svg'];
     viewBox: NormalizedShape['viewBox'];
-    paths: Required<NormalizedShape>['paths'];
+    paths: NormalizedShape['paths'];
     protected _path2DSet: Path2DSet;
     constructor(parent: BaseElement2D);
     setProperties(properties?: Shape): this;

package/dist/index.d.mts

@@ -104,7 +104,6 @@ declare class CoreObject extends EventEmitter implements Required<ReactiveObject
     resetProperties(): this;
     onUpdateProperty(key: string, newValue: unknown, oldValue: unknown, declaration: PropertyDeclaration): void;
     requestUpdate(key?: string, newValue?: unknown, oldValue?: unknown, declaration?: PropertyDeclaration): void;
-    toPropsJSON(): Record<string, any>;
     toJSON(): Record<string, any>;
     clone(): this;
     free(): void;
@@ -1644,8 +1643,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
-    meta: Record<string, any>;
     mask?: Maskable;
+    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1965,7 +1964,7 @@ declare class BaseElement2DShape extends CoreObject {
     preset: NormalizedShape['preset'];
     svg: NormalizedShape['svg'];
     viewBox: NormalizedShape['viewBox'];
-    paths: Required<NormalizedShape>['paths'];
+    paths: NormalizedShape['paths'];
     protected _path2DSet: Path2DSet;
     constructor(parent: BaseElement2D);
     setProperties(properties?: Shape): this;

package/dist/index.d.ts

@@ -104,7 +104,6 @@ declare class CoreObject extends EventEmitter implements Required<ReactiveObject
     resetProperties(): this;
     onUpdateProperty(key: string, newValue: unknown, oldValue: unknown, declaration: PropertyDeclaration): void;
     requestUpdate(key?: string, newValue?: unknown, oldValue?: unknown, declaration?: PropertyDeclaration): void;
-    toPropsJSON(): Record<string, any>;
     toJSON(): Record<string, any>;
     clone(): this;
     free(): void;
@@ -1644,8 +1643,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
-    meta: Record<string, any>;
     mask?: Maskable;
+    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1965,7 +1964,7 @@ declare class BaseElement2DShape extends CoreObject {
     preset: NormalizedShape['preset'];
     svg: NormalizedShape['svg'];
     viewBox: NormalizedShape['viewBox'];
-    paths: Required<NormalizedShape>['paths'];
+    paths: NormalizedShape['paths'];
     protected _path2DSet: Path2DSet;
     constructor(parent: BaseElement2D);
     setProperties(properties?: Shape): this;