@naanlang/naan 1.0.3 → 1.0.4

package/frameworks/browser/sworker.js

@@ -27,10 +27,8 @@
  * knowledge of which ones are responding. If a request takes longer than a second to respond then
  * this executes a validate operation, which eliminates any clients that have gone away and rejects
  * their pending operations.
- *     One potential problem is stale caches, where a new publisher (e.g. NaanIDE) or new version
- * arises but this worker is still serving old data. The solution is that every publisher provides 
- * its ID and version along with the mesage port. If that is different from the previous version then
- * the old caches are cleared and data re-fetched.
+ *     One potential problem is stale caches. When an older version is discovered then we notify the
+ * client and invalidate the old cache.
  *
  * column positioning:                          //                          //                      !
  *
@@ -38,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang 1.0.3-1";
+var CurrentCacheName = "Naanlang-1.0.4-2";
 
 
 //
@@ -91,18 +89,13 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        var newCacheName = "Naanlang".concat("-", pubID, "-", pubVersion);
-        console.log("[1.0.3-1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (CurrentCacheName != newCacheName) {
-            for (var srcid in msgPorts)
-                msgPorts[srcid].postMessage({
-                    id: "upgrade",
-                    previous: "1.0.3-1",
-                    version: pubVersion
-                });
-        }
-        ClearCaches(newCacheName)
-            .then(Reaper);                                                  // clean up obsolete info
+        console.log("[1.0.4-2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.4-2")
+            msgport.postMessage({                                           // notify new version available
+                id: "upgrade",
+                version: "1.0.4-2"
+            });
+        Reaper();                                                           // clean up obsolete info
         
         // msgport.onmessage events
         //
@@ -114,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.3-1] msg received:", msg.text);
+                console.log("[1.0.4-2] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -125,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.3-1",
+                text: "port received by 1.0.4-2",
             });
             */
         if (--pending === 0)
@@ -142,7 +135,7 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.3-1] requesting new msgport for", client.id);
+            console.log("[1.0.4-2] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -188,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.3-1] source gone:", sourceId);
+                console.log("[1.0.4-2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.3-1] client gone:", clientId);
+                console.log("[1.0.4-2] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -218,25 +211,22 @@ function Reaper() {
 /*
  * ClearCaches
  *
- * Clear obsolete caches in favor of the new name, returning a promise.
+ * Clear obsolete caches, returning a promise.
  *
  */
 
-function ClearCaches(newCacheName) {
-    if (CurrentCacheName == newCacheName)
-        return (Promise.resolve());                                         // no change
-    CurrentCacheName = newCacheName;
+function ClearCaches() {
     var promise = caches.keys().then(function(cacheNames) {                 // delete old cache entries
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
-                    if (cacheName !== CurrentCacheName) {
-                        console.log('[1.0.3-1] deleting old cache:', cacheName);
+                    if (cacheName != CurrentCacheName) {
+                        console.log('[1.0.4-2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.3-1] claiming clients for version', CurrentCacheName);
+            console.log('[1.0.4-2] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -279,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.3-1",
+                version: "1.0.4-2",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -327,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.3-1] install");
+    console.log("[1.0.4-2] install");
     self.skipWaiting();
 });
 
@@ -366,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.3-1] fetch failed", e);
+                    console.log("[1.0.4-2] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -395,16 +385,16 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.3-1] activate");
+    console.log("[1.0.4-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.3-1] matching clients:', urls.join(', '));
+        console.log('[1.0.4-2] matching clients:', urls.join(', '));
     });
-    var promise = ClearCaches(CurrentCacheName);
+    var promise = ClearCaches();
     if (event.waitUntil)
         event.waitUntil(promise);
 });

package/frameworks/browser/terminals.nlg

@@ -77,7 +77,7 @@ closure TermHost(track, api, name, workerID, options,
                     if !target.written
                         target.term.WriteLn("(reconnected)")
                 }, 1000).run()
-            else
+            else if message.respOp
                 debuglog("unknown host response message:", message.respOp)
         }
         

package/frameworks/browser/workers.nlg

