Merge pull request #97 from omochi/method-chain-style

パラメータオブジェクトをメソッドチェーンで構築できるようにする

Author: omochi

Codegen/.gitignore

@@ -8,3 +8,4 @@ DerivedData/
 .netrc
 .swiftpm
 node_modules
+data.json

Codegen/Package.resolved

@@ -27,6 +27,15 @@
         "version" : "0.3.0"
       }
     },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
+      }
+    },
     {
       "identity" : "swift-format",
       "kind" : "remoteSourceControl",

Codegen/Package.swift

@@ -12,12 +12,14 @@ let package = Package(
         )
     ],
     dependencies: [
+        .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
         .package(url: "https://github.com/omochi/CodegenKit", from: "1.4.1")
     ],
     targets: [
         .target(
             name: "SRTCodegen",
             dependencies: [
+                .product(name: "Collections", package: "swift-collections"),
                 .product(name: "CodegenKit", package: "CodegenKit")
             ]
         ),

Codegen/Sources/SRTCodegen/Def.swift

@@ -0,0 +1,43 @@
+import Collections
+
+struct Def: Codable {
+    var tagNames: [String]
+    var voidElements: [String]
+    var elementAttributes: [String: [String]]
+    var eventAttributes: [String]
+    var cssProperties: [String]
+
+    mutating func fix() {
+        tagNames.removeAll { (tagName) in
+            voidElements.contains(tagName)
+        }
+
+        self.cssProperties = {
+            var css: OrderedSet<String> = []
+            
+            for x in cssProperties {
+                if !x.hasPrefix("-") {
+                    css.remove("-" + x)
+                }
+
+                css.append(x)
+            }
+
+            return css.elements
+        }()
+    }
+
+    var allAttributes: [String] {
+        var attrs: OrderedSet<String> = []
+        attrs.formUnion(elementAttributes["*"] ?? [])
+
+        var dict = elementAttributes
+        dict["*"] = nil
+
+        for key in dict.keys.sorted() {
+            attrs.formUnion(dict[key] ?? [])
+        }
+
+        return attrs.elements
+    }
+}

Codegen/Sources/SRTCodegen/Keywords.swift

@@ -0,0 +1,29 @@
+import Foundation
+import CodegenKit
+
+struct AttributesRenderer: Renderer {
+    var def: Def
+
+    func isTarget(file: URL) -> Bool {
+        file.lastPathComponent == "Attributes.swift"
+    }
+
+    func render(template: inout CodeTemplateModule.CodeTemplate, file: URL, on runner: CodegenKit.CodegenRunner) throws {
+        let code = def.allAttributes.map { (attribute) in
+            renderSetter(attribute: attribute)
+        }.joined(separator: "\n")
+
+        template["setters"] = code
+    }
+
+    private func renderSetter(attribute: String) -> String {
+        let symbol = attribute.kebabToCamel()
+
+        return """
+        public func \(renderIdentifier(symbol))(_ value: String) -> Attributes {
+            set("\(attribute)", to: value)
+        }
+
+        """
+    }
+}

Codegen/Sources/SRTCodegen/Renderers/AttributesRenderer.swift

@@ -0,0 +1,32 @@
+import Foundation
+import CodegenKit
+
+struct EventListenersRenderer: Renderer {
+    var def: Def
+
+    func isTarget(file: URL) -> Bool {
+        file.lastPathComponent == "EventListeners.swift"
+    }
+
+    func render(template: inout CodeTemplateModule.CodeTemplate, file: URL, on runner: CodegenKit.CodegenRunner) throws {
+        let code = def.eventAttributes.map { (attribute) in
+            renderSetter(attribute: attribute)
+        }.joined(separator: "\n")
+
+        template["setters"] = code
+    }
+
+    private func renderSetter(attribute: String) -> String {
+        var attribute = attribute
+        if attribute.hasPrefix("on") {
+            attribute.removeFirst(2)
+        }
+
+        return """
+        public func \(renderIdentifier(attribute))(_ value: EventListener) -> EventListeners {
+            set("\(attribute)", to: value)
+        }
+
+        """
+    }
+}

Codegen/Sources/SRTCodegen/Renderers/EventListenersRenderer.swift

@@ -2,14 +2,14 @@ import Foundation
 import CodegenKit
 
 struct HTMLTagRenderer: Renderer {
-    var tags: [String]
-    
+    var def: Def
+
     func isTarget(file: URL) -> Bool {
         file.lastPathComponent == "HTMLTags.swift"
     }
 
     func render(template: inout CodeTemplateModule.CodeTemplate, file: URL, on runner: CodegenKit.CodegenRunner) throws {
-        let code = tags.map { (tag) in
+        let code = def.tagNames.map { (tag) in
             renderTagFunc(tag: tag)
         }.joined(separator: "\n")
 
@@ -21,28 +21,22 @@ struct HTMLTagRenderer: Renderer {
         public func \(renderIdentifier(tag))(
             key: AnyHashable? = nil,
             ref: RefObject<JSHTMLElement>? = nil,
-            attributes: Attributes = [:],
-            listeners: EventListeners = [:],
+            attributes: Attributes? = nil,
+            style: Style? = nil,
+            listeners: EventListeners? = nil,
             @ChildrenBuilder _ children: () -> [Node] = { [] }
         ) -> HTMLElement {
             HTMLElement(
                 tagName: "\(tag)",
                 key: key,
                 ref: ref,
                 attributes: attributes,
+                style: style,
                 listeners: listeners,
                 children: children()
             )
         }
 
         """
     }
-
-    private func renderIdentifier(_ text: String) -> String {
-        var text = text
-        if keywords.contains(text) {
-            text = "`\(text)`"
-        }
-        return text
-    }
 }

Codegen/Sources/SRTCodegen/HTMLTagRenderer.swift Codegen/Sources/SRTCodegen/Renderers/HTMLTagRenderer.swift

@@ -1,15 +1,15 @@
 import Foundation
 import CodegenKit
 
-struct HTMLLeafTagRenderer: Renderer {
-    var tags: [String]
+struct HTMLVoidTagRenderer: Renderer {
+    var def: Def
 
     func isTarget(file: URL) -> Bool {
-        file.lastPathComponent == "HTMLLeafTags.swift"
+        file.lastPathComponent == "HTMLVoidTags.swift"
     }
 
     func render(template: inout CodeTemplateModule.CodeTemplate, file: URL, on runner: CodegenKit.CodegenRunner) throws {
-        let code = tags.map { (tag) in
+        let code = def.voidElements.map { (tag) in
             renderTagFunc(tag: tag)
         }.joined(separator: "\n")
 
@@ -21,14 +21,16 @@ struct HTMLLeafTagRenderer: Renderer {
         public func \(tag)(
             key: AnyHashable? = nil,
             ref: RefObject<JSHTMLElement>? = nil,
-            attributes: Attributes = [:],
-            listeners: EventListeners = [:]
+            attributes: Attributes? = nil,
+            style: Style? = nil,
+            listeners: EventListeners? = nil
         ) -> HTMLElement {
             HTMLElement(
                 tagName: "\(tag)",
                 key: key,
                 ref: ref,
                 attributes: attributes,
+                style: style,
                 listeners: listeners
             )
         }

Codegen/Sources/SRTCodegen/HTMLLeafTagRenderer.swift Codegen/Sources/SRTCodegen/Renderers/HTMLVoidTagRenderer.swift

@@ -0,0 +1,29 @@
+import Foundation
+import CodegenKit
+
+struct StyleRenderer: Renderer {
+    var def: Def
+
+    func isTarget(file: URL) -> Bool {
+        file.lastPathComponent == "Style.swift"
+    }
+
+    func render(template: inout CodeTemplateModule.CodeTemplate, file: URL, on runner: CodegenKit.CodegenRunner) throws {
+        let code = def.cssProperties.map { (attribute) in
+            renderSetter(attribute: attribute)
+        }.joined(separator: "\n")
+
+        template["setters"] = code
+    }
+
+    private func renderSetter(attribute: String) -> String {
+        let symbol = attribute.kebabToCamel()
+
+        return """
+        public func \(renderIdentifier(symbol))(_ value: String) -> Style {
+            set("\(attribute)", to: value)
+        }
+
+        """
+    }
+}

Codegen/Sources/SRTCodegen/Renderers/StyleRenderer.swift

@@ -6,25 +6,25 @@ public struct SRTCodegen {
         self.codegenDir = URL(filePath: ".", directoryHint: .isDirectory)
         self.swiftReactDir = codegenDir.deletingLastPathComponent()
         self.htmlSourceDir = swiftReactDir.appending(components: "Sources", "React", "HTML", directoryHint: .isDirectory)
-        let tagsDir = codegenDir.appending(components: "node_modules", "html-tags")
-        let tagsJSON = try Data(contentsOf: tagsDir.appending(path: "html-tags.json"))
+        let json = try Data(contentsOf: codegenDir.appending(path: "data.json"))
         let decoder = JSONDecoder()
-        self.tags = try decoder.decode(Array<String>.self, from: tagsJSON)
-        let leafJSON = try Data(contentsOf: tagsDir.appending(path: "html-tags-void.json"))
-        self.leafTags = try decoder.decode(Array<String>.self, from: leafJSON)
+        self.def = try decoder.decode(Def.self, from: json)
+        def.fix()
     }
 
     var codegenDir: URL
     var swiftReactDir: URL
     var htmlSourceDir: URL
-    var tags: [String]
-    var leafTags: [String]
+    var def: Def
 
     public func run() throws {
         let runner = CodegenRunner(
             renderers: [
-                HTMLTagRenderer(tags: tags),
-                HTMLLeafTagRenderer(tags: leafTags)
+                HTMLTagRenderer(def: def),
+                HTMLVoidTagRenderer(def: def),
+                AttributesRenderer(def: def),
+                StyleRenderer(def: def),
+                EventListenersRenderer(def: def)
             ]
         )
 

Codegen/Sources/SRTCodegen/SRTCodegen.swift

@@ -0,0 +1,38 @@
+import Foundation
+
+public let keywords = [
+    "as",
+    "class",
+    "continue",
+    "default",
+    "defer",
+    "for",
+    "is",
+    "var",
+]
+
+func renderIdentifier(_ text: String) -> String {
+    var text = text
+    if keywords.contains(text) {
+        text = "`\(text)`"
+    }
+    return text
+}
+
+extension String {
+    func kebabToCamel() -> String {
+        let strs = self.components(separatedBy: "-")
+            .filter { !$0.isEmpty }
+
+        var result = ""
+        for (index, str) in strs.enumerated() {
+            if index == 0 {
+                result += str.lowercased()
+            } else {
+                result += str.capitalized
+            }
+        }
+
+        return result
+    }
+}

Codegen/Sources/SRTCodegen/Utils.swift

@@ -1,5 +1,17 @@
-import htmlTags from "html-tags/index.js";
-import htmlLeafTags from "html-tags/void.js";
+import { htmlTagNames } from "html-tag-names";
+import { htmlVoidElements } from "html-void-elements";
+import { htmlElementAttributes } from "html-element-attributes";
+import { htmlEventAttributes } from "html-event-attributes";
+import * as kcpModule from "known-css-properties";
 
-console.log(htmlTags);
-console.log(htmlLeafTags);
+const json = {
+    "tagNames": htmlTagNames,
+    "voidElements": htmlVoidElements,
+    "elementAttributes": htmlElementAttributes,
+    "eventAttributes": htmlEventAttributes,
+    "cssProperties": kcpModule.all
+};
+
+const string = JSON.stringify(json, undefined, 2);
+
+console.log(string);