Skip to content

Commit 211f51c

Browse files
committed
Avoid {} in types
1 parent b3b8836 commit 211f51c

File tree

8 files changed

+25
-23
lines changed

8 files changed

+25
-23
lines changed

add-http-pages/index.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let lastPort = 9111
1818

1919
function createServer(
2020
options: Partial<BaseServerOptions> = {}
21-
): BaseServer<{}, TestLog<ServerMeta>> {
21+
): BaseServer<object, TestLog<ServerMeta>> {
2222
let opts = {
2323
...DEFAULT_OPTIONS,
2424
...options
@@ -32,7 +32,7 @@ function createServer(
3232
opts.port = lastPort
3333
}
3434

35-
let created = new BaseServer<{}, TestLog<ServerMeta>>(opts)
35+
let created = new BaseServer<object, TestLog<ServerMeta>>(opts)
3636
created.auth(() => true)
3737

3838
destroyable = created

base-server/index.d.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ interface ChannelOptions {
4444
queue?: string
4545
}
4646

47-
interface ConnectLoader<Headers extends object = {}> {
47+
interface ConnectLoader<Headers extends object = unknown> {
4848
(ctx: ConnectContext<Headers>, lastSynced: number):
4949
| [Action, ServerMeta][]
5050
| Promise<
@@ -358,7 +358,7 @@ interface ActionFinally<
358358
*/
359359
interface ChannelFilter<Headers extends object> {
360360
(
361-
ctx: Context<{}, Headers>,
361+
ctx: Context<unknown, Headers>,
362362
action: Readonly<Action>,
363363
meta: Readonly<ServerMeta>
364364
): boolean | Promise<boolean>
@@ -637,7 +637,7 @@ export function wasNot403(cb: () => Promise<void>): Promise<boolean>
637637
* Base server class to extend.
638638
*/
639639
export class BaseServer<
640-
Headers extends object = {},
640+
Headers extends object = unknown,
641641
ServerLog extends Log = Log<ServerMeta>
642642
> {
643643
/**
@@ -734,7 +734,7 @@ export class BaseServer<
734734
subscribers: {
735735
[channel: string]: {
736736
[nodeId: string]: {
737-
filters: Record<string, ChannelFilter<{}> | true>
737+
filters: Record<string, ChannelFilter<unknown> | true>
738738
unsubscribe?: (action: LoguxUnsubscribeAction, meta: ServerMeta) => void
739739
}
740740
}
@@ -806,8 +806,8 @@ export class BaseServer<
806806
* @param options Additional options
807807
*/
808808
channel<
809-
ChannelParams extends object = {},
810-
Data extends object = {},
809+
ChannelParams extends object = unknown,
810+
Data extends object = unknown,
811811
SubscribeAction extends LoguxSubscribeAction = LoguxSubscribeAction
812812
>(
813813
pattern: string,
@@ -822,7 +822,7 @@ export class BaseServer<
822822
*/
823823
channel<
824824
ChannelParams extends string[] = string[],
825-
Data extends object = {},
825+
Data extends object = unknown,
826826
SubscribeAction extends LoguxSubscribeAction = LoguxSubscribeAction
827827
>(
828828
pattern: RegExp,
@@ -1054,7 +1054,7 @@ export class BaseServer<
10541054
*
10551055
* @param callbacks Callback during subscription process.
10561056
*/
1057-
otherChannel<Data extends object = {}>(
1057+
otherChannel<Data extends object = unknown>(
10581058
callbacks: ChannelCallbacks<LoguxSubscribeAction, Data, [string], Headers>
10591059
): void
10601060

@@ -1084,7 +1084,7 @@ export class BaseServer<
10841084
*
10851085
* @param callbacks Callbacks for actions with this type.
10861086
*/
1087-
otherType<Data extends object = {}>(
1087+
otherType<Data extends object = unknown>(
10881088
callbacks: ActionCallbacks<Action, Data, Headers>
10891089
): void
10901090

@@ -1151,7 +1151,7 @@ export class BaseServer<
11511151
* @param callbacks Callbacks for action created by creator.
11521152
* @param options Additional options
11531153
*/
1154-
type<Creator extends AbstractActionCreator, Data extends object = {}>(
1154+
type<Creator extends AbstractActionCreator, Data extends object = unknown>(
11551155
actionCreator: Creator,
11561156
callbacks: ActionCallbacks<ReturnType<Creator>, Data, Headers>,
11571157
options?: TypeOptions
@@ -1180,7 +1180,7 @@ export class BaseServer<
11801180
* @param callbacks Callbacks for actions with this type.
11811181
* @param options Additional options
11821182
*/
1183-
type<TypeAction extends Action = AnyAction, Data extends object = {}>(
1183+
type<TypeAction extends Action = AnyAction, Data extends object = unknown>(
11841184
name: RegExp | TypeAction['type'],
11851185
callbacks: ActionCallbacks<TypeAction, Data, Headers>,
11861186
options?: TypeOptions

base-server/index.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let lastPort = 9111
3535

3636
function createServer(
3737
options: Partial<BaseServerOptions> = {}
38-
): BaseServer<{}, TestLog<ServerMeta>> {
38+
): BaseServer<object, TestLog<ServerMeta>> {
3939
let opts = {
4040
...DEFAULT_OPTIONS,
4141
...options
@@ -49,7 +49,7 @@ function createServer(
4949
opts.port = lastPort
5050
}
5151

52-
let created = new BaseServer<{}, TestLog<ServerMeta>>(opts)
52+
let created = new BaseServer<object, TestLog<ServerMeta>>(opts)
5353
created.auth(() => true)
5454

5555
destroyable = created
@@ -61,7 +61,7 @@ let destroyable: BaseServer | undefined
6161
let httpServer: http.Server | undefined
6262

6363
function createReporter(opts: Partial<BaseServerOptions> = {}): {
64-
app: BaseServer<{}, TestLog<ServerMeta>>
64+
app: BaseServer<object, TestLog<ServerMeta>>
6565
names: string[]
6666
reports: [string, any][]
6767
} {

context/index.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { ServerMeta } from '../base-server/index.js'
44
import type { ServerClient } from '../server-client/index.js'
55
import type { Server } from '../server/index.js'
66

7-
export class ConnectContext<Headers extends object = {}> {
7+
export class ConnectContext<Headers extends object = unknown> {
88
/**
99
* Unique persistence client ID.
1010
*
@@ -103,8 +103,8 @@ export class ConnectContext<Headers extends object = {}> {
103103
* ```
104104
*/
105105
export class Context<
106-
Data extends object = {},
107-
Headers extends object = {}
106+
Data extends object = unknown,
107+
Headers extends object = unknown
108108
> extends ConnectContext<Headers> {
109109
/**
110110
* Open structure to save some data between different steps of processing.

filtered-node/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { afterEach, expect, it } from 'vitest'
44
import { FilteredNode } from '../filtered-node/index.js'
55

66
type Test = {
7-
client: ClientNode<{}, TestLog>
7+
client: ClientNode<object, TestLog>
88
server: FilteredNode
99
}
1010

server/index.d.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ export interface ServerOptions extends BaseServerOptions {
7676
* server.listen()
7777
* ```
7878
*/
79-
export class Server<Headers extends object = {}> extends BaseServer<Headers> {
79+
export class Server<
80+
Headers extends object = unknown
81+
> extends BaseServer<Headers> {
8082
/**
8183
* Server options.
8284
*

test-client/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ it('detects action ID duplicate', async () => {
196196

197197
it('tracks subscriptions', async () => {
198198
server = new TestServer()
199-
server.channel<{}, {}, LoguxSubscribeAction>('foo', {
199+
server.channel<object, object, LoguxSubscribeAction>('foo', {
200200
access: () => true,
201201
load(ctx, action) {
202202
ctx.sendBack({ a: action.filter?.a, since: action.since, type: 'FOO' })

test-server/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export interface TestServerOptions
4646
* ```
4747
*/
4848
export class TestServer<
49-
Headers extends object = {}
49+
Headers extends object = unknown
5050
> extends BaseServer<Headers> {
5151
/**
5252
* fetch() compatible API to test HTTP endpoints.

0 commit comments

Comments
 (0)