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 2c275504d84b334caa69a782caca091e7312527f..5a2afad1ec59a153d60b3f67a188222b11904e7e 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 efa32172f864a61f69cc95630393627fc1a73ed7..5fa6716eba3a6edfb50addc9f5ff3a3b77f6c446 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 b7d8aadc7a55444e9cbc310da95511c891290667..3063c50e0f47e877ffd3e7584af642549d6e1379 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 9ff8222a4577776f45e2d50072f2c71692fb753c..775212e76c1868b9eabde07d2e664062769be906 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 4126565bbd9985e7f30a69253f8e5a6d29f45669..5ff7d072d63fccafde387c3add3b113d09e6d728 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 09111aa67f6d40e264cb1bdb0fb93d187b5cc036..47da5d393a829537ec07e306933c50da80008800 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 57f28cce634aa06fba7eb08c617f5894b198f688..a6c5b63374d1de6683ce25d5fe9daa0641c5b6cc 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 bed22d5779207a5a299c5e6d1cb90bae054fc197..1a1875e25662eecfade68bb221dccad907d45e36 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 1bca17abf5c75c443c9b792e56681357545ca404..5af4ae26bf1ad7d2f0e3d71003d08e9aac3a5077 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 a2f7c8244201011241db114f9aa4bfa8212242bf..87fae78665863b017f80ea0801ed190b26b8b253 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 630339a7631ab567a67ecf3c5865a7bf8e5b3f2b..abc939bcaf4f8548a8eca0ee7e35fd7389a203a0 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 6e5b11f89d631248dfe7c522f467b680b6c8bc95..8c0dc94f636766eeaad9573cfc07308e230ebd05 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 036af8e717fb34dc5f3fb23efcc2af43821fc247..cbb1f1e16ba312567b7c4bd7b905375bcb5f9cfa 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"