Skip to content

Minor refactoring changes #102

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
dempseyatgithub merged 2 commits into from
Mar 24, 2026
Merged

Minor refactoring changes #102

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
2a250d5
Make previousResultsURL for a project optional
dempseyatgithub Mar 24, 2026
97ddfd1
Use more compact regex for proposal numbers
dempseyatgithub Mar 24, 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
2 changes: 1 addition & 1 deletion Sources/EvolutionMetadataExtraction/CommandLineSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public enum ArgumentValidation {
for arg in forceExtract {
if arg == "all" {
forceAll = true
} else if arg.contains(/^SE-\d\d\d\d$/){
} else if arg.contains(/^SE-\d{4}/){
forcedExtractionIDs.append(arg)
} else {
throw ValidationError("Valid --force-extraction values are 'all' and proposal ids of the form 'SE-NNNN'")
Expand Down
3 changes: 2 additions & 1 deletion Sources/EvolutionMetadataExtraction/ExtractionJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@ extension ExtractionJob {
return ExtractionJob(project: project, output: output, snapshot: snapshot, proposalSpecs: proposalSpecs, previousResults: nil, forcedExtractionIDs: forcedExtractionIDs, jobMetadata: jobMetadata)
}

static func previousResults(from url: URL, ignorePreviousResults: Bool) async throws -> EvolutionMetadata? {
static func previousResults(from url: URL?, ignorePreviousResults: Bool) async throws -> EvolutionMetadata? {
if ignorePreviousResults { return nil }
guard let url else { return nil }

let data: Data?
if url.isFileURL {
Expand Down
2 changes: 1 addition & 1 deletion ...es/EvolutionMetadataExtraction/Extractors/FieldExtractors/PreviousProposalExtractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct PreviousProposalExtractor: MarkupWalker, ValueExtractor {

mutating func visitText(_ text: Text) -> () {
// VALIDATION ENHANCEMENT: Potentially look for missing links or text that does not include a proposal ID
for match in text.string.matches(of: /SE-\d\d\d\d/) {
for match in text.string.matches(of: /SE-\d{4}/) {
_previousProposalIDs.append(String(match.0))
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/EvolutionMetadataExtraction/Extractors/FieldExtractors/ProposalLinkExtractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct ProposalLinkExtractor: MarkupWalker, ValueExtractor {
}

// The link should be relative and contain the correct number of digits.
if !proposalLink.destination.contains(/^\d\d\d\d-.*\.md$/) {
if !proposalLink.destination.contains(/^\d{4}-.*\.md$/) {
self.proposalLink?.destination = "" // Do not include an incorrect destination
issues.reportIssue(Proposal.Issue.invalidProposalIDLink, source: source)
}
Expand Down
14 changes: 7 additions & 7 deletions Sources/EvolutionMetadataExtraction/Utilities/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ public final class Project: Sendable {
let path: String
let proposalPrefix: String
nonisolated(unsafe) let proposalRegex: Regex<Substring>
let previousResultsURL: URL
let previousResultsURL: URL?
let defaultOutputFilename: String
private let endpointBaseURL: URL
let mainBranchEndpoint: URL
let proposalListingEndpoint: URL
let validationExemptions: [Int:RangeSet<Int>]

private init(name: String, organization: String, repository: String, path: String, proposalPrefix: String, proposalRegex: Regex<Substring>, previousResultsURL: URL, defaultOutputFilename: String, validationExemptions: [Int:RangeSet<Int>]) {
private init(name: String, organization: String, repository: String, path: String, proposalPrefix: String, proposalRegex: Regex<Substring>, previousResultsURL: URL?, defaultOutputFilename: String, validationExemptions: [Int:RangeSet<Int>]) {
self.name = name
self.organization = organization
self.repository = repository
Expand Down Expand Up @@ -60,7 +60,7 @@ public final class Project: Sendable {
repository: "swift-evolution",
path: "proposals",
proposalPrefix: "SE",
proposalRegex: /^SE-\d\d\d\d$/,
proposalRegex: /^SE-\d{4}$/,
previousResultsURL: URL(string: "https://download.swift.org/swift-evolution/v1/evolution.json")!,
defaultOutputFilename: "evolution.json",
validationExemptions: [
Expand Down Expand Up @@ -90,8 +90,8 @@ public final class Project: Sendable {
repository: "swift-evolution",
path: "proposals/testing",
proposalPrefix: "ST",
proposalRegex: /^ST-\d\d\d\d$/,
previousResultsURL: URL(string: "https://download.swift.org/swift-evolution/v1/testing-evolution.json")!,
proposalRegex: /^ST-\d{4}$/,
previousResultsURL: nil, // URL(string: "https://download.swift.org/swift-evolution/v1/testing-evolution.json")!,
defaultOutputFilename: "testing-evolution.json",
validationExemptions: [
// Early proposals did not have a review manager
Expand All @@ -106,8 +106,8 @@ public final class Project: Sendable {
repository: "swift-foundation",
path: "Proposals",
proposalPrefix: "SF",
proposalRegex: /^SF-\d\d\d\d$/,
previousResultsURL: URL(string: "https://download.swift.org/swift-evolution/v1/foundation-evolution.json")!,
proposalRegex: /^SF-\d{4}$/,
previousResultsURL: nil, // URL(string: "https://download.swift.org/swift-evolution/v1/foundation-evolution.json")!,
defaultOutputFilename: "foundation-evolution.json",
validationExemptions: [:]
)
Expand Down
Loading