@naanlang/naan 1.4.0 → 1.4.2

package/frameworks/browser/sworker.js

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

package/frameworks/browser/terminals.nlg

@@ -152,9 +152,9 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 
         // onerror
         // An error occurred on the WebSocket connection.
+        // This can happen in normal operation when the connection times out.
         target.ws.onerror = function onerror(e) {
             pending.signal(list(Error("websocket failed", e)))
-            debuglog("ws error")
         }
         
         // onclose
@@ -655,6 +655,7 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
     //     Destroy the execution instance.
     
     target.destroy = function destroy() {
+        gWorkers[target.guid] = undefined
         target.execClosed(Error("instance destroyed"))
         track.delete(target)
         termDetach()
@@ -750,7 +751,7 @@ closure WorkerToMain(local nideRunning, track) {
         error = Error("WorkerToMain only available in browser workers")
         return (list(error))
     }
-    nideRunning = require("frameworks/running/executors.nlg")
+    nideRunning = require("naanlib:frameworks/running/executors.nlg")
     track = nideRunning.ExecutorTracker()
     track.register(mainProxy, "proxy")
     track.spawn("proxy")                                                    // returns result tuple
@@ -865,6 +866,10 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
             if inbound
                 inbound.active = active
         }
+        
+        connection.WriteLn = function WriteLn(text) {
+            term.WriteLn(text)
+        }
 
         connection.termDetach = function termDetach() {                     // disconnect the terminal
             db.detach(target)
@@ -921,7 +926,46 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         }
         target.execReset()                                                  // reset our parent class
     }
-    
+
+    // targetClose
+    //
+    //     Mark the target window as closed.
+    //
+    function targetClose(local conn) {
+        for conn in connected {
+            conn.db.detach(target)
+            conn.WriteLn("\x1b[90m\x1b[3m".concat("\ntarget closed", "\x1b[0m"))
+        }
+        target.execReset()
+        target.naancont = naancont = false
+    }
+
+    // setCheckStatus
+    //
+    //     Begin or end checking status on the worker to see if stopped responding. The challenge
+    // here is that we open vsite windows in the main thread, but there is no reliable event to learn
+    // when they are closed. The solution is to start checking if the window is closed after it gets
+    // a visibilityChange event to hidden. This terminates when the window gets marked closed or when
+    // it becomes visible again--which is quite unlikely unless someone uses the explicit hide/show
+    // window methods.
+    //
+    target.setCheckStatus = closure setCheckStatus(hidden, window) {
+        if hidden {
+            if !target.statusPoll
+                target.statusPoll = future(function() {
+                    while target.statusPoll {
+                        if window.closed {
+                            targetClose()
+                            target.statusPoll = false
+                            break
+                        } else
+                            sleep(100)                                      // check 10x/second
+                    }
+                }, 10)                                                      // start after 10 msec
+        } else
+            target.statusPoll = false
+    }
+
     // vsiteRefresh
     //
     //     The vsite upon which we are based has changed.
@@ -969,6 +1013,11 @@ closure termInstallVirtualWatcher(track, naancont) {
             if target
                 target.updateController()
         }
+        else if msg.op == "VsiteVisibilityChange" {
+            target = findIDEtarget(track, msg.name, "NaanVsite", msg.naancont)
+            if target
+                target.setCheckStatus(msg.hidden, msg.window)
+        }
     }
     
     require("../running/executors.nlg").TaskOnMessageHook(watchVsites)

package/frameworks/client/psm_client.nlg

@@ -625,6 +625,8 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
     //
     // Connect to the specified service.
     connector.connect = function connect(resID, service, args, local error, creds, api, rootpath) {
+        if !resID || args && !tuple(args)
+            return (list(Error("invalid arguments")))
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"

package/frameworks/client/relaycon.nlg

@@ -85,7 +85,7 @@ closure RelayCon(host, secret, options, local relay, nlregex)
         })
         result = relay.wscon.connect()
         if !result.0
-            sendControl("spawn", { name: "NaanIDE Server" })                // ensure worker is connected
+            sendControl("spawn", { name: options.name })                    // ensure worker is connected
         else if options.debug
             ErrorDebuglog("WebSocket connect failed:", result.0)
         result

package/frameworks/common/common.nlg

@@ -182,53 +182,6 @@ function JsonStringify(data) {
     }
 };
 
