keyword accepts 2 args

bobbicodes · Sep 3, 2023 · c5fbbba · c5fbbba
1 parent 7a92a2c
commit c5fbbba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/clj/core.clj b/src/clj/core.clj
@@ -755,11 +755,10 @@
                              (if (keyword? mk)
                                (let* [mkns (namespace mk)
                                       mkn (name mk)]
-                                     (println (name mk))
-                                     (cond (= mkn "keys") 
+                                     (cond (= mkn "keys")
                                            (assoc transforms 
                                                   mk 
-                                                  #(keyword (or mkns (namespace %)) (name %)))
+                                                  (fn [k] (keyword (or mkns (namespace k)) (name k))))
                                            (= mkn "syms") 
                                            (assoc transforms 
                                                   mk 
@@ -798,9 +797,8 @@
             ret))))
 
 (defn namespace [x]
-  (first (str/split (str x) "/")))
-
-(namespace :keys)
+  (when (str/includes? x "/")
+    (first (str/split (str x) "/"))))
 
 (defn name [x]
   (if (keyword? x)

diff --git a/src/types.js b/src/types.js
@@ -179,12 +179,19 @@ export function _ratio_Q(obj) {
 }
 
 // Keywords
-export function _keyword(obj) {
-    if (typeof obj === 'string' && obj[0] === '\u029e') {
-        return obj;
-    } else {
-        return "\u029e" + obj;
+export function _keyword(ns, name) {
+    if (!name) {
+        name = ns
+        if (typeof name === 'string' && name[0] === '\u029e') {
+            return name;
+        } else {
+            return "\u029e" + name;
+        }
+    }
+    if (ns === null) {
+        return "\u029e" + name
     }
+    return "\u029e" + ns + "/" + name
 }
 export function _keyword_Q(obj) {
     return typeof obj === 'string' && obj[0] === '\u029e';