@shopify/react-native-skia 0.1.130 → 0.1.133

package/lib/typescript/src/renderer/processors/Circles.d.ts

@@ -1,4 +1,4 @@
-import type { Vector } from "./math/Vector";
+import type { Skia, Vector } from "../../skia/types";
 interface PointCircleDef {
     c: Vector;
     r: number;
@@ -9,5 +9,5 @@ interface ScalarCircleDef {
     r: number;
 }
 export declare type CircleDef = PointCircleDef | ScalarCircleDef;
-export declare const processCircle: (def: CircleDef) => PointCircleDef;
+export declare const processCircle: (Skia: Skia, def: CircleDef) => PointCircleDef;
 export {};

package/lib/typescript/src/renderer/processors/Clips.d.ts

@@ -1,4 +1,4 @@
-import type { SkCanvas, ClipOp, SkRect, SkRRect } from "../../skia";
+import type { SkCanvas, ClipOp, SkRect, SkRRect, Skia } from "../../skia/types";
 import type { PathDef } from "./Paths";
 export declare type ClipDef = SkRRect | SkRect | PathDef;
-export declare const processClip: (canvas: SkCanvas, def: ClipDef, op: ClipOp) => void;
+export declare const processClip: (Skia: Skia, canvas: SkCanvas, def: ClipDef, op: ClipOp) => void;

package/lib/typescript/src/{skia/core → renderer/processors}/Color.d.ts

@@ -1,7 +1,7 @@
-import type { Color } from "../types";
+import type { Color, Skia } from "../../skia/types";
 export declare const RED = 0;
 export declare const GREEN = 1;
 export declare const BLUE = 2;
 export declare const ALPHA = 3;
 export declare const rgbaColor: (r: number, g: number, b: number, a: number) => Float32Array;
-export declare const processColor: (cl: Color, currentOpacity: number) => Float32Array;
+export declare const processColor: (Skia: Skia, cl: Color, currentOpacity: number) => Float32Array;

package/lib/typescript/src/renderer/processors/Font.d.ts

@@ -1,4 +1,4 @@
-import type { FontMgr, SkFont } from "../../skia";
+import type { SkFontMgr, SkFont, Skia } from "../../skia/types";
 export declare type FontDef = {
     font: SkFont;
 } | {
@@ -8,4 +8,4 @@ export declare type FontDef = {
 export declare const isFont: (fontDef: FontDef) => fontDef is {
     font: SkFont;
 };
-export declare const processFont: (fontMgr: FontMgr, fontDef: FontDef) => SkFont;
+export declare const processFont: (Skia: Skia, fontMgr: SkFontMgr, fontDef: FontDef) => SkFont;

package/lib/typescript/src/renderer/processors/Paint.d.ts

@@ -1,6 +1,6 @@
 import type { ReactNode, RefObject } from "react";
-import { BlendMode, PaintStyle, StrokeJoin, StrokeCap } from "../../skia";
-import type { SkPaint, Color } from "../../skia";
+import { BlendMode, PaintStyle, StrokeJoin, StrokeCap } from "../../skia/types";
+import type { SkPaint, Color, Skia } from "../../skia/types";
 import type { DeclarationResult } from "../nodes";
 export declare type SkEnum<T> = Uncapitalize<keyof T extends string ? keyof T : never>;
 export interface ChildrenProps {
@@ -19,4 +19,4 @@ export interface CustomPaintProps extends ChildrenProps {
     antiAlias?: boolean;
 }
 export declare const enumKey: <K extends string>(k: K) => Capitalize<K>;
-export declare const processPaint: (paint: SkPaint, currentOpacity: number, { paint: paintRef, color, blendMode, style, strokeWidth, strokeJoin, strokeCap, strokeMiter, opacity, antiAlias, }: CustomPaintProps, children: DeclarationResult[]) => SkPaint;
+export declare const processPaint: (Skia: Skia, paint: SkPaint, currentOpacity: number, { paint: paintRef, color, blendMode, style, strokeWidth, strokeJoin, strokeCap, strokeMiter, opacity, antiAlias, }: CustomPaintProps, children: DeclarationResult[]) => SkPaint;

package/lib/typescript/src/renderer/processors/Paths.d.ts

@@ -1,4 +1,4 @@
-import type { SkPath } from "../../skia";
+import type { SkPath, Skia } from "../../skia/types";
 export declare type PathDef = string | SkPath;
-export declare const processPath: (rawPath: PathDef) => SkPath;
+export declare const processPath: (Skia: Skia, rawPath: PathDef) => SkPath;
 export declare const isPathDef: (def: any) => def is PathDef;

package/lib/typescript/src/renderer/processors/Radius.d.ts

@@ -1,3 +1,3 @@
-import type { Vector } from "./math";
+import type { Skia, Vector } from "../../skia/types";
 export declare type Radius = number | Vector;
-export declare const processRadius: (radius: Radius) => Vector;
+export declare const processRadius: (Skia: Skia, radius: Radius) => Vector;

package/lib/typescript/src/renderer/processors/Rects.d.ts

@@ -1,17 +1,6 @@
-import type { SkRect, SkRRect } from "../../skia";
-import type { Vector } from "./math/Vector";
+import type { Skia, SkRect, SkRRect, Vector } from "../../skia/types";
 import type { Radius } from "./Radius";
-export declare const point: (x: number, y: number) => import("../../skia").SkPoint;
-export declare const rect: (x: number, y: number, width: number, height: number) => SkRect;
-export declare const rrect: (r: SkRect, rx: number, ry: number) => SkRRect;
-export declare const bounds: (rects: SkRect[]) => SkRect;
 export declare const isEdge: (pos: Vector, b: SkRect) => boolean;
-export declare const topLeft: (r: SkRect | SkRRect) => import("../../skia").SkPoint;
-export declare const topRight: (r: SkRect | SkRRect) => import("../../skia").SkPoint;
-export declare const bottomLeft: (r: SkRect | SkRRect) => import("../../skia").SkPoint;
-export declare const bottomRight: (r: SkRect | SkRRect) => import("../../skia").SkPoint;
-export declare const center: (r: SkRect | SkRRect) => import("../../skia").SkPoint;
-export declare const isRRect: (def: SkRect | SkRRect) => def is SkRRect;
 export interface RectCtor {
     x: number;
     y: number;
@@ -27,5 +16,5 @@ export declare type RectDef = RectCtor | {
 export declare type RRectDef = RRectCtor | {
     rect: SkRRect;
 };
-export declare const processRect: (def: RectDef) => SkRect;
-export declare const processRRect: (def: RRectDef) => SkRRect;
+export declare const processRect: (Skia: Skia, def: RectDef) => SkRect;
+export declare const processRRect: (Skia: Skia, def: RRectDef) => SkRRect;

package/lib/typescript/src/renderer/processors/Transform.d.ts

@@ -1,13 +1,12 @@
 import type { DrawingContext } from "../DrawingContext";
-import type { SkMatrix } from "../../skia/types";
-import type { Transforms2d, Vector } from "./math";
+import type { SkMatrix, Vector, Transforms2d } from "../../skia/types";
 export interface TransformProps {
     transform?: Transforms2d;
     origin?: Vector;
     matrix?: SkMatrix;
 }
-export declare const processTransform: ({ canvas }: DrawingContext, { transform, origin, matrix }: TransformProps) => void;
-export declare const localMatrix: ({ transform, origin }: TransformProps) => SkMatrix | undefined;
+export declare const processCanvasTransform: ({ canvas, Skia }: DrawingContext, { transform, origin, matrix }: TransformProps) => void;
+export declare const localMatrix: (m: SkMatrix, { transform, origin }: TransformProps) => SkMatrix | undefined;
 export declare const transformOrigin: (origin: Vector, transform: Transforms2d) => (Pick<{
     readonly translateX: number;
     readonly translateY: number;

package/lib/typescript/src/renderer/processors/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./Paint";
 export * from "./Transform";
 export * from "./Animations";
 export * from "./Circles";
@@ -8,3 +7,5 @@ export * from "./Font";
 export * from "./Paths";
 export * from "./Clips";
 export * from "./Radius";
+export * from "./Color";
+export * from "./Paint";

package/lib/typescript/src/renderer/processors/math/Coordinates.d.ts

@@ -1,4 +1,4 @@
-import type { Vector } from "./Vector";
+import type { Vector } from "../../../skia/types";
 export interface PolarPoint {
     theta: number;
     radius: number;

package/lib/typescript/src/renderer/processors/math/Transforms.d.ts

@@ -1,4 +1,4 @@
-import type { Vector } from "./Vector";
+import type { Vector } from "../../../skia/types";
 export declare const rotate: (tr: Vector, origin: Vector, rotation: number) => {
     x: number;
     y: number;

package/lib/typescript/src/renderer/processors/math/index.d.ts

@@ -1,5 +1,3 @@
-export * from "./Vector";
 export * from "./Coordinates";
-export * from "./Matrix3";
 export * from "./Math";
 export * from "./Transforms";

package/lib/typescript/src/renderer/useCanvas.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+import type { Skia } from "../skia/types";
+import type { SkiaValue } from "../values/types";
+interface CanvasContext {
+    Skia: Skia;
+    size: SkiaValue<{
+        width: number;
+        height: number;
+    }>;
+}
+declare const CanvasContext: React.Context<CanvasContext | null>;
+export declare const CanvasProvider: React.Provider<CanvasContext | null>;
+export declare const useCanvas: () => CanvasContext;
+export {};

package/lib/typescript/src/skia/Skia.web.d.ts

@@ -0,0 +1 @@
+export declare const Skia: import("./types").Skia;

package/lib/typescript/src/skia/core/Data.d.ts

@@ -1,5 +1,5 @@
 import type { DependencyList } from "react";
-import type { Data, DataSource } from "../types";
-export declare const useDataCollection: <T>(sources: DataSource[], factory: (data: Data[]) => T, deps?: DependencyList) => T | null;
-export declare const useRawData: <T>(source: DataSource | null | undefined, factory: (data: Data) => T, onError?: ((err: Error) => void) | undefined) => T | null;
-export declare const useData: (source: DataSource | null | undefined, onError?: ((err: Error) => void) | undefined) => Data | null;
+import type { SkData, DataSource } from "../types";
+export declare const useDataCollection: <T>(sources: DataSource[], factory: (data: SkData[]) => T, deps?: DependencyList) => T | null;
+export declare const useRawData: <T>(source: DataSource | null | undefined, factory: (data: SkData) => T, onError?: ((err: Error) => void) | undefined) => T | null;
+export declare const useData: (source: DataSource | null | undefined, onError?: ((err: Error) => void) | undefined) => SkData | null;

package/lib/typescript/src/skia/core/Matrix.d.ts

@@ -0,0 +1,2 @@
+import type { Transforms2d } from "../types";
+export declare const processTransform2d: (transforms: Transforms2d) => import("../types").SkMatrix;

package/lib/typescript/src/skia/core/Paint.d.ts

@@ -1,6 +1,5 @@
 import type { DependencyList } from "react";
 import type { SkPaint } from "../types";
-export declare const SkiaPaint: () => SkPaint;
 /**
  * Returns a Skia Paint object
  * */

package/lib/typescript/src/skia/core/RRect.d.ts

@@ -0,0 +1,2 @@
+import type { SkRect } from "../types";
+export declare const rrect: (r: SkRect, rx: number, ry: number) => import("../types").SkRRect;

package/lib/typescript/src/skia/core/Rect.d.ts

@@ -0,0 +1,8 @@
+import type { SkRect, SkRRect } from "../types";
+export declare const rect: (x: number, y: number, width: number, height: number) => SkRect;
+export declare const bounds: (rects: SkRect[]) => SkRect;
+export declare const topLeft: (r: SkRect | SkRRect) => import("../types").SkPoint;
+export declare const topRight: (r: SkRect | SkRRect) => import("../types").SkPoint;
+export declare const bottomLeft: (r: SkRect | SkRRect) => import("../types").SkPoint;
+export declare const bottomRight: (r: SkRect | SkRRect) => import("../types").SkPoint;
+export declare const center: (r: SkRect | SkRRect) => import("../types").SkPoint;

package/lib/typescript/src/skia/core/Vector.d.ts

@@ -0,0 +1,12 @@
+import type { Vector } from "../types";
+export declare const vec: (x?: number, y?: number | undefined) => import("../types").SkPoint;
+export declare const point: (x?: number, y?: number | undefined) => import("../types").SkPoint;
+export declare const neg: (a: Vector) => import("../types").SkPoint;
+export declare const add: (a: Vector, b: Vector) => import("../types").SkPoint;
+export declare const sub: (a: Vector, b: Vector) => import("../types").SkPoint;
+export declare const dist: (a: Vector, b: Vector) => number;
+export declare const translate: ({ x, y }: Vector) => readonly [{
+    readonly translateX: number;
+}, {
+    readonly translateY: number;
+}];

package/lib/typescript/src/skia/core/index.d.ts

@@ -1,10 +1,12 @@
-export * from "./Color";
 export * from "./Data";
 export * from "./Font";
 export * from "./Typeface";
 export * from "./Image";
 export * from "./Picture";
 export * from "./SVG";
-export * from "./Shader";
-export * from "./Paint";
 export * from "./Path";
+export * from "./Vector";
+export * from "./Rect";
+export * from "./RRect";
+export * from "./Matrix";
+export * from "./Paint";

package/lib/typescript/src/skia/types/ContourMeasure.d.ts

@@ -6,15 +6,13 @@ export interface PosTan {
     tx: number;
     ty: number;
 }
-export interface SkContourMeasure extends SkJSIInstance<"ContourMeasureIter"> {
+export interface SkContourMeasure extends SkJSIInstance<"ContourMeasure"> {
     /**
      * Returns the given position and tangent line for the distance on the given contour.
      * The return value is 4 floats in this order: posX, posY, vecX, vecY.
      * @param distance - will be pinned between 0 and length().
-     * @param output - if provided, the four floats of the PosTan will be copied into this array
-     *                 instead of allocating a new one.
      */
-    getPosTan(distance: number, output?: PosTan): PosTan;
+    getPosTan(distance: number): PosTan;
     /**
      * Returns an Path representing the segment of this contour.
      * @param startD - will be pinned between 0 and length()

package/lib/typescript/src/skia/types/Data/Data.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
 /// <reference types="react-native" />
 import type { SkJSIInstance } from "../JsiInstance";
-export declare type Data = SkJSIInstance<"Data">;
+export declare type SkData = SkJSIInstance<"Data">;
 export declare type DataSource = ReturnType<typeof require> | string | Uint8Array;

package/lib/typescript/src/skia/types/Data/DataFactory.d.ts

@@ -1,18 +1,18 @@
-import type { Data } from "./Data";
+import type { SkData } from "./Data";
 export interface DataFactory {
     /**
      * Creates a new Data object from an Uri, either locally or remotely.
      * @param uri Uri to a valid resource
      */
-    fromURI(uri: string): Promise<Data>;
+    fromURI(uri: string): Promise<SkData>;
     /**
      * Creates a new Data object from a byte array.
      * @param bytes An array of bytes representing the data
      */
-    fromBytes(bytes: Uint8Array): Data;
+    fromBytes(bytes: Uint8Array): SkData;
     /**
      * Creates a new Data object from a base64 encoded string.
      * @param base64 A Base64 encoded string representing the data
      */
-    fromBase64(base64: string): Data;
+    fromBase64(base64: string): SkData;
 }

package/lib/typescript/src/skia/types/Font/Font.d.ts

@@ -10,6 +10,14 @@ export interface FontMetrics {
     bounds?: SkRect;
 }
 export interface SkFont extends SkJSIInstance<"Font"> {
+    /**
+     * Retrieves the advanceX measurements for each glyph.
+     * If paint is not null, its stroking, PathEffect, and MaskFilter fields are respected.
+     * One width per glyph is returned in the returned array.
+     * @param glyphs
+     * @param paint
+     */
+    getGlyphWidths(glyphs: number[], paint?: SkPaint): number[];
     /** Returns the advance width of text.
         The advance is the normal distance to move before drawing additional text.
         Returns the bounding box of text if bounds is not nullptr. The paint
@@ -34,15 +42,6 @@ export interface SkFont extends SkJSIInstance<"Font"> {
      * @param numCodePoints - the number of code points in the string. Defaults to str.length.
      */
     getGlyphIDs(str: string, numCodePoints?: number): number[];
-    /**
-     * Retrieves the advanceX measurements for each glyph.
-     * If paint is not null, its stroking, PathEffect, and MaskFilter fields are respected.
-     * One width per glyph is returned in the returned array.
-     * @param glyphs
-     * @param paint
-     * @param output - if provided, the results will be copied into this array.
-     */
-    getGlyphWidths(glyphs: number[], paint?: SkPaint | null, output?: Float32Array): Float32Array;
     /**
      * Computes any intersections of a thick "line" and a run of positionsed glyphs.
      * The thick line is represented as a top and bottom coordinate (positive for

package/lib/typescript/src/skia/types/FontMgr/FontMgr.d.ts

@@ -1,7 +1,7 @@
 import type { SkJSIInstance } from "../JsiInstance";
 import type { FontStyle } from "../Font/Font";
 import type { SkTypeface } from "../Typeface";
-export interface FontMgr extends SkJSIInstance<"FontMgr"> {
+export interface SkFontMgr extends SkJSIInstance<"FontMgr"> {
     /**
      * Return the number of font families loaded in this manager. Useful for debugging.
      */

package/lib/typescript/src/skia/types/FontMgr/FontMgrFactory.d.ts

@@ -1,4 +1,4 @@
-import type { FontMgr } from "./FontMgr";
+import type { SkFontMgr } from "./FontMgr";
 export interface FontMgrFactory {
-    RefDefault: () => FontMgr;
+    RefDefault: () => SkFontMgr;
 }

package/lib/typescript/src/skia/types/Image/Image.d.ts

@@ -3,8 +3,8 @@ import type { SkJSIInstance } from "../JsiInstance";
 import type { TileMode } from "../ImageFilter";
 import type { SkShader } from "../Shader";
 export declare enum FilterMode {
-    Linear = 0,
-    Nearest = 1
+    Nearest = 0,
+    Linear = 1
 }
 export declare enum MipmapMode {
     None = 0,
@@ -12,9 +12,9 @@ export declare enum MipmapMode {
     Linear = 2
 }
 export declare enum ImageFormat {
-    PNG = 0,
-    JPEG = 1,
-    WEBP = 2
+    JPEG = 3,
+    PNG = 4,
+    WEBP = 6
 }
 export interface SkImage extends SkJSIInstance<"Image"> {
     /**

package/lib/typescript/src/skia/types/Image/ImageFactory.d.ts

@@ -1,4 +1,4 @@
-import type { Data } from "../Data";
+import type { SkData } from "../Data";
 import type { SkImage } from "./Image";
 export declare enum AlphaType {
     Unknown = 0,
@@ -47,7 +47,7 @@ export interface ImageFactory {
      * @returns If the encoded format is not supported, or subset is outside of the bounds of the decoded
      *  image, nullptr is returned.
      */
-    MakeImageFromEncoded: (encoded: Data) => SkImage | null;
+    MakeImageFromEncoded: (encoded: SkData) => SkImage | null;
     /**
      * Returns an image with the given pixel data and format.
      * Note that we will always make a copy of the pixel data, because of inconsistencies in
@@ -58,5 +58,5 @@ export interface ImageFactory {
      * @param data - bytes representing the pixel data.
      * @param bytesPerRow
      */
-    MakeImage(info: ImageInfo, data: Data, bytesPerRow: number): SkImage | null;
+    MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;
 }

package/lib/typescript/src/skia/types/Matrix.d.ts

@@ -11,18 +11,19 @@ export declare enum MatrixIndex {
     persp2 = 8
 }
 export interface SkMatrix extends SkJSIInstance<"Matrix"> {
-    0: number;
-    1: number;
-    2: number;
-    3: number;
-    4: number;
-    5: number;
-    6: number;
-    7: number;
-    8: number;
-    preConcat: (matrix: SkMatrix) => void;
-    preTranslate: (x: number, y: number) => void;
-    preScale: (x: number, y: number) => void;
-    preSkew: (x: number, y: number) => void;
-    preRotate: (theta: number) => void;
+    concat: (matrix: SkMatrix) => void;
+    translate: (x: number, y: number) => void;
+    scale: (x: number, y?: number) => void;
+    skew: (x: number, y: number) => void;
+    rotate: (theta: number) => void;
 }
+declare type Transform2dName = "translateX" | "translateY" | "scale" | "skewX" | "skewY" | "scaleX" | "scaleY" | "rotateZ" | "rotate";
+declare type Transformations = {
+    readonly [Name in Transform2dName]: number;
+};
+export declare type Transforms2d = readonly (Pick<Transformations, "translateX"> | Pick<Transformations, "translateY"> | Pick<Transformations, "scale"> | Pick<Transformations, "scaleX"> | Pick<Transformations, "scaleY"> | Pick<Transformations, "skewX"> | Pick<Transformations, "skewY"> | Pick<Transformations, "rotate">)[];
+export interface TransformProp {
+    transform?: Transforms2d;
+}
+export declare const processTransform: (m: SkMatrix, transforms: Transforms2d) => SkMatrix;
+export {};

package/lib/typescript/src/skia/types/Paint/Paint.d.ts

@@ -16,9 +16,9 @@ export declare enum StrokeCap {
     Square = 2
 }
 export declare enum StrokeJoin {
-    Bevel = 0,
-    Miter = 1,
-    Round = 2
+    Miter = 0,
+    Round = 1,
+    Bevel = 2
 }
 export declare const isPaint: (obj: SkJSIInstance<string> | null) => obj is SkPaint;
 export interface SkPaint extends SkJSIInstance<"Paint"> {

package/lib/typescript/src/skia/types/Path/Path.d.ts

@@ -1,4 +1,3 @@
-import type { SkFont } from "../Font";
 import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
 import type { SkRRect } from "../RRect";
@@ -64,7 +63,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param isCCW - if the path should be drawn counter-clockwise or not
      * @param startIndex - index of initial point of ellipse
      */
-    addOval(oval: SkRect, isCCW?: boolean, startIndex?: number): void;
+    addOval(oval: SkRect, isCCW?: boolean, startIndex?: number): SkPath;
     /**
      * Returns the number of points in this path. Initially zero.
      */
@@ -78,7 +77,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param points
      * @param close - if true, will add a line connecting last point to the first point.
      */
-    addPoly(points: SkPoint[], close: boolean): void;
+    addPoly(points: SkPoint[], close: boolean): SkPath;
     /** Adds beginning of contour at SkPoint (x, y).
   
           @param x  x-axis value of contour start
@@ -87,7 +86,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
   
           example: https://fiddle.skia.org/c/@Path_moveTo
       */
-    moveTo(x: number, y: number): void;
+    moveTo(x: number, y: number): SkPath;
     /** Adds line from last point to (x, y). If SkPath is empty, or last SkPath::Verb is
           kClose_Verb, last point is set to (0, 0) before adding line.
   
@@ -100,7 +99,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
   
           example: https://fiddle.skia.org/c/@Path_lineTo
       */
-    lineTo(x: number, y: number): void;
+    lineTo(x: number, y: number): SkPath;
     /**
      * Returns a new path that covers the same area as the original path, but with the
      * Winding FillType. This may re-draw some contours in the path as counter-clockwise
@@ -113,7 +112,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param dx
      * @param dy
      */
-    offset(dx: number, dy: number): void;
+    offset(dx: number, dy: number): SkPath;
     /**
      * Relative version of arcToRotated.
      * @param rx
@@ -124,7 +123,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param dx
      * @param dy
      */
-    rArcTo(rx: number, ry: number, xAxisRotateInDegrees: number, useSmallArc: boolean, isCCW: boolean, dx: number, dy: number): void;
+    rArcTo(rx: number, ry: number, xAxisRotateInDegrees: number, useSmallArc: boolean, isCCW: boolean, dx: number, dy: number): SkPath;
     /**
      * Relative version of conicTo.
      * @param dx1
@@ -133,7 +132,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param dy2
      * @param w
      */
-    rConicTo(dx1: number, dy1: number, dx2: number, dy2: number, w: number): void;
+    rConicTo(dx1: number, dy1: number, dx2: number, dy2: number, w: number): SkPath;
     /**
      * Relative version of cubicTo.
      * @param cpx1
@@ -143,7 +142,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param x
      * @param y
      */
-    rCubicTo(cpx1: number, cpy1: number, cpx2: number, cpy2: number, x: number, y: number): void;
+    rCubicTo(cpx1: number, cpy1: number, cpx2: number, cpy2: number, x: number, y: number): SkPath;
     /**
      * Relative version of moveTo.
      * @param x
@@ -182,8 +181,9 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * Turns this path into the filled equivalent of the stroked path. Returns false if the operation
      * fails (e.g. the path is a hairline).
      * @param opts - describe how stroked path should look.
+     * If such a transformation cannot be done, null is returned.
      */
-    stroke(opts?: StrokeOpts): boolean;
+    stroke(opts?: StrokeOpts): null | SkPath;
     /**
      * Appends CLOSE_VERB to Path. A closed contour connects the first and last point
      * with a line, forming a continuous loop.
@@ -213,10 +213,8 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * only lines. If Path contains curves, computed bounds includes
      * the maximum extent of the quad, conic, or cubic; is slower than getBounds();
      * and unlike getBounds(), does not cache the result.
-     * @param outputArray - if provided, the bounding box will be copied into this array instead of
-     *                      allocating a new one.
      */
-    computeTightBounds(outputArray?: SkRect): SkRect;
+    computeTightBounds(): SkRect;
     /**
      * Appends arc to Path. Arc added is part of ellipse
      * bounded by oval, from startAngle through sweepAngle. Both startAngle and
@@ -291,7 +289,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param x
      * @param y
      */
-    cubicTo(cpx1: number, cpy1: number, cpx2: number, cpy2: number, x: number, y: number): void;
+    cubicTo(cpx1: number, cpy1: number, cpx2: number, cpy2: number, x: number, y: number): SkPath;
     /**
      * Changes this path to be the dashed version of itself. This is the same effect as creating
      * a DashPathEffect and calling filterPath on this path.
@@ -367,7 +365,18 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * may not speed repeated drawing.
      */
     isVolatile(): boolean;
-    addCircle(x: number, y: number, r: number): void;
+    /** Adds circle centered at (x, y) of size radius to SkPath, appending kMove_Verb,
+        four kConic_Verb, and kClose_Verb. Circle begins at: (x + radius, y), continuing
+        clockwise if dir is kCW_Direction, and counterclockwise if dir is kCCW_Direction.
+  
+        Has no effect if radius is zero or negative.
+  
+        @param x       center of circle
+        @param y       center of circle
+        @param radius  distance from center to edge
+        @return        reference to SkPath
+    */
+    addCircle(x: number, y: number, r: number): SkPath;
     getLastPt(): {
         x: number;
         y: number;
@@ -414,15 +423,11 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param stopT  - a value in the range [0.0, 1.0]. 1.0 is the end of the path.
      * @param isComplement
      */
-    trim(startT: number, stopT: number, isComplement: boolean): boolean;
+    trim(startT: number, stopT: number, isComplement: boolean): null | SkPath;
     /**
      * Transforms the path by the specified matrix.
      */
     transform(m3: SkMatrix): void;
-    /**
-     * Converts the text to a path with the given font at location x / y.
-     */
-    fromText(text: string, x: number, y: number, font: SkFont): void;
     /**
      * Interpolates between Path with point array of equal size.
      * Copy verb array and weights to result, and set result path to a weighted
@@ -439,10 +444,10 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param ending  path to interpolate with
      * @param weight  contribution of this path, and
      *                 one minus contribution of ending path
-     * @return        Path replaced by interpolated averages or undefined if
+     * @return        Path replaced by interpolated averages or null if
      *                not interpolatable
      * */
-    interpolate(end: SkPath, weight: number): SkPath;
+    interpolate(end: SkPath, weight: number): SkPath | null;
     /** Returns true if Path contain equal verbs and equal weights.
      *     @param compare  path to compare
      *     @return         true if Path can be interpolated equivalent

package/lib/typescript/src/skia/types/Path/PathFactory.d.ts

@@ -1,3 +1,4 @@
+import type { SkFont } from "../Font";
 import type { SkPath, PathOp, PathCommand } from "./Path";
 export interface PathFactory {
     Make(): SkPath;
@@ -21,4 +22,8 @@ export interface PathFactory {
      * @param cmds
      */
     MakeFromCmds(cmds: PathCommand[]): SkPath | null;
+    /**
+     * Converts the text to a path with the given font at location x / y.
+     */
+    MakeFromText(text: string, x: number, y: number, font: SkFont): SkPath | null;
 }

package/lib/typescript/src/skia/types/Picture/Picture.d.ts

@@ -1,8 +1,8 @@
-import type { InputColorMatrix } from "../ColorFilter";
 import type { FilterMode } from "../Image";
 import type { TileMode } from "../ImageFilter";
 import type { SkRect } from "../Rect";
 import type { SkShader } from "../Shader";
+import type { SkMatrix } from "../Matrix";
 export interface SkPicture {
     /**
      *  Returns a new shader that will draw with this picture.
@@ -17,7 +17,7 @@ export interface SkPicture {
      *              and cropping). If null, the tile rect is considered equal to the picture
      *              bounds.
      */
-    makeShader(tmx: TileMode, tmy: TileMode, mode: FilterMode, localMatrix?: InputColorMatrix, tileRect?: SkRect): SkShader;
+    makeShader(tmx: TileMode, tmy: TileMode, mode: FilterMode, localMatrix?: SkMatrix, tileRect?: SkRect): SkShader;
     /**
      * Returns the serialized format of this SkPicture. The format may change at anytime and
      * no promises are made for backwards or forward compatibility.

package/lib/typescript/src/skia/types/Point.d.ts

@@ -7,3 +7,4 @@ export interface SkPoint {
     readonly x: number;
     readonly y: number;
 }
+export declare type Vector = SkPoint;