switch to cljs-oops

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

src/automation/dirac/automation/runtime.cljs

@@ -1,7 +1,6 @@
 (ns dirac.automation.runtime
-  (:require-macros [chromex.support :refer [oget oset ocall oapply]])
   (:require [chromex.logging :refer-macros [log warn error info]]
-            [chromex.support :refer-macros [oset oget]]
+            [oops.core :refer [oset! oget ocall oapply]]
             [dirac.runtime :as runtime]
             [dirac.runtime.prefs :as runtime-prefs]
             [dirac.automation.helpers :as helpers]
@@ -18,10 +17,10 @@
       (runtime-prefs/merge-prefs! prefs))))
 
 (defn monkey-patch-runtime-get-version! [mock-version]
-  (oset js/window ["dirac" "runtime" "get_version"] (constantly mock-version)))
+  (oset! js/window ["dirac" "runtime" "get_version"] (constantly mock-version)))
 
 (defn monkey-patch-runtime-repl-get-api-version! [mock-version]
-  (oset js/window ["dirac" "runtime" "repl" "get_api_version"] (constantly mock-version)))
+  (oset! js/window ["dirac" "runtime" "repl" "get_api_version"] (constantly mock-version)))
 
 (defn promise-based-set-immediate [callback]
   (-> (ocall js/Promise "resolve")

src/automation/dirac/automation/scenario.cljs

@@ -1,5 +1,5 @@
 (ns dirac.automation.scenario
-  (:require [chromex.support :refer-macros [oget oset ocall oapply]]
+  (:require [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log info warn error]]
             [cljs.pprint :refer [pprint]]
             [dirac.utils]
@@ -46,7 +46,7 @@
   false)
 
 (defn register-global-exception-handler! []
-  (oset js/window ["onerror"] scenario-exception-handler!))
+  (oset! js/window "onerror" scenario-exception-handler!))
 
 ; -- notification handler ---------------------------------------------------------------------------------------------------
 
@@ -73,10 +73,10 @@
     (.apply orig js/console (to-array args))))
 
 (defn store-console-api []
-  {"log"   (oget js/window "console" "log")
-   "warn"  (oget js/window "console" "warn")
-   "info"  (oget js/window "console" "info")
-   "error" (oget js/window "console" "error")})
+  {"log"   (oget js/window "console.log")
+   "warn"  (oget js/window "console.warn")
+   "info"  (oget js/window "console.info")
+   "error" (oget js/window "console.error")})
 
 (defn captured-console-api [original-api]
   {"log"   (partial console-handler (get original-api "log") "LOG: ")
@@ -85,10 +85,10 @@
    "error" (partial console-handler (get original-api "error") "ERROR: ")})
 
 (defn set-console-api! [api]
-  (oset js/window ["console" "log"] (get api "log"))
-  (oset js/window ["console" "warn"] (get api "warn"))
-  (oset js/window ["console" "info"] (get api "info"))
-  (oset js/window ["console" "error"] (get api "error")))
+  (oset! js/window "console.log" (get api "log"))
+  (oset! js/window "console.warn" (get api "warn"))
+  (oset! js/window "console.info" (get api "info"))
+  (oset! js/window "console.error" (get api "error")))
 
 (defn capture-console-as-feedback! []
   {:pre [(nil? @original-console-api)]}

src/automation/dirac/automation/status_host.cljs

@@ -1,5 +1,5 @@
 (ns dirac.automation.status-host
-  (:require [chromex.support :refer-macros [oget oset ocall oapply]]
+  (:require [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn error info]]
             [dirac.automation.helpers :as helpers]
             [dirac.automation.status :as status]))

src/automation/dirac/automation/task.cljs

@@ -1,7 +1,7 @@
 (ns dirac.automation.task
   (: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]]
             [dirac.settings :refer-macros [get-signal-server-url
                                            get-chrome-remote-debugging-port
@@ -208,4 +208,4 @@
   false)
 
 (defn register-global-exception-handler! []
-  (oset js/window ["onerror"] task-exception-handler!))
+  (oset! js/window "onerror" task-exception-handler!))

src/automation/dirac/automation/transcript.cljs

@@ -1,5 +1,5 @@
 (ns dirac.automation.transcript
-  (:require [chromex.support :refer-macros [oget oset ocall oapply]]))
+  (:require [oops.core :refer [oget oset! ocall oapply]]))
 
 ; transcript is a <pre> tag which collects textual messages about test execution:
 ; 1) issued automation commands
@@ -35,7 +35,7 @@
   (let [row-el (.createElement js/document "div")]
     (if (some? style)
       (.setAttribute row-el "style" style))
-    (oset row-el ["textContent"] text)
+    (oset! row-el "textContent" text)
     (.appendChild transcript-el row-el)))
 
 (defn read-transcript [transcript-el]

src/automation/dirac/automation/transcript_host.cljs

@@ -6,7 +6,7 @@
                                            get-transcript-label-padding-type]])
   (:require [cljs.core.async :refer [put! <! chan timeout alts! close!]]
             [dirac.automation.transcript :as transcript]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log warn error info]]
             [cuerdas.core :as cuerdas]
             [dirac.automation.helpers :as helpers]

