@naanlang/naan 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "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/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/aws_s3.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -41,6 +41,22 @@ closure S3bucket(s3, name, bucketOptions, local bucket) {
         pending.wait()
     }
 
+    //
+    // get
+    //
+    bucket.get = closure get(key, local pending) {
+        pending = new(nonce)
+        s3.aws.getObject({
+            Bucket: bucket.name
+            Key: key
+        }, function (error, data) {
+            if error
+                error = Error("S3bucket.get failed:", error.name, "key:", key, "in", bucket.name)
+            pending.signal(list(error, data))
+        })
+        pending.wait()
+    }
+
     //
     // listObjects
     //

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

@@ -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/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/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)

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/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" ],