adding tests

Author: hoebat

(sort (get-in packages' [k :internal])))))

@@ -0,0 +1 @@
+Subprocess failed (exit code: 1)

config/packages.edn

@@ -1,18 +1,8 @@
-{xyz.zcaudate/code.ai
- {:description "ai client and server"
-  :include [[code.ai.heal :complete]
-            [code.ai.server :complete]]
-  :dependencies [org.hugoduncan/mcp-clj-server]}
-
- xyz.zcaudate/code.mcp
+{xyz.zcaudate/code.mcp
  {:description "java-sdk MCP wrappers and RAG scaffolding"
   :include [[code.mcp :complete]]
   :dependencies [io.modelcontextprotocol.sdk/mcp]}
 
- xyz.zcaudate/code.dev
- {:description "generate documentation from code"
-  :include [[code.dev :complete]]}
- 
  xyz.zcaudate/code.doc
  {:description "generate documentation from code"
   :include [[code.doc :complete]]
@@ -23,24 +13,11 @@
  {:description "source and test management"
   :include [[code.framework :complete]]}
 
- xyz.zcaudate/code.java
- {:description "source and test management"
-  :include [[code.java :complete]]
-  :dependencies [org.ow2.asm/asm]}
- 
- xyz.zcaudate/code.link
- {:description "code packaging and distribution"
-  :include [[code.link :complete]]}
- 
  xyz.zcaudate/code.manage
  {:description "source code utils and workflow"
   :include [[code.manage :complete]]
   :bundle [{:path "resources" :include ["assets/code.manage"]}]}
 
- xyz.zcaudate/code.maven
- {:description "code packaging and distribution"
-  :include [[code.maven :complete]]}
-
  xyz.zcaudate/code.project
  {:description "working with projects"
   :include [[code.project :complete]]}
@@ -387,75 +364,28 @@
  {:description "python libs and helpers"
   :include [[python :complete]]} 
 
- xyz.zcaudate/rt.base
- {:description "base runtimes"
-  :include [[rt.base :complete]]}
-
- xyz.zcaudate/rt.basic
- {:description "wrapper for nginx" 
-  :include [[rt.basic :complete]]
-  :dependencies [http-kit]}
-
- xyz.zcaudate/rt.circom
- {:description "runtime for circom"
-  :include [[rt.circom :complete]]}
-
- xyz.zcaudate/rt.fortran
- {:description "runtime for fortran"
-  :include [[rt.fortran :complete]]}
- 
  xyz.zcaudate/rt.graal
- {:description "runtime for graal contexts"
-  :include [[rt.graal :complete]]
-  :bundle [{:path "target/classes" 
-            :include ["hara/lib/graal"]}]
-  :dependencies [org.graalvm.sdk/graal-sdk
-                 org.graalvm.js/js
+  {:description "runtime for graal contexts"
+   :include [[rt.graal :complete]
+             [hara.runtime.graal :complete]]
+   :bundle [{:path "target/classes" 
+             :include ["hara/lib/graal"]}]
+   :dependencies [org.graalvm.sdk/graal-sdk
+                  org.graalvm.js/js
                  org.graalvm.js/js-scriptengine
 		             commons-io/commons-io]}
 
  xyz.zcaudate/rt.jep
- {:description "runtime for jep" 
-  :include [[rt.jep :complete]]
-  :dependencies [black.ninia/jep]}
- 
- xyz.zcaudate/rt.libpython
- {:description "runtime for libpython" 
-  :include [[rt.libpython :complete]]
-  :dependencies [clj-python/libpython-clj]} 
-
- xyz.zcaudate/rt.llvm
- {:description "runtime for llvm"
-  :include [[rt.llvm :complete]]}
+  {:description "runtime for jep" 
+   :include [[rt.jep :complete]
+             [hara.runtime.jep :complete]]
+   :dependencies [black.ninia/jep]}
 
- xyz.zcaudate/rt.nginx
- {:description "runtime for nginx" 
-  :include [[rt.nginx :complete]]}
-
- xyz.zcaudate/rt.nix
- {:description "runtime for nix"
-  :include [[rt.nix :complete]]}
-  
- xyz.zcaudate/rt.postgres
- {:description "runtime for postgres" 
-  :include [[rt.postgres :complete]]}
-  
  xyz.zcaudate/rt.redis
- {:description "runtime for redis" 
-  :include [[rt.redis :complete]]
-  :bundle [{:path "resources" :include ["assets/rt.redis"]}]}
-  
- xyz.zcaudate/rt.shell
- {:description "shell runtime"
-  :include [[rt.shell :complete]]}
- 
- xyz.zcaudate/rt.solidity
- {:description "shell runtime"
-  :include [[rt.solidity :complete]]}
-
- xyz.zcaudate/rt.verilog
- {:description "runtime for verilog"
-  :include [[rt.verilog :complete]]}
+  {:description "runtime for redis" 
+   :include [[rt.redis :complete]
+             [hara.runtime.redis :complete]]
+   :bundle [{:path "resources" :include ["assets/rt.redis"]}]}
 
  xyz.zcaudate/script.css
  {:description "read and write css using clojure"
@@ -540,10 +470,32 @@
    com.fasterxml.jackson.datatype/jackson-datatype-jsr310]
   :bundle [{:path "target/classes" :include ["hara/lib/json"]}]}
 
- xyz.zcaudate/hara
- {:description "working with other languages"
-  :include [[hara :complete]]}
-  
+  xyz.zcaudate/hara
+  {:description "working with other languages"
+   :include [[hara :exclude [hara.runtime.postgres
+                             hara.runtime.graal
+                             hara.runtime.jep
+                             hara.runtime.redis
+                             hara.runtime.solidity
+                             hara.runtime.nginx
+                             hara.model.spec-postgres]]
+             [xt.lang :complete]]}
+
+ xyz.zcaudate/hara.runtime.nginx
+ {:description "nginx runtime support"
+  :include [[hara.runtime.nginx :complete]]}
+
+ xyz.zcaudate/postgres
+ {:description "postgres language and runtime support"
+  :include [[postgres :complete]
+            [hara.model.spec-postgres :complete]
+            [hara.runtime.postgres :complete]]}
+
+ xyz.zcaudate/solidity
+ {:description "solidity language and runtime support"
+  :include [[solidity.core :complete]
+            [hara.runtime.solidity :complete]]}
+    
  xyz.zcaudate/std.lib
  {:description "simple string methods for searching"
   :bundle [{:path "target/classes" 
@@ -621,20 +573,8 @@
  xyz.zcaudate/xtalk.db
  {:description "xtalk language"
   :include [[xt.db     :complete]]}
-
- xyz.zcaudate/xtalk.evm
- {:description "xtalk evm"
-  :include [[xt.evm :complete]]}
 
- xyz.zcaudate/xtalk.lang
-  {:description "xtalk language"
-   :include [[xt.lang               :complete]
-             [xt.lang.common-module :complete]]}
-
  xyz.zcaudate/xtalk.runtime
  {:description "xtalk language"
   :include [[kmi.lang     :complete]]}
- 
- xyz.zcaudate/xtalk.system
- {:description "xtalk language"
-  :include [[xt.sys     :complete]]}}
+ }

src/code/framework/link.clj

@@ -88,27 +88,31 @@
   {:added "3.0"}
   ([package lookup]
    (let [nsps (keys lookup)]
-     (mapcat (fn [[ns type select]]
-               (case type
-                 :base      (filter (fn [sym] (or (= sym ns)
-                                                  (.startsWith (str sym)
-                                                               (str ns ".base."))))
-                                    nsps)
-                 :complete  (filter (fn [sym] (or (= sym ns)
-                                                  (.startsWith (str sym)
-                                                               (str ns "."))))
-                                    nsps)
-                 :exclude   (filter (fn [sym]
-                                      (and (or (= sym ns)
-                                               (.startsWith (str sym)
-                                                            (str ns ".")))
-                                           (not ((set select) ns))))
-                                    nsps)
-                 (throw (ex-info "Not supported." {:type type
-                                                   :options [:base
-                                                             :complete
-                                                             :exclude]}))))
-             (:include package)))))
+      (mapcat (fn [[ns type select]]
+                (case type
+                  :base      (filter (fn [sym] (or (= sym ns)
+                                                   (.startsWith (str sym)
+                                                                (str ns ".base."))))
+                                     nsps)
+                  :complete  (filter (fn [sym] (or (= sym ns)
+                                                   (.startsWith (str sym)
+                                                                (str ns "."))))
+                                     nsps)
+                  :exclude   (filter (fn [sym]
+                                       (and (or (= sym ns)
+                                                (.startsWith (str sym)
+                                                             (str ns ".")))
+                                            (not-any? (fn [excluded]
+                                                        (or (= sym excluded)
+                                                            (.startsWith (str sym)
+                                                                         (str excluded "."))))
+                                                      select)))
+                                     nsps)
+                  (throw (ex-info "Not supported." {:type type
+                                                    :options [:base
+                                                              :complete
+                                                              :exclude]}))))
+              (:include package)))))
 
 (defn collect-entries
   "collects all entries given packages and lookups

src/hara/lang.clj

@@ -197,14 +197,24 @@
     m
     (ptr/get-entry m)))
 
+(defn- trim-trailing-nils
+  [v]
+  (->> v
+       reverse
+       (drop-while nil?)
+       reverse
+       vec))
+
 (defn as-lua
-  "change `[]` to `{}`"
+  "change `[]` to `{}` and trim trailing nils from vectors"
   {:added "4.0"}
   [input]
   (walk/prewalk (fn [form]
-                  (cond (and (vector? form)
-                             (empty? form))
-                        {}
+                  (cond (vector? form)
+                        (let [form (trim-trailing-nils form)]
+                          (if (empty? form)
+                            {}
+                            form))
 
                         (map? form)
                         (coll/filter-vals (comp not nil?) form)

src/hara/seedgen.clj

@@ -212,7 +212,7 @@
 (invoke/definvoke seedgen-benchadd
   [:task {:template :code.transform
           :params {:title "SEEDGEN BENCHADD"
-                   :parallel true
+                   :parallel false
                    :print {:function true}}
           :main {:fn #'seedgen-benchadd-summary}
           :item {:list seedgen-test-namespaces

src/hara/seedgen/form_infile.clj

@@ -649,43 +649,28 @@
   [s from to]
   (if (= from to)
     s
-    (letfn [(next-after-subtree [zloc]
-              (loop [current zloc]
-                (or (nav/right current)
-                    (let [parent (nav/up current)]
-                      (when (and parent
-                                 (not= parent current))
-                        (recur parent))))))
-            (next-preorder [zloc]
-              (or (nav/down zloc)
-                  (next-after-subtree zloc)))
-            (replace-once [expr-str]
-              (let [root     (nav/parse-root expr-str)
-                    expr-nav (nav/down root)
-                    body-nav (some-> expr-nav form-common/nav-body)]
-                (if body-nav
-                  (loop [current body-nav]
-                    (cond
-                      (nil? current)
-                      [expr-str false]
-
-                      (= from (nav/value current))
-                      [(-> current
-                           (nav/replace to)
-                           nav/root-string)
-                       true]
-
-                      :else
-                      (if-let [next (next-preorder current)]
-                        (recur next)
-                        [expr-str false])))
-                  [expr-str false])))]
-      (loop [out s]
-        (let [[next-out replaced?] (replace-once out)]
-          (if (and replaced?
-                   (not= out next-out))
-            (recur next-out)
-            next-out))))))
+    (letfn [(rewrite-postwalk [zloc]
+              (let [zloc (if-let [child (nav/down zloc)]
+                           (loop [parent zloc
+                                  child child]
+                             (if child
+                               (let [child'  (rewrite-postwalk child)
+                                     next    (nav/right child')
+                                     parent' (nav/up child')]
+                                 (recur parent' next))
+                               parent))
+                           zloc)]
+                (if (= from (nav/value zloc))
+                  (nav/replace zloc to)
+                  zloc)))]
+      (let [root     (nav/parse-root s)
+            expr-nav (nav/down root)
+            body-nav (some-> expr-nav form-common/nav-body)]
+        (if body-nav
+          (-> body-nav
+              rewrite-postwalk
+              nav/root-string)
+          s)))))
 
 (defn- apply-item-transform-string
   [s entry item lang]

src/lib/redis/bench.clj

@@ -2,7 +2,6 @@
   (:require [clojure.string]
             [std.fs :as fs]
             [std.json :as json]
-            [hara.lang :as l]
             [std.lib.collection :as collection]
             [std.lib.env :as env]
             [std.lib.foundation :as f]

test-lang/xt/db/instance_test.clj

@@ -86,6 +86,7 @@
 ^{:refer xt.db.instance/remove-trigger :added "4.1"}
 (fact "removes triggers from the db map"
 
+  ^{:seedgen/base {:lua {:expect (l/as-lua [{"id" "watch"} nil])}}}
   (!.js
    (var db {:triggers {"watch" {:id "watch"}}})
    [(instance/remove-trigger db "watch")
@@ -106,6 +107,7 @@
 ^{:refer xt.db.instance/db-create :added "4.1"}
 (fact "creates db wrappers with handlers and throttle state"
 
+  ^{:seedgen/base {:lua {:expect (l/as-lua ["db.create" "instance-a" [] {} true true true "test"])}}}
   (!.js
    (xt/x:set-key instance/IMPL
                  "db.create"
@@ -129,6 +131,7 @@
 ^{:refer xt.db.instance/queue-event :added "4.1"}
 (fact "queues events and hands them to the throttle"
 
+  ^{:seedgen/base {:lua {:expect (l/as-lua [1 42 []])}}}
   (!.js
    (var db {:events []
             :throttle (th/throttle-create