@expo/expo-modules-macros-plugin 0.6.0 → 0.6.1

package/apple/Sources/ExpoModulesMacros/DecorateModuleBuilder.swift

@@ -90,23 +90,21 @@ internal struct JSFunction {
       // No omittable trailing run: a single flat call with every argument decoded.
       lines.append(contentsOf: callAndEncodeLines(receiver: receiver, arity: maximum, decodingFrom: required))
     } else {
-      // One call shape per accepted arity. Each branch decodes only the trailing slots it has and
-      // fills the rest (defaulted params drop their label so Swift applies the default; optional
-      // params are passed `nil`). A value-returning function binds the result from a `switch`
-      // expression and encodes once after it; a no-return one calls inline in a `switch` statement
-      // and returns `.undefined`.
-      if returnType != nil {
-        lines.append("let result = switch arguments.count {")
-      } else {
-        lines.append("switch arguments.count {")
+      // One call shape per accepted arity, branching on `arguments.count`. A branch decodes a
+      // trailing slot before the call, so this is a `switch` statement (not an expression): a
+      // value-returning function declares `result` up front and each branch assigns it.
+      if let returnType {
+        lines.append("let result: \(expressionType(returnType))")
       }
+      lines.append("switch arguments.count {")
       for arity in required...maximum {
         let label = arity == maximum ? "default:" : "case \(arity):"
         lines.append(label)
         for index in required..<arity {
           lines.append("  " + decodeStatement(at: index))
         }
-        lines.append("  \(callExpression(receiver: receiver, arity: arity))")
+        let assignment = returnType != nil ? "result = " : ""
+        lines.append("  \(assignment)\(callExpression(receiver: receiver, arity: arity))")
       }
       lines.append("}")
       lines.append(contentsOf: encodeResultLines())
@@ -340,7 +338,7 @@ internal func buildDecorateJavaScriptObject(functions: [JSFunction], properties:
   let body = decorateBody(functions: functions, properties: properties, receiver: .module)
   return """
     @JavaScriptActor
-    public func _decorateModule(object: borrowing JavaScriptObject, in runtime: JavaScriptRuntime, appContext: AppContext) throws {
+    public func _decorateModule(object: borrowing JavaScriptObject, in runtime: JavaScriptRuntime) throws {
     \(raw: body)
     }
     """
@@ -361,7 +359,7 @@ internal func buildDecorateSharedObject(
   let body = decorateBody(functions: functions, properties: properties, receiver: .sharedObject(typeName: typeName))
   return """
     @JavaScriptActor
-    public override class func _decorateSharedObject(prototype: borrowing JavaScriptObject, in runtime: JavaScriptRuntime, appContext: AppContext) throws {
+    public override class func _decorateSharedObject(prototype: borrowing JavaScriptObject, in runtime: JavaScriptRuntime) throws {
     \(raw: body)
     }
     """

package/apple/Sources/ExpoModulesMacros/JSConstructor.swift

@@ -42,14 +42,12 @@ internal struct JSConstructor {
       .joined(separator: "\n")
   }
 
-  /// The `_constructSharedObject` entry point the runtime calls to build an instance from JS
-  /// arguments. Overrides the base `SharedObject` class method so core can dispatch to it through the
-  /// concrete type's metatype; the body returns the concrete instance, which promotes to the base
-  /// `SharedObject?` return type. `this`/`appContext` may go unreferenced, which is harmless.
+  /// Builds an instance from the JS arguments. Overrides the base `SharedObject` class method; returns
+  /// the concrete instance, which promotes to the base `SharedObject?` return type.
   func buildConstructor(typeName: String) -> DeclSyntax {
     return """
       @JavaScriptActor
-      public override class func _constructSharedObject(this: JavaScriptValue, arguments: borrowing JavaScriptValuesBuffer, in runtime: JavaScriptRuntime, appContext: AppContext) throws -> SharedObject? {
+      public override class func _constructSharedObject(this: JavaScriptValue, arguments: borrowing JavaScriptValuesBuffer, in runtime: JavaScriptRuntime) throws -> SharedObject? {
       \(raw: bodyStatements(typeName: typeName, indent: "  "))
       }
       """

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/expo-modules-macros-plugin",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Swift macro plugin for Expo modules",
   "license": "MIT",
   "author": "650 Industries, Inc.",