Fix CI

TypeStrong · Sep 10, 2021 · af183d8 · af183d8
1 parent e40dd44
commit af183d8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/lib/converter/symbols.ts b/src/lib/converter/symbols.ts
@@ -67,8 +67,6 @@ const conversionOrder = [
     ts.SymbolFlags.BlockScopedVariable,
     ts.SymbolFlags.FunctionScopedVariable,
 
-    ts.SymbolFlags.ValueModule,
-    ts.SymbolFlags.NamespaceModule,
     ts.SymbolFlags.TypeAlias,
     ts.SymbolFlags.Function,
     ts.SymbolFlags.Method,
@@ -80,6 +78,9 @@ const conversionOrder = [
 
     ts.SymbolFlags.GetAccessor,
     ts.SymbolFlags.SetAccessor,
+
+    ts.SymbolFlags.ValueModule,
+    ts.SymbolFlags.NamespaceModule,
 ];
 
 // Sanity check, if this fails a dev messed up.

diff --git a/src/test/validation.test.ts b/src/test/validation.test.ts
@@ -7,8 +7,12 @@ import { getConverter2App, getConverter2Program } from "./programs";
 function expectWarning(
     typeName: string,
     file: string,
-    referencingName: string
+    referencingNames: string[] | string
 ) {
+    const refs = Array.isArray(referencingNames)
+        ? referencingNames
+        : [referencingNames];
+
     const app = getConverter2App();
     const program = getConverter2Program();
     const sourceFile = program.getSourceFile(
@@ -43,10 +47,11 @@ function expectWarning(
                     ),
                     "Referencing file is different."
                 );
-                equal(
-                    match[3],
-                    referencingName,
-                    "Referencing name is different."
+                ok(
+                    refs.includes(match[3]),
+                    `Referencing name is different, expected ${
+                        match[3]
+                    } to be: ${refs.join(", ")}`
                 );
             }
         }
@@ -62,7 +67,10 @@ describe("validateExports", () => {
     });
 
     it("Should warn if a type parameter clause is missing", () => {
-        expectWarning("Foo", "typeParameter.ts", "Bar.T");
+        expectWarning("Foo", "typeParameter.ts", [
+            "Bar.T",
+            "Bar.constructor.new Bar.T",
+        ]);
     });
 
     it("Should warn if an index signature type is missing", () => {