- 
-/*
- * JsLoadScript
- *
- *     Load the specified script, or return its main entry point if already loaded. This blocks the
- * caller until the script load completes. The return value is false if an error occurred.
- *
- */
-
-jsScripts = { };                                                            // script values become false on reload
- 
-closure JsLoadScript(libpath, globalID, local savens, hostpath, pending, scriptTag) {
-    global(jsScripts, JSpath, js)
-    if jsScripts[libpath]
-        return                                                              // already loaded
-    savens = nsactive()
-    hostpath = js.w.location.origin.concat(JSpath.join(JSpath.dirname(js.w.location.pathname), libpath))
-    if js.s.importScripts && tostring(js.s.importScripts) == "[Function importScripts]" {
-        try {
-            js.s.importScripts(hostpath)                                    // load in worker context
-            jsScripts[libpath] = js.s[globalID]
-        } catch {
-            debuglog("JsLoadScript:", libpath, "failed", exception)
-            js.s.console.log("JsLoadScript:", libpath, "failed", exception) // ensure visibility in JS console
-        }
-    } else if js.w {                                                        // load in browser context
-        pending = new(nonce)
-        scriptTag = js.w.document.createElement("script")
-        scriptTag.src = hostpath.concat(requireQuery())
-        scriptTag.onload = function (event) {
-            jsScripts[libpath] = js.w[globalID]
-            pending.signal(js.w[globalID])
-            true
-        }
-        scriptTag.onerror = function (event) {
-            debuglog("JsLoadScript:", libpath, "not found")
-            pending.signal(false)
-            true
-        }
-        js.w.document.body.appendChild(scriptTag)
-        pending.wait()
-    } else if js.g
-        jsScripts[libpath] = js.r(libpath)                                  // load in NodeJS context
-    nsactive(savens)
-    jsScripts[libpath]
-};
-
 
 /*
  * LoadComponentOnDemand
@@ -247,7 +200,9 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
     componentPath = eval(componentPath)
     if name(functionKeys)
         functionKeys = list(functionKeys)
-    for key in functionKeys
+    for key in functionKeys {
+        if modobj.exports[key]
+            continue                                                        // already defined
         closure (key, path, local exproc) {
             function loadComponent args {                                   // called when exported function first called
                 exproc = require(path)[key]
@@ -257,6 +212,7 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
             }
             modobj.exports[key] = loadComponent
         } (key, componentPath)
+    }
     true
 };
 
@@ -274,7 +230,7 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
  * LiveImport() function to a module's exports.
  *
  * To use LiveImport, call from the importing module as follows:
- *     require("frameworks/common/common.nlg").LiveImport(<fixproc>);
+ *     require("naanlib:frameworks/common/common.nlg").LiveImport(<fixproc>);
  * The optional <fixproc> is called after the imports in case the foreign module wants to fix up
  * anything after the import:
  *     fixproc(exporterMod);
@@ -362,7 +318,7 @@ Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
     manifest = `(EncodeQuery, DecodeQuery, ContentTypeFromFileExt, UUID, VersionCheck, JsonParse,
-        JsonStringify, JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
+        JsonStringify, LoadComponentOnDemand, LiveExport, comrInit)
 
     Naan.module.build(module.id, "common", closure(modobj, compobj) {
         compobj.manifest = manifest
@@ -370,8 +326,9 @@ function comrInit(local manifest) {
         modobj.exports.DecodeQuery = DecodeQuery
         modobj.exports.ContentTypeFromFileExt = ContentTypeFromFileExt
         modobj.exports.UUID = UUID
-        modobj.exports.JsLoadScript = JsLoadScript
         modobj.exports.LoadComponentOnDemand = LoadComponentOnDemand
+        letimport(module.owner.list.Util.exports.JsLoadScript)              // use the Util version
+        modobj.exports.JsLoadScript = JsLoadScript
         modobj.exports.LiveExport = LiveExport                              // allow others to create export updaters
         updateExports = LiveExport()                                        // export LiveImport() so we can update
 
@@ -478,13 +435,12 @@ function comrInit(local manifest) {
                 }
                 //
                 // MD5 functions
-                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) {
                     data = binaryFrom(data)
+                    if !wsg.SparkMD5
+                        JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
                     if xobject(data)
                         wsg.SparkMD5.ArrayBuffer.hash(data, raw)
                     else

package/frameworks/node/filesystem.nlg

@@ -1137,6 +1137,11 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         })
         spawn.on("close", function(code) {
             output.exitCode = code                                          // zero on success; null on killed
+            completed(false, output)
+        })
+        spawn.on("exit", function(code, signal) {
+            output.exitCode = code                                          // if exited
+            output.signalName = signal                                      // if terminated
         })
         spawn.stderr.on("error", function(err) {
             completed(Error("stderr stream failed:", err))
@@ -1155,8 +1160,6 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
                 call(options.errproc, output)
             if linerOut
                 linerErr = false                                            // let end-of-out do the completion
-            else
-                completed(false, output)
         })
         linerErr.on("readable", function (local line) {
             if options.errproc
@@ -1179,8 +1182,6 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
                 call(options.outproc)
             if linerErr
                 linerOut = false                                            // let end-of-err do the completion
-            else
-                completed(false, output)
         })
         linerOut.on("readable", function (local line) {
             if options.outproc

package/frameworks/node/psm_server.nlg

@@ -525,7 +525,7 @@ function MakeServerPSM(api, name, local importPSM, error, path, psm) {
     if !error {
         App.psm = psm
         psmsFsConnector(App.psm, api)
-        require("frameworks/storage/dbt_pouch.nlg").DbConnector(App.psm)    // Pouch databases as filesystems
+        require("naanlib:frameworks/storage/dbt_pouch.nlg").DbConnector(App.psm)    // Pouch databases as filesystems
     } else
         ErrorDebuglog("Cannot create PSM", error)
     App.psm

package/frameworks/node/shell.nlg

@@ -0,0 +1,134 @@
+/*
+ * shell.nlg
+ * Naanlib/frameworks/node
+ *
+ * Shell access and utilities for the host OS.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2024 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * ShellConnect
+ *
+ * Executing this installs itself in the current dialect to provide a REPL shell escape, returning a
+ * standard result tuple. This sends lines starting with ! to the shell with "bash -c". The result is
+ * output as text and also assigned to the $$ variable in the active namespace.
+ *
+ * Options:
+ * {
+ *      fs:     <filesystem>                    // optional: the filesystem object to use
+ *      cwd:    <string>                        // optional: Current Working Directory
+ *      derive: <string>                        // optional: dialect to derive from, or "" for no !
+ * }
+ *
+ */
+
+closure ShellConnect(options, local shob, error, fs, xparser, shelly) {
+    global(js, compress)
+    shob = new(object, this)
+
+    // readline
+    // read one line of text from the source
+    function readline(source, local cc, output) {
+        output = ""
+        while cc = source.readchar() {
+            output = output.concat(cc)
+            if cc == "\n"
+                break }
+        output
+    }
+
+    // exec
+    //
+    // Execute a shell command with optional current-working-directory.
+    //
+    shob.exec = closure exec(cmd, args, cwd, local pending, report, xlparams) {
+        pending = new(nonce)
+        report = {
+            stdout: []
+            stderr: []
+        }
+        xlparams = {
+            cmdargs: args
+            outproc: function(output, liner, kill, local line) {
+                while line = liner.read() {
+                    report.stdout.push(line)
+                    printline("\x1b[33m${line}\x1b[0m")                     // amber for stdout
+                }
+            }
+            errproc: function(output, liner, kill, local line) {
+                while line = liner.read() {
+                    report.stderr.push(line)
+                    printline("\x1b[36m${line}\x1b[0m")                     // cyan for stderr
+                }
+            }
+        }
+        if cwd
+            xlparams.execops = { cwd: cwd }
+        else if options.cwd
+            xlparams.execops = { cwd: options.cwd }
+        fs.execLines(cmd, xlparams, function(error, result) {
+        	evalactive(list(`assign, `(compress, "$$"), report))            // assign to $$ in active namespace
+            pending.signal(list(error, merge(result, report)))
+        })
+        pending.wait()
+    }
+
+    // shellparser
+    // intercept command-line parsing and look for a !shell escape
+    function shellparser(source, grammar, operators, local token) {
+        token = source.tokenread()
+        if token.atom == `! {
+            source.tokenlast(true)                                          // "consume" the ! token
+            text = readline(source)
+            source.tokenpush({                                              // don't show any output
+                atom: `;;
+                loc: tuple(0, text.length)
+            })
+            exec("bash", ["-c", text], js.d)                                // default directory: js.d
+	    }
+        else {
+            source.tokenpush(token)
+            xparser(source, grammar, operators)
+        }
+    }
+
+    if options.fs
+        fs = options.fs
+    else
+        `(error, fs) = Filesystem("")                                       // error not possible
+    if options.derive != "" {                                               // install hook
+        if string(options.derive)
+            shelly = Dialect.derive(options.derive)
+        else
+            shelly = Dialect
+        xparser = shelly.parser
+        shelly.parser = shellparser
+    }
+
+    // finis
+    shob
+};
+
+
+/*
+ * shInit
+ *
+ *     Initialize the node module.
+ *
+ *
+ */
+
+function shInit(local manifest) {
+    manifest = `(ShellConnect, shInit)
+
+    Naan.module.build(module.id, "shell", function(modobj, compobj) {
+        require("./filesystem.nlg")
+        compobj.manifest = manifest
+        modobj.exports.ShellConnect = ShellConnect
+    })
+} ();

