BridgeJS: Static functions / properties improvements for access via Exports

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -146,12 +146,6 @@ struct BridgeJSLink {
 
             // Process functions
             for function in skeleton.functions {
-                if function.effects.isStatic,
-                    case .enumName(_) = function.staticContext
-                {
-                    continue
-                }
-
                 var (js, dts) = try renderExportedFunction(function: function)
 
                 if function.effects.isStatic,
@@ -195,17 +189,110 @@ struct BridgeJSLink {
             }
 
             for enumDefinition in skeleton.enums where enumDefinition.enumType != .namespace {
+                // Process enum static methods to add to Exports type
+                let enumExportPrinter = CodeFragmentPrinter()
+                let enumDtsPrinter = CodeFragmentPrinter()
+                
                 for function in enumDefinition.staticMethods {
-                    let assignmentJs = try renderEnumStaticFunctionAssignment(
-                        function: function,
-                        enumName: enumDefinition.name
+                    let thunkBuilder = ExportedThunkBuilder(effects: function.effects)
+                    for param in function.parameters {
+                        try thunkBuilder.lowerParameter(param: param)
+                    }
+                    let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType)
+                    
+                    let methodPrinter = CodeFragmentPrinter()
+                    methodPrinter.write("\(function.name): function(\(function.parameters.map { $0.name }.joined(separator: ", "))) {")
+                    methodPrinter.indent {
+                        methodPrinter.write(contentsOf: thunkBuilder.body)
+                        methodPrinter.write(contentsOf: thunkBuilder.cleanupCode)
+                        methodPrinter.write(lines: thunkBuilder.checkExceptionLines())
+                        if let returnExpr = returnExpr {
+                            methodPrinter.write("return \(returnExpr);")
+                        }
+                    }
+                    methodPrinter.write("},")
+                    
+                    enumExportPrinter.write(lines: methodPrinter.lines)
+                    enumDtsPrinter.write("\(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));")
+                }
+                
+                let enumExportLines = enumExportPrinter.lines
+                let enumDtsLines = enumDtsPrinter.lines
+                
+                let enumPropertyPrinter = CodeFragmentPrinter()
+                let enumPropertyDtsPrinter = CodeFragmentPrinter()
+                
+                for property in enumDefinition.staticProperties {
+                    let readonly = property.isReadonly ? "readonly " : ""
+                    enumPropertyDtsPrinter.write("\(readonly)\(property.name): \(property.type.tsType);")
+                    
+                    let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false))
+                    let getterReturnExpr = try getterThunkBuilder.call(
+                        abiName: property.getterAbiName(),
+                        returnType: property.type
                     )
-                    data.enumStaticAssignments.append(contentsOf: assignmentJs)
+                    
+                    enumPropertyPrinter.write("get \(property.name)() {")
+                    enumPropertyPrinter.indent {
+                        enumPropertyPrinter.write(contentsOf: getterThunkBuilder.body)
+                        enumPropertyPrinter.write(contentsOf: getterThunkBuilder.cleanupCode)
+                        enumPropertyPrinter.write(lines: getterThunkBuilder.checkExceptionLines())
+                        if let returnExpr = getterReturnExpr {
+                            enumPropertyPrinter.write("return \(returnExpr);")
+                        }
+                    }
+                    enumPropertyPrinter.write("},")
+                    
+                    if !property.isReadonly {
+                        let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false))
+                        try setterThunkBuilder.lowerParameter(
+                            param: Parameter(label: "value", name: "value", type: property.type)
+                        )
+                        _ = try setterThunkBuilder.call(
+                            abiName: property.setterAbiName(),
+                            returnType: .void
+                        )
+                        
+                        enumPropertyPrinter.write("set \(property.name)(value) {")
+                        enumPropertyPrinter.indent {
+                            enumPropertyPrinter.write(contentsOf: setterThunkBuilder.body)
+                            enumPropertyPrinter.write(contentsOf: setterThunkBuilder.cleanupCode)
+                            enumPropertyPrinter.write(lines: setterThunkBuilder.checkExceptionLines())
+                        }
+                        enumPropertyPrinter.write("},")
+                    }
                 }
