Add aliases for bundle/module - issue #1486

info.jdn -> bundle/info.jdn
bundle.janet -> bundle/init.janet

test/helper.janet

@@ -7,21 +7,31 @@
 
 (def is-verbose (os/getenv "VERBOSE"))
 
-(defn assert
+(defn- assert-no-tail
   "Override's the default assert with some nice error handling."
   [x &opt e]
   (default e "assert error")
   (++ num-tests-run)
   (when x (++ num-tests-passed))
   (def str (string e))
-  (def frame (last (debug/stack (fiber/current))))
+  (def stack (debug/stack (fiber/current)))
+  (def frame (last stack))
   (def line-info (string/format "%s:%d"
                               (frame :source) (frame :source-line)))
   (if x
     (when is-verbose (eprintf "\e[32m✔\e[0m %s: %s: %v" line-info (describe e) x))
-    (do (eprintf "\e[31m✘\e[0m %s: %s: %v" line-info (describe e) x) (eflush)))
+    (do
+      (eprintf "\e[31m✘\e[0m %s: %s: %v" line-info (describe e) x) (eflush)))
   x)
 
+(defmacro assert
+  [x &opt e]
+  (def xx (gensym))
+  ~(do
+     (def ,xx ,x)
+     (,assert-no-tail ,xx ,e)
+     ,xx))
+
 (defmacro assert-error
   [msg & forms]
   (def errsym (keyword (gensym)))

test/suite-bundle.janet

@@ -23,6 +23,8 @@
 
 (assert true) # smoke test
 
+# Testing here is stateful since we are manipulating the filesystem.
+
 # Copy since not exposed in boot.janet
 (defn- bundle-rpath
   [path]
@@ -100,6 +102,13 @@
 (assert-error "cannot uninstall sample-dep1, breaks dependent bundles @[\"sample-bundle\"]"
               (bundle/uninstall "sample-dep1"))
 
+# Check bundle file aliases
+(assert-no-error "sample-bundle-aliases install" (bundle/install "./examples/sample-bundle-aliases"))
+(assert (= 4 (length (bundle/list))) "bundles are listed correctly 5")
+(assert-no-error "import aliases" (import aliases-mod))
+(assert (deep= (range 12) (aliases-mod/fun 12)) "using sample-bundle-aliases")
+(assert-no-error "aliases uninstall" (bundle/uninstall "sample-bundle-aliases"))
+
 # Now re-install sample-bundle as auto-remove
 (assert-no-error "sample-bundle install" (bundle/reinstall "sample-bundle" :auto-remove true))