modern-canvas 0.4.32 → 0.4.34

package/dist/index.cjs

@@ -561,7 +561,17 @@ class CoreObject extends EventEmitter {
     }
   }
   toJSON() {
-    return this.getProperties(Array.from(this._changedProperties));
+    const json = {};
+    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();
+      } else {
+        json[key] = value;
+      }
+    }
+    return json;
   }
   clone() {
     return new this.constructor(this.toJSON());
@@ -1064,27 +1074,7 @@ class Color {
     return this._value;
   }
   set value(value) {
-    if (value === void 0 || this._value === value)
-      return;
-    this._value = value;
-    let input;
-    if (typeof value === "number") {
-      input = {
-        r: value >> 24 & 255,
-        g: value >> 16 & 255,
-        b: value >> 8 & 255,
-        a: (value & 255) / 255
-      };
-    } else {
-      input = value;
-    }
-    const parsed = colord.colord(input);
-    if (parsed.isValid()) {
-      this._colord = parsed;
-    } else {
-      this._colord = colord.colord("#000000");
-      console.warn(`Unable to convert color ${value}`);
-    }
+    this._colord = modernIdoc.parseColor(value ?? "none");
   }
   get r8() {
     return this._colord.rgba.r;
@@ -9214,12 +9204,6 @@ __decorateClass$q([
 __decorateClass$q([
   property({ default: "solid" })
 ], BaseElement2DOutline.prototype, "style");
-__decorateClass$q([
-  property()
-], BaseElement2DOutline.prototype, "src");
-__decorateClass$q([
-  property({ default: 1 })
-], BaseElement2DOutline.prototype, "opacity");
 
 var __defProp$i = Object.defineProperty;
 var __decorateClass$p = (decorators, target, key, kind) => {
@@ -9808,13 +9792,15 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
     return {
       ...json,
       props: {
+        ...json.props,
         style: this.style.toJSON(),
-        text: this.text.toJSON(),
+        background: this.background.toJSON(),
         geometry: this.geometry.toJSON(),
         fill: this.fill.toJSON(),
         outline: this.outline.toJSON(),
-        shadow: this.shadow.toJSON(),
-        ...json.props
+        text: this.text.toJSON(),
+        foreground: this.foreground.toJSON(),
+        shadow: this.shadow.toJSON()
       }
     };
   }

package/dist/index.d.cts

@@ -1,7 +1,8 @@
 import { Font } from 'modern-font';
 import { AnimationItem } from 'lottie-web';
-import { AnyColor, Colord } from 'colord';
-import { FillDeclaration, FillProperty, BackgroundDeclaration, BackgroundProperty, ForegroundDeclaration, ForegroundProperty, GeometryPathDeclaration, GeometryProperty, OutlineDeclaration, OutlineProperty, ShadowDeclaration, ShadowProperty, StyleDeclaration, TextProperty, StyleProperty, TextureFillSourceRect } from 'modern-idoc';
+import { Colord } from 'colord';
+import { Color as Color$1, FillDeclaration, FillProperty, BackgroundDeclaration, BackgroundProperty, ForegroundDeclaration, ForegroundProperty, GeometryPathDeclaration, GeometryProperty, OutlineDeclaration, OutlineProperty, ShadowDeclaration, ShadowProperty, StyleDeclaration, TextProperty, StyleProperty, TextureFillSourceRect } from 'modern-idoc';
+export { Color as ColorValue } from 'modern-idoc';
 import { Path2D, LineCap, LineJoin, LineStyle, Path2DSet } from 'modern-path2d';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
 import { Node as Node$1, Direction } from 'yoga-layout/load';
@@ -300,12 +301,11 @@ interface Resource {
 declare class Resource extends RefCounted {
 }
 
-type ColorValue = number | AnyColor;
 declare class Color {
     protected _colord: Colord;
-    protected _value: ColorValue;
-    get value(): ColorValue;
-    set value(value: ColorValue | undefined);
+    protected _value: Color$1;
+    get value(): Color$1;
+    set value(value: Color$1 | undefined);
     get r8(): number;
     get g8(): number;
     get b8(): number;
@@ -317,7 +317,7 @@ declare class Color {
     get rgb(): number;
     get bgr(): number;
     get abgr(): number;
-    constructor(value?: ColorValue);
+    constructor(value?: Color$1);
     toArgb(alpha?: number, applyToRGB?: boolean): number;
     toHex(): string;
     toArray(): [number, number, number, number];
@@ -1331,7 +1331,7 @@ declare class CanvasTexture extends Texture2D<HTMLCanvasElement> {
 }
 
 declare class ColorTexture extends Texture2D {
-    constructor(value: ColorValue);
+    constructor(value: Color$1);
 }
 
 interface ImageTextureOptions {
@@ -1426,8 +1426,8 @@ interface FillDraw extends Partial<CanvasBatchable> {
 }
 declare class CanvasContext extends Path2D {
     textureTransform?: Transform2D;
-    fillStyle?: ColorValue | Texture2D;
-    strokeStyle?: ColorValue | Texture2D;
+    fillStyle?: Color$1 | Texture2D;
+    strokeStyle?: Color$1 | Texture2D;
     lineCap?: LineCap;
     lineJoin?: LineJoin;
     lineWidth?: number;
@@ -1555,7 +1555,7 @@ interface SceneTree {
 }
 declare class SceneTree extends MainLoop {
     processPaused: boolean;
-    backgroundColor?: ColorValue;
+    backgroundColor?: Color$1;
     debug: boolean;
     readonly input: Input;
     readonly renderStack: RenderStack;
@@ -1743,7 +1743,7 @@ declare class TimelineNode extends Node {
 }
 
 interface CanvasItemProperties extends TimelineNodeProperties {
-    modulate: ColorValue;
+    modulate: Color$1;
     blendMode: WebGLBlendMode;
 }
 interface CanvasItemEventMap extends TimelineNodeEventMap {
@@ -1756,7 +1756,7 @@ interface CanvasItem {
     emit: (<K extends keyof CanvasItemEventMap>(type: K, ...args: Parameters<CanvasItemEventMap[K]>) => boolean) & ((type: string, ...args: any[]) => boolean);
 }
 declare class CanvasItem extends TimelineNode {
-    modulate?: ColorValue;
+    modulate?: Color$1;
     blendMode?: WebGLBlendMode;
     visible: boolean;
     opacity: number;
@@ -1938,8 +1938,6 @@ declare class BaseElement2DOutline extends CoreObject {
     color: OutlineDeclaration['color'];
     width: OutlineDeclaration['width'];
     style: OutlineDeclaration['style'];
-    src?: OutlineDeclaration['src'];
-    opacity: OutlineDeclaration['opacity'];
     constructor(parent: BaseElement2D);
     setProperties(properties?: OutlineProperty): this;
     protected _updateProperty(key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
@@ -1994,7 +1992,7 @@ interface BaseElement2DEventMap extends CanvasItemEventMap {
     updateStyleProperty: (key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration) => void;
 }
 interface BaseElement2DProperties extends Node2DProperties {
-    modulate: ColorValue;
+    modulate: Color$1;
     blendMode: WebGLBlendMode;
     style: StyleProperty;
     background: BackgroundProperty;
@@ -2154,8 +2152,8 @@ declare class Graphics2D extends Node2D {
     protected _resetContext: boolean;
     lineCap?: LineCap;
     lineJoin?: LineJoin;
-    fillStyle?: ColorValue | Texture2D;
-    strokeStyle?: ColorValue | Texture2D;
+    fillStyle?: Color$1 | Texture2D;
+    strokeStyle?: Color$1 | Texture2D;
     lineWidth?: number;
     miterLimit?: number;
     rect: (x: number, y: number, width: number, height: number) => this;
@@ -2708,12 +2706,12 @@ declare class ColorFilterEffect extends Effect {
 }
 
 interface ColorOverlayEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     alpha: number;
 }
 declare class ColorOverlayEffect extends Effect {
     static material: Material;
-    colors: ColorValue[];
+    colors: Color$1[];
     alpha: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorOverlayEffectProperties>, children?: Node[]);
@@ -2721,12 +2719,12 @@ declare class ColorOverlayEffect extends Effect {
 }
 
 interface ColorRemoveEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
 }
 declare class ColorRemoveEffect extends Effect {
     static material: Material;
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorRemoveEffectProperties>, children?: Node[]);
@@ -2734,12 +2732,12 @@ declare class ColorRemoveEffect extends Effect {
 }
 
 interface ColorReplaceEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
 }
 declare class ColorReplaceEffect extends Effect {
     static material: Material;
-    colors: ColorValue[][];
+    colors: Color$1[][];
     epsilon: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorReplaceEffectProperties>, children?: Node[]);
@@ -2760,7 +2758,7 @@ declare class GaussianBlurEffect extends Effect {
 }
 
 interface DropShadowEffectProperties extends EffectProperties {
-    color: ColorValue;
+    color: Color$1;
     blur: number;
     offsetX: number;
     offsetY: number;
@@ -2768,7 +2766,7 @@ interface DropShadowEffectProperties extends EffectProperties {
 }
 declare class DropShadowEffect extends Effect {
     static material: Material;
-    color: ColorValue;
+    color: Color$1;
     blur: number;
     offsetX: number;
     offsetY: number;
@@ -2879,7 +2877,7 @@ declare class MaskEffect extends Effect {
 }
 
 interface OutlineEffectProperties extends EffectProperties {
-    color: ColorValue;
+    color: Color$1;
     width: number;
     style: 'dashed' | 'solid' | string;
     image?: string;
@@ -2892,7 +2890,7 @@ declare class OutlineEffect extends Effect {
     static MIN_SAMPLES: number;
     static MAX_SAMPLES: number;
     static getAngleStep(quality: number): number;
-    color: ColorValue;
+    color: Color$1;
     width: number;
     style: 'dashed' | 'solid' | string;
     image?: string;
@@ -3190,7 +3188,7 @@ interface EngineOptions extends WebGLContextAttributes {
     width?: number;
     height?: number;
     pixelRatio?: number;
-    backgroundColor?: ColorValue;
+    backgroundColor?: Color$1;
     autoResize?: boolean;
     autoStart?: boolean;
     timeline?: Timeline;
@@ -3257,4 +3255,4 @@ interface RenderOptions {
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
 export { AnimatedTexture, Animation, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, BaseElement2D, BaseElement2DBackground, BaseElement2DFill, BaseElement2DForeground, BaseElement2DGeometry, BaseElement2DOutline, BaseElement2DShadow, BaseElement2DStyle, BaseElement2DText, CanvasContext, CanvasItem, CanvasItemEditor, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, Control, CoreObject, DEG_TO_RAD, DEVICE_PIXEL_RATIO, DropShadowEffect, Effect, EffectMaterial, Element2D, Element2DStyle, EmbossEffect, Engine, EventEmitter, FlexElement2D, FlexElement2DStyle, FlexLayout, FontLoader, GIFLoader, GaussianBlurEffect, Geometry, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, IN_BROWSER, Image2D, ImageTexture, IndexBuffer, Input, InputEvent, JSONLoader, KawaseBlurEffect, KawaseTransition, LeftEraseTransition, Loader, Lottie2D, LottieLoader, MainLoop, MaskEffect, Material, Matrix, Matrix2, Matrix3, Matrix4, MouseInputEvent, Node, Node2D, OutlineEffect, PI, PI_2, PixelateEffect, PixelsTexture, PointerInputEvent, Projection2D, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, RawWeakMap, Rect2, RefCounted, Renderer, Resource, Ruler, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, Scaler, SceneTree, ScrollBar, Text2D, TextLoader, Texture2D, TextureLoader, TextureRect2D, Ticker, TiltShiftTransition, Timeline, TimelineNode, Transform2D, TransformRect2D, Transition, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, VertexAttribute, VertexBuffer, Video2D, VideoLoader, VideoTexture, Viewport, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, WebGLBufferModule, WebGLFramebufferModule, WebGLMaskModule, WebGLModule, WebGLProgramModule, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, WebGLTextureModule, WebGLVertexArrayModule, WebGLViewportModule, WebSound, WheelInputEvent, XScrollBar, YScrollBar, ZoomBlurEffect, assets, clamp, clampFrag, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, frag, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };
-export type { AnimationEffectMode, AnimationProperties, AssetHandler, AudioWaveformProperties, BaseElement2DEventMap, BaseElement2DProperties, BaseElement2DStyleProperties, Batchable2D, CSSFilterKey, CSSFilters, CanvasBatchable, CanvasItemEventMap, CanvasItemProperties, ColorAdjustEffectProperties, ColorFilterEffectProperties, ColorOverlayEffectProperties, ColorRemoveEffectProperties, ColorReplaceEffectProperties, ColorValue, ComputedLayout, ControlEventMap, ControlProperties, CoreObjectEventMap, CssFunction, CssFunctionArg, Cursor, DropShadowEffectProperties, Easing, EffectContext, EffectMode, EffectProperties, Element2DEventMap, Element2DProperties, Element2DStyleProperties, EmbossEffectProperties, EngineOptions, EventListener, EventListenerOptions, EventListenerValue, FillDraw, FlexBaseElement2DEventMap, FlexElement2DProperties, FlexElement2DStyleProperties, GaussianBlurEffectProperties, GeometryOptions, GlitchEffectProperties, GodrayEffectProperties, IAudioContext, IAudioNode, IPlayOptions, Image2DProperties, ImageFrame, ImageTextureOptions, IndexBufferOptions, InputEventKey, InputEventMap, InternalMode, KawaseBlurEffectProperties, Keyframe, Lottie2DProperties, MainLoopEventMap, MaskColor, MaskData, MaskEffectProperties, MaskObject, MaskRect, Maskable, MaterialOptions, MatrixLike, MatrixOperateOutput, Node2DProperties, NodeEventMap, NodeProperties, NormalizedKeyframe, OutlineEffectProperties, PixelateEffectProperties, PlatformAudio, PlatformSound, ProcessMode, ProcessSortMode, PropertyDeclaration, RangeProperties, Rectangulable, RectangulableEventMap, RefCountedEventMap, RenderMode, RenderOptions, Renderable, ResourceEventMap, RulerProperties, ScalerEventMap, ScalerProperties, SceneTreeEventMap, ScrollBarProperties, StrokeDraw, Text2DEventMap, Text2DProperties, Texture2DFilterMode, Texture2DPixelsSource, Texture2DSource, Texture2DWrapMode, TextureRect2DProperties, TimelineEventMap, TimelineNodeEventMap, TimelineNodeProperties, TimelineProperties, TimingFunctions, Transform2DObject, TransformRect2DProperties, TransitionProperties, VectorLike, VectorOperateOutput, VertexAttributeOptions, VertexBufferOptions, Video2DProperties, VideoTextureOptions, VideoTextureSource, ViewportEventMap, ViewportFramebuffer, WebGLBufferMeta, WebGLBufferOptions, WebGLBufferTarget, WebGLBufferUsage, WebGLDrawMode, WebGLDrawOptions, WebGLExtensions, WebGLFramebufferMeta, WebGLFramebufferOptions, WebGLProgramMeta, WebGLProgramOptions, WebGLTarget, WebGLTextureFilterMode, WebGLTextureLocation, WebGLTextureMeta, WebGLTextureOptions, WebGLTextureSource, WebGLTextureTarget, WebGLTextureWrapMode, WebGLVertexArrayObjectMeta, WebGLVertexArrayObjectOptions, WebGLVertexAttrib, WebGLVertexAttribType, WebGLViewport, XScrollBarProperties, YScrollBarProperties, ZoomBlurEffectProperties };
+export type { AnimationEffectMode, AnimationProperties, AssetHandler, AudioWaveformProperties, BaseElement2DEventMap, BaseElement2DProperties, BaseElement2DStyleProperties, Batchable2D, CSSFilterKey, CSSFilters, CanvasBatchable, CanvasItemEventMap, CanvasItemProperties, ColorAdjustEffectProperties, ColorFilterEffectProperties, ColorOverlayEffectProperties, ColorRemoveEffectProperties, ColorReplaceEffectProperties, ComputedLayout, ControlEventMap, ControlProperties, CoreObjectEventMap, CssFunction, CssFunctionArg, Cursor, DropShadowEffectProperties, Easing, EffectContext, EffectMode, EffectProperties, Element2DEventMap, Element2DProperties, Element2DStyleProperties, EmbossEffectProperties, EngineOptions, EventListener, EventListenerOptions, EventListenerValue, FillDraw, FlexBaseElement2DEventMap, FlexElement2DProperties, FlexElement2DStyleProperties, GaussianBlurEffectProperties, GeometryOptions, GlitchEffectProperties, GodrayEffectProperties, IAudioContext, IAudioNode, IPlayOptions, Image2DProperties, ImageFrame, ImageTextureOptions, IndexBufferOptions, InputEventKey, InputEventMap, InternalMode, KawaseBlurEffectProperties, Keyframe, Lottie2DProperties, MainLoopEventMap, MaskColor, MaskData, MaskEffectProperties, MaskObject, MaskRect, Maskable, MaterialOptions, MatrixLike, MatrixOperateOutput, Node2DProperties, NodeEventMap, NodeProperties, NormalizedKeyframe, OutlineEffectProperties, PixelateEffectProperties, PlatformAudio, PlatformSound, ProcessMode, ProcessSortMode, PropertyDeclaration, RangeProperties, Rectangulable, RectangulableEventMap, RefCountedEventMap, RenderMode, RenderOptions, Renderable, ResourceEventMap, RulerProperties, ScalerEventMap, ScalerProperties, SceneTreeEventMap, ScrollBarProperties, StrokeDraw, Text2DEventMap, Text2DProperties, Texture2DFilterMode, Texture2DPixelsSource, Texture2DSource, Texture2DWrapMode, TextureRect2DProperties, TimelineEventMap, TimelineNodeEventMap, TimelineNodeProperties, TimelineProperties, TimingFunctions, Transform2DObject, TransformRect2DProperties, TransitionProperties, VectorLike, VectorOperateOutput, VertexAttributeOptions, VertexBufferOptions, Video2DProperties, VideoTextureOptions, VideoTextureSource, ViewportEventMap, ViewportFramebuffer, WebGLBufferMeta, WebGLBufferOptions, WebGLBufferTarget, WebGLBufferUsage, WebGLDrawMode, WebGLDrawOptions, WebGLExtensions, WebGLFramebufferMeta, WebGLFramebufferOptions, WebGLProgramMeta, WebGLProgramOptions, WebGLTarget, WebGLTextureFilterMode, WebGLTextureLocation, WebGLTextureMeta, WebGLTextureOptions, WebGLTextureSource, WebGLTextureTarget, WebGLTextureWrapMode, WebGLVertexArrayObjectMeta, WebGLVertexArrayObjectOptions, WebGLVertexAttrib, WebGLVertexAttribType, WebGLViewport, XScrollBarProperties, YScrollBarProperties, ZoomBlurEffectProperties };

package/dist/index.d.mts

@@ -1,7 +1,8 @@
 import { Font } from 'modern-font';
 import { AnimationItem } from 'lottie-web';
-import { AnyColor, Colord } from 'colord';
-import { FillDeclaration, FillProperty, BackgroundDeclaration, BackgroundProperty, ForegroundDeclaration, ForegroundProperty, GeometryPathDeclaration, GeometryProperty, OutlineDeclaration, OutlineProperty, ShadowDeclaration, ShadowProperty, StyleDeclaration, TextProperty, StyleProperty, TextureFillSourceRect } from 'modern-idoc';
+import { Colord } from 'colord';
+import { Color as Color$1, FillDeclaration, FillProperty, BackgroundDeclaration, BackgroundProperty, ForegroundDeclaration, ForegroundProperty, GeometryPathDeclaration, GeometryProperty, OutlineDeclaration, OutlineProperty, ShadowDeclaration, ShadowProperty, StyleDeclaration, TextProperty, StyleProperty, TextureFillSourceRect } from 'modern-idoc';
+export { Color as ColorValue } from 'modern-idoc';
 import { Path2D, LineCap, LineJoin, LineStyle, Path2DSet } from 'modern-path2d';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
 import { Node as Node$1, Direction } from 'yoga-layout/load';
@@ -300,12 +301,11 @@ interface Resource {
 declare class Resource extends RefCounted {
 }
 
-type ColorValue = number | AnyColor;
 declare class Color {
     protected _colord: Colord;
-    protected _value: ColorValue;
-    get value(): ColorValue;
-    set value(value: ColorValue | undefined);
+    protected _value: Color$1;
+    get value(): Color$1;
+    set value(value: Color$1 | undefined);
     get r8(): number;
     get g8(): number;
     get b8(): number;
@@ -317,7 +317,7 @@ declare class Color {
     get rgb(): number;
     get bgr(): number;
     get abgr(): number;
-    constructor(value?: ColorValue);
+    constructor(value?: Color$1);
     toArgb(alpha?: number, applyToRGB?: boolean): number;
     toHex(): string;
     toArray(): [number, number, number, number];
@@ -1331,7 +1331,7 @@ declare class CanvasTexture extends Texture2D<HTMLCanvasElement> {
 }
 
 declare class ColorTexture extends Texture2D {
-    constructor(value: ColorValue);
+    constructor(value: Color$1);
 }
 
 interface ImageTextureOptions {
@@ -1426,8 +1426,8 @@ interface FillDraw extends Partial<CanvasBatchable> {
 }
 declare class CanvasContext extends Path2D {
     textureTransform?: Transform2D;
-    fillStyle?: ColorValue | Texture2D;
-    strokeStyle?: ColorValue | Texture2D;
+    fillStyle?: Color$1 | Texture2D;
+    strokeStyle?: Color$1 | Texture2D;
     lineCap?: LineCap;
     lineJoin?: LineJoin;
     lineWidth?: number;
@@ -1555,7 +1555,7 @@ interface SceneTree {
 }
 declare class SceneTree extends MainLoop {
     processPaused: boolean;
-    backgroundColor?: ColorValue;
+    backgroundColor?: Color$1;
     debug: boolean;
     readonly input: Input;
     readonly renderStack: RenderStack;
@@ -1743,7 +1743,7 @@ declare class TimelineNode extends Node {
 }
 
 interface CanvasItemProperties extends TimelineNodeProperties {
-    modulate: ColorValue;
+    modulate: Color$1;
     blendMode: WebGLBlendMode;
 }
 interface CanvasItemEventMap extends TimelineNodeEventMap {
@@ -1756,7 +1756,7 @@ interface CanvasItem {
     emit: (<K extends keyof CanvasItemEventMap>(type: K, ...args: Parameters<CanvasItemEventMap[K]>) => boolean) & ((type: string, ...args: any[]) => boolean);
 }
 declare class CanvasItem extends TimelineNode {
-    modulate?: ColorValue;
+    modulate?: Color$1;
     blendMode?: WebGLBlendMode;
     visible: boolean;
     opacity: number;
@@ -1938,8 +1938,6 @@ declare class BaseElement2DOutline extends CoreObject {
     color: OutlineDeclaration['color'];
     width: OutlineDeclaration['width'];
     style: OutlineDeclaration['style'];
-    src?: OutlineDeclaration['src'];
-    opacity: OutlineDeclaration['opacity'];
     constructor(parent: BaseElement2D);
     setProperties(properties?: OutlineProperty): this;
     protected _updateProperty(key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
@@ -1994,7 +1992,7 @@ interface BaseElement2DEventMap extends CanvasItemEventMap {
     updateStyleProperty: (key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration) => void;
 }
 interface BaseElement2DProperties extends Node2DProperties {
-    modulate: ColorValue;
+    modulate: Color$1;
     blendMode: WebGLBlendMode;
     style: StyleProperty;
     background: BackgroundProperty;
@@ -2154,8 +2152,8 @@ declare class Graphics2D extends Node2D {
     protected _resetContext: boolean;
     lineCap?: LineCap;
     lineJoin?: LineJoin;
-    fillStyle?: ColorValue | Texture2D;
-    strokeStyle?: ColorValue | Texture2D;
+    fillStyle?: Color$1 | Texture2D;
+    strokeStyle?: Color$1 | Texture2D;
     lineWidth?: number;
     miterLimit?: number;
     rect: (x: number, y: number, width: number, height: number) => this;
@@ -2708,12 +2706,12 @@ declare class ColorFilterEffect extends Effect {
 }
 
 interface ColorOverlayEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     alpha: number;
 }
 declare class ColorOverlayEffect extends Effect {
     static material: Material;
-    colors: ColorValue[];
+    colors: Color$1[];
     alpha: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorOverlayEffectProperties>, children?: Node[]);
@@ -2721,12 +2719,12 @@ declare class ColorOverlayEffect extends Effect {
 }
 
 interface ColorRemoveEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
 }
 declare class ColorRemoveEffect extends Effect {
     static material: Material;
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorRemoveEffectProperties>, children?: Node[]);
@@ -2734,12 +2732,12 @@ declare class ColorRemoveEffect extends Effect {
 }
 
 interface ColorReplaceEffectProperties extends EffectProperties {
-    colors: ColorValue[];
+    colors: Color$1[];
     epsilon: number;
 }
 declare class ColorReplaceEffect extends Effect {
     static material: Material;
-    colors: ColorValue[][];
+    colors: Color$1[][];
     epsilon: number;
     protected _color: Color;
     constructor(properties?: Partial<ColorReplaceEffectProperties>, children?: Node[]);
@@ -2760,7 +2758,7 @@ declare class GaussianBlurEffect extends Effect {
 }
 
 interface DropShadowEffectProperties extends EffectProperties {
-    color: ColorValue;
+    color: Color$1;
     blur: number;
     offsetX: number;
     offsetY: number;
@@ -2768,7 +2766,7 @@ interface DropShadowEffectProperties extends EffectProperties {
 }
 declare class DropShadowEffect extends Effect {
     static material: Material;
-    color: ColorValue;
+    color: Color$1;
     blur: number;
     offsetX: number;
     offsetY: number;
@@ -2879,7 +2877,7 @@ declare class MaskEffect extends Effect {
 }
 
 interface OutlineEffectProperties extends EffectProperties {
-    color: ColorValue;
+    color: Color$1;
     width: number;
     style: 'dashed' | 'solid' | string;
     image?: string;
@@ -2892,7 +2890,7 @@ declare class OutlineEffect extends Effect {
     static MIN_SAMPLES: number;
     static MAX_SAMPLES: number;
     static getAngleStep(quality: number): number;
-    color: ColorValue;
+    color: Color$1;
     width: number;
     style: 'dashed' | 'solid' | string;
     image?: string;
@@ -3190,7 +3188,7 @@ interface EngineOptions extends WebGLContextAttributes {
     width?: number;
     height?: number;
     pixelRatio?: number;
-    backgroundColor?: ColorValue;
+    backgroundColor?: Color$1;
     autoResize?: boolean;
     autoStart?: boolean;
     timeline?: Timeline;
@@ -3257,4 +3255,4 @@ interface RenderOptions {
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
 export { AnimatedTexture, Animation, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, BaseElement2D, BaseElement2DBackground, BaseElement2DFill, BaseElement2DForeground, BaseElement2DGeometry, BaseElement2DOutline, BaseElement2DShadow, BaseElement2DStyle, BaseElement2DText, CanvasContext, CanvasItem, CanvasItemEditor, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, Control, CoreObject, DEG_TO_RAD, DEVICE_PIXEL_RATIO, DropShadowEffect, Effect, EffectMaterial, Element2D, Element2DStyle, EmbossEffect, Engine, EventEmitter, FlexElement2D, FlexElement2DStyle, FlexLayout, FontLoader, GIFLoader, GaussianBlurEffect, Geometry, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, IN_BROWSER, Image2D, ImageTexture, IndexBuffer, Input, InputEvent, JSONLoader, KawaseBlurEffect, KawaseTransition, LeftEraseTransition, Loader, Lottie2D, LottieLoader, MainLoop, MaskEffect, Material, Matrix, Matrix2, Matrix3, Matrix4, MouseInputEvent, Node, Node2D, OutlineEffect, PI, PI_2, PixelateEffect, PixelsTexture, PointerInputEvent, Projection2D, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, RawWeakMap, Rect2, RefCounted, Renderer, Resource, Ruler, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, Scaler, SceneTree, ScrollBar, Text2D, TextLoader, Texture2D, TextureLoader, TextureRect2D, Ticker, TiltShiftTransition, Timeline, TimelineNode, Transform2D, TransformRect2D, Transition, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, VertexAttribute, VertexBuffer, Video2D, VideoLoader, VideoTexture, Viewport, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, WebGLBufferModule, WebGLFramebufferModule, WebGLMaskModule, WebGLModule, WebGLProgramModule, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, WebGLTextureModule, WebGLVertexArrayModule, WebGLViewportModule, WebSound, WheelInputEvent, XScrollBar, YScrollBar, ZoomBlurEffect, assets, clamp, clampFrag, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, frag, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };
-export type { AnimationEffectMode, AnimationProperties, AssetHandler, AudioWaveformProperties, BaseElement2DEventMap, BaseElement2DProperties, BaseElement2DStyleProperties, Batchable2D, CSSFilterKey, CSSFilters, CanvasBatchable, CanvasItemEventMap, CanvasItemProperties, ColorAdjustEffectProperties, ColorFilterEffectProperties, ColorOverlayEffectProperties, ColorRemoveEffectProperties, ColorReplaceEffectProperties, ColorValue, ComputedLayout, ControlEventMap, ControlProperties, CoreObjectEventMap, CssFunction, CssFunctionArg, Cursor, DropShadowEffectProperties, Easing, EffectContext, EffectMode, EffectProperties, Element2DEventMap, Element2DProperties, Element2DStyleProperties, EmbossEffectProperties, EngineOptions, EventListener, EventListenerOptions, EventListenerValue, FillDraw, FlexBaseElement2DEventMap, FlexElement2DProperties, FlexElement2DStyleProperties, GaussianBlurEffectProperties, GeometryOptions, GlitchEffectProperties, GodrayEffectProperties, IAudioContext, IAudioNode, IPlayOptions, Image2DProperties, ImageFrame, ImageTextureOptions, IndexBufferOptions, InputEventKey, InputEventMap, InternalMode, KawaseBlurEffectProperties, Keyframe, Lottie2DProperties, MainLoopEventMap, MaskColor, MaskData, MaskEffectProperties, MaskObject, MaskRect, Maskable, MaterialOptions, MatrixLike, MatrixOperateOutput, Node2DProperties, NodeEventMap, NodeProperties, NormalizedKeyframe, OutlineEffectProperties, PixelateEffectProperties, PlatformAudio, PlatformSound, ProcessMode, ProcessSortMode, PropertyDeclaration, RangeProperties, Rectangulable, RectangulableEventMap, RefCountedEventMap, RenderMode, RenderOptions, Renderable, ResourceEventMap, RulerProperties, ScalerEventMap, ScalerProperties, SceneTreeEventMap, ScrollBarProperties, StrokeDraw, Text2DEventMap, Text2DProperties, Texture2DFilterMode, Texture2DPixelsSource, Texture2DSource, Texture2DWrapMode, TextureRect2DProperties, TimelineEventMap, TimelineNodeEventMap, TimelineNodeProperties, TimelineProperties, TimingFunctions, Transform2DObject, TransformRect2DProperties, TransitionProperties, VectorLike, VectorOperateOutput, VertexAttributeOptions, VertexBufferOptions, Video2DProperties, VideoTextureOptions, VideoTextureSource, ViewportEventMap, ViewportFramebuffer, WebGLBufferMeta, WebGLBufferOptions, WebGLBufferTarget, WebGLBufferUsage, WebGLDrawMode, WebGLDrawOptions, WebGLExtensions, WebGLFramebufferMeta, WebGLFramebufferOptions, WebGLProgramMeta, WebGLProgramOptions, WebGLTarget, WebGLTextureFilterMode, WebGLTextureLocation, WebGLTextureMeta, WebGLTextureOptions, WebGLTextureSource, WebGLTextureTarget, WebGLTextureWrapMode, WebGLVertexArrayObjectMeta, WebGLVertexArrayObjectOptions, WebGLVertexAttrib, WebGLVertexAttribType, WebGLViewport, XScrollBarProperties, YScrollBarProperties, ZoomBlurEffectProperties };
+export type { AnimationEffectMode, AnimationProperties, AssetHandler, AudioWaveformProperties, BaseElement2DEventMap, BaseElement2DProperties, BaseElement2DStyleProperties, Batchable2D, CSSFilterKey, CSSFilters, CanvasBatchable, CanvasItemEventMap, CanvasItemProperties, ColorAdjustEffectProperties, ColorFilterEffectProperties, ColorOverlayEffectProperties, ColorRemoveEffectProperties, ColorReplaceEffectProperties, ComputedLayout, ControlEventMap, ControlProperties, CoreObjectEventMap, CssFunction, CssFunctionArg, Cursor, DropShadowEffectProperties, Easing, EffectContext, EffectMode, EffectProperties, Element2DEventMap, Element2DProperties, Element2DStyleProperties, EmbossEffectProperties, EngineOptions, EventListener, EventListenerOptions, EventListenerValue, FillDraw, FlexBaseElement2DEventMap, FlexElement2DProperties, FlexElement2DStyleProperties, GaussianBlurEffectProperties, GeometryOptions, GlitchEffectProperties, GodrayEffectProperties, IAudioContext, IAudioNode, IPlayOptions, Image2DProperties, ImageFrame, ImageTextureOptions, IndexBufferOptions, InputEventKey, InputEventMap, InternalMode, KawaseBlurEffectProperties, Keyframe, Lottie2DProperties, MainLoopEventMap, MaskColor, MaskData, MaskEffectProperties, MaskObject, MaskRect, Maskable, MaterialOptions, MatrixLike, MatrixOperateOutput, Node2DProperties, NodeEventMap, NodeProperties, NormalizedKeyframe, OutlineEffectProperties, PixelateEffectProperties, PlatformAudio, PlatformSound, ProcessMode, ProcessSortMode, PropertyDeclaration, RangeProperties, Rectangulable, RectangulableEventMap, RefCountedEventMap, RenderMode, RenderOptions, Renderable, ResourceEventMap, RulerProperties, ScalerEventMap, ScalerProperties, SceneTreeEventMap, ScrollBarProperties, StrokeDraw, Text2DEventMap, Text2DProperties, Texture2DFilterMode, Texture2DPixelsSource, Texture2DSource, Texture2DWrapMode, TextureRect2DProperties, TimelineEventMap, TimelineNodeEventMap, TimelineNodeProperties, TimelineProperties, TimingFunctions, Transform2DObject, TransformRect2DProperties, TransitionProperties, VectorLike, VectorOperateOutput, VertexAttributeOptions, VertexBufferOptions, Video2DProperties, VideoTextureOptions, VideoTextureSource, ViewportEventMap, ViewportFramebuffer, WebGLBufferMeta, WebGLBufferOptions, WebGLBufferTarget, WebGLBufferUsage, WebGLDrawMode, WebGLDrawOptions, WebGLExtensions, WebGLFramebufferMeta, WebGLFramebufferOptions, WebGLProgramMeta, WebGLProgramOptions, WebGLTarget, WebGLTextureFilterMode, WebGLTextureLocation, WebGLTextureMeta, WebGLTextureOptions, WebGLTextureSource, WebGLTextureTarget, WebGLTextureWrapMode, WebGLVertexArrayObjectMeta, WebGLVertexArrayObjectOptions, WebGLVertexAttrib, WebGLVertexAttribType, WebGLViewport, XScrollBarProperties, YScrollBarProperties, ZoomBlurEffectProperties };