fix more tests

Perryvw · Perryvw · commit d48ecd9be2c4 · 2026-04-13T22:20:37.000+02:00
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -73,7 +73,7 @@ class ResolutionContext {
             return;
         }
 
-        if (this.noResolvePaths.find(isMatch => isMatch.test(required.requirePath))) {
+        if (this.noResolvePaths.find(isMatch => picomatch.test(required.requirePath, isMatch))) {
             if (this.options.tstlVerbose) {
                 console.log(
                     `Skipping module resolution of ${required.requirePath} as it is in the tsconfig noResolvePaths.`
diff --git a/test/unit/destructuring.spec.ts b/test/unit/destructuring.spec.ts
@@ -3,40 +3,50 @@ import * as util from "../util";
 
 const allBindings = "x, y, z, rest";
 const testCases = [
-    { binding: "{ x }", value: { x: true } },
-    { binding: "{ x, y }", value: { x: false, y: true } },
-    { binding: "{ x: z, y }", value: { x: true, y: false } },
-    { binding: "{ x: { x, y }, z }", value: { x: { x: true, y: false }, z: false } },
-    { binding: "{ x, y = true }", value: { x: false, y: false } },
-    { binding: "{ x = true }", value: {} },
-    { binding: "{ x, y = true }", value: { x: false } },
-    { binding: "{ ...rest }", value: {} },
-    { binding: "{ x, ...rest }", value: { x: "x" } },
-    { binding: "{ x, ...rest }", value: { x: "x", y: "y", z: "z" } },
-    { binding: "{ x, ...y }", value: { x: "x", y: "y", z: "z" } },
-    { binding: "{ x: y, ...z }", value: { x: "x", y: "y", z: "z" } },
-
-    { binding: "[]", value: [] },
-    { binding: "[x, y]", value: ["x", "y"] },
-    { binding: "[x, , y]", value: ["x", "", "y"] },
-    { binding: "[x = true]", value: [false] },
-    { binding: "[[x, y]]", value: [["x", "y"]] },
-    { binding: "[x, ...rest]", value: ["x"] },
-    { binding: "[x, ...rest]", value: ["x", "y", "z"] },
-
-    { binding: "{ y: [z = true] }", value: { y: [false] } },
-    { binding: "{ x: [x, y] }", value: { x: ["x", "y"] } },
-    { binding: "{ x: [{ y }] }", value: { x: [{ y: "y" }] } },
-].map(({ binding, value }) => ({ binding, value: util.formatCode(value) }));
+    { binding: "{ x }", type: "{ x: boolean }", value: { x: true } },
+    { binding: "{ x, y }", type: "{ x: boolean, y: boolean }", value: { x: false, y: true } },
+    { binding: "{ x: z, y }", type: "{ x: boolean, y?: boolean, z?: boolean }", value: { x: true, y: false } },
+    {
+        binding: "{ x: { x, y }, z }",
+        type: "{ x: { x: boolean, y: boolean }, z: boolean }",
+        value: { x: { x: true, y: false }, z: false },
+    },
+    { binding: "{ x, y = true }", type: "{ x: boolean, y?: boolean }", value: { x: false, y: false } },
+    { binding: "{ x = true }", type: "{ x?: boolean }", value: {} },
+    { binding: "{ x, y = true }", type: "{ x: boolean, y?: boolean }", value: { x: false } },
+    { binding: "{ ...rest }", type: "any", value: {} },
+    { binding: "{ x, ...rest }", type: "any", value: { x: "x" } },
+    { binding: "{ x, ...rest }", type: "any", value: { x: "x", y: "y", z: "z" } },
+    { binding: "{ x, ...y }", type: "any", value: { x: "x", y: "y", z: "z" } },
+    { binding: "{ x: y, ...z }", type: "any", value: { x: "x", y: "y", z: "z" } },
+
+    { binding: "[]", type: "boolean[]", value: [] },
+    { binding: "[x, y]", type: "[string, string]", value: ["x", "y"] },
+    { binding: "[x, , y]", type: "string[]", value: ["x", "", "y"] },
+    { binding: "[x = true]", type: "boolean[]", value: [false] },
+    { binding: "[x = true]", type: "boolean[]", value: [] },
+    { binding: "[[x, y]]", type: "Array<string[]>", value: [["x", "y"]] },
+    { binding: "[x, ...rest]", type: "string[]", value: ["x"] },
+    { binding: "[x, ...rest]", type: "string[]", value: ["x", "y", "z"] },
+
+    { binding: "{ y: [z = true] }", type: "{ y: boolean[] }", value: { y: [false] } },
+    { binding: "{ y: [z = true] }", type: "{ y: boolean[] }", value: { y: [] } },
+    { binding: "{ x: [x, y] }", type: "{ x: [string, string] }", value: { x: ["x", "y"] } },
+    { binding: "{ x: [{ y }] }", type: "{ x: [{ y: string }] }", value: { x: [{ y: "y" }] } },
+].map(({ binding, type, value }) => ({ binding, type, value: util.formatCode(value) }));
 
 test.each([
     ...testCases,
-    { binding: "{ x, y }, z", value: "{ x: false, y: false }, true" },
-    { binding: "{ x, y }, { z }", value: "{ x: false, y: false }, { z: true }" },
-])("in function parameter (%p)", ({ binding, value }) => {
+    { binding: "{ x, y }", type: "{ x: boolean, y: boolean }, z: boolean", value: "{ x: false, y: false }, true" },
+    {
+        binding: "{ x, y }",
+        type: "{ x: boolean, y: boolean }, { z }: { z: boolean }",
+        value: "{ x: false, y: false }, { z: true }",
+    },
+])("in function parameter (%p)", ({ binding, type, value }) => {
     util.testFunction`
         let ${allBindings};
-        function test(${binding}) {
+        function test(${binding}: ${type}) {
             return { ${allBindings} };
         }
 
diff --git a/test/unit/functions/generators.spec.ts b/test/unit/functions/generators.spec.ts
@@ -27,7 +27,7 @@ test(".next()", () => {
 
 test(".next() with parameters", () => {
     util.testFunction`
-        function* generator() {
+        function* generator(): Generator<number, number, number> {
             return yield 0;
         }
 
diff --git a/test/unit/overloads.spec.ts b/test/unit/overloads.spec.ts
@@ -67,8 +67,8 @@ test("overload method2", () => {
 test("constructor1", () => {
     util.testFunction`
         class myclass {
-            num: number;
-            str: string;
+            num?: number;
+            str?: string;
 
             constructor(def: number);
             constructor(def: string);
@@ -88,8 +88,8 @@ test("constructor1", () => {
 test("constructor2", () => {
     util.testFunction`
         class myclass {
-            num: number;
-            str: string;
+            num?: number;
+            str?: string;
 
             constructor(def: number);
             constructor(def: string);
diff --git a/test/unit/spread.spec.ts b/test/unit/spread.spec.ts
@@ -116,7 +116,9 @@ describe("in object literal", () => {
         "{ ...{ x: false }, x: true }",
         "{ ...{ x: false }, x: false, ...{ x: true } }",
     ])("of object literal (%p)", expression => {
-        util.testExpression(expression).expectToMatchJsResult();
+        util.testExpression(expression)
+            .ignoreDiagnostics([2783]) // duplicate property in spread &mdash; intentional, testing spread override behavior
+            .expectToMatchJsResult();
     });
 
     test("of object reference", () => {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class ResolutionContext {`
`73`	`73`	`return;`
`74`	`74`	`}`
`75`	`75`
`76`		`- if (this.noResolvePaths.find(isMatch => isMatch.test(required.requirePath))) {`
	`76`	`+ if (this.noResolvePaths.find(isMatch => picomatch.test(required.requirePath, isMatch))) {`
`77`	`77`	`if (this.options.tstlVerbose) {`
`78`	`78`	`console.log(`
`79`	`79`	`Skipping module resolution of ${required.requirePath} as it is in the tsconfig noResolvePaths.`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ test(".next()", () => {`
`27`	`27`
`28`	`28`	`test(".next() with parameters", () => {`
`29`	`29`	util.testFunction`
`30`		`- function* generator() {`
	`30`	`+ function* generator(): Generator<number, number, number> {`
`31`	`31`	`return yield 0;`
`32`	`32`	`}`
`33`	`33`