@naanlang/naan 1.3.2 → 1.4.0

package/lib/env_nodeworker.js

@@ -164,6 +164,8 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                 naanlib.textLine(msg.text);                                 // keyboard text from terminal
             else if (msg.id == "start")
             {                                                               // start execution with optional state
+                workSelf.workerID = msg.workerID;
+                workSelf.workerGUID = msg.workerGUID;
                 if (typeof(__dirname) !== "undefined")
                     naanlib.js.h = naanlib.js.d;                            // set host directory path
                 if (msg.dirpath)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.3.2",
+    "version": "1.4.0",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/plugins/gitClient/gitutils.nlg

@@ -213,7 +213,7 @@ closure GitTree(local fs, reporoot, gtree, repodir, stagedir) {
     closure fileHash(fspath, callback) {
         if !callback
             return (syncAdapter(fileHash, fspath))
-        fs.readFile(fspath, false, function(error, strdata, local hash) {
+        fs.readFile(fspath, false, function(error, strdata) {
             if error
                 callback(error)
             else
@@ -1025,7 +1025,7 @@ closure GitTree(local fs, reporoot, gtree, repodir, stagedir) {
 
         // comrecur
         // Recursively copy portions of tree that should be in commit.
-        function comrecur(input, parpath, chout, local node, nodout, path, action) {
+        function comrecur(input, parpath, chout, local node, nodout, path) {
             for node in input {
                 nodout = { name: node.name }
                 path = joinode(parpath, node)

package/plugins/nodeLib/node_https.nlg

@@ -17,7 +17,7 @@
  *
  */
 
-closure HttpsGetJson(hostname, pathname, query, local https, options, pending, req) {
+closure HttpsGetJson(hostname, pathname, query, local options, pending, req) {
     if query
         pathname = EncodeQuery(pathname.concat("?"), query)
     debuglog("HttpsGetJson", hostname, pathname)
@@ -55,7 +55,7 @@ closure HttpsGetJson(hostname, pathname, query, local https, options, pending, r
  */
 
 closure HttpsDownloadFile(hostname, pathname, query, filepath,
-    local dirpath, error, pending, writeStream, options, req)
+    local error, pending, writeStream, options, req)
 {
     filepath = nodePath.resolve("/tmp", filepath)
     if query

package/plugins/serviceAws/lambda_naan_control.nlg

@@ -33,7 +33,7 @@ closure lancoRest(local url, client) {
         request.addEventListener("error", function reqFailed(event, local errtext) {
             if request.status == 0
                 errtext = "connectivity"
-            ellse
+            else
                 errtext = "request failed"
             error = Error(errtext, {
                 status: request.status
@@ -92,7 +92,7 @@ closure lancoWs(local url, laws) {
         // onmessage
         // A message was received from the worker via WebSockets.
         
-        laws.ws.onmessage = function onmessage(e, local message, msg) {
+        laws.ws.onmessage = function onmessage(e) {
             laws.doMessage(e.data)
         }
         
@@ -114,7 +114,7 @@ closure lancoWs(local url, laws) {
     // doMessage
     //
     //     Process the specified undecoded message.
-    laws.doMessage = function doMessage(text, local message, msg) {
+    laws.doMessage = function doMessage(text, local message) {
         try {
             message = new(JSONparse(text))
         } catch {

package/plugins/serviceGC/gc_api.nlg

@@ -26,7 +26,7 @@
  */
 
 closure GcApi(options, local gcapi, cacert, renew, access_token, expires_at) {
-    global(https, JSpath)
+    global(js, https, JSpath)
     gcapi = new(object, this)
     if options.preview {
         gcapi.urlbase = "https://gigachat-preview.devices.sberbank.ru/api/v1/"

package/plugins/serviceGitHub/gitops.nlg

@@ -244,7 +244,7 @@ closure GitHubRepo(access, repodict, local gepo, url) {
     // Return a list of commits in the repo, optionally matching the specified file path.
     //
     //
-    gepo.commits = closure commits(filepath, local pardict, query, error, response, result) {
+    gepo.commits = closure commits(filepath, local pardict, query) {
         pardict = {
             per_page: 100
         }
@@ -420,7 +420,8 @@ closure GitHubRepo(access, repodict, local gepo, url) {
     //      ref:  <commit>      - branch, tag or commit hash, default to main branch
     //  }
     //
-    gepo.readfile = closure readfile(filepath, options, local ref, params, query, method, error, response, result) {
+    gepo.readfile = closure readfile(filepath, options
+        local ref, params, query) {
         if !string(filepath)
             return (list(Error("filepath must be a string:", filepath)))
         ref = options.ref
@@ -489,7 +490,7 @@ closure GitHubRepo(access, repodict, local gepo, url) {
 
 gtopParseLinkHeaderRegExp;
 
-function gtopParseLinkHeader(header, local segment, output) {
+function gtopParseLinkHeader(header, local output) {
     if !jsInstanceOf(gtopParseLinkHeaderRegExp, RegExp.prototype)
         gtopParseLinkHeaderRegExp = RegExp('<([^?]+\\?[=\\w&?]+page=(\\d+))>;\\s*rel="(\\w+)"', 'g')
     output = { }

package/plugins/serviceGitHub/psm_github.nlg

@@ -183,7 +183,7 @@ closure phubConnector(psm, local connClassID, connector, watch) {
     //
     // Connect to an ghub bucket filesystem, returning a view.
     
-    connector.connect = function connect(resID, service, args, local error,  ghub, gitremote, table) {
+    connector.connect = function connect(resID, service, args, local error,  ghub, gitremote) {
         `(error, ghub) = connector.access(resID)
         if !error
             `(error, gitremote) = GitHubOps(ghub)                           // get GitHub as a git remote

package/plugins/serviceGitLab/gitops.nlg

@@ -464,7 +464,8 @@ closure GitLabRepo(access, repodict, local gepo, url) {
     //      head: <boolean>     - true to obtain metadata only without contents
     //  }
     //
-    gepo.readfile = closure readfile(filepath, options, local ref, params, query, method, error, response, result) {
+    gepo.readfile = closure readfile(filepath, options
+        local ref, params, query, method) {
         if !string(filepath)
             return (list(Error("filepath must be a string:", filepath)))
         ref = options.ref

package/plugins/serviceGitLab/psm_gitlab.nlg

@@ -183,7 +183,7 @@ closure plabConnector(psm, local connClassID, connector, watch) {
     //
     // Connect to an GitLab filesystem.
     
-    connector.connect = function connect(resID, service, args, local error,  glab, gitremote, table) {
+    connector.connect = function connect(resID, service, args, local error,  glab, gitremote) {
         `(error, glab) = connector.access(resID)
         if !error
             `(error, gitremote) = GitLabOps(glab)                           // get GitLab as a git remote

package/plugins/serviceYC/yc_vm.nlg

@@ -22,7 +22,7 @@ vmState = false;
  */
 
 closure VmControl(local ycvm) {
-    global(https, nodeHttp, vmState)
+    global(js, https, nodeHttp, vmState)
     if vmState.ycvm
         return (vmState.ycvm)                                               // singleton
     ycvm = new(object, this)

package/test/test_02_context.nlg

@@ -263,7 +263,7 @@ RegisterTestCategory("context", [
     //
     
     [ "closure Xx(y, local xx) { xx = new(object, this) };", "Xx" ],
-    [ "x = Xx(33);", "Object{0}" ],
+    [ "x = Xx(33);", "{object Xx}" ],
     [ "car(x@\\.closure.proc.2.0)", "33" ],
     [ "new(object, 3)@*", "false" ]
 ]);

package/test/test_07_lingo.nlg

@@ -646,18 +646,18 @@ RegisterTestCategory("Lingo", [
     [ "closure myob(initv, local myob) {\n"
         "    myob = new(object)\n"
         "    myob.value = initv\n"
-        "    myob.\\.tostring = function \\.tostring(obj) {\n"
+        "    myob@\\.tostring = function \\.tostring(obj) {\n"
         "        \"myob-\".concat(myob.value) }\n"
         "    myob };",
         "myob" ],
-    [ "myob(3);>", "Object{2}" ],
+    [ "myob(3);>", "Object{1}" ],
     [ "myob(3);", "myob-3" ],
     
     //
     // dialects
     //
     
-    [ "dt = Dialect.derive('test');", "Object{22}" ],
+    [ "dt = Dialect.derive('test');", "{object dialect}" ],
     [ "dt.redefine(`^, function(x,y,local z) {z=1,while y-- > 0 z *= x,z});", "^" ],
     [ "$$ = dt.parse(new(textstream, '2^9;'));", "(false, 2^9)" ],
     [ "eval($$);", "(false, 512)" ],