Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/lib/converter/symbols.ts
Original file line number Diff line number Diff line change
Expand Up @@ -868,10 +868,17 @@ function isEnumLike(checker: ts.TypeChecker, type: ts.Type, location: ts.Node) {

return type.getProperties().every((prop) => {
const propType = checker.getTypeOfSymbolAtLocation(prop, location);
return propType.isStringLiteral() || propType.isNumberLiteral();
return isValidEnumProperty(propType);
});
}

function isValidEnumProperty(type: ts.Type) {
return hasAnyFlag(
type.flags,
ts.TypeFlags.NumberLike | ts.TypeFlags.StringLike
);
}

function convertVariableAsEnum(
context: Context,
symbol: ts.Symbol,
Expand Down Expand Up @@ -899,10 +906,12 @@ function convertVariableAsEnum(
prop,
declaration
);
assert(propType.isStringLiteral() || propType.isNumberLiteral());

reflection.defaultValue = JSON.stringify(propType.value);
reflection.type = new LiteralType(propType.value);
reflection.type = context.converter.convertType(context, propType);

if (propType.isStringLiteral() || propType.isNumberLiteral()) {
reflection.defaultValue = JSON.stringify(propType.value);
}

rc.finalizeDeclarationReflection(reflection, prop, void 0);
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/behaviorTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,23 @@ export const behaviorTests: Record<
ReflectionKind.Enum,
"WithoutReadonlyNumeric"
);

const WithInvalidTypeUnionMember = query(
project,
"WithInvalidTypeUnionMember"
);
equal(
WithInvalidTypeUnionMember.kind,
ReflectionKind.Variable,
"WithInvalidTypeUnionMember"
);

const WithNumericExpression = query(project, "WithNumericExpression");
equal(
WithNumericExpression.kind,
ReflectionKind.Enum,
"WithNumericExpression"
);
},

declareGlobal(project) {
Expand Down
Loading