@naanlang/naan 1.0.14 → 1.0.16

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.14+1";
+var CurrentCacheName = "Naanlang-1.0.16+1";
 
 
 //
@@ -92,18 +92,18 @@ var terminated;                                 // flag that this service worker
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.14+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.14+1") {
+        console.log("[1.0.16+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.16+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.0.14+1] update pending for", sourceId);
+                console.log("[1.0.16+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.0.14+1"
+                    version: "1.0.16+1"
                 });
-                console.log("[1.0.14+1] update sent for:", sourceId);
+                console.log("[1.0.16+1] update sent for:", sourceId);
             }
         }
         Reaper();                                                           // clean up obsolete info
@@ -134,10 +134,10 @@ var terminated;                                 // flag that this service worker
         msgport.onmessage = function(msg) {
             msg = msg.data;
             if (msg.id == "skipWaiting") {                                  // try to activate this SW now
-                console.log("[1.0.14+1] attempting skipWaiting");
+                console.log("[1.0.16+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.0.14+1] terminated");
+                console.log("[1.0.16+1] terminated");
                 terminate();
             } else if (msg.id == "abortURL") {                              // abort an I/O transaction
                 var href = new URL(msg.url).href;
@@ -150,7 +150,7 @@ var terminated;                                 // flag that this service worker
             } else if (msg.id == "response")                                // response from fetch request
                 processResponse(msg);
             else if (msg.id == "text")                                      // just log some text
-                console.log("[1.0.14+1] msg received:", msg.text);
+                console.log("[1.0.16+1] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -161,7 +161,7 @@ var terminated;                                 // flag that this service worker
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.14+1",
+                text: "port received by 1.0.16+1",
             });
             */
         if (--pending === 0)
@@ -178,7 +178,7 @@ var terminated;                                 // flag that this service worker
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.14+1] requesting new msgport for", client.id);
+            console.log("[1.0.16+1] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -224,12 +224,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.14+1] source gone:", sourceId);
+                console.log("[1.0.16+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.14+1] client gone:", clientId);
+                console.log("[1.0.16+1] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -263,16 +263,16 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.14+1] deleting old cache:', cacheName);
+                        console.log('[1.0.16+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.14+1] claiming clients');
+            console.log('[1.0.16+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.0.14+1] clients claimed');
+            console.log('[1.0.16+1] clients claimed');
             return (Promise.resolve(true));
         });
     return (promise);
@@ -315,7 +315,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.14+1",
+                version: "1.0.16+1",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -363,7 +363,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.14+1] install");
+    console.log("[1.0.16+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.14+1] activate");
+    console.log("[1.0.16+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.14+1] matching clients:', urls.join(', '));
+        console.log('[1.0.16+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches().then(function() {
         for (var sourceId in upgradeMsgPorts) {
             upgradeMsgPorts[sourceId].postMessage({                         // notify new version available
                 id: "upgrade",
-                version: "1.0.14+1"
+                version: "1.0.16+1"
             });
         }
         upgradeMsgPorts = false;
@@ -421,7 +421,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(request.url);
             var nocache = request.method != "GET"
-                || url.search.length !== 0 && url.searchParams.get("naanver") !== "3551208545a0b7d226925e1a7a47bc6d"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "b2535090f4e111466794eea676c7d7aa"
                 || request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -454,7 +454,7 @@ self.addEventListener('fetch', function(event) {
                             statusText: "Request Cancelled"
                         }));
                     }
