Skip to content

change type assignments to interfaces for augmentation purposes #58753

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 4 commits into from
Feb 19, 2022
Merged

change type assignments to interfaces for augmentation purposes #58753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac30470
change type assignments to interfaces for augmentation purposes
cwadrupldijjit Feb 13, 2022
d2c6c9f
fix tests for expected type for augmentation and no-empty-interfaces
cwadrupldijjit Feb 13, 2022
7aaf196
add server augmentation test
cwadrupldijjit Feb 18, 2022
954895b
Remove the failing blank line
cwadrupldijjit Feb 18, 2022
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
7 changes: 4 additions & 3 deletions types/ws/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// teidesu <https://github.com/teidesu>
// Bartosz Wojtkowiak <https://github.com/wojtkowiak>
// Kyle Hensel <https://github.com/k-yle>
// Samuel Skeen <https://github.com/cwadrupldijjit>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

/// <reference types="node" />
Expand Down Expand Up @@ -171,7 +172,7 @@ declare class WebSocket extends EventEmitter {
}

declare const WebSocketAlias: typeof WebSocket;
type WebSocketAlias = WebSocket;
interface WebSocketAlias extends WebSocket {} // tslint:disable-line no-empty-interface

declare namespace WebSocket {
/**
Expand Down Expand Up @@ -347,9 +348,9 @@ declare namespace WebSocket {
}

const WebSocketServer: typeof Server;
type WebSocketServer = Server;
interface WebSocketServer extends Server {} // tslint:disable-line no-empty-interface
const WebSocket: typeof WebSocketAlias;
type WebSocket = WebSocketAlias;
interface WebSocket extends WebSocketAlias {} // tslint:disable-line no-empty-interface

// WebSocket stream
function createWebSocketStream(websocket: WebSocket, options?: DuplexOptions): Duplex;
Expand Down
21 changes: 21 additions & 0 deletions types/ws/ws-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,24 @@ function f() {
}
});
}

declare module 'ws' {
interface WebSocket {
id?: string;
}

interface Server {
getWebSocketId(): string;
}
}

{
const server = new wslib.WebSocketServer();

server.on('connection', (ws) => {
// $ExpectType string | undefined
ws.id;

ws.id = server.getWebSocketId();
});
}