@naanlang/naan 1.0.16 → 1.1.0

package/frameworks/running/taskexec.nlg

@@ -5,13 +5,13 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2023 by Richard C. Zulch
  *
  */
 
 
 /*
- * taskDispatcher
+ * TaskDispatcher
  *
  *     Create a dispatcher for remote evaluation. The replier argument is a function that accepts
  * outgoing messages. The return value is a closure that processes incomming messages. This code is
@@ -19,7 +19,7 @@
  *
  */
 
-closure taskDispatcher(replier, local contexts, gohome, util) {
+closure TaskDispatcher(replier, local contexts, gohome, util) {
     contexts = { }
     gohome = makeActivator()
     util = modlist().Util.exports
@@ -68,24 +68,22 @@ closure taskDispatcher(replier, local contexts, gohome, util) {
                     })
                     expr = caar(expr)
                     reply.error = undefined
-                    if expr {
-                        expr = evalactive(expr)
-                        if data.get
-                            roots = new(data.get).map(function(sym){        // new() to get symbol from compress
-                                compress(sym)
-                            })
-                        if roots
-                            roots = cons(`expr, totuple(roots))
-                        else
-                            roots = `(expr)
-                        reply.result = util.pkgSave(`expr, roots, {
-                            nsignore: true                                  // don't report namespace errors
-                            comments: true })                               // include comments
-                        if context.namespace !== nsactive().0
-                        {                                                   // evaluation changed namespace
-                            context.namespace = nsactive().0
-                            context.activator = makeActivator()
-                        }
+                    expr = evalactive(expr)
+                    if data.get
+                        roots = new(data.get).map(function(sym){            // new() to get symbol from compress
+                            compress(sym)
+                        })
+                    if roots
+                        roots = cons(`expr, totuple(roots))
+                    else
+                        roots = `(expr)
+                    reply.result = util.pkgSave(`expr, roots, {
+                        nsignore: true                                      // don't report namespace errors
+                        comments: true })                                   // include comments
+                    if context.namespace !== nsactive().0
+                    {                                                       // evaluation changed namespace
+                        context.namespace = nsactive().0
+                        context.activator = makeActivator()
                     }
                 }
             }
