Merge branch 'main' into type-aliases

Author: michaldudak

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "typescript-api-extractor",
-	"version": "1.0.0-alpha.1",
+	"version": "1.0.0-alpha.2",
 	"description": "Extracts API description from TypeScript code",
 	"author": {
 		"name": "Michał Dudak",

src/parsers/typeResolver.ts

@@ -248,16 +248,20 @@ export function resolveType(
 		}
 
 		if (type.flags & ts.TypeFlags.Conditional) {
-			// We don't fully support conditional types. We assume the condition is always true.
-			if (
-				type.aliasSymbol?.declarations?.[0] &&
-				ts.isTypeAliasDeclaration(type.aliasSymbol.declarations[0]) &&
-				ts.isConditionalTypeNode(type.aliasSymbol.declarations[0].type)
-			) {
-				const trueType = checker.getTypeFromTypeNode(
-					type.aliasSymbol.declarations[0].type.trueType,
+			const conditionalType = type as ts.ConditionalType;
+			if (conditionalType.resolvedTrueType && conditionalType.resolvedFalseType) {
+				return new UnionNode(
+					undefined,
+					[],
+					[
+						resolveType((type as ts.ConditionalType).resolvedTrueType!, context),
+						resolveType((type as ts.ConditionalType).resolvedFalseType!, context),
+					],
 				);
-				return resolveType(trueType, context);
+			} else if (conditionalType.resolvedTrueType) {
+				return resolveType(conditionalType.resolvedTrueType, context);
+			} else if (conditionalType.resolvedFalseType) {
+				return resolveType(conditionalType.resolvedFalseType, context);
 			}
 		}
 

test/conditional-types/input.ts

@@ -0,0 +1,11 @@
+export function fn<T extends boolean>(x: T): T extends true ? number : null {
+	return (x ? 1 : null) as T extends true ? number : null;
+}
+
+export function Component1<Multiple extends boolean>(props: Props<Multiple>) {
+	return null;
+}
+
+interface Props<Multiple extends boolean> {
+	value: Multiple extends true ? string | null : string[];
+}

test/conditional-types/output.json

@@ -0,0 +1,104 @@
+{
+	"name": "test/conditional-types/input",
+	"exports": [
+		{
+			"name": "fn",
+			"type": {
+				"kind": "function",
+				"name": "fn",
+				"parentNamespaces": [],
+				"callSignatures": [
+					{
+						"parameters": [
+							{
+								"type": {
+									"kind": "typeParameter",
+									"name": "T",
+									"parentNamespaces": [],
+									"constraint": "boolean"
+								},
+								"name": "x",
+								"optional": false
+							}
+						],
+						"returnValueType": {
+							"kind": "union",
+							"types": [
+								{
+									"kind": "intrinsic",
+									"parentNamespaces": [],
+									"name": "number"
+								},
+								{
+									"kind": "intrinsic",
+									"parentNamespaces": [],
+									"name": "null"
+								}
+							],
+							"parentNamespaces": []
+						}
+					}
+				]
+			}
+		},
+		{
+			"name": "Component1",
+			"type": {
+				"kind": "function",
+				"name": "Component1",
+				"parentNamespaces": [],
+				"callSignatures": [
+					{
+						"parameters": [
+							{
+								"type": {
+									"kind": "object",
+									"name": "Props",
+									"parentNamespaces": [],
+									"properties": [
+										{
+											"name": "value",
+											"type": {
+												"kind": "union",
+												"types": [
+													{
+														"kind": "intrinsic",
+														"parentNamespaces": [],
+														"name": "string"
+													},
+													{
+														"kind": "array",
+														"parentNamespaces": [],
+														"elementType": {
+															"kind": "intrinsic",
+															"parentNamespaces": [],
+															"name": "string"
+														}
+													},
+													{
+														"kind": "intrinsic",
+														"parentNamespaces": [],
+														"name": "null"
+													}
+												],
+												"parentNamespaces": []
+											},
+											"optional": false
+										}
+									]
+								},
+								"name": "props",
+								"optional": false
+							}
+						],
+						"returnValueType": {
+							"kind": "intrinsic",
+							"parentNamespaces": [],
+							"name": "null"
+						}
+					}
+				]
+			}
+		}
+	]
+}