@naanlang/naan 1.7.1 → 1.7.2

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.7.1+1";
+var CurrentCacheName = "Naanlang-1.7.2+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.7.1+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.7.1+1") {
+        console.log("[1.7.2+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.7.2+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.7.1+1] update pending for", sourceId);
+                console.log("[1.7.2+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.7.1+1"
+                    version: "1.7.2+1"
                 });
-                console.log("[1.7.1+1] update sent for:", sourceId);
+                console.log("[1.7.2+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.7.1+1] attempting skipWaiting");
+                console.log("[1.7.2+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.7.1+1] terminated");
+                console.log("[1.7.2+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.7.1+1] msg received:", msg.text);
+                console.log("[1.7.2+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.7.1+1",
+                text: "port received by 1.7.2+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.7.1+1] requesting new msgport for", client.id);
+            console.log("[1.7.2+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.7.1+1] source gone:", sourceId);
+                console.log("[1.7.2+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.7.1+1] client gone:", clientId);
+                console.log("[1.7.2+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.7.1+1] deleting old cache:', cacheName);
+                        console.log('[1.7.2+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.7.1+1] claiming clients');
+            console.log('[1.7.2+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.7.1+1] clients claimed');
+            console.log('[1.7.2+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.7.1+1",
+                version: "1.7.2+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.7.1+1] install");
+    console.log("[1.7.2+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.7.1+1] activate");
+    console.log("[1.7.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.7.1+1] matching clients:', urls.join(', '));
+        console.log('[1.7.2+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.7.1+1"
+                version: "1.7.2+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") !== "11fc8cf71f476b67053e1a89d5956596"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "3bf8aca91851d612b349539bfba24f9c"
                 || request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -455,7 +455,7 @@ self.addEventListener('fetch', function(event) {
                             statusText: "Request Cancelled"
                         }));
                     }
-                    console.log("[1.7.1+1] fetch failed", request.url, e);
+                    console.log("[1.7.2+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/workers.nlg

@@ -151,7 +151,18 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
             message: "opened"
         })
     }
