@naanlang/naan 1.0.3 → 1.0.6

package/plugins/serviceAws/dbt_aws.nlg

@@ -11,18 +11,6 @@
  */
 
 
-/*
- * dawsValidateName
- *
- *     True iff the specified name is valid here.
- *
- */
-
-function dawsValidateName(key, path) {
-    
-};
-
-
 /*
  * dawsBucket
  *
@@ -33,12 +21,12 @@ function dawsValidateName(key, path) {
  *
  */
 
-closure dawsBucket(s3, local bucket) {
+closure dawsBucket(s3b, local bucket, s3) {
     bucket = new(object, this)
-    bucket.s3 = s3
-    bucket.name = s3.config.params.Bucket
-    bucket.region = s3.config.region
-    if not s3 || !string(bucket.region) || bucket.region.length == 0 || !string(bucket.name) || bucket.bucket.length == 0
+    s3 = s3b.s3
+    bucket.name = s3b.bucketName
+    bucket.region = s3b.region
+    if !s3 || !string(bucket.region) || bucket.region.length == 0 || !string(bucket.name) || bucket.bucket.length == 0
         return (list(Error("invalid S3 parameter")))
 
     // asyncResult
@@ -56,7 +44,7 @@ closure dawsBucket(s3, local bucket) {
     // that the bucket is still open before beginning (or continuing) any operations.
     
     bucket.close = function close() {
-        bucket.s3 = false                                                   // just remove access
+        bucket.s3 = s3 = false                                              // just remove access
         list(false, { })
     }
 
@@ -70,6 +58,7 @@ closure dawsBucket(s3, local bucket) {
         if !s3
             return (asyncResult(callback, Error("database closed")))
         params = {
+            Bucket: bucket.name
             Key: key
         }
 
@@ -100,6 +89,7 @@ closure dawsBucket(s3, local bucket) {
         if !s3
             return (asyncResult(callback, Error("database closed")))
         params = {
+            Bucket: bucket.name
             Key: key
         }
         if data {
@@ -110,6 +100,7 @@ closure dawsBucket(s3, local bucket) {
                 mimeType = {
                     "css":  "text/css",
                     "csv":  "text/csv",
+                    "gif":  "image/gif",
                     "htm":  "text/html",
                     "html": "text/html",
                     "ico":  "image/x-icon",
@@ -170,6 +161,7 @@ closure dawsBucket(s3, local bucket) {
         if !s3
             return (asyncResult(callback, Error("database closed")))
         params = {
+            Bucket: bucket.name
             Key:    key
         }
         s3.deleteObject(params, function(error, resp) {
@@ -251,7 +243,9 @@ closure dawsBucket(s3, local bucket) {
 
         if !s3
             return (asyncResult(callback, Error("database closed")))
-        params = { }
+        params = {
+            Bucket: bucket.name
+        }
         if string(prefix)
             params.Prefix = prefix
         if onelevel
@@ -402,7 +396,7 @@ closure dawsTable(database, path, local table) {
         metadata = metadata2s3(metadata)                                    // filter out any invalid metadata
         database.bucket.put(id, content, metadata, function(error, resp) {
             if error
-                error = Error("add failed", error, id, { status: error.statusCode })
+                error = Error("add failed", error, id, { status: error.$metadata.httpStatusCode })
             else {
                 doc.md5 = resp.md5                                          // update the original doc
                 doc.length = resp.length }
@@ -422,7 +416,7 @@ closure dawsTable(database, path, local table) {
         metadata = metadata2s3(doc)
         database.bucket.put(doc._id, doc.content, metadata, function(error, resp) {
             if error
-                error = Error("update failed", error, doc._id, { status: error.statusCode })
+                error = Error("update failed", error, doc._id, { status: error.$metadata.httpStatusCode })
             else {
                 doc.md5 = resp.md5                                          // update the original doc
                 doc.modified = undefined                                    // we don't know exact modify date
@@ -443,7 +437,7 @@ closure dawsTable(database, path, 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.statusCode })
+                error = Error("delete failed", error, doc._id, { status: error.$metadata.httpStatusCode })
             callback(error, resp)
         })
     }
@@ -460,7 +454,7 @@ closure dawsTable(database, path, 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.statusCode })
+                error = Error("get failed", error, id, { status: error.$metadata.httpStatusCode })
             else {
                 resp.key = key
                 resp = s3resp2doc(resp)
@@ -493,7 +487,7 @@ closure dawsTable(database, path, 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.statusCode })
+                error = Error("md5 failed", error, id, { status: error.$metadata.httpStatusCode })
             else if resp._md5
                 resp = resp._md5
             else
@@ -518,7 +512,7 @@ closure dawsTable(database, path, 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.statusCode })
+                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
                 else if id != resp.CommonPrefixes.0.Prefix {
                     error = Error("head not found", id, resp.CommonPrefixes.0.Prefix, { status: 404 })
                     resp = false
@@ -532,7 +526,7 @@ closure dawsTable(database, path, local table) {
         else
             database.bucket.get(id, true, function bgcb(error, resp) {
                 if error
-                    error = Error("head failed", error, id, { status: error.statusCode })
+                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
                 else {
                     resp.key = key
                     resp = s3resp2doc(resp)
@@ -559,7 +553,7 @@ closure dawsTable(database, path, local table) {
                 error = Error("copy failed", {
                     source: srckey
                     destination: destkey
-                    status: error.statusCode
+                    status: error.$metadata.httpStatusCode
                 }, error)
             callback(error, resp)
         })
@@ -651,7 +645,7 @@ closure dawsTable(database, path, 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.statusCode })
+                error = Error("records list failed", error, options.prefix, { status: error.$metadata.httpStatusCode })
             else {
                 for obj in objects.Contents {
                     if obj.Key.startsWith(table.s3prefix)
@@ -694,13 +688,13 @@ closure dawsTable(database, path, local table) {
  *
  */
 
-closure S3DB(s3, local database, result) {
+closure S3DB(s3b, local database, result) {
     database = new(object, this)
-    result = dawsBucket(s3)
+    result = dawsBucket(s3b)
     if result.0
         return (result)                                                     // can't access bucket
     database.bucket = result.1
-    database.s3 = s3
+    database.s3b = s3b
     database.type = "Amazon S3"
 
     // isopen
@@ -720,7 +714,6 @@ closure S3DB(s3, local database, result) {
             return (list(Error("database closed")))
         database.bucket.close()
         database.bucket = false
-        database.s3 = false
         list(false, { ok: true })
     }
 
@@ -732,10 +725,10 @@ closure S3DB(s3, local database, result) {
         if !database.bucket
             return (list(Error("database closed")))
         result = {
-            type: database.type
+            type:           database.type
             info: {
-                region: s3.config.region
-                bucket: s3.config.params.Bucket
+                region:     s3b.region
+                bucket:     s3b.bucketName
             }
         }
         list(false, result)
@@ -778,7 +771,7 @@ closure S3DB(s3, local database, result) {
 
 function dawsInit(local manifest) {
 
-    manifest = `(dawsValidateName, dawsBucket, dawsTable, S3DB, dawsInit)
+    manifest = `(dawsBucket, dawsTable, S3DB, dawsInit)
 
     Naan.module.build(module.id, "dbt_aws", function(modobj, compobj) {
         require("./serviceAws.nlg")

package/plugins/serviceAws/psm_aws.nlg

@@ -54,12 +54,12 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     // findResource
     //
     // Find a resource with the specified contents, returning the resID or false.
-    connector.findResource = function findResource(resource, local resID, creds) {
+    connector.findResource = function findResource(resource, local resID, error, creds) {
         for resID in listResources().1 {
-            creds = access(resID).1
-            if ((!resource.region || resource.region == creds.region)
+            `(error, creds) = connector.vault.accessResource(resID)
+            if creds && (!resource.region || resource.region == creds.region)
                 && (!resource.bucketName || resource.bucketName == creds.bucketName)
-                && (!resource.label || resource.label == creds.name))
+                && (!resource.label || resource.label == creds.label)
                 return (resID)
         }
         false
@@ -209,28 +209,33 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     //
     // Return an S3 access object, which is the credentials to access an AWS S3 bucket.
 
-    connector.access = function access(resID, local error, creds, s3) {
+    connector.access = function access(resID, local error, creds, s3b) {
         `(error, creds) = connector.vault.accessResource(resID)
         if error
             return (list(error))                                            // can't access that resource
-        s3 = xnew(awsSDK.S3, {
-            apiVersion:         "2006-03-01",
-            accessKeyId:        creds.keyID,
-            secretAccessKey:    creds.keySecret,
-            region:             creds.region
-            params: {
-                Bucket:         creds.bucketName }})
-        list(false, s3)
+        if !awsSDK.S3
+            return (list(Error("S3 connector: no AWS SDK available")))
+        s3b = {
+            s3: xnew(awsSDK.S3, {
+                region:                 creds.region
+                credentials: {
+                    accessKeyId:        creds.keyID
+                    secretAccessKey:    creds.keySecret
+                }})
+            bucketName:                 creds.bucketName
+            region:                     creds.region
+        }
+        list(false, s3b)
     }
 
     // connect
     //
     // Connect to an AWS bucket filesystem, returning a view.
     
-    connector.connect = function connect(resID, service, args, local error,  s3, db, table) {
-        `(error, s3) = connector.access(resID)
+    connector.connect = function connect(resID, service, args, local error,  s3b, db, table) {
+        `(error, s3b) = connector.access(resID)
         if !error
-            `(error, db) = S3DB(s3)                                         // get S3 as a database
+            `(error, db) = S3DB(s3b)                                        // get S3 bucket as a database
         if error
             list(error)
         else if service == "NideDB"

package/plugins/serviceAws/serviceAws.nlg

@@ -19,17 +19,19 @@
  */
 
 function sawsInit(local manifest) {
-    manifest = `(sawsInit)
+    manifest = `(awsSDK, sawsLoadList, sawsSetPostLoadCall, sawsCallPostload, sawsInit)
 
     Naan.module.build(module.id, "serviceAws", function(modobj, compobj) {
         compobj.manifest = manifest
         require("frameworks/common").LiveImport()
         require("./aws_utils.nlg")
         function sawsPostload() {
-            if js.g
-                awsSDK = js.r("aws-sdk")
+            if js.lambda
+                awsSDK = js.r("/opt/aws-sdk-node.min.js")                   // SDK is a layer
+            else if js.g
+                awsSDK = js.r("aws-sdk-node.min")                           // SDK must be in search path
             else
-                awsSDK = JsLoadScript(JSpath.join(module.locpath, "./aws/aws-sdk.min.js"), "AWS")
+                awsSDK = JsLoadScript(JSpath.join(module.locpath, "./aws/aws-sdk.min.js"), "awsSdk")
             module.exports.awsSDK = awsSDK
             if App.psm
                 require("./psm_aws.nlg").AwsConnector(App.psm)

package/test/harness.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2022 by Richard C. Zulch
  *
  */
 
@@ -224,6 +224,8 @@ function RunTests(local totalTestCount, totalPassCount, totalTimeMS) {
                 result = parsenv.parse(cmd.concat("\n"))
             else
                 return ("invalid cmd at test ".concat(testCounter, ": ", typeof(cmd), "\n"))
+            if symbol(expect)
+                expect = tostring(expect)
             if string(expect) {
                 if result.errors.length > 0
                     return (strcat("test(\"", cmd, "\") failed:\n    ", result.errors.join("|"), "\n"))

package/test/test_01_core.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2022 by Richard C. Zulch
  *
  */
 
@@ -223,8 +223,8 @@ RegisterTestCategory("core", [
     [ "unicode(\"Z\");", "0x5a" ],
     [ "unicode(0x2609);", "\"☉\"" ],
     [ "unicode(\"☉\");", "0x2609" ],
-    [ "unicode(0x9962);", "\"饢\"" ],                                   // "persian flatbread", i.e. naan
-    [ "unicode(\"饢\");", "0x9962" ],
+    [ "unicode(0x1fad3);", "\"🫓\"" ],                                  // "flatbread", i.e. naan
+    [ "unicode(\"🫓\");", "0x1fad3" ],
     [ "unicode(0x1f35e);", "\"🍞\"" ],
     [ "unicode(\"🍞\");", "0x1f35e" ],
     [ "unicode(0x1f95c);", "\"🥜\"" ],                                  // peanut, UNICODE 9.0 2016
@@ -707,7 +707,7 @@ RegisterTestCategory("core", [
     [ "cons(`a);>", "(a)" ],
     [ "cons(`a,`b);>", "(a . b)" ],
     [ "cons(`a,`b,`c);>", "(a b . c)" ],
-    [ "length(stacktrace());", "54" ],
+    [ "length(stacktrace());", "55" ],
     
     //
     // lower builtin
@@ -764,5 +764,5 @@ RegisterTestCategory("core", [
     // mangled
     //
 
-    [ "mangled();", "true" ],
+    [ "mangled();", equal(    "prod", "prod") ],
 ]);

package/test/test_02_context.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2022 by Richard C. Zulch
  *
  */
 
@@ -206,10 +206,10 @@ RegisterTestCategory("context", [
     [ "test2(6);", { errors: "exception: recursed 102" } ],
 
     [ "function test1(x) { if x > 10000 printline(x) else 0+test2(x+1) };", "==> redefined: test1|test1" ],
-    [ "test2(7);", { errors: "exception: recursed 151" } ],
+    [ "test2(7);", { errors: "exception: recursed 149" } ],
 
     [ "function test2(x) { testRecurCheck(x), if true test1(x+1) else print(x) };", "==> redefined: test2|test2" ],
-    [ "test2(8);", { errors: "exception: recursed 152" } ],
+    [ "test2(8);", { errors: "exception: recursed 150" } ],
 
     [ "function test1(x) { if x > 10000 printline(x) else loop test2(x+1, 4, 5) };", "==> redefined: test1|test1" ],
     [ "function test2(x,y,z) { testRecurCheck(x), loop if true { test1(x+1),break } else print(x) };", "==> redefined: test2|test2" ],
@@ -222,7 +222,7 @@ RegisterTestCategory("context", [
     [ "oo=new(object);", "Object{0}"],
     [ "oo.test1 = function test1(x) { if x > 10000 printline(x) else test2(x+1) };", "==> redefined: test1|test1"],
     [ "oo.test2 = function test2 xt { testRecurCheck(car(xt)), oo.test1(car(xt)+1) };", "==> redefined: test2|test2"],
-    [ "oo.test1(11);", { errors: "exception: recursed 156" } ],
+    [ "oo.test1(11);", { errors: "exception: recursed 154" } ],
 
     [ "function test1 xt { testRecurCheck(car(xt)), if car(xt) > 10000 printline(xt) else test1(car(xt)+1) };",
         "==> redefined: test1|test1" ],

package/test/test_03_jsinterop.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2022 by Richard C. Zulch
  *
  */
 
@@ -33,8 +33,14 @@ RegisterTestCategory("JSinterop", [
     [ "o.a;", "undefined" ],    
     [ "o.nodef;", "undefined" ],
 
-    [ "o(3);", { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" } ],
-    [ "o(Number);", { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" } ],
+    [ "o(3);", {
+        "dev": { errors: "xcall \"[object Object]\": TypeError: object.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: e[3].apply is not a function" }
+    }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],
     [ "tostring(Number(3));", "\"[Number 3]\"" ],

package/plugins/serviceAws/aws_cognito.nlg

@@ -1,76 +0,0 @@
-/*
- * aws_cognito.nlg
- * serviceAws
- *
- *     Access to Cognito services for AWS.
- *
- * column positioning:                          //                          //                      !
- *
- * Copyright (c) 2022 by Richard C. Zulch
- *
- */
-
-
-/*
- * Cognito
- *
- *     Cognito service functions.
- *
- */
-
-closure Cognito(userPoolID, local cogo) {
-    cogo = new(object, this)
-    cogo.userPoolID = userPoolID
-
-    //
-    // login
-    //
-    cogo.login = closure login(creds) {
-        cogo.aws = xnew(awsSDK.CognitoIdentityServiceProvider, {
-            apiVersion: '2016-04-18'
-            accessKeyId:        creds.keyID,
-            secretAccessKey:    creds.keySecret,
-            region:             creds.region })
-    }
-    
-    //
-    // getUser
-    //
-    cogo.adminGetUser = closure adminGetUser(username, local params, pending) {
-        params = {
-            UserPoolId: cogo.userPoolID
-            Username: username
-        }
-        pending = new(nonce)
-        cogo.aws.getFunction(params, function(error, data) {
-            if error {
-                cogoError = error
-                debuglog("aws.cognito.adminGetUser failed", error)
-            }
-            pending.signal(list(error, data))
-        })
-        pending.wait()
-    }
-
-    // finis
-    cogo
-}
-
-
-/*
- * cogoInit
- *
- *     Initialize the Lambda module.
- *
- */
-
-function lambdaInit(local manifest) {
-    manifest = `(cogoInit, Cognito)
-
-    Naan.module.build(module.id, "aws_cognito", function(modobj, compobj) {
-        require("./serviceAws.nlg")
-        compobj.manifest = manifest
-        modobj.exports.Cognito = Cognito
-    })
-
-} ();