@naanlang/naan 1.0.6 → 1.0.7

package/frameworks/browser/browser.nlg

@@ -11,6 +11,64 @@
  */
 
 
+/*
+ * FileReader
+ *
+ *     Read file(s) from the browser's host machine. This is passed a File object and returns a
+ * nearly-standard (error, blob, size) tuple. If progress is specified then this function is called
+ * with a percentage of completion from zero to 100 if available, or true otherwise. The progress
+ * callback is called with "false" when completed, with or without success
+ *
+ */
+
+closure FileReader(file, progress, local pending, freader, result) {
+    pending = new(nonce)
+    freader = xnew(window.FileReader)
+    freader.addEventListener("load", function(event, local blob) {
+        blob = xnew(window.Blob, [freader.result], {
+            type: file.type
+        })
+        pending.signal(list(false, blob, event.total))
+    })
+    freader.addEventListener("error", function(error) {
+        pending.signal(list(error))
+    })
+    freader.AddEventListener("progress", function(event) {
+        if event.lengthComputable && event.total
+            progress(toint((event.loaded * 100) / event.total))
+        else
+            progress(true)
+    })
+    freader.readAsArrayBuffer(file)
+    result = pending.wait()
+    progress(false)
+    result
+};
+
+
+/*
+ * FileDownload
+ *
+ *     Download a file from the browser, returning a standard error tuple.
+ *
+ */
+
+closure FileDownload(file, progress, local error, blob, sizez, url, link) {
+    `(error, blob, size) = FileReader(file, progress)
+    if error
+        list(error)
+    else {
+        url = window.URL.createObjectURL(blob)
+        link = document.createElement("a")
+        link.href = url
+        link.download = file.name
+        link.click()
+        window.URL.revokeObjectURL(url)
+        list(false, file.name)
+    }
+};
+
+
 /*
  * brorInit
  *
@@ -20,11 +78,18 @@
  */
 
 function brorInit(local manifest) {
-    manifest = `(brorInit)
+    manifest = `(FileReader, FileDownload, brorInit)
 
     Naan.module.build(module.id, "browser", function(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
-        runningExecutors = require("../running/executors.nlg")
+        modobj.exports.FileReader = FileReader
+        modobj.exports.FileDownload = FileDownload
+
+        function brorReload() {
+            window = js.w
+            document = window.document
+        }()
+        module.reload = brorReload
     })
 } ();

package/frameworks/browser/https_request.nlg

@@ -72,7 +72,7 @@ closure HttpsApiRequest(url, options,
     //
     // perform the fetch and return when complete
     //
-    `(error, response) = await(js.w.fetch(urlq, fetchOptions))
+    `(error, response) = await(window.fetch(urlq, fetchOptions))
     if error
         return (list(Error("HttpsApiRequest fetch failed:", error, url)))
     contentType = response.headers.get("content-type")
@@ -113,7 +113,7 @@ function https_browserInit(local manifest) {
     manifest = `(HttpsApiRequest, https_browserInit)
 
     Naan.module.build(module.id, "https_request", function(modobj, compobj) {
-        require("./browser.nlg")
+        require("browser.nlg")
         compobj.manifest = manifest
         modobj.exports.HttpsApiRequest = HttpsApiRequest
     })

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.6-2";
+var CurrentCacheName = "Naanlang-1.0.7+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.6-2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.6-2")
+        console.log("[1.0.7+2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.7+2")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.6-2"
+                version: "1.0.7+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.6-2] msg received:", msg.text);
+                console.log("[1.0.7+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.6-2",
+                text: "port received by 1.0.7+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.6-2] requesting new msgport for", client.id);
+            console.log("[1.0.7+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.6-2] source gone:", sourceId);
+                console.log("[1.0.7+2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.6-2] client gone:", clientId);
+                console.log("[1.0.7+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.6-2] deleting old cache:', cacheName);
+                        console.log('[1.0.7+2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.6-2] claiming clients');
+            console.log('[1.0.7+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.6-2",
+                version: "1.0.7+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.6-2] install");
+    console.log("[1.0.7+2] install");
     self.skipWaiting();
 });
 
