Merge pull request #614 from PassiveLogic/krodak/ts-enum-fix

kateinoigakukun · web-flow · commit 0452169c2945 · 2026-02-10T07:39:51.000+09:00
BridgeJS: Fix incorrect TypeScript type names for `tsEnum`-style enums and struct associated values
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -1359,6 +1359,9 @@ public struct BridgeJSLink {
                         case .namespaceEnum:
                             return enumDef.tsFullPath
                         default:
+                            if enumDef.emitStyle == .tsEnum {
+                                return enumDef.tsFullPath
+                            }
                             return "\(enumDef.tsFullPath)Tag"
                         }
                     }
@@ -1679,7 +1682,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: "; ")) }")
                     }
@@ -2819,6 +2822,7 @@ extension BridgeJSLink {
                         depth: 1,
                         printer: printer,
                         exposeToGlobal: true,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
                     printer.unindent()
@@ -2837,6 +2841,7 @@ extension BridgeJSLink {
                         depth: 1,
                         printer: printer,
                         exposeToGlobal: false,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
                 }
@@ -2850,6 +2855,7 @@ extension BridgeJSLink {
             depth: Int,
             printer: CodeFragmentPrinter,
             exposeToGlobal: Bool,
+            exportedSkeletons: [ExportedSkeleton],
             renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String
         ) {
             func hasContent(node: NamespaceNode) -> Bool {
@@ -3004,7 +3010,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: "; ")) }")
                                 }
@@ -3038,6 +3046,7 @@ extension BridgeJSLink {
                         depth: depth + 1,
                         printer: printer,
                         exposeToGlobal: exposeToGlobal,
+                        exportedSkeletons: exportedSkeletons,
                         renderTSSignatureCallback: renderTSSignatureCallback
                     )
 
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts b/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;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts b/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
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts b/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;

Original file line number	Diff line number	Diff line change
`@@ -1359,6 +1359,9 @@ public struct BridgeJSLink {`
`1359`	`1359`	`case .namespaceEnum:`
`1360`	`1360`	`return enumDef.tsFullPath`
`1361`	`1361`	`default:`
	`1362`	`+ if enumDef.emitStyle == .tsEnum {`
	`1363`	`+ return enumDef.tsFullPath`
	`1364`	`+ }`
`1362`	`1365`	`return "\(enumDef.tsFullPath)Tag"`
`1363`	`1366`	`}`
`1364`	`1367`	`}`
`@@ -1679,7 +1682,7 @@ public struct BridgeJSLink {`
`1679`	`1682`	`]`
`1680`	`1683`	`for (associatedValueIndex, associatedValue) in enumCase.associatedValues.enumerated() {`
`1681`	`1684`	`let prop = associatedValue.label ?? "param\(associatedValueIndex)"`
`1682`		`- fields.append("\(prop): \(associatedValue.type.tsType)")`
	`1685`	`+ fields.append("\(prop): \(resolveTypeScriptType(associatedValue.type))")`
`1683`	`1686`	`}`
`1684`	`1687`	`unionParts.append("{ \(fields.joined(separator: "; ")) }")`
`1685`	`1688`	`}`
`@@ -2819,6 +2822,7 @@ extension BridgeJSLink {`
`2819`	`2822`	`depth: 1,`
`2820`	`2823`	`printer: printer,`
`2821`	`2824`	`exposeToGlobal: true,`
	`2825`	`+ exportedSkeletons: exportedSkeletons,`
`2822`	`2826`	`renderTSSignatureCallback: renderTSSignatureCallback`
`2823`	`2827`	`)`
`2824`	`2828`	`printer.unindent()`
`@@ -2837,6 +2841,7 @@ extension BridgeJSLink {`
`2837`	`2841`	`depth: 1,`
`2838`	`2842`	`printer: printer,`
`2839`	`2843`	`exposeToGlobal: false,`
	`2844`	`+ exportedSkeletons: exportedSkeletons,`
`2840`	`2845`	`renderTSSignatureCallback: renderTSSignatureCallback`
`2841`	`2846`	`)`
`2842`	`2847`	`}`
`@@ -2850,6 +2855,7 @@ extension BridgeJSLink {`
`2850`	`2855`	`depth: Int,`
`2851`	`2856`	`printer: CodeFragmentPrinter,`
`2852`	`2857`	`exposeToGlobal: Bool,`
	`2858`	`+ exportedSkeletons: [ExportedSkeleton],`
`2853`	`2859`	`renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String`
`2854`	`2860`	`) {`
`2855`	`2861`	`func hasContent(node: NamespaceNode) -> Bool {`
`@@ -3004,7 +3010,9 @@ extension BridgeJSLink {`
`3004`	`3010`	`.enumerated()`
`3005`	`3011`	`{`
`3006`	`3012`	`let prop = associatedValue.label ?? "param\(associatedValueIndex)"`
`3007`		`- fields.append("\(prop): \(associatedValue.type.tsType)")`
	`3013`	`+ fields.append(`
	`3014`	`+ "\(prop): \(BridgeJSLink.resolveTypeScriptType(associatedValue.type, exportedSkeletons: exportedSkeletons))"`
	`3015`	`+ )`
`3008`	`3016`	`}`
`3009`	`3017`	`unionParts.append("{ \(fields.joined(separator: "; ")) }")`
`3010`	`3018`	`}`
`@@ -3038,6 +3046,7 @@ extension BridgeJSLink {`
`3038`	`3046`	`depth: depth + 1,`
`3039`	`3047`	`printer: printer,`
`3040`	`3048`	`exposeToGlobal: exposeToGlobal,`
	`3049`	`+ exportedSkeletons: exportedSkeletons,`
`3041`	`3050`	`renderTSSignatureCallback: renderTSSignatureCallback`
`3042`	`3051`	`)`
`3043`	`3052`