bump webly 0.9

.gitignore

@@ -34,4 +34,5 @@ package-lock.json
 shadow-cljs.edn
 goldly_bindings_generated.cljs
 resources/META-INF
-.data
+.data
+.gorilla

build.clj

@@ -4,7 +4,7 @@
    [deps-deploy.deps-deploy :as dd]))
 
 (def lib 'org.pinkgorilla/dali)
-(def version (format "0.1.%s" (b/git-count-revs nil)))
+(def version (format "0.2.%s" (b/git-count-revs nil)))
 (def class-dir "target/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
 (def jar-file (format "target/%s-%s.jar" (name lib) version))

demo/deps.edn

@@ -1,22 +1,19 @@
 {:paths ["src"
-         "resources"
-         "target/webly"
-         ".data"]
+         "resources"]
 
  :deps {org.clojure/clojure    {:mvn/version "1.11.1"}
         org.pinkgorilla/clj-service {:mvn/version "0.3.20"}
-        org.pinkgorilla/webly {:mvn/version "0.7.703"} ; build tool
-        org.pinkgorilla/goldly {:mvn/version "0.7.683"}
+        org.pinkgorilla/webly {:mvn/version "0.9.717"} ; build tool
+        ;org.pinkgorilla/goldly {:mvn/version "0.7.683"}
         org.pinkgorilla/ui-tailwind {:mvn/version "0.1.8"} ; tailwind css classes
         org.pinkgorilla/ui-repl {:mvn/version "0.1.112"}
-  ;      org.pinkgorilla/ui-input {:mvn/version "0.2.62"}
         ;; this project
         org.pinkgorilla/dali {:local/root "../" :deps/manifest :deps}
         }
 
  :aliases {;; WATCH
            :npm-install
-           {:exec-fn webly.app.app/webly-build
+           {:exec-fn webly.spa/webly-build
             :config {}
             :exec-args {:profile "npm-install"}}
            :demo
@@ -28,12 +25,12 @@
 
            ;; BUILD / SERVE
 
-           :compile {:exec-fn webly.app.app/webly-build
+           :compile {:exec-fn webly.spa/webly-build
                      :config {}
                      :exec-args {:profile "compile"}}
 
 
-           :release-adv {:exec-fn webly.app.app/webly-build
+           :release-adv {:exec-fn webly.spa/webly-build
                          :config {}
                          :exec-args {:profile "release-adv"}}
 

demo/resources/demo-services.edn

@@ -15,12 +15,11 @@
                         (clip/ref :permission)
                         (clip/ref :exts))}
 
-
-  :webly {:start (webly.app.app/start-webly
-                  (clip/ref :exts)
+  :webly {:start (webly.spa/start-webly
+                  {:exts (clip/ref :exts)}
                   (deref (clip/ref :config))
                   (:profile #ref [:modular]))
-          :stop (webly.app.app/stop-webly this)}
+          :stop (webly.spa/stop-webly this)}
 
   :nrepl {:start (nrepl.server/start-server :bind "0.0.0.0" :port 9100)
           :stop (.close this)}

demo/resources/ext/demo.edn

@@ -1,15 +1,20 @@
 {:name "demo"
- ;:lazy true ; must be true, since it depends on techml-dataset-cljs
- ;:depends-on #{:dali}
- :cljs-routes  {"" demo.page.saying/page
-
-                }
-
-  :clj-services {:name "demo"
-                 :permission nil
-                 :symbols [demo.service.saying/saying
-                           demo.service.image/sun
-                           ]}
+ :lazy true ; must be true, since it depends on daku
+ :depends-on #{:dali}
+ :cljs-namespace [demo.page
+                  demo.person
+                  ]
+ :cljs-ns-bindings {'demo.page {'page demo.page/page} ; page routing
+                    'demo.person {'person demo.person/person} ; viewer resolution
+                    }
+
+ ; runtime
+ :cljs-routes  {"" demo.page/page}
+ :clj-services {:name "demo"
+                :permission nil
+                :symbols [demo.service.saying/saying
+                          demo.service.image/sun
+                          ]}
 
 
 

demo/src/demo/page/saying.cljs → demo/src/demo/page.cljs

@@ -1,4 +1,4 @@
-(ns demo.page.saying
+(ns demo.page
   (:require
    [reagent.core :as r]
    [dali.viewer :refer [viewer2]]
@@ -20,6 +20,9 @@
    [container-dimension
     {:window-a window-a}]
 
+   [:div "container dimension:"
+    [:p (pr-str @window-a)]]
+
    (when @window-a
      [clj-viewer {:fun 'demo.service.saying/saying
                   :args [(assoc {:id 3} :window @window-a)]}])

demo/src/demo/service/image.clj

@@ -5,7 +5,7 @@
 
 (def env
   {:dali-store (create-dali-file-store
-                {:fpath ".data/public/dali"
+                {:fpath ".gorilla/public/dali"
                  :rpath "/r/dali"})})
 
 (def i (open-file "png" "resources/sun.png"))

src/dali/util/resolve.cljs

@@ -2,7 +2,6 @@
   (:require
    [taoensso.timbre :refer-macros [info warn error]]
    [promesa.core :as p]
-   [sci.impl.vars :as vars]
    [webly.spa.resolve :refer [get-resolver]]))
 
 ; replace symbols with functions
@@ -30,7 +29,8 @@
               (let [tuplets (map (fn [s f]
                                    ;(println "tuplet: " (pr-str [s f]))
                                    [s f]
-                                   [s (vars/var-get f)]) symbols ps)
+                                   ;[s (vars/var-get f)] ; 2025-02-25 awb99: this should not be there. fixing in goldly did not work.
+                                   ) symbols ps)
                     d (into {} tuplets)]
                 (info "tuplets: " (pr-str tuplets))
                 ;(println "d: " (pr-str d))

src/dali/viewer.cljs

@@ -4,7 +4,8 @@
    [promesa.core :as p]
    [reagent.core :as r]
    ["react" :as react]
-   [dali.util.resolve :refer [resolve-symbol]]))
+   [dali.util.resolve :refer [resolve-symbol]]
+   [dali.viewer.hiccup]))
 
 (defn transform-data [transform-fn data]
   (info "transforming: " transform-fn " data: " data)
@@ -28,11 +29,23 @@
                     (info "data successfully transformed.")
                     ;(info "data successfully transformed to:  " data)
                     {:viewer viewer
-                     :data data})))
+                     :data data}))
+          (p/catch (fn [err]
+                     (error "dali-viewer resolve-transform error: " err)
+                     {:viewer dali.viewer.hiccup/hiccup
+                      :data [:p "error in viewer-transform-resolve"]}
+                     ))
+          )
       (-> viewer-p
           (p/then (fn [viewer]
                     {:viewer viewer
-                     :data data}))))))
+                     :data data}))
+          (p/catch (fn [err]
+                     (error "dali-viewer resolve error: " err)
+                     {:viewer dali.viewer.hiccup/hiccup
+                      :data [:p "error in viewer-resolve"]}))
+
+          ))))
 
 (defn viewer
   "the viewer renders a dali-spec in the browser.