Improvements

WIP: Selectors & At-Rules support

Author: maximkrouk

Sources/CSSKit/Group.swift

@@ -6,10 +6,13 @@
 //  Copyright © 2019 MakeupStudio. All rights reserved.
 //
 
-//public struct Group: Renderable {
-//    public var selector: ErasedSelector
+//struct AtRuleGroup {
+//    var rule: NestingAtRule
+//    var nestedGroups: [StyleGroup]
+//}
+
+//public struct StyleGroup: Cus {
+//    public var selector: AnySelector
 //    public var styles = StylesCollection()
-//    public func render() -> String {
-//
-//    }
+//    public func render() -> String {}
 //}

Sources/CSSKit/Helpers/Verification.swift

@@ -0,0 +1,15 @@
+//
+//  Verification.swift
+//  CSSKit
+//
+//  Created by Maxim Krouk on 5/29/20.
+//
+
+import Foundation
+
+internal func verifyIdent(_ string: String) -> Bool {
+    string.range(
+        of: #"^(([\\a-zA-Z_-]{1}[^\d])|[\\a-zA-Z_]{1})([\\a-zA-Z0-9_ -]|(\\.))*$"#,
+        options: .regularExpression
+    ) != nil
+}

Sources/CSSKit/Rules/AtRule+Namespace.swift

@@ -0,0 +1,83 @@
+//
+//  AtRule+Namespace.swift
+//  CSSKit
+//
+//  Created by Maxim Krouk on 5/29/20.
+//
+
+extension AtRule {
+    public struct Namespace: CSSAtRule {
+        static private var prefix: String { "@namespace" }
+        public var label: Label
+        public var target: Target
+        
+        public init?(rawValue: RawAtRule) {
+            let string = rawValue.render()
+            guard string.hasPrefix(Self.prefix) else { return nil }
+            let noPrefix = string.components(separatedBy: .whitespaces).dropFirst()
+            
+            guard let labelString = noPrefix.first else { return nil }
+            
+            let label = Label(labelString)
+            
+            let targetString = noPrefix.dropFirst().joined(separator: " ")
+            guard !targetString.isEmpty else { return nil }
+            
+            let target = Target(targetString)
+            
+            self.init(label: label, target: target)
+        }
+        
+        public init(label: Label, target: Target) {
+            self.label = label
+            self.target = target
+        }
+        
+        public var rawValue: RawValue {
+            RawAtRule([
+                Self.prefix,
+                label.rawValue,
+                target.rawValue
+            ]
+                .filter { !$0.isEmpty }
+                .joined(separator: " ")
+            )
+        }
+    }
+}
+
+extension AtRule.Namespace {
+    public struct Label: RawRepresentable, ExpressibleByStringLiteral {
+        private(set) public var rawValue: String
+        
+        public init(stringLiteral value: StringLiteralType) {
+            self.init(value)
+        }
+        
+        public init(_ value: String) {
+            self.init(rawValue: value)
+        }
+        
+        public init(rawValue: String) { self.rawValue = rawValue }
+        
+        static var `default`: Self { .init("") }
+    }
+    
+    // TODO: Maybe I should validate target in initializer somehow
+    public struct Target: RawRepresentable, ExpressibleByStringLiteral {
+        private(set) public var rawValue: String
+        
+        public init(stringLiteral value: StringLiteralType) {
+            self.init(value)
+        }
+        
+        public init(_ value: String) {
+            self.init(rawValue: value)
+        }
+        
+        public init(rawValue: String) { self.rawValue = rawValue }
+        
+        public static func url(_ value: String) -> Self { .init("url(\(value)") }
+        public static func string(_ value: String) -> Self { .init(value) }
+    }
+}

Sources/CSSKit/Rules/CSSAtRule.swift

@@ -0,0 +1,54 @@
+//
+//  CSSAtRule.swift
+//  CSSKit
+//
+//  Created by Maxim Krouk on 9/1/19.
+//  Copyright © 2019 MakeupStudio. All rights reserved.
+//
+
+public enum AtRule {}
+
+public protocol CSSAtRule: Renderable, RawRepresentable where RawValue == RawAtRule {}
+
+extension CSSAtRule {
+    public func eraseToAnyAtRule() -> AnyAtRule { .init(self) }
+    
+    public func render() -> String { rawValue.render() }
+}
+
+public struct RawAtRule: CSSAtRule, ExpressibleByStringLiteral {
+    private var _rawValue: String
+
+    public init(rawValue: RawAtRule) {
+        self = rawValue
+    }
+
+    public init(stringLiteral value: String) {
+        self.init(value)
+    }
+
+    public init(_ value: String) {
+        self._rawValue = value
+    }
+    
+    public func render() -> String { _rawValue }
+    
+    public var rawValue: RawAtRule { self }
+    
+}
+
+public struct AnyAtRule: CSSAtRule {
+    private var _render: () -> String
+    
+    public init(rawValue: RawAtRule) {
+        self.init(rawValue)
+    }
+    
+    public init<T: CSSAtRule>(_ rule: T) {
+        self._render = rule.render
+    }
+    
+    public var rawValue: RawAtRule { .init(render()) }
+    
+    public func render() -> String { _render() }
+}

Sources/CSSKit/Selectors/CSSSelector.swift

@@ -6,10 +6,48 @@
 //  Copyright © 2019 MakeupStudio. All rights reserved.
 //
 
-public protocol Selector: RawRepresentable where RawValue == String {
+public enum Selector {}
+
+public protocol CSSSelector: Renderable, RawRepresentable where RawValue == RawSelector {}
+
+extension CSSSelector {
+    func eraseToAnySelector() -> AnySelector { .init(self) }
+    
+    public func render() -> String { rawValue.render() }
+}
+
+public struct RawSelector: CSSSelector, ExpressibleByStringLiteral {
+    public var _rawValue: String
+    
+    public init(rawValue: RawSelector) {
+        self = rawValue
+    }
 
-    static var `operator`: String { get }
+    public init(stringLiteral value: String) {
+        self.init(value)
+    }
 
+    public init(_ value: String) {
+        self._rawValue = value
+    }
 
+    public func render() -> String { _rawValue }
+    
+    public var rawValue: RawSelector { self }
 }
 
+public struct AnySelector: CSSSelector {
+    var _render: () -> String
+    
+    public init(rawValue: RawSelector) {
+        self.init(rawValue)
+    }
+    
+    public init<T: CSSSelector>(_ selector: T) {
+        self._render = selector.render
+    }
+    
+    public var rawValue: RawSelector { .init(render())}
+    
+    public func render() -> String { _render() }
+}