@naanlang/naan 1.4.4 → 1.5.0

package/frameworks/storage/psm.nlg

@@ -252,6 +252,14 @@ closure MakePSMutil(fs, local util) {
     //      follow:     <boolean>           -- follow links instead of treating them as files
     //      idmode:     <boolean>           -- preserve id/mode where possible
     //      times:      <boolean>           -- preserve time where possible
+    //      cacheControl: [
+    //          {                           -- apply cacheControl to files matching regex
+    //              match: <regex-string>
+    //              flags: <regex-flags>    -- default "i" ignore case
+    //              cacheControl: <string>
+    //          }
+    //          ...
+    //      ]
     // }
     //
     // Limitations:
@@ -295,10 +303,13 @@ closure MakePSMutil(fs, local util) {
             if destpath == "."
                 destpath = ""                                               // joined empty strings
             `(error, stat) = fs.info(srcpath, fsopt)
-            if stat.type != "directory" && (!options.follow || stat.type != "symlink") {
+            if stat.type == "symlink" && options.follow && !fs.dirList(srcpath).0
+                stat.type = "directory"                                     // for our purposes this is a directory
+            if stat.type != "directory" {
                 copies.push({                                               // copy file or symlink 
                     source: srcpath
                     dest: destpath
+                    entry: entry
                 })
                 return (list(false, { ok: true }))                          // generic success not used
             }
@@ -346,10 +357,29 @@ closure MakePSMutil(fs, local util) {
             }).wait()
         }
         //
+        // Pass 3 - determine cache control values
+        //
+        let (regexes, item, file) {
+            regexes = new(options.cacheControl)
+            try {
+                for item in regexes
+                    item.regex = RegExp(item.match, item.flags || "i")
+            } catch {
+                ErrorDebuglog("PsmUtil.deepcopy: RegExp exception", exception)
+                regexes = []
+            }
+            for file in copies
+                for item in regexes
+                    if item.regex.test(file.entry) {
+                        file.cacheControl = item.cacheControl
+                        break
+                    }
+        } ()
+        //
         // Pass 3 - copy files and links
         //
         asyncArray(copies, 10, closure cpfiles(entry, 
-            local error, data, dest, instat, outstat) {
+            local error, data, dest, instat, outstat, foptions) {
             `(error, instat) = fs.info(entry.source, fsopt)
             if !error {
                 `(error, outstat) = outfs.info(entry.dest)
@@ -372,9 +402,13 @@ closure MakePSMutil(fs, local util) {
                         `(error, data) = outfs.symlink(data, entry.dest)
                 }
                 else {
-                    `(error, data) = fs.readFile(entry.source, { encoding: "binary"})
-                    if !error
-                        `(error, data) = outfs.writeFile(entry.dest, data, { encoding: "binary"})
+                    foptions = { encoding: "binary"}
+                    `(error, data) = fs.readFile(entry.source, foptions)
+                    if !error {
+                        if entry.cacheControl
+                            foptions.cacheControl = entry.cacheControl
+                        `(error, data) = outfs.writeFile(entry.dest, data, foptions)
+                    }
                     if !error && (options.idmode || options.times) {
                         if !options.idmode
                             instat.mode = instat.uid = instat.gid = false

package/frameworks/storage/psm_dbtables.nlg

@@ -185,6 +185,7 @@ closure FSview(table, rootpath, local view) {
     //      emptyok: true           -- allow empty directory names (leading "/" or embdedded "//")
     //      md5: <hash>             -- existing file content must match hash
     //      writenew: true          -- write as a new file, with updated create time
+    //      cacheControl: <string>  -- set the cacheControl header
     
    closure dbWriteRecord(path, content, options, callback) {
         if !callback
@@ -247,9 +248,15 @@ closure FSview(table, rootpath, local view) {
                     path: path
                 })))
             if doc
-                `(error, data) = view.table.update(doc)                     // update existing record
+                `(error, data) = view.table.update(doc, {                   // update existing record
+                    metadata: metadata
+                    cacheControl: options.cacheControl
+                })
             else
-                `(error, data) = view.table.add(path, content, metadata)    // create new record
+                `(error, data) = view.table.add(path, content, {            // create new record
+                    metadata: metadata
+                    cacheControl: options.cacheControl
+                })
             if error
                 callback(error)
             else
@@ -553,6 +560,7 @@ closure FSview(table, rootpath, local view) {
     // available:
     //      exclusive: true         -- file must not already exist
     //      md5: <hash>             -- existing file content must match hash
+    //      cacheControl: <string>  -- set the cacheControl header (if supported by underlying storage)
     
     view.write = closure write(path, content, options, callback) {
         if !callback

package/lib/browser/env_web.js

@@ -514,7 +514,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.4.4+1";
+        statedoc.verstring = "1.5.0+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -532,7 +532,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.4.4+1"
+            || statedoc.verstring != "1.5.0+1"
             || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
@@ -550,7 +550,7 @@ exports.NaanControllerWeb = function() {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
         }
-        if (querystrings["nosave"])
+        if ("nosave" in querystrings)
             return (false);
         var statedoc = makeState();
         var statestr = JSON.stringify(statedoc);
@@ -591,7 +591,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1"
+                    title: vsiteName + " 1.5.0+1"
                 });
             }
         } catch (e) {
@@ -605,7 +605,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1"
+                    title: vsiteName + " 1.5.0+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -621,7 +621,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteVisibilityChange",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1",
+                    title: vsiteName + " 1.5.0+1",
                     hidden: window.document.visibilityState == "hidden",
                     window: window
                 });
@@ -631,13 +631,13 @@ exports.NaanControllerWeb = function() {
     }
 
     /*jshint sub:true */
-    if (querystrings["restart"] || !loadLocal())
+    if ("restart" in querystrings || !loadLocal())
     {                                                                       // don't load state or can't load state
         naanlib.banner();
         var hostpath = window.location.origin.concat(naanlib.js.r("path").dirname(window.location.pathname));
         naanlib.start({
-            cmd: 'App.version = "1.4.4+1";;\r\n'
-                + 'App.cache = "c0da8251995ca3b0d26c3c5513b98f41";;\r\n'
+            cmd: 'App.version = "1.5.0+1";;\r\n'
+                + 'App.cache = "8a52678888a755df427e58396a70e4f9";;\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

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2024 by Richard C. Zulch
+ * Copyright (c) 2019-2025 by Richard C. Zulch
  *
  */
 
@@ -18,7 +18,6 @@
 
 importScripts(
     
-    "lib/core/naanlib.js"
 );