@naanlang/naan 1.0.6 → 1.0.8

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.6-1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.8+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
@@ -408,7 +408,11 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             if error
                 debuglog("projConfig.writeConfig cannot write local storage:", ErrorString(error))
         }
-        `(error, data) = fs.writeFile(configpath, JSONstringify(procon.configDict))
+        if procon.configMD5 {                                               // don't overwrite existing file
+            data = HashMD5(JSONstringify(procon.configDict))                // ### it messes up the formatting and
+            error = false                                                   // is manually maintained anyway
+        } else
+            `(error, data) = fs.writeFile(configpath, JSONstringify(procon.configDict))
         if !error {
             procon.configMD5 = data
             `(error, info) = fs.info(configpath)
@@ -561,37 +565,44 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
 
     // buildrules
     //
-    //     Get the build rules for the named stage.
+    //     Get the build rules for the named stage, reloading the project configuration if changed.
     //
-    function buildrules(stage, local rules, common, rule, key) {
+    function buildrules(stage, local error, data, rules, common, rule, key) {
+        if !procon.loaded
+            return (list(Error("project not loaded")))
+        `(error, data) = procon.changed()
+        if error
+            return (list(error))
         rules = procon.configDict."build-rules"[stage]
         if !rules
             rules = procon.configDict.build                                 // fallback to old config structure
         rules = new(rules)
-        common = procon.configDict."build-common"
+        if !rules["no-common"]
+            common = procon.configDict."build-common"
         if common {
             for rule in common
                 if !rules[rule]
                     rules[rule] = common[rule]                              // common rule was not overridden
-                else if array(common[rule], rules[rule])
+                else if array(common[rule], rules[rule])                    // ### array only tests first argument 20220909 Rcz
                     rules[rule] = common[rule].concat(rules[rule])          // merge common array with rule
-                else if dictionary(common[rule], rules[rule]) {
+                else if dictionary(common[rule], rules[rule]) {             // ### dictionary only tests first argument 20220909 Rcz
                     for key in common[rule]                                 // merge common dictionary with rule
                         if !rules[rule][key]
                             rules[rule][key] = common[rule][key]
                 }
         }
-        rules
+        list(false, rules)
     }
 
     // run
     //
     //     Run the project by building and then launching.
     //
-    procon.run = closure run(stage, buildonly, local rules, builder, buildpath, error, buildnum) {
-        if !procon.loaded
-            return (list(Error("project not loaded")))
-        rules = buildrules(stage)
+    procon.run = closure run(stage, buildonly, 
+        local error, rules, builder, buildpath, error, buildnum) {
+        `(error, rules) = buildrules(stage)
+        if error
+            return (list(error))
         if !rules || !rules.products
             return (list(Error("build rules missing or incomplete")))
         buildpath = fs.path.join(proj_configDataFolder, rules.products)
@@ -628,13 +639,27 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
     //
     //     Publish the project to its configured location.
     //
-    procon.publish = closure publish(stage, local rules, where, publish, error, outfs, inpath) {
-        rules = buildrules(stage)
+    //  {
+    //      input: "tutorApp/www/"
+    //      sources: [""]
+    //      output: ""
+    //      cacheControl: "max-age=2592000"
+    //  }
+    //
+    procon.publish = closure publish(stage, 
+        local error, rules, where, publish, error, outOptions, outfs, inpath) {
+        `(error, rules) = buildrules(stage)
+        if error
+            return (list(error))
         publish = rules.publish
         where = procon.localDict.publish[stage].where
         if !rules || !where
             return (list(Error("no project publish location configured")))
-        `(error, outfs) = projman.locate.connect(where.locationID, "NideFS", where.path)
+        if publish.cacheControl
+            outOptions = {
+                cacheControl: publish.cacheControl
+            }
+        `(error, outfs) = projman.locate.connect(where.locationID, "NideFS", where.path, outOptions)
         if error
             return (list(Error("can't access publishing filesystem", error)))
         inpath = fs.path.join(proj_configDataFolder, rules.products, publish.input)
@@ -671,8 +696,8 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
  */
 
 function projInit(local manifest) {
-
-    manifest = `(ProjectManager, projTracker, projConnector, projConfig, projInit)
+    manifest = `(ProjectManager, projTracker, projConnector, proj_configDataFolder,
+        proj_cliserConfigFile, projConfig, projInit)
 
     Naan.module.build(module.id, "projects", function(modobj, compobj) {
         require("./project.nlg")

package/frameworks/running/running.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2023 by Richard C. Zulch
  *
  */
 
@@ -48,17 +48,26 @@ function baseproc(procdef) {
 /*
  * pathmatch
  *
- *     Given a parent symbol and a tuple of child procedure symbols within it, return the child 
- * procedure named by the path in the tuple.
+ *     Given a parent symbol and a tuple of child procedures within it, return the child procedure
+ * named by the path in the tuple. Each element in the child procedures is either a symbol == to the
+ * procedure or, in the case of lambdas, a tuple comprising the procedure symbol and an integer
+ * specifying the nth matching child. This is necessary because a procedure can have any number of
+ * children named lambda, and we need to pick the right ones even though we don't have identical
+ * symbols.
  *
  */
 
-function pathmatch(parent, path, local segment) {
+function pathmatch(parent, path, local segment, nth, child) {
     if empty(path)
         return (parent)
-    segment = tostring(pop(path))
+    segment = pop(path)
+    if tuple(segment) {                                                     // select nth instance of matching symbol
+        nth = segment.1
+        segment = segment.0
+    } else
+        nth = 0
     for child in parent@\.children
-        if tostring(child) == segment
+        if child == segment && nth-- == 0
             return (pathmatch(child, path))
     false
 };
@@ -68,14 +77,27 @@ function pathmatch(parent, path, local segment) {
  * procpath
  *
  *     Return a tuple of parent prcoedure symbols for the specified child procedure. Note that this
- * path includes the parent but pathmatch above requires the parent as a separate argument.
+ * path includes the parent but pathmatch above requires the parent as a separate argument. As noted
+ * above, the segments of the path are either a procedure symbol, or a tuple of symbol and integer.
  *
  */
 
-function procpath(procdef, local path) {
+function procpath(procdef, local path, segment, parent, peers, nth, peer) {
     loop {
-        push(procdef.1, path)
-        parent = procdef.1@\.parent
+        segment = procdef.1
+        parent = segment@\.parent
+        if segment == lambda && parent {                                    // lambdas all have same name
+            peers = parent@\.children
+            nth = 0
+            for peer in peers {
+                if peer === segment
+                    break
+                if peer == segment
+                    ++nth
+            }
+            push(list(segment, nth), path)                                  // we are the nth of the matching ones
+        } else
+            push(segment, path)
         if !parent
             break
         procdef = parent.proc
@@ -144,7 +166,7 @@ function procstring(procdef, options, local name, output, parm) {
 function runnInit(local manifest) {
     manifest = `(rootproc, baseproc, pathmatch, procpath, procname, procstring, runnInit)
 
-    build(module.id, "running", closure(modobj, compobj) {
+    Naan.module.build(module.id, "running", closure(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
     })

package/frameworks/running/taskexec.nlg

@@ -119,7 +119,7 @@ closure taskDispatcher(replier, local contexts, gohome, util) {
                 }
             }
             else
-                call(onMessageHook, data)
+                onMessageHook(data)
         } catch {
             if true {
                 if tuple(exception)

package/frameworks/storage/file_manager.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2022 by Richard C. Zulch
  *
  */
 
@@ -287,6 +287,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
             fixed: true
             ignoreCase: true
             returnText: true
+            excludeDirs: []
         }
     }
     

package/frameworks/storage/psm.nlg

@@ -248,8 +248,8 @@ closure MakePSMutil(fs, local util) {
     //      erase:      <boolean>           -- remove extraneous files in destination folders
     //      force:      <boolean>           -- copy files even if older (default is only copy if new/newer)
     //      follow:     <boolean>           -- follow links instead of treating them as files
-    //      preserve:   <boolean>           -- preserve file info where possible
-    //                                         (e.g. mtime/atime/mode/uid/gid on NodeJS)
+    //      idmode:     <boolean>           -- preserve id/mode where possible
+    //      times:      <boolean>           -- preserve time where possible
     // }
     //
     // Limitations:
@@ -336,7 +336,8 @@ closure MakePSMutil(fs, local util) {
         //
         // Pass 3 - copy files and links
         //
-        asyncArray(copies, 10, closure cpfiles(entry, index, elements, local error, data, instat, outstat) {
+        asyncArray(copies, 10, closure cpfiles(entry, index, elements, 
+            local error, data, dest, instat, outstat) {
             `(error, instat) = fs.info(entry.source, fsopt)
             if !error {
                 `(error, outstat) = outfs.info(entry.dest)
@@ -348,6 +349,13 @@ closure MakePSMutil(fs, local util) {
                     error = Error("deepcopy: can't overwrite", entry.dest)
                 else if instat.type == "symlink" && !options.follow {
                     `(error, data) = fs.readlink(entry.source)
+                    if !error {
+                        `(error, dest) = outfs.readlink(entry.dest)         // get destination to compare links
+                        if dest == data
+                            return                                          // symlink unchanged
+                        outfs.delete(entry.dest)
+                        error = false                                       // ignore any destination errors
+                    }
                     if !error
                         `(error, data) = outfs.symlink(data, entry.dest)
                 }
@@ -355,8 +363,16 @@ closure MakePSMutil(fs, local util) {
                     `(error, data) = fs.readFile(entry.source, { encoding: "binary"})
                     if !error
                         `(error, data) = outfs.writeFile(entry.dest, data, { encoding: "binary"})
-                    if !error && options.preserve
+                    if !error && (options.idmode || options.times) {
+                        if !options.idmode
+                            instat.mode = instat.uid = instat.gid = false
+                        if !options.times {
+                            instat.mtimeMs = instat.mtime = false
+                            instat.nodejs_stat.mtimeMs = instat.nodejs_stat.mtime = false
+                            instat.nodejs_stat.atimeMs = instat.nodejs_stat.atime = false
+                        }
                         `(error) = outfs.setInfo(entry.dest, instat)
+                    }
                 }
             }
             if error

package/frameworks/storage/psm_dbtables.nlg

@@ -465,14 +465,24 @@ closure FSview(table, rootpath, local view, error) {
         if !callback
             return (syncAdapter(info, path))
         dbReadRecord(path, true, function(error, data, local finfo) {
-            if data {
+            if data {                                                       // try to glean the node info
                 finfo = new(data.finfo)
                 if !finfo
                     finfo = { }
                 if data._md5
                     finfo.md5 = data._md5
-                if data._length
-                    finfo.length = data._length }
+                if xobject(data.modified) {
+                    finfo.mtimeMs = data.modified.getTime()
+                    finfo.mtime = data.modified.toISOString()
+                }
+                if data.contentType
+                    finfo.contentType = data.contentType
+                if data.length
+                    finfo.length = data.length
+                else if data._length
+                    finfo.length = data._length
+                if finfo.length
+                    finfo.type = "file" }
             else if path == "" {
                 error = false                                               // we were asked for info on superoot
                 finfo = {

package/lib/browser/env_web.js

@@ -309,13 +309,75 @@ exports.NaanControllerWeb = function() {
     //
     
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
-        if (window.location.href.startsWith(url_origin)) {
+        if (vsiteName && window.location.href.startsWith(url_origin)) {
             window.location.reload();                                       // we have changed underneath
+            window.scroll(0,0);                                             // Chrome 106 had flood pants 🤓
             return (true);
         }
         return (false);
     };
 
+    //==========================================================================
+    // Browser Console Terminal
+    //--------------------------------------------------------------------------
+    
+    // Commands:
+    //      Naanlang.debug(<text>)          -- command line text entry
+    //      Naanlang.int()                  -- interrupt and enter debugger
+    //      Naanlang.detach()               -- close the console terminal
+
+    var conDebTerm;
+
+    //
+    // ConsoleDebugTerminal
+    //
+    function ConsoleDebugTerminal() {
+        var termSelf = this;
+        //
+        // OnMessageOut
+        //
+        this.OnMessage = function OnMessage(msg) {
+            if (msg.id == "debugtext")
+                console.log("dbug-" + msg.level + " " + msg.text);
+            else if (msg.id == "textout")
+                console.log(msg.text);
+        };
+        //
+        // cmd
+        //
+        this.cmd = function cmd(keys) {
+            keys = keys.trim();
+            contSelf.Return(keys + "\n", termSelf);
+            return (keys);
+        };
+        //
+        // int
+        //
+        this.int = function int() {
+            contSelf.Interrupt();
+        };
+    }
+    
+    //
+    // debug
+    //
+    function debug(text) {
+        if (!conDebTerm) {
+            conDebTerm = new ConsoleDebugTerminal();
+            contSelf.Attach(conDebTerm);
+        }
+        exports.debug = conDebTerm.cmd;
+        exports.int = conDebTerm.int;
+        exports.detach = function() {
+            contSelf.Detach(conDebTerm);
+            exports.debug = debug;
+            exports.int = undefined;
+            exports.detach = undefined;
+            conDebTerm = false;
+        };
+        return (conDebTerm.cmd(text));
+    }
+    exports.debug = debug;
 
     //==========================================================================
     // Clone Debug Interface
@@ -458,7 +520,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.6-1";
+        statedoc.verstring = "1.0.8+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -476,7 +538,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.6-1")
+            || statedoc.verstring != "1.0.8+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -528,26 +590,34 @@ exports.NaanControllerWeb = function() {
     }
         
     function virtualOpen() {
-        vsiteName = window.document.title;                                  // consistent name at open and close
-        if (window.opener && window.opener.Naanlang)
-            window.opener.Naanlang.naancon.DispatchMessage({
-                op: "VsiteOpen",
-                name: vsiteName,
-                naancont: contSelf,
-                title: vsiteName + " 1.0.6-1"
-            });
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                vsiteName = window.document.title;                          // consistent name at open and close
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteOpen",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " 1.0.8+1"
+                });
+            }
+        } catch (e) {
+        }
     }
     
     function virtualClose() {
-        if (window.opener && window.opener.Naanlang) {
-            window.opener.Naanlang.naancon.DispatchMessage({
-                op: "VsiteClose",
-                name: vsiteName,
-                naancont: contSelf,
-                title: vsiteName + " 1.0.6-1"
-            });
-            termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteClose",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " 1.0.8+1"
+                });
+                termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+            }
+        } catch (e) {
         }
+        vsiteName = false;                                                  // window is going away
     }
 
     /*jshint sub:true */
@@ -556,7 +626,10 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '"' + ');;\r\n'
+            cmd: 'App.version = "1.0.8+1";;\r\n'
+                + 'App.cache = "a7694c55ac4ee13a1946011bac913099";;\r\n'
+                + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
+                + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });
     } else {
         if (!replstate) {                                                   // saved state but never opened a terminal

package/lib/browser/env_webworker.js

@@ -104,6 +104,16 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
         return (proc);
     };
 
+    targSelf.Download = function Download(bits, name, options) {
+        postMessage({                                                       // tell browser host to download a file
+            id: "download",
+            bits: bits,
+            name: name,
+            options: options,
+        });
+        return (name);
+    };
+
     onmessage = function(e) {
         var msg = e.data;
         if (msg.id == "interrupt")