@@ -148,12 +146,12 @@ closure taskDispatcher(replier, local contexts, gohome, util) {
 closure TaskExecutor() {
 
     // taskInstall
-    // Install the taskDispatcher, and reload on state load.
+    // Install the TaskDispatcher, and reload on state load.
     //
     function taskInstall() {
         if !js.t.OnMessage
             return (false)                                                  // false if not a worker
-        js.t.OnMessage(taskDispatcher(js.t.ReplyMessage))
+        js.t.OnMessage(TaskDispatcher(js.t.ReplyMessage))
     }()
     LoadNotify(taskInstall)
 
@@ -185,11 +183,12 @@ function TaskOnMessageHook(hook) {
 
 function taxInit(local manifest) {
 
-    manifest = `(taskDispatcher, TaskExecutor, TaskOnMessageHook, taxInit)
+    manifest = `(TaskDispatcher, TaskExecutor, TaskOnMessageHook, taxInit)
 
     Naan.module.build(module.id, "taskexec", function(modobj, compobj) {
         require("./running.nlg").LiveImport()
         compobj.manifest = manifest
+        modobj.exports.TaskDispatcher = TaskDispatcher
         modobj.exports.TaskExecutor = TaskExecutor
         modobj.exports.TaskOnMessageHook = TaskOnMessageHook
     })

package/frameworks/storage/dbt_pouch.nlg

@@ -7,7 +7,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2023 by Richard C. Zulch
+ * Copyright (c) 2017-2024 by Richard C. Zulch
  *
  */
 
@@ -35,6 +35,7 @@
  */
 
 closure dapoTable(database, path, local table, prefix) {
+    global()
     table = new(object, this)
     table.type = database.type
     table.db = database
@@ -277,13 +278,11 @@ closure dapoTable(database, path, local table, prefix) {
     //  rows : [
     //      {
     //          key         :   "john",
-    //          _modified   :   [Date Sat Apr 04 2020 17:05:38 GMT-0700 (Pacific Daylight Time)]
     //          _md5        :   "55ff07fb005494c4bd42322d4845e858"
     //          _length     :   156043
     //         [ doc | error:  <document from "get" or "head"> | <error from get|head> ] },
     //      {
     //          key         :   "jill",
-    //          _modified   :   [Date Sat Apr 22 2020 17:05:38 GMT-0700 (Pacific Daylight Time)]
     //          _md5        :   "f53f07fb00d42322dc4bd42322d4845e"
     //          _length     :   155
     //         [ doc         :  <document from "get" or "head"> ] } ] }
@@ -335,7 +334,7 @@ closure dapoTable(database, path, local table, prefix) {
                         _id:        obj.id
                         _rev:       obj.value.rev
                     }
-                    if obj.doc {
+                    if obj.doc {                                            // docs were requested
                         if obj.doc.content {
                             item._md5 = HashMD5(obj.doc.content)
                             item._length = length(obj.doc.content) }
@@ -373,6 +372,7 @@ closure dapoTable(database, path, local table, prefix) {
  */
 
 closure PouchDB(urlname, local database, options) {
+    global(jspath, pouchdb)
     options = {
         revs_limit: 1                                                       // number of revs to maintain for replication
         auto_compaction: false }                                            // don't compcat on every change
@@ -480,7 +480,8 @@ closure PouchDB(urlname, local database, options) {
  *
  */
 
-closure ListBrowserDBs(local pending, output) {
+closure ListBrowserDBs(local pending, output, item) {
+    global(indexedDB)
     if !indexedDB
         return (list(Error("browser database unavailable")))
     if !indexedDB.databases
@@ -507,6 +508,7 @@ closure ListBrowserDBs(local pending, output) {
  */
 
 closure DbConnector(psm, local connClassID, connector, watch) {
+    global()
     connClassID = "PouchDB"
     connector = new(object, this)
     connector.psm = psm
@@ -572,7 +574,7 @@ closure DbConnector(psm, local connClassID, connector, watch) {
     // 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 errors, creds, original, error, data) {
+        local errors, creds, original, error, data, change) {
         // badField - test for a bad string
         function badField(str) { !string(str) || str.trim().length == 0 }
 

package/frameworks/storage/file_manager.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
+    global(commonWatching)
     files = new(object, this)
     files.fs = fs
     files.nodes = []                                                        // array of nodes, one per file or folder
@@ -159,7 +160,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
     //
     // Return the parent path of the specified node, or "" for the root.
     //
-    function parentPath(node) {
+    function parentPath(node, local path) {
         path = node.path
         if path.slice(-1) == files.pathsep
             path = path.slice(0,-1)
@@ -415,7 +416,8 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
             return                                                          // no git checking available
         opBeginOrReschedule(closure(callback) {
             willgit = true
-            files.fs.gitStatus(false, function (error, statlist, local changed, delgit, unknownFiles, unknownFileStatus, changes, classID) {
+            files.fs.gitStatus(false, function (error, statlist,
+                local changed, delgit, unknownFiles, unknownFileStatus, changes, classID, item) {
                 if error {
                     files.gitvalid = false
                     return (callback(error))
@@ -649,6 +651,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
  */
 
 closure fimaStore(fm, node, local store) {
+    global()
     store = new(object, this)
     store.fm = fm
     store.fs = fm.fs

package/frameworks/storage/psm.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2022 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -56,7 +56,8 @@ closure MakePSMutil(fs, local util) {
     //
     // Update a directory within an existing tree data structure. The result is a standard tuple with
     // (error, changes) where the changes are added/deleted/changed. This assumes that children changed
-    // if their info is different
+    // if their info is different. If a child directory is found that does not yet have children, then
+    // the 
     
     util.treeDirUpdate = closure treeDirUpdate(treepath, dirpath, tree, callback, local error, inpath, treedir, files) {
         if !callback

package/frameworks/storage/psm_dbtables.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -23,7 +23,7 @@
  *      - directory names are non-empty strings with the sole "/" at the end
  *      - the names ".", "..", and anything containing ":" are forbidden
  *      - every directory has (or should have) an associated database record for itself
- *          - files lacking a valid directory parent are "orphans" listed during tree enumeration
+ *          - when these records are missing, trivial parents are created during tree enumeration
  *      - pathnames are relative to the root of the view an d consist of a string with:
  *          - zero or more directory names joined by "/", then
  *          - either "", "/" for a directory, or "/" with a filename
@@ -37,6 +37,7 @@
  */
 
 closure FSview(table, rootpath, local view) {
+    global(JSpath)
     if !table
         return (list(Error("invalid arguments")))
     view = new(object, this)
@@ -83,7 +84,7 @@ closure FSview(table, rootpath, local view) {
         if isPath {
             if name == ""
                 return (true)
-            else if name.substring(0, 1) == "/" || path.indexOf("//") >= 0
+            else if name.substring(0, 1) == "/" || name.indexOf("//") >= 0
                 return (false)
             else
                 name = baseName(name) }
@@ -98,9 +99,7 @@ closure FSview(table, rootpath, local view) {
         if !string(path) {
             if !msg
                 msg = "invalid path"
-            if !string(path)
-                path = "<".concat(typeof(path), ">")                        // e.g. "<xobject>"
-            asyncResult(callback, Error(msg, typeof(content), {
+            asyncResult(callback, Error(msg, "invalid path ${typeof(path)}", {
                     status: 400
                     name: "invalid_arguments"
                     path: path
@@ -110,8 +109,10 @@ closure FSview(table, rootpath, local view) {
         
     // checkPathName
     //
-    // Return a `(path, name) tuple for a directory, or false if callback executed due to error.
-    
+    // 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.
+    //
     function checkPathName(path, callback, local name, slashdex) {
         if path == ""
             name = ""
@@ -232,7 +233,7 @@ closure FSview(table, rootpath, local view) {
                 else
                     metadata.finfo.encoding = "utf8" }                      // default string encoding
             else if content && !xobject(content)
-                return (callback(Error("unsupported content type", typeof(content), {
+                return (callback(Error("unsupported content type ${typeof(content)}", {
                     status: 400
                     name: "invalid_arguments"
                     path: path
@@ -352,10 +353,17 @@ closure FSview(table, rootpath, local view) {
     
     // copyDirectory
     //
-    // Copy a directory by its source path, with optional move.
-    
-    closure copyDirectory(srcpath, dest, options, local error, nodes, data, destpath, errors, docpath, newpath, srcroot) {
-        `(error, nodes) = view.table.records({ prefix: srcpath })
+    // Copy a directory by its source path, with optional move. The
+    // destination is:
+    //  - a new name in same parent if it has no embedded slashes, or
+    //  - the same name in a new location if it ends in a slash, otherwise
+    //  - a new pathname for the source.
+    //
+    closure copyDirectory(srcpath, dest, options,
+        local error, nodes, data, destpath, errors, docpath, newpath, srcroot, item) {
+        if srcpath.slice(-1) != "/"
+            srcpath = srcpath.concat("/")                                   // normalize source as directory
+        `(error, nodes) = view.table.records({ prefix: srcpath })           // each item has key/_id/_rev, not doc
         if error
             return (list(Error("copyDirectory: can't enumerate source directory", {
                 source: srcpath
@@ -434,7 +442,7 @@ closure FSview(table, rootpath, local view) {
                 if !srcroot
                     srcroot = item                                          // delete source root later
                 else {
-                    `(error, data) = view.table.delete(item.doc)            // delete original
+                    `(error, data) = view.table.delete(item)                // delete original
                     if error
                         errors.push(Error("copyDirectory: can't remove original", {
                             source: docpath
@@ -448,7 +456,7 @@ closure FSview(table, rootpath, local view) {
             }, errors))
         else {
             if srcroot {
-                `(error, data) = view.table.delete(srcroot.doc)             // delete original root
+                `(error, data) = view.table.delete(srcroot)                 // delete original root
                 if error
                     return (list(Error("copyDirectory: can't remove original root", {
                     source: srcpath
@@ -573,12 +581,11 @@ closure FSview(table, rootpath, local view) {
     // Copy / move / rename a file or directory. The source is the full path of the item. The
     // destination is:
     //  - a new name if it has no embedded slashes, or
-    //  - a new location if it ends in a slash, otherwise
-    //  - a new pathname for the source if it does not end in a slash.
+    //  - the same name in a new location if it ends in a slash, otherwise
+    //  - a new pathname for the source.
     //     This works by creating a new file or directory of files in the new location and then
-    // optionally deleting the files in the existing location. If options.move is true then we
-    // delete the source after the copy.
-    
+    // deleting the files in the existing location after the copy if options.move is true.
+    //
     view.copy = closure copy(srcpath, dest, options, callback) {
         if !callback
             return (syncAdapter(copy, srcpath, dest, options))
@@ -594,7 +601,7 @@ closure FSview(table, rootpath, local view) {
                     source: srcpath
                     destination: dest
                 }, error)))
-            else if srcpath.slice(-1) == "/"
+            else if data.key.slice(-1) == "/"
                 result = copyDirectory(srcpath, dest, options)              // hard case: directory with possibly many children
             else
                 result = copyFile(data, dest, options)                      // easy case: single file
@@ -637,13 +644,13 @@ closure FSview(table, rootpath, local view) {
                     basedir = item                                          // delete base directory at end
                     continue
                 }
-                `(error, data) = view.table.delete(item.doc)
+                `(error, data) = view.table.delete(item)
                 if error
                     errors.push(error) }
             if errors.length != 0
                 error = Error("some directory children not deleted", errors)
             else {
-                `(error, data) = view.table.delete(basedir.doc)
+                `(error, data) = view.table.delete(basedir)
                 if error
                    error = Error("delete directory failed", {
                         path: path
@@ -659,7 +666,7 @@ closure FSview(table, rootpath, local view) {
     //
     // Read a directory at the specified path
     // ### options currently ignored, for better or woise
-    
+    //
     view.dirList = closure dirList(path, options, callback, local name, dirdict) {
         if !callback
             return (syncAdapter(readir, path))
@@ -667,7 +674,7 @@ closure FSview(table, rootpath, local view) {
         if !path
             return                                                          // already executed callback with error
         dirdict = {
-            name: name.slice(0,-1)
+            name: name
             path: path
             data: {
                 platform: table.type
@@ -700,10 +707,8 @@ closure FSview(table, rootpath, local view) {
                             finfo.type = "directory"
                     } else if !finfo.type
                         finfo.type = "file"                                 // everything is a file in UNIX
-                    if item.doc._md5
-                        finfo.md5 = item.doc._md5
-                    if item.doc._length
-                        finfo.length = item.doc._length
+                    finfo.md5 = item.doc._md5 || undefined
+                    finfo.length = item.doc._length || item.doc.length || undefined
                     if item.key.length > offset                             // not the directory itself
                         dirdict.children.push({
                             name: name
@@ -723,7 +728,7 @@ closure FSview(table, rootpath, local view) {
     // tree
     //
     // Return a tree for the specified path. The path is relative to the root of the view.
-    
+    //
     view.tree = closure tree(path, options, callback, local name, treedict, item, offset) {
         if !callback
             return (syncAdapter(tree, path, options))
@@ -735,7 +740,7 @@ closure FSview(table, rootpath, local view) {
             deep: true
         }
         treedict = {
-            name: name.slice(0,-1)
+            name: name
             data: {
                 platform: table.type
                 semantics: "dbfs"
@@ -748,7 +753,8 @@ closure FSview(table, rootpath, local view) {
         for item in path.split("/").slice(0,-1)
             treedict.parents.push(item)
         offset = path.length                                                // offset to path's child names (after any slash)
-        view.table.records(options, function(error, data, local index, leaf, parent, slashdex) {
+        view.table.records(options, function(error, data,
+            local index, leaf, parent, child, slashdex, parents) {
             if error
                 return (callback(error))
             if data.rows.length == 0 && path != ""
@@ -775,22 +781,28 @@ closure FSview(table, rootpath, local view) {
                     else {                                                  // named or non-root directory
                         slashdex = name.lastIndexOf("/", name.length-2)     // penultimate slash
                         parent = name.substring(0, slashdex+1)              // includes parent's ending slash
-                            leaf = name.slice(slashdex+1, -1) }             // omits child's ending slash
-                        child = index[name] = {
+                        leaf = name.slice(slashdex+1, -1) }                 // omits child's ending slash
+                    child = index[name] = {
                         name: leaf
                         children: [] } }
                 else {                                                      // file child not in root
                     parent = name.substring(0, slashdex+1)
                     leaf = name.slice(slashdex+1)
                     child = { name: leaf } }
-                if index[parent]
-                    index[parent].children.push(child)
-                else {                                                      // orphaned child doesn't have <parent>/ record
-                    if !treedict.orphans
-                        treedict.orphans = []
-                    child.key = item.key
-                    treedict.orphans.push(child)
+                if !index[parent] {                                         // doesn't have immediate <parent>/ record
+                    parents = parent.split("/").slice(0,-1)
+                    parent = item = ""
+                    for leaf in parents {
+                        item = item.concat(leaf, "/")
+                        if !index[item]
+                            index[parent].children.push(
+                                index[item] = {
+                                    name: leaf
+                                    children: [] })
+                        parent = item
+                    }
                 }
+                index[parent].children.push(child)
             }
             callback(false, treedict)
         })

package/frameworks/storage/resources.nlg

@@ -11,7 +11,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2022 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -28,6 +28,7 @@
  */
 
 closure rsrcVault(db, tablename, local vault) {
+    global()
     vault = new(object, this)
 
     // addResource
@@ -72,7 +73,7 @@ closure rsrcVault(db, tablename, local vault) {
     //
     // Return credentials for access to the resource.
 
-    vault.accessResource = function accessResource(resID) {
+    vault.accessResource = function accessResource(resID, local error, data) {
         `(error, data) = vault.table.get(resID)
         if error
             list(error)
@@ -134,6 +135,7 @@ closure rsrcVault(db, tablename, local vault) {
  */
 
 closure ResourceManager(dbname, prefix, local reman, watch, result) {
+    global(commonWatching)
     reman = new(object, this)
     watch = commonWatching.Watchable()
     reman.watch = watch.watch

package/lib/browser/env_web.js

@@ -526,7 +526,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.16+1";
+        statedoc.verstring = "1.1.0+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -544,7 +544,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.16+1")
+            || statedoc.verstring != "1.1.0+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -603,7 +603,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.16+1"
+                    title: vsiteName + " 1.1.0+1"
                 });
             }
         } catch (e) {
@@ -617,7 +617,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.16+1"
+                    title: vsiteName + " 1.1.0+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -632,8 +632,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.16+1";;\r\n'
-                + 'App.cache = "268effa64ff3abbb3b2387089c918818";;\r\n'
+            cmd: 'App.version = "1.1.0+1";;\r\n'
+                + 'App.cache = "241e1d15dfb0de008135e2de76886ccc";;\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

@@ -26,7 +26,7 @@ importScripts(
 
 
 /*
- * NaanControllerNodeWorker
+ * NaanControllerWebWorker
  *
  *     This is the Web worker that executes Naan.
  *