@naanlang/naan 1.4.0 → 1.4.2

package/LICENSE.md

@@ -1,4 +1,4 @@
-**Naan for NPM** version **1.4.0+1** is released under the MIT License:
+**NaaN for NPM** version **1.4.2+1** is released under the MIT License:
 
 Copyright (c) 2017-2024 Zulch Laboratories, Inc.
 

package/README.md

@@ -1,14 +1,14 @@
-**Naan**™
+**NaaN**™
 -----
 
-Naan is an async-first software platform for rapid development.
+NaaN is an async-first software platform for rapid development.
 
 #### Release:
-     **Naan for NPM** version **1.4.0+1**  
+     **NaaN for NPM** version **1.4.2+1**  
      Copyright (c) 2017-2024 Zulch Laboratories, Inc.
 
 #### Features
-- **Naan** runs in NodeJS and web browsers using JavaScript
+- **NaaN** runs in NodeJS and web browsers using JavaScript
 - Based on an asynchronous LISP-2 engine with persistent execution
 - The default **Lingo**™ surface language provides familiar Algol-style braces syntax
 - Fiber-based concurrent execution without async or await declarations
@@ -37,18 +37,18 @@ For use as a library in the current project:
 
     naan [options] [source file] [arguments]
 
-With no arguments Naan runs as an interactive REPL using the node.js terminal.  
+With no arguments NaaN runs as an interactive REPL using the node.js terminal.  
 It can also evaluate an expression or execute a source file.
 
 ##### Command line usage
 
     -e <expression>             evaluate an expression
     -i, --interactive           use REPL with -e or [source file]
-    --version                   print Naan version
-    --buildno                   print Naan version with build number
+    --version                   print NaaN version
+    --buildno                   print NaaN version with build number
     -h, --help                  print usage information
 
-Naan prints the results of evaluating each expression with the REPL, but not
+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.
 
@@ -72,7 +72,7 @@ Fetch your public IP from a website (NodeJS version 18 or later):
 
 ##### Shell scripting
 
