Merge branch 'master' of github.com:clojure/clojurescript

Author: swannodette

pom.template.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.google.javascript</groupId>
             <artifactId>closure-compiler-unshaded</artifactId>
-            <version>v20170521</version>
+            <version>v20170626</version>
         </dependency>
         <dependency>
             <groupId>org.clojure</groupId>

project.clj

@@ -14,7 +14,7 @@
                  [org.clojure/test.check "0.9.0" :scope "test"]
                  [com.cognitect/transit-clj "0.8.300"]
                  [org.clojure/google-closure-library "0.0-20170519-fa0499ef"]
-                 [com.google.javascript/closure-compiler-unshaded "v20170521"]
+                 [com.google.javascript/closure-compiler-unshaded "v20170626"]
                  [org.mozilla/rhino "1.7R5"]]
   :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :uberjar {:aot :all :main clojure.main}}

script/bootstrap

@@ -5,7 +5,7 @@ set -e
 CLOJURE_RELEASE="1.9.0-alpha16"
 SPEC_ALPHA_RELEASE="0.1.108"
 CORE_SPECS_ALPHA_RELEASE="0.1.10"
-CLOSURE_RELEASE="20170521"
+CLOSURE_RELEASE="20170626"
 DJSON_RELEASE="0.2.6"
 TRANSIT_RELEASE="0.8.285"
 GCLOSURE_LIB_RELEASE="0.0-20160609-f42b4a24"

src/main/cljs/cljs/core.cljs

@@ -255,8 +255,8 @@
   [p x]
   (let [x (if (nil? x) nil x)]
     (cond
-     (aget p (goog/typeOf x)) true
-     (aget p "_") true
+     (unsafe-get p (goog/typeOf x)) true
+     (unsafe-get p "_") true
      :else false)))
 (set! *unchecked-if* false)
 
@@ -887,7 +887,7 @@
 
 (defn add-to-string-hash-cache [k]
   (let [h (hash-string* k)]
-    (aset string-hash-cache k h)
+    (gobject/set string-hash-cache k h)
     (set! string-hash-cache-count (inc string-hash-cache-count))
     h))
 
@@ -897,7 +897,7 @@
     (set! string-hash-cache-count 0))
   (if (nil? k)
     0
-    (let [h (aget string-hash-cache k)]
+    (let [h (unsafe-get string-hash-cache k)]
       (if (number? h)
         h
         (add-to-string-hash-cache k)))))
@@ -2927,7 +2927,7 @@ reduces them without incurring seq initialization"
   [obj fn-map]
   (doseq [[key-name f] fn-map]
     (let [str-name (name key-name)]
-      (aset obj str-name f)))
+      (gobject/set obj str-name f)))
   obj)
 
 ;;;;;;;;;;;;;;;; cons ;;;;;;;;;;;;;;;;
@@ -5998,7 +5998,7 @@ reduces them without incurring seq initialization"
     (loop [i 0]
       (when (< i l)
         (let [k (aget ks i)]
-          (aset new-obj k (aget obj k))
+          (gobject/set new-obj k (gobject/get obj k))
           (recur (inc i)))))
     new-obj))
 
@@ -8458,7 +8458,7 @@ reduces them without incurring seq initialization"
     (loop [kvs (seq keyvals)]
       (if kvs
         (do (.push ks (first kvs))
-            (aset obj (first kvs) (second kvs))
+            (gobject/set obj (first kvs) (second kvs))
             (recur (nnext kvs)))
         (.fromObject ObjMap ks obj)))))
 
@@ -9532,7 +9532,7 @@ reduces them without incurring seq initialization"
   [s]
   (str \"
        (.replace s (js/RegExp "[\\\\\"\b\f\n\r\t]" "g")
-         (fn [match] (aget char-escapes match)))
+         (fn [match] (unsafe-get char-escapes match)))
        \"))
 
 (declare print-map)
