Merge pull request #455 from PassiveLogic/fix/negative-enum-value

BridgeJS: Fix support for negative enum values for raw value types

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -981,12 +981,23 @@ public class ExportSwift {
                         rawValue = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text
                     } else if let boolLiteral = element.rawValue?.value.as(BooleanLiteralExprSyntax.self) {
                         rawValue = boolLiteral.literal.text
-                    } else if let intLiteral = element.rawValue?.value.as(IntegerLiteralExprSyntax.self) {
-                        rawValue = intLiteral.literal.text
-                    } else if let floatLiteral = element.rawValue?.value.as(FloatLiteralExprSyntax.self) {
-                        rawValue = floatLiteral.literal.text
                     } else {
-                        rawValue = nil
+                        var numericExpr = element.rawValue?.value
+                        var isNegative = false
+                        if let prefixExpr = numericExpr?.as(PrefixOperatorExprSyntax.self),
+                            prefixExpr.operator.text == "-"
+                        {
+                            numericExpr = prefixExpr.expression
+                            isNegative = true
+                        }
+
+                        if let intLiteral = numericExpr?.as(IntegerLiteralExprSyntax.self) {
+                            rawValue = isNegative ? "-\(intLiteral.literal.text)" : intLiteral.literal.text
+                        } else if let floatLiteral = numericExpr?.as(FloatLiteralExprSyntax.self) {
+                            rawValue = isNegative ? "-\(floatLiteral.literal.text)" : floatLiteral.literal.text
+                        } else {
+                            rawValue = nil
+                        }
                     }
                 } else {
                     rawValue = nil

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumRawType.swift

@@ -28,7 +28,7 @@
 }
 
 @JS enum Priority: Int32 {
-    case lowest = 1
+    case lowest = -1
     case low = 2
     case medium = 3
     case high = 4

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

@@ -37,7 +37,7 @@ export enum TSHttpStatus {
 }
 
 export const PriorityValues: {
-    readonly Lowest: 1;
+    readonly Lowest: -1;
     readonly Low: 2;
     readonly Medium: 3;
     readonly High: 4;

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js

@@ -34,7 +34,7 @@ export const TSHttpStatus = {
 };
 
 export const PriorityValues = {
-    Lowest: 1,
+    Lowest: -1,
     Low: 2,
     Medium: 3,
     High: 4,

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json

@@ -178,7 +178,7 @@
 
           ],
           "name" : "lowest",
-          "rawValue" : "1"
+          "rawValue" : "-1"
         },
         {
           "associatedValues" : [

Tests/BridgeJSRuntimeTests/ExportAPITests.swift

@@ -153,6 +153,7 @@ struct TestError: Error {
     case ok = 200
     case notFound = 404
     case serverError = 500
+    case unknown = -1
 }
 
 @JS(enumStyle: .tsEnum) enum TSDirection {

Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json

@@ -1290,6 +1290,13 @@
           ],
           "name" : "serverError",
           "rawValue" : "500"
+        },
+        {
+          "associatedValues" : [
+
+          ],
+          "name" : "unknown",
+          "rawValue" : "-1"
         }
       ],
       "emitStyle" : "const",

Tests/prelude.mjs

@@ -401,6 +401,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     assert.equal(exports.HttpStatus.Ok, 200);
     assert.equal(exports.HttpStatus.NotFound, 404);
     assert.equal(HttpStatusValues.ServerError, 500);
+    assert.equal(HttpStatusValues.Unknown, -1);
 
     assert.equal(exports.setTheme(exports.Theme.Light), exports.Theme.Light);
     assert.equal(exports.setTheme(exports.Theme.Dark), exports.Theme.Dark);