Skip to content

[release/7.0] [wasm] Drop actually not exported types from dotnet.d.ts #75265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 1 addition & 75 deletions src/mono/wasm/runtime/dotnet.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,85 +236,11 @@ declare type ModuleAPI = {
declare function createDotnetRuntime(moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)): Promise<RuntimeAPI>;
declare type CreateDotnetRuntimeType = typeof createDotnetRuntime;

interface IDisposable {
dispose(): void;
get isDisposed(): boolean;
}
declare const enum MemoryViewType {
Byte = 0,
Int32 = 1,
Double = 2
}
interface IMemoryView {
/**
* copies elements from provided source to the wasm memory.
* target has to have the elements of the same type as the underlying C# array.
* same as TypedArray.set()
*/
set(source: TypedArray, targetOffset?: number): void;
/**
* copies elements from wasm memory to provided target.
* target has to have the elements of the same type as the underlying C# array.
*/
copyTo(target: TypedArray, sourceOffset?: number): void;
/**
* same as TypedArray.slice()
*/
slice(start?: number, end?: number): TypedArray;
get length(): number;
get byteLength(): number;
}

declare global {
function getDotnetRuntime(runtimeId: number): RuntimeAPI | undefined;
}

declare const dotnet: ModuleAPI["dotnet"];
declare const exit: ModuleAPI["exit"];
/**
* Span class is JS wrapper for System.Span<T>. This view doesn't own the memory, nor pin the underlying array.
* It's ideal to be used on call from C# with the buffer pinned there or with unmanaged memory.
* It is disposed at the end of the call to JS.
*/
declare class Span implements IMemoryView, IDisposable {
dispose(): void;
get isDisposed(): boolean;
set(source: TypedArray, targetOffset?: number | undefined): void;
copyTo(target: TypedArray, sourceOffset?: number | undefined): void;
slice(start?: number | undefined, end?: number | undefined): TypedArray;
get length(): number;
get byteLength(): number;
}
/**
* ArraySegment class is JS wrapper for System.ArraySegment<T>.
* This wrapper would also pin the underlying array and hold GCHandleType.Pinned until this JS instance is collected.
* User could dispose it manually.
*/
declare class ArraySegment implements IMemoryView, IDisposable {
dispose(): void;
get isDisposed(): boolean;
set(source: TypedArray, targetOffset?: number | undefined): void;
copyTo(target: TypedArray, sourceOffset?: number | undefined): void;
slice(start?: number | undefined, end?: number | undefined): TypedArray;
get length(): number;
get byteLength(): number;
}
/**
* Represents proxy to the System.Exception
*/
declare class ManagedError extends Error implements IDisposable {
get stack(): string | undefined;
dispose(): void;
get isDisposed(): boolean;
toString(): string;
}
/**
* Represents proxy to the System.Object
*/
declare class ManagedObject implements IDisposable {
dispose(): void;
get isDisposed(): boolean;
toString(): string;
}

export { ArraySegment, AssetBehaviours, AssetEntry, CreateDotnetRuntimeType, DotnetModuleConfig, EmscriptenModule, IMemoryView, LoadingResource, ManagedError, ManagedObject, MemoryViewType, ModuleAPI, MonoConfig, NativePointer, ResourceRequest, RuntimeAPI, Span, createDotnetRuntime as default, dotnet, exit };
export { CreateDotnetRuntimeType, DotnetModuleConfig, EmscriptenModule, ModuleAPI, MonoConfig, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
59 changes: 3 additions & 56 deletions src/mono/wasm/runtime/export-types.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

import { IDisposable, IMemoryView, MemoryViewType } from "./marshal";
import { AssetBehaviours, AssetEntry, createDotnetRuntime, CreateDotnetRuntimeType, DotnetModuleConfig, RuntimeAPI, LoadingResource, MonoConfig, ResourceRequest, ModuleAPI } from "./types";
import { EmscriptenModule, NativePointer, TypedArray } from "./types/emscripten";
import { createDotnetRuntime, CreateDotnetRuntimeType, DotnetModuleConfig, RuntimeAPI, MonoConfig, ModuleAPI } from "./types";
import { EmscriptenModule } from "./types/emscripten";

// -----------------------------------------------------------
// this files has all public exports from the dotnet.js module
Expand All @@ -20,60 +19,8 @@ export default createDotnetRuntime;
declare const dotnet: ModuleAPI["dotnet"];
declare const exit: ModuleAPI["exit"];

/**
* Span class is JS wrapper for System.Span<T>. This view doesn't own the memory, nor pin the underlying array.
* It's ideal to be used on call from C# with the buffer pinned there or with unmanaged memory.
* It is disposed at the end of the call to JS.
*/
declare class Span implements IMemoryView, IDisposable {
dispose(): void;
get isDisposed(): boolean;
set(source: TypedArray, targetOffset?: number | undefined): void;
copyTo(target: TypedArray, sourceOffset?: number | undefined): void;
slice(start?: number | undefined, end?: number | undefined): TypedArray;
get length(): number;
get byteLength(): number;
}

/**
* ArraySegment class is JS wrapper for System.ArraySegment<T>.
* This wrapper would also pin the underlying array and hold GCHandleType.Pinned until this JS instance is collected.
* User could dispose it manually.
*/
declare class ArraySegment implements IMemoryView, IDisposable {
dispose(): void;
get isDisposed(): boolean;
set(source: TypedArray, targetOffset?: number | undefined): void;
copyTo(target: TypedArray, sourceOffset?: number | undefined): void;
slice(start?: number | undefined, end?: number | undefined): TypedArray;
get length(): number;
get byteLength(): number;
}

/**
* Represents proxy to the System.Exception
*/
declare class ManagedError extends Error implements IDisposable {
get stack(): string | undefined;
dispose(): void;
get isDisposed(): boolean;
toString(): string;
}

/**
* Represents proxy to the System.Object
*/
declare class ManagedObject implements IDisposable {
dispose(): void;
get isDisposed(): boolean;
toString(): string;
}

export {
EmscriptenModule, NativePointer,
EmscriptenModule,
RuntimeAPI, ModuleAPI, DotnetModuleConfig, CreateDotnetRuntimeType, MonoConfig,
AssetEntry, ResourceRequest, LoadingResource, AssetBehaviours,
IMemoryView, MemoryViewType, ManagedObject, ManagedError, Span, ArraySegment,
dotnet, exit
};