Merge pull request #2034 from mrazauskas/upgrade-tstyche

jdeniau · jdeniau · commit 41ec5f65690b · 2024-11-19T14:23:05.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -127,7 +127,7 @@
     "rollup": "3.28.1",
     "size-limit": "^8.2.6",
     "transducers-js": "0.4.174",
-    "tstyche": "^2.1.1",
+    "tstyche": "^3.0.0-rc.2",
     "typescript": "5.1"
   },
   "size-limit": [
diff --git a/tstyche.config.json b/tstyche.config.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://tstyche.org/schemas/config.json",
   "testFileMatch": [
-    "**/type-definitions/ts-tests/*.ts"
+    "type-definitions/ts-tests/*.ts"
   ]
 }
diff --git a/type-definitions/ts-tests/list.ts b/type-definitions/ts-tests/list.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import {
   List,
   get,
@@ -21,9 +21,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(List().size).type.toBeNumber();
-
-  expect(List()).type.toMatch<{ readonly size: number }>();
+  expect(pick(List(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('#setSize', () => {
diff --git a/type-definitions/ts-tests/map.ts b/type-definitions/ts-tests/map.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { Map, List, MapOf, OrderedMap } from 'immutable';
 
 test('#constructor', () => {
@@ -45,9 +45,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(Map().size).type.toBeNumber();
-
-  expect(Map()).type.toMatch<{ readonly size: number }>();
+  expect(pick(Map(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('#get', () => {
diff --git a/type-definitions/ts-tests/ordered-map.ts b/type-definitions/ts-tests/ordered-map.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { OrderedMap, List } from 'immutable';
 
 test('#constructor', () => {
@@ -20,9 +20,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(OrderedMap().size).type.toBeNumber();
-
-  expect(OrderedMap()).type.toMatch<{ readonly size: number }>();
+  expect(pick(OrderedMap(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('#get', () => {
diff --git a/type-definitions/ts-tests/ordered-set.ts b/type-definitions/ts-tests/ordered-set.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { Collection, OrderedSet, Map } from 'immutable';
 
 test('#constructor', () => {
@@ -12,9 +12,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(OrderedSet().size).type.toBeNumber();
-
-  expect(OrderedSet()).type.toMatch<{ readonly size: number }>();
+  expect(pick(OrderedSet(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('.of', () => {
diff --git a/type-definitions/ts-tests/record.ts b/type-definitions/ts-tests/record.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { List, Map, MapOf, Record, RecordOf, Set } from 'immutable';
 
 test('Factory', () => {
@@ -14,13 +14,9 @@ test('Factory', () => {
     Record<{ x: number; y: number }> & Readonly<{ x: number; y: number }>
   >();
 
-  expect(pointXY.x).type.toBeNumber();
+  expect(pick(pointXY, 'x')).type.toBe<{ readonly x: number }>();
 
-  expect(pointXY).type.toMatch<{ readonly x: number }>();
-
-  expect(pointXY.y).type.toBeNumber();
-
-  expect(pointXY).type.toMatch<{ readonly y: number }>();
+  expect(pick(pointXY, 'y')).type.toBe<{ readonly y: number }>();
 
   expect(pointXY.toJS()).type.toBe<{ x: number; y: number }>();
 
diff --git a/type-definitions/ts-tests/seq.ts b/type-definitions/ts-tests/seq.ts
@@ -1,12 +1,12 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { Seq } from 'immutable';
 
 test('#constructor', () => {
   expect(Seq([1, 2, 3])).type.toBe<Seq.Indexed<number>>();
 });
 
 test('#size', () => {
-  expect(Seq().size).type.toBe<number | undefined>();
-
-  expect(Seq()).type.toMatch<{ readonly size: number | undefined }>();
+  expect(pick(Seq(), 'size')).type.toBe<{
+    readonly size: number | undefined;
+  }>();
 });
diff --git a/type-definitions/ts-tests/set.ts b/type-definitions/ts-tests/set.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { Set, Map, Collection, OrderedSet } from 'immutable';
 
 test('#constructor', () => {
@@ -12,9 +12,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(Set().size).type.toBeNumber();
-
-  expect(Set()).type.toMatch<{ readonly size: number }>();
+  expect(pick(Set(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('.of', () => {
diff --git a/type-definitions/ts-tests/stack.ts b/type-definitions/ts-tests/stack.ts
@@ -1,4 +1,4 @@
-import { expect, test } from 'tstyche';
+import { expect, pick, test } from 'tstyche';
 import { Collection, Stack } from 'immutable';
 
 test('#constructor', () => {
@@ -10,9 +10,7 @@ test('#constructor', () => {
 });
 
 test('#size', () => {
-  expect(Stack().size).type.toBeNumber();
-
-  expect(Stack()).type.toMatch<{ readonly size: number }>();
+  expect(pick(Stack(), 'size')).type.toBe<{ readonly size: number }>();
 });
 
 test('.of', () => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://tstyche.org/schemas/config.json",`
`3`	`3`	`"testFileMatch": [`
`4`		`- "*/type-definitions/ts-tests/.ts"`
	`4`	`+ "type-definitions/ts-tests/*.ts"`
`5`	`5`	`]`
`6`	`6`	`}`