expo-modules-macros 0.28.0 → 0.30.0

package/apple/Sources/ExpoModulesMacrosTool/main.swift

@@ -0,0 +1,27 @@
+import ExpoModulesCLI
+import ExpoModulesMacrosCore
+
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif os(Windows)
+import CRT
+#endif
+
+// The binary that this package ships as `ExpoModulesMacros`: the compiler plugin, which CocoaPods
+// builds load, and the scanner CLI, which `expo-modules-autolinking` and `expo-modules-cli` run. The
+// compiler always launches a plugin executable without arguments and speaks the plugin protocol over
+// stdin, so any argument means a scanner invocation (`ExpoModulesMacros scan-modules <path>...`);
+// with none, this starts the plugin server. The CLI gets `expandMacros`, so `expand` runs the macros
+// of this executable.
+let arguments = Array(CommandLine.arguments.dropFirst())
+if arguments.isEmpty {
+  try runPluginServer()
+} else {
+  let expander = MacroExpander(
+    attributeNames: Set(ProvidedMacro.all.map(\.name)),
+    expand: expandMacros
+  )
+  exit(ScannerCLI.run(arguments: arguments, expander: expander))
+}

package/build/types.d.ts

@@ -260,7 +260,7 @@ export interface ExportedEvent extends ExportedAccess, ExportedAvailability {
     jsName: string;
     /** The payload type, absent for a no-payload `() -> Void` event. */
     payload?: TypeNode;
-    /** `@Event(sync: true)`, dispatching inline on the JS thread instead of scheduling. */
+    /** `@Event(.sync)`, dispatching inline on the JS thread instead of scheduling. */
     sync: boolean;
 }
 /** The `@JS init` of a shared object: the constructor JS calls with `new`. */
@@ -391,10 +391,16 @@ export interface ScanStats {
     /** Wall-clock duration of the scan, in milliseconds. */
     durationMs: number;
 }
-/** One module in the `scan-modules` output. */
-export interface ScannedModule {
+/**
+ * One class in the `scan-modules` output: an `@ExpoModule` class in `modules`, or a `@SharedObject`
+ * class in `sharedObjects`.
+ */
+export interface ScannedClass {
     name: string;
-    /** The resolved JS name: the `@ExpoModule("Foo")` override, else the class name. */
+    /**
+     * The resolved JS name: the `@ExpoModule("Foo")` or `@SharedObject("Foo")` override, else the class
+     * name.
+     */
     jsName: string;
     /**
      * The spelled access level, or `internal` when none is written. The generated provider references
@@ -403,7 +409,7 @@ export interface ScannedModule {
     accessLevel: string;
     /**
      * The OSes whose builds include this class, resolved from the enclosing `#if` conditions. An
-     * unconditional module lists every OS. Empty means no build is known to include it, so don't
+     * unconditional class lists every OS. Empty means no build is known to include it, so don't
      * register it.
      */
     platforms: ScannedPlatform[];
@@ -412,7 +418,10 @@ export interface ScannedModule {
 /** The `scan-modules` result. */
 export interface ScanModulesResult {
     schemaVersion: number;
-    modules: ScannedModule[];
+    /** The top-level `@ExpoModule` classes. */
+    modules: ScannedClass[];
+    /** The top-level `@SharedObject` classes, with the same platform rules as `modules`. */
+    sharedObjects: ScannedClass[];
     warnings: ScanWarning[];
     stats: ScanStats;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-macros",
-  "version": "0.28.0",
+  "version": "0.30.0",
   "description": "Swift macro plugin for Expo modules",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -26,9 +26,9 @@
     "typescript": "^5.4.0"
   },
   "optionalDependencies": {
-    "@expo/modules-macros-linux-arm64": "0.28.0",
-    "@expo/modules-macros-linux-x64": "0.28.0",
-    "@expo/modules-macros-win32-arm64": "0.28.0",
-    "@expo/modules-macros-win32-x64": "0.28.0"
+    "@expo/modules-macros-linux-arm64": "0.30.0",
+    "@expo/modules-macros-linux-x64": "0.30.0",
+    "@expo/modules-macros-win32-arm64": "0.30.0",
+    "@expo/modules-macros-win32-x64": "0.30.0"
   }
 }

package/apple/Package.swift

@@ -1,66 +0,0 @@
-// swift-tools-version: 6.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import CompilerPluginSupport
-import Foundation
-import PackageDescription
-
-let package = Package(
-  name: "ExpoModulesMacros",
-  platforms: [.macOS(.v13)],
-  dependencies: [
-    .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "604.0.0-latest")
-  ],
-  targets: [
-    // The plugin executable doubles as the scanner CLI: the compiler launches it without arguments
-    // and speaks the plugin protocol over stdin, while an invocation with arguments dispatches into
-    // `ScannerCLI` (see the entry point in Plugin.swift). Sharing the binary keeps the package to a
-    // single shipped executable; the scanner adds little on top of the SwiftSyntax the macros
-    // already link.
-    .macro(
-      name: "ExpoModulesMacros",
-      dependencies: [
-        "ExpoModulesCLI",
-        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-        .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-        // For `expand`, which runs the macros in process.
-        .product(name: "SwiftSyntaxMacroExpansion", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
-        .product(name: "SwiftBasicFormat", package: "swift-syntax"),
-      ]
-    ),
-    .target(
-      name: "ExpoModulesCLI",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "SwiftIfConfig", package: "swift-syntax"),
-      ]
-    ),
-  ]
-)
-
-// The Tests directory is excluded from the published npm package,
-// so only declare the test target when building from the repository.
-if FileManager.default.fileExists(atPath: Context.packageDirectory + "/Tests") {
-  package.targets.append(
-    .testTarget(
-      name: "ExpoModulesMacrosTests",
-      dependencies: [
-        "ExpoModulesMacros",
-        "ExpoModulesCLI",
-        .product(name: "SwiftSyntaxMacrosGenericTestSupport", package: "swift-syntax"),
-      ]
-    )
-  )
-  package.targets.append(
-    .testTarget(
-      name: "ExpoModulesCLITests",
-      dependencies: [
-        "ExpoModulesCLI",
-        .product(name: "SwiftParser", package: "swift-syntax"),
-      ]
-    )
-  )
-}

package/apple/Sources/ExpoModulesMacros/Plugin.swift

@@ -1,36 +0,0 @@
-import ExpoModulesCLI
-import SwiftCompilerPlugin
-import SwiftSyntaxMacros
-
-#if canImport(Darwin)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#elseif os(Windows)
-import CRT
-#endif
-
-struct ExpoModulesMacrosPlugin: CompilerPlugin {
-  let providingMacros: [Macro.Type] = ProvidedMacro.all.map(\.type)
-}
-
-/// The executable doubles as the scanner CLI. The compiler always launches a plugin executable
-/// without arguments and speaks the plugin protocol over stdin, so any argument means a scanner
-/// invocation (`ExpoModulesMacros scan-modules <path>...`); with none, this starts the plugin
-/// server exactly as `@main` on the `CompilerPlugin` type would. The CLI gets `expandMacros`, so
-/// `expand` runs the macros of this executable.
-@main
-enum EntryPoint {
-  static func main() throws {
-    let arguments = Array(CommandLine.arguments.dropFirst())
-    if arguments.isEmpty {
-      try ExpoModulesMacrosPlugin.main()
-    } else {
-      let expander = MacroExpander(
-        attributeNames: Set(ProvidedMacro.all.map(\.name)),
-        expand: expandMacros
-      )
-      exit(ScannerCLI.run(arguments: arguments, expander: expander))
-    }
-  }
-}