julia kernel better ns support

Author: lihebi

api/kernels/julia/codepod.jl

@@ -10,18 +10,30 @@ function isModuleDefined(names)
     return true
 end
 
+# function ensureModuleDefined(namespace)
+#     # ensure the module is defined, and return the module
+#     # 1. split with /
+#     names = split(namespace, "/", keepempty=false)
+#     mod = :(Main)
+#     for name in names
+#         name = Symbol(name)
+#         if !isdefined(eval(mod), name) 
+#             include_string(eval(mod), "module $name using Reexport end")
+#         end
+#         mod = :($mod.$name)
+#     end
+#     return mod, eval(mod)
+# end
+
+
 function ensureModuleDefined(namespace)
-    # ensure the module is defined, and return the module
-    # 1. split with /
-    names = split(namespace, "/", keepempty=false)
-    mod = :(Main)
-    for name in names
-        name = Symbol(name)
-        if !isdefined(eval(mod), name) 
-            include_string(eval(mod), "module $name using Reexport end")
-        end
-        mod = :($mod.$name)
+    if !isdefined(eval(:Main), Symbol(namespace))
+        expr = :(module $(Symbol(namespace))
+                    using Reexport
+                end)
+        eval(expr)
     end
+    mod = :($(:Main).$(Symbol(namespace)))
     return mod, eval(mod)
 end
 

ui/src/lib/ws/middleware.js

@@ -189,6 +189,40 @@ ${nses
   ${names.length > 0 ? `export ${names.join(",")}` : ""}
   
     `;
+
+    // FIXME optimize this logic. Probably construct several CODEPOD_ADD_IMPORT here
+    code = `
+    ${nses.map(
+      (ns) => `
+    include_string(eval(:($(:Main).$(Symbol("${pod.ns}")))), "using $(:($(:Main).$(Symbol("${ns}"))))")`
+    )}
+    ${exported_decks.map(
+      (ns) => `
+    include_string(eval(:($(:Main).$(Symbol("${pod.ns}")))), "@reexport using $(:($(:Main).$(Symbol("${ns}"))))")`
+    )}
+
+    ${names.length > 0 ? `export ${names.join(",")}` : ""}
+    `;
+
+    // DEBUG Much better!!!
+    code = `
+    ${nses
+      .map(
+        (ns) => `
+    eval(:(using $(:Main).$(Symbol("${ns}"))))
+    `
+      )
+      .join("\n")}
+    ${exported_decks
+      .map(
+        (ns) => `
+    eval(:(@reexport using $(:Main).$(Symbol("${ns}"))))
+    `
+      )
+      .join("\n")}
+
+    ${names.length > 0 ? `export ${names.join(",")}` : ""}
+    `;
     // console.log("code:", code);
     // ${struct_names.map((name) => `(struct ${name} ())`)}