context: ssr & rsc

Author: roman01la

core/dev/uix/rsc_example/server/core.clj

@@ -79,7 +79,9 @@
 
 (def error-boundary
   (uix/create-error-boundary
-    {:derive-error-state (fn [error] {:error error})}
+    {:derive-error-state (fn [error] {:error error})
+     :did-catch (fn [error info]
+                  (prn error))}
     (fn [[state] {:keys [children]}]
       (if-let [error (:error state)]
         ($ server.root/html-page

core/scripts/rsc

@@ -8,3 +8,4 @@ npm ci
 
 echo "Starting examples build server..."
 npx concurrently "npx patch-package && clojure -A:examples -M -m shadow.cljs.devtools.cli watch rsc" "npx @tailwindcss/cli -i ./dev/uix/main.css -o ./rsc-out/main.css --watch"
+#npx concurrently "npx patch-package && clojure -A:examples -M -m shadow.cljs.devtools.cli release rsc" "npx @tailwindcss/cli -i ./dev/uix/main.css -o ./rsc-out/main.css --minify"

core/src/uix/compiler/aot.clj

@@ -119,10 +119,19 @@
                                                   [spread-props]))))
       v)))
 
+(defn- context-element? [[tag] env]
+  (and (symbol? tag)
+       (some-> (resolve env tag) meta :uix/context)))
+
+(defn- compile-context-provider [[var {:keys [value]} & children]]
+  [:uix/context `(fn [f#] (binding [~var ~value] (f#))) (vec children)])
+
 (defn compile-element [v {:keys [env] :as opts}]
   (if (uix.lib/cljs-env? env)
     (compile-element* v opts)
-    (with-meta (with-spread-props v) {:uix/element? true})))
+    (if (context-element? v env)
+      (compile-context-provider v)
+      (with-meta (with-spread-props v) {:uix/element? true}))))
 
 ;; ========== forms rewriter ==========
 

core/src/uix/core.clj

@@ -245,6 +245,18 @@
 (defn use-ref [value]
   (hooks/use-ref value))
 
+(defmacro defcontext
+  "cljs: Creates React context with initial value set to `value`.
+   clj: Create dynamic var bound to `value`."
+  ([name]
+   (if (uix.lib/cljs-env? &env)
+     `(def ~(with-meta name {:dynamic true}) (create-context nil))
+     `(def ~(with-meta name {:dynamic true :uix/context true}))))
+  ([name value]
+   (if (uix.lib/cljs-env? &env)
+     `(def ~(with-meta name {:dynamic true}) (create-context ~value))
+     `(def ~(with-meta name {:dynamic true :uix/context true}) ~value))))
+
 (defn use-context [value]
   (hooks/use-context value))
 
@@ -360,7 +372,7 @@
    `(uix.hooks.alpha/use-imperative-handle ~ref ~f ~(->js-deps deps))))
 
 (defui suspense [{:keys [fallback children] :as props}]
-  [::suspense props])
+  [:uix/suspense props])
 
 (defui strict-mode [{:keys [children]}]
   children)

core/src/uix/hooks/alpha.clj

@@ -49,9 +49,7 @@
   (f))
 
 ;; == Context hook ==
-;; TODO: requires changes tp how context is created
 (defn use-context [v]
-  (throw (UnsupportedOperationException. "use-context is not implemented yet"))
   v)
 
 ;; == Imperative Handle hook ==

dom/src/uix/dom/server.clj

@@ -520,12 +520,11 @@
   (when-not (empty? element)
     (let [tag (nth element 0 nil)]
       (cond
-        (identical? :uix/bind-context tag)
-        (let [binder (nth element 1 nil)
-              children (seq (nth element 2 nil))]
+        (identical? :uix/context tag)
+        (let [[_ binder children] element]
           (binder #(-render-html children *state sb)))
         (identical? :<> tag) (render-fragment! element *state sb)
-        (identical? :uix.core/suspense tag) (render-suspense! element *state sb)
+        (identical? :uix/suspense tag) (render-suspense! element *state sb)
         (keyword? tag) (render-html-element! element *state sb)
         :else (render-component! element *state sb)))))
 

dom/src/uix/dom/server/flight.clj

@@ -163,7 +163,7 @@
     (client-component? tag) (render-component-element-client-ref el sb)
     (fn? tag) (render-component-element-server el sb)
     (= :<> tag) (render-fragment-element el sb)
-    (= :uix.core/suspense tag) (render-suspense-element el sb)
+    (= :uix/suspense tag) (render-suspense-element el sb)
     (keyword? tag) (render-dom-element el sb)
     :else (throw (IllegalArgumentException. (str (type tag) " " tag " is not a valid element type")))))
 
@@ -225,7 +225,7 @@
 
 (defn- source-fn [v]
   (when-let [filepath (:file (meta v))]
-    (with-open [rdr (LineNumberReader. (io/reader (io/resource filepath)))]
+    (with-open [rdr (LineNumberReader. (io/reader (or (io/resource filepath) (io/file filepath))))]
       (dotimes [_ (dec (:line (meta v)))] (.readLine rdr))
       (let [text (StringBuilder.)
             pbr (proxy [PushbackReader] [rdr]
@@ -243,17 +243,21 @@
         st (.getStackTrace error)
         stack (->> st
                    (mapv (fn [^java.lang.StackTraceElement frame]
-                           (str/join " "
-                             ["    at"
-                              (str (.getClassName frame)
-                                   " "
-                                   (.getMethodName frame))
-                              (str
-                                "("
-                                (.getFileName frame)
-                                ":"
-                                (.getLineNumber frame)
-                                ")")])))
+                           (let [filename (.getFileName frame)
+                                 clj? (re-find #"\.cljc?$" filename)
+                                 class-name (cond-> (.getClassName frame)
+                                              clj? (clojure.lang.Compiler/demunge))]
+                             (str/join " "
+                               ["    at"
+                                (str class-name
+                                     " "
+                                     (.getMethodName frame))
+                                (str
+                                  "("
+                                  filename
+                                  ":"
+                                  (.getLineNumber frame)
+                                  ")")]))))
                    (into [(str (type error) ": " (ex-message error))])
                    (str/join "\n"))
         component-src (source-fn var)
@@ -292,22 +296,28 @@
         (-> (render-fn [(derive-error-state e) identity] props)
             (-unwrap sb))))))
 
+(defn- unwrap-context-element [element sb]
+  (let [[_ binder children] element]
+    (binder #(-unwrap children sb))))
+
 (defn unwrap-element [[tag :as el] sb]
   (cond
     (client-component? tag) el
     (fn? tag) (unwrap-component-element el sb)
     (= :<> tag) (unwrap-fragment-element el sb)
-    (= :uix.core/suspense tag) (unwrap-suspense-element el sb)
+    (= :uix/suspense tag) (unwrap-suspense-element el sb)
+    (= :uix/context tag) (unwrap-context-element el sb)
     (keyword? tag) (unwrap-dom-element el sb)
     (and (map? tag) (-> tag meta :uix.core/error-boundary)) (unwrap-error-boundary el sb)
     :else (throw (IllegalArgumentException. (str (type tag) " " tag " is not a valid element type")))))
 
 (extend-protocol FlightRenderer
   IPersistentVector
   (-unwrap [this sb]
-    (if (vector? (first this))
-      (map #(-unwrap % sb) this)
-      (unwrap-element this sb)))
+    (let [tag (first this)]
+      (if (vector? tag)
+        (doall (map #(-unwrap % sb) this))
+        (unwrap-element this sb))))
   (-render [this sb]
     (if (vector? (first this))
       (map #(-render % sb) this)