-                    console.log("[1.0.14+1] fetch failed", request.url, e);
+                    console.log("[1.0.16+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/terminals.nlg

@@ -393,7 +393,10 @@ closure TermLocal(track, name, workerID, options,
     
     listener.addEventListener("message", function(e, msg) {
         msg = new(e.data)
-        if msg.id != "targetout" && msg.id != "loaded" {
+        if msg.id == "termination" {
+            destroy()
+            return }
+        else if msg.id != "targetout" && msg.id != "loaded" {
             if msg.id == "status"
                 target.lastStatus = milliseconds()
             if target.msgQueue {

package/frameworks/project/build.nlg

@@ -58,7 +58,7 @@
  *      @           - the @ character stands in for a persistent, temporary directory within the
  *                    build folder that replaces srcpath or destpath. It can be used in fields that
  *                    are otherwise absolute: group.input, group.output, and template paths. Build
- *                    detects piplines formed from temporary files and processes them in order from
+ *                    detects pipelines formed from temporary files and processes them in order from
  *                    beginning to end.
  *
  * Templates:
@@ -83,7 +83,7 @@
  *      jspack      - convert to Naan JavaScript format
  *      syntax      - syntax check and copy
  *      catenate    - copy multiple input files into a single output file
- *      zip         - compressed catenate
+ *      zip         - compressed catenate (binary if only task, otherwise text mode)
  *
  * Dictionary structure:
  *      {
@@ -159,7 +159,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     }
     build.solotasks = {                                                     // solo-only tasks
         copy: true,
-        unzip: true
+        unzip: true,
     }
 
     if rules.licfile
@@ -725,6 +725,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     return
                 }
                 entry = {
+                    tasks: group.tasks
                     readpath: infile,
                     writepath: outfile
                 }
@@ -960,10 +961,12 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
         closure processOneFile(entry, local result, content, error) {
             ++pending.active
-            future(function build1(local dirpath) {
+            future(function build1(local dirpath, readOptions) {
                 if entry.depends
                     entry.depends.done.wait()                               // wait for our precursor
                 dirpath = JSpath.dirname(entry.writepath)
+                if entry.zip && entry.tasks.length == 1
+                    readOptions = { encoding: "binary" }                    // just zip--no text processing
                 if baddestpaths[dirpath]
                     { }                                                     // error already reported
                 else if ((`(error, result) = fs.mkdir(dirpath)) && error) {
@@ -983,7 +986,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     if error                                                // deepcopy returns a list of errors
                         error = error.0                                     // but we're only doing one item
                 }
-                else if ((`(error, content) = fs.readFile(entry.readpath)) && !error) {
+                else if ((`(error, content) = fs.readFile(entry.readpath, readOptions)) && !error) {
                     if entry.license
                         `(content) = applySubstitutions(content, licFileDefs)
                     if entry.version

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.14+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.16+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/frameworks/running/debugnub.nlg

@@ -62,7 +62,7 @@ closure DebugNub(local nub, debug, paused) {
             paused.wait = false                                             // false: go back to ndb
         }
         else if msg.op == "pause"
-            future(function(){ debugger() }, 1)                             // enter at convenient time
+            debugger()
         else if msg.op == "resume" || msg.op == "stop"
             || msg.op == "stepover" || msg.op == "stepinto" || msg.op == "stepout"
             paused.wait = msg.op

package/lib/browser/env_web.js

@@ -201,7 +201,7 @@ exports.NaanControllerWeb = function() {
     this.Interrupt = function Interrupt(terminal) {
         window.setTimeout(function () {
             naanlib.escape();
-        }, 1);
+        }, 0);
     };
 
     //
@@ -526,7 +526,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.14+1";
+        statedoc.verstring = "1.0.16+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -544,7 +544,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.14+1")
+            || statedoc.verstring != "1.0.16+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -603,7 +603,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.14+1"
+                    title: vsiteName + " 1.0.16+1"
                 });
             }
         } catch (e) {
@@ -617,7 +617,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.14+1"
+                    title: vsiteName + " 1.0.16+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -632,8 +632,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.14+1";;\r\n'
-                + 'App.cache = "7d35a97d7bea57c619edd042aaf5b648";;\r\n'
+            cmd: 'App.version = "1.0.16+1";;\r\n'
+                + 'App.cache = "268effa64ff3abbb3b2387089c918818";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });

package/lib/browser/env_webworker.js

@@ -114,6 +114,15 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
         return (name);
     };
 
+    targSelf.Terminate = function Terminate(result) {
+        postMessage({                                                       // terminate this worker from worker
+            id: "termination",
+            result: result
+        });
+        close();
+        return (result);
+    };
+
     onmessage = function(e) {
         var msg = e.data;
         if (msg.id == "interrupt")