From d0f25d70bde1db450c18b42f412c2beeb0092612 Mon Sep 17 00:00:00 2001 From: Tony133 Date: Wed, 29 Apr 2026 10:11:22 +0200 Subject: [PATCH] refactor(types): migrate from tsd to tstyche --- package.json | 6 +++--- types/index.test-d.ts | 27 --------------------------- types/index.tst.ts | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 30 deletions(-) delete mode 100644 types/index.test-d.ts create mode 100644 types/index.tst.ts diff --git a/package.json b/package.json index cdda594..a9a4445 100644 --- a/package.json +++ b/package.json @@ -60,14 +60,14 @@ "c8": "^11.0.0", "eslint": "^9.17.0", "neostandard": "^0.13.0", - "tsd": "^0.33.0" + "tstyche": "^7.0.0" }, "scripts": { "bench": "node benchmark/index.js", "lint": "eslint", "lint:fix": "eslint --fix", "test": "npm run test:unit && npm run test:typescript", - "test:typescript": "tsd", + "test:typescript": "tstyche", "test:unit": "c8 --100 node --test" } -} +} \ No newline at end of file diff --git a/types/index.test-d.ts b/types/index.test-d.ts deleted file mode 100644 index fd87133..0000000 --- a/types/index.test-d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import proxyaddr from '..' -import { createServer } from 'node:http' -import { expectType } from 'tsd' - -createServer(req => { - expectType(proxyaddr(req, addr => addr === '127.0.0.1')) - expectType(proxyaddr(req, (_addr, i) => i < 1)) - - expectType(proxyaddr(req, '127.0.0.1')) - expectType(proxyaddr(req, ['127.0.0.0/8', '10.0.0.0/8'])) - expectType(proxyaddr(req, ['127.0.0.0/255.0.0.0', '192.168.0.0/255.255.0.0'])) - - expectType(proxyaddr(req, '::1')) - expectType(proxyaddr(req, ['::1/128', 'fe80::/10'])) - - expectType(proxyaddr(req, 'loopback')) - expectType(proxyaddr(req, ['loopback', 'fc00:ac:1ab5:fff::1/64'])) - - expectType(proxyaddr.all(req)) - expectType(proxyaddr.all(req, 'loopback')) - - proxyaddr.compile(['localhost']) - - const trust = proxyaddr.compile('localhost') - expectType<(addr: string, i: number) => boolean>(trust) - proxyaddr(req, trust) -}) diff --git a/types/index.tst.ts b/types/index.tst.ts new file mode 100644 index 0000000..d80b091 --- /dev/null +++ b/types/index.tst.ts @@ -0,0 +1,33 @@ +import proxyaddr from '..' +import { createServer } from 'node:http' +import { expect } from 'tstyche' + +createServer((req) => { + expect(proxyaddr(req, (addr) => addr === '127.0.0.1')).type.toBe() + expect(proxyaddr(req, (_addr, i) => i < 1)).type.toBe() + + expect(proxyaddr(req, '127.0.0.1')).type.toBe() + expect(proxyaddr(req, ['127.0.0.0/8', '10.0.0.0/8'])).type.toBe() + expect( + proxyaddr(req, ['127.0.0.0/255.0.0.0', '192.168.0.0/255.255.0.0']) + ).type.toBe() + + expect(proxyaddr(req, '::1')).type.toBe() + expect(proxyaddr(req, ['::1/128', 'fe80::/10'])).type.toBe() + + expect(proxyaddr(req, 'loopback')).type.toBe() + expect( + proxyaddr(req, ['loopback', 'fc00:ac:1ab5:fff::1/64']) + ).type.toBe() + + expect(proxyaddr.all(req)).type.toBe() + expect(proxyaddr.all(req, 'loopback')).type.toBe() + + proxyaddr.compile(['localhost']) + + const trust = proxyaddr.compile('localhost') + + expect(trust).type.toBe<(addr: string, i: number) => boolean>() + + proxyaddr(req, trust) +})