@naanlang/naan 1.0.1 → 1.0.2

package/LICENSE.md

@@ -1,4 +1,4 @@
-Naan for NPM version 1.0.1-2 is released under the MIT License:
+Naan for NPM version 1.0.2-1 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.1-2
+     Naan for NPM version 1.0.2-1
      Copyright (c) 2017-2022 Zulch Laboratories, Inc.
 
 #### Features
@@ -17,7 +17,7 @@ Naan is an async-first software platform for rapid development.
 - Preserves referential integrity when communicating among workers or hosts
 - Plugin architecture enables alternate languages and functionality
 - Custom language syntax can be added through simplified dialect extensions
-- Integrates transparently with all exising JavaScript libraries
+- Integrates transparently with all existing JavaScript libraries
 - Can save and reload running program state across page loads or lambda invocations
 - Lightweight and efficient
 
@@ -67,7 +67,7 @@ Now make it executable with chmod:
 
 
 #### Dependencies:
-     We greatfully acknowlege 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

@@ -32,50 +32,53 @@ var eval_text;
 var do_interactive;
 var cmd_text = "nodeparse('node_repl_init.nlg');;\n";
 
-process.argv.forEach((val, index) => {
+process.argv.every((val, index) => {
     if (index < 2)
-        return;
+        return (true);
     if (val == "-e") {
         eval_text = 1;
-        return;
+        return (true);
     }
+    if (eval_text == 1 && val.substring(0,1) == "-")
+        return (false);
     if (val == "-h" || val == "--help") {
         console.log(
             "Usage: naan [options] [source file] [arguments]\n\n" +
             "Options:\n" +
             "  -e <expression>      evaluate an expression\n" +
             "  -i, --interactive    use REPL with -e or [source file]\n" +
-            "  -v, --version        print the Naan version\n" +
-            "  -vv                  print the version and build\n"
+            "  --version            print the Naan version\n" +
+            "  --buildno            print the version and build\n" +
+            "  -h, --help           print this usage information\n"
         );
         process.exit(0);
     }
     if (val == "-i" || val == "--interactive") {
         do_interactive = true;
-        return;
+        return (true);
     }
-    if (val == "-v" || val == "--version") {
-        console.log("1.0.1");
+    if (val == "--version") {
+        console.log("1.0.2");
         process.exit(0);
     }
-    if (val == "-vv") {
-        console.log("1.0.1-2");
+    if (val == "--buildno") {
+        console.log("1.0.2-1");
         process.exit(0);
     }
     if (val.substring(0,1) == "-") {
         console.log("naan: bad option: " + val);
         process.exit(9);
     }
-    if (eval_text) {
-        if (eval_text == 1)
-            eval_text = val + '\n';
-        return;
+    if (eval_text == 1) {
+        eval_text = val + '\n';
+        return (true);
     }
     if (!cmd_file) {
         cmd_file = val;
-        return;
+        return (true);
     }
     // ignore extra arguments
+    return (true);
 });
 
 if (eval_text == 1) {

package/dist/env_web.js

@@ -344,8 +344,8 @@ exports.NaanControllerWeb = function() {
         var statedoc = {};
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
-        statedoc.licensee = "$Licensee$";
-        statedoc.verstring = "$Version$";
+        statedoc.licensee = "Zulch Laboratories, Inc.";
+        statedoc.verstring = "1.0.2-1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(true);                            // true to optimize, which is a bit slower
@@ -362,8 +362,8 @@ exports.NaanControllerWeb = function() {
         if (statedoc===undefined || statedoc.naan === undefined
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
-            || statedoc.licensee != "$Licensee$"
-            || statedoc.verstring != "$Version$")
+            || statedoc.licensee != "Zulch Laboratories, Inc."
+            || statedoc.verstring != "1.0.2-1")
             return (false);
         naanstate = statedoc.naan;
         replstate = statedoc.replstate;                                     // get terminal state, if any

package/dist/naan.min.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.1-2 is released under the MIT License:
+ * Naan for NPM version 1.0.2-1 is released under the MIT License:
  * 
  * Copyright (c) 2017-2022 Zulch Laboratories, Inc.
  * 

package/frameworks/browser/sworker.js

@@ -10,7 +10,7 @@
  *
  */
 
-var CurrentCacheName = "Naan IDE 1.0.1-2"
+var CurrentCacheName = "Naan IDE 1.0.2-1"
 
 
 //
@@ -31,20 +31,20 @@ var msgport;
 
 var promiseport = new Promise(function (resolve, reject) {
     self.addEventListener('message', function(event) {
-        console.log("[1.0.1-2] port received");
+        console.log("[1.0.2-1] port received");
         msgport = event.data.hereIsYourPort;
         msgport.onmessage = function(msg) {
             msg = msg.data;
             if (msg.id == "response")
                 postResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.1-2] msg received:", msg.text);
+                console.log("[1.0.2-1] msg received:", msg.text);
         };
 /*
         // don't clutter the log
         msgport.postMessage({
             id: "text",
-            text: "port received by 1.0.1-2",
+            text: "port received by 1.0.2-1",
         });
 */
         resolve(msgport);
@@ -74,7 +74,7 @@ var promiseport = new Promise(function (resolve, reject) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.1-2] install");
+    console.log("[1.0.2-1] install");
     self.skipWaiting();
 });
 
@@ -103,14 +103,14 @@ self.addEventListener('fetch', function(event) {
                     promise = self.clients.matchAll({
                         includeUncontrolled: true
                     }).then(function(clientList) {
-                        console.log("[1.0.1-2] requesting new msgport");
+                        console.log("[1.0.2-1] requesting new msgport");
                         var urls = clientList.map(function(client) {
                             client.postMessage({                                // tell client(s) we need a fetch source
                                 msg: "Naan_need_fetch_port"
                             });
                             return (client.url);
                         });
-                        console.log('[1.0.1-2] matching clients:', urls.join(', '));
+                        console.log('[1.0.2-1] matching clients:', urls.join(', '));
                         return (promiseport);
                     });
                 }
@@ -128,14 +128,14 @@ self.addEventListener('fetch', function(event) {
                         msgport.postMessage({
                             id: "fetch",
                             seq: seqno,
-                            version: "1.0.1-2",
+                            version: "1.0.2-1",
                             request: {
                                 method: event.request.method,
                                 url: event.request.url
                             },
                         });
                     } else {
-                        console.log("[1.0.1-2] fetch has no msgport");
+                        console.log("[1.0.2-1] fetch has no msgport");
                         return (reject("fatal delegation error"));
                     }
                 }) });
@@ -165,26 +165,26 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.1-2] activate");
+    console.log("[1.0.2-1] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.0.1-2] matching clients:', urls.join(', '));
+        console.log('[1.0.2-1] matching clients:', urls.join(', '));
     });
     var promise = caches.keys().then(function(cacheNames) {                 // delete old cache entries
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName !== CurrentCacheName) {
-                        console.log('[1.0.1-2] deleting old cache:', cacheName);
+                        console.log('[1.0.2-1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.1-2] claiming clients for version', CurrentCacheName);
+            console.log('[1.0.2-1] claiming clients for version', CurrentCacheName);
             return (self.clients.claim());
         });
     if (event.waitUntil)

package/frameworks/client/psm_client.nlg

@@ -510,7 +510,7 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
             if creds == "HostFS"
                 api = connector.api
             else
-                `(error, api) = MakeNideAPIclient(creds.urlName)            // API to remote NodeJS filesystem
+                api = MakeNideAPIclient(creds.urlName)                      // API to remote NodeJS filesystem
         }
         if error
             list(error)

package/frameworks/project/projects.nlg

@@ -276,7 +276,7 @@ closure projConnector(projman, projtype, local connector, watch) {
  *
  * Nide.proj/
  *      nide_cliser.cfg                 - JSON definition of the project (see below)
- *      NaanIDE_version.txt             - [default] substitution file defining 1.0.1-2 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.2-1 etc.
  *      NaanIDE_version_builds.txt      - [default] contains current build number as decimal string
  *      build/                          - [optional] default build output location
  *      NaanIDE.lic                     - [optional] defines Zulch Laboratories, Inc. and other license info

package/lib/browser/env_web.js

@@ -345,7 +345,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.1-2";
+        statedoc.verstring = "1.0.2-1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(true);                            // true to optimize, which is a bit slower
@@ -363,7 +363,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.1-2")
+            || statedoc.verstring != "1.0.2-1")
             return (false);
         naanstate = statedoc.naan;
         replstate = statedoc.replstate;                                     // get terminal state, if any

package/lib/core/naanlib.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.1-2 is released under the MIT License:
+ * Naan for NPM version 1.0.2-1 is released under the MIT License:
  * 
  * Copyright (c) 2017-2022 Zulch Laboratories, Inc.
  * 

package/lib/env_node.js

@@ -44,6 +44,9 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     naanlib.js.t = this;                                                    // allow us to be accessed from Naan
     var termops;
     var outEnable = !options.replDisable;
+    var useConsoleOut = false;
+    if (outEnable && process.env["RUNKIT_ENDPOINT_URL"])
+        useConsoleOut = true;                                               // use console.log for output in RunKit
 
 
     //==========================================================================
@@ -131,7 +134,12 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
                 }, 1);
             }
         } else if (outEnable) {
-            process.stdout.write(text);
+            if (useConsoleOut) {                                            // stdout doesn't work
+                text = text.replace(/\r?\n$/, "");                          // console.log already does a newline
+                console.log(text);
+            }
+            else
+                process.stdout.write(text);
             textToRemoteTerm(text);
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",