@naanlang/naan 1.0.2 → 1.0.5

package/plugins/serviceAws/psm_aws.nlg

@@ -50,36 +50,26 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             key:            "bucketName" }
         ]
     }
-        
-    // hashResourceID
-    //
-    // Make a stable hash based on the resource credentials that we can persist or share between
-    // different domains accessing the same resource.
-    connector.hashResourceID = function hashResourceID(resource, local ident) {
-        ident = resource.region.concat(resource.region, resource.bucketName)
-        if resource.label
-            ident = ident.concat(resource.label)
-        HashSHA256(ident)
-    }
 
     // findResource
     //
-    // Find a resource with the specified contents, returning the resID or false. The loose criteria
-    // is: if added, would the specified contents be redundant to an existing resource?
-    connector.findResource = function findResource(resource, local resID, creds) {
+    // Find a resource with the specified contents, returning the resID or false.
+    connector.findResource = function findResource(resource, local resID, error, creds) {
         for resID in listResources().1 {
-            creds = access(resID).1
-            if resource.region == creds.region && resource.bucketName == creds.bucketName
-                && (!resource.label || resource.label == creds.name)
+            `(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.label)
                 return (resID)
         }
         false
     }
 
-    // addResource
+    // writeResource
     //
-    // Add credentials for a named resource. The label is a string. The resource is a dictionary
-    // comprising these keys:
+    // Add or update credentials for a named resource. If no resID is specified this adds a new
+    // resource; otherwise it updates an existing one. The resource is a dictionary comprising these
+    // keys:
     //      label       - [optional] label we use for this resource
     //      keyID       - AWS IAM keyID
     //      keySecret   - AWS IAM keySecret
@@ -87,10 +77,13 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     //      bucketName  - AWS bucketName
     //      hidden      - [optional] don't enumerate to user
     //      locked      - [optional] don't allow user delete
-    // The return value is (error, result) tuple. Error, if non-false, is a dictionary of field
-    // keys and error diagnostic strings. The special key "label" refers to the label string.
-    connector.addResource = function addResource(resource, local label, errors, creds, error, resID, data) {
-        function badField(str) { !string(str) || str.trim().length == 0 } 
+    // The return value is an (error, resID) tuple. Error, if non-false, is a dictionary of field
+    // keys and error diagnostic strings.
+    connector.writeResource = function writeResource(resource, resID,
+        local creds, errors, error, data, change) {
+        // badField - test for a bad string
+        function badField(str) { !string(str) || str.trim().length == 0 }
+
         creds = { 
             keyID: resource.keyID,
             keySecret: resource.keySecret,
@@ -104,6 +97,8 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             creds.label = resource.region.concat("-", resource.bucketName)
         if badField(creds.label)
             errors.label = "invalid label"
+        else if !resID && findResource({ label: creds.label })
+            errors.label = "duplicate name"
         if badField(resource.keyID)
             errors.keyID = "required field"
         if badField(resource.keySecret)
@@ -119,14 +114,35 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
                 creds.hidden = resource.hidden
             if resource.locked
                 creds.locked = resource.locked
-            resID = hashResourceID(resource)
-            `(error, data) = connector.vault.addResource(resID, creds)
+            if resID {
+                `(error, data) = connector.vault.updateResource(resID, creds)
+                change = { changed: [resID] }
+            } else {
+                resID = UUID()
+                `(error, data) = connector.vault.addResource(resID, creds)
+                change = { added: [resID] }
+            }
             if data {
-                watch.notify(connClassID, { added: [resID] })
-                data = resID }
+                watch.notify(connClassID, change)
+                data = resID
+            }
         }
         list(error, data)
     }
+
+    // addResource
+    //
+    // Add a new resource, returning a standard error tuple per writeResource.
+    connector.addResource = function addResource(resource) {
+        writeResource(resource)
+    }
+
+    // updateResource
+    //
+    // Update an existing resource, returning a standard error tuple per writeResource.
+    connector.updateResource = function updateResource(resID, resource) {
+        writeResource(resource, resID)
+    }
     
     // getResource
     //
