fix: --expose all with generic types (#2009)

* code * feat: more tests * removed other tests as they work but generate different results (as expected)
vega · Jul 3, 2024 · 08e49c6 · 08e49c6
1 parent bb5de41
commit 08e49c6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/Error/Errors.ts b/src/Error/Errors.ts
@@ -17,7 +17,7 @@ export class UnknownTypeError extends BaseError {
     constructor(readonly type: BaseType) {
         super({
             code: 101,
-            messageText: `Unknown type "${type.getId()}"`,
+            messageText: `Unknown type "${type?.getId()}"`,
         });
     }
 }

diff --git a/src/NodeParser/InterfaceAndClassNodeParser.ts b/src/NodeParser/InterfaceAndClassNodeParser.ts
@@ -113,7 +113,7 @@ export class InterfaceAndClassNodeParser implements SubNodeParser {
                     if (ts.isConstructorDeclaration(member)) {
                         const params = member.parameters.filter((param) =>
                             ts.isParameterPropertyDeclaration(param, param.parent),
-                        ) as ts.ParameterPropertyDeclaration[];
+                        );
                         members.push(...params);
                     } else if (ts.isPropertySignature(member) || ts.isPropertyDeclaration(member)) {
                         members.push(member);

diff --git a/src/SchemaGenerator.ts b/src/SchemaGenerator.ts
@@ -166,8 +166,8 @@ export class SchemaGenerator {
             ts.isTypeAliasDeclaration(node)
         ) {
             if (
-                this.config?.expose === "all" ||
-                (this.isExportType(node) && !this.isGenericType(node as ts.TypeAliasDeclaration))
+                (this.config?.expose === "all" || this.isExportType(node)) &&
+                !this.isGenericType(node as ts.TypeAliasDeclaration)
             ) {
                 allTypes.set(this.getFullName(node, typeChecker), node);
                 return;

diff --git a/test/valid-data-other.test.ts b/test/valid-data-other.test.ts
@@ -43,6 +43,7 @@ describe("valid-data-other", () => {
     it("import-anonymous", assertValidSchema("import-anonymous", "MyObject"));
 
     it("generic-simple", assertValidSchema("generic-simple", "MyObject"));
+    it("generic-simple", assertValidSchema("generic-simple", "*", { expose: "all" }));
     it("generic-arrays", assertValidSchema("generic-arrays", "MyObject"));
     it("generic-multiple", assertValidSchema("generic-multiple", "MyObject"));
     it("generic-multiargs", assertValidSchema("generic-multiargs", "MyObject"));