@naanlang/naan 1.4.0 → 1.4.1

package/frameworks/running/debugutil.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2024 by Richard C. Zulch
  *
  */
 
@@ -260,24 +260,33 @@ closure DebugRemote(commander, local remoter, here, there, library) {
     here.breakInfo = function breakInfo(bpid) {
         libBreakInfo(bpid)
     }
+    
+    // usingContID
+    //
+    // Mark that the contID is being used.
+    //
+    here.usingContID = function usingContID(contID, usage) {
+        debugNub = car(compress("debugNub"))
+        debugNub.usingContID(contID, usage)
+    }
 
     // callstack
     //
-    // Report current callstack.
+    // Report the specified fiber callstack or current debugger stack.
     //
-    here.callStack = function callStack(local debugNub) {
+    here.callStack = function callStack(contID, local debugNub) {
         debugNub = car(compress("debugNub"))
-        debugNub.callStack()
+        debugNub.callStack(contID)
     }
     
     // frameinfo
     //
-    // Report information about the nth frame in the callStack.
+    // Report information about the nth frame in a fiber callstack or the current debugger stack.
     //
-    here.frameinfo = function frameinfo(nth, local debugNub, frame, proctask, comp, position) {
+    here.frameinfo = function frameinfo(nth, contID, local debugNub, frame, proctask, comp, position) {
         debugNub = car(compress("debugNub"))
-        frame = debugNub.nthFrame(nth)
-        proctask = debugNub.procTask(frame)
+        frame = debugNub.nthFrame(nth, contID)
+        proctask = debugNub.procTask(frame, contID)
         comp = debugNub.codemgr.procComponent(proctask.0)
         position = comp.textpos(proctask.0, proctask.1)
         {
@@ -302,11 +311,11 @@ closure DebugRemote(commander, local remoter, here, there, library) {
     //     The optional visible array is a preceding result of this function, where "visible=true"
     // can be applied to nested values to add recursive depth.
     //
-    here.scopeinfo = function scopeinfo(nth, visible,
+    here.scopeinfo = function scopeinfo(nth, visible, contID
         local debugNub, frame, procsym, parent, proc, lex1, ex1, params, content, scope, level, level1)
     {
         debugNub = car(compress("debugNub"))
-        frame = debugNub.nthFrame(nth)
+        frame = debugNub.nthFrame(nth, contID)
         procsym = frame.3.1
         parent = procsym@\.parent
         while parent {
@@ -370,11 +379,11 @@ closure DebugRemote(commander, local remoter, here, there, library) {
     // can be applied to nested values to add recursive depth. A stack frame index can be specified
     // to evaluate an expression in that context.
 
-    here.watchInfo = function watchInfo(visible, nth,
+    here.watchInfo = function watchInfo(visible, nth, contID,
         local debugNub, values, content, watch, child1, error, value, level, expr)
     {
         debugNub = car(compress("debugNub"))
-        values = debugNub.evalWatchesInFrame(nth)
+        values = debugNub.evalWatchesInFrame(nth, contID)
         visible = new(visible)                                              // don't modify original
         content = []
         for watch in debugNub.watches {
@@ -417,8 +426,9 @@ closure DebugRemote(commander, local remoter, here, there, library) {
     //
     // List the current futures.
     
-    here.futureslist = function futureslist(local debugNub, output, future, record, procsym) {
+    here.futureslist = closure futureslist(local debugNub, contIDs, output, future, record, procsym) {
         debugNub = car(compress("debugNub"))
+        contIDs = []
         output = []
         for future in futures() {
             if member(debugNub.pauser, future.waiting)
@@ -431,6 +441,7 @@ closure DebugRemote(commander, local remoter, here, there, library) {
             if procedure(future.execute) {
                 procsym = future.execute.1
                 record.execute = strcat(future.execute.0, space, procsym.namespace.tostring, "::", debugNub.procname(procsym))
+                record.execloc = debugNub.procLoc(future.execute)
             }
             else if future.execute
                 record.execute = tostring(future.execute)
@@ -439,9 +450,15 @@ closure DebugRemote(commander, local remoter, here, there, library) {
                     procsym = item.1
                     strcat(item.0, space, procsym.namespace.tostring, "::", debugNub.procname(procsym))
                 })
+                record.continuations = future.continuations.toarray.map(function(cont, local contID) {
+                    contID = debugNub.getContID(cont)
+                    contIDs.push(contID)
+                    contID
+                })
             }
             output.push(record)
         }
+        debugNub.contGC(contIDs)
         output
     }
 

package/frameworks/running/running.nlg

@@ -228,9 +228,9 @@ closure packageCoder(evalf, local coder) {
     coder.invokeMethod = closure invokeMethod(objectID, args, local obj) {
         obj = coder.mapDecoding[objectID]
         if obj
-            list(false, eval(list(deref, obj, pop(args), args)))
+            eval(list(deref, obj, pop(args), args))
         else
-            list(Error("object ${objectID} not found"))
+            throw("remoting error: object ${objectID} not found")
     }
 
     // finis

package/frameworks/running/sourcecode.nlg

@@ -87,12 +87,14 @@ closure CodeManager(options,  local coman, cache)
                 output.push(false)
                 continue
             }
+            if text.startsWith("!")
+                text = "(${text})"                                          // no shell escapes here
             try {
                 source = new(textstream, text.concat(" ;"))                 // avoid EOF
                 if locals
                     source.setsymbols(locals)
                 registry = modlist().Lib.exports.Registry                   // dialect registry
-                dialect = registry.findName(registry.dialects().0)          // ### default dialecct
+                dialect = registry.findName(registry.dialects().0)          // ### default dialect
                 output.push(dialect.parse(source))
             } catch {
                 if true {

package/frameworks/storage/dbt_pouch.nlg

@@ -34,13 +34,17 @@
  *
  */
 
-closure dapoTable(database, path, local table, prefix) {
+closure dapoTable(database, rootpath, local table, prefix) {
     global()
+    if !database || !string(rootpath)
+        return (list(Error("invalid arguments")))
     table = new(object, this)
     table.type = database.type
     table.db = database
-    table.path = path
-    table.prefix = makePrefix(path)
+    if rootpath != "" && rootpath.slice(-1) != "/"
+        rootpath = rootpath.concat("/")                                     // "" or "<path>/"
+    table.rootpath = rootpath
+    table.prefix = makePrefix(rootpath)
         
     // makePrefix
     //
@@ -80,7 +84,7 @@ closure dapoTable(database, path, local table, prefix) {
             return (syncAdapter(add, key, content, metadata))
         id = makeID(key)
         if !string(id)
-            return (asyncResult(callback, id))                                 // error from makeID
+            return (asyncResult(callback, id))                              // error from makeID
         if metadata && !dictionary(metadata)
             return (asyncResult(callback, Error("invalid arguments")))
         if !database.pouch
@@ -291,7 +295,7 @@ closure dapoTable(database, path, local table, prefix) {
     // only immediate children are listed, with directories at the end--and no metadata for them.
     //
 
-    table.records = closure records(options, callback, local prefix, pouchOpts, output) {
+    table.records = closure records(options, callback, local prefix, prelen, pouchOpts, output) {
         if !callback
             return (syncAdapter(records, options))
         output = {
@@ -300,9 +304,11 @@ closure dapoTable(database, path, local table, prefix) {
             if !string(options.prefix)
                 return (asyncResult(callback, Error("prefix option must be string")))
             output.prefix = options.prefix
-            prefix = table.prefix.concat(makePrefix(options.prefix)) }
-        else
+            prefix = table.prefix.concat(makePrefix(options.prefix))
+            prelen = options.prefix.length }
+        else {
             prefix = table.prefix
+            prelen = 0 }
         if !database.pouch
             return (asyncResult(callback, Error("database closed")))
         pouchOpts = {
@@ -321,19 +327,24 @@ closure dapoTable(database, path, local table, prefix) {
                         key = obj.id.substring(table.prefix.length)
                     else
                         key = "*key error*"                                 // should not happen
-                    if !options.deep {
-                        offset = key.indexOf("/", prefix.length)
-                        if offset >= 0 {
-                                key = key.substring(0, offset+1)            // child directory name
-                                if !firstkids[key]
-                                    firstkids[key] = key                    // first time we've seen this child directory
-                                else
-                                    continue } }                            // ignore deeper child
                     item = {
                         key:        key
                         _id:        obj.id
                         _rev:       obj.value.rev
                     }
+                    if !options.deep {
+                        offset = key.indexOf("/", prelen)                   // start looking past options.prefix
+                        if offset >= 0 {                                    // directory child
+                            if length(key) > offset+1 {                     // transitive child (not directory itself)
+                                obj.doc = undefined                         // just record directory name
+                                item._id = undefined
+                                item._rev = undefined }
+                            key = key.substring(0, offset+1)                // child directory name
+                            if !firstkids[key]
+                                firstkids[key] = key                        // first time we've seen this child directory
+                            else
+                                continue                                    // ignore deeper child
+                            item.key = key } }
                     if obj.doc {                                            // docs were requested
                         if obj.doc.content {
                             item._md5 = HashMD5(obj.doc.content)
@@ -741,6 +752,8 @@ closure DbConnector(psm, local connClassID, connector, watch) {
     //
     // Connect to a database, returning a PSM view.
     connector.connect = function connect(resID, service, args, local error, creds, db, rootpath, table) {
+        if !resID || args && !tuple(args)
+            return (list(Error("invalid arguments")))
         `(error, creds) = connector.access(resID)
         if !error
             `(error, db) = PouchDB(creds)
@@ -751,7 +764,7 @@ closure DbConnector(psm, local connClassID, connector, watch) {
         else if service == "NideFS" {
             rootpath = args.0                                               // connect to a NideFS filesystem
             if !rootpath
-                return (Error("mandatory rootpath missing"))
+                return (list(Error("mandatory rootpath missing")))
             `(error, table) = db.table(rootpath)
             if error
                 list(error)

package/frameworks/storage/file_manager.nlg

@@ -766,7 +766,7 @@ function fimaInit(local manifest) {
 
     manifest = `(FileManager, fimaStore, fimaInit)
 
-    Naan.module.build(module.id, "fileManager", function(modobj, compobj) {
+    Naan.module.build(module.id, "file_manager", function(modobj, compobj) {
         require("./storage.nlg")
         commonWatching = require("../common/watching.nlg")
         compobj.manifest = manifest

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.4.0+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.4.0+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.4.0+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.4.0+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.4.0+1";;\r\n'
-                + 'App.cache = "233c1fed240ea5c0dd1c14562f30021b";;\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'
         });