Skip to content

Commit 21cc187

Browse files
RandomHashTagsRandomHashTags
committed
removed some unnecessary imports; minor fixes/changes
1 parent 795cd5c commit 21cc187

28 files changed

+62
-108
lines changed

‎Sources/CSS/CSS.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
public enum CSSStyle : HTMLInitializable {
1311
public typealias SFloat = Swift.Float

‎Sources/CSS/CSSUnit.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import HTMLKitUtilities
1111

1212
#if canImport(SwiftSyntax)
1313
import SwiftSyntax
14-
import SwiftSyntaxMacros
1514
#endif
1615

1716
public enum CSSUnit : HTMLInitializable { // https://www.w3schools.com/cssref/css_units.php

‎Sources/CSS/styles/AccentColor.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum AccentColor : HTMLInitializable {

‎Sources/CSS/styles/Align.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
/*
1311
extension CSSStyle {

‎Sources/CSS/styles/Animation.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
/*
1311
extension CSSStyle {

‎Sources/CSS/styles/Color.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum Color : HTMLParsable {

‎Sources/CSS/styles/ColumnCount.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum ColumnCount : HTMLParsable {

‎Sources/CSS/styles/Duration.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum Duration : HTMLInitializable {

‎Sources/CSS/styles/HyphenateCharacter.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum HyphenateCharacter : HTMLParsable {

‎Sources/CSS/styles/Opacity.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum Opacity : HTMLInitializable {

‎Sources/CSS/styles/Zoom.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
extension CSSStyle {
1311
public enum Zoom : HTMLInitializable {

‎Sources/HTMLAttributes/HTMLAttribute.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ import HTMLKitUtilities
1717
import HTMX
1818
#endif
1919

20-
#if canImport(SwiftSyntax)
21-
import SwiftSyntax
22-
import SwiftSyntaxMacros
23-
#endif
24-
2520
// MARK: HTMLAttribute
2621
public enum HTMLAttribute : HTMLInitializable {
2722
case accesskey(String? = nil)

‎Sources/HTMLAttributes/HTMLAttributes+Extra.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import HTMLKitUtilities
1515

1616
#if canImport(SwiftSyntax)
1717
import SwiftSyntax
18-
import SwiftSyntaxMacros
1918
#endif
2019

2120
// MARK: HTMLAttribute.Extra

‎Sources/HTMLAttributes/HTMLGlobalAttributes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import HTMX
1919

2020
#if canImport(SwiftSyntax)
2121
import SwiftSyntax
22-
import SwiftSyntaxMacros
2322
#endif
2423

2524
// MARK: HTMLGlobalAttributes

‎Sources/HTMLElements/CustomElement.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import HTMLAttributes
99
import HTMLKitUtilities
10-
import SwiftSyntax
11-
import SwiftSyntaxMacros
1210

1311
// MARK: custom
1412
/// A custom HTML element.

‎Sources/HTMLElements/HTMLElementValueType.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77

88
import HTMLKitUtilities
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
119

1210
package indirect enum HTMLElementValueType {
1311
case string

‎Sources/HTMLElements/LiteralElements.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import CSS
99
import HTMLAttributes
1010
import HTMLKitUtilities
11-
import SwiftSyntax
12-
import SwiftSyntaxMacros
1311

1412
@freestanding(
1513
declaration,

‎Sources/HTMLElements/svg/svg.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import HTMLAttributes
99
import HTMLKitUtilities
10-
import SwiftSyntax
11-
import SwiftSyntaxMacros
1210

1311
// MARK: svg
1412
/// The `svg` HTML element.

‎Sources/HTMLKitParse/InterpolationLookup.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import HTMLKitUtilities
1111
import SwiftDiagnostics
12-
import SwiftSyntaxMacros
1312
import SwiftParser
1413
import SwiftSyntax
1514

‎Sources/HTMLKitParse/ParseData.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import HTMLElements
1010
import HTMLKitUtilities
1111
import SwiftDiagnostics
1212
import SwiftSyntax
13-
import SwiftSyntaxMacros
1413

1514
extension HTMLKitUtilities {
1615
// MARK: Escape HTML

‎Sources/HTMLKitParse/ParseLiteral.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import HTMLAttributes
99
import HTMLKitUtilities
1010
import SwiftDiagnostics
1111
import SwiftSyntax
12-
import SwiftSyntaxMacros
1312

1413
extension HTMLKitUtilities {
1514
// MARK: Parse Literal Value

‎Sources/HTMLKitParse/extensions/HTMLElementValueType.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// Created by Evan Anderson on 1/30/25.
66
//
77

8+
#if canImport(HTMLElements) && canImport(HTMLKitUtilities) && canImport(SwiftSyntax)
89
import HTMLElements
910
import HTMLKitUtilities
1011
import SwiftSyntax
11-
import SwiftSyntaxMacros
1212

1313
extension HTMLElementValueType {
1414
package static func parse_element(context: HTMLExpansionContext, _ function: FunctionCallExprSyntax) -> HTMLElement? {
@@ -144,8 +144,9 @@ extension HTMLElementValueType {
144144
case "wbr": return get(wbr.self)
145145

146146
case "custom": return get(custom.self)
147-
case "svg": return get(svg.self)
147+
//case "svg": return get(svg.self)
148148
default: return nil
149149
}
150150
}
151-
}
151+
}
152+
#endif

‎Sources/HTMLKitParse/extensions/HTMX.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import HTMLKitUtilities
99
import HTMX
10-
import SwiftSyntax
11-
import SwiftSyntaxMacros
1210

1311
// MARK: init
1412
extension HTMXAttribute : HTMLParsable {

‎Sources/HTMLKitUtilities/HTMLExpansionContext.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
// Created by Evan Anderson on 1/31/25.
66
//
77

8+
#if canImport(SwiftSyntax) && canImport(SwiftSyntaxMacros)
89
import SwiftSyntax
910
import SwiftSyntaxMacros
11+
#endif
1012

1113
/// Data required to process an HTML expansion.
1214
public struct HTMLExpansionContext {
@@ -43,8 +45,10 @@ public struct HTMLExpansionContext {
4345
self.lookupFiles = lookupFiles
4446
}
4547

48+
#if canImport(SwiftSyntax)
4649
/// First expression in the arguments.
4750
public var expression : ExprSyntax? {
4851
arguments.first?.expression
4952
}
53+
#endif
5054
}

‎Sources/HTMLKitUtilities/HTMLKitUtilities.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
// Created by Evan Anderson on 9/19/24.
66
//
77

8+
#if canImport(SwiftSyntax)
89
import SwiftSyntax
9-
import SwiftSyntaxMacros
10+
#endif
1011

1112
// MARK: HTMLKitUtilities
1213
public enum HTMLKitUtilities {
@@ -59,6 +60,7 @@ extension String {
5960
}
6061
}
6162

63+
#if canImport(SwiftSyntax)
6264
// MARK: Misc
6365
extension ExprSyntaxProtocol {
6466
package var booleanLiteral : BooleanLiteralExprSyntax? { self.as(BooleanLiteralExprSyntax.self) }
@@ -94,4 +96,5 @@ extension LabeledExprListSyntax {
9496
package func get(_ index: Int) -> Element? {
9597
return index < count ? self[self.index(at: index)] : nil
9698
}
97-
}
99+
}
100+
#endif

‎Sources/HTMLKitUtilities/HTMLParsable.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
// Created by Evan Anderson on 1/30/25.
66
//
77

8-
#if canImport(SwiftSyntax)
9-
import SwiftSyntax
10-
import SwiftSyntaxMacros
11-
#endif
12-
138
public protocol HTMLParsable : HTMLInitializable {
149
#if canImport(SwiftSyntax)
1510
init?(context: HTMLExpansionContext)

‎Sources/HTMX/HTMX+Attributes.swift

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
import HTMLKitUtilities
1010
#endif
1111

12-
#if canImport(SwiftSyntax)
13-
import SwiftSyntax
14-
import SwiftSyntaxMacros
15-
#endif
16-
1712
extension HTMXAttribute {
1813
// MARK: TrueOrFalse
1914
public enum TrueOrFalse : String, HTMLParsable {
@@ -71,54 +66,56 @@ extension HTMXAttribute {
7166
case xhrProgress
7267

7368
@inlinable
74-
public var key : String {
75-
func slug() -> String {
76-
switch self {
77-
case .afterOnLoad: return "after-on-load"
78-
case .afterProcessNode: return "after-process-node"
79-
case .afterRequest: return "after-request"
80-
case .afterSettle: return "after-settle"
81-
case .afterSwap: return "after-swap"
82-
case .beforeCleanupElement: return "before-cleanup-element"
83-
case .beforeOnLoad: return "before-on-load"
84-
case .beforeProcessNode: return "before-process-node"
85-
case .beforeRequest: return "before-request"
86-
case .beforeSend: return "before-send"
87-
case .beforeSwap: return "before-swap"
88-
case .beforeTransition: return "before-transition"
89-
case .configRequest: return "config-request"
90-
case .historyCacheError: return "history-cache-error"
91-
case .historyCacheMiss: return "history-cache-miss"
92-
case .historyCacheMissError: return "history-cache-miss-error"
93-
case .historyCacheMissLoad: return "history-cache-miss-load"
94-
case .historyRestore: return "history-restore"
95-
case .beforeHistorySave: return "before-history-save"
96-
case .noSSESourceError: return "no-sse-source-error"
97-
case .onLoadError: return "on-load-error"
98-
case .oobAfterSwap: return "oob-after-swap"
99-
case .oobBeforeSwap: return "oob-before-swap"
100-
case .oobErrorNoTarget: return "oob-error-no-target"
101-
case .beforeHistoryUpdate: return "before-history-update"
102-
case .pushedIntoHistory: return "pushed-into-history"
103-
case .replacedInHistory: return "replaced-in-history"
104-
case .responseError: return "response-error"
105-
case .sendError: return "send-error"
106-
case .sseError: return "sse-error"
107-
case .sseOpen: return "sse-open"
108-
case .swapError: return "swap-error"
109-
case .targetError: return "target-error"
110-
case .validateURL: return "validate-url"
111-
case .validationValidate: return "validation:validate"
112-
case .validationFailed: return "validation:failed"
113-
case .validationHalted: return "validation:halted"
114-
case .xhrAbort: return "xhr:abort"
115-
case .xhrLoadEnd: return "xhr:loadend"
116-
case .xhrLoadStart: return "xhr:loadstart"
117-
case .xhrProgress: return "xhr:progress"
118-
default: return rawValue
119-
}
69+
var slug : String {
70+
switch self {
71+
case .afterOnLoad: return "after-on-load"
72+
case .afterProcessNode: return "after-process-node"
73+
case .afterRequest: return "after-request"
74+
case .afterSettle: return "after-settle"
75+
case .afterSwap: return "after-swap"
76+
case .beforeCleanupElement: return "before-cleanup-element"
77+
case .beforeOnLoad: return "before-on-load"
78+
case .beforeProcessNode: return "before-process-node"
79+
case .beforeRequest: return "before-request"
80+
case .beforeSend: return "before-send"
81+
case .beforeSwap: return "before-swap"
82+
case .beforeTransition: return "before-transition"
83+
case .configRequest: return "config-request"
84+
case .historyCacheError: return "history-cache-error"
85+
case .historyCacheMiss: return "history-cache-miss"
86+
case .historyCacheMissError: return "history-cache-miss-error"
87+
case .historyCacheMissLoad: return "history-cache-miss-load"
88+
case .historyRestore: return "history-restore"
89+
case .beforeHistorySave: return "before-history-save"
90+
case .noSSESourceError: return "no-sse-source-error"
91+
case .onLoadError: return "on-load-error"
92+
case .oobAfterSwap: return "oob-after-swap"
93+
case .oobBeforeSwap: return "oob-before-swap"
94+
case .oobErrorNoTarget: return "oob-error-no-target"
95+
case .beforeHistoryUpdate: return "before-history-update"
96+
case .pushedIntoHistory: return "pushed-into-history"
97+
case .replacedInHistory: return "replaced-in-history"
98+
case .responseError: return "response-error"
99+
case .sendError: return "send-error"
100+
case .sseError: return "sse-error"
101+
case .sseOpen: return "sse-open"
102+
case .swapError: return "swap-error"
103+
case .targetError: return "target-error"
104+
case .validateURL: return "validate-url"
105+
case .validationValidate: return "validation:validate"
106+
case .validationFailed: return "validation:failed"
107+
case .validationHalted: return "validation:halted"
108+
case .xhrAbort: return "xhr:abort"
109+
case .xhrLoadEnd: return "xhr:loadend"
110+
case .xhrLoadStart: return "xhr:loadstart"
111+
case .xhrProgress: return "xhr:progress"
112+
default: return rawValue
120113
}
121-
return ":" + slug()
114+
}
115+
116+
@inlinable
117+
public var key : String {
118+
return ":" + slug
122119
}
123120
}
124121

0 commit comments

Comments
 (0)