package/frameworks/node/worker.nlg

@@ -312,7 +312,7 @@ closure workThread(workco, workerID, startup, guid
     // create our worker thread
 
     // options = { execArgv: ["--inspect-brk"] }                            // uncomment for NodeJS debugging
-    worker.thread = xnew(threads.Worker, JSpath.resolve(js.d, "node_worker.js"), options)
+    worker.thread = xnew(threads.Worker, JSpath.resolve(js.d, "lib/node_worker.js"), options)
     subChannel = xnew(threads.MessageChannel)
     worker.thread.postMessage({ hereIsYourPort: subChannel.port1 }, [subChannel.port1])
     worker.msgport = subChannel.port2

package/frameworks/project/build.nlg

@@ -230,17 +230,26 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     //      <substitute text, one or more lines>
     //      [File EOF]
     //
+    // Special line starts:
+    //      # comment
+    //      \# line starts with #
+    //      \\ line starts with \
+    //
     // Note that the newlines before and after the substitute text are not included. This returns a
     // a dictionary of variables and replacement text. The defs argument is optional, and defines a
     // substitution dictionary applied to the replacement text defined in this file.
     //
-    function parseSubstitutionLines(lines, defs, local ignoregex, varegex, line, find, subs, curvar, sub) {
+    function parseSubstitutionLines(lines, defs,
+        local ignoregex, escapex, varegex, line, find, subs, curvar, sub) {
         subs = { }
         ignoregex = RegExp("^#")
+        escapex = RegExp("^\\\\(#|\\\\)")
         varegex = RegExp("^[$]([^$]+)[$]")
         for line in lines {
-            if ignoregex.exec(line)
-                continue
+            if ignoregex.test(line)
+                continue                                                        // comment
+            if escapex.test(line)
+                line = line.slice(1)                                            // not-a-comment escape
             if find = line.match(varegex) {
                 curvar = find[1]
                 subs[curvar] = ""
@@ -271,6 +280,11 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     //      <substitute text, one or more lines>
     //      [File EOF]
     //
+    // Special line starts:
+    //      # comment
+    //      \# line starts with #
+    //      \\ line starts with \
+    //
     // Note that the newlines before and after the substitute text are not included. This returns a
     // standard `(error, subs) result tuple where subs is a dictionary of variables and replacement
     // text. The defs argument is optional, and defines a substitution dictionary applied to the
@@ -293,7 +307,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     //
     function applySubstitutions(text, subs, local subbed) {
         subbed = { }
-        list(text.replace(RegExp("[$][-A-Za-z0-9_./()\\\\]+[$]", "g"), function(match, local subst) {
+        list(text.replace(RegExp("[$][^$\\s]+[$]", "g"), function(match, local subst) {
             subst = subs[match.slice(1,-1)]
             if subst {
                 subbed[match] = true
@@ -368,7 +382,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     // for each file. The result is a standard (error, data) tuple.
     
     function zip1(files, options, local libzip, ziparc, file, result) {
-        libzip = require("frameworks/project/jszip.nlg").JSZip()
+        libzip = require("naanlib:frameworks/project/jszip.nlg").JSZip()
         if !libzip
             return (list(Error("Build requires zip but it's not available")))
         ziparc = libzip.create()

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.4.0+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.4.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
@@ -563,6 +563,17 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         }
     }
 
+    // persist
+    //
+    //    Return a dictionary for persistent local project state, like view configuration.
+    //
+    procon.persist = function persist() {
+        if procon.localDict.persist {
+        }
+        else
+            procon.localDict.persist = {}
+    }
+
     // buildrules
     //
     //     Get the build rules for the named stage, reloading the project configuration if changed.