Skip to content

Lowered SDK requirements to macOS 14 #10

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.

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
merged 3 commits into from
May 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// swift-tools-version: 6.1
// swift-tools-version: 6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "PrincipleMacros",
platforms: [
.macOS(.v15),
.macCatalyst(.v18),
.iOS(.v18),
.tvOS(.v18),
.watchOS(.v11),
.visionOS(.v2)
.macOS(.v14),
.macCatalyst(.v17),
.iOS(.v17),
.tvOS(.v17),
.watchOS(.v10),
.visionOS(.v1)
],
products: [
.library(
Expand Down
13 changes: 13 additions & 0 deletions Sources/PrincipleMacros/Parsers/Properties/PropertiesList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ extension PropertiesList {

extension PropertiesList {

public var uniqueInferredTypes: [TypeSyntax] {
let allInferredTypes = all.lazy.map { property in
(property.inferredType.description, property.inferredType)
}
let dictionary = Dictionary(
allInferredTypes,
uniquingKeysWith: { first, _ in first }
)
return dictionary.values.sorted { lhs, rhs in
lhs.description < rhs.description
}
}

public func withInferredType(like someType: TypeSyntax) -> Self {
.init(filter { $0.inferredType.isLike(someType) })
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/PrincipleMacros/Syntax/Extensions/TypeSyntax.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftSyntax
extension TypeSyntax {

public func isLike(_ other: TypeSyntax) -> Bool {
trimmedDescription == other.trimmedDescription
standardized.trimmedDescription == other.standardized.trimmedDescription
}
}

Expand Down
143 changes: 143 additions & 0 deletions Tests/PrincipleMacrosTests/Parsers/PropertiesListTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
//
// PropertiesListTests.swift
// PrincipleMacros
//
// Created by Kamil Strzelecki on 15/05/2025.
// Copyright © 2025 Kamil Strzelecki. All rights reserved.
//

@testable import PrincipleMacros
import SwiftSyntaxMacroExpansion
import Testing

internal struct PropertiesListTests {

private let list: PropertiesList

init() throws {
let decl: DeclSyntax = """
class Test {

let letProp: Int? = 0
var varProp = ""
lazy var lazyVarProp = Optional<Int>.none

static let staticLetProp = String(data: Data(), encoding: .utf8)
static var staticVarProp = Int?.some(0)
class var classVarProp: String { "" }

var computedProp: Int? { 0 }
var computedSettableProp: Optional<Int> {
get { 0 }
set {}
}
}
"""

let classDecl = try #require(ClassDeclSyntax(decl))
let context = BasicMacroExpansionContext()
self.list = PropertiesParser.parse(memberBlock: classDecl.memberBlock, in: context)
}

@Test
func testImmutable() throws {
#expect(
list.immutable.map(\.trimmedName.description) == [
"letProp",
"staticLetProp",
"classVarProp",
"computedProp"
]
)
}

@Test
func testMutable() throws {
#expect(
list.mutable.map(\.trimmedName.description) == [
"varProp",
"lazyVarProp",
"staticVarProp",
"computedSettableProp"
]
)
}

@Test
func testInstance() throws {
#expect(
list.instance.map(\.trimmedName.description) == [
"letProp",
"varProp",
"lazyVarProp",
"computedProp",
"computedSettableProp"
]
)
}

@Test
func testType() throws {
#expect(
list.type.map(\.trimmedName.description) == [
"staticLetProp",
"staticVarProp",
"classVarProp"
]
)
}

@Test
func testStored() throws {
#expect(
list.stored.map(\.trimmedName.description) == [
"letProp",
"varProp",
"lazyVarProp",
"staticLetProp",
"staticVarProp"
]
)
}

@Test
func testComputed() throws {
#expect(
list.computed.map(\.trimmedName.description) == [
"classVarProp",
"computedProp",
"computedSettableProp"
]
)
}

@Test
func testUniqueInferredTypes() throws {
#expect(
list.uniqueInferredTypes.map(\.description) == [
"Optional<Int>",
"String"
]
)
}

@Test
func testWithInferredType() throws {
#expect(
list.withInferredType(like: "Int?").map(\.trimmedName.description) == [
"letProp",
"lazyVarProp",
"staticVarProp",
"computedProp",
"computedSettableProp"
]
)
#expect(
list.withInferredType(like: "String").map(\.trimmedName.description) == [
"varProp",
"staticLetProp",
"classVarProp"
]
)
}
}
Loading