@naanlang/naan 1.0.5 → 1.0.6

package/LICENSE.md

@@ -1,4 +1,4 @@
-Naan for NPM version 1.0.5-2 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.5-2
+     Naan for NPM version 1.0.6-2
      Copyright (c) 2017-2022 Zulch Laboratories, Inc.
 
 #### Features

package/bin/index.js

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

package/dist/env_web.js

@@ -309,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);
     };
 
 

package/dist/naan.min.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.5-2 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/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.5-2";
+var CurrentCacheName = "Naanlang-1.0.6-2";
 
 
 //
@@ -89,11 +89,11 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.5-2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.5-2")
+        console.log("[1.0.6-2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.6-2")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.5-2"
+                version: "1.0.6-2"
             });
         Reaper();                                                           // clean up obsolete info
         
@@ -107,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.5-2] msg received:", msg.text);
+                console.log("[1.0.6-2] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -118,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.5-2",
+                text: "port received by 1.0.6-2",
             });
             */
         if (--pending === 0)
@@ -135,7 +135,7 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.5-2] requesting new msgport for", client.id);
+            console.log("[1.0.6-2] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -181,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.5-2] source gone:", sourceId);
+                console.log("[1.0.6-2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.5-2] client gone:", clientId);
+                console.log("[1.0.6-2] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -220,13 +220,13 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.5-2] deleting old cache:', cacheName);
+                        console.log('[1.0.6-2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.5-2] claiming clients');
+            console.log('[1.0.6-2] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -269,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.5-2",
+                version: "1.0.6-2",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -317,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.5-2] install");
+    console.log("[1.0.6-2] install");
     self.skipWaiting();
 });
 
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.5-2] fetch failed", e);
+                    console.log("[1.0.6-2] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -385,14 +385,14 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.5-2] activate");
+    console.log("[1.0.6-2] 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.5-2] matching clients:', urls.join(', '));
+        console.log('[1.0.6-2] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/client/apiclient.nlg

@@ -37,7 +37,7 @@ closure MakeNideAPIclient(url, guid, local client) {
         request.addEventListener("error", function reqFailed(event, local errtext) {
             if request.status == 0
                 errtext = "connectivity"
-            ellse
+            else
                 errtext = "request failed"
             error = Error(errtext, {
                 status: request.status

package/frameworks/client/psm_client.nlg

@@ -136,10 +136,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // readLines
     //
     // Read a lines of a file at the specified path with options:
-    //      matchRE:        -- JavaScript regex
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
+    //      matchRE:                            -- JavaScript regex
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
     // When using a matchRE, the return value is an array of [ lineNumber, text ] pairs if
     // returnText is specified, or just an array of one-based line numbers otherwise.
     //
@@ -288,6 +288,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Search the specified file or recursive directory.
     
     view.dirSearch = function dirSearch(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "dirSearch", options, false, callback)
     }
 
@@ -357,6 +361,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Grep the specified file or recursive directory.
     
     view.grepLines = function grepLines(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "grepLines", options, false, callback)
     }
 

package/frameworks/common/common.nlg

@@ -373,10 +373,17 @@ function comrInit(local manifest) {
                     result
             }
             //
-            // DecodeBase64url - decode base64url to original string
+            // EncodeBase64url - decode base64url to original string
             // See https://en.wikipedia.org/wiki/Base64 for details on variants
             //
-            DecodeBase64url = function decodeBase64url(base64url, local padding) {
+            EncodeBase64url = function encodeBase64url(data) {
+                data = EncodeBase64(data)
+                data.replace(RegExp("[+]", "g"), '-').replace(RegExp("/", "g"), '_')
+            }
+            //
+            // DecodeBase64url - decode base64url to original string
+            //
+            DecodeBase64url = function decodeBase64url(base64url) {
                 base64url = base64url.replace(RegExp("-", "g"), '+').replace(RegExp("_", "g"), '/')
                 DecodeBase64(base64url)
             }
@@ -526,6 +533,7 @@ function comrInit(local manifest) {
             modobj.exports.JsonStringify = JsonStringify
             modobj.exports.JsonParse = JsonParse
             modobj.exports.Uint8ArrayFromString = Uint8ArrayFromString
+            modobj.exports.EncodeBase64url = EncodeBase64url
             modobj.exports.DecodeBase64url = DecodeBase64url
             modobj.exports.HashMD5 = HashMD5
             modobj.exports.HashMD5_base64 = HashMD5_base64

package/frameworks/node/apiserver.nlg

@@ -171,8 +171,8 @@ closure MakeAPI(port, options, callback, local chroot, server) {
             res.status(403).send("unauthorized")
         timeoutms = toint(req.query.timeout)
         after = toint(req.query.after)
-        if not integer(timeoutms) or timeoutms > 10000
-            res.status(400).send("timeout is integer milliseconds no greater than 10000")
+        if not integer(timeoutms) or timeoutms > 7200000
+            res.status(400).send("timeout is integer milliseconds no greater than 7200000")
         else if not integer(after)
             res.status(400).send("after must be an integer")
         else {

package/frameworks/node/filesystem.nlg

@@ -181,11 +181,11 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // readLines
     //
     // Read the contents of a file into an array of lines with the following options:
-    //      pattern:        -- only return lines matching pattern
-    //      fixed           -- pattern is a fixed string, not a regular expression
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
+    //      pattern:                            -- only return lines matching pattern
+    //      fixed                               -- pattern is a fixed string, not a regular expression
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
     //
 
     files.readLines = closure readLines(path, options, callback,
@@ -748,21 +748,31 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // dirSearch
     //
     // Search the files in a directory for a pattern.
-    
+    //
+    // Most options are handled by readLines, but the following is done here:
+    //      excludeDirs: [dirnames]             -- exclude the specified directory names
+
     files.dirSearch = closure dirSearch(path, options, callback,
-        local error, localpaths, output) {
+        local error, localpaths, dexmatch, item, output) {
         if !callback
             return (syncAdapter(dirSearch, path, options))
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
+        if options.excludeDirs.0 {                                          // match all provided paths
+            dexmatch = []
+            for item in options.excludeDirs                                 // escape all special characters
+                dexmatch.push(item.replace(RegExp("[^A-Za-z0-9-_\n]","g"), "\\$&"))
+            dexmatch = RegExp(dexmatch.join("|"))
+        }
         output = []
         debuglog("dirSearch begins", localpath)
         asyncArray(localpaths, 10, closure(localpath, index, elements, local error, direnum, node, lines, line) {
             `(error, direnum) = dirList(localpath, { })
             if direnum.children
                 for node in direnum.children
-                    localpaths.push(JSpath.join(localpath, node.name))    // more files or directories to examine
+                    if !dexmatch || !node.name.match(dexmatch)
+                        localpaths.push(JSpath.join(localpath, node.name))  // more files or directories to examine
             else {
                `(error, lines) = readLines(localpath, options)
                if error && localpaths.length == 1 {
@@ -986,22 +996,29 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //
     // Return an array of text matches in a file or recursive directory of files with the following
     // options:
-    //      pattern:        -- pattern to find
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
-    //      maxCount:       -- integer maximum number of results (default 10,000)
+    //      pattern:                            -- pattern to find
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
+    //      excludeDirs: [dirnames]             -- exclude the specified directory names
+    //      maxCount:                           -- integer maximum number of results (default 10,000)
     // grep-specific options:
-    //      ignoreBinary:   -- ignore binary files
+    //      ignoreBinary:                       -- ignore binary files
     //
     files.grepLines = closure grepLines(path, options, callback,
-        local error, localpath, cmdargs, execOptions, grep, result, lineRE, maxcount) {
+        local error, localpath, cmdargs, item, execOptions, grep, result, lineRE, maxcount) {
         if !callback
             return (syncAdapter(grepLines, path, options))
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
         cmdargs = ["-rn"]                                                   // recursively search directories for files; report line numbers
+        if options.excludeDirs.0 {                                          // exclude a directory
+            for item in options.excludeDirs {
+                cmdargs.push("--exclude-dir")
+                cmdargs.push(item)
+            }
+        }
         if options.ignoreCase
             cmdargs.push("-i")
         if options.invert

package/frameworks/node/psm_server.nlg

@@ -204,6 +204,7 @@ closure psmsFsView(rootpath, local view, gitter) {
                 
         // op: dirSearch
         function dirSearchApi() {
+            req.query.excludeDirs = JSONparse(req.query.excludeDirs)
             res.send(new(array, view.dirSearch(path, req.query)))
         }
 
@@ -239,6 +240,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         
         // op: grepLines
         function grepLinesApi() {
+            req.query.excludeDirs = JSONparse(req.query.excludeDirs)
             res.send(new(array, view.grepLines(path, req.query)))
         }
         
@@ -289,8 +291,15 @@ closure psmsFsView(rootpath, local view, gitter) {
             gitLog:         gitLogApi
             gitShowFile:    gitShowFileApi
         }[req.query.op]
-        if proc
-            proc()
+        if proc {
+            try {
+                proc()
+            } catch {
+                if true {
+                    res.status(400).send("psm op failed: ".concat(req.query.op, ": ", exception))
+                }
+            }
+        }
         else
             res.status(400).send("invalid psm op: ".concat(req.query.op))
     }

package/frameworks/project/build.nlg

@@ -1024,13 +1024,14 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //      } ... ]
     //  }
     //
-    build.make = closure make(debugMake, local sink, xchan, entry, outext, error) {
+    build.make = closure make(options, local sink, xchan, entry, outext, error) {
         sink = new(textstream, "", `string)                                 // log all output
         xchan = textstreams(list(sink, sink))
         try {
             resetlist()
-            analyze(debugMake)
-            if debugMake {
+            analyze(options.debugMake)
+            if options.debugMake {
+                printline("Debugging make for ", options.buildnum, "-", options.stage)
                 if build.errorlist.length == 0 {
                     printline("build operations (", build.filelist.length, ") for ", operation)
                     for entry in build.filelist
@@ -1052,6 +1053,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
             "\ndate: ", Date(),
             "\nfrom: ", JSpath.join(fs.rootpath, build.srcpath),
             "\n  to: ", build.destpath,
+            "\ntype: ", options.stage,
+            "\nvers: ", options.buildnum,
             "\n", sink.taketext())
         `(error) = fs.writeFile(JSpath.join(build.destpath, "build_log.txt"), outext)
         if error
@@ -1153,14 +1156,17 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // build.refresh
     //
-    // Refresh after updating the v-site. This should probably update all types of executions. ###
+    // Refresh after updating the v-site, returning true iff an existing vsite was found.
     //
-    build.refresh = function refresh(track local main, url_origin) {
+    build.refresh = function refresh(track local main, url_origin, found) {
         if build.runway."v-site" {
             url_origin = js.w.location.origin.concat("/run", build.runway."v-site")
-            for target in track.enumlist()
-                target.vsiteRefresh(url_origin)
+            for target in track.enumlist() {
+                if target.vsiteRefresh(url_origin)
+                    found = true
+            }
         }
+        found
     }
 
     //

package/frameworks/project/projects.nlg

@@ -296,7 +296,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.5-1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.6-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
@@ -326,6 +326,7 @@ proj_cliserConfigFile = "nide_cliser.cfg";
 closure projConfig(projman, where, projID, local procon, fs, configpath) {
     procon = new(object, this)
     procon.name = where.name
+    procon.dirName = proj_configDataFolder.slice(0,-1)                      // remove terminal "/"
     if projID
         procon.localID = projID.concat("-data")
     
@@ -547,6 +548,17 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         stage
     }
 
+    // setCurrentStage
+    //
+    //     Set the current stage.
+    //
+    procon.setCurrentStage = function setCurrentStage(stage) {
+        if member(stage, stages()) {
+            procon.localDict.currentStage = stage
+            update()                                                        // ### errors here are never reported
+        }
+    }
+
     // buildrules
     //
     //     Get the build rules for the named stage.
@@ -595,11 +607,14 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             ErrorDebuglog("build number increment failed", error)
             return (list(error))
         }
-        `(error) = builder.make()
+        `(error) = builder.make({
+            stage: stage
+            buildnum: buildnum
+        })
         if !error {
-            if buildonly
-                builder.refresh(projman.track)
-            else
+            if builder.refresh(projman.track)
+                buildonly = !buildonly                                      // reverse if refresh
+            if !buildonly
                 `(error) = builder.run(projman.track)
         }
         builder.destroy()

package/frameworks/running/executors.nlg

@@ -438,7 +438,6 @@ closure ExecutorTracker(local xtrak) {
     // Notify watchers of an update on an execution instance.
 
     xtrak.update = closure update(executor) {
-        debuglog("xtrack.update", executor.title)
         notify({ updated: [executor] })
     }
     

package/lib/browser/env_web.js

@@ -309,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);
     };
 
 
@@ -455,7 +458,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.5-1";
+        statedoc.verstring = "1.0.6-1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -473,7 +476,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.5-1")
+            || statedoc.verstring != "1.0.6-1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -531,7 +534,7 @@ exports.NaanControllerWeb = function() {
                 op: "VsiteOpen",
                 name: vsiteName,
                 naancont: contSelf,
-                title: vsiteName + " 1.0.5-1"
+                title: vsiteName + " 1.0.6-1"
             });
     }
     
@@ -541,7 +544,7 @@ exports.NaanControllerWeb = function() {
                 op: "VsiteClose",
                 name: vsiteName,
                 naancont: contSelf,
-                title: vsiteName + " 1.0.5-1"
+                title: vsiteName + " 1.0.6-1"
             });
             termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
         }

package/lib/core/naanlib.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.5-2 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/package.json

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

package/plugins/serviceAws/aws_dynamo.nlg

@@ -338,7 +338,7 @@ closure DynaConverter(local conv) {
             adef = datumNaanToDyn(expr)
             atype = keys(adef).0
             for `(key, data) in params.ExpressionAttributeValues
-                if data[atype] == adef[atype]
+                if defined(data, atype) && data[atype] == adef[atype]
                     return (key)                                            // found matching attribute
             key = ":v".concat(adex++)
             params.ExpressionAttributeValues[key] = adef