@naanlang/naan 1.0.8 → 1.0.9

package/frameworks/browser/browser.nlg

@@ -53,7 +53,7 @@ closure FileReader(file, progress, local pending, freader, result) {
  *
  */
 
-closure FileDownload(file, progress, local error, blob, sizez, url, link) {
+closure FileDownload(file, progress, local error, blob, size, url, link) {
     `(error, blob, size) = FileReader(file, progress)
     if error
         list(error)

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.8+1";
+var CurrentCacheName = "Naanlang-1.0.9+1";
 
 
 //
@@ -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.8+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.8+1")
+        console.log("[1.0.9+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.9+1")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.8+1"
+                version: "1.0.9+1"
             });
         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.8+1] msg received:", msg.text);
+                console.log("[1.0.9+1] 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.8+1",
+                text: "port received by 1.0.9+1",
             });
             */
         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.8+1] requesting new msgport for", client.id);
+            console.log("[1.0.9+1] 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.8+1] source gone:", sourceId);
+                console.log("[1.0.9+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.8+1] client gone:", clientId);
+                console.log("[1.0.9+1] 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.8+1] deleting old cache:', cacheName);
+                        console.log('[1.0.9+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.8+1] claiming clients');
+            console.log('[1.0.9+1] 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.8+1",
+                version: "1.0.9+1",
                 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.8+1] install");
+    console.log("[1.0.9+1] 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.searchParams.get("naanver") !== "09e820a5a47c4b099bacaa5d8a7d3f7a"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "47cb512242b15eae60df6f89500e5ca4"
                 || 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.8+1] fetch failed", e);
+                    console.log("[1.0.9+1] 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.8+1] activate");
+    console.log("[1.0.9+1] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.0.8+1] matching clients:', urls.join(', '));
+        console.log('[1.0.9+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -650,7 +650,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
             naancont.Interrupt(inbound)
         }
 
-        function onreturn(local text) {
+        function onreturn() {
             naancont.Return(term.TakeText(), inbound)
         }
     

package/frameworks/browser/workers.nlg

@@ -311,7 +311,7 @@ closure findTrackedScope(track, scope, local exec) {
  *
  */
 
-closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
+closure TrackedScope(track, scope, fs, rootpath, local trope) {
     trope = findTrackedScope(track, scope)
     if trope
         return (list(false, trope))

package/frameworks/client/psm_client.nlg

@@ -307,7 +307,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // optionally deleting the files in the existing location. If options.move is true then we
     // delete the source after the copy.
     
-    view.copy = closure copy(srcpath, dest, options, callback, local parameters) {
+    view.copy = closure copy(srcpath, dest, options, callback) {
         if options
             options = new(options)
         else

package/frameworks/common/common.nlg

@@ -80,7 +80,7 @@ function ContentTypeFromFileExt(filepath, local mimeType, encoding) {
  *
  */
  
-function UUID(local rando, cc) {
+function UUID(local rando) {
     if !RandomBytes
         return (false)
     rando = RandomBytes(36)                                                 // length of UUID

package/frameworks/node/filesystem.nlg

@@ -566,7 +566,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // Return array of files in a directory if it exists. If options.stat is true then this reads 
     // info for each file as well.
 
-    files.dirList = closure dirList(path, options, callback, local error, localpath, output, nodelist, file) {
+    files.dirList = closure dirList(path, options, callback, local error, localpath, output, file) {
         if js.g.process.platform == "win32" && rootpath == "\\" && (path == "" || path == "\\")
             return (files.winDrives(callback))                              // top level is drive letters in Windows
         if !callback
@@ -608,7 +608,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
-        fs.mkdir(localpath, { recursive: true }, function(errmkdir, local result) {
+        fs.mkdir(localpath, { recursive: true }, function(errmkdir) {
             if errmkdir.code == "EEXIST"
                 fs.stat(localpath, function(errstat, stat) {
                     if errstat || !stat.isDirectory()
@@ -807,7 +807,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //      overwrite:  <boolean>           -- overwrite existing file, if any
     // }
     
-    files.copy = closure copy(srcpath, dest, options, callback, local error, localsrc, localdest, pending) {
+    files.copy = closure copy(srcpath, dest, options, callback, local error, localsrc, localdest) {
         if !callback
             return (syncAdapter(copy, srcpath, dest, options))
         `(error, localsrc) = localPath(srcpath)
@@ -906,7 +906,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // Execute the uglifyjs utility on the specified source, returning the result as a standard
     // tuple: `(error, minified)
     //
-    files.minimize = closure minimize(input, callback, local child, stdinStream) {
+    files.minimize = closure minimize(input, callback, local child) {
         if !callback
             return (syncAdapter(minimize, input))
         debuglog("==> Warning: files.minimize is deprecated")
@@ -1012,7 +1012,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //      ignoreBinary:                       -- ignore binary files
     //
     files.grepLines = closure grepLines(path, options, callback,
-        local error, localpath, cmdargs, item, execOptions, grep, result, lineRE, maxcount) {
+        local error, localpath, cmdargs, item, execOptions, result, lineRE, maxcount) {
         if !callback
             return (syncAdapter(grepLines, path, options))
         `(error, localpath) = localPath(path)
@@ -1099,7 +1099,8 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //  
     //
 
-    files.execLines = closure execLines(cmdname, options, callback, local output, arg, execops, spawn, linerErr, linerOut) {
+    files.execLines = closure execLines(cmdname, options, callback, 
+        local output, execops, spawn, linerErr, linerOut) {
         if !callback
             return (syncAdapter(execLines, cmdname, options))
         if !string(cmdname) || cmdname == ""
@@ -1124,7 +1125,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         // kill
         // terminate the command
         function kill() {
-            grep.kill()
+            spawn.kill()
             completed(false, output) }                                      // the official end will never come
 
         //

package/frameworks/node/psm_server.nlg

@@ -59,7 +59,7 @@ closure psmsFsView(rootpath, local view, gitter) {
     //
     // Entry point for API requests.
     
-    view.api = closure api(req, res, local path, proc, result) {
+    view.api = closure api(req, res, local path, proc) {
         if not string(req.query.path) {
             res.status(400).send("invalid path")
             return }
@@ -78,7 +78,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         }
 
         // op: pathOp
-        function pathOpApi(local selector, local result) {
+        function pathOpApi(local selector, result) {
             try {
                 result = list(false, xapply(JSpath, req.query.selector, totuple(js.g.JSON.parse(req.query.arglist))))
             } catch {
@@ -489,7 +489,7 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
     //
     // Connect to the specified service. The first argument is the rootpath, which is required.
     //
-    connector.connect = function connect(resID, service, args, local error, creds, api) {
+    connector.connect = function connect(resID, service, args, local error, creds) {
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"

package/frameworks/project/build.nlg

@@ -391,7 +391,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // Run the zip operation on a worker.
     //
 
-    closure zip(files, options, local result, annote) {
+    closure zip(files, options, local result) {
         if !build.zipper
             build.zipper = ExecutorParallel({                               // create worker for zipping
                 maxcount: 1                                                 // stupid Zip lib can't do more than one
@@ -527,7 +527,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // Run the parseAndPack operation on a worker.
     //
 
-    closure parseAndPack(text, fpath, options, local result, annote) {
+    closure parseAndPack(text, fpath, options, local result) {
         if !build.parallel
             build.parallel = ExecutorParallel({                             // create worker pool
                 basename: "build"
@@ -652,7 +652,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
         // added as a separate new group. A counter is kept of all outstanding async functions, and
         // analyze does not return until all pending async operations have completed.
         //
-        closure processOneGroup(group, local error, indirpath, outdirpath, destcheck,
+        closure processOneGroup(group, local indirpath, outdirpath, destcheck,
             groupVerStat, source, sdex) {
             ++pending.active
             future(function test1() {
@@ -719,7 +719,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     
             // Add an entry to execution list if it's needed.
             //
-            closure addEntry(infile, outfile, instat, sdex, local error, outstat, entry) {
+            closure addEntry(infile, outfile, instat, sdex, local entry) {
                 if sdex >= sourcemax {
                     build.errorlist.push(Error("Too many sources in one group:", groupno.group))
                     return
@@ -1271,7 +1271,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Refresh after updating the v-site, returning true iff an existing vsite was found.
     //
-    build.refresh = function refresh(track local main, url_origin, found) {
+    build.refresh = function refresh(track local url_origin, found) {
         if build.runway."v-site" {
             url_origin = js.w.location.origin.concat("/run", build.runway."v-site")
             for target in track.enumlist() {

package/frameworks/project/proj_console.nlg

@@ -46,7 +46,7 @@ closure proj_consoleInstance(projman, where, projID, local project) {
     // load
     //
     // Load the project, which fails if it does not already exist.
-    project.load = closure load(local error, info) {
+    project.load = closure load(local result) {
         if project.loaded
             return (list(false, { ok: true }))
         result = project.config.load()

package/frameworks/project/proj_lambda.nlg

@@ -46,7 +46,7 @@ closure proj_lambdaInstance(projman, where, projID, local project) {
     // load
     //
     // Load the project, which fails if it does not already exist.
-    project.load = closure load(local error, info) {
+    project.load = closure load(local result) {
         if project.loaded
             return (list(false, { ok: true }))
         result = project.config.load()

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.8+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.9+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
@@ -432,7 +432,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //
     // ### we need to update this for optional multiple-configuraiton builds
     //
-    procon.create = closure create(name, local error, data, configpath) {
+    procon.create = closure create(name, local error, data) {
         if procon.loaded
             return (list(Error("Project.create: project already loaded")))
         if validate(name)
@@ -476,7 +476,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //     Load the project, i.e. read the project configuration if valid. This is non-destructive.
     // The result is a standard error tuple with a dictionary result on success.
     //
-    procon.load = closure load(local error, data, info, configpath) {
+    procon.load = closure load(local error, data, info) {
         if procon.loaded
             return (list(false, procon.configDict))
         if validate()
@@ -599,7 +599,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //     Run the project by building and then launching.
     //
     procon.run = closure run(stage, buildonly, 
-        local error, rules, builder, buildpath, error, buildnum) {
+        local error, rules, builder, buildpath, buildnum) {
         `(error, rules) = buildrules(stage)
         if error
             return (list(error))
@@ -647,7 +647,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //  }
     //
     procon.publish = closure publish(stage, 
-        local error, rules, where, publish, error, outOptions, outfs, inpath) {
+        local error, rules, where, publish, outOptions, outfs, inpath) {
         `(error, rules) = buildrules(stage)
         if error
             return (list(error))

package/frameworks/running/debugnub.nlg

@@ -390,7 +390,7 @@ closure DebugNub(local nub, debug, paused) {
     //
     // Report all our breakpoints as an array of dictionary items.
     
-    nub.breakList = function breakList(local output, id, bp) {
+    nub.breakList = function breakList(local output, bpid) {
         output = []
         for bpid in debug.breakpoints
             output.push(breakInfo(bpid))

package/frameworks/running/executors.nlg

@@ -538,7 +538,7 @@ closure execLambda(track, url, name, workerID, local target, nlregex, clientID,
         // onmessage
         // A message was received from the worker via WebSockets.
         
-        target.ws.onmessage = function onmessage(e, local message, msg) {
+        target.ws.onmessage = function onmessage(e) {
             if target.msgQueue
                 target.msgQueue.push(e.data)
             else

package/frameworks/running/sourcecode.nlg

@@ -79,7 +79,7 @@ closure CodeManager(options,  local coman, cache)
     // standard `(error, expr) format. The optional locals are symbols to provide context.
     //
     coman.parseExprs = function parseExprs(texts, locals,
-        local output, text, source, registry, dialect, error, expr)
+        local output, text, source, registry, dialect)
     {
         output = []
         for text in texts {
@@ -124,7 +124,7 @@ closure CodeManager(options,  local coman, cache)
     //
     //     Get a CodeComposite from our cache, or false.
     
-    coman.cachGet = function cachGet(cocode, manifest, local entry, item, mandefs) {
+    coman.cachGet = function cachGet(cocode, manifest, local item, mandefs) {
         if cache.modname != cocode.modname || cache.compname != cocode.compname || cache.manifest != manifest
             return (false)
         for item in manifest

package/frameworks/storage/csv.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2022 by Richard C. Zulch
+ * Copyright (c) 2022-2023 by Richard C. Zulch
  *
  */
 
@@ -84,7 +84,7 @@ function csvPrint(rows, local output, quoter, row, line, delim, col) {
  *
  */
 
-closure csvQuoteGenerator(delimiter, local rxComma, rxQuote) {
+closure csvQuoteGenerator(delimiter, local rxDelimiter, rxQuote) {
     if !delimiter
         delimiter = ','
     rxDelimiter = RegExp('['.concat('"\\', delimiter, ']'))

package/frameworks/storage/dbt_pouch.nlg

@@ -7,7 +7,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2023 by Richard C. Zulch
  *
  */
 

package/frameworks/storage/psm.nlg

@@ -396,7 +396,7 @@ closure MakePSMutil(fs, local util) {
  *
  */
 
-closure MakePSM(dbname, local psm) {
+closure MakePSM(dbname) {
     ResourceManager(dbname, "PSM_locations/")
 };
 

package/frameworks/storage/psm_dbtables.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -36,7 +36,7 @@
  *
  */
 
-closure FSview(table, rootpath, local view, error) {
+closure FSview(table, rootpath, local view) {
     if !table
         return (list(Error("invalid arguments")))
     view = new(object, this)
@@ -676,7 +676,7 @@ closure FSview(table, rootpath, local view, error) {
             }
             children: []
         }
-        dbDirRecords(path, false, function(error, data, local item, result, slashdex, offset, finfo) {
+        dbDirRecords(path, false, function(error, data, local item, slashdex, offset, finfo) {
             if error
                 return (callback(error))
             if data.rows.length == 0 && path != ""
@@ -716,7 +716,7 @@ closure FSview(table, rootpath, local view, error) {
     //
     // Read a directory at the specified path
     
-    view.readir = closure readir(path, callback, local name, dirdict) {
+    view.readir = closure readir(path, callback) {
         dirList(path, { stat: true }, callback)
     }
 

package/frameworks/storage/resources.nlg

@@ -181,9 +181,10 @@ closure ResourceManager(dbname, prefix, local reman, watch, result) {
     //
     // Return an array of labels for the registered connectors.
     reman.labels = function labels(local classID, labels) {
+        debuglog("ResourceManager.labels is broken")
         labels = []
         for remanID in reman.conns.*
-            labels.push(reman.conns[classID].label)
+            labels.push(reman.conns[classID].label)                         // ### classID?
         labels
     }
         
@@ -329,7 +330,7 @@ closure ResourceTracker(reman, local retor, watch) {
     //
     // Update credentials for accessing a resource, returning the added credential record.
     
-    retor.updateResource = function updateResource(resID, resource, local error, classI) {
+    retor.updateResource = function updateResource(resID, resource, local error, classID) {
         `(error, classID) = resourceClassID(resID)
         if error
             list(error)

package/lib/browser/env_web.js

@@ -520,7 +520,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.8+1";
+        statedoc.verstring = "1.0.9+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -538,7 +538,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.8+1")
+            || statedoc.verstring != "1.0.9+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -597,7 +597,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.8+1"
+                    title: vsiteName + " 1.0.9+1"
                 });
             }
         } catch (e) {
@@ -611,7 +611,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.8+1"
+                    title: vsiteName + " 1.0.9+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -626,8 +626,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.8+1";;\r\n'
-                + 'App.cache = "a7694c55ac4ee13a1946011bac913099";;\r\n'
+            cmd: 'App.version = "1.0.9+1";;\r\n'
+                + 'App.cache = "56a3661c1caa5c6ed3781ffcad84acf4";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });