@naanlang/naan 1.0.9 → 1.0.10

package/LICENSE.md

@@ -1,4 +1,4 @@
-**Naan for NPM** version **1.0.9+1** is released under the MIT License:
+**Naan for NPM** version **1.0.10+1** is released under the MIT License:
 
 Copyright (c) 2017-2023 Zulch Laboratories, Inc.
 

package/README.md

@@ -4,7 +4,7 @@
 Naan is an async-first software platform for rapid development.
 
 #### Release:
-     **Naan for NPM** version **1.0.9+1**
+     **Naan for NPM** version **1.0.10+1**
      Copyright (c) 2017-2023 Zulch Laboratories, Inc.
 
 #### Features

package/bin/index.js

@@ -58,11 +58,11 @@ process.argv.every((val, index) => {
         return (true);
     }
     if (val == "--version") {
-        console.log("1.0.9");
+        console.log("1.0.10");
         process.exit(0);
     }
     if (val == "--buildno") {
-        console.log("1.0.9+1");
+        console.log("1.0.10+1");
         process.exit(0);
     }
     if (val.substring(0,1) == "-") {

package/dist/naan.min.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.9+2 is released under the MIT License:
+ * Naan for NPM version 1.0.10+1 is released under the MIT License:
  * 
  * Copyright (c) 2017-2023 Zulch Laboratories, Inc.
  * 

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.9+1";
+var CurrentCacheName = "Naanlang-1.0.10+1";
 
 
 //
@@ -89,11 +89,11 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.9+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.9+1")
+        console.log("[1.0.10+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.10+1")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.9+1"
+                version: "1.0.10+1"
             });
         Reaper();                                                           // clean up obsolete info
         
@@ -107,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.9+1] msg received:", msg.text);
+                console.log("[1.0.10+1] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -118,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.9+1",
+                text: "port received by 1.0.10+1",
             });
             */
         if (--pending === 0)
@@ -135,7 +135,7 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.9+1] requesting new msgport for", client.id);
+            console.log("[1.0.10+1] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -181,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.9+1] source gone:", sourceId);
+                console.log("[1.0.10+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.9+1] client gone:", clientId);
+                console.log("[1.0.10+1] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -220,13 +220,13 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.9+1] deleting old cache:', cacheName);
+                        console.log('[1.0.10+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.9+1] claiming clients');
+            console.log('[1.0.10+1] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -269,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.9+1",
+                version: "1.0.10+1",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -317,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.9+1] install");
+    console.log("[1.0.10+1] install");
     self.skipWaiting();
 });
 
@@ -339,7 +339,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(event.request.url);
             var nocache = event.request.method != "GET"
-                || url.search.length !== 0 && url.searchParams.get("naanver") !== "47cb512242b15eae60df6f89500e5ca4"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "580c5d8d85e0f1e49012dd76522f8a8b"
                 || event.request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.9+1] fetch failed", e);
+                    console.log("[1.0.10+1] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -385,14 +385,14 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.9+1] activate");
+    console.log("[1.0.10+1] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.0.9+1] matching clients:', urls.join(', '));
+        console.log('[1.0.10+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/common/common.nlg

@@ -176,7 +176,7 @@ function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
-        scriptTag.src = js.w.location.origin.concat(fpath, requireQuery())
+        scriptTag.src = JSpath.dirname(js.w.location.href).concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
             pending.signal(js.w[globalID])

package/frameworks/project/projects.nlg

@@ -296,7 +296,7 @@ closure projConnector(projman, projtype, local connector, watch) {
  *
  * Nide.proj/
  *      nide_cliser.cfg                 - JSON definition of the project (see below)
- *      NaanIDE_version.txt             - [default] substitution file defining 1.0.9+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.10+1 etc.
  *      NaanIDE_version_builds.txt      - [default] contains current build number as decimal string
  *      build/                          - [optional] default build output location
  *      NaanIDE.lic                     - [optional] defines Zulch Laboratories, Inc. and other license info

package/lib/browser/env_web.js

@@ -520,7 +520,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.9+1";
+        statedoc.verstring = "1.0.10+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -538,7 +538,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.9+1")
+            || statedoc.verstring != "1.0.10+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -597,7 +597,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.9+1"
+                    title: vsiteName + " 1.0.10+1"
                 });
             }
         } catch (e) {
@@ -611,7 +611,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.9+1"
+                    title: vsiteName + " 1.0.10+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -626,8 +626,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.9+1";;\r\n'
-                + 'App.cache = "56a3661c1caa5c6ed3781ffcad84acf4";;\r\n'
+            cmd: 'App.version = "1.0.10+1";;\r\n'
+                + 'App.cache = "604febd141ddeb5891867e0c18fea956";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });

package/lib/core/naanlib.js

@@ -1,7 +1,7 @@
 /*
  * naan.min.js
  *
- * Naan for NPM version 1.0.9+2 is released under the MIT License:
+ * Naan for NPM version 1.0.10+1 is released under the MIT License:
  * 
  * Copyright (c) 2017-2023 Zulch Laboratories, Inc.
  * 

package/package.json

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

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)