js/keys - but this will change

Author: borkdude

cherry/corpus/destructuring.cljs

@@ -1,5 +1,8 @@
 (ns destructuring)
 
-(let [{:keys [a]} {:a 1}
+(let [{:js/keys [a] :as m} (clj->js {:a 1})
       [b c d] [2 3 4]]
-  (js/console.log a b c d))
+  (prn m a b c d))
+
+(let [{:js/keys [a] :as m} {:js/a 1}]
+  (prn m a))

cherry/corpus/destructuring.mjs

@@ -1,15 +1,26 @@
-import { get, nth, vector, __destructure_map, keyword, arrayMap } from 'cherry-cljs/cljs.core.js'
+import { prn, nth, vector, __destructure_map, keyword, clj__GT_js, arrayMap } from 'cherry-cljs/cljs.core.js'
 
 (function () {
- let map__1124, a, vec__1125, b, c, d;
-map__1124 = arrayMap(keyword("a"), 1);
+ let map__1124, m, a, vec__1125, b, c, d;
+map__1124 = clj__GT_js(arrayMap(keyword("a"), 1));
 map__1124 = __destructure_map(map__1124);
-a = get(map__1124, keyword("a"));
+m = map__1124;
+a = map__1124["a"];
 vec__1125 = vector(2, 3, 4);
 b = nth(vec__1125, 0, null);
 c = nth(vec__1125, 1, null);
 d = nth(vec__1125, 2, null);
 return (function () {
- return console.log(a, b, c, d);
+ return prn(m, a, b, c, d);
+})();
+})();
+(function () {
+ let map__1129, m, a;
+map__1129 = arrayMap(keyword("js/a"), 1);
+map__1129 = __destructure_map(map__1129);
+m = map__1129;
+a = map__1129["a"];
+return (function () {
+ return prn(m, a);
 })();
 })();

cherry/src/cherry/internal/destructure.cljc

@@ -57,10 +57,12 @@
                                            (if (keyword? mk)
                                              (let [mkns (namespace mk)
                                                    mkn (name mk)]
-                                               (cond (= mkn "keys") (assoc transforms mk #(keyword (or mkns (namespace %)) (name %)))
-                                                     (= mkn "syms") (assoc transforms mk #(list `quote (symbol (or mkns (namespace %)) (name %))))
-                                                     (= mkn "strs") (assoc transforms mk str)
-                                                     :else transforms))
+                                               (cond
+                                                 (= mk "js/keys") (assoc transforms mk str)
+                                                 (= mkn "keys") (assoc transforms mk #(keyword (or mkns (namespace %)) (name %)))
+                                                 (= mkn "syms") (assoc transforms mk #(list `quote (symbol (or mkns (namespace %)) (name %))))
+                                                 (= mkn "strs") (assoc transforms mk str)
+                                                 :else transforms))
                                              transforms))
                                          {}
                                          (keys b))]
@@ -79,8 +81,12 @@
                                          (with-meta (symbol nil (name bb)) (meta bb))
                                          bb)
                                  bv (if (contains? defaults local)
-                                      (list 'cljs.get gmap bk (defaults local))
-                                      (list 'cljs.core/get gmap bk))]
+                                      (if (= "js" (namespace bk))
+                                        (list 'cljs.core/aget gmap (name bk) (defaults local))
+                                        (list 'cljs.core/get gmap bk (defaults local)))
+                                      (if (= "js" (namespace bk))
+                                        (list 'cljs.core/aget gmap (name bk))
+                                        (list 'cljs.core/get gmap bk)))]
                              (recur
                               (if (or (keyword? bb) (symbol? bb)) ;(ident? bb)
                                 (-> ret (conj local bv))