Skip to content

BridgeJS: Include pluginGeneratedSources in build plugin input files #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krodak merged 2 commits into from
Feb 16, 2026
+12 −2
Merged

BridgeJS: Include pluginGeneratedSources in build plugin input files #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9589496
BridgeJS: Add additionalSourceDirs config for cross-plugin file disco…
krodak Feb 16, 2026
53f69d4
BridgeJS: Test different approach for cross-plugin file discovery
krodak Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
inputFiles.append(configFile)
}

// Include Swift files generated by other plugins applied to this
// target (available in tools-version 6.0+). This lets BridgeJS
// process @JS annotations in files produced by earlier plugins
// without requiring any extra configuration.
let pluginGeneratedSwiftFiles = target.pluginGeneratedSources.filter {
$0.pathExtension == "swift"
}
inputFiles.append(contentsOf: pluginGeneratedSwiftFiles)

let inputTSFile = target.directoryURL.appending(path: "bridge-js.d.ts")
let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json")

Expand All @@ -47,15 +56,15 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
]

if FileManager.default.fileExists(atPath: inputTSFile.path) {
// Add .d.ts file and tsconfig.json as inputs
inputFiles.append(contentsOf: [inputTSFile, tsconfigPath])
arguments.append(contentsOf: [
"--project",
tsconfigPath.path,
])
}

arguments.append(contentsOf: inputSwiftFiles.map(\.path))
let allSwiftFiles = inputSwiftFiles + pluginGeneratedSwiftFiles
arguments.append(contentsOf: allSwiftFiles.map(\.path))

return .buildCommand(
displayName: "Generate BridgeJS code",
Expand Down
1 change: 1 addition & 0 deletions Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ import BridgeJSUtilities
var inputFiles = withSpan("Collecting Swift files") {
return inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments)
}

// BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need
// to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin
// filters out Generated/ files, so we explicitly add it here after generation.
Expand Down