Update documentation and clean up code

Author: danielsaidi

Package.swift

@@ -1,14 +1,14 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
 let package = Package(
     name: "TagKit",
     platforms: [
-        .iOS(.v15),
-        .macOS(.v12),
-        .tvOS(.v15),
-        .watchOS(.v10),
+        .iOS(.v16),
+        .macOS(.v13),
+        .tvOS(.v16),
+        .watchOS(.v9),
         .visionOS(.v1)
     ],
     products: [

RELEASE_NOTES.md

@@ -4,6 +4,12 @@ TagKit will use semver after 1.0.
 
 
 
+## 0.5
+
+This version makes TagKit use Swift 6.
+
+
+
 ## 0.4.1
 
 This version temporarily downgrades to Swift 5.9 since Xcode 16.1 made things stop working.

Sources/TagKit/SlugConfiguration.swift

@@ -11,39 +11,43 @@ import Foundation
 /// This configuration defines how ``Slugifiable`` types are
 /// slugified.
 ///
-/// Use the ``SlugConfiguration/standard`` configuration for
-/// the default behavior, which limits the slugified strings
-/// to `a-z` and `1-9`, using `-` as separator.
+/// The standard configuration allows `a-z`, `A-Z` and `0-9`,
+/// and will e.g. slugify `Hello, world!` into `hello-world`.
 public struct SlugConfiguration {
 
     /// Create a new slug configurator.
     ///
     /// - Parameters:
     ///   - separator: The separator to use in the slugified string, by default `-`.
-    ///   - allowedCharacters: The characters to allow in the slugified string, by default alphanumerical characters and `-`.
+    ///   - allowedCharacters: The characters to allow in the slugified string, by default `a-zA-Z0-9`.
     public init(
         separator: String = "-",
         allowedCharacters: String = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     ) {
         let chars = allowedCharacters + separator
         self.separator = separator
         self.allowedCharacters = chars
-        self.allowedCharacterSet = NSCharacterSet(charactersIn: chars)
+        let allowedSet = NSCharacterSet(charactersIn: chars)
+        self.allowedCharacterSet = allowedSet
+        self.notAllowedCharacterSet = allowedSet.inverted
     }
 
     /// The separator to use in the slugified string.
     public let separator: String
 
     /// The characters to allow in the slugified string.
     public let allowedCharacters: String
-
-    /// The character set to allow in the slugified string.
+    
+    /// The characters to allow in the slugified string.
     public let allowedCharacterSet: NSCharacterSet
+    
+    /// The characters to not allow in the slugified string.
+    public let notAllowedCharacterSet: CharacterSet
 }
 
 public extension SlugConfiguration {
 
-    /// A standard slug configuration, that allows `a-z` and
-    /// `1-9` and uses `-` as the component separator.
+    /// A standard slug configuration, with `-` as component
+    /// separator and `a-zA-Z0-9` as allowed characters.
     static var standard: SlugConfiguration { .init() }
 }

Sources/TagKit/Slugifiable.swift

@@ -8,15 +8,8 @@
 
 import Foundation
 
-/// This protocol describes a slugifiable type, which can be
-/// represented as a slugified string.
-///
-/// Slugified strings are for instance used in urls and tags,
-/// where a text is represented by removing unsupported text
-/// components. The standard format can be customized with a
-/// custom ``SlugConfiguration``.
-///
-/// By default, `Hello, world!` is slugified to `hello-world`.
+/// This protocol can be implemented by any type that can be
+/// converted to a slugified string.
 ///
 /// This protocol is automatically implemented by `String`.
 public protocol Slugifiable {
@@ -37,12 +30,10 @@ public extension Slugifiable {
     func slugified(
         configuration: SlugConfiguration = .standard
     ) -> String {
-        let chars = configuration.allowedCharacterSet.inverted
-        let separator = configuration.separator
-        return slugifiableValue.lowercased()
-            .components(separatedBy: chars)
+        slugifiableValue.lowercased()
+            .components(separatedBy: configuration.notAllowedCharacterSet)
             .filter { !$0.isEmpty }
-            .joined(separator: separator)
+            .joined(separator: configuration.separator)
     }
 }
 

Sources/TagKit/Views/FlowLayout.swift

@@ -75,22 +75,52 @@ private extension FlowLayout {
 
     var content: some View {
         GeometryReader { geometry in
-            content(in: geometry)
+            content(in: geometry.size)
         }
     }
 
-    func content(in g: GeometryProxy) -> some View {
+    func content(in size: CGSize) -> some View {
         var width = CGFloat.zero
         var height = CGFloat.zero
         var lastHeight = CGFloat.zero
         let itemCount = items.count
+        let itemVews = items.enumerated().map { element in
+            let index = element.offset
+            let item = element.element
+            itemView(item)
+                .padding([.horizontal], horizontalSpacing)
+                .padding([.vertical], verticalSpacing)
+                .alignmentGuide(.leading, computeValue: { d in
+                    if abs(width - d.width) > size.width {
+                        width = 0
+                        height -= lastHeight
+                    }
+                    lastHeight = d.height
+                    let result = width
+                    if index == itemCount - 1 {
+                        width = 0
+                    } else {
+                        width -= d.width
+                    }
+                    return result
+                })
+                .alignmentGuide(.top, computeValue: { _ in
+                    let result = height
+                    if index == itemCount - 1 {
+                        height = 0
+                    }
+                    return result
+                })
+        }
+        
+        
         return ZStack(alignment: .topLeading) {
             ForEach(Array(items.enumerated()), id: \.offset) { index, item in
                 itemView(item)
                     .padding([.horizontal], horizontalSpacing)
                     .padding([.vertical], verticalSpacing)
                     .alignmentGuide(.leading, computeValue: { d in
-                        if abs(width - d.width) > g.size.width {
+                        if abs(width - d.width) > size.width {
                             width = 0
                             height -= lastHeight
                         }