diff --git a/tsconfig.json b/tsconfig.json index 85d09a39..19f75f50 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es2022", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - "module": "commonjs", + "module": "nodenext", "declaration": true, "outDir": "./typescript/dist", /* Specify what module code is generated. */ "paths": { diff --git a/typescript/src/async-callbacks.ts b/typescript/src/async-callbacks.ts index 57041c5d..bad5bcf6 100644 --- a/typescript/src/async-callbacks.ts +++ b/typescript/src/async-callbacks.ts @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { CALL_ERROR, CALL_UNEXPECTED_ERROR } from "./rust-call"; -import { type UniffiHandle, UniffiHandleMap } from "./handle-map"; -import { type UniffiByteArray } from "./ffi-types"; +import { CALL_ERROR, CALL_UNEXPECTED_ERROR } from "./rust-call.js"; +import { type UniffiHandle, UniffiHandleMap } from "./handle-map.js"; +import { type UniffiByteArray } from "./ffi-types.js"; // Some additional data we hold for each in-flight promise. type PromiseHelper = { diff --git a/typescript/src/async-rust-call.ts b/typescript/src/async-rust-call.ts index 0ddc9b95..9ce589c1 100644 --- a/typescript/src/async-rust-call.ts +++ b/typescript/src/async-rust-call.ts @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { UniffiInternalError } from "./errors"; -import { type UniffiByteArray } from "./ffi-types"; -import { UniffiHandleMap, type UniffiHandle } from "./handle-map"; +import { UniffiInternalError } from "./errors.js"; +import { type UniffiByteArray } from "./ffi-types.js"; +import { UniffiHandleMap, type UniffiHandle } from "./handle-map.js"; import { type UniffiErrorHandler, type UniffiRustCallStatus, UniffiRustCaller, -} from "./rust-call"; +} from "./rust-call.js"; const UNIFFI_RUST_FUTURE_POLL_READY = 0; const UNIFFI_RUST_FUTURE_POLL_MAYBE_READY = 1; diff --git a/typescript/src/callbacks.ts b/typescript/src/callbacks.ts index 703b7982..233ed472 100644 --- a/typescript/src/callbacks.ts +++ b/typescript/src/callbacks.ts @@ -3,18 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { type FfiConverter, FfiConverterUInt64 } from "./ffi-converters"; -import { type UniffiByteArray, RustBuffer } from "./ffi-types"; +import { type FfiConverter, FfiConverterUInt64 } from "./ffi-converters.js"; +import { type UniffiByteArray, RustBuffer } from "./ffi-types.js"; import { type UniffiHandle, UniffiHandleMap, defaultUniffiHandle, -} from "./handle-map"; +} from "./handle-map.js"; import { CALL_ERROR, CALL_UNEXPECTED_ERROR, type UniffiRustCallStatus, -} from "./rust-call"; +} from "./rust-call.js"; const handleConverter = FfiConverterUInt64; diff --git a/typescript/src/errors.ts b/typescript/src/errors.ts index cb8a6864..e01f803a 100644 --- a/typescript/src/errors.ts +++ b/typescript/src/errors.ts @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { uniffiTypeNameSymbol } from "./symbols"; +import { uniffiTypeNameSymbol } from "./symbols.js"; // The top level error class for all uniffi-wrapped errors. // diff --git a/typescript/src/ffi-converters.ts b/typescript/src/ffi-converters.ts index fa4bddfd..ecd38c0c 100644 --- a/typescript/src/ffi-converters.ts +++ b/typescript/src/ffi-converters.ts @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { UniffiInternalError } from "./errors"; -import { type UniffiByteArray, RustBuffer } from "./ffi-types"; +import { UniffiInternalError } from "./errors.js"; +import { type UniffiByteArray, RustBuffer } from "./ffi-types.js"; // https://github.com/mozilla/uniffi-rs/blob/main/docs/manual/src/internals/lifting_and_lowering.md export interface FfiConverter { diff --git a/typescript/src/ffi-types.ts b/typescript/src/ffi-types.ts index abb7edc1..b7669bd4 100644 --- a/typescript/src/ffi-types.ts +++ b/typescript/src/ffi-types.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { UniffiInternalError } from "./errors"; +import { UniffiInternalError } from "./errors.js"; export type UniffiByteArray = Uint8Array; diff --git a/typescript/src/handle-map.ts b/typescript/src/handle-map.ts index 9df30efc..bbd363d4 100644 --- a/typescript/src/handle-map.ts +++ b/typescript/src/handle-map.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { UniffiInternalError } from "./errors"; +import { UniffiInternalError } from "./errors.js"; export type UniffiHandle = bigint; export const defaultUniffiHandle = BigInt("0"); diff --git a/typescript/src/index.ts b/typescript/src/index.ts index bb5b5405..40222a7b 100644 --- a/typescript/src/index.ts +++ b/typescript/src/index.ts @@ -6,17 +6,17 @@ // Entry point for the runtime for uniffi-bindgen-react-native. // This modules is not needed directly, but is imported from generated code. // -export * from "./async-callbacks"; -export * from "./async-rust-call"; -export * from "./callbacks"; -export * from "./enums"; -export * from "./errors"; -export * from "./ffi-converters"; -export * from "./ffi-types"; -export * from "./handle-map"; -export * from "./objects"; -export * from "./records"; -export * from "./result"; -export * from "./rust-call"; -export * from "./symbols"; -export * from "./type-utils"; +export * from "./async-callbacks.js"; +export * from "./async-rust-call.js"; +export * from "./callbacks.js"; +export * from "./enums.js"; +export * from "./errors.js"; +export * from "./ffi-converters.js"; +export * from "./ffi-types.js"; +export * from "./handle-map.js"; +export * from "./objects.js"; +export * from "./records.js"; +export * from "./result.js"; +export * from "./rust-call.js"; +export * from "./symbols.js"; +export * from "./type-utils.js"; diff --git a/typescript/src/objects.ts b/typescript/src/objects.ts index 7f5e9af9..f1807acb 100644 --- a/typescript/src/objects.ts +++ b/typescript/src/objects.ts @@ -8,12 +8,12 @@ import { AbstractFfiConverterByteArray, type FfiConverter, FfiConverterUInt64, -} from "./ffi-converters"; -import { RustBuffer } from "./ffi-types"; -import type { UniffiRustArcPtr } from "./rust-call"; -import { type UniffiHandle, UniffiHandleMap } from "./handle-map"; -import { type StructuralEquality } from "./type-utils"; -import { UniffiInternalError, UniffiThrownObject } from "./errors"; +} from "./ffi-converters.js"; +import { RustBuffer } from "./ffi-types.js"; +import type { UniffiRustArcPtr } from "./rust-call.js"; +import { type UniffiHandle, UniffiHandleMap } from "./handle-map.js"; +import { type StructuralEquality } from "./type-utils.js"; +import { UniffiInternalError, UniffiThrownObject } from "./errors.js"; /** * Marker interface for all `interface` objects that cross the FFI. diff --git a/typescript/src/result.ts b/typescript/src/result.ts index edc51fe1..54311e66 100644 --- a/typescript/src/result.ts +++ b/typescript/src/result.ts @@ -4,9 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { type UniffiByteArray } from "./ffi-types"; -import { type UniffiReferenceHolder } from "./callbacks"; -import { type UniffiRustCallStatus } from "./rust-call"; +import { type UniffiByteArray } from "./ffi-types.js"; +import { type UniffiReferenceHolder } from "./callbacks.js"; +import { type UniffiRustCallStatus } from "./rust-call.js"; // This Result combines RustCallStatus and ReferenceHolder. // This is principally so we can _return_ something from calling from native into typescript. diff --git a/typescript/src/rust-call.ts b/typescript/src/rust-call.ts index 4e13799c..0cdfaf96 100644 --- a/typescript/src/rust-call.ts +++ b/typescript/src/rust-call.ts @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ -import { UniffiInternalError } from "./errors"; -import { type UniffiByteArray } from "./ffi-types"; +import { UniffiInternalError } from "./errors.js"; +import { type UniffiByteArray } from "./ffi-types.js"; export const CALL_SUCCESS = 0; export const CALL_ERROR = 1;