js type hint

Author: borkdude

cherry/corpus/destructuring.cljs

@@ -1,8 +1,6 @@
 (ns destructuring)
 
-(let [{:js/keys [a] :as m} (clj->js {:a 1})
-      [b c d] [2 3 4]]
-  (prn m a b c d))
-
-(let [{:js/keys [a] :as m} {:js/a 1}]
-  (prn m a))
+(let [^js {:keys [a] :as m} (clj->js {:a 1})
+      ^js {:js/keys [b]} (js-obj "js/b" :js/b)
+      [c d e] [2 3 4]]
+  (prn m a b c d e))

cherry/corpus/destructuring.mjs

@@ -1,26 +1,19 @@
-import { prn, nth, vector, __destructure_map, keyword, clj__GT_js, arrayMap } from 'cherry-cljs/cljs.core.js'
+import { js_obj, prn, nth, vector, __destructure_map, keyword, clj__GT_js, arrayMap } from 'cherry-cljs/cljs.core.js'
 
 (function () {
- 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);
-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 prn(m, a, b, c, d);
-})();
-})();
-(function () {
- let map__1129, m, a;
-map__1129 = arrayMap(keyword("js/a"), 1);
+ let map__1128, m, a, map__1129, b, vec__1130, c, d, e;
+map__1128 = clj__GT_js(arrayMap(keyword("a"), 1));
+map__1128 = __destructure_map(map__1128);
+m = map__1128;
+a = map__1128["a"];
+map__1129 = js_obj("js/b", keyword("js/b"));
 map__1129 = __destructure_map(map__1129);
-m = map__1129;
-a = map__1129["a"];
+b = map__1129["js/b"];
+vec__1130 = vector(2, 3, 4);
+c = nth(vec__1130, 0, null);
+d = nth(vec__1130, 1, null);
+e = nth(vec__1130, 2, null);
 return (function () {
- return prn(m, a);
+ return prn(m, a, b, c, d, e);
 })();
 })();

cherry/src/cherry/internal/destructure.cljc

@@ -43,7 +43,9 @@
                            ret))))
                    pmap
                    (fn [bvec b v]
-                     (let [gmap (gensym "map__")
+                     (let [m (meta b)
+                           js-keys? (= 'js (:tag m))
+                           gmap (gensym "map__")
                            defaults (:or b)]
                        (loop [ret (-> bvec (conj gmap) (conj v)
                                       (conj gmap) (conj (list 'cljs.core/--destructure-map gmap))
@@ -58,7 +60,7 @@
                                              (let [mkns (namespace mk)
                                                    mkn (name mk)]
                                                (cond
-                                                 (= mk "js/keys") (assoc transforms mk str)
+                                                 js-keys? (assoc transforms mk #(subs (str (keyword (or mkns (namespace %)) (name %))) 1))
                                                  (= 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)
@@ -81,11 +83,11 @@
                                          (with-meta (symbol nil (name bb)) (meta bb))
                                          bb)
                                  bv (if (contains? defaults local)
-                                      (if (= "js" (namespace bk))
-                                        (list 'cljs.core/aget gmap (name bk) (defaults local))
+                                      (if js-keys?
+                                        (list 'cljs.core/aget gmap bk (defaults local))
                                         (list 'cljs.core/get gmap bk (defaults local)))
-                                      (if (= "js" (namespace bk))
-                                        (list 'cljs.core/aget gmap (name bk))
+                                      (if js-keys?
+                                        (list 'cljs.core/aget gmap bk)
                                         (list 'cljs.core/get gmap bk)))]
                              (recur
                               (if (or (keyword? bb) (symbol? bb)) ;(ident? bb)