@naanlang/naan 1.0.6 → 1.0.8

package/LICENSE.md

@@ -1,6 +1,6 @@
-Naan for NPM version 1.0.6-2 is released under the MIT License:
+**Naan for NPM** version **1.0.8+1** is released under the MIT License:
 
-Copyright (c) 2017-2022 Zulch Laboratories, Inc.
+Copyright (c) 2017-2023 Zulch Laboratories, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,5 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -4,8 +4,8 @@
 Naan is an async-first software platform for rapid development.
 
 #### Release:
-     Naan for NPM version 1.0.6-2
-     Copyright (c) 2017-2022 Zulch Laboratories, Inc.
+     **Naan for NPM** version **1.0.8+1**
+     Copyright (c) 2017-2023 Zulch Laboratories, Inc.
 
 #### Features
 - **Naan** runs in NodeJS and web browsers using JavaScript
@@ -52,6 +52,24 @@ Naan prints the results of evaluating each expression with the REPL, but not
 by default with an expression or source file. The interactive flag overrides
 this to print the result of each expression in all cases.
 
+##### Example shell commands
+
+Define a function, call it, and return the length of the base-10 result. First recursive and then tail recursive:
+
+```
+% naan -e "function fact(x){if x>0 x*fact(x-1) else 1}(1000).length"
+2568
+% naan -e "function factr(x,a){if x>0 factr(x-1,x*a) else a}(10000,1).length"
+35660
+```
+Fetch your public IP from a website (NodeJS version 18 or later):
+
+```
+% naan -e "new(await(await(js.g.fetch('http://ip.jsontest.com/')).1.json()).1)"
+{ ip: "64.201.122.183" }
+```
+
+
 ##### Shell scripting
 
 When installed globally, Naan can be used for shell scripts with the [Shebang](https://en.wikipedia.org/wiki/Shebang_(Unix))

package/bin/index.js

@@ -58,11 +58,11 @@ process.argv.every((val, index) => {
         return (true);
     }
     if (val == "--version") {
-        console.log("1.0.6");
+        console.log("1.0.8");
         process.exit(0);
     }
     if (val == "--buildno") {
-        console.log("1.0.6-2");
+        console.log("1.0.8+1");
         process.exit(0);
     }
     if (val.substring(0,1) == "-") {

package/dist/env_web.js

@@ -309,13 +309,75 @@ exports.NaanControllerWeb = function() {
     //
     
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
-        if (window.location.href.startsWith(url_origin)) {
+        if (vsiteName && window.location.href.startsWith(url_origin)) {
             window.location.reload();                                       // we have changed underneath
+            window.scroll(0,0);                                             // Chrome 106 had flood pants 🤓
             return (true);
         }
         return (false);
     };
 
+    //==========================================================================
+    // Browser Console Terminal
+    //--------------------------------------------------------------------------
+    
+    // Commands:
+    //      Naanlang.debug(<text>)          -- command line text entry
+    //      Naanlang.int()                  -- interrupt and enter debugger
+    //      Naanlang.detach()               -- close the console terminal
+
+    var conDebTerm;
+
+    //
+    // ConsoleDebugTerminal
+    //
+    function ConsoleDebugTerminal() {
+        var termSelf = this;
+        //
+        // OnMessageOut
+        //
+        this.OnMessage = function OnMessage(msg) {
+            if (msg.id == "debugtext")
+                console.log("dbug-" + msg.level + " " + msg.text);
+            else if (msg.id == "textout")
+                console.log(msg.text);
+        };
+        //
+        // cmd
+        //
+        this.cmd = function cmd(keys) {
+            keys = keys.trim();
+            contSelf.Return(keys + "\n", termSelf);
+            return (keys);
+        };
+        //
+        // int
+        //
+        this.int = function int() {
+            contSelf.Interrupt();
+        };
+    }
+    
+    //
+    // debug
+    //
+    function debug(text) {
+        if (!conDebTerm) {
+            conDebTerm = new ConsoleDebugTerminal();
+            contSelf.Attach(conDebTerm);
+        }
+        exports.debug = conDebTerm.cmd;
+        exports.int = conDebTerm.int;
+        exports.detach = function() {
+            contSelf.Detach(conDebTerm);
+            exports.debug = debug;
+            exports.int = undefined;
+            exports.detach = undefined;
+            conDebTerm = false;
+        };
+        return (conDebTerm.cmd(text));
+    }
+    exports.debug = debug;
 
     //==========================================================================
     // Clone Debug Interface
@@ -528,26 +590,34 @@ exports.NaanControllerWeb = function() {
     }
         
     function virtualOpen() {
-        vsiteName = window.document.title;                                  // consistent name at open and close
-        if (window.opener && window.opener.Naanlang)
-            window.opener.Naanlang.naancon.DispatchMessage({
-                op: "VsiteOpen",
-                name: vsiteName,
-                naancont: contSelf,
-                title: vsiteName + " $Version$"
-            });
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                vsiteName = window.document.title;                          // consistent name at open and close
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteOpen",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " $Version$"
+                });
+            }
+        } catch (e) {
+        }
     }
     
     function virtualClose() {
-        if (window.opener && window.opener.Naanlang) {
-            window.opener.Naanlang.naancon.DispatchMessage({
-                op: "VsiteClose",
-                name: vsiteName,
-                naancont: contSelf,
-                title: vsiteName + " $Version$"
-            });
-            termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteClose",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " $Version$"
+                });
+                termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+            }
+        } catch (e) {
         }
+        vsiteName = false;                                                  // window is going away
     }
 
     /*jshint sub:true */
@@ -556,7 +626,10 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '"' + ');;\r\n'
+            cmd: 'App.version = "$Version$";;\r\n'
+                + 'App.cache = "$CacheBuster$";;\r\n'
+                + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
+                + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });
     } else {
         if (!replstate) {                                                   // saved state but never opened a terminal