switch to cljs-oops

Author: darwin

project.clj

@@ -13,6 +13,7 @@
                  [org.clojure/tools.logging "0.3.1"]
                  [org.clojure/tools.cli "0.3.5"]
                  [org.clojure/tools.nrepl "0.2.12"]
+                 [binaryage/oops "0.2.0"]
                  [http-kit "2.2.0"]
                  [clj-logging-config "1.9.12"]
                  [version-clj "0.1.2"]
@@ -22,7 +23,7 @@
 
                  ; we cannot use :dependencies under individual profiles because Cursive recognizes only root level
                  ; thus we mark extra deps with :scope "test" and filter them later when producing jar library
-                 [binaryage/chromex "0.4.2" :scope "test"]
+                 [binaryage/chromex "0.5.0" :scope "test"]
                  [binaryage/devtools "0.8.2" :scope "test"]
                  [cljs-http "0.1.41" :scope "test"]
                  [figwheel "0.5.7" :scope "test"]

src/automation/dirac/automation.cljs

@@ -10,7 +10,7 @@
   "
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log error]]
             [dirac.automation.machinery :as machinery]
             [dirac.automation.helpers :as helpers]

src/automation/dirac/automation/devtools.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.devtools
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn error info]]
             [devtools.core :as devtools]
             [devtools.prefs :as devtools-prefs]))

src/automation/dirac/automation/feedback.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.feedback
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn]]
             [dirac.automation.messages :as messages]
             [dirac.automation.transcript-host :as transcript-host]))
@@ -30,11 +30,11 @@
 ; -- message processing -----------------------------------------------------------------------------------------------------
 
 (defn process-event! [event]
-  (if-let [data (oget event "data")]
-    (case (oget data "type")
+  (if-let [data (oget event "?data")]
+    (case (oget data "?type")
       "feedback-from-devtools" (append-to-transcript! "devtools" (oget data "transcript") (oget data "devtools"))
       "feedback-from-extension" (append-to-transcript! "extension" (oget data "transcript"))
-      "feedback-from-scenario" (append-to-transcript! (or (oget data "label") "scenario") (oget data "transcript"))
+      "feedback-from-scenario" (append-to-transcript! (or (oget data "?label") "scenario") (oget data "transcript"))
       nil)))
 
 (defn start-processing-messages! []

src/automation/dirac/automation/helpers.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.helpers
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [cuerdas.core :as cuerdas])
   (:import goog.Uri))
 

src/automation/dirac/automation/launcher.cljs

@@ -2,16 +2,16 @@
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
             [goog.string :as string]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! oset!+ ocall ocall+ oapply]]
             [chromex.logging :refer-macros [log warn error info]]
             [dirac.settings :refer-macros [get-launch-task-key get-launch-task-message]]))
 
 (defn register-task! [task-fn]
-  (oset js/window [(get-launch-task-key)] task-fn))
+  (oset!+ js/window (str "!" (get-launch-task-key)) task-fn))
 
 (defn launch-task! []
   (log "launching task...")
-  (ocall js/window (get-launch-task-key)))                                                                                    ; see go-task
+  (ocall+ js/window (get-launch-task-key)))                                                                                   ; see go-task
 
 (defn launch-task-after-delay! [delay-ms]
   (log "scheduled task launch after " delay-ms "ms...")
@@ -21,9 +21,9 @@
     (launch-task!)))
 
 (defn process-event! [event]
-  (if-let [data (oget event "data")]
-    (if (= (oget data "type") (get-launch-task-message))
-      (launch-task-after-delay! (string/parseInt (oget data "delay"))))))
+  (if-let [data (oget event "?data")]
+    (if (= (oget data "?type") (get-launch-task-message))
+      (launch-task-after-delay! (string/parseInt (oget data "?delay"))))))
 
 (defn init! []
   (.addEventListener js/window "message" process-event!))

src/automation/dirac/automation/machinery.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.machinery
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log error]]
             [dirac.automation.task :as task]
             [dirac.automation.transcript-host :as transcript]

src/automation/dirac/automation/messages.cljs

@@ -3,7 +3,7 @@
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
             [cljs.reader :as reader]
             [clojure.string :as str]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log info warn error]]
             [dirac.settings :refer-macros [get-marion-message-reply-timeout]]
             [dirac.utils :as utils]))
@@ -98,7 +98,7 @@
 ; see https://developer.chrome.com/extensions/content_scripts#host-page-communication
 (defn post-message-with-timeout! [js-message reply-timeout]
   (let [message-id (get-next-message-id!)]
-    (oset js-message ["id"] message-id)
+    (oset! js-message "!id" message-id)
     (let [post-message! #(.postMessage js/window js-message "*")]
       (if (or (nil? reply-timeout) (= :no-timeout reply-timeout))
         (go
@@ -176,8 +176,8 @@
 ; -- message processing -----------------------------------------------------------------------------------------------------
 
 (defn process-event! [event]
-  (if-let [data (oget event "data")]
-    (case (oget data "type")
+  (if-let [data (oget event "?data")]
+    (case (oget data "?type")
       "reply" (process-reply! data)
       nil)))
 

src/automation/dirac/automation/notifications.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.notifications
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn]]
             [dirac.automation.messages :as messages]
             [cljs.reader :as reader]))

src/automation/dirac/automation/runner.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.runner
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn error info]]
             [devtools.preload]
             [dirac.automation.helpers :as helpers]
@@ -16,10 +16,10 @@
   (helpers/get-el-by-id "resume-button"))
 
 (defn enable-resume! []
-  (oset (get-resume-button-el) ["disabled"] false))
+  (oset! (get-resume-button-el) "disabled" false))
 
 (defn disable-resume! []
-  (oset (get-resume-button-el) ["disabled"] true))
+  (oset! (get-resume-button-el) "disabled" true))
 
 (defn wait-for-resume! []
   (go