Cleanup

shadow-cljs.edn

@@ -5,9 +5,9 @@
  {:web-editor
   {:target :esm
    :output-dir "public/js"
-   :modules {:l4_web_editor {:init-fn l4-lp.web-editor.main/init!}}
-   :devtools {:before-load l4-lp.web-editor.main/stop!
-              :after-load l4-lp.web-editor.main/start!}
+   :modules {:l4_web_editor {:init-fn l4-lp.web-editor.core/init!}}
+   :devtools {:before-load l4-lp.web-editor.core/stop!
+              :after-load l4-lp.web-editor.core/start!}
    :compiler-options {:output-feature-set :es2021
                       :externs ["datascript/externs.js"]}}
 

src/l4_lp/core.cljc

@@ -1,6 +1,5 @@
 (ns l4-lp.core
-  (:require #?(:cljs [applied-science.js-interop :as jsi])
-            #?(:cljs [l4-lp.swipl.js.wasm-query :as swipl-wasm-js-query])
+  (:require #?(:cljs [l4-lp.swipl.js.wasm-query :as swipl-wasm-js-query])
             [l4-lp.syntax.l4-to-prolog :as l4->prolog]
             #?(:cljs [promesa.core :as prom])))
 
@@ -12,45 +11,4 @@
 
 ;; #?(:cljs
 ;;    (def query-and-trace
-;;      swipl-wasm-js-query/query-and-trace))
-
-#?(:cljs
-   (prom/let
-    [program
-     ['(DECIDE p of var/xs and var/x and var/z
-              IF (var/xs IS THE LIST OF ALL var/y SUCH THAT q holds for var/y)
-              AND (var/ys IS THE LIST OF ALL var/y SUCH THAT r holds for var/y)
-              AND (r holds for var/z)
-              AND (var/x IS (SUM var/xs))
-              AND (var/y IS (SUM var/ys))
-              AND (var/y > 0))
-
-      '(DECIDE q holds for 0)
-      '(DECIDE q holds for 1)
-
-      '(DECIDE r holds for var/z
-              IF (var/z IS 3)
-              OR (var/z IS 4))]
-
-     goal '(p of var/xs and var/x and 4)
-
-     _ (jsi/call js/console :log "Input L4 program:\n" program)
-     _ (jsi/call js/console :log "Input L4 goal:\n" goal)
-
-     program' (l4->prolog/l4-program->prolog-program-str program)
-     goal' (l4->prolog/l4->prolog-str goal)
-
-     _ (jsi/call js/console :log "Transpiled Prolog program:\n" program')
-     _ (jsi/call js/console :log "Transpiled Prolog goal:\n" goal')
-
-     output (swipl-wasm-js-query/query-and-trace! program' goal')]
-     (jsi/call js/console :log "Output:\n" output))
-
-   #_(->>
-      "[(DECIDE p of var/x IF ((var/x ** 1) IS 0))
-   (DECIDE q holds for 1)
-   (DECIDE q holds for 2)]"
-
-      l4->prolog/l4-program->prolog-program-str
-
-      (jsi/call js/console :log)))
+;;      swipl-wasm-js-query/query-and-trace))

src/l4_lp/swipl/js/wasm_query.cljs

@@ -3,12 +3,11 @@
             [cljs-bean.core :as bean]
             [l4-lp.swipl.js.common.swipl-js-to-clj :as swipl-js->clj]
             [promesa.core :as prom]
-            [shadow.esm :refer [dynamic-import]]))
+            ["https://SWI-Prolog.github.io/npm-swipl-wasm/3/7/5/dynamic-import.js"
+             :as swipl-mod]))
 
 (def ^:private swipl-constructor
-  (prom/let [cdn-url "https://SWI-Prolog.github.io/npm-swipl-wasm/3/7/5/dynamic-import.js"
-             mod (dynamic-import cdn-url)]
-    (jsi/get mod :SWIPL)))
+  (jsi/get swipl-mod :SWIPL))
 
 (def ^:private prelude-qlf-url
   "resources/swipl/prelude.qlf")

src/l4_lp/web_editor/codemirror_editor.cljs

@@ -23,8 +23,7 @@
 
 (def ^:private eval-query-extension
   (jsi/call cm-view/keymap :of
-            #js [#js {:key "Mod-Enter"
-                      :run eval-query!}]))
+            #js [#js {:key "Mod-Enter" :run eval-query!}]))
 
 (def ^:private theme
   (jsi/call cm-view/EditorView :theme
@@ -48,7 +47,6 @@
   (let [editor-elt (jsi/call js/document :getElementById editor-element-id)
         state (jsi/call cm-state/EditorState
                         :create
-                        #js {:doc code
-                             :extensions extensions})]
+                        #js {:doc code :extensions extensions})]
     (cm-view/EditorView.
      #js {:parent editor-elt :state state})))

src/l4_lp/web_editor/main.cljs → src/l4_lp/web_editor/core.cljs

@@ -1,4 +1,4 @@
-(ns l4-lp.web-editor.main
+(ns l4-lp.web-editor.core
   (:require [applied-science.js-interop :as jsi]
             [hoplon.core :as h]
             [hoplon.goog]

src/l4_lp/web_editor/guifier.cljs

@@ -1,17 +1,14 @@
-(ns l4-lp.web-editor.guifier 
+(ns l4-lp.web-editor.guifier
   (:require [applied-science.js-interop :as jsi]
             [l4-lp.swipl.js.wasm-query :as swipl-wasm-query]
             [l4-lp.syntax.l4-to-prolog :as l4->prolog]
             [promesa.core :as prom]
-            [shadow.esm :refer [dynamic-import]]))
+            ["https://cdn.jsdelivr.net/npm/guifier@1.0.24/dist/Guifier.js"
+             :as guifier-mod]))
 
 (def ^:private guifier
   {:element-id "guifier"
-   :constructor
-   (prom/let
-    [cdn-url "https://cdn.jsdelivr.net/npm/guifier@1.0.24/dist/Guifier.js"
-     mod (dynamic-import cdn-url)]
-     (jsi/get mod :default))})
+   :constructor (jsi/get guifier-mod :default)})
 
 (def ^:private query
   (-> "query" l4->prolog/l4->prolog-str))