BridgeJS: Fix incorrect TypeScript type names for tsEnum-style enums and struct associated values

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -1470,6 +1470,9 @@ public struct BridgeJSLink {
                         case .namespaceEnum:
                             return enumDef.tsFullPath
                         default:
+                            if enumDef.emitStyle == .tsEnum {
+                                return enumDef.tsFullPath
+                            }
                             return "\(enumDef.tsFullPath)Tag"
                         }
                     }
@@ -1786,7 +1789,7 @@ public struct BridgeJSLink {
                         ]
                         for (associatedValueIndex, associatedValue) in enumCase.associatedValues.enumerated() {
                             let prop = associatedValue.label ?? "param\(associatedValueIndex)"
-                            fields.append("\(prop): \(associatedValue.type.tsType)")
+                            fields.append("\(prop): \(resolveTypeScriptType(associatedValue.type))")
                         }
                         unionParts.append("{ \(fields.joined(separator: "; ")) }")
                     }
@@ -2917,6 +2920,7 @@ extension BridgeJSLink {
                         depth: 1,
                         printer: printer,
                         exposeToGlobal: true,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
                     printer.unindent()
@@ -2935,6 +2939,7 @@ extension BridgeJSLink {
                         depth: 1,
                         printer: printer,
                         exposeToGlobal: false,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
                 }
@@ -2948,6 +2953,7 @@ extension BridgeJSLink {
             depth: Int,
             printer: CodeFragmentPrinter,
             exposeToGlobal: Bool,
+            exportedSkeletons: [ExportedSkeleton],
             renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String
         ) {
             func hasContent(node: NamespaceNode) -> Bool {
@@ -3102,7 +3108,9 @@ extension BridgeJSLink {
                                         .enumerated()
                                     {
                                         let prop = associatedValue.label ?? "param\(associatedValueIndex)"
-                                        fields.append("\(prop): \(associatedValue.type.tsType)")
+                                        fields.append(
+                                            "\(prop): \(BridgeJSLink.resolveTypeScriptType(associatedValue.type, exportedSkeletons: exportedSkeletons))"
+                                        )
                                     }
                                     unionParts.append("{ \(fields.joined(separator: "; ")) }")
                                 }
@@ -3136,6 +3144,7 @@ extension BridgeJSLink {
                         depth: depth + 1,
                         printer: printer,
                         exposeToGlobal: exposeToGlobal,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
 

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts

@@ -82,7 +82,7 @@ export const AllTypesResultValues: {
 };
 
 export type AllTypesResultTag =
-  { tag: typeof AllTypesResultValues.Tag.StructPayload; param0: PointTag } | { tag: typeof AllTypesResultValues.Tag.ClassPayload; param0: User } | { tag: typeof AllTypesResultValues.Tag.JsObjectPayload; param0: any } | { tag: typeof AllTypesResultValues.Tag.NestedEnum; param0: APIResultTag } | { tag: typeof AllTypesResultValues.Tag.ArrayPayload; param0: number[] } | { tag: typeof AllTypesResultValues.Tag.Empty }
+  { tag: typeof AllTypesResultValues.Tag.StructPayload; param0: Point } | { tag: typeof AllTypesResultValues.Tag.ClassPayload; param0: User } | { tag: typeof AllTypesResultValues.Tag.JsObjectPayload; param0: any } | { tag: typeof AllTypesResultValues.Tag.NestedEnum; param0: APIResultTag } | { tag: typeof AllTypesResultValues.Tag.ArrayPayload; param0: number[] } | { tag: typeof AllTypesResultValues.Tag.Empty }
 
 export const OptionalAllTypesResultValues: {
     readonly Tag: {
@@ -96,7 +96,7 @@ export const OptionalAllTypesResultValues: {
 };
 
 export type OptionalAllTypesResultTag =
-  { tag: typeof OptionalAllTypesResultValues.Tag.OptStruct; param0: PointTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptClass; param0: User | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptJSObject; param0: any | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptNestedEnum; param0: APIResultTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptArray; param0: number[] | null } | { tag: typeof OptionalAllTypesResultValues.Tag.Empty }
+  { tag: typeof OptionalAllTypesResultValues.Tag.OptStruct; param0: Point | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptClass; param0: User | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptJSObject; param0: any | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptNestedEnum; param0: APIResultTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptArray; param0: number[] | null } | { tag: typeof OptionalAllTypesResultValues.Tag.Empty }
 
 export interface Point {
     x: number;

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts

@@ -42,9 +42,9 @@ export type Exports = {
     getDirection(): DirectionTag;
     processDirection(input: DirectionTag): StatusTag;
     roundTripOptionalDirection(input: DirectionTag | null): DirectionTag | null;
-    setTSDirection(direction: TSDirectionTag): void;
-    getTSDirection(): TSDirectionTag;
-    roundTripOptionalTSDirection(input: TSDirectionTag | null): TSDirectionTag | null;
+    setTSDirection(direction: TSDirection): void;
+    getTSDirection(): TSDirection;
+    roundTripOptionalTSDirection(input: TSDirection | null): TSDirection | null;
     Direction: DirectionObject
     Status: StatusObject
     PublicStatus: PublicStatusObject

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts

@@ -113,18 +113,18 @@ export type Exports = {
     setTheme(theme: ThemeTag): void;
     getTheme(): ThemeTag;
     roundTripOptionalTheme(input: ThemeTag | null): ThemeTag | null;
-    setTSTheme(theme: TSThemeTag): void;
-    getTSTheme(): TSThemeTag;
-    roundTripOptionalTSTheme(input: TSThemeTag | null): TSThemeTag | null;
+    setTSTheme(theme: TSTheme): void;
+    getTSTheme(): TSTheme;
+    roundTripOptionalTSTheme(input: TSTheme | null): TSTheme | null;
     setFeatureFlag(flag: FeatureFlagTag): void;
     getFeatureFlag(): FeatureFlagTag;
     roundTripOptionalFeatureFlag(input: FeatureFlagTag | null): FeatureFlagTag | null;
     setHttpStatus(status: HttpStatusTag): void;
     getHttpStatus(): HttpStatusTag;
     roundTripOptionalHttpStatus(input: HttpStatusTag | null): HttpStatusTag | null;
-    setTSHttpStatus(status: TSHttpStatusTag): void;
-    getTSHttpStatus(): TSHttpStatusTag;
-    roundTripOptionalHttpStatus(input: TSHttpStatusTag | null): TSHttpStatusTag | null;
+    setTSHttpStatus(status: TSHttpStatus): void;
+    getTSHttpStatus(): TSHttpStatus;
+    roundTripOptionalHttpStatus(input: TSHttpStatus | null): TSHttpStatus | null;
     setPriority(priority: PriorityTag): void;
     getPriority(): PriorityTag;
     roundTripOptionalPriority(input: PriorityTag | null): PriorityTag | null;