-    
+
+    // update
+    //
+    // Go get the latest version of the service worker and update if changed.
+    //
+    serv.update = closure update(local err, reg) {
+        `(err, reg) = await(serv.reg.update())
+        if err
+            return (list(Error("service worker update failed", err)))
+        list(false, reg)
+    }
+
     // reload
     //
     // If a sevice worker is waiting, then terminate the old one and activate the new one -- which

package/frameworks/project/build.nlg

@@ -426,6 +426,16 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         result
     }
 
+    //
+    // init1
+    //
+    // Initialize a build worker.
+    //
+
+    function init1() {
+        require("../common").LiveImport()
+    }
+
     //
     // parseAndPack1
     //
@@ -434,7 +444,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     // autoquoted to itself, a symbol. This can be used to detect build time vs. runtime.
     
     function parseAndPack1(text, fpath, options, operation,
-        local util, lib, penv, naansym, dlogsym, pmod, pcomp, ournn, output, textout, annerror, annotations, package)
+        local util, lib, modid, penv, naansym, dlogsym, pmod, pcomp, ournn,
+            output, textout, annotations, package)
     {
         //
         // textline
@@ -453,6 +464,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         lib = Naan.module.modlist().Lib.exports
         if !util || !lib
             return (list("Build packager cannot access support functions"))
+        modid = JSpath.basename(JSpath.dirname(fpath))
         //
         // The following crazy rigmarole is about customizing the ParsEnvironment so we can glean
         // enough information to build a package without actually executing the code. To do this we
@@ -469,7 +481,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         pcomp = { }                                                         // our component object
         ournn.module = {
             build: function(modname, compname, proc) {
-                pmod.id = module.id
+                pmod.id = modid
                 pmod.exports = { }
                 pcomp.name = compname
                 call(proc, pmod, pcomp)                                     // obtain manifest
@@ -513,23 +525,39 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         //
         textout = ""
         try {
-            if !pcomp.name
-                annerror = "Component required to build package"
-            else if output.errors.length > 0
-                annerror = output.errors[0]
-            annotations = output.annotations
-            if annotations {
-                if annotations.length == 0 {                                // empty annotations list
-                    if annerror
-                        annotations = [{                                    // first error becomes annotation
-                            row: 0
-                            column: 0
-                            text: annerror
-                            type: "error"
-                        }]
-                    else
-                        annotations = false }                               // no errors or annotations
+            if output.annotations.length == 0 && output.errors.length == 0
+                && (options.naanpack || options.jspack) {                   // actually building a package
+                if !pcomp.name {
+                    //
+                    // Some components cannot use a build function because they are too early in the
+                    // boot process, but we still need a component. We look for NaanBuildComponent
+                    // to define a dictionary with filename, name and manifest fields. For example,
+                    // see Util:Module.nlg
+                    //
+                    pcomp = penv.evalq(car(compress(NaanBuildComponent)))
+                    if !pcomp || !fpath.endsWith("/".concat(pcomp.filename))
+                        output.errors.push("Build cannot package without component, use NaanBuildComponent?")
+                }
+                if output.errors.length == 0 {
+                    package = util.pkgSave(compress(pcomp.name), pcomp.manifest)
+                    if string(package) {
+                        output.errors.push("Build cannot generate package: ".concat(package))
+                        package = false
+                    }
+                }
             }
+
+            annotations = output.annotations
+            if annotations.length == 0 {                                    // empty annotations list
+                if output.errors.length > 0
+                    annotations.push({                                      // first error becomes annotation
+                        row: 0
+                        column: 0
+                        text: output.errors[0]
+                        type: "error"
+                    })
+                else
+                    annotations = false }                                   // no errors or annotations
             if output.errors.length > 0 || output.text.length > 0 {
                 textline("-".repeat(79))
                 textline("While processing ", fpath)
@@ -548,22 +576,6 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
             //
             // Build the package, if not just doing syntax checking
             //
-            if options.naanpack || options.jspack {                         // actually building a package?
-                if !pcomp.name {
-                    //
-                    // Some components cannot use a build function because they are too early in the
-                    // boot process, but we still need a component. We look for NaanBuildComponent
-                    // to define a dictionary with filename, name and manifest fields. For example,
-                    // see Util:Module.nlg
-                    //
-                    pcomp = penv.evalq(car(compress(NaanBuildComponent)))
-                    if !pcomp || !fpath.endsWith("/".concat(pcomp.filename))
-                        return (list("Build cannot package without component in ".concat(fpath), false, annotations, textout))
-                }
-                package = util.pkgSave(compress(pcomp.name), pcomp.manifest)
-                if string(package)
-                    return (list("Build cannot generate package for ".concat(fpath), false, annotations, textout))
-            }
         } catch {
             if true
                 return (list("Packaging exception in ".concat(fpath, ": ", tostring(exception)), false, annotations, textout))
@@ -593,7 +605,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         if !build.parallel
             build.parallel = ExecutorParallel(track, {                      // create worker pool
                 basename: "build"
-                initeval: `(false, (parseAndPack1))
+                initeval: list(quote(init1()), `(init1, parseAndPack1))
             })
         result = build.parallel.rpc(parseAndPack1, list(text, fpath, options, operation))
         if !result.0 {

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.7.1+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.7.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

@@ -624,7 +624,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.7.1+1";
+        statedoc.verstring = "1.7.2+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -642,7 +642,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.7.1+1"
+            || statedoc.verstring != "1.7.2+1"
             || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
@@ -705,7 +705,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.1+1"
+                    title: vsiteName + " 1.7.2+1"
                 });
             }
         } catch (e) {
@@ -719,7 +719,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.1+1"
+                    title: vsiteName + " 1.7.2+1"
                 });
             }
         } catch (e) {
@@ -734,7 +734,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteVisibilityChange",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.1+1",
+                    title: vsiteName + " 1.7.2+1",
                     hidden: window.document.visibilityState == "hidden",
                     window: window
                 });
@@ -749,8 +749,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = window.location.origin.concat(naanlib.js.r("path").dirname(window.location.pathname));
         naanlib.start({
-            cmd: 'App.version = "1.7.1+1";;\r\n'
-                + 'App.cache = "b173565c63a43f623fb769868912eb9d";;\r\n'
+            cmd: 'App.version = "1.7.2+1";;\r\n'
+                + 'App.cache = "9e8f87aa915943862be39d701927fbd1";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });