libpag 4.5.1 → 4.5.2

package/src/wechat/pag-file.ts

@@ -1,8 +1,7 @@
 import { PAGFile as NativePAGFile } from '../pag-file';
-import { destroyVerify, wasmAwaitRewind } from '../utils/decorators';
+import { destroyVerify } from '../utils/decorators';
 
 @destroyVerify
-@wasmAwaitRewind
 export class PAGFile extends NativePAGFile {
   public static async load(data: ArrayBuffer) {
     return PAGFile.loadFromBuffer(data);

package/src/wechat/pag-image.ts

@@ -1,9 +1,7 @@
 import { ArrayBufferImage } from '@tgfx/wechat/array-buffer-image';
 import { PAGImage as NativePAGImage } from '../pag-image';
 import { PAGModule } from '../pag-module';
-import { wasmAwaitRewind } from '../utils/decorators';
 
-@wasmAwaitRewind
 export class PAGImage extends NativePAGImage {
   /**
    * Create pag image from ArrayBuffer.

package/src/wechat/pag-view.ts

@@ -3,7 +3,7 @@ import { PAGView as NativePAGView } from '../pag-view';
 
 import { RenderCanvas } from '../core/render-canvas';
 import { BackendContext } from '../core/backend-context';
-import { destroyVerify, wasmAwaitRewind } from '../utils/decorators';
+import { destroyVerify } from '../utils/decorators';
 
 import type { PAGComposition } from '../pag-composition';
 import type { wx } from './interfaces';
@@ -35,7 +35,6 @@ function isOffscreenCanvas(canvas: any): boolean {
 }
 
 @destroyVerify
-@wasmAwaitRewind
 export class PAGView extends NativePAGView {
   /**
    * Create pag view.

package/types/third_party/tgfx/web/src/core/path-rasterizer.d.ts

@@ -0,0 +1,4 @@
+import { ctor } from '../types';
+export declare class PathRasterizer {
+    static readPixels(width: number, height: number, path: Path2D, fillType: ctor): Uint8Array;
+}

package/types/third_party/tgfx/web/src/core/scaler-context.d.ts

@@ -1,8 +1,10 @@
-import type { Rect } from '../types';
+import { ctor, Rect } from '../types';
 export declare class ScalerContext {
     static canvas: HTMLCanvasElement | OffscreenCanvas;
     static context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D;
     private static hasMeasureBoundsAPI;
+    static getLineCap(cap: ctor): CanvasLineCap;
+    static getLineJoin(join: ctor): CanvasLineJoin;
     static setCanvas(canvas: HTMLCanvasElement | OffscreenCanvas): void;
     static setContext(context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D): void;
     static isUnicodePropertyEscapeSupported(): boolean;
@@ -23,7 +25,12 @@ export declare class ScalerContext {
     };
     getBounds(text: string, fauxBold: boolean, fauxItalic: boolean): Rect;
     getAdvance(text: string): number;
-    generateImage(text: string, bounds: Rect): HTMLCanvasElement | OffscreenCanvas;
+    readPixels(text: string, bounds: Rect, fauxBold: boolean, stroke?: {
+        width: number;
+        cap: ctor;
+        join: ctor;
+        miterLimit: number;
+    }): Uint8Array;
     protected loadCanvas(): void;
     private measureText;
 }

package/types/third_party/tgfx/web/src/utils/decorators.d.ts

@@ -1,3 +1 @@
-export declare function wasmAwaitRewind(constructor: any): void;
-export declare function wasmAsyncMethod(target: any, propertyKey: string, descriptor: PropertyDescriptor): void;
 export declare function destroyVerify(constructor: any): void;

package/types/web/src/core/video-reader.d.ts

@@ -1,6 +1,6 @@
 import type { TimeRange, VideoReader as VideoReaderInterfaces } from '../interfaces';
 export declare class VideoReader {
-    static create(source: Uint8Array | HTMLVideoElement, width: number, height: number, frameRate: number, staticTimeRanges: TimeRange[]): Promise<VideoReaderInterfaces>;
+    static create(source: Uint8Array | HTMLVideoElement, width: number, height: number, frameRate: number, staticTimeRanges: TimeRange[]): VideoReaderInterfaces;
     isSought: boolean;
     isPlaying: boolean;
     bitmap: ImageBitmap | null;
@@ -15,10 +15,11 @@ export declare class VideoReader {
     private height;
     private bitmapCanvas;
     private bitmapCtx;
-    constructor(source: Uint8Array | HTMLVideoElement, width: number, height: number, frameRate: number, staticTimeRanges: TimeRange[], isWorker?: boolean);
+    private currentFrame;
+    constructor(source: Uint8Array | HTMLVideoElement, width: number, height: number, frameRate: number, staticTimeRanges: TimeRange[]);
     prepare(targetFrame: number, playbackRate: number): Promise<void>;
+    getCurrentFrame(): number;
     getVideo(): HTMLVideoElement;
-    generateBitmap(): Promise<ImageBitmap>;
     play(): Promise<void>;
     pause(): void;
     stop(): void;

package/types/web/src/interfaces.d.ts

@@ -1,5 +1,4 @@
-import type { WebFont } from '@tgfx/core/web-mask';
-import type { ctor, Point, Rect, Vector } from './types';
+import type { ctor, Rect } from './types';
 export interface TimeRange {
     start: number;
     end: number;
@@ -21,26 +20,20 @@ export interface FontMetrics {
     xHeight: number;
     capHeight: number;
 }
+export interface Stroke {
+    width: number;
+    cap: ctor;
+    join: ctor;
+    miterLimit: number;
+}
 export interface ScalerContext {
     fontString: (fauxBold: boolean, fauxItalic: boolean) => string;
     getAdvance: (text: string) => number;
     getBounds: (text: string, fauxBold: boolean, fauxItalic: boolean) => Rect;
     getFontMetrics: () => FontMetrics;
-    generateImage: (text: string, bounds: Rect) => TexImageSource | OffscreenCanvas;
+    readPixels: (text: string, bounds: Rect, fauxBold: boolean, stroke?: Stroke) => Uint8Array | null;
 }
 export interface ScalerContextConstructor {
     isEmoji: (text: string) => boolean;
     new (fontName: string, fontStyle: string, size: number, fauxBold: boolean, fauxItalic: boolean): ScalerContext;
 }
-export interface WebMask {
-    fillPath: (path: Path2D, fillType: ctor) => void;
-    fillText: (webFont: WebFont, texts: Vector<string>, positions: Vector<Point>, matrixWasmIns: any) => void;
-    strokeText: (webFont: WebFont, stroke: {
-        width: number;
-        cap: ctor;
-        join: ctor;
-        miterLimit: number;
-    }, texts: Vector<string>, positions: Vector<Point>, matrixWasmIns: any) => void;
-    clear: () => void;
-}
-export type WebMaskConstructor = new (canvas: HTMLCanvasElement | OffscreenCanvas) => WebMask;

package/types/web/src/pag-composition.d.ts

@@ -1,5 +1,5 @@
 import { PAGLayer } from './pag-layer';
-import type { Marker } from './types';
+import { type Marker, VecArray } from './types';
 export declare class PAGComposition extends PAGLayer {
     /**
      * Make a empty PAGComposition with specified size.
@@ -91,10 +91,10 @@ export declare class PAGComposition extends PAGLayer {
     /**
      * Returns an array of layers that match the specified layer name.
      */
-    getLayersByName(layerName: string): import("@tgfx/types").Vector<import("./pag-image-layer").PAGImageLayer | PAGLayer | import("./pag-solid-layer").PAGSolidLayer | import("./pag-text-layer").PAGTextLayer>;
+    getLayersByName(layerName: string): VecArray;
     /**
      * Returns an array of layers that lie under the specified point. The point is in pixels and from
      * this PAGComposition's local coordinates.
      */
-    getLayersUnderPoint(localX: number, localY: number): import("@tgfx/types").Vector<import("./pag-image-layer").PAGImageLayer | PAGLayer | import("./pag-solid-layer").PAGSolidLayer | import("./pag-text-layer").PAGTextLayer>;
+    getLayersUnderPoint(localX: number, localY: number): VecArray;
 }

package/types/web/src/pag-file.d.ts

@@ -1,6 +1,6 @@
 import { PAGComposition } from './pag-composition';
 import type { PAGImage } from './pag-image';
-import { LayerType, PAGTimeStretchMode, TextDocument } from './types';
+import { LayerType, PAGTimeStretchMode, TextDocument, VecArray } from './types';
 export declare class PAGFile extends PAGComposition {
     /**
      * Load pag file from file.
@@ -49,7 +49,7 @@ export declare class PAGFile extends PAGComposition {
     /**
      * Return an array of layers by specified editable index and layer type.
      */
-    getLayersByEditableIndex(editableIndex: Number, layerType: LayerType): import("@tgfx/types").Vector<import("./pag-image-layer").PAGImageLayer | import("./pag-layer").PAGLayer | import("./pag-solid-layer").PAGSolidLayer | import("./pag-text-layer").PAGTextLayer>;
+    getLayersByEditableIndex(editableIndex: Number, layerType: LayerType): VecArray;
     /**
      * Returns the indices of the editable layers in this PAGFile.
      * If the editableIndex of a PAGLayer is not present in the returned indices, the PAGLayer should
@@ -71,8 +71,8 @@ export declare class PAGFile extends PAGComposition {
      */
     setDuration(duration: number): void;
     /**
-     * Set the duration of this PAGFile. Passing a value less than or equal to 0 resets the duration
-     * to its default value.
+     * Make a copy of the original file, any modification to current file has no effect on the result
+     * file.
      */
     copyOriginal(): PAGFile;
 }

package/types/web/src/pag-player.d.ts

@@ -2,7 +2,7 @@ import { PAGSurface } from './pag-surface';
 import { Matrix } from './core/matrix';
 import { PAGComposition } from './pag-composition';
 import type { PAGLayer } from './pag-layer';
-import type { PAGScaleMode, Rect } from './types';
+import { PAGScaleMode, Rect, VecArray } from './types';
 import type { VideoReader } from './interfaces';
 export declare class PAGPlayer {
     static create(): PAGPlayer;
@@ -140,7 +140,7 @@ export declare class PAGPlayer {
      *
      * this PAGComposition's local coordinates.
      */
-    getLayersUnderPoint(localX: number, localY: number): import("@tgfx/types").Vector<import("./pag-image-layer").PAGImageLayer | PAGLayer | import("./pag-solid-layer").PAGSolidLayer | import("./pag-text-layer").PAGTextLayer>;
+    getLayersUnderPoint(localX: number, localY: number): VecArray;
     /**
      * Evaluates the PAGLayer to see if it overlaps or intersects with the specified point. The point
      *

package/types/web/src/pag-view.d.ts

@@ -182,7 +182,7 @@ export declare class PAGView {
      * will be set to PAGScaleMode::None when this method is called.
      */
     setMatrix(matrix: Matrix): void;
-    getLayersUnderPoint(localX: number, localY: number): import("@tgfx/types").Vector<import("./pag-image-layer").PAGImageLayer | import("./pag-layer").PAGLayer | import("./pag-solid-layer").PAGSolidLayer | import("./pag-text-layer").PAGTextLayer>;
+    getLayersUnderPoint(localX: number, localY: number): import("./types").VecArray;
     /**
      * Update size when changed canvas size.
      */

package/types/web/src/types.d.ts

@@ -15,8 +15,8 @@ import { PAGImageLayer } from './pag-image-layer';
 import { PAGSolidLayer } from './pag-solid-layer';
 import { Matrix as ClassMatrix } from './core/matrix';
 import { RenderCanvas } from './core/render-canvas';
-import type { ScalerContextConstructor, VideoDecoderConstructor, WebMaskConstructor } from './interfaces';
-import type { ArrayBufferImage } from '@tgfx//wechat/array-buffer-image';
+import type { ScalerContextConstructor, VideoDecoderConstructor } from './interfaces';
+import type { ArrayBufferImage } from '@tgfx/wechat/array-buffer-image';
 import type { TGFXPathFillType, TGFXLineCap, TGFXLineJoin, EmscriptenGL, ctor, Point, Vector, Rect } from '@tgfx/types';
 export type { EmscriptenGL, ctor, Point, Vector, Rect };
 declare global {
@@ -81,7 +81,6 @@ export interface PAG extends EmscriptenModule {
     PAGTextLayer: typeof PAGTextLayer;
     PAGImageLayer: typeof PAGImageLayer;
     PAGSolidLayer: typeof PAGSolidLayer;
-    WebMask: WebMaskConstructor;
     ScalerContext: ScalerContextConstructor;
     VideoReader: VideoDecoderConstructor;
     GlobalCanvas: typeof GlobalCanvas;
@@ -468,3 +467,13 @@ export declare class SoftwareDecoder {
 export declare class SoftwareDecoderFactory {
     createSoftwareDecoder(pag: PAG): SoftwareDecoder | null;
 }
+export declare class VecArray extends Array {
+    private isDeleted;
+    private constructor();
+    static create(): VecArray;
+    get(index: number): any;
+    push_back(value: any): void;
+    size(): number;
+    delete(): void;
+    private ensureNotDeleted;
+}

package/types/web/src/utils/decorators.d.ts

@@ -1,3 +1 @@
-export declare function wasmAwaitRewind(constructor: any): void;
-export declare function wasmAsyncMethod(target: any, propertyKey: string, descriptor: PropertyDescriptor): void;
 export declare function destroyVerify(constructor: any): void;

package/types/web/src/utils/ua.d.ts

@@ -4,4 +4,3 @@ export declare const MACOS: boolean;
 export declare const IPHONE: boolean;
 export declare const WECHAT: boolean;
 export declare const SAFARI_OR_IOS_WEBVIEW: boolean;
-export declare const WORKER: boolean;

package/types/web/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "lib": ["ES5", "ES6", "DOM", "DOM.Iterable"],
+    "target": "ES2020",
+    "allowJs": true,
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "moduleResolution": "Node",
+    "experimentalDecorators": true,
+    "strict": true,
+    "outDir": "./lib",
+    "baseUrl": ".", 
+    "paths": {
+      "@tgfx/*": ["../third_party/tgfx/web/src/*"],
+    },
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*.ts", "demo/**/*.ts"]
+}