Rename Data to SkData

Author: wcandillon

package/src/skia/core/Data.ts

@@ -3,11 +3,11 @@ import { useRef, useEffect, useState } from "react";
 import { Image } from "react-native";
 
 import { Skia } from "../Skia";
-import type { Data, DataSource } from "../types";
+import type { SkData, DataSource } from "../types";
 
 export const useDataCollection = <T>(
   sources: DataSource[],
-  factory: (data: Data[]) => T,
+  factory: (data: SkData[]) => T,
   deps: DependencyList = []
 ) => {
   const [data, setData] = useState<T | null>(null);
@@ -34,7 +34,7 @@ export const useDataCollection = <T>(
 
 export const useRawData = <T>(
   source: DataSource | null | undefined,
-  factory: (data: Data) => T,
+  factory: (data: SkData) => T,
   onError?: (err: Error) => void
 ) => {
   const [data, setData] = useState<T | null>(null);
@@ -44,7 +44,7 @@ export const useRawData = <T>(
     if (prevSourceRef.current !== source) {
       prevSourceRef.current = source;
       if (source !== null && source !== undefined) {
-        const factoryWrapper = (data2: Data) => {
+        const factoryWrapper = (data2: SkData) => {
           const factoryResult = factory(data2);
           if (factoryResult === null) {
             onError && onError(new Error("Could not load data"));
@@ -70,7 +70,7 @@ export const useRawData = <T>(
   return data;
 };
 
-const identity = (data: Data) => data;
+const identity = (data: SkData) => data;
 
 export const useData = (
   source: DataSource | null | undefined,

package/src/skia/types/Data/Data.ts

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

package/src/skia/types/Data/DataFactory.ts

@@ -1,19 +1,19 @@
-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/src/skia/types/Image/ImageFactory.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import type { Data } from "../Data";
+import type { SkData } from "../Data";
 
 import type { SkImage } from "./Image";
 
@@ -62,7 +62,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.
@@ -74,5 +74,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/src/skia/types/SVG/SVGFactory.ts

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

package/src/skia/types/Typeface/TypefaceFactory.ts

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

package/src/skia/web/api/JsiSkData.ts

@@ -1,7 +1,6 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
-// TODO: rename Data to SkData
-import type { Data as SkData } from "../../types";
+import type { SkData } from "../../types";
 
 import { HostObject } from "./Host";
 

package/src/skia/web/api/JsiSkDataFactory.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
-import type { Data } from "../../types";
+import type { SkData } from "../../types";
 import type { DataFactory } from "../../types/Data/DataFactory";
 
 import { Host, NotImplementedOnRNWeb } from "./Host";
@@ -27,7 +27,7 @@ export class JsiSkDataFactory extends Host implements DataFactory {
    * 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 {
     throw new NotImplementedOnRNWeb();
   }
 }

package/src/skia/web/api/JsiSkImageFactory.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
-import type { Data, ImageInfo } from "../../types";
+import type { SkData, ImageInfo } from "../../types";
 import type { ImageFactory } from "../../types/Image/ImageFactory";
 
 import { Host, toValue, ckEnum } from "./Host";
@@ -11,15 +11,15 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     super(CanvasKit);
   }
 
-  MakeImageFromEncoded(encoded: Data) {
+  MakeImageFromEncoded(encoded: SkData) {
     const image = this.CanvasKit.MakeImageFromEncoded(toValue(encoded));
     if (image === null) {
       return null;
     }
     return new JsiSkImage(this.CanvasKit, image);
   }
 
-  MakeImage(info: ImageInfo, data: Data, bytesPerRow: number) {
+  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {
     // see toSkImageInfo() from canvaskit
     const image = this.CanvasKit.MakeImage(
       {

package/src/skia/web/api/JsiSkSVGFactory.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
-import type { Data, SkSVG } from "../../types";
+import type { SkData, SkSVG } from "../../types";
 import type { SVGFactory } from "../../types/SVG/SVGFactory";
 
 import { Host, NotImplementedOnRNWeb } from "./Host";
@@ -10,7 +10,7 @@ export class JsiSkSVGFactory extends Host implements SVGFactory {
     super(CanvasKit);
   }
 
-  MakeFromData(_data: Data): SkSVG | null {
+  MakeFromData(_data: SkData): SkSVG | null {
     throw new NotImplementedOnRNWeb();
   }