@@ -339,7 +339,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(event.request.url);
             var nocache = event.request.method != "GET"
-                || url.search.length !== 0
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "cb-1.0.7+2"
                 || event.request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.6-2] fetch failed", e);
+                    console.log("[1.0.7+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.6-2] activate");
+    console.log("[1.0.7+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.6-2] matching clients:', urls.join(', '));
+        console.log('[1.0.7+2] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -21,7 +21,7 @@
 closure TermHost(track, api, name, workerID, options,
     local target, nlregex, clientID, serverID)
 {
-    target = runningExecutors.ExecutorBase(track, "Host", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Host", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
     nlregex = RegExp("\\n", "g")
@@ -35,7 +35,7 @@ closure TermHost(track, api, name, workerID, options,
     closure connect(local pending) {
         if target.ws
             return
-        target.ws = xnew(js.w.WebSocket,"ws://".concat(js.w.location.host)) // ### use api parameter
+        target.ws = xnew(window.WebSocket,"ws://".concat(window.location.host)) // ### use api parameter
         pending = new(nonce)
     
         // onopen
@@ -52,7 +52,7 @@ closure TermHost(track, api, name, workerID, options,
         
         target.ws.onmessage = function onmessage(e, message, local msg) {
             try {
-                message = new(js.w.JSON.parse(e.data))
+                message = new(window.JSON.parse(e.data))
             } catch {
                 if true {
                     debuglog("can't decode incoming ws message:", exception)
@@ -169,7 +169,7 @@ closure TermHost(track, api, name, workerID, options,
     //     Send a message to the worker controller.
 
     target.sendControl = function sendControl(workerOp, payload) {
-        target.ws.send(js.w.JSON.stringify({
+        target.ws.send(window.JSON.stringify({
             guid: api.guid
             clientID: clientID
             serverID: serverID
@@ -368,23 +368,23 @@ closure TermLocal(track, name, workerID, options,
         options = new(options)
     else
         options = { }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     nlregex = RegExp("\\n", "g")
     target.workerID = workerID
     target.msgQueue = []
     if workerID == "NaanIDE-Debug" {
-        target.worker = js.w.open(js.w.location.href, "_blank")
+        target.worker = window.open(window.location.href, "_blank")
         target.worker.addEventListener("beforeunload", function(e) {        // our target is closing
             destroy()
         })
-        js.w.addEventListener("beforeunload", function(e) {                 // we are closing
+        window.addEventListener("beforeunload", function(e) {               // we are closing
             // ### tell target we are closing (if needed)
         })
-        listener = js.w
+        listener = window
     } else {
-        if not js.w.Worker
+        if not window.Worker
             return (list(Error("Local environment does not support workers")))
-        target.worker = xnew(js.w.Worker, "env_webworker.js")
+        target.worker = xnew(window.Worker, "env_webworker.js")
         listener = target.worker
     }
 
@@ -460,6 +460,8 @@ closure TermLocal(track, name, workerID, options,
             target.statusCB(target, msg.status)
         else if msg.id == "debugout"
             target.debugger.debugData(target, msg.data)
+        else if msg.id == "download"
+            FileDownload(xnew(window.File, msg.bits, msg.name, msg.options))
         else if msg.id == "loaded" {
             if !target.started
                 target.worker.postMessage({
@@ -610,7 +612,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         track.update(target)
         return (target)
     }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     target.name = name
     target.title = title
     target.workerID = workerID
@@ -778,7 +780,7 @@ closure termInstallVirtualWatcher(track, naancont) {
         }
     }
     
-    runningExecutors.TaskOnMessageHook(watchVsites)
+    require("../running/executors.nlg").TaskOnMessageHook(watchVsites)
 };
 
 

package/frameworks/browser/workers.nlg

@@ -29,7 +29,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
     closure updateReg(local mchan) {
         if !serv.sw
             return
-        mchan = xnew(js.w.MessageChannel)
+        mchan = xnew(window.MessageChannel)
         serv.msgport = mchan.port2
         serv.msgport.onmessage = workerMsg.proc
         serv.sw.postMessage({
@@ -112,13 +112,13 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
         serv.scope = scope
         if !scope
             return (makeResult(Error("service worker scope required")))
-        if !js.w.navigator.serviceWorker
+        if !window.navigator.serviceWorker
             return (makeResult(Error("service workers not supported")))
-        js.w.navigator.serviceWorker.addEventListener("message", function(event) {
+        window.navigator.serviceWorker.addEventListener("message", function(event) {
             if event.data.msg == "Naan_need_fetch_port"
                 updateReg()
         })
-        await(js.w.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
+        await(window.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
             return (reg.update())
         }).then(function (reg) {
             serv.reg = reg
@@ -211,7 +211,7 @@ closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
             }
             
             // read resource
-            filepath = xnew(js.w.URL, data.request.url).pathname
+            filepath = xnew(window.URL, data.request.url).pathname
             filepath = DecodeURIComponent(filepath)                         // "/run/<scope>/path..."
             filepath = filepath.slice(4)                                    // "/<scope>/path..."
             error = true                                                    // stays true iff not in scope
@@ -308,7 +308,7 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
     trope = findTrackedScope(track, scope)
     if trope
         return (list(false, trope))
-    trope = runningExecutors.ExecutorBase(track, "ServiceWorkers", scope)
+    trope = require("../running/executors.nlg").ExecutorBase(track, "ServiceWorkers", scope)
     serviceWorker.register(scope, closure(filepath, scope, init,
         local options, mimeType, error, data) {
         mimeType = {

package/frameworks/common/common.nlg

@@ -143,7 +143,7 @@ function JsonStringify(data) {
 jsScripts = { };                                                            // script values become false on reload
  
 function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
-    if jsScripts[jsScripts]
+    if jsScripts[libpath]
         return                                                              // already loaded
     if libpath.startsWith("/")
         fpath = libpath
@@ -155,10 +155,10 @@ function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
-        scriptTag.src = js.w.location.origin.concat(fpath)
+        scriptTag.src = js.w.location.origin.concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
-            pending.signal(JSZipLib)
+            pending.signal(js.w[globalID])
             true
         }
         scriptTag.onerror = function (event) {
@@ -303,7 +303,8 @@ JSONparse = false;
 Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
-    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
+    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsonParse, JsonStringify, JsLoadScript,
+        LoadComponentOnDemand, LiveExport, comrInit)
 
     Naan.module.build(module.id, "common", closure(modobj, compobj) {
         compobj.manifest = manifest
@@ -418,7 +419,9 @@ function comrInit(local manifest) {
                 }
                 //
                 // MD5 functions
-                JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                if symbol(NideBuild) {                                      // execute if we are not building
+                    JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                }
                 //
                 // hasMD5 in hex
                 HashMD5 = function browserMD5(data, raw) {

package/frameworks/project/build.nlg

@@ -716,6 +716,10 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     entry.unzip = true
                     entry.writepath = outdirpath
                 }
+                if group.tasks.indexOf("catenate") >= 0
+                    entry.catenate = true
+                if group.tasks.indexOf("zip") >= 0
+                    entry.zip = true
                 if group.tasks.indexOf("naanpack") >= 0 || group.tasks.indexOf("jspack") >= 0 || group.tasks.indexOf("syntax") >= 0 {
                     let (inpar, outpar, extension) {                        // change extension for package output
                         inpar = JSpath.parse(infile)
@@ -740,12 +744,12 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                                 inpar.base = inpar.name.concat(extension)
                                 entry.insource = JSpath.format(inpar)
                             }
-                        } else
+                        } else if !entry.zip && !entry.catenate
                             entry.copy = true                               // fall back to copy
                     } ()
                 }
                 if group.tasks.indexOf("minimize") >= 0 {
-                    if infile.endsWith(".js") {
+                    if infile.endsWith(".js") || outfile.endsWith(".js") {
                         entry.minimize = true
                         if group.minprefix
                             entry.minprefix = group.minprefix               // use group minify prefix
@@ -753,10 +757,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                             entry.minprefix = build.minprefix               // use generic minify prefix
                     }
                 }
-                if group.tasks.indexOf("catenate") >= 0
-                    entry.catenate = true
-                if group.tasks.indexOf("zip") >= 0 {
-                    entry.zip = true
+                if entry.zip {
                     if !entry.writepath.toLowerCase().endsWith(".zip")
                         entry.writepath = entry.writepath.concat(".zip")    // always ends with .zip
                     outfile = entry.writepath
@@ -844,7 +845,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // checked and any that have all the parts are written out. Catenates that don't have all their
     // parts are reported as an error in addition to the error that caused them to be incomplete.
     //
-    closure execute(local error, entries, pending, licFileDefs, buildno, verFileDefs, baddestpaths, catenates) {
+    closure execute(local error, licFileDefs, buildno, verFileDefs, version, entries, pending, 
+            baddestpaths, catenates) {
         if build.tasks.license > 0
             `(error, licFileDefs) = readSubstitutionFile(build.licfilepath)
         if build.tasks.version > 0 {
@@ -858,6 +860,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
             `(error, verFileDefs) = readSubstitutionFile(build.verfilepath, {
                 BuildNumber: buildno
             })
+            build.version = verFileDefs["Version"]
+            verFileDefs["CacheBuster"] = HashMD5(build.version.concat(Math.random()))
         }
         if build.tasks.catenate > 0 || build.tasks.zip > 0 {
             build.templates = { }
@@ -962,7 +966,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
         let (writepath, template, entry, content, catsub, dozip, docat, fsoptions, zipmap, error, result) {
             for :out1 writepath in catenates {
-                template = build.templates[writepath]                       // optional
+                template = build.templates[writepath]                       // optional in some cases ### should warn in others
                 catsub = { }
                 for entry in catenates[writepath] {                         // error check and substitution build
                     if !entry.content {
@@ -1054,7 +1058,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
             "\nfrom: ", JSpath.join(fs.rootpath, build.srcpath),
             "\n  to: ", build.destpath,
             "\ntype: ", options.stage,
-            "\nvers: ", options.buildnum,
+            "\nvers: ", build.version,
             "\n", sink.taketext())
         `(error) = fs.writeFile(JSpath.join(build.destpath, "build_log.txt"), outext)
         if error

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.6-1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.7+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
@@ -408,7 +408,11 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             if error
                 debuglog("projConfig.writeConfig cannot write local storage:", ErrorString(error))
         }
-        `(error, data) = fs.writeFile(configpath, JSONstringify(procon.configDict))
+        if procon.configMD5 {                                               // don't overwrite existing file
+            data = HashMD5(JSONstringify(procon.configDict))                // ### it messes up the formatting and
+            error = false                                                   // is manually maintained anyway
+        } else
+            `(error, data) = fs.writeFile(configpath, JSONstringify(procon.configDict))
         if !error {
             procon.configMD5 = data
             `(error, info) = fs.info(configpath)
@@ -561,37 +565,44 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
 
     // buildrules
     //
-    //     Get the build rules for the named stage.
+    //     Get the build rules for the named stage, reloading the project configuration if changed.
     //
-    function buildrules(stage, local rules, common, rule, key) {
+    function buildrules(stage, local error, data, rules, common, rule, key) {
+        if !procon.loaded
+            return (list(Error("project not loaded")))
+        `(error, data) = procon.changed()
+        if error
+            return (list(error))
         rules = procon.configDict."build-rules"[stage]
         if !rules
             rules = procon.configDict.build                                 // fallback to old config structure
         rules = new(rules)
-        common = procon.configDict."build-common"
+        if !rules["no-common"]
+            common = procon.configDict."build-common"
         if common {
             for rule in common
                 if !rules[rule]
                     rules[rule] = common[rule]                              // common rule was not overridden
-                else if array(common[rule], rules[rule])
+                else if array(common[rule], rules[rule])                    // ### array only tests first argument 20220909 Rcz
                     rules[rule] = common[rule].concat(rules[rule])          // merge common array with rule
-                else if dictionary(common[rule], rules[rule]) {
+                else if dictionary(common[rule], rules[rule]) {             // ### dictionary only tests first argument 20220909 Rcz
                     for key in common[rule]                                 // merge common dictionary with rule
                         if !rules[rule][key]
                             rules[rule][key] = common[rule][key]
                 }
         }
-        rules
+        list(false, rules)
     }
 
     // run
     //
     //     Run the project by building and then launching.
     //
-    procon.run = closure run(stage, buildonly, local rules, builder, buildpath, error, buildnum) {
-        if !procon.loaded
-            return (list(Error("project not loaded")))
-        rules = buildrules(stage)
+    procon.run = closure run(stage, buildonly, 
+        local error, rules, builder, buildpath, error, buildnum) {
+        `(error, rules) = buildrules(stage)
+        if error
+            return (list(error))
         if !rules || !rules.products
             return (list(Error("build rules missing or incomplete")))
         buildpath = fs.path.join(proj_configDataFolder, rules.products)
@@ -628,13 +639,27 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //
     //     Publish the project to its configured location.
     //
-    procon.publish = closure publish(stage, local rules, where, publish, error, outfs, inpath) {
-        rules = buildrules(stage)
+    //  {
+    //      input: "tutorApp/www/"
+    //      sources: [""]
+    //      output: ""
+    //      cacheControl: "max-age=2592000"
+    //  }
+    //
+    procon.publish = closure publish(stage, 
+        local error, rules, where, publish, error, outOptions, outfs, inpath) {
+        `(error, rules) = buildrules(stage)
+        if error
+            return (list(error))
         publish = rules.publish
         where = procon.localDict.publish[stage].where
         if !rules || !where
             return (list(Error("no project publish location configured")))
-        `(error, outfs) = projman.locate.connect(where.locationID, "NideFS", where.path)
+        if publish.cacheControl
+            outOptions = {
+                cacheControl: publish.cacheControl
+            }
+        `(error, outfs) = projman.locate.connect(where.locationID, "NideFS", where.path, outOptions)
         if error
             return (list(Error("can't access publishing filesystem", error)))
         inpath = fs.path.join(proj_configDataFolder, rules.products, publish.input)
@@ -671,8 +696,8 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
  */
 
 function projInit(local manifest) {
-
-    manifest = `(ProjectManager, projTracker, projConnector, projConfig, projInit)
+    manifest = `(ProjectManager, projTracker, projConnector, proj_configDataFolder,
+        proj_cliserConfigFile, projConfig, projInit)
 
     Naan.module.build(module.id, "projects", function(modobj, compobj) {
         require("./project.nlg")

package/frameworks/running/running.nlg

@@ -144,7 +144,7 @@ function procstring(procdef, options, local name, output, parm) {
 function runnInit(local manifest) {
     manifest = `(rootproc, baseproc, pathmatch, procpath, procname, procstring, runnInit)
 
-    build(module.id, "running", closure(modobj, compobj) {
+    Naan.module.build(module.id, "running", closure(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
     })

package/frameworks/running/taskexec.nlg

@@ -119,7 +119,7 @@ closure taskDispatcher(replier, local contexts, gohome, util) {
                 }
             }
             else
-                call(onMessageHook, data)
+                onMessageHook(data)
         } catch {
             if true {
                 if tuple(exception)

package/frameworks/storage/file_manager.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2022 by Richard C. Zulch
  *
  */
 
@@ -287,6 +287,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
             fixed: true
             ignoreCase: true
             returnText: true
+            excludeDirs: []
         }
     }