@leafer/interface 1.0.0-beta.9 → 1.0.0-rc.10

package/src/file/IExport.ts

@@ -0,0 +1,24 @@
+import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { IBoundsData } from '../math/IMath'
+
+
+export interface IExportOptions {
+    quality?: number
+    blob?: boolean
+    scale?: number
+    pixelRatio?: number
+    slice?: boolean
+    trim?: boolean
+    fill?: string
+    screenshot?: IBoundsData | boolean
+}
+
+export interface IExportResult {
+    data: ILeaferCanvas | IBlob | string | boolean
+    renderBounds?: IBoundsData
+    trimBounds?: IBoundsData
+}
+
+export interface IExportResultFunction {
+    (data: IExportResult): void
+}

package/src/file/IFileType.ts

@@ -1,2 +1,2 @@
 export type IExportImageType = 'jpg' | 'png' | 'webp'
-export type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json'
+export type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json'

package/src/function/IFunction.ts

@@ -10,4 +10,13 @@ export interface INumberFunction {
 
 export interface IPointDataFunction {
     (...arg: any): IPointData
+}
+
+
+export interface IAttrDecorator {
+    (...arg: any): IAttrDecoratorInner
+}
+
+interface IAttrDecoratorInner {
+    (target: any, key: string): any
 }

package/src/image/IImageManager.ts

@@ -1,10 +1,21 @@
 import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
 import { ITaskProcessor } from '../task/ITaskProcessor'
-import { IFunction } from '../function/IFunction'
+import { IExportFileType } from '../file/IFileType'
+
+interface ILeaferImageMap {
+    [name: string]: ILeaferImage
+}
 
 export interface IImageManager {
+    map: ILeaferImageMap
+    recycledList: ILeaferImage[]
     tasker: ITaskProcessor
+    patternTasker: ITaskProcessor
+    readonly isComplete: boolean
     get(config: ILeaferImageConfig): ILeaferImage
-    load(image: ILeaferImage, onSuccess: IFunction, onError: IFunction): void
+    recycle(image: ILeaferImage): void
+    clearRecycled(): void
+    hasOpacityPixel(config: ILeaferImageConfig): boolean // png / svg / webp
+    isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean
     destroy(): void
 }

package/src/image/ILeaferImage.ts

@@ -1,8 +1,13 @@
+import { ICanvasPattern } from '../canvas/ICanvas'
 import { IObject } from '../data/IData'
+import { InnerId } from '../event/IEventer'
+import { IExportFileType } from '../file/IFileType'
+import { IMatrixData } from '../math/IMath'
 
 export interface ILeaferImageConfig {
     url: string
     thumb?: string
+    format?: IExportFileType
 }
 
 export interface ILeaferImageOnLoaded {
@@ -13,13 +18,39 @@ export interface ILeaferImageOnError {
     (error?: string | IObject, image?: ILeaferImage): any
 }
 
+export interface ILeaferImageCacheCanvas {
+    data: IObject
+    params: IArguments
+}
+
+export interface ILeaferImagePatternPaint {
+    transform: IMatrixData
+}
+
 export interface ILeaferImage {
+    readonly innerId: InnerId
+    readonly url: string
+
     view: unknown
     width: number
     height: number
+
+    isSVG: boolean
+    hasOpacityPixel: boolean
+
+    readonly completed: boolean
     ready: boolean
-    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): Promise<void>
+    error: IObject
+    loading: boolean
+
+    use: number
+    config: ILeaferImageConfig
+
+    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number
+    unload(index: number, stopEvent?: boolean): void
     getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): unknown
+    getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: IObject): ICanvasPattern
+    destroy(): void
 }
 
 export type IImageStatus = 'wait' | 'thumb-loading' | 'thumb-success' | 'thumb-error' | 'loading' | 'success' | 'error' 

package/src/index.ts

@@ -1,12 +1,12 @@
-export { IApp } from './app/IApp'
-export { ILeafer, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode } from './display/ILeaf'
+export { IAppBase } from './app/IApp'
+export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IAround } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
 
-export { ILeafData, IDataProcessor } from './data/ILeafData'
-export { ILeafLayout, ILayoutLocationType, ILayoutBoundsType } from './layout/ILeafLayout'
+export { ILeafData, IDataProcessor, ILeafDataOptions } from './data/ILeafData'
+export { ILeafLayout, ILocationType, IBoundsType } from './layout/ILeafLayout'
 
 export { ILeafDataProxy, ILeafDataProxyModule } from './display/module/ILeafDataProxy'
 export { ILeafMatrix, ILeafMatrixModule } from './display/module/ILeafMatrix'
@@ -14,19 +14,18 @@ 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 { IBranchRender, IBranchRenderModule } from './display/module/IBranchRender'
 
 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, ISelectorConfig, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
+export { ISelector, ISelectorConfig, ISelectorProxy, IFindMethod, IPickResult, IPickOptions, IAnswer } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
 export { IImageManager } from './image/IImageManager'
 
-export { ITaskProcessor, ITaskProcessorConfig } from './task/ITaskProcessor'
+export { ITaskProcessor, ITaskProcessorConfig, ITaskItem, ITaskOptions } from './task/ITaskProcessor'
 
 
 export { IControl } from './control/IControl'
@@ -34,22 +33,24 @@ export { IPlatform, IMiniapp, IMiniappSelect, IMiniappSizeView } from './platfor
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
-export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType } from './canvas/ISkiaCanvas'
+export { ILeaferCanvas, ILeaferCanvasView, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
+export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
-export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
+export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D, ICanvasPattern } 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, ILeaferImageOnLoaded, ILeaferImageOnError } from './image/ILeaferImage'
+export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError, ILeaferImageCacheCanvas, ILeaferImagePatternPaint } from './image/ILeaferImage'
 export { IExportFileType, IExportImageType } from './file/IFileType'
+export { IExportOptions, IExportResult, IExportResultFunction } from './file/IExport'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode, IMultiTouchData, IKeepTouchData } from './event/IEvent'
+export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, IMultiTouchData, IKeepTouchData } from './event/IEvent'
 export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
+export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/ICursor'
 export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 
 
-export { __Number, __Boolean, __String, __Object, __Value, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, 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, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
-export { IFunction } from './function/IFunction'
+export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
+export { IFunction, IAttrDecorator } from './function/IFunction'

package/src/interaction/ICursor.ts

@@ -0,0 +1,16 @@
+import { ICursorType } from '../display/ILeaf'
+
+
+export interface ICursorTypeMap {
+    [name: string]: ICursorType | ICursorType[]
+}
+
+
+export interface ICursorRotate {
+    rotation?: number
+    data?: string
+}
+
+export interface ICursorRotateMap {
+    [name: string]: ICursorRotate
+}

package/src/interaction/IInteraction.ts

@@ -1,9 +1,9 @@
 import { INumberFunction, IPointDataFunction } from '../function/IFunction'
-import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent } from '../event/IUIEvent'
-import { ILeaf } from '../display/ILeaf'
+import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent, IKeyEvent } from '../event/IUIEvent'
+import { ILeaf, ICursorType } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
 import { IPointData } from '../math/IMath'
-import { ISelector } from '../selector/ISelector'
+import { ISelector, IPickOptions } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
 import { IKeepTouchData } from '../event/IEvent'
