From 5712310739933ce224e2db5e74d83341464fce8d Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 14 Nov 2024 18:05:48 +0300 Subject: [PATCH] Renamed interop types.ts to InteropTypes.ts Signed-off-by: Alexander Gorshenev --- interop/src/arkts/{types.sts => InteropTypes.sts} | 0 interop/src/arkts/callback.sts | 4 ++-- interop/src/arkts/index.sts | 4 ++-- interop/src/interop/Finalizable.ts | 2 +- interop/src/interop/InteropOps.ts | 2 +- interop/src/interop/{types.ts => InteropTypes.ts} | 0 interop/src/interop/Platform.ts | 2 +- interop/src/interop/Wrapper.ts | 2 +- interop/src/interop/index.ts | 4 ++-- interop/src/interop/nullable.ts | 2 +- interop/src/napi/wrappers/Callback.ts | 2 +- interop/src/napi/wrappers/Wrapper.ts | 2 +- interop/src/wasm/wrappers/Callback.ts | 4 ++-- interop/src/wasm/wrappers/Wrapper.ts | 4 ++-- interop/src/wasm/wrappers/arrays.ts | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) rename interop/src/arkts/{types.sts => InteropTypes.sts} (100%) rename interop/src/interop/{types.ts => InteropTypes.ts} (100%) diff --git a/interop/src/arkts/types.sts b/interop/src/arkts/InteropTypes.sts similarity index 100% rename from interop/src/arkts/types.sts rename to interop/src/arkts/InteropTypes.sts diff --git a/interop/src/arkts/callback.sts b/interop/src/arkts/callback.sts index 2c275504d..5a2afad1e 100644 --- a/interop/src/arkts/callback.sts +++ b/interop/src/arkts/callback.sts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { KUint8ArrayPtr } from "./types" +import { KUint8ArrayPtr } from "./InteropTypes" import { int32 } from "@koalaui/common" export type CallbackType = (args: KUint8ArrayPtr, length: int32) => int32 @@ -80,4 +80,4 @@ export function disposeCallback(id: int32) { export function callCallback(id: int32, args: KUint8ArrayPtr, length: int32): int32 { return CallbackRegistry.INSTANCE.call(id, args, length) -} \ No newline at end of file +} diff --git a/interop/src/arkts/index.sts b/interop/src/arkts/index.sts index efa32172f..5fa6716eb 100644 --- a/interop/src/arkts/index.sts +++ b/interop/src/arkts/index.sts @@ -13,7 +13,7 @@ * limitations under the License. */ -export * from "./types" +export * from "./InteropTypes" export * from "./callback" export * from "./buffer" -export * from "../interop/ResourceManager" \ No newline at end of file +export * from "../interop/ResourceManager" diff --git a/interop/src/interop/Finalizable.ts b/interop/src/interop/Finalizable.ts index b7d8aadc7..3063c50e0 100644 --- a/interop/src/interop/Finalizable.ts +++ b/interop/src/interop/Finalizable.ts @@ -16,7 +16,7 @@ import { Wrapper } from "./Wrapper" import { nullptr, isNullPtr } from "./Wrapper" import { finalizerRegister, finalizerUnregister, Thunk } from "@koalaui/common" -import { pointer } from "./types" +import { pointer } from "./InteropTypes" export abstract class NativeThunk implements Thunk { finalizer: pointer diff --git a/interop/src/interop/InteropOps.ts b/interop/src/interop/InteropOps.ts index 9ff8222a4..775212e76 100644 --- a/interop/src/interop/InteropOps.ts +++ b/interop/src/interop/InteropOps.ts @@ -15,7 +15,7 @@ import { int32 } from "@koalaui/common" import { withStringResult } from "./Platform" -import { KInt, KStringPtr, KUint8ArrayPtr, pointer } from "./types" +import { KInt, KStringPtr, KUint8ArrayPtr, pointer } from "./InteropTypes" export type CallbackType = (args: Uint8Array, length: int32) => int32 diff --git a/interop/src/interop/types.ts b/interop/src/interop/InteropTypes.ts similarity index 100% rename from interop/src/interop/types.ts rename to interop/src/interop/InteropTypes.ts diff --git a/interop/src/interop/Platform.ts b/interop/src/interop/Platform.ts index 4126565bb..5ff7d072d 100644 --- a/interop/src/interop/Platform.ts +++ b/interop/src/interop/Platform.ts @@ -17,7 +17,7 @@ import { int32 } from "@koalaui/common" import { isNullPtr, nullptr, Wrapper } from "./Wrapper" import { decodeToString } from "#common/wrappers/arrays" import { setCallbackRegistry } from "#common/wrappers/Callback" -import { KPointer } from "./types" +import { KPointer } from "./InteropTypes" export abstract class NativeStringBase extends Wrapper { constructor(ptr: KPointer) { diff --git a/interop/src/interop/Wrapper.ts b/interop/src/interop/Wrapper.ts index 09111aa67..47da5d393 100644 --- a/interop/src/interop/Wrapper.ts +++ b/interop/src/interop/Wrapper.ts @@ -15,7 +15,7 @@ import { ptrToString, nullptr, isSamePtr } from "#common/wrappers/Wrapper" import { className } from "@koalaui/common" -import { KPointer } from "./types" +import { KPointer } from "./InteropTypes" export { isNullPtr, nullptr, ptrToBits, bitsToPtr, isSamePtr, ptrToString } from "#common/wrappers/Wrapper" diff --git a/interop/src/interop/index.ts b/interop/src/interop/index.ts index 57f28cce6..a6c5b6337 100644 --- a/interop/src/interop/index.ts +++ b/interop/src/interop/index.ts @@ -60,8 +60,8 @@ export { } export * from "./Platform" -export * from "./types" +export * from "./InteropTypes" export * from "./InteropOps" export * from "./buffer" -export * from "./ResourceManager" \ No newline at end of file +export * from "./ResourceManager" diff --git a/interop/src/interop/nullable.ts b/interop/src/interop/nullable.ts index bed22d577..1a1875e25 100644 --- a/interop/src/interop/nullable.ts +++ b/interop/src/interop/nullable.ts @@ -14,7 +14,7 @@ */ import { isNullPtr } from "./Wrapper" -import { KPointer } from "./types" +import { KPointer } from "./InteropTypes" export function nullable(value: KPointer, body: (arg: KPointer) => T | undefined): T | undefined { if (isNullPtr(value)) { diff --git a/interop/src/napi/wrappers/Callback.ts b/interop/src/napi/wrappers/Callback.ts index 1bca17abf..5af4ae26b 100644 --- a/interop/src/napi/wrappers/Callback.ts +++ b/interop/src/napi/wrappers/Callback.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { KPointer } from "../../interop/types" +import { KPointer } from "../../interop/InteropTypes" import { CallbackRegistry } from "../../interop/Platform" export function registerCallback(callback: any, obj: any = null): KPointer { diff --git a/interop/src/napi/wrappers/Wrapper.ts b/interop/src/napi/wrappers/Wrapper.ts index a2f7c8244..87fae7866 100644 --- a/interop/src/napi/wrappers/Wrapper.ts +++ b/interop/src/napi/wrappers/Wrapper.ts @@ -14,7 +14,7 @@ */ import { int32 } from "@koalaui/common" -import { KPointer } from "../../interop/types" +import { KPointer } from "../../interop/InteropTypes" export const nullptr = BigInt(0) diff --git a/interop/src/wasm/wrappers/Callback.ts b/interop/src/wasm/wrappers/Callback.ts index 630339a76..abc939bca 100644 --- a/interop/src/wasm/wrappers/Callback.ts +++ b/interop/src/wasm/wrappers/Callback.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { KPointer } from "../../interop/types" +import { KPointer } from "../../interop/InteropTypes" import { CallbackRegistry } from "../../interop/Platform" class CallbackInfo { @@ -96,4 +96,4 @@ globalThis.releaseCallback = releaseCallback export function setCallbackRegistry(_ignoredRegistry: CallbackRegistry) { // On WASM we don't need registry in current implementation. -} \ No newline at end of file +} diff --git a/interop/src/wasm/wrappers/Wrapper.ts b/interop/src/wasm/wrappers/Wrapper.ts index 6e5b11f89..8c0dc94f6 100644 --- a/interop/src/wasm/wrappers/Wrapper.ts +++ b/interop/src/wasm/wrappers/Wrapper.ts @@ -14,7 +14,7 @@ */ import { int32 } from "@koalaui/common" -import { KPointer } from "../../interop/types" +import { KPointer } from "../../interop/InteropTypes" export const nullptr: number = 0 @@ -41,4 +41,4 @@ export function ptrToBits(ptr: KPointer): Uint32Array { export function bitsToPtr(array: Int32Array, offset: int32): KPointer { return array[offset] -} \ No newline at end of file +} diff --git a/interop/src/wasm/wrappers/arrays.ts b/interop/src/wasm/wrappers/arrays.ts index 036af8e71..cbb1f1e16 100644 --- a/interop/src/wasm/wrappers/arrays.ts +++ b/interop/src/wasm/wrappers/arrays.ts @@ -15,7 +15,7 @@ import { CustomTextEncoder, CustomTextDecoder, int32 } from "@koalaui/common" -import { KPointer } from "../../interop/types" +import { KPointer } from "../../interop/InteropTypes" import { Wrapper } from "../../interop/Wrapper" import { Access, isRead, isWrite, Exec, TypedArray, ExecWithLength } from "../../interop/arrays" -- Gitee