src/automation/dirac/automation/verbs.cljs

@@ -2,7 +2,7 @@
   "Low-level automation API"
   (: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.transcript-host :as transcript]
             [dirac.automation.matchers :as matchers]

src/background/dirac/background/chrome.cljs

@@ -2,7 +2,7 @@
   (:require-macros [cljs.core.async.macros :refer [go go-loop]]
                    [dirac.background.logging :refer [log info warn error]])
   (:require [cljs.core.async :refer [<! chan put!]]
-            [chromex.support :refer-macros [oget ocall oapply oset]]
+            [oops.core :refer [oget ocall oapply oset!]]
             [chromex.chrome-event-channel :refer [make-chrome-event-channel]]
             [chromex.protocols :refer [post-message! get-sender get-name]]
             [chromex.ext.runtime :as runtime]

src/background/dirac/background/core.cljs

@@ -2,7 +2,7 @@
   (:require-macros [cljs.core.async.macros :refer [go go-loop]]
                    [dirac.background.logging :refer [log info warn error]])
   (:require [cljs.core.async :refer [<! chan put!]]
-            [chromex.support :refer-macros [oget ocall oapply]]
+            [oops.core :refer [oget ocall oapply]]
             [chromex.chrome-event-channel :refer [make-chrome-event-channel]]
             [chromex.protocols :refer [post-message! get-sender get-name]]
             [dirac.background.chrome :as chrome]

src/background/dirac/background/devtools.cljs

@@ -1,5 +1,5 @@
 (ns dirac.background.devtools
-  (:require [chromex.support :refer-macros [oget ocall oapply]]
+  (:require [oops.core :refer [oget ocall oapply]]
             [chromex.logging :refer-macros [log info warn error group group-end]]
             [dirac.background.action :as action]
             [dirac.background.marion :as marion]

src/background/dirac/background/helpers.cljs

@@ -1,7 +1,7 @@
 (ns dirac.background.helpers
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [<! chan put! close! timeout]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oget+ oset! oset!+ ocall oapply]]
             [chromex.logging :refer-macros [log info warn error group group-end]]
             [chromex.ext.tabs :as tabs]
             [chromex.ext.extension :as extension]
@@ -105,11 +105,11 @@
   (filter (partial is-devtools-view? devtools-id) (extension/get-views)))
 
 (defn has-automation-support? [view]
-  (some? (oget view (get-automation-entry-point-key))))
+  (some? (oget+ view (str "?" (get-automation-entry-point-key)))))
 
 (defn get-automation-entry-point [view]
   {:post [(fn? %)]}
-  (oget view (get-automation-entry-point-key)))
+  (oget+ view (get-automation-entry-point-key)))
 
 (defn safe-serialize [value]
   (try
@@ -177,7 +177,7 @@
   (let [matching-views (get-devtools-views devtools-id)]
     (if (= (count matching-views) 1)
       (let [view (first matching-views)]
-        (oset view [(get-dirac-intercom-key)] handler)
-        (when-let [flush-fn (oget view (get-flush-pending-feedback-messages-key))]
+        (oset!+ view (str "!" (get-dirac-intercom-key)) handler)
+        (when-let [flush-fn (oget+ view (str "?" (get-flush-pending-feedback-messages-key)))]
           (flush-fn)))
       (error "unable to install intercom from dirac extension to dirac frontend" devtools-id))))

src/background/dirac/background/marion.cljs

@@ -2,7 +2,7 @@
   (:require-macros [cljs.core.async.macros :refer [go go-loop]]
                    [dirac.background.logging :refer [log info warn error]])
   (:require [cljs.core.async :refer [<! chan put!]]
-            [chromex.support :refer-macros [oget ocall oapply]]
+            [oops.core :refer [oget ocall oapply]]
             [chromex.protocols :refer [post-message! get-sender get-name]]
             [devtools.toolbox :refer [envelope]]
             [dirac.background.state :as state]

src/background/dirac/background/state.cljs

@@ -1,6 +1,6 @@
 (ns dirac.background.state
   (:require-macros [dirac.background.logging :refer [log info warn error]])
-  (:require [chromex.support :refer-macros [oget oset ocall oapply]]
+  (:require [oops.core :refer [oget oset! ocall oapply]]
             [chromex.protocols :refer [post-message! get-sender get-name]]
             [devtools.toolbox :as toolbox]
             [dirac.utils :as utils]

src/background/dirac/background/thief.cljs

@@ -2,7 +2,7 @@
   (:require-macros [cljs.core.async.macros :refer [go go-loop]]
                    [dirac.background.logging :refer [log info warn error]])
   (:require [cljs.core.async :refer [<! chan timeout]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.ext.page-capture :as page-capture]
             [dirac.mime :as mime]
             [dirac.quoted-printable :as qp]

src/background/dirac/background/tools.cljs

@@ -1,7 +1,7 @@
 (ns dirac.background.tools
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [<! chan timeout close! put!]]
-            [chromex.support :refer-macros [oget oset ocall oapply]]
+            [oops.core :refer [oget oset! ocall oapply]]
             [chromex.logging :refer-macros [log info warn error group group-end]]
             [chromex.ext.windows :as windows]
             [chromex.ext.tabs :as tabs]