@naanlang/naan 1.3.2 → 1.4.1

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.1",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/plugins/gitClient/gitClient.nlg

@@ -54,9 +54,9 @@ function gitcInit(local manifest) {
     })
     nideCommon = require("nideCommon/nideCommon.nlg")
     letimport(nideCommon)
-    require("plugins/gitClient/clientops.nlg")
-    require("plugins/gitClient/gitutils.nlg")
-    gitcRequireJS("plugins/gitClient/minimatch.js", function(error, result) {
+    require("./clientops.nlg")
+    require("./gitutils.nlg")
+    gitcRequireJS("./minimatch.js", function(error, result) {
         if error
             ErrorDebugLog(error)
     })

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/openSearch/openSearch.nlg

@@ -567,8 +567,8 @@ function opseInit(local manifest) {
 
     Naan.module.build(module.id, "openSearch", function(modobj, compobj) {
         compobj.manifest = manifest
-        require("frameworks/common").LiveImport()
-        letimport(require("frameworks/node/https_request.nlg"))
+        require("naanlib:frameworks/common").LiveImport()
+        letimport(require("naanlib:frameworks/node/https_request.nlg"))
         modobj.exports.OpenSearchClient = OpenSearchClient
     })
 } ();

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/serviceAws/psm_aws.nlg

@@ -252,6 +252,8 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     
     connector.connect = function connect(resID, service, args,
         local error,  s3b, db, rootpath, table) {
+        if !resID || args && !tuple(args)
+            return (list(Error("invalid arguments")))
         `(error, s3b) = connector.access(resID)
         if !error
             `(error, db) = S3DB(s3b, args.1)                                // get S3 bucket as a database
@@ -262,12 +264,12 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
         else if service == "NideFS" {
             rootpath = args.0                                               // connect to a NideFS filesystem
             if !rootpath
-                return (Error("mandatory rootpath missing"))
+                return (list(Error("mandatory rootpath missing")))
             `(error, table) = db.table(rootpath, args.1)                    // args.1 is table options; see dawsTable
             if error
                 list(error)
             else
-                require("frameworks/storage/psm_dbtables.nlg").FSview(table, rootpath)
+                require("naanlib:frameworks/storage/psm_dbtables.nlg").FSview(table, rootpath)
         } else
             list(Error("unsupported service", service))
     }

package/plugins/serviceAws/serviceAws.nlg

@@ -23,7 +23,7 @@ function sawsInit(local manifest) {
 
     Naan.module.build(module.id, "serviceAws", function(modobj, compobj) {
         compobj.manifest = manifest
-        require("frameworks/common").LiveImport()
+        require("naanlib:frameworks/common").LiveImport()
         require("./aws_utils.nlg")
         function sawsPostload() {
             if js.g

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/"
@@ -74,7 +74,7 @@ closure GcApi(options, local gcapi, cacert, renew, access_token, expires_at) {
     //
     // Make an HTTPS request on the API, renewing the access token first if needed.
     //
-    closure request(url, put, local error, data, status) {
+    closure request(url, put, sseHook, local error, data, status) {
         if !(milliseconds() < expires_at - 60000) {
             `(error, data) = auth(renew)
             if error
@@ -87,7 +87,7 @@ closure GcApi(options, local gcapi, cacert, renew, access_token, expires_at) {
                 `(Accept, "application/json"),
                 list(`Authorization, "Bearer ".concat(access_token))
             ]
-            sseHook: options.sseHook || undefined
+            sseHook: sseHook || options.sseHook || undefined
         })
         if error
             list(error)
@@ -172,13 +172,13 @@ closure GcApi(options, local gcapi, cacert, renew, access_token, expires_at) {
     //      object:             <string>
     //  }
     //
-    gcapi.chatCompletion = closure chatCompletion(query) {
+    gcapi.chatCompletion = closure chatCompletion(query, sseHook) {
         if options.preview {
             query = new(query)
             if !query.model.endsWith("-preview")
                 query.model = query.model.concat("-preview")
         }
-        request(gcapi.urlbase.concat("chat/completions"), query)
+        request(gcapi.urlbase.concat("chat/completions"), query, sseHook)
     }
     
     // uploadFile

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/serviceGitHub/serviceGitHub.nlg

@@ -60,6 +60,6 @@ function ghubInit(local manifest) {
     Naan.module.build(module.id, "serviceGitHub", function(modobj, compobj) {
         compobj.manifest = manifest
     })
-    require("frameworks/common", { in: naanlib }).LiveImport()
+    require("naanlib:frameworks/common").LiveImport()
     require("./psm_github.nlg").GitHubConnector(App.psm)
 } ();

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

@@ -20,7 +20,7 @@
 
 closure plabConnector(psm, local connClassID, connector, watch) {
     connClassID = "GLAB"
-    require("plugins/serviceGitLab/gitops.nlg")
+    require("./gitops.nlg")
     connector = new(object, this)
     connector.psm = psm
     connector.vault = psm.vault(connClassID)
@@ -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/serviceGitLab/serviceGitLab.nlg

@@ -60,6 +60,6 @@ function glabInit(local manifest) {
     Naan.module.build(module.id, "serviceGitLab", function(modobj, compobj) {
         compobj.manifest = manifest
     })
-    require("frameworks/common", { in: naanlib }).LiveImport()
+    require("naanlib:frameworks/common").LiveImport()
     require("./psm_gitlab.nlg").GitLabConnector(App.psm)
 } ();

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/harness.nlg

@@ -83,15 +83,15 @@ closure Parsenv(name, local penv, gohome, lingo, naansym) {
                     `(errors, expr) = lingo.parse(source)
                     for error in errors
                         output.errors.push(penv.lib.ParseErrorString(error))
-                    if expr {
-                        output.exprs.push(expr)
-                        expr = function() { evalactive(expr) }()            // return here if return executed outside procedure
-                        output.results.push(expr)
-                        if source.tokenlast().atom == `;>
-                            output.pretty.push(tostring(expr, { quote: true }))
-                        else if source.tokenlast().atom != `;;
-                            output.pretty.push(lingo.print(expr))
-                    }
+                    output.exprs.push(expr)
+                    expr = function() { evalactive(expr) }()                // return here if return executed outside procedure
+                    output.results.push(expr)
+                    if expr === Naan.local.mu
+                        { }
+                    else if source.tokenlast().atom == `;>
+                        output.pretty.push(tostring(expr, { quote: true }))
+                    else if source.tokenlast().atom != `;;
+                        output.pretty.push(lingo.print(expr))
                 } finally {
                     sudo(putproc(`exception, savex)) }
             }

package/test/test_01_core.nlg

@@ -23,7 +23,7 @@ RegisterTestCategory("core", [
     // booleans and/or undefined
     //
     
-    [ "false;", "" ],
+    [ "false;", "false" ],
     [ "true;", "true" ],
     [ "not true;", "false" ],
     [ "not false;", "true" ],
@@ -61,9 +61,16 @@ RegisterTestCategory("core", [
     [ "lambda(unintern(\"lambda\"));", "true" ],
 
     [ "car(`;);", ";" ],
+    
+    [ "null;", "null" ],
+    [ "null();", "(null)" ],
+    [ "mu;", "mu" ],
+    [ "mu();", "" ],
+    [ "mu.tostring;", '"mu"' ],
+    [ "mu().tostring;", '"mu"' ],
 
     //
-    // basic lists and dotted pairs
+    // basic tuples and dotted pairs
     //
     
     [ "`();>", "false" ],
@@ -82,6 +89,21 @@ RegisterTestCategory("core", [
     [ "`((a . b) . (c d));>", "((a . b) c d)" ],
     [ "`((a b) . (c . d));>", "((a b) c . d)" ],
 
+    //
+    // tuple manipulation
+    //
+    
+    [ "append(`(a,b,c), d, `(e,f));>", "(a b c d e f)" ],
+    [ "append(`(3), `((4)));>", "(3 (4))" ],
+    [ "append(`(3), 5);>", "(3 5)" ],
+    [ "append(3, 4, 5);>", "(3 4 5)" ],
+
+    [ "subatq(list(a,3), list(a, 4));", "list(4, 3)" ],
+    [ "subatq(list(a,3), [list(a, 4)]);", "list(4, 3)" ],
+    [ "subatq(function joe(x) { 4*x }, [list(joe, bob), list(x,y)]);>",
+        "(Lib::defproc function bob (y) (* 4 y))" ],
+    [ "subat(list(a, { b: c }, [d, e]), [list(a,1), list(b,2), list(c,3), list(e,d), list(d,e)]);",
+        "(1, { 2: 3 }, [e, d])" ],
 
     //
     // assignment

package/test/test_02_context.nlg

@@ -38,7 +38,7 @@ RegisterTestCategory("context", [
     [ "function setNS(ns) { ns=reverse(ns),sudo(nsactive(reverse(ns, defNS))) };", "setNS" ],
     [ "x;", "x" ],
     [ "y;", "y" ],
-    [ "length(symlist(nsactive(true).0));", "171"],
+    [ "length(symlist(nsactive(true).0));", "173"],
     [ "testvar;", "testvar" ],
     [ "function setTestvar(v) { testvar=v };", "setTestvar" ],
     [ "naanvar;", "naanvar" ],
@@ -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)" ],

package/plugins/serviceGC/russian_trusted_root_ca_pem.crt

@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
-PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
-ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
-Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS
-VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
-YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v
-dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n
-qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q
-XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U
-zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX
-YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y
-Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD
-U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD
-4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9
-G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH
-BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX
-ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa
-OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf
-BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS
-BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH
-tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq
-W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+
-/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS
-AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj
-C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV
-4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d
-WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ
-D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC
-EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq
-391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4=
------END CERTIFICATE-----