-                for property in enumDefinition.staticProperties {
-                    let (propJs, _) = try renderEnumStaticProperty(property: property, enumName: enumDefinition.name)
-                    data.enumStaticAssignments.append(contentsOf: propJs)
+                
+                let enumPropertyLines = enumPropertyPrinter.lines
+                let enumPropertyDtsLines = enumPropertyDtsPrinter.lines
+                
+                if !enumExportLines.isEmpty || !enumPropertyLines.isEmpty {
+                    let exportsPrinter = CodeFragmentPrinter()
+                    let dtsExportsPrinter = CodeFragmentPrinter()
+                    
+                    exportsPrinter.write("\(enumDefinition.name): {")
+                    exportsPrinter.indent {
+                        // Combine all lines and handle trailing comma removal
+                        var allLines = enumExportLines + enumPropertyLines
+                        if let lastLineIndex = allLines.indices.last, allLines[lastLineIndex].hasSuffix(",") {
+                            allLines[lastLineIndex] = String(allLines[lastLineIndex].dropLast())
+                        }
+                        exportsPrinter.write(lines: allLines)
+                    }
+                    exportsPrinter.write("},")
+                    
+                    dtsExportsPrinter.write("\(enumDefinition.name): {")
+                    dtsExportsPrinter.indent {
+                        dtsExportsPrinter.write(lines: enumDtsLines)
+                        dtsExportsPrinter.write(lines: enumPropertyDtsLines)
+                    }
+                    dtsExportsPrinter.write("}")
+                    
+                    data.exportsLines.append(contentsOf: exportsPrinter.lines)
+                    data.dtsExportLines.append(contentsOf: dtsExportsPrinter.lines)
                 }
+                
+                // Static properties are now handled in Exports type - no global assignments needed
             }
 
         }
@@ -994,8 +1081,6 @@ struct BridgeJSLink {
     private func generateDeclarations(enumDefinition: ExportedEnum) -> [String] {
         let printer = CodeFragmentPrinter()
 
-        let enumStaticFunctions = enumDefinition.staticMethods
-
         switch enumDefinition.emitStyle {
         case .tsEnum:
             switch enumDefinition.enumType {
@@ -1035,22 +1120,10 @@ struct BridgeJSLink {
                         printer.write("readonly \(caseName): \(value);")
                     }
 
-                    for function in enumStaticFunctions {
-                        let signature = renderTSSignature(
-                            parameters: function.parameters,
-                            returnType: function.returnType,
-                            effects: function.effects
-                        )
-                        printer.write("\(function.name)\(signature);")
-                    }
-                    for property in enumDefinition.staticProperties {
-                        let readonly = property.isReadonly ? "readonly " : ""
-                        printer.write("\(readonly)\(property.name): \(property.type.tsType);")
-                    }
                 }
                 printer.write("};")
                 printer.write(
-                    "export type \(enumDefinition.name) = typeof \(enumDefinition.name)[keyof typeof \(enumDefinition.name)];"
+                    "export type \(enumDefinition.name)Tag = typeof \(enumDefinition.name)[keyof typeof \(enumDefinition.name)];"
                 )
                 printer.nextLine()
             case .associatedValue:
@@ -1064,18 +1137,6 @@ struct BridgeJSLink {
                     }
                     printer.write("};")
 
-                    for function in enumStaticFunctions {
-                        let signature = renderTSSignature(
-                            parameters: function.parameters,
-                            returnType: function.returnType,
-                            effects: function.effects
-                        )
-                        printer.write("\(function.name)\(signature);")
-                    }
-                    for property in enumDefinition.staticProperties {
-                        let readonly = property.isReadonly ? "readonly " : ""
-                        printer.write("\(readonly)\(property.name): \(property.type.tsType);")
-                    }
                 }
                 printer.write("};")
                 printer.nextLine()

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -537,14 +537,6 @@ struct IntrinsicJSFragment: Sendable {
                         }
                     }
                     printer.write("},")
-
-                    for function in enumDefinition.staticMethods {
-                        printer.write("\(function.name): null,")
-                    }
-
-                    for property in enumDefinition.staticProperties {
-                        printer.write("\(property.name): null,")
-                    }
                 }
                 printer.write("};")
                 printer.nextLine()
@@ -633,14 +625,6 @@ struct IntrinsicJSFragment: Sendable {
                         let caseName = enumCase.name.capitalizedFirstLetter
                         printer.write("\(caseName): \(index),")
                     }
-
-                    for function in enumDefinition.staticMethods {
-                        printer.write("\(function.name): null,")
-                    }
-
-                    for property in enumDefinition.staticProperties {
-                        printer.write("\(property.name): null,")
-                    }
                 }
                 printer.write("};")
                 printer.nextLine()
@@ -667,14 +651,6 @@ struct IntrinsicJSFragment: Sendable {
 
                         printer.write("\(caseName): \(formattedValue),")
                     }
-
-                    for function in enumDefinition.staticMethods {
-                        printer.write("\(function.name): null,")
-                    }
-
-                    for property in enumDefinition.staticProperties {
-                        printer.write("\(property.name): null,")
-                    }
                 }
                 printer.write("};")
                 printer.nextLine()

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

@@ -10,14 +10,14 @@ export const Direction: {
     readonly East: 2;
     readonly West: 3;
 };
