@leafer/interface 1.0.0-alpha.9 → 1.0.0-beta

package/src/display/module/ILeafDataProxy.ts

@@ -4,8 +4,7 @@ import { __Value } from '../../data/IData'
 export type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>
 
 export interface ILeafDataProxy {
-    __set?(attrName: string, newValue: __Value): void
-    __get?(attrName: string): __Value
-    __updateAttr?(attrName: string): void
+    __setAttr?(name: string, newValue: __Value): void
+    __getAttr?(name: string): __Value
 }
 

package/src/display/module/ILeafEventer.ts

@@ -9,8 +9,8 @@ export type ILeafEventerModule = ILeafEventer & ThisType<ILeaf>
 export interface ILeafEventer {
     on?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
     off?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    on__?(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
-    off__?(id: IEventListenerId | IEventListenerId[]): void
+    on_?(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
+    off_?(id: IEventListenerId | IEventListenerId[]): void
     once?(type: string | string[], listener: IEventListener, capture?: boolean): void
     emit?(type: string, event?: IEvent | IObject, capture?: boolean): void
     emitEvent?(event?: IEvent, capture?: boolean): void

package/src/display/module/ILeafHit.ts

@@ -1,10 +1,12 @@
 import { IRadiusPointData } from '../../math/IMath'
 import { ILeaf } from '../ILeaf'
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
 
 export type ILeafHitModule = ILeafHit & ThisType<ILeaf>
 
 export interface ILeafHit {
     __hitWorld?(point: IRadiusPointData): boolean
     __hit?(local: IRadiusPointData): boolean
+    __drawHitPath?(canvas: ILeaferCanvas): void
     __updateHitCanvas?(): void
 }

package/src/display/module/ILeafMask.ts

@@ -0,0 +1,11 @@
+import { ILeaf } from '../ILeaf'
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
+
+export type ILeafMaskModule = ILeafMask & ThisType<ILeaf>
+
+export interface ILeafMask {
+    __updateMask?(value?: boolean): void
+    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
+    __removeMask?(child?: ILeaf): void
+}
+

package/src/display/module/ILeafMatrix.ts

@@ -4,5 +4,5 @@ export type ILeafMatrixModule = ILeafMatrix & ThisType<ILeaf>
 
 export interface ILeafMatrix {
     __updateWorldMatrix?(): void
-    __updateRelativeMatrix?(): void
+    __updateLocalMatrix?(): void
 }

package/src/display/module/ILeafRender.ts

@@ -6,11 +6,10 @@ export type ILeafRenderModule = ILeafRender & ThisType<ILeaf>
 
 export interface ILeafRender {
     __render?(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __draw?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    __drawBefore?(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __drawAfter?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __updateWorldOpacity?(): void
     __updateChange?(): void

package/src/event/IEvent.ts

@@ -24,6 +24,10 @@ export interface IEventTarget extends IEventer {
 
 }
 
+export interface ILeaferEvent {
+
+}
+
 export interface IRenderEvent {
 
 }
@@ -52,7 +56,7 @@ export interface IUpdateEvent extends IEvent {
 
 }
 
-export interface IAttrEvent extends IEvent {
+export interface IPropertyEvent extends IEvent {
     readonly attrName: string
     readonly oldValue: unknown
     readonly newValue: unknown
@@ -60,6 +64,7 @@ export interface IAttrEvent extends IEvent {
 
 export interface ILayoutEvent extends IEvent {
     readonly data: ILayoutBlockData[]
+    readonly times: number
 }
 
 export interface IWatchEvent extends IEvent {

package/src/event/IEventer.ts

@@ -32,8 +32,8 @@ export interface IEventer extends ILeafEventer {
 
     on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
     off(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    on__(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
-    off__(id: IEventListenerId | IEventListenerId[]): void
+    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
+    off_(id: IEventListenerId | IEventListenerId[]): void
     once(type: string | string[], listener: IEventListener): void
     emit(type: string, event?: IEvent | IObject, capture?: boolean): void
     emitEvent(event?: IEvent, capture?: boolean): void

package/src/event/IUIEvent.ts

@@ -1,5 +1,7 @@
+import { IObject } from '../data/IData'
 import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
+import { ILeaferImage } from '../image/ILeaferImage'
 
 export interface IUIEvent extends IEvent {
     x: number
@@ -19,6 +21,8 @@ export interface IUIEvent extends IEvent {
     path: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
+    origin: IObject
+
     stopDefault(): void
     stopNow(): void
     stop(): void
@@ -46,6 +50,7 @@ export interface IDragEvent extends IPointerEvent {
 
 export interface IDropEvent extends IPointerEvent {
     list: ILeafList
+    data?: IObject
 }
 
 export interface IRotateEvent extends IUIEvent {
@@ -66,4 +71,9 @@ export interface ISwipeEvent extends IDragEvent {
 
 export interface IKeyEvent extends IUIEvent {
 
+}
+
+export interface IImageEvent extends IEvent {
+    image: ILeaferImage
+    error: string | IObject
 }

package/src/image/IImageManager.ts

@@ -1,3 +1,7 @@
+import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
+
+
 export interface IImageManager {
+    get(config: ILeaferImageConfig): ILeaferImage
     destory(): void
 }

package/src/image/ILeaferImage.ts

@@ -1,8 +1,25 @@
+import { IObject } from '../data/IData'
+
 export interface ILeaferImageConfig {
     url: string
     thumb?: string
 }
 
+export interface ILeaferImageOnLoaded {
+    (image?: ILeaferImage): any
+}
+
+export interface ILeaferImageOnError {
+    (error?: string | IObject, image?: ILeaferImage): any
+}
+
 export interface ILeaferImage {
+    view: unknown
+    width: number
+    height: number
+    ready: boolean
+    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): void
+    getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): unknown
+}
 
-}
+export type IImageStatus = 'wait' | 'thumb-loading' | 'thumb-success' | 'thumb-error' | 'loading' | 'success' | 'error' 

package/src/index.ts

@@ -1,6 +1,6 @@
-export { ISupperLeafer } from './app/ISupperLeafer'
-export { ILeafer, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf } from './display/ILeaf'
+export { IApp } from './app/IApp'
+export { ILeafer, ILeaferType, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -14,35 +14,37 @@ export { ILeafBounds, ILeafBoundsModule } from './display/module/ILeafBounds'
 export { ILeafHit, ILeafHitModule } from './display/module/ILeafHit'
 export { ILeafRender, ILeafRenderModule } from './display/module/ILeafRender'
 export { ILeafEventer, ILeafEventerModule } from './display/module/ILeafEventer'
+export { ILeafMask, ILeafMaskModule } from './display/module/ILeafMask'
 
 export { IRenderer, IRendererConfig, IRenderOptions } from './renderer/IRenderer'
 export { IWatcher, IWatchEventData, IWatcherConfig } from './watcher/IWatcher'
 export { ILayouter, ILayoutChangedData, ILayoutBlockData, ILayouterConfig, IPartLayoutConfig } from './layouter/ILayouter'
-export { ISelector, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
+export { ISelector, ISelectorConfig, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
 export { IImageManager } from './image/IImageManager'
 
 
+export { IControl } from './control/IControl'
 export { IPlatform } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
 export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
-export { IPathDrawer } from './path/IPathDrawer'
+export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
 export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
-export { ILeaferImage, ILeaferImageConfig } from './image/ILeaferImage'
+export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError } from './image/ILeaferImage'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, IAttrEvent, ILayoutEvent, IRenderEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } from './event/IEvent'
-export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent } from './event/IUIEvent'
-export { IInteraction, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
+export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } from './event/IEvent'
+export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
+export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 
 
-export { __Number, __Boolean, __String, __Object, __Value, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { __Number, __Boolean, __String, __Object, __Value, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
-export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataHandle, IOffsetBoundsData, ITwoPointBounds, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData } from './math/IMath'
+export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataHandle, IOffsetBoundsData, ITwoPointBounds, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
 export { IFunction } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -1,20 +1,31 @@
 import { INumberFunction, IPointDataFunction } from '../function/IFunction'
-import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent } from '../event/IUIEvent'
+import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent } from '../event/IUIEvent'
 import { ILeaf } from '../display/ILeaf'
+import { ILeafList } from '../data/IList'
 import { IPointData } from '../math/IMath'
+import { ISelector } from '../selector/ISelector'
+import { IBounds } from '../math/IMath'
+import { IControl } from '../control/IControl'
 
-export interface IInteraction {
+export interface IInteraction extends IControl {
     target: ILeaf
-    config: IInteractionConfig
+    canvas: IInteractionCanvas
+    selector: ISelector
+
     running: boolean
+    readonly dragging: boolean
 
-    pointerMoveIgnore: boolean
+    config: IInteractionConfig
 
-    start(): void
-    stop(): void
+    readonly hitRadius: number
+    shrinkCanvasBounds: IBounds
+
+    downData: IPointerEvent
+    downTime: number
 
     pointerDown(data: IPointerEvent): void
     pointerMove(data: IPointerEvent): void
+    pointerMoveReal(data: IPointerEvent): void
     pointerUp(data: IPointerEvent): void
     pointerCancel(): void
 
@@ -22,13 +33,30 @@ export interface IInteraction {
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
 
-    destroy(): void
+    emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
+}
+
+export interface IInteractionCanvas {
+    bounds: IBounds
+    view: unknown
 }
 
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
+    zoom?: IZoomConfig
+    move?: IMoveConfig
+}
+
+export interface IZoomConfig {
+    min?: number
+    max?: number
+}
 
+export interface IMoveConfig {
+    dragEmpty?: boolean
+    dragOut?: boolean
+    autoDistance?: number
 }
 
 export interface IWheelConfig {
@@ -36,18 +64,22 @@ export interface IWheelConfig {
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5
-    delta?: IPointData
+    delta?: IPointData  // 以chrome为基准, 鼠标滚动一格的距离
     getScale?: INumberFunction
     getMove?: IPointDataFunction
+    preventDefault?: boolean
 }
 
 export interface IPointerConfig {
     hitRadius?: number
     through?: boolean
-    clickTime?: number
+    tapMore?: boolean
+    tapTime?: number
     longPressTime?: number
     transformTime?: number
+    dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number
-    autoMoveDistance?: number
+    ignoreMove?: boolean // 性能优化字段, 控制move事件触发次数
+    preventDefault?: boolean
 }

package/src/layout/ILeafLayout.ts

@@ -1,8 +1,8 @@
-import { IBoundsData, IMatrixData } from '../math/IMath'
+import { IBoundsData, IMatrixData, IMatrixDecompositionData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILayoutLocationType = 'world' | 'relative' | 'local'
-export type ILayoutBoundsType = 'content' | 'box' | 'event' | 'margin' | 'render'
+export type ILayoutLocationType = 'world' | 'local' | 'inner'
+export type ILayoutBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
 
 export interface ILeafLayout {
 
@@ -13,23 +13,23 @@ export interface ILeafLayout {
     // local
 
     boxBounds: IBoundsData    //  | content + padding |
-    eventBounds: IBoundsData  //  | boxBounds + border |  
-    renderBounds: IBoundsData //  | eventBounds + shadow |
+    strokeBounds: IBoundsData  //  | boxBounds + border |  
+    renderBounds: IBoundsData //  | strokeBounds + shadow |
 
     // auto layout
-    marginBounds: IBoundsData //  | eventBounds + margin |
+    marginBounds: IBoundsData //  | strokeBounds + margin |
     contentBounds: IBoundsData // | content |  
 
-    // relative
+    // local
 
-    //relativeBoxBounds: IBoundsData = leaf.__local
-    relativeEventBounds: IBoundsData
-    relativeRenderBounds: IBoundsData
+    //localBoxBounds: IBoundsData = leaf.__local
+    localStrokeBounds: IBoundsData
+    localRenderBounds: IBoundsData
 
     // state
 
     // matrix changed
-    matrixChanged: boolean
+    matrixChanged: boolean // include positionChanged scaleChanged skewChanged
     positionChanged: boolean // x, y
     scaleChanged: boolean // scaleX scaleY
     rotationChanged: boolean // rotaiton, skewX scaleY 数据更新
@@ -37,11 +37,11 @@ export interface ILeafLayout {
     // bounds changed
     boundsChanged: boolean
 
-    boxBoundsChanged: boolean
-    eventBoundsChanged: boolean
-    renderBoundsChanged: boolean
+    boxChanged: boolean
+    strokeChanged: boolean
+    renderChanged: boolean
 
-    localBoxBoundsChanged: boolean // position
+    localBoxChanged: boolean // position
 
     // face changed
     surfaceChanged: boolean
@@ -54,25 +54,29 @@ export interface ILeafLayout {
     // keep state
     affectScaleOrRotation: boolean
     affectRotation: boolean
-    eventBoundsSpreadWidth: number
-    renderBoundsSpreadWidth: number
-    renderShapeBoundsSpreadWidth: number
 
-    update(): void
+    strokeSpread: number
+    renderSpread: number
+    strokeBoxSpread: number
+    renderShapeSpread: number
+
+    checkUpdate(): void
 
-    getTransform(type: ILayoutLocationType): IMatrixData
-    getBounds(type: ILayoutLocationType, boundsType: ILayoutBoundsType): IBoundsData
+    getTransform(locationType: ILayoutLocationType): IMatrixData
+    decomposeTransform(locationType: ILayoutLocationType): IMatrixDecompositionData
+    getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData
 
     // 独立 / 引用 boxBounds
-    eventBoundsSpread(): void
-    renderBoundsSpread(): void
-    eventBoundsSpreadCancel(): void
-    renderBoundsSpreadCancel(): void
+    spreadStroke(): void
+    spreadRender(): void
+    spreadStrokeCancel(): void
+    spreadRenderCancel(): void
 
     // bounds
-    boxBoundsChange(): void
-    eventBoundsChange(): void
-    renderBoundsChange(): void
+    boxChange(): void
+    localBoxChange(): void
+    strokeChange(): void
+    renderChange(): void
 
     // matrix
     positionChange(): void

package/src/layouter/ILayouter.ts

@@ -1,6 +1,7 @@
 import { IBounds } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
+import { IControl } from '../control/IControl'
 
 export interface ILayoutChangedData {
     matrixList: ILeaf[]
@@ -30,23 +31,30 @@ export interface ILayouterConfig {
     partLayout?: IPartLayoutConfig
 }
 
-export interface ILayouter {
+export interface ILayouter extends IControl {
     target: ILeaf
     layoutedBlocks: ILayoutBlockData[]
+
     totalTimes: number
     times: number
-    config: ILayouterConfig
+
+    disabled: boolean
     running: boolean
+    layouting: boolean
 
-    start(): void
-    stop(): void
+    waitAgain: boolean
 
-    createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
-    getBlocks(list: ILeafList): ILayoutBlockData[]
-    setBlocks(current: ILayoutBlockData[]): void
+    config: ILayouterConfig
+
+    disable(): void
 
     layout(): void
+    layoutAgain(): void
+    layoutOnce(): void
     partLayout(): void
     fullLayout(): void
-    destroy(): void
+
+    createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
+    getBlocks(list: ILeafList): ILayoutBlockData[]
+    addBlocks(current: ILayoutBlockData[]): void
 }

package/src/math/IMath.ts

@@ -10,15 +10,17 @@ export interface IPoint extends IPointData {
     copy(point: IPointData): IPoint
     clone(): IPoint
 
-    rotate(angle: number, center?: IPointData): void
+    rotate(angle: number, center?: IPointData): IPoint
 
-    toLocal(matrix: IMatrixData): void
-    toWorld(matrix: IMatrixData): void
+    toInnerOf(matrix: IMatrixData, to?: IPointData): IPoint
+    toOuterOf(matrix: IMatrixData, to?: IPointData): IPoint
 
     getCenter(to: IPointData): IPointData
     getDistance(to: IPointData): number
     getAngle(to: IPointData): number
     getAtan2(to: IPointData): number
+
+    reset(): void
 }
 
 export interface IRadiusPointData extends IPointData {
@@ -54,31 +56,31 @@ export interface IBounds extends IBoundsData {
     copy(bounds: IBoundsData): IBounds
     clone(): IBounds
 
-    timesMatrix(matrix: IMatrixData): IBounds
-    divideMatrix(matrix: IMatrixData): IBounds
+    scale(scale: number): IBounds
+    toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
-    spread(size: number): void
-    ceil(): void
 
-    add(bounds: IBoundsData): void
-    addList(boundsList: IBounds[]): void
-    setByList(boundsList: IBounds[], addMode?: boolean): void
-    addListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle): void
-    setByListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle, addMode: boolean): void
-    setByBoundsTimesMatrix(fromBounds: IBoundsData, fromMatrix: IMatrixData): void
-    setByPoints(points: IPointData[]): void
+    spread(size: number): IBounds
+    ceil(): IBounds
+
+    add(bounds: IBoundsData): IBounds
+    addList(boundsList: IBounds[]): IBounds
+    setByList(boundsList: IBounds[], addMode?: boolean): IBounds
+    addListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle): IBounds
+    setByListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle, addMode: boolean): IBounds
+    setByPoints(points: IPointData[]): IBounds
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
     hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixData): boolean
     hit(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
     includes(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
 
+    intersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): IBounds
     getIntersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): IBounds
-    setByIntersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): void
 
     isSame(bounds: IBoundsData): boolean
     isEmpty(): boolean
-    empty(): void
+    reset(): void
 }
 
 export interface ITwoPointBoundsData {
@@ -90,6 +92,7 @@ export interface ITwoPointBoundsData {
 
 export interface ITwoPointBounds extends ITwoPointBoundsData {
     addPoint(x: number, y: number): void
+    addBounds(x: number, y: number, width: number, height: number): void
     add(pointBounds: ITwoPointBoundsData): void
 }
 
@@ -120,21 +123,57 @@ export interface IMatrixData {
     e: number
     f: number
 }
+
+export interface IMatrixDecompositionData {
+    x: number
+    y: number
+    scaleX: number
+    scaleY: number
+    rotation: number
+    skewX: number
+    skewY: number
+}
+
+export type IMatrixDecompositionAttr =
+    | 'x'
+    | 'y'
+    | 'scaleX'
+    | 'scaleY'
+    | 'rotation'
+    | 'skewX'
+    | 'skewY'
+
 export interface IMatrix extends IMatrixData {
     set(a: number, b: number, c: number, d: number, e: number, f: number): void
     copy(matrix: IMatrixData): IMatrix
     clone(): IMatrix
 
     translate(x: number, y: number): IMatrix
+    translateInner(x: number, y: number): IMatrix
+
     scale(x: number, y?: number): IMatrix
+    scaleOf(center: IPointData, x: number, y?: number): IMatrix
+    scaleOfInner(center: IPointData, x: number, y?: number): IMatrix
+
     rotate(angle: number): IMatrix
+    rotateOf(center: IPointData, angle: number): IMatrix
+    rotateOfInner(center: IPointData, angle: number): IMatrix
+
+    skew(x: number, y?: number): IMatrix
+    skewOf(center: IPointData, x: number, y?: number): IMatrix
+    skewOfInner(center: IPointData, x: number, y?: number): IMatrix
+
+    multiply(matrix: IMatrixData): IMatrix
+    divide(matrix: IMatrixData): IMatrix
+    preMultiply(matrix: IMatrixData): IMatrix
+    invert(): IMatrix
+
+    toOuterPoint(inner: IPointData, to?: IPointData): void
+    toInnerPoint(outer: IPointData, to?: IPointData): void
 
-    times(matrix: IMatrixData): void
-    divide(matrix: IMatrixData): void
-    invert(): void
+    decompose(): IMatrixDecompositionData
 
-    toWorldPoint(local: IPointData, world?: IPointData): void
-    toLocalPoint(world: IPointData, local?: IPointData): void
+    reset(): void
 }
 
 

package/src/path/IPathCommand.ts

@@ -34,14 +34,14 @@ type height = number
 type rotation = number
 type startAngle = number
 type endAngle = number
-type counterclockwise = boolean
+type anticlockwise = boolean
 type cornerRadius = number | number[]
 type radius = number
 
 export type RectCommandData = [Command, x, y, width, height]
 export type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]
-export type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, counterclockwise]
-export type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, counterclockwise]
+export type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]
+export type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]
 export type ArcToCommandData = [Command, x1, y1, x2, y2, radius]