-When installed globally, Naan can be used for shell scripts with the [Shebang](https://en.wikipedia.org/wiki/Shebang_(Unix))
+When installed globally, NaaN can be used for shell scripts with the [Shebang](https://en.wikipedia.org/wiki/Shebang_(Unix))
 mechanism. For example, copy the following text to a file named helloworld:
 
     #!/usr/bin/env naan
@@ -89,7 +89,7 @@ The [NaanIDE](https://www.npmjs.com/package/@naanlang/naanide) installation incl
 Please email [Richard Zulch](mailto:naanlang@zulchlabs.com) with questions and comments.
 
 #### Dependencies:
-We gratefully acknowledge these software packages used with Naan:  
+We gratefully acknowledge these software packages used with NaaN:  
 - [jszip.js](http://stuartk.com/jszip) - read and write zip files  
 - [NodeJS-path](https://nodejs.org/) - NodeJS path utilities  
 - [PouchDB](https://pouchdb.com/) - synchronizing database  

package/bin/index.js

@@ -7,20 +7,24 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2024 by Richard C. Zulch
  *
  */
 
 "use strict";
 
 /*
- * imports
+ * imports & environment
  *
  */
 
 var path = require("path");
 var fs = require("fs");
 var naanOptions = {};
+var jspath = require("path");
+var naanpath = path.join(__dirname, "..");                                  // path to naan, which is us
+var rootpath = naanpath;                                                    // path to us, which is naan
+var envpath = jspath.resolve(naanpath, 'lib/env_node.js');                  // path to Naan loader
 
 /*
  * Process command-line arguments
@@ -30,7 +34,12 @@ var naanOptions = {};
 var cmd_file;
 var eval_text;
 var do_interactive;
-var cmd_text = "nodeparse('node_repl_init.nlg');;\n";
+var cmd_text = ""
+    + `App.naanpath = '${ naanpath.replace(/\\/g, "\\\\") }';;\n`           // path/to/our naan library
+    + `App.rootpath = '${ rootpath.replace(/\\/g, "\\\\") }';;\n`           // path/to/our package.json
+    + "Naan.module.defineLoc('naanlib', App.naanpath);;\n"                  // defines "naanlib:" prefix for require
+    + "nodeparse('lib/node_repl_init.nlg');;\n"                             // REPL utility functions
+    + "App.shell = require('naanlib:frameworks/node/shell.nlg').ShellConnect({ cwd: js.d });;\n";
 
 process.argv.every((val, index) => {
     if (index < 2)
@@ -58,11 +67,11 @@ process.argv.every((val, index) => {
         return (true);
     }
     if (val == "--version") {
-        console.log("1.4.0");
+        console.log("1.4.2");
         process.exit(0);
     }
     if (val == "--buildno") {
-        console.log("1.4.0+1");
+        console.log("1.4.2+1");
         process.exit(0);
     }
     if (val.substring(0,1) == "-") {
@@ -97,10 +106,10 @@ if (eval_text) {
     naanOptions.noWelcome = true;
     if (!do_interactive)
         naanOptions.replDisable = true;
-    cmd_text =
+    cmd_text = cmd_text.concat(
         "closure NodeREPL(local input, error, expr) {\n" +
 
-        (do_interactive ?  "" :
+        (do_interactive ? "" :
         "   sudo(putproc(`exception, false))\n") +
 
         "   input = new(textstream, js.expr)\n" +
@@ -114,15 +123,16 @@ if (eval_text) {
         "           } else\n" +
 
         (cmd_file && !do_interactive ?
-	    "		        eval(expr)\n" :
+	    "		        $(evalactive(expr))\n" :
 
         "           {\n" +
-        "               if input.tokenlast().atom == `;;\n" +
-        "                   eval(expr)\n" +
+        "               $(evalactive(expr))\n" +
+        "               if input.tokenlast().atom == `;; || $ === Naan.local.mu\n" +
+        "                   { }\n" +
         "               else if input.tokenlast().atom == `;>\n" +
-        "                   printline(eval(expr))\n" +
+        "                   printline($)\n" +
         "               else\n" +
-        "                   printline(Dialect.print(eval(expr)))\n" +
+        "                   printline(Dialect.print($))\n" +
         "           }\n") +
 
         "       }\n" +
@@ -138,7 +148,7 @@ if (eval_text) {
         "       exec(quote(js.g.process.exit(if error 1 else 0)))\n") +
 
         "   }\n" +
-        "}();;\n";
+        "}();;\n");
 } else if (!process.stdin.isTTY) {
     console.log("naan: nothing specified and no TTY; exiting");
     process.exit(1);
@@ -150,9 +160,9 @@ if (eval_text) {
  *
  */
 
-var NaanNodeREPL = require('../lib/env_node.js');
+var NaanNodeREPL = require(envpath);
 var naanrepl = new NaanNodeREPL(naanOptions);
-naanrepl.setDirectory(path.join(__dirname, "../lib"));
+naanrepl.setDirectory(rootpath);
 if (eval_text)
     naanrepl.setGlobal("expr", eval_text + "\n");
 naanrepl.textCommand(cmd_text);

package/dist/env_web.js

@@ -34,7 +34,7 @@ exports.NaanControllerWeb = function() {
     "use strict";
     /*jshint -W024 */
     var undefined;                                                          // JavaScript should make this a keyword
- 
+
     //
     // Persistent
     //
@@ -43,17 +43,11 @@ exports.NaanControllerWeb = function() {
         kStateFirstVersion = 200,                                           // increment when losing backwards compatbility
         kStateCurrentVersion = 200;                                         // increment when adding features
 
- 
+
     //
     // Environment
     //
-  
-    var pageLoading = true;                                                 // assume we are loading the page
 
-    window.addEventListener("load", function (e) {
-        pageLoading = false;
-    });
- 
     var querystrings = (function(a) {
         if (a === "") return {};
         var b = {};
@@ -67,12 +61,12 @@ exports.NaanControllerWeb = function() {
         }
         return b;
     })(window.location.search.substr(1).split('&'));
-   
-   
+
+
     //
     // Initialization
     //
- 
+
     var naanlib = new exports.Naanlib();
     var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
     var contSelf = this;                                                    // this is us, for access within nested functions
@@ -129,7 +123,7 @@ exports.NaanControllerWeb = function() {
     //
     // Read any pending Naan output and send to terminal.
     //
- 
+
     function takePending() {
         var outputq = replqueue;
         replqueue = false;
@@ -145,13 +139,13 @@ exports.NaanControllerWeb = function() {
     //==========================================================================
     // New Terminal Interface
     //--------------------------------------------------------------------------
-               
+
     //
     // StateGet
     //
     // Report the saved state we are keeping for the terminal.
     //
-    
+
     this.StateGet = function StateGet() {
         termlist.every(function(term) {
             var state;
@@ -170,20 +164,20 @@ exports.NaanControllerWeb = function() {
     //
     // Attach a terminal to our interpreter and immediately start sending it messages.
     //
-    
+
     this.Attach = function Attach(terminal) {
         var repdex = termlist.indexOf(terminal);
         if (repdex < 0)
             termlist.push(terminal);
         takePending();                                                      // output all pending terminal messages
     };
-    
+
     //
     // Detach
     //
     // Detach the terminal from the interpreter.
     //
-    
+
     this.Detach = function Detach(terminal) {
         var repdex = termlist.indexOf(terminal);
         if (repdex >= 0)
@@ -191,17 +185,17 @@ exports.NaanControllerWeb = function() {
         if (termlist.length === 0)
             replstate = terminal.StateSave();                               // save ultimate repl state
     };
-    
+
     //
     // Interrupt
     //
     // Interrupt the interpreter in response to a user request.
     //
-    
+
     this.Interrupt = function Interrupt(terminal) {
-        window.setTimeout(function () {
+        Promise.resolve().then(function () {
             naanlib.escape();
-        }, 0);
+        });
     };
 
     //
@@ -209,7 +203,7 @@ exports.NaanControllerWeb = function() {
     //
     // Enter line of text to instance.
     //
-    
+
     this.Return = function Return(text, terminal) {
         termlist.forEach(function(term) {
             if (term !== terminal)
@@ -240,13 +234,13 @@ exports.NaanControllerWeb = function() {
         });
         return (data);
     };
-    
+
     var nideListener;
     this.OnMessage = function OnMessage(proc) {
         nideListener = proc;
         return (proc);
     };
-    
+
     this.DispatchMessage = function DispatchMessage(data) {                 // "local" -> "remote"
         if (nideListener)
             setTimeout(function() {
@@ -267,7 +261,7 @@ exports.NaanControllerWeb = function() {
         debugListener = proc;
         return (proc);
     };
-    
+
     this.DispatchDebugger = function DispatchDebugger(data) {               // "local" -> "remote"
         if (debugListener)
             setTimeout(function() {
@@ -280,7 +274,7 @@ exports.NaanControllerWeb = function() {
     //
     // Report status to the terminal.
     //
-    
+
     setInterval(function() {
         var samples = naanlib.status(1);
         if (samples.length > 0)
@@ -297,29 +291,30 @@ exports.NaanControllerWeb = function() {
     //
     // Enter keystroke to instance.
     //
-    
+
     this.Keystroke = function Keystroke(text, keycode) {
         console.log("Naan keystroke mode not implemented");
     };
-    
+
     //
     // Dimensions
     //
     // Report terminal dimensions to instance.
     //
-    
+
     this.Dimensions = function Dimensions(rows, cols) {
         console.log("Naan terminal dimensions now (" + rows + ", " + cols + ")");
     };
-    
+
     //
     // VsiteRefresh
     //
     // Check if our underlying data has changed, and reload if needed.
     //
-    
+
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
         if (vsiteName && window.location.href.startsWith(url_origin)) {
+            virtualClose();
             window.location.reload();                                       // we have changed underneath
             window.scroll(0,0);                                             // Chrome 106 had flood pants 🤓
             return (true);
@@ -330,7 +325,7 @@ exports.NaanControllerWeb = function() {
     //==========================================================================
     // Browser Console Terminal
     //--------------------------------------------------------------------------
-    
+
     // Commands:
     //      Naanlang.debug(<text>)          -- command line text entry
     //      Naanlang.int()                  -- interrupt and enter debugger
@@ -373,7 +368,7 @@ exports.NaanControllerWeb = function() {
             return (false);
         };
     }
-    
+
     //
     // debug
     //
@@ -429,7 +424,7 @@ exports.NaanControllerWeb = function() {
                     debugListener(msg.data);                                // target received a message
             }
         });
-        
+
         //
         // report messages back to opener
         //
@@ -437,7 +432,7 @@ exports.NaanControllerWeb = function() {
             window.opener.postMessage(msg, window.origin);
             return (msg);
         };
-                
+
         //
         // report messages back to opener
         //
@@ -459,7 +454,7 @@ exports.NaanControllerWeb = function() {
             };
             return (termSelf.OnMessage(msg));
         };
-        
+
         //
         // report status back to opener
         //
@@ -471,64 +466,47 @@ exports.NaanControllerWeb = function() {
             return (termSelf.OnMessage(msg));
         };
     }
- 
+
     //==========================================================================
     // Host Environment
     //--------------------------------------------------------------------------
- 
+
     //
     // SavePref
     //
     // Save a persistent preference object that can be retrieved in the future.
     //
-    
+
     this.SavePref = function SavePref(key, value) {
         return (prefs[key] = value);
     };
- 
+
     //
     // LoadPref
     //
     // Load a previously-saved preference object for future retrieval.
     //
-    
+
     this.LoadPref = function LoadPref(key) {
         return (prefs[key]);
     };
-    
+
     //
     // Working
     //
     // The application is working, so it is safe to save state.
     //
-    
+
     this.Working = function Working() {
         dontSaveUntilWorking = false;
     };
- 
-    var saveEvent = new Event("NaanSave");
- 
-    window.document.addEventListener("visibilitychange", function (e) {
-        if (window.document.visibilityState != "hidden")
-            return;
-        window.dispatchEvent(saveEvent);
-        saveLocal();
-    });
 
-    window.addEventListener("pagehide", function (e) {
-        window.dispatchEvent(saveEvent);
-        saveLocal();
-    });
-  
-    window.addEventListener("unload", function (e) {
-        window.dispatchEvent(saveEvent);
-        saveLocal();
-        virtualClose();
-    });
- 
-    window.addEventListener("beforeunload", function (e) {
-        window.dispatchEvent(saveEvent);
-        saveLocal();
+    window.document.addEventListener("visibilitychange", function (e) {
+        virtualVisibilityChange();
+        if (window.document.visibilityState == "hidden") {
+            window.dispatchEvent(new Event("NaanSave"));
+            saveLocal();
+        }
     });
 
     function makeState() {
@@ -548,24 +526,24 @@ exports.NaanControllerWeb = function() {
             statedoc.replstate = replstate;
         return (statedoc);
     }
- 
+
     function loadState(statedoc) {
         if (statedoc===undefined || statedoc.naan === undefined
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "$Licensee$"
-            || statedoc.verstring != "$Version$")
+            || statedoc.verstring != "$Version$"
+            || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
         }
-        naanstate = statedoc.naan;
         replstate = statedoc.replstate;                                     // get terminal state, if any
         if (typeof(statedoc.prefs) == "object")
             prefs = statedoc.prefs;
         return (true);
     }
- 
+
     function saveLocal() {
         /*jshint sub:true */
         if (dontSaveUntilWorking) {                                         // saved state is problematic
@@ -588,7 +566,7 @@ exports.NaanControllerWeb = function() {
         }
         return (false);
     }
-  
+
     function loadLocal() {
         try {
             /*jshint sub:true */
@@ -604,7 +582,7 @@ exports.NaanControllerWeb = function() {
         }
         return (false);
     }
-        
+
     function virtualOpen() {
         try {
             if (window.opener && window.opener.Naanlang) {
@@ -619,7 +597,7 @@ exports.NaanControllerWeb = function() {
         } catch (e) {
         }
     }
-    
+
     function virtualClose() {
         try {
             if (window.opener && window.opener.Naanlang) {
@@ -636,6 +614,22 @@ exports.NaanControllerWeb = function() {
         vsiteName = false;                                                  // window is going away
     }
 
+    function virtualVisibilityChange() {
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteVisibilityChange",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " $Version$",
+                    hidden: window.document.visibilityState == "hidden",
+                    window: window
+                });
+            }
+        } catch (e) {
+        }
+    }
+
     /*jshint sub:true */
     if (querystrings["restart"] || !loadLocal())
     {                                                                       // don't load state or can't load state
@@ -656,6 +650,7 @@ exports.NaanControllerWeb = function() {
             localStorage.removeItem("NaanState_Hosted");
             window.location.reload();
         }
+        naanstate = false;                                                  // reclaim memory
     }
 
     if (window.opener) {