update

omochi · Apr 17, 2024 · 9e539a2 · 9e539a2
1 parent a31c9da
commit 9e539a2
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 10 deletions.
diff --git a/BrowserTests/Sources/GenPagesModule/GenPages.swift b/BrowserTests/Sources/GenPagesModule/GenPages.swift
@@ -17,6 +17,7 @@ public struct GenPages {
             try generateEntryHTML(page: page)
         }
         try generateViteConfig()
+        try generateIndexPage()
     }
 
     private static func pages(rootDir: URL) throws -> [String] {
@@ -41,7 +42,7 @@ public struct GenPages {
             <title>\(page)</title>
             <script type="module">
                 import { load } from "/src/loader/load.ts";
-                load("/.build/debug/\(page).wasm");
+                load("/.build/wasm32-unknown-wasi/debug/\(page).wasm");
             </script>
         </head>
         <body>
@@ -80,8 +81,40 @@ public struct GenPages {
         """)
 
         let code = parts.joined(separator: "\n")
-
         let file = rootDir.appending(component: "vite.config.js")
         try code.write(to: file, atomically: true, encoding: .utf8)
     }
+
+    private func generateIndexPage() throws {
+        var parts: [String] = []
+
+        parts.append("""
+        <!DOCTYPE html>
+        <html lang="ja">
+        <head>
+            <meta charset="utf-8">
+            <title>index</title>
+        </head>
+        <body>
+            <ul>
+        """)
+
+        for page in pages {
+            parts.append("""
+                <li>
+                    <a href="./pages/\(page).html">\(page)</a>
+                </li>
+        """)
+        }
+
+        parts.append("""
+            </ul>
+        </body>
+        </html>
+        """)
+
+        let code = parts.joined(separator: "\n")
+        let file = rootDir.appending(component: "index.html")
+        try code.write(to: file, atomically: true, encoding: .utf8)
+    }
 }
diff --git a/BrowserTests/Sources/QSComponents/main.swift b/BrowserTests/Sources/QSComponents/main.swift
@@ -1,4 +1,5 @@
 import React
+import SRTDOM
 import JavaScriptKit
 
 // https://ja.react.dev/learn
@@ -22,4 +23,6 @@ struct MyApp: Component {
     }
 }
 
-print("hello wasm")
+let body = try JSWindow.global.document.body.unwrap("body")
+let root = ReactRoot(element: body)
+root.render(node: MyApp())
diff --git a/BrowserTests/index.html b/BrowserTests/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    <meta charset="utf-8">
+    <title>index</title>
+</head>
+<body>
+    <ul>
+        <li>
+            <a href="./pages/QSComponents.html">QSComponents</a>
+        </li>
+    </ul>
+</body>
+</html>
diff --git a/BrowserTests/pages/QSComponents.html b/BrowserTests/pages/QSComponents.html
@@ -5,7 +5,7 @@
     <title>QSComponents</title>
     <script type="module">
         import { load } from "/src/loader/load.ts";
-        load("/.build/debug/QSComponents.wasm");
+        load("/.build/wasm32-unknown-wasi/debug/QSComponents.wasm");
     </script>
 </head>
 <body>

diff --git a/Sources/SRTDOM/JSDocument.swift b/Sources/SRTDOM/JSDocument.swift
@@ -11,6 +11,16 @@ public struct JSDocument: ConvertibleToJSObject & ConstructibleFromJSValue {
 
     public var jsObject: JSObject
 
+
+    public var body: JSHTMLElement? {
+        get { .unsafeConstruct(from: jsValue.body) }
+        nonmutating set { jsValue.body = newValue.jsValue }
+    }
+
+    public var documentElement: JSHTMLElement {
+        .unsafeConstruct(from: jsValue.documentElement)
+    }
+
     public func createElement(_ tagName: String) throws -> JSHTMLElement {
         try .mustConstruct(from: try jsValue.throws.createElement(tagName))
     }

diff --git a/Sources/SRTDOM/JSText.swift b/Sources/SRTDOM/JSText.swift
@@ -7,12 +7,8 @@ public protocol JSTextProtocol: JSNodeProtocol {
 
 extension JSTextProtocol {
     public var data: String {
-        get {
-            .unsafeConstruct(from: jsValue.data)
-        }
-        nonmutating set {
-            jsValue.data = newValue.jsValue
-        }
+        get { .unsafeConstruct(from: jsValue.data) }
+        nonmutating set { jsValue.data = newValue.jsValue }
     }
 }