Skip to content

Add class types to emscripten, fix readable-stream #69218

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.

Sign up for GitHub

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
typescript-bot merged 7 commits into from
May 13, 2024
+41 −7
Merged

Add class types to emscripten, fix readable-stream #69218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20cf39e
Added emscripten class types
james-pre Mar 31, 2024
0fa7bb9
Formatting
james-pre Mar 31, 2024
1ee2e96
Fixed readable stream types
james-pre Apr 5, 2024
0066922
Fixed null initialized FSStream.node
james-pre Apr 19, 2024
a2b5ba1
Removed internal API properties
james-pre Apr 22, 2024
b0950d2
Merge branch 'master' into master
May 4, 2024
b1a6b5a
Formatting
james-pre May 4, 2024
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
40 changes: 37 additions & 3 deletions types/emscripten/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ declare namespace WebAssembly {
}

declare namespace Emscripten {
interface FileSystemType {}
interface FileSystemType {
mount(mount: FS.Mount): FS.FSNode;
syncfs(mount: FS.Mount, populate: () => unknown, done: (err?: number | null) => unknown): void;
}
type EnvironmentType = "WEB" | "NODE" | "SHELL" | "WORKER";

type JSType = "number" | "string" | "array" | "boolean";
Expand Down Expand Up @@ -115,14 +118,45 @@ declare namespace FS {
parentObject: Lookup["node"];
}

interface FSStream {}
interface FSNode {
interface Mount {
type: Emscripten.FileSystemType;
opts: object;
mountpoint: string;
mounts: Mount[];
root: FSNode;
}

class FSStream {
constructor();
object: FSNode;
readonly isRead: boolean;
readonly isWrite: boolean;
readonly isAppend: boolean;
flags: number;
position: number;
}

class FSNode {
parent: FSNode;
mount: Mount;
mounted?: Mount;
id: number;
name: string;
mode: number;
rdev: number;
readMode: number;
writeMode: number;
constructor(parent: FSNode, name: string, mode: number, rdev: number);
read: boolean;
write: boolean;
readonly isFolder: boolean;
readonly isDevice: boolean;
}

class ErrnoError extends Error {
name: "ErronoError";
errno: number;
code: string;
}

let ignorePermissions: boolean;
Expand Down
8 changes: 4 additions & 4 deletions types/readable-stream/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,15 +416,15 @@ declare namespace _Readable {
destroy?(this: _IReadable, error: Error | null, callback: (error: Error | null) => void): void;
};

class Readable extends _Readable {
class Readable extends _Readable implements NodeJS.ReadableStream {
readonly readableAborted: boolean;
readonly readableDidRead: boolean;
readonly readableEncoding: BufferEncoding | null;
readonly readableEnded: boolean;
readonly readableObjectMode: boolean;

constructor(options?: ReadableOptions);
pipe<T extends _IWritable>(destination: T, options?: { end?: boolean | undefined }): T;
pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean | undefined }): T;
Comment thread
james-pre marked this conversation as resolved.
compose<T extends NodeJS.ReadableStream>(
stream: T | ComposeFnParam | Iterable<T> | AsyncIterable<T>,
options?: { signal: AbortSignal },
Expand Down Expand Up @@ -555,7 +555,7 @@ declare namespace _Readable {
end(str: string, encoding?: BufferEncoding, cb?: () => void): this;
}

class _Writable extends Stream implements _IWritable {
class _Writable extends Stream implements _IWritable, NodeJS.WritableStream {
writable: boolean;
readonly writableHighWaterMark: number;
readonly writableLength: number;
Expand Down Expand Up @@ -662,7 +662,7 @@ declare namespace _Readable {

class Stream extends _Readable {
constructor(options?: ReadableOptions);
pipe<T extends _IWritable>(destination: T, options?: { end?: boolean | undefined }): T;
pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean | undefined }): T;
compose<T extends NodeJS.ReadableStream>(
stream: T | ComposeFnParam | Iterable<T> | AsyncIterable<T>,
options?: { signal: AbortSignal },
Expand Down