@naanlang/naan 1.3.2 → 1.4.1

package/frameworks/storage/psm_dbtables.nlg

@@ -38,10 +38,12 @@
 
 closure FSview(table, rootpath, local view) {
     global(JSpath)
-    if !table
+    if !table || !string(rootpath)
         return (list(Error("invalid arguments")))
     view = new(object, this)
     view.table = table
+    if rootpath != "" && rootpath.slice(-1) != "/"
+        rootpath = rootpath.concat("/")                                     // "" or "<path>/"
     view.rootpath = rootpath
     view.path = JSpath.posix                                                // for view.path.join(), etc.
 
@@ -118,23 +120,21 @@ closure FSview(table, rootpath, local view) {
     // checkPathName
     //
     // Return a `(path, name) tuple for a directory, or false if callback executed due to error. The
-    // name is the empty string if the path is empty. Path "/" has name "/". Otherwise the name is
-    // the last segment of the path, omitting the trailing slash.
+    // name is the empty string if the path is empty. Path "/" has name "". Otherwise the name is the
+    // last segment of the path, omitting any trailing slash. A key invariant is that the information
+    // should be the same whether the pathname was part of the rootpath or specified in the source
+    // path to an operation. That is why this "steals" the rootpath name if needed.
     //
-    function checkPathName(path, callback, local name, slashdex) {
-        if path == ""
-            name = ""
-        else {
-            if checkPath(path, callback)
-                return (false)                                              // non-string
-            if path.slice(-1) != "/"
-                path = path.concat("/")                                     // force to be directory
-            slashdex = path.lastIndexOf("/", path.length-2)
-            if path == "/" || slashdex < 0
-                name = path
-            else
-                name = path.slice(slashdex+1, -1)                           // omit trailing "/"
-        }
+    function checkPathName(path, callback, local name) {
+        if checkPath(path, callback)
+            return (false)                                                  // non-string
+        if path != "" && path.slice(-1) != "/"
+            path = path.concat("/")                                         // force to be directory
+        if path == "/" && rootpath != ""
+            name = rootpath                                                 // avoid making "//"
+        else
+            name = rootpath.concat(path)
+        name = name.split("/").slice(0,-1).pop() || ""                      // <|| ""> not needed
         list(path, name)
     }
 
@@ -683,7 +683,7 @@ closure FSview(table, rootpath, local view) {
             return                                                          // already executed callback with error
         dirdict = {
             name: name
-            path: path
+            path: rootpath.concat(path)
             data: {
                 platform: table.type
                 semantics: "dbfs"
@@ -743,14 +743,13 @@ closure FSview(table, rootpath, local view) {
         `(path, name) = checkPathName(path, callback)
         if !path
             return                                                          // already executed callback with error
-        options = {                                                         // ### might want to allow some options
+        options = merge({
             prefix: path
             deep: true
-        }
-        if name == "" && rootpath != ""
-            name = rootpath.split("/").slice(0,-1).pop() || ""
+        }, options)
         treedict = {
             name: name
+            path: rootpath.concat(path)
             data: {
                 platform: table.type
                 semantics: "dbfs"

package/frameworks/storage/resources.nlg

@@ -142,9 +142,14 @@ closure ResourceManager(dbname, prefix, local reman, watch, result) {
     reman.unWatch = watch.unWatch
     reman.dbname = dbname
     reman.conns = {}
-    result =  PouchDB(dbname)
+    try {
+        require("./dbt_pouch.nlg")
+        result = PouchDB(dbname)
+    } catch {
+        result = list(Error("PouchDB not available", exception))
+    }
     if result.0
-        return (result)                                                     // can't access our vault database
+        return (list(result))                                               // can't access our vault database
     reman.db = result.1
     
     // vault
@@ -423,19 +428,22 @@ closure ResourceTracker(reman, local retor, watch) {
     // Start tracking resources.
     retor.open = function open() {
         if retor.classIdList
-            return                                                          // already open
+            return (list(false, { open: true }))                            // already open
         watch.reset()
         retor.resids = { }                                                  // start empty
         retor.classIdList = []
         for classID in reman.connectors()
             addConnResources(classID)
         reman.watch(remanUpdateOnChange)
+        list(false, { ok: true })
     }
     
     // close
     //
     // stop tracking resources.
     retor.close = function close(local classID, connector) {
+        if !retor.classIdList
+            return (list(false, { open: false }))
         watch.reset()
         if retor.classIdList {
             for classID in retor.classIdList {
@@ -446,6 +454,7 @@ closure ResourceTracker(reman, local retor, watch) {
         }
         reman.unWatch(remanUpdateOnChange)
         retor.resids = false
+        list(false, { ok: true })
     }
 
     // finis
@@ -466,7 +475,6 @@ function rsrcInit(local manifest) {
 
     Naan.module.build(module.id, "resources", function(modobj, compobj) {
         require("./storage.nlg")
-        require("./dbt_pouch.nlg")
         commonWatching = require("../common/watching.nlg")
         compobj.manifest = manifest
         module.exports.ResourceManager = ResourceManager

package/frameworks/storage/storage.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -26,7 +26,7 @@ function storInit(local manifest) {
         require("../common/common.nlg").LiveImport()
         require("../common/watching.nlg")
         compobj.manifest = manifest
-        LoadComponentOnDemand(list(DbConnector, ListBrowserDBs, PouchDB), "./dbt_pouch.nlg")
+        LoadComponentOnDemand(list(DbConnector, ListBrowserDBs, PouchDB), "naanlib:storage/dbt_pouch.nlg")
 
 
         // storReload

package/lib/browser/env_web.js

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

package/lib/browser/env_webworker.js

@@ -145,6 +145,8 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
             naanlib.textLine(msg.text);                                     // keyboard text from terminal
         else if (msg.id == "start")
         {                                                                   // start execution with optional state
+            targSelf.workerID = msg.workerID;
+            targSelf.workerGUID = msg.workerGUID;
             naanlib.banner();
             naanlib.start({
                 state: msg.state,