@naanlang/naan 1.0.3 → 1.0.6

package/LICENSE.md

@@ -1,4 +1,4 @@
-Naan for NPM version 1.0.3-1 is released under the MIT License:
+Naan for NPM version 1.0.6-2 is released under the MIT License:
 
 Copyright (c) 2017-2022 Zulch Laboratories, Inc.
 

package/README.md

@@ -4,7 +4,7 @@
 Naan is an async-first software platform for rapid development.
 
 #### Release:
-     Naan for NPM version 1.0.3-1
+     Naan for NPM version 1.0.6-2
      Copyright (c) 2017-2022 Zulch Laboratories, Inc.
 
 #### Features
@@ -23,7 +23,7 @@ Naan is an async-first software platform for rapid development.
 
 #### Installation
 
-Please ensure you have a recent version of [node.js](http://nodejs.org/)
+Please ensure you have a recent version of [node.js](http://nodejs.org/). The minimum is `v14.14.0`
 
 For use everywhere as a command line app:
 
@@ -42,11 +42,11 @@ It can also evaluate an expression or execute a source file.
 
 ##### Command line usage
 
-    -h, --help                  print usage information
     -e <expression>             evaluate an expression
     -i, --interactive           use REPL with -e or [source file]
-    -v, --version               print Naan version
-    -vv                         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
 by default with an expression or source file. The interactive flag overrides
@@ -64,10 +64,12 @@ Now make it executable with chmod:
 
     chmod a+x helloworld
 
+#### For More Information
 
+[NaanIDE](https://www.npmjs.com/package/@naanlang/naanide) -- the Naan IDE -- includes more detailed documentation on Naan.
 
 #### 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

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

package/dist/env_web.js

@@ -74,14 +74,17 @@ exports.NaanControllerWeb = function() {
     //
  
     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
     exports.naancon = this;                                                 // access to this instance
     contSelf.anaan = naanlib.js.n;
     naanlib.js.t = contSelf;
+    naanlib.js.q = querystrings;
     var replstate;                                                          // latest known state of the REPL
     var naanstate;                                                          // desired state for the interpreter
     var replqueue;                                                          // text destined for terminal when opened
     var termlist = [];                                                      // list of terminals currently attached
+    contSelf.termlist = termlist;
     var prefs = { };
     var vsiteName;
 
@@ -306,8 +309,11 @@ exports.NaanControllerWeb = function() {
     //
     
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
-        if (window.location.href.startsWith(url_origin))
+        if (window.location.href.startsWith(url_origin)) {
             window.location.reload();                                       // we have changed underneath
+            return (true);
+        }
+        return (false);
     };
 
 
@@ -411,6 +417,16 @@ exports.NaanControllerWeb = function() {
     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");
  
@@ -474,6 +490,10 @@ exports.NaanControllerWeb = function() {
  
     function saveLocal() {
         /*jshint sub:true */
+        if (dontSaveUntilWorking) {                                         // saved state is problematic
+            localStorage.removeItem("NaanState_Hosted");
+            return (false);
+        }
         if (querystrings["nosave"])
             return (false);
         var statedoc = makeState();
@@ -497,6 +517,7 @@ exports.NaanControllerWeb = function() {
             if ("localStorage" in window && window["localStorage"] !== null)
             {
                 var statestr = localStorage.getItem("NaanState_Hosted");
+                dontSaveUntilWorking = true;
                 if (statestr)
                     return (loadState(JSON.parse(statestr)));
             }
@@ -512,7 +533,8 @@ exports.NaanControllerWeb = function() {
             window.opener.Naanlang.naancon.DispatchMessage({
                 op: "VsiteOpen",
                 name: vsiteName,
-                naancont: contSelf
+                naancont: contSelf,
+                title: vsiteName + " $Version$"
             });
     }
     
@@ -521,7 +543,8 @@ exports.NaanControllerWeb = function() {
             window.opener.Naanlang.naancon.DispatchMessage({
                 op: "VsiteClose",
                 name: vsiteName,
-                naancont: contSelf
+                naancont: contSelf,
+                title: vsiteName + " $Version$"
             });
             termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
         }
@@ -540,9 +563,10 @@ exports.NaanControllerWeb = function() {
             naanlib.banner();
             naanlib.textLine("print();;\n");
         }
-        naanlib.start({
-            state: naanstate
-        });
+        if (!naanlib.start({ state: naanstate })) {                         // state loading failed
+            localStorage.removeItem("NaanState_Hosted");
+            window.location.reload();
+        }
     }
 
     if (window.opener) {