@@ -10151,7 +10151,7 @@ reduces them without incurring seq initialization"
          (symbol? x) (str x)
          (map? x) (let [m (js-obj)]
                     (doseq [[k v] x]
-                      (aset m (key->js k) (clj->js v)))
+                      (gobject/set m (key->js k) (clj->js v)))
                     m)
          (coll? x) (let [arr (array)]
                      (doseq [x (map clj->js x)]

src/main/cljs/cljs/reader.cljs

@@ -8,7 +8,8 @@
 
 (ns cljs.reader
   (:require-macros [cljs.reader :refer [add-data-readers]])
-  (:require [goog.string :as gstring])
+  (:require [goog.object :as gobject]
+            [goog.string :as gstring])
   (:import goog.string.StringBuffer))
 
 (defprotocol PushbackReader
@@ -580,7 +581,7 @@ nil if the end of stream has been reached")
     (map? form)
     (let [obj (js-obj)]
       (doseq [[k v] form]
-        (aset obj (name k) v))
+        (gobject/set obj (name k) v))
       obj)
 
     :else

src/main/clojure/cljs/analyzer.cljc

@@ -134,6 +134,8 @@
    :extending-base-js-type true
    :invoke-ctor true
    :invalid-arithmetic true
+   :invalid-aget false
+   :invalid-aset false
    :protocol-invalid-method true
    :protocol-duped-method true
    :protocol-multiple-impls true
@@ -391,6 +393,24 @@
   [warning-type info]
   (str (:js-op info) ", all arguments must be numbers, got " (:types info) " instead."))
 
+(defmethod error-message :invalid-aget
+  [warning-type info]
+  (str (:js-op info) ", arguments must be an array followed by numeric indices, got " (:types info) " instead"
+    (when (or (= 'object (first (:types info)))
+              (every? #{'string} (rest (:types info))))
+      (str " (consider "
+        (if (== 2 (count (:types info)))
+          "goog.object/get"
+          "goog.object/getValueByKeys")
+        " for object access)"))))
+
+(defmethod error-message :invalid-aset
+  [warning-type info]
+  (str (:js-op info) ", arguments must be an array, followed by numeric indices, followed by a value, got " (:types info) " instead"
+    (when (or (= 'object (first (:types info)))
+              (every? #{'string} (butlast (rest (:types info)))))
+      " (consider goog.object/set for object access)")))
+
 (defmethod error-message :invoke-ctor
   [warning-type info]
   (str "Cannot invoke type constructor " (-> info :fexpr :info :name) " as function "))
@@ -2822,20 +2842,48 @@
             (contains? t 'any)
             (contains? t 'js))))))
 
+(defn array-type?
+  #?(:cljs {:tag boolean})
+  [t]
+  ;; TODO same inference caveats as the numeric-type? fn above
+  (cond
+    (nil? t) true
+    (= 'clj-nil t) true
+    (js-tag? t) true ;; TODO: revisit
+    :else
+    (if (and (symbol? t) (some? (get '#{any array} t)))
+      true
+      (when #?(:clj  (set? t)
+               :cljs (cljs-set? t))
+        (or (contains? t 'array)
+            (contains? t 'any)
+            (contains? t 'js))))))
+
 (defn analyze-js-star* [env jsform args form]
   (let [enve      (assoc env :context :expr)
         argexprs  (vec (map #(analyze enve %) args))
         form-meta (meta form)
         segs      (js-star-seg jsform)
         tag       (get-js-tag form)
         js-op     (:js-op form-meta)
-        numeric   (:numeric form-meta)]
+        numeric   (:numeric form-meta)
+        validate  (fn [warning-type valid-types?]
+                    (let [types (map #(infer-tag env %) argexprs)]
+                      (when-not (valid-types? types)
+                        (warning warning-type env
+                          {:js-op js-op
+                           :types (into [] types)}))))
+        op-match? (fn [sym]
+                    #?(:clj  (= sym (:js-op form-meta))
+                       :cljs (symbol-identical? sym (:js-op form-meta))))]
     (when (true? numeric)
-      (let [types (map #(infer-tag env %) argexprs)]
-        (when-not (every? numeric-type? types)
-          (warning :invalid-arithmetic env
-            {:js-op js-op
-             :types (into [] types)}))))
+      (validate :invalid-arithmetic #(every? numeric-type? %)))
+    (when (op-match? 'cljs.core/aget)
+      (validate :invalid-aget #(and (array-type? (first %))
+                                    (every? numeric-type? (rest %)))))
+    (when (op-match? 'cljs.core/aset)
+      (validate :invalid-aset #(and (array-type? (first %))
+                                    (every? numeric-type? (butlast (rest %))))))
     {:op :js
      :env env
      :segs segs

src/main/clojure/cljs/closure.clj

@@ -61,9 +61,7 @@
               SourceMap$DetailLevel ClosureCodingConvention SourceFile
               Result JSError CheckLevel DiagnosticGroups
               CommandLineRunner AnonymousFunctionNamingPolicy
-              JSModule SourceMap ProcessCommonJSModules
-              AbstractCompiler TransformAMDToCJSModule
-              ProcessEs6Modules CompilerInput]
+              JSModule SourceMap]
            [com.google.javascript.jscomp.deps ModuleLoader$ResolutionMode]
            [com.google.javascript.rhino Node]
            [java.nio.file Path Paths Files StandardWatchEventKinds WatchKey
@@ -1473,7 +1471,8 @@
                    (str "document.write('<script>goog.require(\"" (comp/munge entry)"\");</script>');\n"))
               (if-let [entries (:entries opts)]
                 entries
-                [(:main opts)]))))))))
+                (when-let [main (:main opts)]
+                  [main])))))))))
 
 (defn output-modules
   "Given compiler options, original IJavaScript sources and a sequence of

src/main/clojure/cljs/core.cljc

@@ -993,6 +993,12 @@
               astr (apply core/str (repeat n "[~{}]"))]
      `(~'js* ~(core/str "(~{}[~{}][~{}]" astr " = ~{})") ~a ~idx ~idx2 ~@idxv))))
 
+(core/defmacro unsafe-get
+  "Efficient alternative to goog.object/get which lacks opt_val and emits
+  unchecked property access."
+  [obj key]
+  (core/list 'js* "(~{}[~{}])" obj key))
+
 (core/defmacro ^::ana/numeric +
   ([] 0)
   ([x] x)
@@ -1376,9 +1382,9 @@
   (core/let [psym       (resolve p)
              pfn-prefix (subs (core/str psym) 0
                           (clojure.core/inc (.indexOf (core/str psym) "/")))]
-    (cons `(aset ~psym ~type true)
+    (cons `(goog.object/set ~psym ~type true)
       (map (core/fn [[f & meths :as form]]
-             `(aset ~(symbol (core/str pfn-prefix f))
+             `(goog.object/set ~(symbol (core/str pfn-prefix f))
                 ~type ~(with-meta `(fn ~@meths) (meta form))))
         sigs))))
 
@@ -1977,10 +1983,10 @@
                                     (not (nil? (. ~(first sig) ~(symbol (core/str "-" slot)))))) ;; Property access needed here.
                                 (. ~(first sig) ~slot ~@sig)
                                 (let [x# (if (nil? ~(first sig)) nil ~(first sig))
-                                      m# (aget ~(fqn fname) (goog/typeOf x#))]
+                                      m# (unsafe-get ~(fqn fname) (goog/typeOf x#))]
                                   (if-not (nil? m#)
                                     (m# ~@sig)
-                                    (let [m# (aget ~(fqn fname) "_")]
+                                    (let [m# (unsafe-get ~(fqn fname) "_")]
                                       (if-not (nil? m#)
                                         (m# ~@sig)
                                         (throw
@@ -2740,7 +2746,7 @@
   (core/list 'js* "''+~{}" s))
 
 (core/defmacro es6-iterable [ty]
-  `(aset (.-prototype ~ty) cljs.core/ITER_SYMBOL
+  `(goog.object/set (.-prototype ~ty) cljs.core/ITER_SYMBOL
      (fn []
        (this-as this#
          (cljs.core/es6-iterator this#)))))

src/test/cljs/cljs/core_test.cljs

@@ -10,7 +10,8 @@
   (:refer-clojure :exclude [iter])
   (:require [cljs.test :refer-macros [deftest testing is]]
             [clojure.string :as s]
-            [clojure.set :as set]))
+            [clojure.set :as set]
+            [goog.object :as gobject]))
 
 (deftest test-metadata
   (testing "Testing metadata"
@@ -143,11 +144,11 @@
       (is (goog/isArray (clj->js #{})))
       (is (goog/isArray (clj->js '())))
       (is (goog/isObject (clj->js {})))
-      (is (= (aget (clj->js {:a 1}) "a") 1))
+      (is (= (gobject/get (clj->js {:a 1}) "a") 1))
       (is (= (-> (clj->js {:a {:b {{:k :ey} :d}}})
-                   (aget "a")
-                   (aget "b")
-                   (aget "{:k :ey}"))
+                   (gobject/get "a")
+                   (gobject/get "b")
+                   (gobject/get "{:k :ey}"))
                 "d")))))
 
 (deftest test-delay
@@ -544,6 +545,11 @@
   (is (= 0 (loop [x 0] (cond-> x false recur))))
   (is (= 0 (loop [x 0] (cond->> x false recur)))))
 
+(deftest unsafe-get-test
+  (is (= 1 (unsafe-get #js {:a 1} "a")))
+  (is (nil? (unsafe-get #js {:a 1} "b")))
+  (is (nil? (unsafe-get #js {:a 1} nil))))
+
 ;; =============================================================================
 ;; Tickets
 

src/test/cljs/cljs/hashing_test.cljs

@@ -10,10 +10,11 @@
   (:refer-clojure :exclude [iter])
   (:require [cljs.test :refer-macros [deftest testing is]]
             [clojure.string :as s]
-            [clojure.set :as set]))
+            [clojure.set :as set]
+            [goog.object :as gobject]))
 
 (deftest test-hash-null
-  (is (zero? (hash (aget (js-obj) "foo")))))
+  (is (zero? (hash (gobject/get (js-obj) "foo")))))
 
 ;; hashing bug in many JS runtimes CLJ-118
 (deftest test-clj-118