Merge pull request #1772 from fastn-stack/asset-path-fix

fix: global object nested path conflict when assets begin with same name
fastn-stack · Feb 16, 2024 · cdda10c · cdda10c
2 parents 36b9089 + 814621a
commit cdda10c
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 32 deletions.
diff --git a/...68397A7E3F168E807119C8D73E375734010259.js → ...F9F644BD7079A31FB42B3FCE1DD4683696571A.js b/...68397A7E3F168E807119C8D73E375734010259.js → ...F9F644BD7079A31FB42B3FCE1DD4683696571A.js
@@ -4803,7 +4803,6 @@ const ftd = (function () {
             return;
         }
 
-
         if (body && method !== "GET") {
             if (body[0] instanceof fastn.recordInstanceClass) {
                 if (body.length !== 1) {

diff --git a/fastn-core/tests/08-static-assets/output/index.html b/fastn-core/tests/08-static-assets/output/index.html
diff --git a/...7C76B4EF66302B96447D220BBCE10F8122B342.js → ...A8FC8E9CA2DA19F288E98A7B0C4357F1EAA780.js b/...7C76B4EF66302B96447D220BBCE10F8122B342.js → ...A8FC8E9CA2DA19F288E98A7B0C4357F1EAA780.js
@@ -4803,7 +4803,6 @@ const ftd = (function () {
             return;
         }
 
-
         if (body && method !== "GET") {
             if (body[0] instanceof fastn.recordInstanceClass) {
                 if (body.length !== 1) {

diff --git a/fastn-core/tests/09-markdown-pages/output/index.html b/fastn-core/tests/09-markdown-pages/output/index.html
diff --git a/...2E03E5AE70ACD4DBF17D461BF66523DD110CC5.js → ...98A0F1A37462F37F6DC231B85AB35688F315A4.js b/...2E03E5AE70ACD4DBF17D461BF66523DD110CC5.js → ...98A0F1A37462F37F6DC231B85AB35688F315A4.js
@@ -4803,7 +4803,6 @@ const ftd = (function () {
             return;
         }
 
-
         if (body && method !== "GET") {
             if (body[0] instanceof fastn.recordInstanceClass) {
                 if (body.length !== 1) {

diff --git a/fastn-core/tests/17-sitemap/output/guide/install/index.html b/fastn-core/tests/17-sitemap/output/guide/install/index.html
diff --git a/fastn-core/tests/17-sitemap/output/index.html b/fastn-core/tests/17-sitemap/output/index.html
diff --git a/fastn-core/tests/17-sitemap/output/install/index.html b/fastn-core/tests/17-sitemap/output/install/index.html
diff --git a/...AADC9D400114E3917D4F8AEFCFB10D1765DAAB.js → ...A71343396A1503C8D7883C55CAA350B2B033AD.js b/...AADC9D400114E3917D4F8AEFCFB10D1765DAAB.js → ...A71343396A1503C8D7883C55CAA350B2B033AD.js
@@ -4803,7 +4803,6 @@ const ftd = (function () {
             return;
         }
 
-
         if (body && method !== "GET") {
             if (body[0] instanceof fastn.recordInstanceClass) {
                 if (body.length !== 1) {

diff --git a/fastn-core/tests/19-offline-build/output/index.html b/fastn-core/tests/19-offline-build/output/index.html
diff --git a/...0B3EF2BDE8DBABABFB476CED9CCAE7550067A3.js → ...55FD0047BB6E6948676913F2A2C31D2E2457C9.js b/...0B3EF2BDE8DBABABFB476CED9CCAE7550067A3.js → ...55FD0047BB6E6948676913F2A2C31D2E2457C9.js
@@ -4803,7 +4803,6 @@ const ftd = (function () {
             return;
         }
 
-
         if (body && method !== "GET") {
             if (body[0] instanceof fastn.recordInstanceClass) {
                 if (body.length !== 1) {

diff --git a/fastn-core/tests/21-http-endpoint/output/index.html b/fastn-core/tests/21-http-endpoint/output/index.html
diff --git a/fastn-js/src/to_js.rs b/fastn-js/src/to_js.rs
@@ -71,7 +71,8 @@ impl fastn_js::SetProperty {
             .append(text(
                 format!(
                     "{},",
-                    self.value
+                    &self
+                        .value
                         .to_js_with_element_name(&Some(self.element_name.clone()))
                 )
                 .as_str(),
@@ -677,6 +678,11 @@ fn variable_to_js(
         let (doc_name, remaining) = fastn_js::utils::get_doc_name_and_remaining(variable_name);
         let mut name = fastn_js::utils::name_to_js(doc_name.as_str());
         if let Some(remaining) = remaining {
+            let remaining = if fastn_js::utils::is_asset_path(doc_name.as_str()) {
+                remaining.replace('.', "_")
+            } else {
+                remaining
+            };
             name = format!(
                 "{}.{}",
                 name,

diff --git a/fastn-js/src/utils.rs b/fastn-js/src/utils.rs
@@ -11,7 +11,12 @@ pub fn is_kernel(s: &str) -> bool {
 
 pub fn reference_to_js(s: &str) -> String {
     let (prefix, s) = get_prefix(s);
-    let (mut p1, mut p2) = get_doc_name_and_remaining(s.as_str());
+    let (mut p1, p2) = get_doc_name_and_remaining(s.as_str());
+    let mut p2 = if is_asset_path(p1.as_str()) {
+        p2.map(|s| s.replace('.', "_"))
+    } else {
+        p2
+    };
     p1 = fastn_js::utils::name_to_js_(p1.as_str());
     let mut wrapper_function = None;
     while let Some(ref remaining) = p2 {
@@ -125,3 +130,15 @@ pub fn trim_brackets(s: &str) -> String {
 pub(crate) fn kebab_to_snake_case(s: &str) -> String {
     s.replace('-', "_")
 }
+
+pub(crate) fn ends_with_exact_suffix(name: &str, separator: &str, suffix: &str) -> bool {
+    if let Some((_, end)) = name.rsplit_once(separator) {
+        end.eq(suffix)
+    } else {
+        false
+    }
+}
+
+pub(crate) fn is_asset_path(name: &str) -> bool {
+    ends_with_exact_suffix(name, "/", "assets#files")
+}
diff --git a/ftd/syntax/neovim-ftd.lua → neovim-ftd.lua b/ftd/syntax/neovim-ftd.lua → neovim-ftd.lua
-Original file line number
+Diff line change
@@ Expand Up / @@ -4803,7 +4803,6 @@ const ftd = (function () { @@
                 return;
             }
             if (body && method !== "GET") {
                 if (body[0] instanceof fastn.recordInstanceClass) {
                     if (body.length !== 1) {
@@ Expand Down @@