Skip to content

Commit a9d2385

Browse files
Rename Options to PackageOptions
1 parent 2995a90 commit a9d2385

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

Plugins/PackageToJS/Sources/MiniMake.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Foundation
22

3-
/// A simple build system
3+
/// A minimal build system
4+
///
5+
/// This build system is a traditional mtime-based incremental build system.
46
struct MiniMake {
57
/// Attributes of a task
68
enum TaskAttribute: String, Codable {

Plugins/PackageToJS/Sources/PackageToJS.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22

33
struct PackageToJS {
4-
struct Options {
4+
struct PackageOptions {
55
/// Path to the output directory
66
var outputPath: String?
77
/// Name of the package (default: lowercased Package.swift name)
@@ -15,7 +15,8 @@ struct PackageToJS {
1515
var product: String?
1616
/// Whether to split debug information into a separate file (default: false)
1717
var splitDebug: Bool
18-
var options: Options
18+
/// The options for packaging
19+
var packageOptions: PackageOptions
1920
}
2021

2122
struct TestOptions {
@@ -25,8 +26,8 @@ struct PackageToJS {
2526
var listTests: Bool
2627
/// The filter to apply to the tests
2728
var filter: [String]
28-
/// The options
29-
var options: Options
29+
/// The options for packaging
30+
var packageOptions: PackageOptions
3031
}
3132
}
3233

@@ -40,8 +41,8 @@ struct PackageToJSError: Swift.Error, CustomStringConvertible {
4041

4142
/// Plans the build for packaging.
4243
struct PackagingPlanner {
43-
/// The options of the plugin
44-
let options: PackageToJS.Options
44+
/// The options for packaging
45+
let options: PackageToJS.PackageOptions
4546
/// The package ID of the package that this plugin is running on
4647
let packageId: String
4748
/// The directory of the package that contains this plugin
@@ -56,7 +57,7 @@ struct PackagingPlanner {
5657
let wasmFilename = "main.wasm"
5758

5859
init(
59-
options: PackageToJS.Options,
60+
options: PackageToJS.PackageOptions,
6061
packageId: String,
6162
pluginWorkDirectoryURL: URL,
6263
selfPackageDir: URL,

Plugins/PackageToJS/Sources/PackageToJSPlugin.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ struct PackageToJSPlugin: CommandPlugin {
230230
}
231231
}
232232

233-
private func buildWasm(productName: String, context: PluginContext, options: PackageToJS.Options) throws
233+
private func buildWasm(productName: String, context: PluginContext, options: PackageToJS.PackageOptions) throws
234234
-> PackageManager.BuildResult
235235
{
236236
var parameters = PackageManager.BuildParameters(
@@ -285,12 +285,12 @@ struct PackageToJSPlugin: CommandPlugin {
285285

286286
// MARK: - Options parsing
287287

288-
extension PackageToJS.Options {
289-
static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.Options {
288+
extension PackageToJS.PackageOptions {
289+
static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.PackageOptions {
290290
let outputPath = extractor.extractOption(named: "output").last
291291
let packageName = extractor.extractOption(named: "package-name").last
292292
let explain = extractor.extractFlag(named: "explain")
293-
return PackageToJS.Options(
293+
return PackageToJS.PackageOptions(
294294
outputPath: outputPath, packageName: packageName, explain: explain != 0
295295
)
296296
}
@@ -300,7 +300,7 @@ extension PackageToJS.BuildOptions {
300300
static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.BuildOptions {
301301
let product = extractor.extractOption(named: "product").last
302302
let splitDebug = extractor.extractFlag(named: "split-debug")
303-
let options = PackageToJS.Options.parse(from: &extractor)
303+
let options = PackageToJS.PackageOptions.parse(from: &extractor)
304304
return PackageToJS.BuildOptions(product: product, splitDebug: splitDebug != 0, options: options)
305305
}
306306

@@ -338,7 +338,7 @@ extension PackageToJS.TestOptions {
338338
let buildOnly = extractor.extractFlag(named: "build-only")
339339
let listTests = extractor.extractFlag(named: "list-tests")
340340
let filter = extractor.extractOption(named: "filter")
341-
let options = PackageToJS.Options.parse(from: &extractor)
341+
let options = PackageToJS.PackageOptions.parse(from: &extractor)
342342
return PackageToJS.TestOptions(
343343
buildOnly: buildOnly != 0, listTests: listTests != 0,
344344
filter: filter, options: options
@@ -421,7 +421,7 @@ private func findPackageInDependencies(package: Package, id: Package.ID) -> Pack
421421

422422
extension PackagingPlanner {
423423
init(
424-
options: PackageToJS.Options,
424+
options: PackageToJS.PackageOptions,
425425
context: PluginContext,
426426
selfPackage: Package,
427427
outputDir: URL

0 commit comments

Comments
 (0)