-export type Direction = typeof Direction[keyof typeof Direction];
+export type DirectionTag = typeof Direction[keyof typeof Direction];
 
 export const Status: {
     readonly Loading: 0;
     readonly Success: 1;
     readonly Error: 2;
 };
-export type Status = typeof Status[keyof typeof Status];
+export type StatusTag = typeof Status[keyof typeof Status];
 
 export enum TSDirection {
     North = 0,
@@ -29,7 +29,7 @@ export enum TSDirection {
 export const PublicStatus: {
     readonly Success: 0;
 };
-export type PublicStatus = typeof PublicStatus[keyof typeof PublicStatus];
+export type PublicStatusTag = typeof PublicStatus[keyof typeof PublicStatus];
 
 export type Exports = {
     setDirection(direction: Direction): void;

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

@@ -9,7 +9,7 @@ export const Theme: {
     readonly Dark: "dark";
     readonly Auto: "auto";
 };
-export type Theme = typeof Theme[keyof typeof Theme];
+export type ThemeTag = typeof Theme[keyof typeof Theme];
 
 export enum TSTheme {
     Light = "light",
@@ -21,14 +21,14 @@ export const FeatureFlag: {
     readonly Enabled: true;
     readonly Disabled: false;
 };
-export type FeatureFlag = typeof FeatureFlag[keyof typeof FeatureFlag];
+export type FeatureFlagTag = typeof FeatureFlag[keyof typeof FeatureFlag];
 
 export const HttpStatus: {
     readonly Ok: 200;
     readonly NotFound: 404;
     readonly ServerError: 500;
 };
-export type HttpStatus = typeof HttpStatus[keyof typeof HttpStatus];
+export type HttpStatusTag = typeof HttpStatus[keyof typeof HttpStatus];
 
 export enum TSHttpStatus {
     Ok = 200,
@@ -43,51 +43,51 @@ export const Priority: {
     readonly High: 4;
     readonly Highest: 5;
 };
-export type Priority = typeof Priority[keyof typeof Priority];
+export type PriorityTag = typeof Priority[keyof typeof Priority];
 
 export const FileSize: {
     readonly Tiny: 1024;
     readonly Small: 10240;
     readonly Medium: 102400;
     readonly Large: 1048576;
 };
-export type FileSize = typeof FileSize[keyof typeof FileSize];
+export type FileSizeTag = typeof FileSize[keyof typeof FileSize];
 
 export const UserId: {
     readonly Guest: 0;
     readonly User: 1000;
     readonly Admin: 9999;
 };
-export type UserId = typeof UserId[keyof typeof UserId];
+export type UserIdTag = typeof UserId[keyof typeof UserId];
 
 export const TokenId: {
     readonly Invalid: 0;
     readonly Session: 12345;
     readonly Refresh: 67890;
 };
-export type TokenId = typeof TokenId[keyof typeof TokenId];
+export type TokenIdTag = typeof TokenId[keyof typeof TokenId];
 
 export const SessionId: {
     readonly None: 0;
     readonly Active: 9876543210;
     readonly Expired: 1234567890;
 };
-export type SessionId = typeof SessionId[keyof typeof SessionId];
+export type SessionIdTag = typeof SessionId[keyof typeof SessionId];
 
 export const Precision: {
     readonly Rough: 0.1;
     readonly Normal: 0.01;
     readonly Fine: 0.001;
 };
-export type Precision = typeof Precision[keyof typeof Precision];
+export type PrecisionTag = typeof Precision[keyof typeof Precision];
 
 export const Ratio: {
     readonly Quarter: 0.25;
     readonly Half: 0.5;
     readonly Golden: 1.618;
     readonly Pi: 3.14159;
 };
-export type Ratio = typeof Ratio[keyof typeof Ratio];
+export type RatioTag = typeof Ratio[keyof typeof Ratio];
 
 export type Exports = {
     setTheme(theme: Theme): void;

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts

@@ -7,16 +7,14 @@
 export const Calculator: {
     readonly Scientific: 0;
     readonly Basic: 1;
-    square(value: number): number;
 };
-export type Calculator = typeof Calculator[keyof typeof Calculator];
+export type CalculatorTag = typeof Calculator[keyof typeof Calculator];
 
 export const APIResult: {
     readonly Tag: {
         readonly Success: 0;
         readonly Failure: 1;
     };
-    roundtrip(value: APIResult): APIResult;
 };
 
 export type APIResult =
@@ -48,6 +46,12 @@ export type Exports = {
         subtract(a: number, b: number): number;
         add(a: number, b: number): number;
     }
+    Calculator: {
+        square(value: number): number;
+    }
+    APIResult: {
+        roundtrip(value: APIResult): APIResult;
+    }
 }
 export type Imports = {
 }