@shopify/react-native-skia 0.1.127 → 0.1.130

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

@@ -1,9 +1,9 @@
-import type { SkiaReadonlyValue } from "../../../values";
+import type { SkiaValue } from "../../../values";
 import type { DrawingContext } from "../../DrawingContext";
 export declare type FrameValue<T> = (ctx: DrawingContext) => T;
-export declare const isValue: (value: unknown) => value is SkiaReadonlyValue<unknown>;
+export declare const isValue: (value: unknown) => value is SkiaValue<unknown>;
 export declare const isAnimated: <T>(props: AnimatedProps<T>) => boolean;
 export declare const materialize: <T>(props: AnimatedProps<T>) => T;
 export declare type AnimatedProps<T> = {
-    [K in keyof T]: T[K] | SkiaReadonlyValue<T[K]>;
+    [K in keyof T]: T[K] | SkiaValue<T[K]>;
 };

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

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

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

@@ -1,5 +1,4 @@
-import type { SkFont } from "../../skia";
-import type { FontMgr } from "../../skia/FontMgr/FontMgr";
+import type { FontMgr, SkFont } from "../../skia";
 export declare type FontDef = {
     font: SkFont;
 } | {

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

@@ -1,9 +1,11 @@
 import type { SkRect, SkRRect } from "../../skia";
+import type { Vector } from "./math/Vector";
 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;

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

@@ -1,5 +1,5 @@
 import type { DrawingContext } from "../DrawingContext";
-import type { SkMatrix } from "../../skia/Matrix";
+import type { SkMatrix } from "../../skia/types";
 import type { Transforms2d, Vector } from "./math";
 export interface TransformProps {
     transform?: Transforms2d;

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

@@ -1,41 +1,8 @@
-import "./NativeSetup";
-import type { SkiaApi as SkSkiaApi } from "./SkiaApi";
+import type { Skia as SkSkiaApi } from "./types";
 /**
  * Declares the SkiaApi as an available object in the global scope
  */
 declare global {
     var SkiaApi: SkSkiaApi;
 }
-/**
- * Declares the implemented API with overrides.
- */
-export declare const Skia: {
-    Typeface: import("./Typeface").TypefaceFactory;
-    MaskFilter: import("./MaskFilter").MaskFilterFactory;
-    RuntimeEffect: import("./RuntimeEffect").RuntimeEffectFactory;
-    Shader: import("./Shader").ShaderFactory;
-    ImageFilter: import("./ImageFilter").ImageFilterFactory;
-    PathEffect: import("./PathEffect").PathEffectFactory;
-    Data: import("./Data").DataFactory;
-    SVG: import("./SVG").SVGFactory;
-    FontMgr: import("./FontMgr").FontMgrFactory;
-    TextBlob: import("./TextBlob").TextBlobFactory;
-    Matrix: () => import("./Matrix").SkMatrix;
-    Font: (typeface?: import("./Typeface").SkTypeface | undefined, size?: number | undefined) => import("./Font").SkFont;
-    Point: (x: number, y: number) => import("./Point").SkPoint;
-    XYWHRect: (x: number, y: number, width: number, height: number) => import("./Rect").SkRect;
-    RRectXY: (rect: import("./Rect").SkRect, rx: number, ry: number) => import("./RRect").SkRRect;
-    RuntimeShaderBuilder: (rt: import("./RuntimeEffect").SkRuntimeEffect) => import("./RuntimeEffect").SkRuntimeShaderBuilder;
-    Paint: () => import("./Paint").SkPaint;
-    PictureRecorder: () => import("./Picture").SkPictureRecorder;
-    Picture: import("./Picture").PictureFactory;
-    Path: import("./Path").PathFactory;
-    ColorFilter: import("./ColorFilter").ColorFilterFactory;
-    ContourMeasureIter: (path: import("./Path").SkPath, forceClosed: boolean, resScale: number) => import("./ContourMeasure").SkContourMeasureIter;
-    Color: (color: import("./Color").Color) => Float32Array;
-    RSXform: (scos: number, ssin: number, tx: number, ty: number) => import("./RSXform").SkRSXform;
-    MakeSurface: (width: number, height: number) => import("./Surface").SkSurface | null;
-    MakeImageFromEncoded: (encoded: import("./Data").Data) => import("./Image").SkImage | null;
-    MakeImage: (info: import("./Image").ImageInfo, data: import("./Data").Data, bytesPerRow: number) => import("./Image").SkImage | null;
-    MakeVertices: (mode: import("./Vertices").VertexMode, positions: import("./Point").SkPoint[], textureCoordinates?: import("./Point").SkPoint[] | null | undefined, colors?: Float32Array[] | undefined, indices?: number[] | null | undefined, isVolatile?: boolean | undefined) => import("./Vertices").SkVertices;
-};
+export declare const Skia: SkSkiaApi;

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

@@ -1,5 +1,4 @@
-export declare type SkColor = Float32Array;
-export declare type Color = string | Float32Array | number;
+import type { Color } from "../types";
 export declare const RED = 0;
 export declare const GREEN = 1;
 export declare const BLUE = 2;

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

@@ -0,0 +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;

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

@@ -0,0 +1,5 @@
+import type { DataSource, SkFont } from "../types";
+/**
+ * Returns a Skia Font object
+ * */
+export declare const useFont: (font: DataSource | null | undefined, size?: number | undefined, onError?: ((err: Error) => void) | undefined) => SkFont | null;

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

@@ -0,0 +1,5 @@
+import type { DataSource } from "../types";
+/**
+ * Returns a Skia Image object
+ * */
+export declare const useImage: (source: DataSource | null | undefined, onError?: ((err: Error) => void) | undefined) => import("../types").SkImage | null;

package/lib/typescript/src/skia/{Paint/usePaint.d.ts → core/Paint.d.ts}

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

package/lib/typescript/src/skia/{Path/usePath.d.ts → core/Path.d.ts}

@@ -1,6 +1,5 @@
 import type { DependencyList } from "react";
-import type { SkFont } from "../Font";
-import type { SkPath } from "./Path";
+import type { SkFont, SkPath } from "../types";
 /**
  * Memoizes and returns a Skia Path object with optional initializer
  * @param initializer

package/lib/typescript/src/skia/{Picture/usePicture.d.ts → core/Picture.d.ts}

@@ -1,7 +1,5 @@
 import type { DependencyList } from "react";
-import type { SkCanvas } from "../Canvas";
-import type { SkRect } from "../Rect";
-import type { SkPicture } from "./Picture";
+import type { SkCanvas, SkPicture, SkRect } from "../types";
 /**
  * Memoizes and returns an SkPicture that can be drawn to another canvas.
  * @param rect Picture bounds

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

@@ -0,0 +1,2 @@
+import type { DataSource } from "../types";
+export declare const useSVG: (source: DataSource | null | undefined, onError?: ((err: Error) => void) | undefined) => import("../types").SkSVG | null;

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

@@ -0,0 +1,5 @@
+import type { DataSource } from "../types";
+/**
+ * Returns a Skia Typeface object
+ * */
+export declare const useTypeface: (source: DataSource | null | undefined, onError?: ((err: Error) => void) | undefined) => import("../types").SkTypeface | null;

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

@@ -0,0 +1,10 @@
+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";

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

@@ -1,24 +1,3 @@
 export { Skia } from "./Skia";
-export * from "./Canvas";
-export * from "./Paint";
-export * from "./Rect";
-export * from "./RRect";
-export * from "./Point";
-export * from "./Path";
-export * from "./Font";
-export * from "./Typeface";
-export * from "./MaskFilter";
-export * from "./ColorFilter";
-export * from "./ImageFilter";
-export * from "./PathEffect";
-export * from "./RuntimeEffect";
-export * from "./Shader";
-export * from "./Image";
-export * from "./Matrix";
-export * from "./SVG";
-export * from "./Surface";
-export * from "./FontMgr";
-export * from "./Vertices";
-export * from "./Color";
-export * from "./Picture";
-export * from "./Data";
+export * from "./core";
+export * from "./types";

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

@@ -0,0 +1,2 @@
+export declare type SkColor = Float32Array;
+export declare type Color = string | Float32Array | number;

package/lib/typescript/src/skia/{ColorFilter → types/ColorFilter}/ColorFilterFactory.d.ts

@@ -1,5 +1,5 @@
 import type { SkColor } from "../Color";
-import type { BlendMode } from "../Paint/BlendMode";
+import type { BlendMode } from "../Paint";
 import type { SkColorFilter } from "./ColorFilter";
 export declare type InputColorMatrix = number[];
 export interface ColorFilterFactory {

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

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

package/lib/typescript/src/skia/{Font → types/Font}/Font.d.ts

@@ -2,7 +2,7 @@ import type { SkJSIInstance } from "../JsiInstance";
 import type { SkPaint } from "../Paint";
 import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
-import type { SkTypeface } from "../Typeface/Typeface";
+import type { SkTypeface } from "../Typeface";
 export interface FontMetrics {
     ascent: number;
     descent: number;

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

@@ -0,0 +1 @@
+export * from "./Font";

package/lib/typescript/src/skia/{FontMgr → types/FontMgr}/FontMgr.d.ts

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

package/lib/typescript/src/skia/{FontMgr → types/FontMgr}/index.d.ts

@@ -1 +1,2 @@
 export * from "./FontMgrFactory";
+export * from "./FontMgr";

package/lib/typescript/src/skia/{Image → types/Image}/Image.d.ts

@@ -1,7 +1,7 @@
-import type { TileMode } from "../ImageFilter";
-import type { SkShader } from "../Shader";
 import type { SkMatrix } from "../Matrix";
 import type { SkJSIInstance } from "../JsiInstance";
+import type { TileMode } from "../ImageFilter";
+import type { SkShader } from "../Shader";
 export declare enum FilterMode {
     Linear = 0,
     Nearest = 1

package/lib/typescript/src/skia/{Image → types/Image}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Image";
 export * from "./ImageFactory";
-export * from "./useImage";

package/lib/typescript/src/skia/{ImageFilter → types/ImageFilter}/ImageFilterFactory.d.ts

@@ -1,9 +1,9 @@
 import type { SkColor } from "../Color";
 import type { SkColorFilter } from "../ColorFilter/ColorFilter";
-import type { SkShader } from "../Shader/Shader";
+import type { BlendMode } from "../Paint";
 import type { SkRect } from "../Rect";
-import type { BlendMode } from "../Paint/BlendMode";
 import type { SkRuntimeShaderBuilder } from "../RuntimeEffect";
+import type { SkShader } from "../Shader";
 import type { SkImageFilter, TileMode } from "./ImageFilter";
 export declare enum ColorChannel {
     R = 0,

package/lib/typescript/src/skia/{MaskFilter.d.ts → types/MaskFilter.d.ts}

@@ -5,8 +5,8 @@ export declare enum BlurStyle {
     Outer = 2,
     Inner = 3
 }
-export declare const isMaskFilter: (obj: SkJSIInstance<string> | null) => obj is IMaskFilter;
-export declare type IMaskFilter = SkJSIInstance<"MaskFilter">;
+export declare const isMaskFilter: (obj: SkJSIInstance<string> | null) => obj is SkMaskFilter;
+export declare type SkMaskFilter = SkJSIInstance<"MaskFilter">;
 /**
  * See SkMaskFilter.h for more details.
  */
@@ -17,5 +17,5 @@ export interface MaskFilterFactory {
      * @param sigma - Standard deviation of the Gaussian blur to apply. Must be > 0.
      * @param respectCTM - if true the blur's sigma is modified by the CTM.
      */
-    MakeBlur(style: BlurStyle, sigma: number, respectCTM: boolean): IMaskFilter;
+    MakeBlur(style: BlurStyle, sigma: number, respectCTM: boolean): SkMaskFilter;
 }

package/lib/typescript/src/skia/{Paint → types/Paint}/Paint.d.ts

@@ -1,10 +1,10 @@
 import type { SkImageFilter } from "../ImageFilter";
-import type { IMaskFilter } from "../MaskFilter";
+import type { SkMaskFilter } from "../MaskFilter";
 import type { SkColorFilter } from "../ColorFilter";
-import type { SkShader } from "../Shader";
 import type { SkColor } from "../Color";
-import type { IPathEffect } from "../PathEffect";
+import type { SkPathEffect } from "../PathEffect";
 import type { SkJSIInstance } from "../JsiInstance";
+import type { SkShader } from "../Shader";
 import type { BlendMode } from "./BlendMode";
 export declare enum PaintStyle {
     Fill = 0,
@@ -20,7 +20,6 @@ export declare enum StrokeJoin {
     Miter = 1,
     Round = 2
 }
-export declare const SkiaPaint: () => SkPaint;
 export declare const isPaint: (obj: SkJSIInstance<string> | null) => obj is SkPaint;
 export interface SkPaint extends SkJSIInstance<"Paint"> {
     /**
@@ -89,12 +88,12 @@ export interface SkPaint extends SkJSIInstance<"Paint"> {
      * Sets the current mask filter, replacing the existing one if there was one.
      * @param filter
      */
-    setMaskFilter(filter: IMaskFilter | null): void;
+    setMaskFilter(filter: SkMaskFilter | null): void;
     /**
      * Sets the current path effect, replacing the existing one if there was one.
      * @param effect
      */
-    setPathEffect(effect: IPathEffect | null): void;
+    setPathEffect(effect: SkPathEffect | null): void;
     /**
      * Sets the current shader, replacing the existing one if there was one.
      * @param shader

package/lib/typescript/src/skia/{Paint → types/Paint}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Paint";
 export * from "./BlendMode";
-export * from "./usePaint";

package/lib/typescript/src/skia/{Path → types/Path}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Path";
 export * from "./PathFactory";
-export * from "./usePath";

package/lib/typescript/src/skia/{PathEffect.d.ts → types/PathEffect.d.ts}

@@ -1,8 +1,8 @@
 import type { SkJSIInstance } from "./JsiInstance";
 import type { SkPath } from "./Path/Path";
 import type { SkMatrix } from "./Matrix";
-export declare type IPathEffect = SkJSIInstance<"PathEffect">;
-export declare const isPathEffect: (obj: SkJSIInstance<string> | null) => obj is IPathEffect;
+export declare type SkPathEffect = SkJSIInstance<"PathEffect">;
+export declare const isPathEffect: (obj: SkJSIInstance<string> | null) => obj is SkPathEffect;
 export declare enum Path1DEffectStyle {
     Translate = 0,
     Rotate = 1,
@@ -13,7 +13,7 @@ export interface PathEffectFactory {
      * Returns a PathEffect that can turn sharp corners into rounded corners.
      * @param radius - if <=0, returns null
      */
-    MakeCorner(radius: number): IPathEffect | null;
+    MakeCorner(radius: number): SkPathEffect | null;
     /**
      * Returns a PathEffect that add dashes to the path.
      *
@@ -23,7 +23,7 @@ export interface PathEffectFactory {
      *                    the "on" intervals, and the odd indices specifying the length of "off".
      * @param phase - offset length into the intervals array. Defaults to 0.
      */
-    MakeDash(intervals: number[], phase?: number): IPathEffect;
+    MakeDash(intervals: number[], phase?: number): SkPathEffect;
     /**
      * Returns a PathEffect that breaks path into segments of segLength length, and randomly move
      * the endpoints away from the original path by a maximum of deviation.
@@ -31,21 +31,21 @@ export interface PathEffectFactory {
      * @param dev - limit of the movement of the endpoints.
      * @param seedAssist - modifies the randomness. See SkDiscretePathEffect.h for more.
      */
-    MakeDiscrete(segLength: number, dev: number, seedAssist: number): IPathEffect;
+    MakeDiscrete(segLength: number, dev: number, seedAssist: number): SkPathEffect;
     /**
      *
      * A pathEffect whose effect is to apply first the inner pathEffect and the the
      * outer pathEffect (i.e. outer(inner(path))).
      *
      */
-    MakeCompose(outer: IPathEffect, inner: IPathEffect): IPathEffect;
+    MakeCompose(outer: SkPathEffect, inner: SkPathEffect): SkPathEffect;
     /**
      *
      * A pathEffect pathEffect whose effect is to apply two effects,
      * in sequence (i.e. first(path) + second(path)).
      *
      */
-    MakeSum(outer: IPathEffect, inner: IPathEffect): IPathEffect;
+    MakeSum(outer: SkPathEffect, inner: SkPathEffect): SkPathEffect;
     /**
      * Returns a PathEffect that will fill the drawing path with a pattern made by applying
      * the given matrix to a repeating set of infinitely long lines of the given width.
@@ -54,7 +54,7 @@ export interface PathEffectFactory {
      * @param width - must be >= 0
      * @param matrix
      */
-    MakeLine2D(width: number, matrix: SkMatrix): IPathEffect | null;
+    MakeLine2D(width: number, matrix: SkMatrix): SkPathEffect | null;
     /**
      * Returns a PathEffect which implements dashing by replicating the specified path.
      *   @param path The path to replicate (dash)
@@ -63,7 +63,7 @@ export interface PathEffectFactory {
      *   @param style how to transform path at each point (based on the current
      *                position and tangent)
      */
-    MakePath1D(path: SkPath, advance: number, phase: number, style: Path1DEffectStyle): IPathEffect | null;
+    MakePath1D(path: SkPath, advance: number, phase: number, style: Path1DEffectStyle): SkPathEffect | null;
     /**
      * Returns a PathEffect that will fill the drawing path with a pattern by repeating the
      * given path according to the provided matrix. For example, the scale of the matrix
@@ -71,5 +71,5 @@ export interface PathEffectFactory {
      * @param matrix
      * @param path
      */
-    MakePath2D(matrix: SkMatrix, path: SkPath): IPathEffect | null;
+    MakePath2D(matrix: SkMatrix, path: SkPath): SkPathEffect | null;
 }

package/lib/typescript/src/skia/{Picture → types/Picture}/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./Picture";
 export * from "./PictureRecorder";
-export * from "./usePicture";
 export * from "./PictureFactory";

package/lib/typescript/src/skia/{RuntimeEffect → types/RuntimeEffect}/RuntimeEffect.d.ts

@@ -13,18 +13,16 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
     /**
      * Returns a shader executed using the given uniform data.
      * @param uniforms
-     * @param isOpaque
      * @param localMatrix
      */
-    makeShader(uniforms: number[], isOpaque?: boolean, localMatrix?: SkMatrix): SkShader;
+    makeShader(uniforms: number[], localMatrix?: SkMatrix): SkShader;
     /**
      * Returns a shader executed using the given uniform data and the children as inputs.
      * @param uniforms
-     * @param isOpaque
      * @param children
      * @param localMatrix
      */
-    makeShaderWithChildren(uniforms: number[], isOpaque?: boolean, children?: SkShader[], localMatrix?: SkMatrix): SkShader;
+    makeShaderWithChildren(uniforms: number[], children?: SkShader[], localMatrix?: SkMatrix): SkShader;
     /**
      * Returns the nth uniform from the effect.
      * @param index

package/lib/typescript/src/skia/{SVG → types/SVG}/SVGFactory.d.ts

@@ -1,4 +1,4 @@
-import type { Data } from "../Data/Data";
+import type { Data } from "../Data";
 import type { SkSVG } from "./SVG";
 export interface SVGFactory {
     MakeFromData(data: Data): SkSVG | null;

package/lib/typescript/src/skia/{SVG → types/SVG}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./SVG";
 export * from "./SVGFactory";
-export * from "./useSvg";

package/lib/typescript/src/skia/{Shader → types/Shader}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Shader";
 export * from "./ShaderFactory";
-export * from "./useShader";

package/lib/typescript/src/skia/{SkiaApi.d.ts → types/Skia.d.ts}

@@ -8,7 +8,7 @@ import type { MaskFilterFactory } from "./MaskFilter";
 import type { SkPaint } from "./Paint";
 import type { SkRect } from "./Rect";
 import type { SkRRect } from "./RRect";
-import type { RuntimeEffectFactory } from "./RuntimeEffect";
+import type { RuntimeEffectFactory, SkRuntimeEffect, SkRuntimeShaderBuilder } from "./RuntimeEffect";
 import type { ShaderFactory } from "./Shader";
 import type { SkMatrix } from "./Matrix";
 import type { PathEffectFactory } from "./PathEffect";
@@ -19,24 +19,21 @@ import type { SVGFactory } from "./SVG";
 import type { TextBlobFactory } from "./TextBlob";
 import type { FontMgrFactory } from "./FontMgr/FontMgrFactory";
 import type { SurfaceFactory } from "./Surface";
-import "./NativeSetup";
 import type { SkRSXform } from "./RSXform";
 import type { SkPath } from "./Path/Path";
 import type { SkContourMeasureIter } from "./ContourMeasure";
 import type { PictureFactory, SkPictureRecorder } from "./Picture";
 import type { Color, SkColor } from "./Color";
-import type { SkRuntimeShaderBuilder, SkRuntimeEffect } from "./RuntimeEffect/RuntimeEffect";
 /**
  * Declares the interface for the native Skia API
  */
-export interface SkiaApi {
+export interface Skia {
     Point: (x: number, y: number) => SkPoint;
     XYWHRect: (x: number, y: number, width: number, height: number) => SkRect;
     RuntimeShaderBuilder: (rt: SkRuntimeEffect) => SkRuntimeShaderBuilder;
     RRectXY: (rect: SkRect, rx: number, ry: number) => SkRRect;
     RSXform: (scos: number, ssin: number, tx: number, ty: number) => SkRSXform;
     Color: (color: Color) => SkColor;
-    parseColorString: (color: string) => SkColor | undefined;
     ContourMeasureIter: (path: SkPath, forceClosed: boolean, resScale: number) => SkContourMeasureIter;
     Paint: () => SkPaint;
     PictureRecorder: () => SkPictureRecorder;

package/lib/typescript/src/skia/{Typeface → types/Typeface}/TypefaceFactory.d.ts

@@ -1,4 +1,4 @@
-import type { Data } from "../Data/Data";
+import type { Data } from "../Data";
 import type { SkTypeface } from "./Typeface";
 export interface TypefaceFactory {
     MakeFreeTypeFaceFromData(data: Data): SkTypeface | null;

package/lib/typescript/src/skia/{Typeface → types/Typeface}/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./Typeface";
-export * from "./useTypeface";
 export * from "./TypefaceFactory";