Skip to content

Commit 2cc25ed

Browse files
authored
refactor(types): migrate from tsd to tstyche (#86)
1 parent cbfa48e commit 2cc25ed

2 files changed

Lines changed: 36 additions & 34 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint:fix": "eslint --fix",
1111
"unit": "c8 --100 node --test",
1212
"test": "npm run unit && npm run test:typescript",
13-
"test:typescript": "tsd"
13+
"test:typescript": "tstyche"
1414
},
1515
"repository": {
1616
"type": "git",
@@ -58,7 +58,7 @@
5858
"fastify": "^5.0.0",
5959
"neostandard": "^0.13.0",
6060
"sanitize-filename": "^1.6.3",
61-
"tsd": "^0.33.0"
61+
"tstyche": "^7.1.0"
6262
},
6363
"dependencies": {
6464
"fast-json-stringify": "^6.0.0"
Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expectAssignable, expectError, expectType } from 'tsd'
1+
import { expect } from 'tstyche'
22
import SerializerSelector, {
33
RouteDefinition,
44
Serializer,
@@ -14,12 +14,12 @@ import SerializerSelector, {
1414

1515
{
1616
const compiler = SerializerSelector()
17-
expectType<SerializerFactory>(compiler)
17+
expect(compiler).type.toBe<SerializerFactory>()
1818
}
1919

2020
{
2121
const compiler = SerializerSelectorNamed()
22-
expectType<SerializerFactory>(compiler)
22+
expect(compiler).type.toBe<SerializerFactory>()
2323
}
2424

2525
{
@@ -34,13 +34,13 @@ import SerializerSelector, {
3434
const externalSchemas1 = {}
3535

3636
const factory = SerializerSelector()
37-
expectType<SerializerFactory>(factory)
37+
expect(factory).type.toBe<SerializerFactory>()
3838
const compiler = factory(externalSchemas1, {})
39-
expectType<SerializerCompiler>(compiler)
39+
expect(compiler).type.toBe<SerializerCompiler>()
4040
const serializeFunc = compiler({ schema: sampleSchema, method: '', url: '', httpStatus: '' })
41-
expectType<Serializer>(serializeFunc)
41+
expect(serializeFunc).type.toBe<Serializer>()
4242

43-
expectType<string>(serializeFunc({ name: 'hello' }))
43+
expect(serializeFunc({ name: 'hello' })).type.toBe<string>()
4444
}
4545

4646
/**
@@ -49,21 +49,21 @@ import SerializerSelector, {
4949

5050
const reader = StandaloneSerializer({
5151
readMode: true,
52-
restoreFunction: (route: RouteDefinition) => {
53-
expectAssignable<RouteDefinition>(route)
52+
restoreFunction: (route) => {
53+
expect(route).type.toBe<RouteDefinition>()
5454
return {} as Serializer
5555
},
5656
})
57-
expectType<SerializerFactory>(reader)
57+
expect(reader).type.toBe<SerializerFactory>()
5858

5959
const writer = StandaloneSerializer({
6060
readMode: false,
61-
storeFunction: (route: RouteDefinition, code: string) => {
62-
expectAssignable<RouteDefinition>(route)
63-
expectAssignable<string>(code)
61+
storeFunction: (route, code) => {
62+
expect(route).type.toBe<RouteDefinition>()
63+
expect(code).type.toBe<string>()
6464
},
6565
})
66-
expectType<SerializerFactory>(writer)
66+
expect(writer).type.toBe<SerializerFactory>()
6767

6868
{
6969
const base = {
@@ -100,43 +100,45 @@ expectType<SerializerFactory>(writer)
100100
[refSchema.$id]: refSchema
101101
}
102102

103-
expectError(StandaloneSerializer({
103+
expect(StandaloneSerializer).type.not.toBeCallableWith({
104104
readMode: true,
105105
storeFunction () { }
106-
}))
107-
expectError(StandaloneSerializer({
106+
})
107+
108+
expect(StandaloneSerializer).type.not.toBeCallableWith({
108109
readMode: false,
109110
restoreFunction () {}
110-
}))
111-
expectError(StandaloneSerializer({
111+
})
112+
113+
expect(StandaloneSerializer).type.not.toBeCallableWith({
112114
restoreFunction () {}
113-
}))
115+
})
114116

115-
expectType<SerializerFactory>(StandaloneSerializer({
117+
expect(StandaloneSerializer({
116118
storeFunction (routeOpts, schemaSerializerCode) {
117-
expectType<RouteDefinition>(routeOpts)
118-
expectType<string>(schemaSerializerCode)
119+
expect(routeOpts).type.toBe<RouteDefinition>()
120+
expect(schemaSerializerCode).type.toBe<string>()
119121
}
120-
}))
122+
})).type.toBe<SerializerFactory>()
121123

122-
expectType<SerializerFactory>(StandaloneSerializer({
124+
expect(StandaloneSerializer({
123125
readMode: true,
124126
restoreFunction (routeOpts) {
125-
expectType<RouteDefinition>(routeOpts)
127+
expect(routeOpts).type.toBe<RouteDefinition>()
126128
return {} as Serializer
127129
}
128-
}))
130+
})).type.toBe<SerializerFactory>()
129131

130132
const factory = StandaloneSerializer({
131133
readMode: false,
132134
storeFunction (routeOpts, schemaSerializerCode) {
133-
expectType<RouteDefinition>(routeOpts)
134-
expectType<string>(schemaSerializerCode)
135+
expect(routeOpts).type.toBe<RouteDefinition>()
136+
expect(schemaSerializerCode).type.toBe<string>()
135137
}
136138
})
137-
expectType<SerializerFactory>(factory)
139+
expect(factory).type.toBe<SerializerFactory>()
138140

139141
const compiler = factory(schemaMap)
140-
expectType<SerializerCompiler>(compiler)
141-
expectType<Serializer>(compiler(endpointSchema))
142+
expect(compiler).type.toBe<SerializerCompiler>()
143+
expect(compiler(endpointSchema)).type.toBe<Serializer>()
142144
}

0 commit comments

Comments
 (0)