@zyno-io/ts-reflection 26.813.2145 → 26.816.840
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -90,10 +90,11 @@ func classFromNode(info *fileInfo, node *shimast.Node) *classInfo {
|
|
|
90
90
|
continue
|
|
91
91
|
}
|
|
92
92
|
class.properties = append(class.properties, propertyInfo{
|
|
93
|
-
name:
|
|
94
|
-
typeText:
|
|
95
|
-
typeNode:
|
|
96
|
-
|
|
93
|
+
name: name,
|
|
94
|
+
typeText: nodeText(file, member.Type()),
|
|
95
|
+
typeNode: member.Type(),
|
|
96
|
+
declaration: member,
|
|
97
|
+
optional: member.QuestionToken() != nil,
|
|
97
98
|
})
|
|
98
99
|
case shimast.KindMethodDeclaration:
|
|
99
100
|
name := memberName(file, member)
|
|
@@ -230,6 +230,24 @@ func TestTypeExprRendersLiteralArrayTypes(t *testing.T) {
|
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
232
|
|
|
233
|
+
func TestInterfacePropertyPreservesUnionWithAnArrayMember(t *testing.T) {
|
|
234
|
+
file := parseTestSourceFile(t, "/project/union-array-property.ts", `
|
|
235
|
+
interface ScalarOrArrayValue {
|
|
236
|
+
value: string | string[];
|
|
237
|
+
}
|
|
238
|
+
`)
|
|
239
|
+
decl := interfaceFromNode(file, file.Statements.Nodes[0])
|
|
240
|
+
info, reg := testTypeInfo()
|
|
241
|
+
info.file = file
|
|
242
|
+
|
|
243
|
+
property := decl.properties[0]
|
|
244
|
+
got := typeExprForNodePreferred(info, reg, property.typeText, property.typeNode, decl.pos, true)
|
|
245
|
+
want := `{kind: 12, types: [{kind: 6}, {kind: 14, type: {kind: 6}}]}`
|
|
246
|
+
if got != want {
|
|
247
|
+
t.Fatalf("scalar-or-array property metadata = %s, want %s", got, want)
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
|
|
233
251
|
func TestTypeExprForNodeUsesAstUnionMemberOrder(t *testing.T) {
|
|
234
252
|
file := parseTestSourceFile(t, "/project/ordered-union.ts", `
|
|
235
253
|
type Status =
|
|
@@ -57,6 +57,13 @@ func precomputeClassMetadataExpressions(info *fileInfo, reg *registry, class *cl
|
|
|
57
57
|
}
|
|
58
58
|
for i := range class.properties {
|
|
59
59
|
prop := &class.properties[i]
|
|
60
|
+
if prop.typeNode == nil && prop.declaration != nil && reg.checker != nil {
|
|
61
|
+
inferredType := reg.checker.GetTypeAtLocation(prop.declaration)
|
|
62
|
+
if metadata, ok := typiaTypeExprFromType(info, reg, inferredType, class.pos, ""); ok {
|
|
63
|
+
prop.metadataText = metadata
|
|
64
|
+
continue
|
|
65
|
+
}
|
|
66
|
+
}
|
|
60
67
|
prop.metadataText = typeExprForNode(info, reg, prop.typeText, prop.typeNode, class.pos)
|
|
61
68
|
}
|
|
62
69
|
for i := range class.methods {
|
|
@@ -453,6 +453,9 @@ func cachedTypeExpr(info *fileInfo, reg *registry, raw string, node *shimast.Nod
|
|
|
453
453
|
|
|
454
454
|
func preferredWrapperTypeExprForNode(info *fileInfo, reg *registry, raw string, node *shimast.Node, pos int) (string, bool) {
|
|
455
455
|
raw = strings.TrimSpace(trimParens(raw))
|
|
456
|
+
if len(nonEmptyParts(splitTop(raw, "|"))) > 1 || len(nonEmptyParts(splitTop(raw, "&"))) > 1 {
|
|
457
|
+
return "", false
|
|
458
|
+
}
|
|
456
459
|
if strings.HasSuffix(raw, "[]") {
|
|
457
460
|
element := strings.TrimSpace(strings.TrimSuffix(raw, "[]"))
|
|
458
461
|
return "{kind: 14, type: " + typeExprForNodePreferred(info, reg, element, nil, pos, true) + "}", true
|