@@ -55,8 +55,13 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
                 version: msg.version
             })
         } else if msg.id == "upgrade" {
-            if msg.version != msg.previous                                  // same version: new install
-                debuglog("service worker version upgrade to:", msg.version, "from", msg.previous)
+            if serv.upgrade != msg.version {
+                serv.upgrade = msg.version                                  // only report once
+                callback(false, {
+                    message: "upgrade"
+                    version: msg.version
+                })
+            }
         }
         else if msg.id == "text"
             debuglog("sw[".concat(serv.scope, "]: "), msg.text)             // handy remote debug capability
@@ -182,7 +187,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
  *
  */
 
-closure ScopedServiceWorker(pubID, pubVersion, local scoper, result) {
+closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
     scoper = new(object, ScopedServiceWorker)
     scoper.scopes = {}
     scoper.serv = ServiceWorker(pubID, pubVersion)
@@ -232,7 +237,8 @@ closure ScopedServiceWorker(pubID, pubVersion, local scoper, result) {
             response.body = data
             scoper.serv.msgport.postMessage(response)
             return
-        }
+        } else if data.message == "upgrade"
+            callback(data.version)
     })
     if result.0 {
         ErrorDebuglog("ScopedServiceWorker failed", result)
@@ -365,8 +371,8 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
  *
  */
 
-closure TrackServiceWorkers(track, pubID, pubVersion, local error) {
-    `(error, serviceWorker) = ScopedServiceWorker(pubID, pubVersion)
+closure TrackServiceWorkers(track, pubID, pubVersion, callback, local error) {
+    `(error, serviceWorker) = ScopedServiceWorker(pubID, pubVersion, callback)
     if error
         ErrorDebugLog("TrackServiceWorkers: cannot load service worker", error)
     track.register(TrackedScope, "V-Site")

package/frameworks/client/psm_client.nlg

@@ -22,6 +22,44 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     view = new(object, this)
     view.api = api
     view.rootpath = rootpath
+    
+    // data
+    //
+    // Return the filesystem data, i.e. the tree data field. The minimum information is:
+    //      platform    -- e.g. "darwin" or "win32"
+    //      semantics   -- e.g. "win32" or "posix"
+    //      pathsep     -- e.g. / or \
+
+    view.data = closure data(callback) {
+        if !callback
+            return (syncAdapter(data))
+        params = {
+            path: ""
+            op: "tree"
+            depthlimit: 0
+        }
+        api.psmRemote(params, false, function(error, tree) {
+            view.fsdata = tree.data
+            callback(error, tree.data)
+        })
+    }
+    
+    // pathInit
+    //
+    // Initialize our path module for the applicable path type.
+    
+    closure pathInit(local result) {
+        result = view.data()
+        if result.0
+            pathmod = false
+        else {
+            if view.fsdata.pathsep == "\\"
+                pathmod = JSpath.win32
+            else
+                pathmod = JSpath.posix
+            false
+        }
+    }
 
     // psmRemote
     //
@@ -30,10 +68,14 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     closure psmRemote(path, op, options, putdata, callback, local params, item) {
         if !callback
             return (syncAdapter(psmRemote, path, op, options, putdata))
+        if !pathmod && pathInit()
+            return                                                          // failed to initialize path module
         if !string(path)
             return (asyncResult(callback, Error("invalid path:", typeof(path))))
+        if rootpath != ""
+            path = pathmod.resolve(rootpath, path)
         params = {
-            path: JSpath.resolve(rootpath, path)
+            path: path
             op: op
         }
         for item in options
@@ -59,38 +101,30 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
 
     // path
     //
-    // The path sub-object remotes calls to the NodeJS path module.
+    // Redirect path calls to module chosen for filesystem semantics. It is possible for this to fail
+    // on first connection to the filesystem, in which case we return false for the path result.
+    // Throwing an error would complicate our callers and testing. This way there's a small chance
+    // that a transient error will give a bad path, but that will be detected downstream.
 
     view.path = new(object, this)
-    view.path[".undefined"] = closure path args {
-        closure (selector, arglist, local error, info) {
-            if !pathmod {
-                `(error, data) = view.data()
-                if error
-                    return (list(error))
-                if info.pathsep == "\\"
-                    pathmod = JSpath.win32
-                else
-                    pathmod = JSpath.posix
-            }
-            xapply(pathmod, selector, arglist)
-        } (args.0, args.-1)
+    view.path[".undefined"] = function path args {
+        if !pathmod
+            pathInit()
+        xapply(pathmod, args.0, args.-1)
     }
     
-    // data
+    // folderPath
     //
-    // Return the filesystem data, i.e. the tree data field. The minimum information is:
-    //      platform    -- e.g. "darwin" or "win32"
-    //      semantics   -- e.g. "win32" or "posix"
-    //      pathsep     -- e.g. / or \
-
-    view.data = closure data(callback) {
-        if !callback
-            return (syncAdapter(data))
-        psmRemote("", "tree", { depthlimit: 0 }, false, function(error, tree) {
-            view.fsdata = tree.data
-            callback(error, tree.data)
-        })
+    // Return the path of the specified special folder:
+    //      "HomeDir"
+    //      "TempDir"
+    //      "PackageDir"
+    // The returned path is relative to our root if within it, or absolute otherwise.
+    
+    view.folderPath = function folderPath(folderID, callback) {
+        psmRemote("", "folderPath", {
+            folderid: folderID
+        }, false, callback)
     }
                
     // readLines

package/frameworks/common/common.nlg

@@ -66,7 +66,7 @@ function JsonParse(data) {
         list(false, data)
     } catch {
         if true
-             list(exception)
+            list(exception)
     }
 };
 
@@ -84,7 +84,7 @@ function JsonStringify(data) {
         list(false, data)
     } catch {
         if true
-             list(exception)
+            list(exception)
     }
 };
 

package/frameworks/node/apiserver.nlg

@@ -110,8 +110,12 @@ closure MakeAPI(port, options, callback, local chroot, server) {
 
     server.app.use(function(req,res,next) {
         res.header("Access-Control-Allow-Origin", "*")
-        res.header("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE")
-        next()
+        res.header("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS")
+        res.header("Access-Control-Allow-Headers", "x-naanlang-api-guid")
+        if req.method == "OPTIONS"
+            res.sendStatus(200)
+        else
+            next()
     })
 
     server.app.use("", express.static(chroot))
@@ -197,7 +201,7 @@ closure MakeAPI(port, options, callback, local chroot, server) {
 
     server.app.all("/psm", closure(req, res, local guid) {
         guid = req.get("x-naanlang-api-guid")
-        if server.guid && guid != server.guid
+        if server.guid && guid != server.guid && req.method !== "OPTIONS"
             res.status(403).send("unauthorized")
         else if !server.hostfs
             res.status(503).send("host filesystem not available")

package/frameworks/node/filesystem.nlg

@@ -23,7 +23,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     if !rootpath
         return (list(Error("mandatory rootpath missing")))
     else if rootpath == ""
-        rootpath = js.g.process.cwd()                                       // NodeJS uses CWD for empty rootpath
+        rootpath = JSpath.sep
     files = new(object, this)
     files.rootpath = rootpath
     files.path = JSpath
@@ -54,24 +54,31 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // Convert a path argument to a local path, returning a standard result tuple. If the path is
     // invalid this will report why. Otherwise this returns the correct localpath, which is the path
     // we use with the underlying API.
+    //     Win32 driver letters are annoying here. If the rootpath specifies a drive letter then the
+    // paths must match it. If the rootpath doesn't specify a drive letter then path can have any
+    // drive letter, or none.
     
     badCreatePathRegEx = RegExp("[:]|[/\\\\][/\\\\]|[/\\\\]$|(^|[/\\\\])[.][.]?$")
 
-    closure localPath(path, create, local pattern, testpath) {
+    files.localPath = closure localPath(path, create, local pattern, testpath, locroot) {
         if !path
             return (list(Error("filesystem path false")))
         else if !string(path)
             return (list(Error("filesystem path invalid:", typeof(path))))
+        if JSpath === JSpath.win32 {
+            locroot = JSpath.resolve(path, rootpath)                        // use path's drive letter if we don't have one
+            pattern = "\\:\\"                                               // unchanged and unique on win32
+        }
+        else {
+            locroot = rootpath
+            pattern = "/:/"                                                 // unchanged and unique on posix
+        }
         if JSpath.isAbsolute(path)
-            path = JSpath.resolve(path)                                     // puts C: in front of \abs\win\path
+            path = JSpath.resolve(locroot, path)                            // add drive letter to absolute path
         else
             path = JSpath.normalize(path)                                   // normalize for current platform
-        if JSpath === JSpath.win32
-            pattern = "\\:\\"                                               // unchanged and unique on win32
-        else
-            pattern = "/:/"                                                 // unchanged and unique on posix
-        if ((testpath = commonParents(path, rootpath)) != "")
-            list(false, JSpath.resolve(rootpath, path))                     // ### shouldn't be so lax on this test
+        if (commonParents(path, locroot) != "")
+            list(false, JSpath.resolve(locroot, path))
         else if ((testpath = JSpath.resolve(pattern, path)).indexOf(pattern.slice(0,-1)) < 0)
             list(Error("filesystem path reaches above root:", path))
         else if create && testpath.indexOf(pattern) < 0
@@ -79,7 +86,31 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         else if create && badCreatePathRegEx.test(path)
             list(Error("filesystem create path invalid", path))
         else
-            list(false, JSpath.resolve(rootpath, path))
+            list(false, JSpath.resolve(locroot, path))
+    }
+    
+    // folderPath
+    //
+    // Return a folder path for the specified folderID, relative to our root. If the folder path is
+    // not within our root then it is returned as an absolute path.
+    
+    files.folderPath = function folderPath(folderID, callback, local envID, path) {
+        if !callback
+            return (syncAdapter(folderPath, folderID))
+        envID = {
+            "HomeDir":      "HOME",
+            "TempDir":      "TMPDIR",
+            "PackageDir":   "npm_config_prefix"
+        }[folderID]
+        if envID {
+            path = js.g.process.env[envID]
+            if path.startsWith(rootpath)
+                path = path.slice(rootpath.length)                          // remove rootpath from beginning
+        }
+        if path
+            callback(false, path)
+        else
+            callback(Error("unknown folderID:", folderID))
     }
 
     // winDrives
@@ -639,8 +670,10 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         // Recursively build the tree
 
         closure recurTree(localpath, depth, parent) {
-            if depthlimit && depth >= depthlimit
+            if depthlimit && depth >= depthlimit {
+                recurNext()
                 return
+            }
             ++pending.active
             fs.readdir(localpath, { }, function(err, nodes, local child, node, stat) {
                 if err.code == "ENOTDIR"
@@ -670,13 +703,21 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
                             parent: child
                         }) } }
                 --pending.active
-                while queue.length > 0 && pending.active < 20 {
-                    node = queue.pop()
-                    recurTree(node.path, node.depth, node.parent) }
-                if pending.active == 0 && queue.length == 0
-                    pending.signal(list(false, root))
+                recurNext()
             })
         }
+        
+        // recurNext
+        //
+        // Pull more queued items and signal when done.
+        
+        function recurNext(local node) {
+            while queue.length > 0 && pending.active < 20 {
+                node = queue.pop()
+                recurTree(node.path, node.depth, node.parent) }
+            if pending.active == 0 && queue.length == 0
+                pending.signal(list(false, root))
+        }
 
         `(error, localpath) = localPath(path)
         if error

package/frameworks/node/gitter.nlg

@@ -23,6 +23,28 @@ closure Gitter(fs, local gitt) {
     gitt = new(object, this)
     gitt.roots = {}
     
+    // gitPath
+    //
+    // Convert a Windows path to a posix (git) path if needed.
+    //
+    function gitPath(fspath) {
+        if fs.path.sep == "/"
+            fspath
+        else
+            fspath.split(fs.path.sep).join("/")
+    }
+        
+    // fsPath
+    //
+    // Convert a posix (git) path to a filesystem path if needed.
+    //
+    function fsPath(gitpath) {
+        if fs.path.sep == "/"
+            gitpath
+        else
+            gitpath.split("/").join(fs.path.sep)
+    }
+
     // repoRoot
     //
     // Compute the path from the fs root to the repo root.
@@ -54,11 +76,10 @@ closure Gitter(fs, local gitt) {
     // Compute the bridge path to an absolute repopath (which can point inside a repo) from the
     // phyiscal repo root. If these are the same, or an error occurs, then the result is "".
     //
-    
     function bridgePath(repopath, local top) {
         top = repoRoot(repopath).1
         if top && repopath.startsWith(top) && repopath.length > top.length
-           top = repopath.slice(top.length+1).concat("/")                   // move leading "/" of bridge path to trailing
+           top = repopath.slice(top.length+1).concat(fs.path.sep)           // move leading "/" of bridge path to trailing
         else
             ""                                                              // we are looking at the root, or an error
     }
@@ -151,12 +172,12 @@ closure Gitter(fs, local gitt) {
             outLE: "\x00"                                                   // lines delimited by nulls
         }
         if options.pathspec
-            execOptions.cmdargs = execOptions.cmdargs.concat("--", options.pathspec)
+            execOptions.cmdargs = execOptions.cmdargs.concat("--", gitPath(options.pathspec))
         result = []
         execOptions.outproc = function(output, liner, kill, local line, path) {
             while (line = liner.read())
                 if line != "" {
-                    path = line.substring(3)
+                    path = fsPath(line.substring(3))
                     if path.startsWith(bridge) {                            // must start with bridge to be within repopath
                         path = path.slice(bridge.length)
                         result.push({
@@ -183,7 +204,7 @@ closure Gitter(fs, local gitt) {
     // Retrieve the content of a specific file and revision. The file pathspec must be the path of
     // the file within the repo.
     
-    gitt.showfile = closure showfile(repopath, options, callback, local execOptions, result) {
+    gitt.showfile = closure showfile(repopath, options, callback, local execOptions) {
         if !callback
             return (syncAdapter(showfile, repopath, options))
         if !string(repopath)
@@ -192,7 +213,7 @@ closure Gitter(fs, local gitt) {
             return (asyncResult(callback, Error("both pathspec and hash required:", options.pathspec, options.hash)))
         repopath = fs.path.resolve(fs.rootpath, repopath)
         execOptions = {
-            cmdargs: ["show", options.hash.concat(":", bridgePath(repopath), options.pathspec)]
+            cmdargs: ["show", options.hash.concat(":", bridgePath(repopath), gitPath(options.pathspec))]
             execops: {
                 cwd: repopath
             }

package/frameworks/node/psm_server.nlg

@@ -27,6 +27,7 @@ closure psmsFsView(rootpath, local view, gitter) {
     view = view.1
     
     // inherited
+    //  --  view.folderPath(folderid, callback)
     //  --  view.winDrives(callback)
     //  --  view.testHidden(path, callback)
     //  --  view.readLines(path, options, callback)
@@ -86,16 +87,27 @@ closure psmsFsView(rootpath, local view, gitter) {
             }
             res.send(new(array, result))
         }
-                 
+                                 
+        // op: folderPath
+        function folderPathApi() {
+            res.send(new(array, view.folderPath(req.query.folderid)))
+        }
+ 
         // op: readLines
         function readLinesApi() {
             res.send(new(array, view.readLines(path, req.query)))
         }
 
         // op: readFile
-        function readFileApi(local options) {
+        function readFileApi(local error, localpath, options) {
+            `(error, localpath) = view.localPath(path)
+            if error {
+                res.send(new(array, list(error)))
+                return
+            }
             options = {
-                dotfiles: "allow" }
+                dotfiles: "allow"
+            }
             if req.query.encoding == "binary"
                 options.headers = {
                     "Content-Type": "application/octet-stream"
@@ -104,7 +116,7 @@ closure psmsFsView(rootpath, local view, gitter) {
                 options.headers = {                                         // ### is this always the right default?
                     "Content-Type": "text/html; charset=UTF-8"
                 }
-            res.sendFile(path, options, function (err, local status) {
+            res.sendFile(localpath, options, function (err, local status) {
                 if err {
                     if err.code == "ENOENT"
                         status = 404
@@ -187,7 +199,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         
         // op: tree
         function treeApi() {
-            res.send(new(array, view.tree(path, req.query.depthlimit)))
+            res.send(new(array, view.tree(path, toint(req.query.depthlimit))))
         }
                 
         // op: dirSearch
@@ -250,6 +262,7 @@ closure psmsFsView(rootpath, local view, gitter) {
 
         proc = {
             pathOp:         pathOpApi
+            folderPath:     folderPathApi
             readFile:       readFileApi
             readLines:      readLinesApi
             writeFile:      writeFileApi

package/frameworks/project/projects.nlg

@@ -293,7 +293,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.3-1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.4-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
@@ -457,7 +457,9 @@ closure projConfig(projman, where, local procon, fs, configpath) {
                 error = Error("project configuration not a directory", where.path)
             else
                 `(error, data) = readConfig() }
-        if error
+        if error.code == "ENOENT"
+            return (list(Error("Project <b>".concat(where.name, "</b>:<br>not found at ", where.path))))
+        else if error
             return (list(Error("Project.load failed", error)))
         procon.loaded = true
         list(false, procon.configDict)