@naanlang/naan 1.4.4 → 1.5.0

package/package.json

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

package/plugins/serviceAws/aws_cloudwatchlogs.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure CloudWatchLogs(local cwlogs) {
+    global(awsSDK)
     cwlogs = new(object, this)
 
     //

package/plugins/serviceAws/aws_dynamo.nlg

@@ -1040,6 +1040,7 @@ closure DynaTable(dyna, tablename, options, local table) {
         params = {
             TableName: tablename
         }
+        output = []
         if options.index
             params.IndexName = options.index
         if options.filter {

package/plugins/serviceAws/aws_s3.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure S3bucket(s3, name, bucketOptions, local bucket) {
+    global()
     bucket = new(object, this)
     bucket.name = name
 
@@ -83,8 +84,6 @@ closure S3bucket(s3, name, bucketOptions, local bucket) {
     //  }
     //
     bucket.put = closure put(key, data, options, local params, pending) {
-        if !contentType
-            contentType = "application/octet-stream"
         params = {
             Bucket: bucket.name
             Key: key
@@ -246,6 +245,7 @@ closure S3bucket(s3, name, bucketOptions, local bucket) {
  */
 
 closure S3(local s3) {
+    global(awsSDK)
     s3 = new(object, this)
 
     //

package/plugins/serviceAws/aws_sqs.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023 by Richard C. Zulch
+ * Copyright (c) 2023-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure SqsMQ(sqs, queueUrl, local sqsq) {
+    global()
     sqsq = new(object, this)
 
     //
@@ -55,6 +56,7 @@ closure SqsMQ(sqs, queueUrl, local sqsq) {
  */
 
 closure SQS(local sqs) {
+    global(awsSDK)
     sqs = new(object, this)
 
     //

package/plugins/serviceAws/aws_utils.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure queryPager(apiobject, procname, params, xargs, doneCB, local pending, looping, result) {
+    global()
     if !apiobject[procname]
         return (list(Error("queryPager method undefined:", procname)))
     pending = new(nonce)
@@ -55,6 +56,7 @@ closure queryPager(apiobject, procname, params, xargs, doneCB, local pending, lo
  */
 
 function QueryPager args {
+    global()
     closure(local apiobject, procname, params, xargs, doneCB) {
         apiobject = pop(args)
         procname = pop(args)

package/plugins/serviceAws/dbt_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure dawsBucket(s3b, local bucket, s3) {
+    global(JSpath)
     bucket = new(object, this)
     s3 = s3b.s3
     bucket.name = s3b.bucketName
@@ -311,6 +312,7 @@ closure dawsBucket(s3b, local bucket, s3) {
  */
 
 closure dawsTable(database, path, tableOptions, local table) {
+    global(js, TextDecoder)
     table = new(object, this)
     table.type = database.type
     table.db = database
@@ -411,9 +413,10 @@ closure dawsTable(database, path, tableOptions, local table) {
 
     // add
     //
-    // Add a new record to the table with optional metadata. This will fail if the key already
-    // exists. The metadata is stored with the record and cannot be changed without calling update.
-    // Metadata keys cannot begin with underscore ("_").
+    // Add a new record to the table with options. This will fail if the key already exists. Optional
+    // metadata is stored with the record and cannot be changed without calling update. Metadata keys
+    // cannot begin with underscore ("_"). If optional cacheControl is not specified then the default
+    // tableOptions.cacheControl is used.
     //
     // The returned document, which can be used with update, has the following keys:
     //      key         - the key name of the record
@@ -421,26 +424,25 @@ closure dawsTable(database, path, tableOptions, local table) {
     //      md5         - the MD5 hash of the content
     //      <...>       - the various metadata keys
 
-    table.add = closure add(key, content, metadata, callback, local id, doc) {
+    table.add = closure add(key, content, options, callback, local id, doc) {
         if !callback
-            return (syncAdapter(add, key, content, metadata))
+            return (syncAdapter(add, key, content, options))
         id = makeID(key)
         if !string(id)
-            return (asyncResult(callback, id))                                 // error from makeID
-        if  metadata && !dictionary(metadata)
+            return (asyncResult(callback, id))                              // error from makeID
+        if  options.metadata && !dictionary(options.metadata)
             return (asyncResult(callback, Error("invalid arguments")))
-        if metadata
-            doc = new(metadata)                                             // start with metadata
+        if options.metadata
+            doc = new(options.metadata)                                     // start with metadata
         else
             doc = { }
         doc.key = key
         doc.id = id
         if content
             doc.content = content
-        metadata = metadata2s3(metadata)                                    // filter out any invalid metadata
         database.bucket.put(id, content, {
-            metadata: metadata
-            cacheControl: tableOptions.cacheControl
+            metadata: metadata2s3(options.metadata)                         // filter metadata for s3
+            cacheControl: options.cacheControl || tableOptions.cacheControl
         }, function(error, resp) {
             if error
                 error = Error("add failed", error, id, { status: error.status })
@@ -453,17 +455,17 @@ closure dawsTable(database, path, tableOptions, local table) {
 
     // update
     //
-    // Update a record in the table using the document previously returned by add or get.
+    // Update a record in the table using the document previously returned by add or get. Specify
+    // options to update those values, otherwise existing/default values are used.
 
-    table.update = closure update(doc, callback, local metadata) {
+    table.update = closure update(doc, options, callback) {
         if !callback
-            return (syncAdapter(update, doc))
+            return (syncAdapter(update, doc, options))
         if !doc._id || !doc._id.startsWith(table.s3prefix) || !doc._md5
             return (asyncResult(callback, Error("invalid argument")))
-        metadata = metadata2s3(doc)
         database.bucket.put(doc._id, doc.content, {
-            metadata: metadata
-            cacheControl: tableOptions.cacheControl
+            metadata: metadata2s3(options.metadata || doc)
+            cacheControl: options.cacheControl || tableOptions.cacheControl
         }, function(error, resp) {
             if error
                 error = Error("update failed", error, doc._id, { status: error.status })
@@ -519,7 +521,7 @@ closure dawsTable(database, path, tableOptions, local table) {
                     resp.content = readableStreamToArrayBuffer(resp.content)
                 else if jsTypedArray(resp.content)
                     resp.content = xnew(TextDecoder, "utf-8").decode(resp.content)
-                else if jsInstanceOf(resp.content, js.w.ReadableStream)
+                else if jsInstanceOf(resp.content, js.w.ReadableStream)     // for browsers only
                     resp.content = xnew(TextDecoder, "utf-8").decode(readableStreamToArrayBuffer(resp.content))
                 resp._id = id }
             callback(error, resp)

package/plugins/serviceAws/psm_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure psmaConnector(psm, local connClassID, connector, watch) {
+    global(awsSDK)
     connClassID = "S3DB"
     require("./dbt_aws.nlg")
     connector = new(object, this)

package/test/test_03_jsinterop.nlg

@@ -35,11 +35,11 @@ RegisterTestCategory("JSinterop", [
 
     [ "o(3);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
     }[    "prod"]],
     [ "o(Number);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
     }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],
@@ -158,6 +158,35 @@ RegisterTestCategory("JSinterop", [
     "    } }" ],
 
     [ "function&(top,local nth){ nth=0, loop { print(nth), closure(nth) { stacktrap(nth,function&(x) { print(\" loop-\",x,\"-\",nth) }) }(nth), if nth >= top break else nth = nth+1 }, }(9);",
-        "0 loop-Dictionary{0}-01 loop-Dictionary{0}-123456789 loop-true-2 loop-true-3 loop-true-4 loop-true-5 loop-true-6 loop-true-7 loop-true-8 loop-true-9|true" ]
+        "0 loop-Dictionary{0}-01 loop-Dictionary{0}-123456789 loop-true-2 loop-true-3 loop-true-4 loop-true-5 loop-true-6 loop-true-7 loop-true-8 loop-true-9|true" ],
+
+    //
+    // Callbacks
+    //
+
+    [ "function mycb() { mynon.wait(), 15 };", "mycb"],
+    [ "oocb=xnew()", "[object Object]" ],
+    [ "oocb.mycb=mycb.proc;>", "(function mycb false (`. mynon wait false) 15)" ],
+    [ "oocb.mycb();", "15" ],
+    [ "mynon = new(nonce);", "Nonce{3}" ],
+    [ "oocb.mycb();", "true" ],
+
+    [ "@\\.suspend = 7", "7" ],
+    [ "function mycb() { mynon.wait(), 16 };", "==> redefined: mycb|mycb"],
+    [ "oocb.mycb=mycb.proc;>", "(function mycb false (`. mynon wait false) 16)" ],
+    [ "oocb.mycb();", "7" ],
+
+    //
+    // JavaScript compiled functions
+    //
+    
+    [ "putproc(`arbyarb, 'return(_lib.pl(narg,nthf));');", "[Compiled arbyarb]" ],
+    [ "arbyarb(3,5,2,4);", "3524|4" ],
+
+    [ "putproc(`bobbuiltin, 'builtin: return(_lib.j2n(_lib.n2j(cx)+_lib.n2j(cy)+_lib.n2j(cz)));');", "[Compiled bobbuiltin]" ],
+    [ "bobbuiltin(1,2,3,4);", "6" ],
+
+    [ "putproc(`joemacro, 'macro: _lib.idle();return(_lib.j2n(_lib.n2j(args[1])(_lib.n2j(args[2][1]))));');", "[Compiled joemacro]" ],
+    [ "joemacro(function(x){x+1}, 8);", "9" ]
 
 ]);

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-----