Change the way the special js namespace is implemented

Author: imakira

src/net/coruscation/js4clj/api/polyglot.clj

@@ -1,6 +1,7 @@
 (ns net.coruscation.js4clj.api.polyglot
   (:require
-   [clojure.string :as string]))
+   [clojure.string :as string]
+   [net.coruscation.js4clj.context :refer [*context*]]))
 
 (defn with-raw-clojure-value [polyglot-value clojure-value]
   (with-meta polyglot-value
@@ -14,9 +15,20 @@
     {::raw-polyglot-value polyglot-value}))
 
 (defn polyglot-value [obj]
-  (or (::raw-polyglot-value (meta obj))
-      (and (instance? org.graalvm.polyglot.Value obj)
-           obj)))
+  (cond (::raw-polyglot-value (meta obj))
+        (::raw-polyglot-value (meta obj))
+
+        (and (symbol? obj)
+             (= (namespace obj)
+                (name 'net.coruscation.js4clj.js)))
+        (.getMember (.getBindings *context* "js")
+                    (name obj))
+
+        (instance? org.graalvm.polyglot.Value obj)
+        obj
+
+        :else
+        nil))
 
 (defn- to-camel-style [s]
   (string/replace s #"-([a-z])" (fn [g]

src/net/coruscation/js4clj/js.clj

@@ -7,39 +7,28 @@
    [org.graalvm.polyglot Context Source Value]))
 
 (def ^{:dynamic true :private true} *no-clojurify* false)
+
 (def ^:private nullprint (java.io.PrintWriter. (proxy [java.io.OutputStream] []
                                                  (write [_ _]))))
-
-(defn- define-builtin [ns primitive & [alias]]
+(defn- define-builtin [ns primitive]
   (binding [*err* nullprint]
-    (intern ns (if alias (symbol alias) (symbol primitive))
-            ((if *no-clojurify* identity clojurify-value)
-             (.getMember (.getBindings *context* "js") primitive)))))
+    (intern ns (with-meta primitive
+                 {:doc (str "A symbol stands for js `" (name primitive) "`")})
+            (symbol (name ns) (name primitive)))))
 
 (defmacro ^:private define-builtins
   {:clj-kondo/lint-as 'clojure.core/declare}
   [ns & primitives]
   (create-ns ns)
   `(doseq [primitive# '~primitives]
-     (define-builtin '~ns (str primitive#))))
-
-;; In cljs there is also a js/undefined
-;;	in which (= nil js/undefined) but we can't mimic it.
-;; Still, we need a js/undefined in case we need to do some
-;; 	very specific interop.
-(def undefined
-  "Internal representation of `undefined` in JavaScript.
-
-  Only use this when you want to pass a undefined value to a JavaScript function.
-
-  Unlike ClojureScript, this value does not equal to `nil`"
-  (.getMember (.getBindings *context* "js") "undefined"))
+     (define-builtin '~ns primitive#)))
 
 #_{:clojure-lsp/ignore [:clojure-lsp/unused-public-var]}
 (define-builtins net.coruscation.js4clj.js
   globalThis
   Infinity
   NaN
+  undefined
   Object
   Function
   Boolean

test/net/coruscation/js4clj/js4clj_test.clj

@@ -56,7 +56,7 @@
 
 (deftest wrapper-method-test
   (testing ""
-    (is (function? js/Array))
+    ;; (is (function? js/Array))
     (is (= (polyglot/get-meta-qualified-name (polyglot/get-meta-object js/Array))
            "Function"))
     (is (= (polyglot/get-meta-qualified-name (polyglot/get-meta-object (polyglot/get-member js/Array "from")))
@@ -70,10 +70,22 @@
 
 (deftest polyglot-value?-test
   (testing ""
-    (is (true? (fn? js/Array)) "js/Array is a clojure fn")
-    (is (boolean (polyglot/polyglot-value js/Array)) "js/Array is also a polyglot value")
-    (is (isa? (class (polyglot/polyglot-value js/Array))
-              org.graalvm.polyglot.Value) "It returns the wrapped Value")))
+    (is (true? (symbol? js/Array)) "js/Array is just a symbol now")
+    (is (instance? org.graalvm.polyglot.Value (polyglot/polyglot-value js/Array) ) "We turn it into a polyglot value using polyglot-value")
+    (is (true? (fn? (converting/clojurify-value (polyglot/polyglot-value js/Array)))) "We can't use it as a function now, maybe we need to solve this problem in the future")))
+
+(deftest special-js-namespace-test
+  (testing ""
+    (is (symbol? js/Array)
+        "It is just a symbol")
+    (is (= (js->clj (core/js-new js/Array 1 2 3))
+           [1 2 3])
+        "We can use it as the class")
+    (is (= (js->clj (core/js-new js/Array js/undefined js/undefined))
+           [nil nil])
+        "We can pass it as arguments")
+    (is (true? (core/js-fn? js/Array))
+        "functions starting with js- will treat these symbols as js values")))
 
 (deftest js-array?-test
   (testing ""
@@ -82,9 +94,6 @@
     (is (false? (core/js-array? js/undefined)) "returns false, no error threw")))
 
 (deftest js->clj-test
-  (testing "Default testing"
-    (is (nil? (js->clj js/undefined)))
-    (is (fn? (js->clj js/Array))))
 
   (testing "Testing builitn types, they should be returned as is"
     (is (nil? (js->clj nil)))
@@ -216,7 +225,7 @@
 
 (deftest executable-javascript-object-test
   (testing ""
-    (is (function? js/Array) "It is a clojure function")
+    (is (not (function? js/Array)) "We can not use it as a Clojure function now")
     (is (core/js-fn? js/Array) "It is also a javascript function")
     (is (polyglot/can-instantiate js/Array)  "We can also instantiate it")
     (is (polyglot/get-member js/Array "from") "We can get its static method")