@@ -17,21 +17,27 @@ export interface IInteraction extends IControl {
 
     running: boolean
     readonly dragging: boolean
+    readonly isDragEmpty: boolean
+    readonly isHoldRightKey: boolean
+    readonly moveMode: boolean
 
     config: IInteractionConfig
 
+    cursor: ICursorType | ICursorType[]
     readonly hitRadius: number
+
     shrinkCanvasBounds: IBounds
 
     downData: IPointerEvent
+    hoverData: IPointerEvent
     downTime: number
 
     receive(event: any): void
 
-    pointerDown(data: IPointerEvent): void
-    pointerMove(data: IPointerEvent): void
+    pointerDown(data?: IPointerEvent, defaultPath?: boolean): void
+    pointerMove(data?: IPointerEvent): void
     pointerMoveReal(data: IPointerEvent): void
-    pointerUp(data: IPointerEvent): void
+    pointerUp(data?: IPointerEvent): void
     pointerCancel(): void
 
     multiTouch(data: IUIEvent, list: IKeepTouchData[]): void
@@ -40,6 +46,18 @@ export interface IInteraction extends IControl {
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
 
+    keyDown(data: IKeyEvent): void
+    keyUp(data: IKeyEvent): void
+
+    findPath(data: IPointerEvent, options?: IPickOptions): ILeafList
+    isDrag(leaf: ILeaf): boolean
+
+    updateDownData(data?: IPointerEvent, options?: IPickOptions): void
+    updateHoverData(data: IPointerEvent): void
+
+    updateCursor(hoverData?: IPointerEvent): void
+    setCursor(cursor: ICursorType | ICursorType[]): void
+
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
 
@@ -50,6 +68,7 @@ export interface IInteractionCanvas extends ILeaferCanvas {
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
+    cursor?: ICursorConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
@@ -61,13 +80,17 @@ export interface IZoomConfig {
 }
 
 export interface IMoveConfig {
+    holdSpaceKey?: boolean
+    holdMiddleKey?: boolean
+    holdRightKey?: boolean
+    drag?: boolean
     dragEmpty?: boolean
     dragOut?: boolean
     autoDistance?: number
 }
 
 export interface IWheelConfig {
-    zoomMode?: boolean
+    zoomMode?: boolean | 'mouse'
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5
@@ -89,4 +112,9 @@ export interface IPointerConfig {
     swipeDistance?: number
     ignoreMove?: boolean // 性能优化字段, 控制move事件触发次数
     preventDefault?: boolean
+    preventDefaultMenu?: boolean
+}
+
+export interface ICursorConfig {
+    stop?: boolean
 }

package/src/layout/ILeafLayout.ts

@@ -1,16 +1,16 @@
-import { IBoundsData, IMatrixData, IMatrixDecompositionData } from '../math/IMath'
+import { IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILayoutLocationType = 'world' | 'local' | 'inner'
-export type ILayoutBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
+export type ILocationType = 'world' | 'local' | 'inner'
+export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
 
 export interface ILeafLayout {
 
     leaf: ILeaf
 
-    useZoomProxy: boolean
+    proxyZoom: boolean
 
-    // local
+    // inner
 
     boxBounds: IBoundsData    //  | content + padding |
     strokeBounds: IBoundsData  //  | boxBounds + border |  
@@ -23,17 +23,17 @@ export interface ILeafLayout {
     // local
 
     //localBoxBounds: IBoundsData = leaf.__local
-    localStrokeBounds: IBoundsData
-    localRenderBounds: IBoundsData
+    localStrokeBounds?: IBoundsData
+    localRenderBounds?: IBoundsData
 
     // state
+    resized: boolean
+    waitAutoLayout: boolean
 
     // matrix changed
     matrixChanged: boolean // include positionChanged scaleChanged skewChanged
-    positionChanged: boolean // x, y
-    originChanged?: boolean // originX originY
     scaleChanged: boolean // scaleX scaleY
-    rotationChanged: boolean // rotaiton, skewX scaleY 数据更新
+    rotationChanged: boolean // rotaiton, skewX skewY 数据更新
 
     // bounds changed
     boundsChanged: boolean
@@ -55,17 +55,33 @@ export interface ILeafLayout {
     // keep state
     affectScaleOrRotation: boolean
     affectRotation: boolean
+    affectChildrenSort?: boolean
 
     strokeSpread: number
     renderSpread: number
     strokeBoxSpread: number
     renderShapeSpread: number
 
-    checkUpdate(force?: boolean): void
+    // temp local
+    a: number
+    b: number
+    c: number
+    d: number
+    e: number
+    f: number
+    x: number
+    y: number
+    width: number
+    height: number
+
+    createLocal(): void
 
-    getTransform(locationType: ILayoutLocationType): IMatrixData
-    decomposeTransform(locationType: ILayoutLocationType): IMatrixDecompositionData
-    getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData
+    update(): void
+
+    getTransform(relative?: ILocationType | ILeaf): IMatrixData
+    getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData
+    getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData
+    getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[]
 
     // 独立 / 引用 boxBounds
     spreadStroke(): void
@@ -80,13 +96,15 @@ export interface ILeafLayout {
     renderChange(): void
 
     // matrix
-    positionChange(): void
     scaleChange(): void
     rotationChange(): void
+    matrixChange(): void
 
     // face
     surfaceChange(): void
     opacityChange(): void
 
+    childrenSortChange(): void
+
     destroy(): void
 }

package/src/layouter/ILayouter.ts

@@ -34,6 +34,7 @@ export interface ILayouterConfig {
 export interface ILayouter extends IControl {
     target: ILeaf
     layoutedBlocks: ILayoutBlockData[]
+    extraBlock: ILayoutBlockData
 
     totalTimes: number
     times: number
@@ -54,6 +55,8 @@ export interface ILayouter extends IControl {
     partLayout(): void
     fullLayout(): void
 
+    addExtra(leaf: ILeaf): void
+
     createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
     getBlocks(list: ILeafList): ILayoutBlockData[]
     addBlocks(current: ILayoutBlockData[]): void

package/src/math/IMath.ts

@@ -6,21 +6,28 @@ export interface IPointData {
 }
 
 export interface IPoint extends IPointData {
-    set(x?: number, y?: number): void
-    copy(point: IPointData): IPoint
+    set(x?: number | IPointData, y?: number): IPoint
+    get(): IPointData
     clone(): IPoint
 
-    rotate(angle: number, center?: IPointData): IPoint
+    move(x: number, y: number): IPoint
+    scale(scaleX: number, scaleY?: number): IPoint
+    scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IPoint
+    rotate(rotation: number, origin?: IPointData): IPoint
+    rotateOf(origin: IPointData, rotation: number): IPoint
+    getRotation(origin: IPointData, to: IPointData, toOrigin?: IPointData): number
 
     toInnerOf(matrix: IMatrixData, to?: IPointData): IPoint
     toOuterOf(matrix: IMatrixData, to?: IPointData): IPoint
 
-    getCenter(to: IPointData): IPointData
+    getCenter(to: IPointData): IPoint
     getDistance(to: IPointData): number
+    getDistancePoint(to: IPointData, distance: number): IPoint
+
     getAngle(to: IPointData): number
     getAtan2(to: IPointData): number
 
-    reset(): void
+    reset(): IPoint
 }
 
 export interface IRadiusPointData extends IPointData {
@@ -47,31 +54,38 @@ export interface IOffsetBoundsData extends IBoundsData {
     offsetY: number
 }
 
-export interface IBoundsDataHandle {
+export interface IBoundsDataFn {
     (target: any): IBoundsData
 }
 
-export interface IBounds extends IBoundsData {
-    set(x?: number, y?: number, width?: number, height?: number): void
-    copy(bounds: IBoundsData): IBounds
+export interface IBounds extends IBoundsData, ITwoPointBoundsData {
+    set(x?: number | IBoundsData, y?: number, width?: number, height?: number): IBounds
+    get(): IBoundsData
     clone(): IBounds
 
-    scale(scale: number): IBounds
+    move(x: number, y: number): IBounds
+    scale(scaleX: number, scaleY?: number): IBounds
+    scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
+    toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
 
-    spread(size: number): IBounds
+    spread(spreadX: number, spreadY?: number): IBounds
     ceil(): IBounds
+    unsign(): IBounds
+    float(maxLength?: number): 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
+    addList(boundsList: IBoundsData[]): IBounds
+    setList(boundsList: IBoundsData[]): IBounds
+    addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
+    setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
+
+    setPoints(points: IPointData[]): IBounds
+    getPoints(): IPointData[] // topLeft, topRight, bottomRight, bottomLeft
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
-    hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixData): boolean
+    hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixWithLayoutData): boolean
     hit(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
     includes(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
 
@@ -90,12 +104,6 @@ export interface ITwoPointBoundsData {
     maxY: number
 }
 
-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
-}
-
 
 export interface IAutoBoundsData {
     top?: number
@@ -124,17 +132,24 @@ export interface IMatrixData {
     f: number
 }
 
-export interface IMatrixDecompositionData {
-    x: number
-    y: number
+export interface IScaleData {
     scaleX: number
     scaleY: number
+}
+
+export interface IScaleRotationData extends IScaleData {
     rotation: number
+}
+
+export interface ISkewData {
     skewX: number
     skewY: number
 }
 
-export type IMatrixDecompositionAttr =
+export interface ILayoutData extends IScaleRotationData, ISkewData, IPointData {
+}
+
+export type ILayoutAttr =
     | 'x'
     | 'y'
     | 'scaleX'
@@ -143,9 +158,13 @@ export type IMatrixDecompositionAttr =
     | 'skewX'
     | 'skewY'
 
+
+export interface ILayoutBoundsData extends ILayoutData, IBoundsData {
+}
 export interface IMatrix extends IMatrixData {
-    set(a: number, b: number, c: number, d: number, e: number, f: number): void
-    copy(matrix: IMatrixData): IMatrix
+
+    set(a: number | IMatrixData, b: number, c: number, d: number, e: number, f: number): IMatrix
+    get(): IMatrixData
     clone(): IMatrix
 
     translate(x: number, y: number): IMatrix
@@ -163,18 +182,33 @@ export interface IMatrix extends IMatrixData {
     skewOfOuter(origin: IPointData, x: number, y?: number): IMatrix
     skewOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
-    multiply(matrix: IMatrixData): IMatrix
-    divide(matrix: IMatrixData): IMatrix
-    preMultiply(matrix: IMatrixData): IMatrix
+    multiply(child: IMatrixData): IMatrix
+    multiplyParent(parent: IMatrixData): IMatrix
+
+    divide(child: IMatrixData): IMatrix
+    divideParent(parent: IMatrixData): IMatrix
     invert(): IMatrix
 
-    toOuterPoint(inner: IPointData, to?: IPointData): void
-    toInnerPoint(outer: IPointData, to?: IPointData): void
+    toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
+    toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void
+
+    setLayout(data: ILayoutData, origin?: IPointData): IMatrix
+    getLayout(origin?: IPointData, firstSkewY?: boolean): ILayoutData
 
-    decompose(): IMatrixDecompositionData
+    withScale(scaleX?: number, scaleY?: number): IMatrixWithScaleData
 
     reset(): void
 }
 
-
 export interface IMatrixWithBoundsData extends IMatrixData, IBoundsData { }
+
+export interface IMatrixWithScaleData extends IMatrixData, IScaleData { }
+
+export interface IMatrixWithOptionScaleData extends IMatrixData {
+    scaleX?: number
+    scaleY?: number
+}
+
+export interface IMatrixWithBoundsScaleData extends IMatrixData, IBoundsData, IScaleData { }
+
+export interface IMatrixWithLayoutData extends IMatrixData, ILayoutBoundsData { }

package/src/path/IPathDrawer.ts

@@ -33,4 +33,9 @@ export interface IPathCreator {
 
     rect(x: number, y: number, width: number, height: number): IPathCreator
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): IPathCreator
+
+    // new
+    drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
+    drawArc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
+    drawPoints(points: number[], curve?: boolean | number, close?: boolean): IPathCreator
 }