@naanlang/naan 1.0.9 → 1.0.11

package/plugins/serviceAws/aws_cloudwatchlogs.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2023 by Richard C. Zulch
  *
  */
 
@@ -61,7 +61,7 @@ closure CloudWatchLogs(local cwlogs) {
     // describeLogStreams
     //
     cwlogs.describeLogStreams = closure describeLogStreams(name, options,
-        local params, remaining, output, error)
+        local params, output, error)
     {
         params = {
             logGroupName: name
@@ -83,7 +83,7 @@ closure CloudWatchLogs(local cwlogs) {
     // getLogEvents
     //
     cwlogs.getLogEvents = closure getLogEvents(groupName, streamName, options
-        local params, remaining, output, error)
+        local params, output, error)
     {
         params = {
             logGroupName: groupName

package/plugins/serviceAws/aws_dynamo.nlg

@@ -250,12 +250,7 @@ closure DynaConverter(local conv) {
         if dtype == "BS" || dtype == "SS"
             dvalue
         else if dtype == "NS"
-            new(dvalue).map(function(item) {
-                if item.indexOf(".") >= 0
-                    Number.parseFloat(item)
-                else
-                    Number.parseInt(item)
-            })
+            new(dvalue).map(Number.parseFloat(item))
         else if dtype == "M"
             recordDynToNaan(dvalue)
         else if dtype == "L"
@@ -265,11 +260,8 @@ closure DynaConverter(local conv) {
             })
         else if dtype == "BOOL"
             dvalue && true
-        else if dtype == "N" {
-            if dvalue.indexOf(".") >= 0
-                Number.parseFloat(dvalue)
-            else
-                Number.parseInt(dvalue) }
+        else if dtype == "N"
+            Number.parseFloat(dvalue)
         else if dtype == "NULL"
             null
         else if dtype == "B" || dtype == "S"
@@ -567,7 +559,8 @@ closure DynaTable(dyna, tablename, local table) {
                     else if key.AttributeName == output.range
                         output.rangeType = dyna.conv.fieldTypeDynToNaan(key.AttributeType)
                 table.hashKey = compress(output.hash)                       // hash attribute name
-                table.rangeKey = compress(output.range)                     // range attribute name or false
+                if output.range
+                    table.rangeKey = compress(output.range)                 // range attribute name or false
             }
             pending.signal(list(error, output))
         })
@@ -842,9 +835,9 @@ closure DynaTable(dyna, tablename, local table) {
             processed = doneCB(data)
             if processed
                 remaining -= processed
+            params.ExclusiveStartKey = data.LastEvaluatedKey
             if processed && remaining > 0 && data.LastEvaluatedKey {
                 params.limit = remaining                                // set up for next iteration
-                params.ExclusiveStartKey = data.LastEvaluatedKey
                 true                                                    // continue looping
             }
         })
@@ -862,7 +855,7 @@ closure DynaTable(dyna, tablename, local table) {
     //      attmap:         <dictionary>                                    // map attribute names to #shortcuts
     //      reverse:        <boolean>                                       // reverse order
     //      project:        <array>                                         // project only specified attributes
-    //      exstart:        <exclusive start key>                           // for paging
+    //      paging:         <exclusive start key>                           // for paging; updated each call
     //      limit:          <number>                                        // maximum count of results
     //  }
     //
@@ -907,8 +900,8 @@ closure DynaTable(dyna, tablename, local table) {
             params.ScanIndexForward = false
         if options.project
             params.ProjectionExpression = options.project.join(", ")
-        if options.exstart
-            params.ExclusiveStartKey = options.exstart
+        if options.paging
+            params.ExclusiveStartKey = options.paging
         output = []
         `(error) = dynQueryPager(`query, params, options.limit, function(data) {
             if data.Count > 0
@@ -919,6 +912,7 @@ closure DynaTable(dyna, tablename, local table) {
             error = Error("table.queryRecords(".concat(tablename, ") failed"), error)
             output = false
         }
+        options.paging = params.ExclusiveStartKey
         list(error, output)
     }
 
@@ -931,7 +925,7 @@ closure DynaTable(dyna, tablename, local table) {
     //      filter:     <key-expression>                                    // conditions for items to return
     //      attmap:     <dictionary>                                        // map attribute names to #shortcuts
     //      project:    <array>                                             // project only specified attributes
-    //      exstart:    <exclusive start key>                               // for paging
+    //      paging:     <exclusive start key>                               // for paging; updated each call
     //      limit:      <number>                                            // maximum count of results
     //  }
     //
@@ -957,8 +951,8 @@ closure DynaTable(dyna, tablename, local table) {
             params.ExpressionAttributeNames = attmap
         if options.project
             params.ProjectionExpression = options.project.join(", ")
-        if options.exstart
-            params.ExclusiveStartKey = options.exstart
+        if options.paging
+            params.ExclusiveStartKey = options.paging
         output = []
         `(error) = dynQueryPager(`scan, params, options.limit, function(data) {
             if data.Count >= 0
@@ -969,6 +963,7 @@ closure DynaTable(dyna, tablename, local table) {
             error = Error("table.scanRecords(".concat(tablename, ") failed"), error)
             output = false
         }
+        options.paging = params.ExclusiveStartKey
         list(error, output)
     }
 

package/plugins/serviceAws/aws_sqs.nlg

@@ -68,7 +68,11 @@ closure SQS(local sqs) {
     // sendMessage
     //
     sqs.sendMessage = closure sendMessage(queueUrl, msgBody, local params, pending) {
-        debuglog("SQS.sendMessage:", awsSDK, sqs.aws, sqs.aws.sendMessage)
+        if !sqs.aws || !queueUrl {
+            error = Error("SQS.sendMessage: invalid arguments", sqs.aws)
+            ErrorDebuglog(error)
+            return (list(error))
+        }
         params = {
             MessageBody: msgBody
             QueueUrl: queueUrl

package/plugins/serviceAws/dbt_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -77,7 +77,7 @@ closure dawsBucket(s3b, local bucket, s3) {
 
         function s3GetCB(error, resp) {
             if error
-                error = Error("can't get object", error, key)
+                error = Error("can't get object", { status: error.$metadata.httpStatusCode }, error, key)
             else
                 resp.md5 = hashFromETag(resp.ETag)
             callback(error, resp)
@@ -162,7 +162,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         md5 = HashMD5(data)                                                 // hex character string
         s3.putObject(params, function(error, resp) {
             if error
-                error = Error("can't put object", error, key)
+                error = Error("can't put object", { status: error.$metadata.httpStatusCode }, error, key)
             else {
                 resp.length = length(data)
                 resp.md5 = hashFromETag(resp.ETag)
@@ -188,7 +188,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         }
         s3.deleteObject(params, function(error, resp) {
             if error
-                error = Error("can't delete object", error, key)
+                error = Error("can't delete object", { status: error.$metadata.httpStatusCode }, error, key)
             callback(error, resp)
         })
     }
@@ -209,7 +209,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         }
         s3.copyObject(params, function(error, resp) {
             if error
-                error = Error("can't copy object", error)
+                error = Error("can't copy object", { status: error.$metadata.httpStatusCode }, error)
             callback(error, resp)
         })
     }
@@ -245,7 +245,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         function listOne() {                                                // list one chunk of objects
             s3.listObjectsV2(params, function(error, resp) {
                 if error
-                    callback(Error("list objects failed", error))
+                    callback(Error("list objects failed", { status: error.$metadata.httpStatusCode }, error))
                 else {
                     if output {
                         output.Contents = output.Contents.concat(resp.Contents)
@@ -440,7 +440,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             cacheControl: tableOptions.cacheControl
         }, function(error, resp) {
             if error
-                error = Error("add failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("add failed", error, id, { status: error.status })
             else {
                 doc._md5 = resp.md5                                         // update the original doc
                 doc.length = resp.length }
@@ -463,7 +463,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             cacheControl: tableOptions.cacheControl
         }, function(error, resp) {
             if error
-                error = Error("update failed", error, doc._id, { status: error.$metadata.httpStatusCode })
+                error = Error("update failed", error, doc._id, { status: error.status })
             else {
                 doc._md5 = resp.md5                                         // update the original doc
                 doc.modified = undefined                                    // we don't know exact modify date
@@ -484,7 +484,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, Error("invalid argument")))
         database.bucket.delete(doc._id, function(error, resp) {
             if error
-                error = Error("delete failed", error, doc._id, { status: error.$metadata.httpStatusCode })
+                error = Error("delete failed", error, doc._id, { status: error.status })
             callback(error, resp)
         })
     }
@@ -501,7 +501,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, id))                              // error from makeID
         database.bucket.get(id, false, function(error, resp) {
             if error
-                error = Error("get failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("get failed", error, id, { status: error.status })
             else {
                 resp.key = key
                 resp = s3resp2doc(resp)
@@ -536,7 +536,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, id))                                 // error from makeID
         database.bucket.get(id, true, function(error, resp) {
             if error
-                error = Error("md5 failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("md5 failed", error, id, { status: error.status })
             else if resp._md5
                 resp = resp._md5
             else
@@ -561,7 +561,7 @@ closure dawsTable(database, path, tableOptions, local table) {
         if id.slice(-1) == "/"
             database.bucket.list(id.slice(0,-1), true, function blcb(error, resp) {
                 if error
-                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
+                    error = Error("head failed", error, id, { status: error.status })
                 else if id != resp.CommonPrefixes.0.Prefix {
                     error = Error("head not found", id, resp.CommonPrefixes.0.Prefix, { status: 404 })
                     resp = false
@@ -575,7 +575,7 @@ closure dawsTable(database, path, tableOptions, local table) {
         else
             database.bucket.get(id, true, function bgcb(error, resp) {
                 if error
-                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
+                    error = Error("head failed", error, id, { status: error.status })
                 else {
                     resp.key = key
                     resp = s3resp2doc(resp)
@@ -602,7 +602,7 @@ closure dawsTable(database, path, tableOptions, local table) {
                 error = Error("copy failed", {
                     source: srckey
                     destination: destkey
-                    status: error.$metadata.httpStatusCode
+                    status: error.status
                 }, error)
             callback(error, resp)
         })
@@ -694,7 +694,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             s3prefix = table.s3prefix
         database.bucket.list(s3prefix, !options.deep, function(error, objects, local obj, key) {
             if error
-                error = Error("records list failed", error, options.prefix, { status: error.$metadata.httpStatusCode })
+                error = Error("records list failed", error, options.prefix, { status: error.status })
             else {
                 for obj in objects.Contents {
                     if obj.Key.startsWith(table.s3prefix)

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));", "173"],
+    [ "length(symlist(nsactive(true).0));", "171"],
     [ "testvar;", "testvar" ],
     [ "function setTestvar(v) { testvar=v };", "setTestvar" ],
     [ "naanvar;", "naanvar" ],

package/test/test_03_jsinterop.nlg

@@ -55,7 +55,10 @@ RegisterTestCategory("JSinterop", [
 
     [ "sqrt = false;", "false" ],
     [ "Math.sqrt(9);", "3" ],                                               // ensure method selector is not evalulated
-    
+        
+    [ "merge({ a:3, b:4 }, { a:6, c:7, d:8, e:`(x, y, z) }, xnew({ d:77, f:88 }));",
+        "{ a: 6, b: 4, c: 7, d: 77, e: (x, y, z), f: 88 }"],
+
     [ "xnew(js.g.Promise, function() {});", "[object Promise]" ],
     
     

package/test/test_07_lingo.nlg

@@ -108,7 +108,8 @@ RegisterTestCategory("Lingo", [
     //
         
     [ "false <=> false;", "0" ],
-    [ "false <=> true;", "0" ],
+    [ "false <=> true;", "1" ],
+    [ "true <=> false;", "-1" ],
     [ "'a' <=> 'a';", "0" ],
     [ "'a' <=> 'b';", "-1" ],
     [ "'b' <=> 'a';", "1" ],