@@ -193,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,16 +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/plugins/serviceGitHub/psm_github.nlg

@@ -45,41 +45,34 @@ closure phubConnector(psm, local connClassID, connector, watch) {
 
     // findResource
     //
-    // Find a resource with the specified contents, returning the resID or false. The loose criteria
-    // is: if added, would the specified contents be redundant to an existing resource?
+    // Find a resource with the specified contents, returning the resID or false.
     connector.findResource = function findResource(resource, local resID, creds) {
         for resID in listResources().1 {
             creds = access(resID).1
-            if resource.userName == creds.userName
+            if ((!resource.label || resource.label == creds.label)
+                && (!resource.userName || resource.userName == creds.userName))
                 return (resID)
         }
         false
     }
-    
-    // hashResourceID
-    //
-    // Make a stable hash based on the resource credentials that we can persist or share between
-    // different domains accessing the same resource.
-    connector.hashResourceID = function hashResourceID(resource, local ident) {
-        ident = resource.userName
-        if resource.label
-            ident = ident.concat(resource.label)
-        HashSHA256(ident)
-    }
 
-    // addResource
+    // writeResource
     //
-    // Add credentials for a named resource. The label is a string. The resource is a dictionary
-    // comprising these keys:
+    // Add or update credentials for a named resource. If no resID is specified this adds a new
+    // resource; otherwise it updates an existing one. The resource is a dictionary comprising these
+    // keys:
     //      label       - [optional] label we use for this resource
     //      userName    - GitHub user name
     //      userPat     - GitHUB Personal Access Token
     //      hidden      - [optional] don't enumerate to user
     //      locked      - [optional] don't allow user delete
-    // The return value is (error, result) tuple. Error, if non-false, is a dictionary of field
-    // keys and error diagnostic strings. The special key "label" refers to the label string.
-    connector.addResource = function addResource(resource, local label, errors, creds, error, resID, data) {
-        function badField(str) { !string(str) || str.trim().length == 0 } 
+    // The return value is an (error, resID) tuple. Error, if non-false, is a dictionary of field
+    // keys and error diagnostic strings.
+    connector.writeResource = function writeResource(resource, resID,
+        local label, errors, creds, error, data) {
+        // badField - test for a bad string
+        function badField(str) { !string(str) || str.trim().length == 0 }
+
         creds = { 
             userName: resource.userName,
             userPat: resource.userPat
@@ -91,6 +84,8 @@ closure phubConnector(psm, local connClassID, connector, watch) {
             creds.label = resource.region.concat("-", resource.bucketName)
         if badField(creds.label)
             errors.label = "invalid label"
+        else if !resID && findResource({ label: creds.label })
+            errors.label = "duplicate name"
         if badField(resource.userName)
             errors.userName = "required field"
         if badField(resource.userPat)
@@ -102,15 +97,36 @@ closure phubConnector(psm, local connClassID, connector, watch) {
                 creds.hidden = resource.hidden
             if resource.locked
                 creds.locked = resource.locked
-            resID = hashResourceID(resource)
-            `(error, data) = connector.vault.addResource(resID, creds)
+            if resID {
+                `(error, data) = connector.vault.updateResource(resID, creds)
+                change = { changed: [resID] }
+            } else {
+                resID = UUID()
+                `(error, data) = connector.vault.addResource(resID, creds)
+                change = { added: [resID] }
+            }
             if data {
-                watch.notify(connClassID, { added: [resID] })
-                data = resID }
+                watch.notify(connClassID, change)
+                data = resID
+            }
         }
         list(error, data)
     }
 
+    // addResource
+    //
+    // Add a new resource, returning a standard error tuple per writeResource.
+    connector.addResource = function addResource(resource) {
+        writeResource(resource)
+    }
+
+    // updateResource
+    //
+    // Update an existing resource, returning a standard error tuple per writeResource.
+    connector.updateResource = function updateResource(resID, resource) {
+        writeResource(resource, resID)
+    }
+
     // deleteResource
     //
     // Delete credentials for a resource

package/plugins/serviceGitLab/psm_gitlab.nlg

@@ -42,44 +42,37 @@ closure plabConnector(psm, local connClassID, connector, watch) {
             type:           "password" }
         ]
     }
-    
-    // hashResourceID
-    //
-    // Make a stable hash based on the resource credentials that we can persist or share between
-    // different domains accessing the same resource.
-    connector.hashResourceID = function hashResourceID(resource, local ident) {
-        ident = resource.userName
-        if resource.label
-            ident = ident.concat(resource.label)
-        HashSHA256(ident)
-    }
 
     // findResource
     //
-    // Find a resource with the specified contents, returning the resID or false. The loose criteria
-    // is: if added, would the specified contents be redundant to an existing resource?
+    // Find a resource with the specified contents, returning the resID or false.
     connector.findResource = function findResource(resource, local resID, creds) {
         for resID in listResources().1 {
             creds = access(resID).1
-            if resource.userName == creds.userName
+            if ((!resource.label || resource.label == creds.label)
+                && (!resource.userName || resource.userName == creds.userName))
                 return (resID)
         }
         false
     }
 
-    // addResource
+    // writeResource
     //
-    // Add credentials for a named resource. The label is a string. The resource is a dictionary
-    // comprising these keys:
+    // Add or update credentials for a named resource. If no resID is specified this adds a new
+    // resource; otherwise it updates an existing one. The resource is a dictionary comprising these
+    // keys:
     //      label       - [optional] label we use for this resource
     //      userName    - GitLab user name
     //      userPat     - GitLab Personal Access Token
     //      hidden      - [optional] don't enumerate to user
     //      locked      - [optional] don't allow user delete
-    // The return value is (error, result) tuple. Error, if non-false, is a dictionary of field
-    // keys and error diagnostic strings. The special key "label" refers to the label string.
-    connector.addResource = function addResource(resource, local label, errors, creds, error, resID, data) {
-        function badField(str) { !string(str) || str.trim().length == 0 } 
+    // The return value is an (error, resID) tuple. Error, if non-false, is a dictionary of field
+    // keys and error diagnostic strings.
+    connector.writeResource = function writeResource(resource, resID,
+        local label, errors, creds, error, data) {
+        // badField - test for a bad string
+        function badField(str) { !string(str) || str.trim().length == 0 }
+
         creds = { 
             userName: resource.userName,
             userPat: resource.userPat
@@ -91,6 +84,8 @@ closure plabConnector(psm, local connClassID, connector, watch) {
             creds.label = resource.region.concat("-", resource.bucketName)
         if badField(creds.label)
             errors.label = "invalid label"
+        else if !resID && findResource({ label: creds.label })
+            errors.label = "duplicate name"
         if badField(resource.userName)
             errors.userName = "required field"
         if badField(resource.userPat)
@@ -102,15 +97,36 @@ closure plabConnector(psm, local connClassID, connector, watch) {
                 creds.hidden = resource.hidden
             if resource.locked
                 creds.locked = resource.locked
-            resID = hashResourceID(resource)
-            `(error, data) = connector.vault.addResource(resID, creds)
+            if resID {
+                `(error, data) = connector.vault.updateResource(resID, creds)
+                change = { changed: [resID] }
+            } else {
+                resID = UUID()
+                `(error, data) = connector.vault.addResource(resID, creds)
+                change = { added: [resID] }
+            }
             if data {
-                watch.notify(connClassID, { added: [resID] })
-                data = resID }
+                watch.notify(connClassID, change)
+                data = resID
+            }
         }
         list(error, data)
     }
 
+    // addResource
+    //
+    // Add a new resource, returning a standard error tuple per writeResource.
+    connector.addResource = function addResource(resource) {
+        writeResource(resource)
+    }
+
+    // updateResource
+    //
+    // Update an existing resource, returning a standard error tuple per writeResource.
+    connector.updateResource = function updateResource(resID, resource) {
+        writeResource(resource, resID)
+    }
+
     // deleteResource
     //
     // Delete credentials for a resource

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
-    })
-
-} ();