@naanlang/naan 1.0.5 → 1.0.7

package/frameworks/project/build.nlg

@@ -716,6 +716,10 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     entry.unzip = true
                     entry.writepath = outdirpath
                 }
+                if group.tasks.indexOf("catenate") >= 0
+                    entry.catenate = true
+                if group.tasks.indexOf("zip") >= 0
+                    entry.zip = true
                 if group.tasks.indexOf("naanpack") >= 0 || group.tasks.indexOf("jspack") >= 0 || group.tasks.indexOf("syntax") >= 0 {
                     let (inpar, outpar, extension) {                        // change extension for package output
                         inpar = JSpath.parse(infile)
@@ -740,12 +744,12 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                                 inpar.base = inpar.name.concat(extension)
                                 entry.insource = JSpath.format(inpar)
                             }
-                        } else
+                        } else if !entry.zip && !entry.catenate
                             entry.copy = true                               // fall back to copy
                     } ()
                 }
                 if group.tasks.indexOf("minimize") >= 0 {
-                    if infile.endsWith(".js") {
+                    if infile.endsWith(".js") || outfile.endsWith(".js") {
                         entry.minimize = true
                         if group.minprefix
                             entry.minprefix = group.minprefix               // use group minify prefix
@@ -753,10 +757,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                             entry.minprefix = build.minprefix               // use generic minify prefix
                     }
                 }
-                if group.tasks.indexOf("catenate") >= 0
-                    entry.catenate = true
-                if group.tasks.indexOf("zip") >= 0 {
-                    entry.zip = true
+                if entry.zip {
                     if !entry.writepath.toLowerCase().endsWith(".zip")
                         entry.writepath = entry.writepath.concat(".zip")    // always ends with .zip
                     outfile = entry.writepath
@@ -844,7 +845,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // checked and any that have all the parts are written out. Catenates that don't have all their
     // parts are reported as an error in addition to the error that caused them to be incomplete.
     //
-    closure execute(local error, entries, pending, licFileDefs, buildno, verFileDefs, baddestpaths, catenates) {
+    closure execute(local error, licFileDefs, buildno, verFileDefs, version, entries, pending, 
+            baddestpaths, catenates) {
         if build.tasks.license > 0
             `(error, licFileDefs) = readSubstitutionFile(build.licfilepath)
         if build.tasks.version > 0 {
@@ -858,6 +860,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
             `(error, verFileDefs) = readSubstitutionFile(build.verfilepath, {
                 BuildNumber: buildno
             })
+            build.version = verFileDefs["Version"]
+            verFileDefs["CacheBuster"] = HashMD5(build.version.concat(Math.random()))
         }
         if build.tasks.catenate > 0 || build.tasks.zip > 0 {
             build.templates = { }
@@ -962,7 +966,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
         let (writepath, template, entry, content, catsub, dozip, docat, fsoptions, zipmap, error, result) {
             for :out1 writepath in catenates {
-                template = build.templates[writepath]                       // optional
+                template = build.templates[writepath]                       // optional in some cases ### should warn in others
                 catsub = { }
                 for entry in catenates[writepath] {                         // error check and substitution build
                     if !entry.content {
@@ -1024,13 +1028,14 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //      } ... ]
     //  }
     //
-    build.make = closure make(debugMake, local sink, xchan, entry, outext, error) {
+    build.make = closure make(options, local sink, xchan, entry, outext, error) {
         sink = new(textstream, "", `string)                                 // log all output
         xchan = textstreams(list(sink, sink))
         try {
             resetlist()
-            analyze(debugMake)
-            if debugMake {
+            analyze(options.debugMake)
+            if options.debugMake {
+                printline("Debugging make for ", options.buildnum, "-", options.stage)
                 if build.errorlist.length == 0 {
                     printline("build operations (", build.filelist.length, ") for ", operation)
                     for entry in build.filelist
@@ -1052,6 +1057,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
             "\ndate: ", Date(),
             "\nfrom: ", JSpath.join(fs.rootpath, build.srcpath),
             "\n  to: ", build.destpath,
+            "\ntype: ", options.stage,
+            "\nvers: ", build.version,
             "\n", sink.taketext())
         `(error) = fs.writeFile(JSpath.join(build.destpath, "build_log.txt"), outext)
         if error
@@ -1153,14 +1160,17 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // build.refresh
     //
-    // Refresh after updating the v-site. This should probably update all types of executions. ###
+    // Refresh after updating the v-site, returning true iff an existing vsite was found.
     //
-    build.refresh = function refresh(track local main, url_origin) {
+    build.refresh = function refresh(track local main, url_origin, found) {
         if build.runway."v-site" {
             url_origin = js.w.location.origin.concat("/run", build.runway."v-site")
-            for target in track.enumlist()
-                target.vsiteRefresh(url_origin)
+            for target in track.enumlist() {
+                if target.vsiteRefresh(url_origin)
+                    found = true
+            }
         }
+        found
     }
 
     //

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.5-1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.7+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
@@ -326,6 +326,7 @@ proj_cliserConfigFile = "nide_cliser.cfg";
 closure projConfig(projman, where, projID, local procon, fs, configpath) {
     procon = new(object, this)
     procon.name = where.name
+    procon.dirName = proj_configDataFolder.slice(0,-1)                      // remove terminal "/"
     if projID
         procon.localID = projID.concat("-data")
     
@@ -407,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)
@@ -547,39 +552,57 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         stage
     }
 
+    // setCurrentStage
+    //
+    //     Set the current stage.
+    //
+    procon.setCurrentStage = function setCurrentStage(stage) {
+        if member(stage, stages()) {
+            procon.localDict.currentStage = stage
+            update()                                                        // ### errors here are never reported
+        }
+    }
+
     // 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)
@@ -595,11 +618,14 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             ErrorDebuglog("build number increment failed", error)
             return (list(error))
         }
-        `(error) = builder.make()
+        `(error) = builder.make({
+            stage: stage
+            buildnum: buildnum
+        })
         if !error {
-            if buildonly
-                builder.refresh(projman.track)
-            else
+            if builder.refresh(projman.track)
+                buildonly = !buildonly                                      // reverse if refresh
+            if !buildonly
                 `(error) = builder.run(projman.track)
         }
         builder.destroy()
@@ -613,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)
@@ -656,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/executors.nlg

@@ -438,7 +438,6 @@ closure ExecutorTracker(local xtrak) {
     // Notify watchers of an update on an execution instance.
 
     xtrak.update = closure update(executor) {
-        debuglog("xtrack.update", executor.title)
         notify({ updated: [executor] })
     }
     

package/frameworks/running/running.nlg

@@ -144,7 +144,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_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,8 +309,11 @@ 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
+            return (true);
+        }
+        return (false);
     };
 
 
@@ -455,7 +458,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.5-1";
+        statedoc.verstring = "1.0.7+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -473,7 +476,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.5-1")
+            || statedoc.verstring != "1.0.7+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -531,7 +534,7 @@ exports.NaanControllerWeb = function() {
                 op: "VsiteOpen",
                 name: vsiteName,
                 naancont: contSelf,
-                title: vsiteName + " 1.0.5-1"
+                title: vsiteName + " 1.0.7+1"
             });
     }
     
@@ -541,8 +544,9 @@ exports.NaanControllerWeb = function() {
                 op: "VsiteClose",
                 name: vsiteName,
                 naancont: contSelf,
-                title: vsiteName + " 1.0.5-1"
+                title: vsiteName + " 1.0.7+1"
             });
+            vsiteName = false;                                              // window is going away
             termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
         }
     }
@@ -553,7 +557,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.7+1";;\r\n'
+                + 'App.cache = "cb-1.0.7+1";;\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")