From 653d0158b51705240a8d850f16386d6730e2be8a Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Tue, 23 Jan 2024 15:59:52 +0530 Subject: [PATCH 01/30] Fix: record referring its own field --- fastn-js/src/constants.rs | 1 + fastn-js/src/property.rs | 8 +- fastn-js/src/utils.rs | 2 + ftd/src/js/mod.rs | 19 +++- ftd/src/js/resolver.rs | 15 +++ ftd/src/js/utils.rs | 6 ++ ftd/t/js/92-self-reference-record.ftd | 24 +++++ ftd/t/js/92-self-reference-record.html | 129 +++++++++++++++++++++++++ 8 files changed, 199 insertions(+), 5 deletions(-) create mode 100644 ftd/t/js/92-self-reference-record.ftd create mode 100644 ftd/t/js/92-self-reference-record.html diff --git a/fastn-js/src/constants.rs b/fastn-js/src/constants.rs index d32bc6e9a7..fda5af8406 100644 --- a/fastn-js/src/constants.rs +++ b/fastn-js/src/constants.rs @@ -1,6 +1,7 @@ pub const GLOBAL_VARIABLE_MAP: &str = "global"; pub const LEGACY_GLOBAL_MAP_REF_VARIABLE: &str = "__fastn_legacy_global_ref__"; pub const LOCAL_VARIABLE_MAP: &str = "__args__"; +pub const LOCAL_RECORD_MAP: &str = "record"; pub const FUNCTION_ARGS: &str = "args"; pub const INHERITED_PREFIX: &str = "__$$inherited$$__"; pub const INHERITED_VARIABLE: &str = "inherited"; diff --git a/fastn-js/src/property.rs b/fastn-js/src/property.rs index 3eca3990f9..a92d93c551 100644 --- a/fastn-js/src/property.rs +++ b/fastn-js/src/property.rs @@ -242,7 +242,8 @@ impl Value { fields, other_references, } => format!( - "fastn.recordInstance({{{}{}}})", + "function() {{let {} = fastn.recordInstance({{{}}}); {} return record;}}()", + fastn_js::LOCAL_RECORD_MAP, if other_references.is_empty() { "".to_string() } else { @@ -258,11 +259,12 @@ impl Value { fields .iter() .map(|(k, v)| format!( - "{}: {}", + "{}.set(\"{}\", {});", + fastn_js::LOCAL_RECORD_MAP, fastn_js::utils::name_to_js_(k), v.to_js_with_element_name(element_name) )) - .join(", ") + .join("\n") ), Value::UI { value } => format!( "function({}, {}){{{}}}", diff --git a/fastn-js/src/utils.rs b/fastn-js/src/utils.rs index 8998192499..13c742eba6 100644 --- a/fastn-js/src/utils.rs +++ b/fastn-js/src/utils.rs @@ -10,7 +10,9 @@ pub fn is_kernel(s: &str) -> bool { } pub fn reference_to_js(s: &str) -> String { + dbg!("reference_to_js", &s); let (prefix, s) = get_prefix(s); + dbg!("prefix", &prefix, &s); let (mut p1, mut p2) = get_doc_name_and_remaining(s.as_str()); p1 = fastn_js::utils::name_to_js_(p1.as_str()); diff --git a/ftd/src/js/mod.rs b/ftd/src/js/mod.rs index 9549dcc8f2..46f771019e 100644 --- a/ftd/src/js/mod.rs +++ b/ftd/src/js/mod.rs @@ -110,6 +110,7 @@ pub fn document_into_js_ast(document: ftd::interpreter::Document) -> JSAstData { continue; } if let ftd::interpreter::Thing::Component(c) = thing { + dbg!(&c.arguments); document_asts.push(c.to_ast(&doc, &mut has_rive_components)); } else if let ftd::interpreter::Thing::Variable(v) = thing { document_asts.push(v.to_ast( @@ -229,7 +230,14 @@ impl ftd::interpreter::Variable { if let Some(value) = record_fields.get(field.name.as_str()) { fields.push(( field.name.to_string(), - value.to_fastn_js_value_with_none(doc, has_rive_components), + value.to_fastn_js_value_with_ui( + doc, + &ftd::js::ResolverData::new_with_record_definition_name(&Some( + name.to_string(), + )), + has_rive_components, + false, + ), )); } else { fields.push(( @@ -237,7 +245,14 @@ impl ftd::interpreter::Variable { field .get_default_value() .unwrap() - .to_set_property_value_with_none(doc, has_rive_components), + .to_set_property_value_with_ui( + doc, + &ftd::js::ResolverData::new_with_record_definition_name(&Some( + name.to_string(), + )), + has_rive_components, + false, + ), )); } } diff --git a/ftd/src/js/resolver.rs b/ftd/src/js/resolver.rs index d2ba624d59..782f291082 100644 --- a/ftd/src/js/resolver.rs +++ b/ftd/src/js/resolver.rs @@ -1,6 +1,7 @@ #[derive(Debug, Clone)] pub struct ResolverData<'a> { pub component_definition_name: &'a Option, + pub record_definition_name: &'a Option, pub component_name: Option, pub loop_alias: &'a Option, pub loop_counter_alias: &'a Option, @@ -13,6 +14,7 @@ impl<'a> ResolverData<'a> { pub(crate) fn none() -> ResolverData<'a> { ResolverData { component_definition_name: &None, + record_definition_name: &None, component_name: None, loop_alias: &None, loop_counter_alias: &None, @@ -30,9 +32,18 @@ impl<'a> ResolverData<'a> { rdata } + pub(crate) fn new_with_record_definition_name( + record_definition_name: &'a Option, + ) -> ResolverData<'a> { + let mut rdata = ResolverData::none(); + rdata.record_definition_name = record_definition_name; + rdata + } + pub(crate) fn clone_with_default_inherited_variable(&self) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, + record_definition_name: self.record_definition_name, component_name: self.component_name.clone(), loop_alias: self.loop_alias, loop_counter_alias: self.loop_counter_alias, @@ -48,6 +59,7 @@ impl<'a> ResolverData<'a> { ) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, + record_definition_name: self.record_definition_name, component_name: self.component_name.clone(), loop_alias: self.loop_alias, loop_counter_alias: self.loop_counter_alias, @@ -63,6 +75,7 @@ impl<'a> ResolverData<'a> { ) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, + record_definition_name: self.record_definition_name, component_name, loop_alias: self.loop_alias, loop_counter_alias: self.loop_counter_alias, @@ -78,6 +91,7 @@ impl<'a> ResolverData<'a> { ) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, + record_definition_name: self.record_definition_name, component_name: self.component_name.clone(), loop_alias: self.loop_alias, loop_counter_alias: self.loop_counter_alias, @@ -95,6 +109,7 @@ impl<'a> ResolverData<'a> { ) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, + record_definition_name: self.record_definition_name, component_name: self.component_name.clone(), loop_alias, loop_counter_alias, diff --git a/ftd/src/js/utils.rs b/ftd/src/js/utils.rs index 05a606a535..271b9f8df9 100644 --- a/ftd/src/js/utils.rs +++ b/ftd/src/js/utils.rs @@ -128,6 +128,12 @@ pub(crate) fn update_reference(reference: &str, rdata: &ftd::js::ResolverData) - } } + if let Some(record_definition_name) = rdata.record_definition_name { + if let Some(alias) = name.strip_prefix(format!("{record_definition_name}.").as_str()) { + return format!("{}.{alias}", fastn_js::LOCAL_RECORD_MAP); + } + } + if let Some(loop_alias) = rdata.loop_alias { if let Some(alias) = name.strip_prefix(format!("{loop_alias}.").as_str()) { return format!("item.{alias}"); diff --git a/ftd/t/js/92-self-reference-record.ftd b/ftd/t/js/92-self-reference-record.ftd new file mode 100644 index 0000000000..f72e3e26a9 --- /dev/null +++ b/ftd/t/js/92-self-reference-record.ftd @@ -0,0 +1,24 @@ +-- record name-data: +caption name: +string full-name: $name-data.name + + +-- name-data arpita: Arpita + +-- display-name: $arpita + +-- component display-name: +caption name-data name: +name-data clone-name: $display-name.name + +-- ftd.column: + +-- ftd.text: $display-name.name.name +color: green + +-- ftd.text: $display-name.name.full-name +color: red + +-- end: ftd.column + +-- end: display-name diff --git a/ftd/t/js/92-self-reference-record.html b/ftd/t/js/92-self-reference-record.html new file mode 100644 index 0000000000..e28026450a --- /dev/null +++ b/ftd/t/js/92-self-reference-record.html @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + +
Arpita
Arpita
+ + From ae8ee8970b25cf0da4d70b5ee724684284fdd5c5 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Tue, 23 Jan 2024 16:02:03 +0530 Subject: [PATCH 02/30] Fix tests --- fastn-js/src/utils.rs | 3 - ftd/src/js/mod.rs | 1 - ftd/t/js/01-basic-module.html | 33 +- ftd/t/js/01-basic.html | 11 +- ftd/t/js/02-property.html | 11 +- ftd/t/js/03-common-properties.html | 383 +++--- ftd/t/js/07-dynamic-dom-record-list.html | 22 +- ftd/t/js/08-inherited.html | 1053 ++++++++++------- ftd/t/js/09-text-properties.html | 55 +- ftd/t/js/10-color-test.html | 111 +- ftd/t/js/12-children.html | 11 +- ftd/t/js/13-non-style-properties.html | 44 +- ftd/t/js/14-code.html | 11 +- ftd/t/js/17-events.html | 22 +- ftd/t/js/18-rive.html | 11 +- ftd/t/js/19-image.html | 11 +- ftd/t/js/20-background-properties.html | 122 +- ftd/t/js/22-document.html | 40 +- ftd/t/js/23-record-list.html | 44 +- ftd/t/js/24-re-export.html | 33 +- ftd/t/js/25-re-re-export.html | 44 +- ftd/t/js/30-web-component.html | 77 +- ftd/t/js/31-advance-list.html | 88 +- ftd/t/js/31-ftd-len.html | 11 +- ftd/t/js/32-ftd-len.html | 77 +- ftd/t/js/33-list-indexing.html | 22 +- ftd/t/js/34-ftd-ui.html | 26 +- ftd/t/js/37-expander.html | 11 +- ftd/t/js/38-background-image-properties.html | 24 +- ftd/t/js/41-document-favicon.html | 20 +- ftd/t/js/42-links.html | 22 +- ftd/t/js/43-image-object-fit.html | 77 +- ftd/t/js/44-module.html | 11 +- ftd/t/js/45-re-module.html | 11 +- ftd/t/js/45-re-re-module.html | 11 +- ftd/t/js/48-video.html | 22 +- ftd/t/js/49-align-content.html | 792 ++++++++----- ftd/t/js/51-markdown-table.html | 33 +- ftd/t/js/52-events.html | 11 +- ftd/t/js/53-link-color.html | 11 +- ftd/t/js/54-class-fix.html | 22 +- ftd/t/js/59-text-shadow.html | 28 +- ftd/t/js/60-conditional-module-headers.html | 11 +- ftd/t/js/61-functions.html | 22 +- ftd/t/js/62-fallback-fonts.html | 136 ++- ftd/t/js/66-backdrop-filter.html | 34 +- ftd/t/js/67-counter.html | 11 +- ftd/t/js/68-mask.html | 303 +++-- .../js/69-chained-dot-value-in-functions.html | 46 +- ftd/t/js/72-document-breakpoint.html | 20 +- ftd/t/js/73-loops-inside-list.html | 88 +- ftd/t/js/78-module-using-record.html | 11 +- ftd/t/js/79-module-using-function.html | 55 +- ftd/t/js/80-or-type-constant.html | 13 +- ftd/t/js/81-or-type-test.html | 13 +- ftd/t/js/82-or-type-module.html | 24 +- ftd/t/js/86-import-or-type.html | 13 +- ftd/t/js/87-or-type-module-export.html | 13 +- .../88-module-reference-wrap-in-variant.html | 46 +- ftd/t/js/89-nested-or-type.html | 11 +- ftd/t/js/91-component-event.html | 22 +- 61 files changed, 2751 insertions(+), 1624 deletions(-) diff --git a/fastn-js/src/utils.rs b/fastn-js/src/utils.rs index 13c742eba6..f15975f02a 100644 --- a/fastn-js/src/utils.rs +++ b/fastn-js/src/utils.rs @@ -10,10 +10,7 @@ pub fn is_kernel(s: &str) -> bool { } pub fn reference_to_js(s: &str) -> String { - dbg!("reference_to_js", &s); let (prefix, s) = get_prefix(s); - dbg!("prefix", &prefix, &s); - let (mut p1, mut p2) = get_doc_name_and_remaining(s.as_str()); p1 = fastn_js::utils::name_to_js_(p1.as_str()); let mut wrapper_function = None; diff --git a/ftd/src/js/mod.rs b/ftd/src/js/mod.rs index 46f771019e..7965e3bf32 100644 --- a/ftd/src/js/mod.rs +++ b/ftd/src/js/mod.rs @@ -110,7 +110,6 @@ pub fn document_into_js_ast(document: ftd::interpreter::Document) -> JSAstData { continue; } if let ftd::interpreter::Thing::Component(c) = thing { - dbg!(&c.arguments); document_asts.push(c.to_ast(&doc, &mut has_rive_components)); } else if let ftd::interpreter::Thing::Variable(v) = thing { document_asts.push(v.to_ast( diff --git a/ftd/t/js/01-basic-module.html b/ftd/t/js/01-basic-module.html index a781d0be59..8bddad1f0a 100644 --- a/ftd/t/js/01-basic-module.html +++ b/ftd/t/js/01-basic-module.html @@ -54,18 +54,24 @@ v: false, }, parenti0); }); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([global.foo__hover], function () { if (function () { return fastn_utils.getter(global.foo__hover); }()) { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#eaaaff", - light: "#eaaaff" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#eaaaff"); + record.set("light", "#eaaaff"); + return record; + }()); } } ), inherited); @@ -83,10 +89,13 @@ } global["main"] = main; fastn_utils.createNestedObject(global, "foo__hover", fastn.mutable(false)); -fastn_utils.createNestedObject(global, "foo__bg_og", fastn.recordInstance({ - light: "yellow", - dark: "green" -})); +fastn_utils.createNestedObject(global, "foo__bg_og", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "green"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/01-basic.html b/ftd/t/js/01-basic.html index ae436ab4d5..7866c84bf4 100644 --- a/ftd/t/js/01-basic.html +++ b/ftd/t/js/01-basic.html @@ -46,10 +46,13 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__bg_og", fastn.recordInstance({ - light: "yellow", - dark: "green" -})); +fastn_utils.createNestedObject(global, "foo__bg_og", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "green"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/02-property.html b/ftd/t/js/02-property.html index 3792f424c9..6c6861dac0 100644 --- a/ftd/t/js/02-property.html +++ b/ftd/t/js/02-property.html @@ -64,10 +64,13 @@ } } ), inherited); - parenti4.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + parenti4.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/03-common-properties.html b/ftd/t/js/03-common-properties.html index 4485e74c53..a36da35b99 100644 --- a/ftd/t/js/03-common-properties.html +++ b/ftd/t/js/03-common-properties.html @@ -941,10 +941,13 @@ }()) { return global.foo__bp; } else { - return fastn.recordInstance({ - dark: "red", - light: "red" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(); } } ), inherited); @@ -1052,10 +1055,13 @@ rooti0.setProperty(fastn_dom.PropertyKind.Top, fastn_dom.Length.Px(20), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Left, fastn_dom.Length.Px(50), inherited); rooti0.setProperty(fastn_dom.PropertyKind.ZIndex, 3, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "deepskyblue", - light: "deepskyblue" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "deepskyblue"); + record.set("light", "deepskyblue"); + return record; + }()), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -1067,10 +1073,13 @@ rooti0.setProperty(fastn_dom.PropertyKind.Bottom, fastn_dom.Length.Px(70), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Right, fastn_dom.Length.Px(60), inherited); rooti0.setProperty(fastn_dom.PropertyKind.ZIndex, 2, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "deepskyblue", - light: "deepskyblue" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "deepskyblue"); + record.set("light", "deepskyblue"); + return record; + }()), inherited); } ]), inherited); let parenti2 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); @@ -1093,14 +1102,20 @@ rooti0.setProperty(fastn_dom.PropertyKind.Top, fastn_dom.Length.Px(0), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Left, fastn_dom.Length.Px(50), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Sticky, true, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "deepskyblue", - light: "deepskyblue" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "deepskyblue"); + record.set("light", "deepskyblue"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextAlign, fastn_dom.TextAlign.Center, inherited); }, function (root, inherited) { @@ -1112,10 +1127,13 @@ let parenti3 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Row); parenti3.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti3.setProperty(fastn_dom.PropertyKind.MarginVertical, fastn_dom.Length.Px(50), inherited); - parenti3.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "red", - light: "red" - })), inherited); + parenti3.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }()), inherited); parenti3.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceEvenly, inherited); parenti3.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -1157,10 +1175,13 @@ let parenti4 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Row); parenti4.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti4.setProperty(fastn_dom.PropertyKind.MarginVertical, fastn_dom.Length.Px(50), inherited); - parenti4.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "green", - light: "green" - })), inherited); + parenti4.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }()), inherited); parenti4.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceEvenly, inherited); parenti4.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -1202,10 +1223,13 @@ let parenti5 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Row); parenti5.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti5.setProperty(fastn_dom.PropertyKind.MarginVertical, fastn_dom.Length.Px(50), inherited); - parenti5.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "deepskyblue", - light: "deepskyblue" - })), inherited); + parenti5.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "deepskyblue"); + record.set("light", "deepskyblue"); + return record; + }()), inherited); parenti5.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceEvenly, inherited); parenti5.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -1348,10 +1372,13 @@ parenti7.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); parenti7.setProperty(fastn_dom.PropertyKind.BorderStyle, fastn_dom.BorderStyle.Solid, inherited); parenti7.setProperty(fastn_dom.PropertyKind.BorderColor, global.foo__red_yellow, inherited); - parenti7.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + parenti7.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); parenti7.setProperty(fastn_dom.PropertyKind.Wrap, true, inherited); parenti7.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); parenti7.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { @@ -1381,19 +1408,25 @@ ]), inherited); let parenti8 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti8.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); - parenti8.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#963770", - light: "#963770" - })), inherited); + parenti8.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#963770"); + record.set("light", "#963770"); + return record; + }()), inherited); parenti8.setProperty(fastn_dom.PropertyKind.Opacity, 0.6, inherited); parenti8.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, global.foo__sample_text, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(10), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "white", - light: "white" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }(), inherited); } ]), inherited); let parenti9 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); @@ -1625,10 +1658,13 @@ "b", "c", "d"]), inherited); - parenti14.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti14.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); let parenti15 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti15.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(600)), inherited); parenti15.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); @@ -1643,20 +1679,26 @@ rooti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderStyle, fastn_dom.BorderStyle.Solid, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Inside Inner Container", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Anchor, fastn_dom.Anchor.Id("c1"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Top, fastn_dom.Length.Px(0), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Left, fastn_dom.Length.Px(0), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); } ]), inherited); } @@ -1675,20 +1717,26 @@ rooti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderStyle, fastn_dom.BorderStyle.Solid, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Inside Outer Container", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Anchor, fastn_dom.Anchor.Id("c2"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Top, fastn_dom.Length.Px(0), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Left, fastn_dom.Length.Px(0), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); } ]), inherited); } @@ -1711,46 +1759,61 @@ ]), inherited); let parenti18 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti18.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); - parenti18.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "blue:", - light: "blue:" - })), inherited); + parenti18.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue:"); + record.set("light", "blue:"); + return record; + }()), inherited); parenti18.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "These are stylized values", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextStyle, fastn.mutableList([fastn_dom.TextStyle.Italic, fastn_dom.TextStyle.Regular]), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); rooti0.setProperty(fastn_dom.PropertyKind.IntegerValue, 1234, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextStyle, fastn.mutableList([fastn_dom.TextStyle.Bold]), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Decimal); rooti0.setProperty(fastn_dom.PropertyKind.DecimalValue, 3.142, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextStyle, fastn.mutableList([fastn_dom.TextStyle.Underline, fastn_dom.TextStyle.Italic]), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Boolean); rooti0.setProperty(fastn_dom.PropertyKind.BooleanValue, true, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextStyle, fastn.mutableList([fastn_dom.TextStyle.Heavy]), inherited); } ]), inherited); @@ -1761,10 +1824,13 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello World", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Region, fastn_dom.Region.H1, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); } ]), inherited); let parenti20 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); @@ -1773,10 +1839,13 @@ parenti20.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); parenti20.setProperty(fastn_dom.PropertyKind.BorderStyle, fastn_dom.BorderStyle.Solid, inherited); parenti20.setProperty(fastn_dom.PropertyKind.BorderColor, global.foo__red_yellow, inherited); - parenti20.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + parenti20.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); parenti20.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Center, inherited); parenti20.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -1801,14 +1870,20 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__ylg", fastn.recordInstance({ - light: "yellow", - dark: "lightgreen" -})); -fastn_utils.createNestedObject(global, "foo__red_yellow", fastn.recordInstance({ - light: "red", - dark: "yellow" -})); +fastn_utils.createNestedObject(global, "foo__ylg", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "lightgreen"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__red_yellow", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "red"); + record.set("dark", "yellow"); + return record; +}()); let foo__increment = function (args) { let __fastn_super_package_name__ = __fastn_package_name__; @@ -1829,50 +1904,74 @@ } global["foo__increment"] = foo__increment; fastn_utils.createNestedObject(global, "foo__value", fastn.mutable(0)); -fastn_utils.createNestedObject(global, "foo__og", fastn.recordInstance({ - light: "orange", - dark: "green" -})); -fastn_utils.createNestedObject(global, "foo__bp", fastn.recordInstance({ - light: "blue", - dark: "purple" -})); -fastn_utils.createNestedObject(global, "foo__dtype", fastn.recordInstance({ - size: fastn_dom.FontSize.Px(40), - line_height: fastn_dom.FontSize.Px(65), - letter_spacing: fastn_dom.FontSize.Px(5), - weight: 700, - font_family: fastn.mutableList(["cursive"]) -})); -fastn_utils.createNestedObject(global, "foo__mtype", fastn.recordInstance({ - size: fastn_dom.FontSize.Px(20), - line_height: fastn_dom.FontSize.Px(35), - letter_spacing: fastn_dom.FontSize.Px(3), - weight: 100, - font_family: fastn.mutableList(["fantasy"]) -})); -fastn_utils.createNestedObject(global, "foo__rtype", fastn.recordInstance({ - desktop: global.foo__dtype, - mobile: global.foo__mtype -})); -fastn_utils.createNestedObject(global, "foo__red_blue", fastn.recordInstance({ - light: "red", - dark: "blue" -})); +fastn_utils.createNestedObject(global, "foo__og", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "orange"); + record.set("dark", "green"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__bp", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "blue"); + record.set("dark", "purple"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__dtype", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(40)); + record.set("line_height", fastn_dom.FontSize.Px(65)); + record.set("letter_spacing", fastn_dom.FontSize.Px(5)); + record.set("weight", 700); + record.set("font_family", fastn.mutableList(["cursive"])); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__mtype", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(20)); + record.set("line_height", fastn_dom.FontSize.Px(35)); + record.set("letter_spacing", fastn_dom.FontSize.Px(3)); + record.set("weight", 100); + record.set("font_family", fastn.mutableList(["fantasy"])); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__rtype", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__dtype); + record.set("mobile", global.foo__mtype); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__red_blue", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "red"); + record.set("dark", "blue"); + return record; +}()); fastn_utils.createNestedObject(global, "foo__sample_text", "Far far away, behind the word mountains, far from the countries\nVokalia and Consonantia, there live the blind texts. Separated they\nin Bookmarksgrove right at the coast of the Semantics, a large language\nocean. A small river named Duden flows by their place and supplies it\nwith the necessary regelialia. It is a paradisematic country, in which\nroasted parts of sentences fly into your mouth. Even the all-powerful\nPointing has no control about the blind texts it is an almost unorthographic\nlife One day however a small line of blind text by the name of Lorem\nIpsum decided to leave for the far World of Grammar."); fastn_utils.createNestedObject(global, "foo__sample_text2", "But ere she from the church-door stepped She smiled and told us why:\n\n'It was a wicked woman's curse,' Quoth she, 'and what care I?'\nShe smiled, and smiled, and passed it off Ere from the door she stept-"); -fastn_utils.createNestedObject(global, "foo__yellow_red", fastn.recordInstance({ - light: "yellow", - dark: "red" -})); -fastn_utils.createNestedObject(global, "foo__s", fastn.recordInstance({ - x_offset: fastn_dom.Length.Px(10), - y_offset: fastn_dom.Length.Px(10), - blur: fastn_dom.Length.Px(1), - spread: fastn_dom.Length.Px(0), - color: global.foo__yellow_red, - inset: false -})); +fastn_utils.createNestedObject(global, "foo__yellow_red", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "red"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__s", function () { + let record = fastn.recordInstance({ + }); + record.set("x_offset", fastn_dom.Length.Px(10)); + record.set("y_offset", fastn_dom.Length.Px(10)); + record.set("blur", fastn_dom.Length.Px(1)); + record.set("spread", fastn_dom.Length.Px(0)); + record.set("color", global.foo__yellow_red); + record.set("inset", false); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/07-dynamic-dom-record-list.html b/ftd/t/js/07-dynamic-dom-record-list.html index 3f857a3e84..f88807b313 100644 --- a/ftd/t/js/07-dynamic-dom-record-list.html +++ b/ftd/t/js/07-dynamic-dom-record-list.html @@ -62,15 +62,21 @@ } } global["foo__append_person"] = foo__append_person; -fastn_utils.createNestedObject(global, "foo__first", fastn.recordInstance({ - name: "Jill", - bio: "I am Jill" -})); +fastn_utils.createNestedObject(global, "foo__first", function () { + let record = fastn.recordInstance({ + }); + record.set("name", "Jill"); + record.set("bio", "I am Jill"); + return record; +}()); fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([global.foo__first])); -fastn_utils.createNestedObject(global, "foo__tom", fastn.recordInstance({ - name: "Tom", - bio: "I am Tom" -})); +fastn_utils.createNestedObject(global, "foo__tom", function () { + let record = fastn.recordInstance({ + }); + record.set("name", "Tom"); + record.set("bio", "I am Tom"); + return record; +}()); let foo__show_person = function (parent, inherited, args) { let __fastn_super_package_name__ = __fastn_package_name__; diff --git a/ftd/t/js/08-inherited.html b/ftd/t/js/08-inherited.html index 6244704488..3a922eeadd 100644 --- a/ftd/t/js/08-inherited.html +++ b/ftd/t/js/08-inherited.html @@ -64,10 +64,13 @@ let parenti2 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti2.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti2.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); - let __$$inherited$$__parenti2 = fastn.recordInstance({ - ...inherited.getAllFields(), - colors: global.foo__colors - }); + let __$$inherited$$__parenti2 = function () { + let record = fastn.recordInstance({ + ...inherited.getAllFields(), + }); + record.set("colors", global.foo__colors); + return record; + }(); parenti2.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); @@ -107,401 +110,653 @@ } } global["foo__foo"] = foo__foo; -fastn_utils.createNestedObject(global, "foo__base_", fastn.recordInstance({ - light: "#FFFFFF", - dark: "#000000" -})); -fastn_utils.createNestedObject(global, "foo__step_1_", fastn.recordInstance({ - light: "#FDFAF1", - dark: "#111111" -})); -fastn_utils.createNestedObject(global, "foo__step_2_", fastn.recordInstance({ - light: "#fbf3dc", - dark: "#2b2b2b" -})); -fastn_utils.createNestedObject(global, "foo__overlay_", fastn.recordInstance({ - light: "#000000", - dark: "#000000" -})); -fastn_utils.createNestedObject(global, "foo__code_", fastn.recordInstance({ - light: "#f5f5f5", - dark: "#21222c" -})); -fastn_utils.createNestedObject(global, "foo__background_", fastn.recordInstance({ - base: global.foo__base_, - step_1: global.foo__step_1_, - step_2: global.foo__step_2_, - overlay: global.foo__overlay_, - code: global.foo__code_ -})); -fastn_utils.createNestedObject(global, "foo__border_", fastn.recordInstance({ - light: "#f0ece2", - dark: "#434547" -})); -fastn_utils.createNestedObject(global, "foo__border_strong_", fastn.recordInstance({ - light: "#D9D9D9", - dark: "#333333" -})); -fastn_utils.createNestedObject(global, "foo__text_", fastn.recordInstance({ - light: "#707070", - dark: "#D9D9D9" -})); -fastn_utils.createNestedObject(global, "foo__text_strong_", fastn.recordInstance({ - light: "#333333", - dark: "#FFFFFF" -})); -fastn_utils.createNestedObject(global, "foo__shadow_", fastn.recordInstance({ - light: "#EF8435", - dark: "#EF8435" -})); -fastn_utils.createNestedObject(global, "foo__scrim_", fastn.recordInstance({ - light: "#393939", - dark: "#393939" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_base_", fastn.recordInstance({ - light: "#EF8435", - dark: "#EF8435" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_hover_", fastn.recordInstance({ - light: "#D77730", - dark: "#D77730" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_pressed_", fastn.recordInstance({ - light: "#BF6A2A", - dark: "#BF6A2A" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_disabled_", fastn.recordInstance({ - light: "#FAD9C0", - dark: "#FAD9C0" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_focused_", fastn.recordInstance({ - light: "#B36328", - dark: "#B36328" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_border_", fastn.recordInstance({ - light: "#F3A063", - dark: "#F3A063" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_text_", fastn.recordInstance({ - light: "#512403", - dark: "#512403" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_text_disabled_", fastn.recordInstance({ - light: "#f2a164", - dark: "#f2a164" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_border_disabled_", fastn.recordInstance({ - light: "#fad9c0", - dark: "#fad9c0" -})); -fastn_utils.createNestedObject(global, "foo__cta_primary_", fastn.recordInstance({ - base: global.foo__cta_primary_base_, - hover: global.foo__cta_primary_hover_, - pressed: global.foo__cta_primary_pressed_, - disabled: global.foo__cta_primary_disabled_, - focused: global.foo__cta_primary_focused_, - border: global.foo__cta_primary_border_, - border_disabled: global.foo__cta_primary_border_disabled_, - text: global.foo__cta_primary_text_, - text_disabled: global.foo__cta_primary_text_disabled_ -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_base_", fastn.recordInstance({ - light: "#EBE8E5", - dark: "#EBE8E5" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_hover_", fastn.recordInstance({ - light: "#D4D1CE", - dark: "#D4D1CE" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_pressed_", fastn.recordInstance({ - light: "#BCBAB7", - dark: "#BCBAB7" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_disabled_", fastn.recordInstance({ - light: "#F9F8F7", - dark: "#F9F8F7" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_focused_", fastn.recordInstance({ - light: "#B0AEAC", - dark: "#B0AEAC" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_border_", fastn.recordInstance({ - light: "#B0AEAC", - dark: "#B0AEAC" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_text_", fastn.recordInstance({ - light: "#333333", - dark: "#333333" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_text_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#fff" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_border_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#f1dac0" -})); -fastn_utils.createNestedObject(global, "foo__cta_secondary_", fastn.recordInstance({ - base: global.foo__cta_secondary_base_, - hover: global.foo__cta_secondary_hover_, - pressed: global.foo__cta_secondary_pressed_, - disabled: global.foo__cta_secondary_disabled_, - focused: global.foo__cta_secondary_focused_, - border: global.foo__cta_secondary_border_, - border_disabled: global.foo__cta_secondary_border_disabled_, - text: global.foo__cta_secondary_text_, - text_disabled: global.foo__cta_secondary_text_disabled_ -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_base_", fastn.recordInstance({ - light: "#4A6490", - dark: "#4A6490" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_hover_", fastn.recordInstance({ - light: "#3d5276", - dark: "#3d5276" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_pressed_", fastn.recordInstance({ - light: "#2b3a54", - dark: "#2b3a54" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_disabled_", fastn.recordInstance({ - light: "rgba(74, 100, 144, 0.4)", - dark: "rgba(74, 100, 144, 0.4)" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_focused_", fastn.recordInstance({ - light: "#6882b1", - dark: "#6882b1" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_border_", fastn.recordInstance({ - light: "#4e6997", - dark: "#4e6997" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_text_", fastn.recordInstance({ - light: "#ffffff", - dark: "#ffffff" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_text_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#fff" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_border_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#f1dac0" -})); -fastn_utils.createNestedObject(global, "foo__cta_tertiary_", fastn.recordInstance({ - base: global.foo__cta_tertiary_base_, - hover: global.foo__cta_tertiary_hover_, - pressed: global.foo__cta_tertiary_pressed_, - disabled: global.foo__cta_tertiary_disabled_, - focused: global.foo__cta_tertiary_focused_, - border: global.foo__cta_tertiary_border_, - border_disabled: global.foo__cta_tertiary_border_disabled_, - text: global.foo__cta_tertiary_text_, - text_disabled: global.foo__cta_tertiary_text_disabled_ -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_base_", fastn.recordInstance({ - light: "#F9E4E1", - dark: "#F9E4E1" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_hover_", fastn.recordInstance({ - light: "#F1BDB6", - dark: "#F1BDB6" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_pressed_", fastn.recordInstance({ - light: "#D46A63", - dark: "#D46A63" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_disabled_", fastn.recordInstance({ - light: "#FAECEB", - dark: "#FAECEB" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_focused_", fastn.recordInstance({ - light: "#D97973", - dark: "#D97973" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_border_", fastn.recordInstance({ - light: "#E9968C", - dark: "#E9968C" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_text_", fastn.recordInstance({ - light: "#D84836", - dark: "#D84836" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_text_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#fff" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_border_disabled_", fastn.recordInstance({ - light: "#304655", - dark: "#f1dac0" -})); -fastn_utils.createNestedObject(global, "foo__cta_danger_", fastn.recordInstance({ - base: global.foo__cta_danger_base_, - hover: global.foo__cta_danger_hover_, - pressed: global.foo__cta_danger_pressed_, - disabled: global.foo__cta_danger_disabled_, - focused: global.foo__cta_danger_focused_, - border: global.foo__cta_danger_border_, - border_disabled: global.foo__cta_danger_border_disabled_, - text: global.foo__cta_danger_text_, - text_disabled: global.foo__cta_danger_text_disabled_ -})); -fastn_utils.createNestedObject(global, "foo__accent_primary_", fastn.recordInstance({ - light: "#EF8435", - dark: "#EF8435" -})); -fastn_utils.createNestedObject(global, "foo__accent_secondary_", fastn.recordInstance({ - light: "#EBE8E5", - dark: "#EBE8E5" -})); -fastn_utils.createNestedObject(global, "foo__accent_tertiary_", fastn.recordInstance({ - light: "#c5cbd7", - dark: "#c5cbd7" -})); -fastn_utils.createNestedObject(global, "foo__accent_", fastn.recordInstance({ - primary: global.foo__accent_primary_, - secondary: global.foo__accent_secondary_, - tertiary: global.foo__accent_tertiary_ -})); -fastn_utils.createNestedObject(global, "foo__error_base_", fastn.recordInstance({ - light: "#F9E4E1", - dark: "#4f2a25c9" -})); -fastn_utils.createNestedObject(global, "foo__error_text_", fastn.recordInstance({ - light: "#D84836", - dark: "#D84836" -})); -fastn_utils.createNestedObject(global, "foo__error_border_", fastn.recordInstance({ - light: "#E9968C", - dark: "#E9968C" -})); -fastn_utils.createNestedObject(global, "foo__error_btb_", fastn.recordInstance({ - base: global.foo__error_base_, - text: global.foo__error_text_, - border: global.foo__error_border_ -})); -fastn_utils.createNestedObject(global, "foo__success_base_", fastn.recordInstance({ - light: "#DCEFE4", - dark: "#033a1bb8" -})); -fastn_utils.createNestedObject(global, "foo__success_text_", fastn.recordInstance({ - light: "#3E8D61", - dark: "#159f52" -})); -fastn_utils.createNestedObject(global, "foo__success_border_", fastn.recordInstance({ - light: "#95D0AF", - dark: "#95D0AF" -})); -fastn_utils.createNestedObject(global, "foo__success_btb_", fastn.recordInstance({ - base: global.foo__success_base_, - text: global.foo__success_text_, - border: global.foo__success_border_ -})); -fastn_utils.createNestedObject(global, "foo__info_base_", fastn.recordInstance({ - light: "#DAE7FB", - dark: "#233a5dc7" -})); -fastn_utils.createNestedObject(global, "foo__info_text_", fastn.recordInstance({ - light: "#5290EC", - dark: "#5290EC" -})); -fastn_utils.createNestedObject(global, "foo__info_border_", fastn.recordInstance({ - light: "#7EACF1", - dark: "#7EACF1" -})); -fastn_utils.createNestedObject(global, "foo__info_btb_", fastn.recordInstance({ - base: global.foo__info_base_, - text: global.foo__info_text_, - border: global.foo__info_border_ -})); -fastn_utils.createNestedObject(global, "foo__warning_base_", fastn.recordInstance({ - light: "#FDF7F1", - dark: "#3b2c1ee6" -})); -fastn_utils.createNestedObject(global, "foo__warning_text_", fastn.recordInstance({ - light: "#E78B3E", - dark: "#E78B3E" -})); -fastn_utils.createNestedObject(global, "foo__warning_border_", fastn.recordInstance({ - light: "#F2C097", - dark: "#F2C097" -})); -fastn_utils.createNestedObject(global, "foo__warning_btb_", fastn.recordInstance({ - base: global.foo__warning_base_, - text: global.foo__warning_text_, - border: global.foo__warning_border_ -})); -fastn_utils.createNestedObject(global, "foo__custom_one_", fastn.recordInstance({ - light: "#4AA35C", - dark: "#4AA35C" -})); -fastn_utils.createNestedObject(global, "foo__custom_two_", fastn.recordInstance({ - light: "#5C2860", - dark: "#5C2860" -})); -fastn_utils.createNestedObject(global, "foo__custom_three_", fastn.recordInstance({ - light: "#EBBE52", - dark: "#EBBE52" -})); -fastn_utils.createNestedObject(global, "foo__custom_four_", fastn.recordInstance({ - light: "#FDFAF1", - dark: "#111111" -})); -fastn_utils.createNestedObject(global, "foo__custom_five_", fastn.recordInstance({ - light: "#FBF5E2", - dark: "#222222" -})); -fastn_utils.createNestedObject(global, "foo__custom_six_", fastn.recordInstance({ - light: "#ef8dd6", - dark: "#ef8dd6" -})); -fastn_utils.createNestedObject(global, "foo__custom_seven_", fastn.recordInstance({ - light: "#7564be", - dark: "#7564be" -})); -fastn_utils.createNestedObject(global, "foo__custom_eight_", fastn.recordInstance({ - light: "#d554b3", - dark: "#d554b3" -})); -fastn_utils.createNestedObject(global, "foo__custom_nine_", fastn.recordInstance({ - light: "#ec8943", - dark: "#ec8943" -})); -fastn_utils.createNestedObject(global, "foo__custom_ten_", fastn.recordInstance({ - light: "#da7a4a", - dark: "#da7a4a" -})); -fastn_utils.createNestedObject(global, "foo__custom_", fastn.recordInstance({ - one: global.foo__custom_one_, - two: global.foo__custom_two_, - three: global.foo__custom_three_, - four: global.foo__custom_four_, - five: global.foo__custom_five_, - six: global.foo__custom_six_, - seven: global.foo__custom_seven_, - eight: global.foo__custom_eight_, - nine: global.foo__custom_nine_, - ten: global.foo__custom_ten_ -})); -fastn_utils.createNestedObject(global, "foo__colors", fastn.recordInstance({ - background: global.foo__background_, - border: global.foo__border_, - border_strong: global.foo__border_strong_, - text: global.foo__text_, - text_strong: global.foo__text_strong_, - shadow: global.foo__shadow_, - scrim: global.foo__scrim_, - cta_primary: global.foo__cta_primary_, - cta_secondary: global.foo__cta_secondary_, - cta_tertiary: global.foo__cta_tertiary_, - cta_danger: global.foo__cta_danger_, - accent: global.foo__accent_, - error: global.foo__error_btb_, - success: global.foo__success_btb_, - info: global.foo__info_btb_, - warning: global.foo__warning_btb_, - custom: global.foo__custom_ -})); +fastn_utils.createNestedObject(global, "foo__base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FFFFFF"); + record.set("dark", "#000000"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__step_1_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FDFAF1"); + record.set("dark", "#111111"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__step_2_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#fbf3dc"); + record.set("dark", "#2b2b2b"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__overlay_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#000000"); + record.set("dark", "#000000"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__code_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f5f5f5"); + record.set("dark", "#21222c"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__background_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__base_); + record.set("step_1", global.foo__step_1_); + record.set("step_2", global.foo__step_2_); + record.set("overlay", global.foo__overlay_); + record.set("code", global.foo__code_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f0ece2"); + record.set("dark", "#434547"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__border_strong_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D9D9D9"); + record.set("dark", "#333333"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#707070"); + record.set("dark", "#D9D9D9"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__text_strong_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#333333"); + record.set("dark", "#FFFFFF"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__shadow_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EF8435"); + record.set("dark", "#EF8435"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__scrim_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#393939"); + record.set("dark", "#393939"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EF8435"); + record.set("dark", "#EF8435"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_hover_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D77730"); + record.set("dark", "#D77730"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_pressed_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#BF6A2A"); + record.set("dark", "#BF6A2A"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FAD9C0"); + record.set("dark", "#FAD9C0"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_focused_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#B36328"); + record.set("dark", "#B36328"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F3A063"); + record.set("dark", "#F3A063"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#512403"); + record.set("dark", "#512403"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_text_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f2a164"); + record.set("dark", "#f2a164"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_border_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#fad9c0"); + record.set("dark", "#fad9c0"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_primary_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__cta_primary_base_); + record.set("hover", global.foo__cta_primary_hover_); + record.set("pressed", global.foo__cta_primary_pressed_); + record.set("disabled", global.foo__cta_primary_disabled_); + record.set("focused", global.foo__cta_primary_focused_); + record.set("border", global.foo__cta_primary_border_); + record.set("border_disabled", global.foo__cta_primary_border_disabled_); + record.set("text", global.foo__cta_primary_text_); + record.set("text_disabled", global.foo__cta_primary_text_disabled_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EBE8E5"); + record.set("dark", "#EBE8E5"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_hover_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D4D1CE"); + record.set("dark", "#D4D1CE"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_pressed_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#BCBAB7"); + record.set("dark", "#BCBAB7"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F9F8F7"); + record.set("dark", "#F9F8F7"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_focused_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#B0AEAC"); + record.set("dark", "#B0AEAC"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#B0AEAC"); + record.set("dark", "#B0AEAC"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#333333"); + record.set("dark", "#333333"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_text_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#fff"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_border_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#f1dac0"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_secondary_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__cta_secondary_base_); + record.set("hover", global.foo__cta_secondary_hover_); + record.set("pressed", global.foo__cta_secondary_pressed_); + record.set("disabled", global.foo__cta_secondary_disabled_); + record.set("focused", global.foo__cta_secondary_focused_); + record.set("border", global.foo__cta_secondary_border_); + record.set("border_disabled", global.foo__cta_secondary_border_disabled_); + record.set("text", global.foo__cta_secondary_text_); + record.set("text_disabled", global.foo__cta_secondary_text_disabled_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4A6490"); + record.set("dark", "#4A6490"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_hover_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3d5276"); + record.set("dark", "#3d5276"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_pressed_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2b3a54"); + record.set("dark", "#2b3a54"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(74, 100, 144, 0.4)"); + record.set("dark", "rgba(74, 100, 144, 0.4)"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_focused_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#6882b1"); + record.set("dark", "#6882b1"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4e6997"); + record.set("dark", "#4e6997"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ffffff"); + record.set("dark", "#ffffff"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_text_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#fff"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_border_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#f1dac0"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_tertiary_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__cta_tertiary_base_); + record.set("hover", global.foo__cta_tertiary_hover_); + record.set("pressed", global.foo__cta_tertiary_pressed_); + record.set("disabled", global.foo__cta_tertiary_disabled_); + record.set("focused", global.foo__cta_tertiary_focused_); + record.set("border", global.foo__cta_tertiary_border_); + record.set("border_disabled", global.foo__cta_tertiary_border_disabled_); + record.set("text", global.foo__cta_tertiary_text_); + record.set("text_disabled", global.foo__cta_tertiary_text_disabled_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F9E4E1"); + record.set("dark", "#F9E4E1"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_hover_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F1BDB6"); + record.set("dark", "#F1BDB6"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_pressed_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D46A63"); + record.set("dark", "#D46A63"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FAECEB"); + record.set("dark", "#FAECEB"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_focused_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D97973"); + record.set("dark", "#D97973"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#E9968C"); + record.set("dark", "#E9968C"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D84836"); + record.set("dark", "#D84836"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_text_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#fff"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_border_disabled_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#304655"); + record.set("dark", "#f1dac0"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__cta_danger_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__cta_danger_base_); + record.set("hover", global.foo__cta_danger_hover_); + record.set("pressed", global.foo__cta_danger_pressed_); + record.set("disabled", global.foo__cta_danger_disabled_); + record.set("focused", global.foo__cta_danger_focused_); + record.set("border", global.foo__cta_danger_border_); + record.set("border_disabled", global.foo__cta_danger_border_disabled_); + record.set("text", global.foo__cta_danger_text_); + record.set("text_disabled", global.foo__cta_danger_text_disabled_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__accent_primary_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EF8435"); + record.set("dark", "#EF8435"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__accent_secondary_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EBE8E5"); + record.set("dark", "#EBE8E5"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__accent_tertiary_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c5cbd7"); + record.set("dark", "#c5cbd7"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__accent_", function () { + let record = fastn.recordInstance({ + }); + record.set("primary", global.foo__accent_primary_); + record.set("secondary", global.foo__accent_secondary_); + record.set("tertiary", global.foo__accent_tertiary_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__error_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F9E4E1"); + record.set("dark", "#4f2a25c9"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__error_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#D84836"); + record.set("dark", "#D84836"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__error_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#E9968C"); + record.set("dark", "#E9968C"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__error_btb_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__error_base_); + record.set("text", global.foo__error_text_); + record.set("border", global.foo__error_border_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__success_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#DCEFE4"); + record.set("dark", "#033a1bb8"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__success_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3E8D61"); + record.set("dark", "#159f52"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__success_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#95D0AF"); + record.set("dark", "#95D0AF"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__success_btb_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__success_base_); + record.set("text", global.foo__success_text_); + record.set("border", global.foo__success_border_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__info_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#DAE7FB"); + record.set("dark", "#233a5dc7"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__info_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#5290EC"); + record.set("dark", "#5290EC"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__info_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7EACF1"); + record.set("dark", "#7EACF1"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__info_btb_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__info_base_); + record.set("text", global.foo__info_text_); + record.set("border", global.foo__info_border_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__warning_base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FDF7F1"); + record.set("dark", "#3b2c1ee6"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__warning_text_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#E78B3E"); + record.set("dark", "#E78B3E"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__warning_border_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F2C097"); + record.set("dark", "#F2C097"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__warning_btb_", function () { + let record = fastn.recordInstance({ + }); + record.set("base", global.foo__warning_base_); + record.set("text", global.foo__warning_text_); + record.set("border", global.foo__warning_border_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_one_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4AA35C"); + record.set("dark", "#4AA35C"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_two_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#5C2860"); + record.set("dark", "#5C2860"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_three_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#EBBE52"); + record.set("dark", "#EBBE52"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_four_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FDFAF1"); + record.set("dark", "#111111"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_five_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FBF5E2"); + record.set("dark", "#222222"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_six_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ef8dd6"); + record.set("dark", "#ef8dd6"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_seven_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7564be"); + record.set("dark", "#7564be"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_eight_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#d554b3"); + record.set("dark", "#d554b3"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_nine_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ec8943"); + record.set("dark", "#ec8943"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_ten_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#da7a4a"); + record.set("dark", "#da7a4a"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__custom_", function () { + let record = fastn.recordInstance({ + }); + record.set("one", global.foo__custom_one_); + record.set("two", global.foo__custom_two_); + record.set("three", global.foo__custom_three_); + record.set("four", global.foo__custom_four_); + record.set("five", global.foo__custom_five_); + record.set("six", global.foo__custom_six_); + record.set("seven", global.foo__custom_seven_); + record.set("eight", global.foo__custom_eight_); + record.set("nine", global.foo__custom_nine_); + record.set("ten", global.foo__custom_ten_); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__colors", function () { + let record = fastn.recordInstance({ + }); + record.set("background", global.foo__background_); + record.set("border", global.foo__border_); + record.set("border_strong", global.foo__border_strong_); + record.set("text", global.foo__text_); + record.set("text_strong", global.foo__text_strong_); + record.set("shadow", global.foo__shadow_); + record.set("scrim", global.foo__scrim_); + record.set("cta_primary", global.foo__cta_primary_); + record.set("cta_secondary", global.foo__cta_secondary_); + record.set("cta_tertiary", global.foo__cta_tertiary_); + record.set("cta_danger", global.foo__cta_danger_); + record.set("accent", global.foo__accent_); + record.set("error", global.foo__error_btb_); + record.set("success", global.foo__success_btb_); + record.set("info", global.foo__info_btb_); + record.set("warning", global.foo__warning_btb_); + record.set("custom", global.foo__custom_); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/09-text-properties.html b/ftd/t/js/09-text-properties.html index 533a8dccdb..452e4a667e 100644 --- a/ftd/t/js/09-text-properties.html +++ b/ftd/t/js/09-text-properties.html @@ -89,14 +89,20 @@ parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); parenti0.setProperty(fastn_dom.PropertyKind.BorderStyle, fastn_dom.BorderStyle.Double, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -118,25 +124,34 @@ parenti1.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti1.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(10), inherited); parenti1.setProperty(fastn_dom.PropertyKind.MarginVertical, fastn_dom.Length.Px(5), inherited); - parenti1.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "black", - light: "black" - })), inherited); + parenti1.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }()), inherited); parenti1.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "This is some indented text.\n\nIt only applies spacing at the beginning of the first line.", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "yellow", - light: "yellow" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextIndent, fastn_dom.Length.Px(30), inherited); } ]), inherited); let parenti2 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Row); - parenti2.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + parenti2.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); parenti2.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); parenti2.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); diff --git a/ftd/t/js/10-color-test.html b/ftd/t/js/10-color-test.html index b8fba73727..250b023ade 100644 --- a/ftd/t/js/10-color-test.html +++ b/ftd/t/js/10-color-test.html @@ -64,10 +64,13 @@ }()) { return fastn_dom.BackgroundStyle.Solid(global.foo__bg_bp); } else { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "pink", - light: "pink" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "pink"); + record.set("light", "pink"); + return record; + }()); } } ), inherited); @@ -94,10 +97,13 @@ }()) { return global.foo__bp; } else { - return fastn.recordInstance({ - dark: "red", - light: "red" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(); } } ), inherited); @@ -108,10 +114,13 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__bg_og", fastn.recordInstance({ - light: "#170d03", - dark: "#edfce8" -})); +fastn_utils.createNestedObject(global, "foo__bg_og", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#170d03"); + record.set("dark", "#edfce8"); + return record; +}()); let foo__increment = function (args) { let __fastn_super_package_name__ = __fastn_package_name__; @@ -132,36 +141,54 @@ } global["foo__increment"] = foo__increment; fastn_utils.createNestedObject(global, "foo__value", fastn.mutable(0)); -fastn_utils.createNestedObject(global, "foo__og", fastn.recordInstance({ - light: "orange", - dark: "green" -})); -fastn_utils.createNestedObject(global, "foo__bp", fastn.recordInstance({ - light: "blue", - dark: "purple" -})); -fastn_utils.createNestedObject(global, "foo__dtype", fastn.recordInstance({ - size: fastn_dom.FontSize.Px(36), - line_height: fastn_dom.FontSize.Px(40), - letter_spacing: fastn_dom.FontSize.Px(5), - weight: 700, - font_family: fastn.mutableList(["cursive"]) -})); -fastn_utils.createNestedObject(global, "foo__mtype", fastn.recordInstance({ - size: fastn_dom.FontSize.Px(20), - line_height: fastn_dom.FontSize.Px(35), - letter_spacing: fastn_dom.FontSize.Px(3), - weight: 100, - font_family: fastn.mutableList(["fantasy"]) -})); -fastn_utils.createNestedObject(global, "foo__rtype", fastn.recordInstance({ - desktop: global.foo__dtype, - mobile: global.foo__mtype -})); -fastn_utils.createNestedObject(global, "foo__bg_bp", fastn.recordInstance({ - light: "#e8eafc", - dark: "#f4e8fc" -})); +fastn_utils.createNestedObject(global, "foo__og", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "orange"); + record.set("dark", "green"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__bp", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "blue"); + record.set("dark", "purple"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__dtype", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(36)); + record.set("line_height", fastn_dom.FontSize.Px(40)); + record.set("letter_spacing", fastn_dom.FontSize.Px(5)); + record.set("weight", 700); + record.set("font_family", fastn.mutableList(["cursive"])); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__mtype", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(20)); + record.set("line_height", fastn_dom.FontSize.Px(35)); + record.set("letter_spacing", fastn_dom.FontSize.Px(3)); + record.set("weight", 100); + record.set("font_family", fastn.mutableList(["fantasy"])); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__rtype", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__dtype); + record.set("mobile", global.foo__mtype); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__bg_bp", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e8eafc"); + record.set("dark", "#f4e8fc"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/12-children.html b/ftd/t/js/12-children.html index 6eefe261b3..804dc7743d 100644 --- a/ftd/t/js/12-children.html +++ b/ftd/t/js/12-children.html @@ -57,10 +57,13 @@ inherited = fastn_utils.getInheritedValues(__args__, inherited, args); __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, __args__.uis, inherited); return parenti0; } finally { diff --git a/ftd/t/js/13-non-style-properties.html b/ftd/t/js/13-non-style-properties.html index 9ad89ddb4b..33fa70e5b0 100644 --- a/ftd/t/js/13-non-style-properties.html +++ b/ftd/t/js/13-non-style-properties.html @@ -57,10 +57,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/200/300", - light: "https://picsum.photos/200/300" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/200/300"); + record.set("light", "https://picsum.photos/200/300"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Link, "https://www.fastn.com", inherited); } ]), inherited); @@ -141,26 +144,35 @@ let parenti7 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti7.setProperty(fastn_dom.PropertyKind.StringValue, "Fetch Priority = Auto", inherited); let parenti8 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Image); - parenti8.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + parenti8.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); parenti8.setProperty(fastn_dom.PropertyKind.FetchPriority, fastn_dom.FetchPriority.auto, inherited); let parenti9 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti9.setProperty(fastn_dom.PropertyKind.StringValue, "Fetch Priority = low", inherited); let parenti10 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Image); - parenti10.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + parenti10.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); parenti10.setProperty(fastn_dom.PropertyKind.FetchPriority, fastn_dom.FetchPriority.low, inherited); let parenti11 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti11.setProperty(fastn_dom.PropertyKind.StringValue, "Fetch Priority = high", inherited); let parenti12 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Image); - parenti12.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + parenti12.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); parenti12.setProperty(fastn_dom.PropertyKind.FetchPriority, fastn_dom.FetchPriority.high, inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/14-code.html b/ftd/t/js/14-code.html index 93ce6af423..a73b5a068a 100644 --- a/ftd/t/js/14-code.html +++ b/ftd/t/js/14-code.html @@ -108,10 +108,13 @@ try { let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.HugContent, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#0d260d", - light: "#0d260d" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#0d260d"); + record.set("light", "#0d260d"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Code); rooti0.setProperty(fastn_dom.PropertyKind.Code, "-- ftd.column:\npadding.px: 10 ;; \nspacing.fixed.px: 50 ;; \nheight.fixed.px: 200 ;; \nwidth.fixed.px: 300 ;; \noverflow-y: scroll\nborder-color: $red-yellow\nborder-style: solid\nborder-width.px: 2\n\n-- ftd.text: The blue planet below is sticky\n\n-- ftd.text: Blue planet\ncolor: black\nbackground.solid: deepskyblue\nsticky: true\nwidth.fixed.px: 120\ntext-align: center\nleft.px: 50\ntop.px: 0\n\n-- ftd.text:\npadding.px: 10\n\nFar out in the uncharted backwaters of the unfashionable end of the western\nspiral arm of the Galaxy lies a small unregarded blue planet.\nOrbiting this at a distance of roughly ninety-two million miles is an\nutterly insignificant little planet whose ape-descended life\nforms are so amazingly primitive that they still think fastn code written\nby humans is still a pretty neat idea of escalating knowledge throughout the\nuniverse.\n\n-- end: ftd.column", inherited); diff --git a/ftd/t/js/17-events.html b/ftd/t/js/17-events.html index 8d14a0f17b..71949694db 100644 --- a/ftd/t/js/17-events.html +++ b/ftd/t/js/17-events.html @@ -64,15 +64,21 @@ if (function () { return fastn_utils.getter(global.foo__flag); }()) { - return fastn.recordInstance({ - dark: "red", - light: "red" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(); } else { - return fastn.recordInstance({ - dark: "green", - light: "green" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(); } } ), inherited); diff --git a/ftd/t/js/18-rive.html b/ftd/t/js/18-rive.html index 32d9aa1b72..7167f90d67 100644 --- a/ftd/t/js/18-rive.html +++ b/ftd/t/js/18-rive.html @@ -56,10 +56,13 @@ } parenti0.setProperty(fastn_dom.PropertyKind.Id, "panda", inherited); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(500)), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); let parenti1 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Rive); if (!ssr) { let extraData = parenti1.getExtraData(); diff --git a/ftd/t/js/19-image.html b/ftd/t/js/19-image.html index 5785fcc297..d40ccf71a2 100644 --- a/ftd/t/js/19-image.html +++ b/ftd/t/js/19-image.html @@ -39,10 +39,13 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__my_images", fastn.recordInstance({ - light: "https://fastn.com/-/fastn.com/images/cs/show-cs-1.jpg", - dark: "https://fastn.com/-/fastn.com/images/cs/show-cs-1-dark.jpg" -})); +fastn_utils.createNestedObject(global, "foo__my_images", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "https://fastn.com/-/fastn.com/images/cs/show-cs-1.jpg"); + record.set("dark", "https://fastn.com/-/fastn.com/images/cs/show-cs-1-dark.jpg"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/20-background-properties.html b/ftd/t/js/20-background-properties.html index 0aead6982e..c5dd3ce988 100644 --- a/ftd/t/js/20-background-properties.html +++ b/ftd/t/js/20-background-properties.html @@ -84,52 +84,82 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__bg_solid", fastn.recordInstance({ - light: "red", - dark: "green" -})); -fastn_utils.createNestedObject(global, "foo__bg_image_src", fastn.recordInstance({ - light: "https://picsum.photos/id/236/200/300", - dark: "https://picsum.photos/id/237/200/300" -})); -fastn_utils.createNestedObject(global, "foo__len", fastn_dom.BackgroundSize.Length(fastn.recordInstance({ - x: fastn_dom.Length.Px(150), - y: fastn_dom.Length.Px(150) -}))); -fastn_utils.createNestedObject(global, "foo__pos", fastn_dom.BackgroundPosition.Length(fastn.recordInstance({ - x: fastn_dom.Length.Px(0), - y: fastn_dom.Length.Px(25) -}))); -fastn_utils.createNestedObject(global, "foo__bg_image", fastn.recordInstance({ - src: global.foo__bg_image_src, - repeat: fastn_dom.BackgroundRepeat.NoRepeat, - size: fastn_dom.BackgroundSize.Length(global.foo__len), - position: fastn_dom.BackgroundPosition.Length(global.foo__pos) -})); -fastn_utils.createNestedObject(global, "foo__red_orange", fastn.recordInstance({ - light: "red", - dark: "orange" -})); -fastn_utils.createNestedObject(global, "foo__yellow_blue", fastn.recordInstance({ - light: "yellow", - dark: "blue" -})); -fastn_utils.createNestedObject(global, "foo__color_values", fastn.mutableList([fastn.recordInstance({ - color: global.foo__red_orange, - end: null, - start: null, - stop_position: fastn_dom.Length.Percent(40) -}), -fastn.recordInstance({ - color: global.foo__yellow_blue, - end: null, - start: null, - stop_position: null -})])); -fastn_utils.createNestedObject(global, "foo__lg", fastn.recordInstance({ - direction: fastn_dom.LinearGradientDirection.BottomLeft, - colors: global.foo__color_values -})); +fastn_utils.createNestedObject(global, "foo__bg_solid", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "red"); + record.set("dark", "green"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__bg_image_src", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "https://picsum.photos/id/236/200/300"); + record.set("dark", "https://picsum.photos/id/237/200/300"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__len", fastn_dom.BackgroundSize.Length(function () { + let record = fastn.recordInstance({ + }); + record.set("x", fastn_dom.Length.Px(150)); + record.set("y", fastn_dom.Length.Px(150)); + return record; +}())); +fastn_utils.createNestedObject(global, "foo__pos", fastn_dom.BackgroundPosition.Length(function () { + let record = fastn.recordInstance({ + }); + record.set("x", fastn_dom.Length.Px(0)); + record.set("y", fastn_dom.Length.Px(25)); + return record; +}())); +fastn_utils.createNestedObject(global, "foo__bg_image", function () { + let record = fastn.recordInstance({ + }); + record.set("src", global.foo__bg_image_src); + record.set("repeat", fastn_dom.BackgroundRepeat.NoRepeat); + record.set("size", fastn_dom.BackgroundSize.Length(global.foo__len)); + record.set("position", fastn_dom.BackgroundPosition.Length(global.foo__pos)); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__red_orange", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "red"); + record.set("dark", "orange"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__yellow_blue", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "blue"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__color_values", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("color", global.foo__red_orange); + record.set("end", null); + record.set("start", null); + record.set("stop_position", fastn_dom.Length.Percent(40)); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("color", global.foo__yellow_blue); + record.set("end", null); + record.set("start", null); + record.set("stop_position", null); + return record; +}()])); +fastn_utils.createNestedObject(global, "foo__lg", function () { + let record = fastn.recordInstance({ + }); + record.set("direction", fastn_dom.LinearGradientDirection.BottomLeft); + record.set("colors", global.foo__color_values); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/22-document.html b/ftd/t/js/22-document.html index f2d5a4cbe0..8c18fd0e88 100644 --- a/ftd/t/js/22-document.html +++ b/ftd/t/js/22-document.html @@ -38,26 +38,38 @@ parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaDescription, "This is main description", inherited); parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaOGDescription, "This is og description", inherited); parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaTwitterDescription, "This is twitter description", inherited); - parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaOGImage, fastn.recordInstance({ - src: global.foo__fastn_image.get("light") - }), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaTwitterImage, fastn.recordInstance({ - src: global.foo__fastn_image.get("dark") - }), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaThemeColor, fastn.recordInstance({ - dark: "white", - light: "white" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaOGImage, function () { + let record = fastn.recordInstance({ + }); + record.set("src", global.foo__fastn_image.get("light")); + return record; + }(), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaTwitterImage, function () { + let record = fastn.recordInstance({ + }); + record.set("src", global.foo__fastn_image.get("dark")); + return record; + }(), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaThemeColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaFacebookDomainVerification, "7uedwv99dgux8pbshcr7jzhb3l3hvu", inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__fastn_image", fastn.recordInstance({ - light: "https://fastn.io/-/fastn.io/images/fastn.svg", - dark: "https://fastn.io/-/fastn.io/images/fastn-dark.svg" -})); +fastn_utils.createNestedObject(global, "foo__fastn_image", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "https://fastn.io/-/fastn.io/images/fastn.svg"); + record.set("dark", "https://fastn.io/-/fastn.io/images/fastn-dark.svg"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/23-record-list.html b/ftd/t/js/23-record-list.html index ffef33d9d7..5262502797 100644 --- a/ftd/t/js/23-record-list.html +++ b/ftd/t/js/23-record-list.html @@ -63,18 +63,24 @@ parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); rooti0.setProperty(fastn_dom.PropertyKind.IntegerValue, __args__.emp_id, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); } ]), inherited); return parenti0; @@ -110,14 +116,20 @@ } } global["foo__show_persons"] = foo__show_persons; -fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([fastn.recordInstance({ - emp_id: 1, - name: "Ritesh" -}), -fastn.recordInstance({ - emp_id: 2, - name: "Ajinosaurus" -})])); +fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("emp_id", 1); + record.set("name", "Ritesh"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("emp_id", 2); + record.set("name", "Ajinosaurus"); + return record; +}()])); let foo__get_first_person = function (args) { let __fastn_super_package_name__ = __fastn_package_name__; diff --git a/ftd/t/js/24-re-export.html b/ftd/t/js/24-re-export.html index df889b1c5e..a2e98dc393 100644 --- a/ftd/t/js/24-re-export.html +++ b/ftd/t/js/24-re-export.html @@ -72,10 +72,13 @@ fastn_utils.getter(__args__.p).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item.get("name"), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return rooti0; }); } @@ -86,14 +89,20 @@ } } global["foo__display_persons"] = foo__display_persons; -fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([fastn.recordInstance({ - address: null, - name: "Ritesh" -}), -fastn.recordInstance({ - address: null, - name: "Rithik" -})])); +fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("address", null); + record.set("name", "Ritesh"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("address", null); + record.set("name", "Rithik"); + return record; +}()])); let foo__append = global["_01_basic__append"]; global["foo__append"] = foo__append; fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; diff --git a/ftd/t/js/25-re-re-export.html b/ftd/t/js/25-re-re-export.html index d513667f12..f858636352 100644 --- a/ftd/t/js/25-re-re-export.html +++ b/ftd/t/js/25-re-re-export.html @@ -72,10 +72,13 @@ __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "orange", - light: "orange" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; + }(), inherited); return parenti0; } finally { __fastn_package_name__ = __fastn_super_package_name__; @@ -97,10 +100,13 @@ fastn_utils.getter(__args__.p).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item.get("name"), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return rooti0; }); } @@ -111,14 +117,20 @@ } } global["_24_re_export__display_persons"] = _24_re_export__display_persons; -fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([fastn.recordInstance({ - address: null, - name: "Ritesh" -}), -fastn.recordInstance({ - address: null, - name: "Rithik" -})])); +fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("address", null); + record.set("name", "Ritesh"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("address", null); + record.set("name", "Rithik"); + return record; +}()])); let foo__append = global["_01_basic__append"]; global["foo__append"] = foo__append; let _24_re_export__append = global["_01_basic__append"]; diff --git a/ftd/t/js/30-web-component.html b/ftd/t/js/30-web-component.html index 6cddf7547e..9d28314655 100644 --- a/ftd/t/js/30-web-component.html +++ b/ftd/t/js/30-web-component.html @@ -134,10 +134,13 @@ let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#dae6f0", - light: "#dae6f0" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#dae6f0"); + record.set("light", "#dae6f0"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Center, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -208,15 +211,21 @@ if (function () { return fastn_utils.getter(__args__.mouse_in); }()) { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#92B4D2", - light: "#92B4D2" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#92B4D2"); + record.set("light", "#92B4D2"); + return record; + }()); } else { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#B6CDE1", - light: "#B6CDE1" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#B6CDE1"); + record.set("light", "#B6CDE1"); + return record; + }()); } } ), inherited); @@ -270,10 +279,13 @@ let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Row); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti0.setProperty(fastn_dom.PropertyKind.PaddingHorizontal, fastn_dom.Length.Px(5), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#b8dbfb", - light: "#b8dbfb" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#b8dbfb"); + record.set("light", "#b8dbfb"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceBetween, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -285,10 +297,13 @@ rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("button_large"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.item.get("status"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignSelf, fastn_dom.AlignSelf.Center, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); } ]), inherited); return parenti0; @@ -319,10 +334,13 @@ ), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); parenti0.setProperty(fastn_dom.PropertyKind.PaddingBottom, fastn_dom.Length.Px(20), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#dae6f0", - light: "#dae6f0" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#dae6f0"); + record.set("light", "#dae6f0"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -344,10 +362,13 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "white", - light: "white" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.MinHeight, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(234)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { diff --git a/ftd/t/js/31-advance-list.html b/ftd/t/js/31-advance-list.html index ba0f16f1a2..75c81ce491 100644 --- a/ftd/t/js/31-advance-list.html +++ b/ftd/t/js/31-advance-list.html @@ -114,22 +114,34 @@ } } global["foo__insert"] = foo__insert; -fastn_utils.createNestedObject(global, "foo__name_scores", fastn.mutableList([fastn.recordInstance({ - name: "Arpita", - score: 100 -}), -fastn.recordInstance({ - name: "Arpita", - score: 90 -})])); -fastn_utils.createNestedObject(global, "foo__width", fastn.recordInstance({ - desktop: fastn_dom.Length.Px(500), - mobile: fastn_dom.Length.Percent(40) -})); -fastn_utils.createNestedObject(global, "foo__ns", fastn.recordInstance({ - name: ftd.empty, - score: 0 -})); +fastn_utils.createNestedObject(global, "foo__name_scores", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("name", "Arpita"); + record.set("score", 100); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("name", "Arpita"); + record.set("score", 90); + return record; +}()])); +fastn_utils.createNestedObject(global, "foo__width", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", fastn_dom.Length.Px(500)); + record.set("mobile", fastn_dom.Length.Percent(40)); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__ns", function () { + let record = fastn.recordInstance({ + }); + record.set("name", ftd.empty); + record.set("score", 0); + return record; +}()); let foo__form = function (parent, inherited, args) { let __fastn_super_package_name__ = __fastn_package_name__; @@ -145,10 +157,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(40), inherited); parenti0.setProperty(fastn_dom.PropertyKind.MarginBottom, fastn_dom.Length.Px(40), inherited); parenti0.setProperty(fastn_dom.PropertyKind.BorderRadius, fastn_dom.Length.Px(5), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#f2f2f2", - light: "#f2f2f2" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#f2f2f2"); + record.set("light", "#f2f2f2"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("copy_large"), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { @@ -212,14 +227,20 @@ }); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.MarginTop, fastn_dom.Length.Px(20), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "white", - light: "white" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#4CAF50", - light: "#4CAF50" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#4CAF50"); + record.set("light", "#4CAF50"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.TextAlign, fastn_dom.TextAlign.Center, inherited); return rooti0; }); @@ -269,10 +290,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Responsive(global.foo__width)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(10), inherited); parenti0.setProperty(fastn_dom.PropertyKind.MarginBottom, fastn_dom.Length.Px(10), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceBetween, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); diff --git a/ftd/t/js/31-ftd-len.html b/ftd/t/js/31-ftd-len.html index 636a385207..3afaa1adae 100644 --- a/ftd/t/js/31-ftd-len.html +++ b/ftd/t/js/31-ftd-len.html @@ -42,10 +42,13 @@ }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return rooti0; }).getParent(); }); diff --git a/ftd/t/js/32-ftd-len.html b/ftd/t/js/32-ftd-len.html index a0bcd7751a..7c660dbfb6 100644 --- a/ftd/t/js/32-ftd-len.html +++ b/ftd/t/js/32-ftd-len.html @@ -61,10 +61,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(10), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Margin, fastn_dom.Length.Px(10), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "black", - light: "black" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(5)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { fastn_utils.getter(global.foo__months).forLoop(root, function (root, item, index) { @@ -75,22 +78,31 @@ if (function () { return (fastn_utils.getter(index) % 3 == 1); }()) { - return fastn.recordInstance({ - dark: "white", - light: "white" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }(); } else if (function () { return (fastn_utils.getter(index) % 3 == 2); }()) { - return fastn.recordInstance({ - dark: "green", - light: "green" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(); } else { - return fastn.recordInstance({ - dark: "orange", - light: "orange" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; + }(); } } ), inherited); @@ -145,10 +157,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(10)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -175,10 +190,13 @@ }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.current_value, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return rooti0; }); } @@ -194,10 +212,13 @@ }, rooti0); }); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); } ]), inherited); return parenti0; diff --git a/ftd/t/js/33-list-indexing.html b/ftd/t/js/33-list-indexing.html index a50ec3e43f..7a07d53f7c 100644 --- a/ftd/t/js/33-list-indexing.html +++ b/ftd/t/js/33-list-indexing.html @@ -44,10 +44,13 @@ fastn_utils.getter(global.foo__names).forLoop(parent, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); return rooti0; }); fastn_dom.conditionalDom(parent, [ @@ -57,10 +60,13 @@ }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn_utils.getListItem(global.foo__names.get(2)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return rooti0; }); } finally { diff --git a/ftd/t/js/34-ftd-ui.html b/ftd/t/js/34-ftd-ui.html index 8ac10ead6f..9eff537d84 100644 --- a/ftd/t/js/34-ftd-ui.html +++ b/ftd/t/js/34-ftd-ui.html @@ -91,8 +91,10 @@ } } global["foo__switcher"] = foo__switcher; -fastn_utils.createNestedObject(global, "foo__c", fastn.mutableList([fastn.recordInstance({ - elements: fastn.mutableList([function (root, inherited) { +fastn_utils.createNestedObject(global, "foo__c", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("elements", fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Me component", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Color, inherited.get("colors").get("text_strong"), inherited); @@ -101,11 +103,14 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Me component 2", inherited); } - ]), - name: "me" -}), -fastn.recordInstance({ - elements: fastn.mutableList([function (root, inherited) { + ])); + record.set("name", "me"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("elements", fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Me component22", inherited); }, @@ -113,9 +118,10 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Me component22 2", inherited); } - ]), - name: "me22" -})])); + ])); + record.set("name", "me22"); + return record; +}()])); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/37-expander.html b/ftd/t/js/37-expander.html index 372bf07ee3..dd36087d0b 100644 --- a/ftd/t/js/37-expander.html +++ b/ftd/t/js/37-expander.html @@ -62,10 +62,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.FillContainer, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn_dom.Length.Px(20), inherited); parenti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(1), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "#eee", - light: "#eee" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#eee"); + record.set("light", "#eee"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopCenter, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.Fixed(fastn_dom.Length.Px(50)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { diff --git a/ftd/t/js/38-background-image-properties.html b/ftd/t/js/38-background-image-properties.html index 67a7e3fed2..3d3b88065c 100644 --- a/ftd/t/js/38-background-image-properties.html +++ b/ftd/t/js/38-background-image-properties.html @@ -42,15 +42,21 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__bg_image", fastn.recordInstance({ - src: fastn.recordInstance({ - dark: "https://picsum.photos/200/300", - light: "https://picsum.photos/200/300" - }), - repeat: fastn_dom.BackgroundRepeat.NoRepeat, - size: null, - position: fastn_dom.BackgroundPosition.Center -})); +fastn_utils.createNestedObject(global, "foo__bg_image", function () { + let record = fastn.recordInstance({ + }); + record.set("src", function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/200/300"); + record.set("light", "https://picsum.photos/200/300"); + return record; + }()); + record.set("repeat", fastn_dom.BackgroundRepeat.NoRepeat); + record.set("size", null); + record.set("position", fastn_dom.BackgroundPosition.Center); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/41-document-favicon.html b/ftd/t/js/41-document-favicon.html index bcbd5e7d03..3d57bf3470 100644 --- a/ftd/t/js/41-document-favicon.html +++ b/ftd/t/js/41-document-favicon.html @@ -35,15 +35,21 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "This is some text", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Margin, fastn_dom.Length.Px(20), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Favicon, fastn.recordInstance({ - src: "https://fastn.com/-/fastn.com/images/favicon.svg" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Favicon, function () { + let record = fastn.recordInstance({ + }); + record.set("src", "https://fastn.com/-/fastn.com/images/favicon.svg"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.DocumentProperties.MetaTitle, "Testing favicon", inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/42-links.html b/ftd/t/js/42-links.html index a89b6b50e7..c2fa4b70bb 100644 --- a/ftd/t/js/42-links.html +++ b/ftd/t/js/42-links.html @@ -36,10 +36,13 @@ }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello from mobile", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Link, "fastn.com", inherited); return rooti0; }); @@ -50,10 +53,13 @@ }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello from desktop", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Link, "fastn.com", inherited); return rooti0; }); diff --git a/ftd/t/js/43-image-object-fit.html b/ftd/t/js/43-image-object-fit.html index afcb30c502..15582c6625 100644 --- a/ftd/t/js/43-image-object-fit.html +++ b/ftd/t/js/43-image-object-fit.html @@ -58,10 +58,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); @@ -69,10 +72,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); }, @@ -82,10 +88,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Fit, fastn_dom.Fit.none, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); @@ -96,10 +105,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Fit, fastn_dom.Fit.cover, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); @@ -110,10 +122,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Fit, fastn_dom.Fit.contain, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); @@ -124,10 +139,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Fit, fastn_dom.Fit.fill, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); @@ -138,10 +156,13 @@ }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Image); - rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/536/354", - light: "https://picsum.photos/536/354" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/536/354"); + record.set("light", "https://picsum.photos/536/354"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Fit, fastn_dom.Fit.scaleDown, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); diff --git a/ftd/t/js/44-module.html b/ftd/t/js/44-module.html index 2c24e79c69..9f7c2fdd6c 100644 --- a/ftd/t/js/44-module.html +++ b/ftd/t/js/44-module.html @@ -68,10 +68,13 @@ __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "orange", - light: "orange" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; + }(), inherited); return parenti0; } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/45-re-module.html b/ftd/t/js/45-re-module.html index 0b3954f282..8c011fd2a3 100644 --- a/ftd/t/js/45-re-module.html +++ b/ftd/t/js/45-re-module.html @@ -76,10 +76,13 @@ __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "orange", - light: "orange" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; + }(), inherited); return parenti0; } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/45-re-re-module.html b/ftd/t/js/45-re-re-module.html index fdaad507c5..7d2e5aea5e 100644 --- a/ftd/t/js/45-re-re-module.html +++ b/ftd/t/js/45-re-re-module.html @@ -66,10 +66,13 @@ __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "orange", - light: "orange" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; + }(), inherited); return parenti0; } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/48-video.html b/ftd/t/js/48-video.html index b6bada2cfa..1f87cb9a06 100644 --- a/ftd/t/js/48-video.html +++ b/ftd/t/js/48-video.html @@ -40,14 +40,20 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__my_video", fastn.recordInstance({ - light: "https://storage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4", - dark: "https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerFun.mp4" -})); -fastn_utils.createNestedObject(global, "foo__my_video_poster", fastn.recordInstance({ - light: "https://storage.googleapis.com/gtv-videos-bucket/sample/images/BigBuckBunny.jpg", - dark: "https://storage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerFun.jpg" -})); +fastn_utils.createNestedObject(global, "foo__my_video", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "https://storage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"); + record.set("dark", "https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerFun.mp4"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__my_video_poster", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "https://storage.googleapis.com/gtv-videos-bucket/sample/images/BigBuckBunny.jpg"); + record.set("dark", "https://storage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerFun.jpg"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/49-align-content.html b/ftd/t/js/49-align-content.html index 793252aff8..afe010db0a 100644 --- a/ftd/t/js/49-align-content.html +++ b/ftd/t/js/49-align-content.html @@ -262,42 +262,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "TOP LEFT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopLeft, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -305,23 +320,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopLeft, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -331,42 +355,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "TOP CENTER", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopCenter, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -374,23 +413,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopCenter, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -400,42 +448,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "TOP RIGHT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopRight, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -443,23 +506,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.TopRight, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -469,42 +541,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "LEFT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Left, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -512,23 +599,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Left, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -538,42 +634,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "CENTER", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Center, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -581,23 +692,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Center, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -607,42 +727,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "RIGHT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Right, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -650,23 +785,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.Right, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -676,42 +820,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "BOTTOM LEFT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomLeft, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -719,23 +878,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomLeft, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -745,42 +913,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "BOTTOM CENTER", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomCenter, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -788,23 +971,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomCenter, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } @@ -814,42 +1006,57 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_medium"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "BOTTOM RIGHT", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.PaddingVertical, fastn_dom.Length.Px(10), inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Spacing, fastn_dom.Spacing.SpaceAround, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomRight, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Column", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); }, @@ -857,23 +1064,32 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Row); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(100)), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); rooti0.setProperty(fastn_dom.PropertyKind.AlignContent, fastn_dom.AlignContent.BottomRight, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Row", inherited); rooti0.setProperty(fastn_dom.PropertyKind.BorderWidth, fastn_dom.Length.Px(2), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.BorderColor, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } diff --git a/ftd/t/js/51-markdown-table.html b/ftd/t/js/51-markdown-table.html index b6fa7778ce..bdf2697d10 100644 --- a/ftd/t/js/51-markdown-table.html +++ b/ftd/t/js/51-markdown-table.html @@ -60,10 +60,13 @@ try { let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Boolean); parenti0.setProperty(fastn_dom.PropertyKind.BooleanValue, global.foo__flag, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); let parenti1 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti1.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti1.setProperty(fastn_dom.PropertyKind.Margin, fastn_dom.Length.Px(40), inherited); @@ -75,15 +78,21 @@ if (function () { return fastn_utils.getter(global.foo__flag); }()) { - return fastn.recordInstance({ - dark: "green", - light: "green" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(); } else { - return fastn.recordInstance({ - dark: "red", - light: "red" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(); } } ), inherited); diff --git a/ftd/t/js/52-events.html b/ftd/t/js/52-events.html index 20b2a1f7e5..144c9475eb 100644 --- a/ftd/t/js/52-events.html +++ b/ftd/t/js/52-events.html @@ -72,10 +72,13 @@ if (function () { return (fastn_utils.getter(__args__.selected) == fastn_utils.getter(__args__.idx)); }()) { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()); } } ), inherited); diff --git a/ftd/t/js/53-link-color.html b/ftd/t/js/53-link-color.html index ca00964e45..67a75d2ac1 100644 --- a/ftd/t/js/53-link-color.html +++ b/ftd/t/js/53-link-color.html @@ -42,10 +42,13 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__link_color", fastn.recordInstance({ - light: "blue", - dark: "red" -})); +fastn_utils.createNestedObject(global, "foo__link_color", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "blue"); + record.set("dark", "red"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/54-class-fix.html b/ftd/t/js/54-class-fix.html index 1beb296780..d66e535f50 100644 --- a/ftd/t/js/54-class-fix.html +++ b/ftd/t/js/54-class-fix.html @@ -36,19 +36,25 @@ parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(global.foo__bg_yg), inherited); let parenti1 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti1.setProperty(fastn_dom.PropertyKind.StringValue, "hello", inherited); - parenti1.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), inherited); + parenti1.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__bg_yg", fastn.recordInstance({ - light: "yellow", - dark: "green" -})); +fastn_utils.createNestedObject(global, "foo__bg_yg", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "yellow"); + record.set("dark", "green"); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/59-text-shadow.html b/ftd/t/js/59-text-shadow.html index 5ec3c6e757..1eed428cf4 100644 --- a/ftd/t/js/59-text-shadow.html +++ b/ftd/t/js/59-text-shadow.html @@ -39,17 +39,23 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__s", fastn.recordInstance({ - x_offset: fastn_dom.Length.Px(1), - y_offset: fastn_dom.Length.Px(1), - blur: fastn_dom.Length.Px(4), - spread: fastn_dom.Length.Px(0), - color: fastn.recordInstance({ - dark: "#000000", - light: "#000000" - }), - inset: false -})); +fastn_utils.createNestedObject(global, "foo__s", function () { + let record = fastn.recordInstance({ + }); + record.set("x_offset", fastn_dom.Length.Px(1)); + record.set("y_offset", fastn_dom.Length.Px(1)); + record.set("blur", fastn_dom.Length.Px(4)); + record.set("spread", fastn_dom.Length.Px(0)); + record.set("color", function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#000000"); + record.set("light", "#000000"); + return record; + }()); + record.set("inset", false); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/60-conditional-module-headers.html b/ftd/t/js/60-conditional-module-headers.html index de46cff549..70ac637076 100644 --- a/ftd/t/js/60-conditional-module-headers.html +++ b/ftd/t/js/60-conditional-module-headers.html @@ -60,10 +60,13 @@ __args__ = fastn_utils.getArgs(__args__, args); let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.title, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); return parenti0; } finally { __fastn_package_name__ = __fastn_super_package_name__; diff --git a/ftd/t/js/61-functions.html b/ftd/t/js/61-functions.html index 2a257e75c9..e817f0f069 100644 --- a/ftd/t/js/61-functions.html +++ b/ftd/t/js/61-functions.html @@ -42,10 +42,13 @@ b: "World", }, parenti1); }), inherited); - parenti1.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti1.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -67,10 +70,13 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.Role, inherited.get("types").get("heading_large"), inherited); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.title, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); diff --git a/ftd/t/js/62-fallback-fonts.html b/ftd/t/js/62-fallback-fonts.html index 98a6488e73..1622e8d7ab 100644 --- a/ftd/t/js/62-fallback-fonts.html +++ b/ftd/t/js/62-fallback-fonts.html @@ -34,10 +34,13 @@ try { let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Integer); parenti0.setProperty(fastn_dom.PropertyKind.IntegerValue, global.foo__flag, inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); let parenti1 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Text); parenti1.setProperty(fastn_dom.PropertyKind.Role, fastn.formula([global.foo__flag, global.foo__flag, @@ -45,29 +48,41 @@ if (function () { return (fastn_utils.getter(global.foo__flag) % 4 == 1); }()) { - return fastn.recordInstance({ - desktop: global.foo__f_type_2, - mobile: global.foo__f_type_2 - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__f_type_2); + record.set("mobile", global.foo__f_type_2); + return record; + }(); } else if (function () { return (fastn_utils.getter(global.foo__flag) % 4 == 2); }()) { - return fastn.recordInstance({ - desktop: global.foo__f_type_3, - mobile: global.foo__f_type_3 - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__f_type_3); + record.set("mobile", global.foo__f_type_3); + return record; + }(); } else if (function () { return (fastn_utils.getter(global.foo__flag) % 4 == 3); }()) { - return fastn.recordInstance({ - desktop: global.foo__f_type_4, - mobile: global.foo__f_type_4 - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__f_type_4); + record.set("mobile", global.foo__f_type_4); + return record; + }(); } else { - return fastn.recordInstance({ - desktop: global.foo__f_type, - mobile: global.foo__f_type - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", global.foo__f_type); + record.set("mobile", global.foo__f_type); + return record; + }(); } } ), inherited); @@ -77,49 +92,64 @@ a: global.foo__flag, }, parenti1); }); - parenti1.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + parenti1.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); } finally { __fastn_package_name__ = __fastn_super_package_name__; } } global["main"] = main; fastn_utils.createNestedObject(global, "foo__flag", fastn.mutable(0)); -fastn_utils.createNestedObject(global, "foo__f_type", fastn.recordInstance({ - size: null, - line_height: null, - letter_spacing: null, - weight: null, - font_family: fastn.mutableList(["sans-serif"]) -})); +fastn_utils.createNestedObject(global, "foo__f_type", function () { + let record = fastn.recordInstance({ + }); + record.set("size", null); + record.set("line_height", null); + record.set("letter_spacing", null); + record.set("weight", null); + record.set("font_family", fastn.mutableList(["sans-serif"])); + return record; +}()); fastn_utils.createNestedObject(global, "foo__font", "Arial"); -fastn_utils.createNestedObject(global, "foo__f_type_2", fastn.recordInstance({ - size: null, - line_height: null, - letter_spacing: null, - weight: null, - font_family: fastn.mutableList([global.foo__font]) -})); +fastn_utils.createNestedObject(global, "foo__f_type_2", function () { + let record = fastn.recordInstance({ + }); + record.set("size", null); + record.set("line_height", null); + record.set("letter_spacing", null); + record.set("weight", null); + record.set("font_family", fastn.mutableList([global.foo__font])); + return record; +}()); fastn_utils.createNestedObject(global, "foo__font_2", "cursive"); -fastn_utils.createNestedObject(global, "foo__f_type_3", fastn.recordInstance({ - size: null, - line_height: null, - letter_spacing: null, - weight: null, - font_family: fastn.mutableList([global.foo__font, - global.foo__font_2]) -})); +fastn_utils.createNestedObject(global, "foo__f_type_3", function () { + let record = fastn.recordInstance({ + }); + record.set("size", null); + record.set("line_height", null); + record.set("letter_spacing", null); + record.set("weight", null); + record.set("font_family", fastn.mutableList([global.foo__font, + global.foo__font_2])); + return record; +}()); fastn_utils.createNestedObject(global, "foo__fonts", fastn.mutableList(["Aria", global.foo__font_2])); -fastn_utils.createNestedObject(global, "foo__f_type_4", fastn.recordInstance({ - size: null, - line_height: null, - letter_spacing: null, - weight: null, - font_family: global.foo__fonts -})); +fastn_utils.createNestedObject(global, "foo__f_type_4", function () { + let record = fastn.recordInstance({ + }); + record.set("size", null); + record.set("line_height", null); + record.set("letter_spacing", null); + record.set("weight", null); + record.set("font_family", global.foo__fonts); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/66-backdrop-filter.html b/ftd/t/js/66-backdrop-filter.html index b331224b55..ad6a1cec7e 100644 --- a/ftd/t/js/66-backdrop-filter.html +++ b/ftd/t/js/66-backdrop-filter.html @@ -37,10 +37,13 @@ __fastn_package_name__ = "foo"; try { let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Image); - parenti0.setProperty(fastn_dom.PropertyKind.ImageSrc, fastn.recordInstance({ - dark: "https://picsum.photos/200", - light: "https://picsum.photos/200" - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.ImageSrc, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://picsum.photos/200"); + record.set("light", "https://picsum.photos/200"); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Id, "test", inherited); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Height, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(300)), inherited); @@ -94,16 +97,19 @@ global["main"] = main; fastn_utils.createNestedObject(global, "foo__blur_image", fastn.mutable(false)); fastn_utils.createNestedObject(global, "foo__contrast_image", fastn.mutable(false)); -fastn_utils.createNestedObject(global, "foo__bdf", fastn.recordInstance({ - blur: fastn_dom.Length.Px(10), - brightness: fastn_dom.Length.Percent(50), - contrast: fastn_dom.Length.Percent(40), - grayscale: fastn_dom.Length.Percent(40), - invert: null, - opacity: null, - sepia: null, - saturate: null -})); +fastn_utils.createNestedObject(global, "foo__bdf", function () { + let record = fastn.recordInstance({ + }); + record.set("blur", fastn_dom.Length.Px(10)); + record.set("brightness", fastn_dom.Length.Percent(50)); + record.set("contrast", fastn_dom.Length.Percent(40)); + record.set("grayscale", fastn_dom.Length.Percent(40)); + record.set("invert", null); + record.set("opacity", null); + record.set("sepia", null); + record.set("saturate", null); + return record; +}()); fastn_utils.createNestedObject(global, "foo__set_multi_filters", fastn.mutable(false)); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; diff --git a/ftd/t/js/67-counter.html b/ftd/t/js/67-counter.html index 1da10e7fc3..a62a4bff19 100644 --- a/ftd/t/js/67-counter.html +++ b/ftd/t/js/67-counter.html @@ -70,10 +70,13 @@ if (function () { return (fastn_utils.getter(__args__.count) % 2 == 0); }()) { - return fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })); + return fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()); } } ), inherited); diff --git a/ftd/t/js/68-mask.html b/ftd/t/js/68-mask.html index 8129a7f1a7..dc957fff77 100644 --- a/ftd/t/js/68-mask.html +++ b/ftd/t/js/68-mask.html @@ -506,117 +506,198 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__colors", fastn.mutableList([fastn.recordInstance({ - dark: "red", - light: "red" -}), -fastn.recordInstance({ - dark: "orange", - light: "orange" -}), -fastn.recordInstance({ - dark: "yellow", - light: "yellow" -}), -fastn.recordInstance({ - dark: "green", - light: "green" -}), -fastn.recordInstance({ - dark: "blue", - light: "blue" -}), -fastn.recordInstance({ - dark: "indigo", - light: "indigo" -}), -fastn.recordInstance({ - dark: "violet", - light: "violet" -}), -fastn.recordInstance({ - dark: "cyan", - light: "cyan" -}), -fastn.recordInstance({ - dark: "magenta", - light: "magenta" -}), -fastn.recordInstance({ - dark: "lime", - light: "lime" -}), -fastn.recordInstance({ - dark: "olive", - light: "olive" -}), -fastn.recordInstance({ - dark: "maroon", - light: "maroon" -}), -fastn.recordInstance({ - dark: "purple", - light: "purple" -}), -fastn.recordInstance({ - dark: "white", - light: "white" -}), -fastn.recordInstance({ - dark: "#e5e5e5", - light: "#e5e5e5" -}), -fastn.recordInstance({ - dark: "#ccc", - light: "#ccc" -}), -fastn.recordInstance({ - dark: "#b2b2b2", - light: "#b2b2b2" -}), -fastn.recordInstance({ - dark: "#999", - light: "#999" -}), -fastn.recordInstance({ - dark: "#7f7f7f", - light: "#7f7f7f" -}), -fastn.recordInstance({ - dark: "#666", - light: "#666" -}), -fastn.recordInstance({ - dark: "#4c4c4c", - light: "#4c4c4c" -}), -fastn.recordInstance({ - dark: "#333", - light: "#333" -}), -fastn.recordInstance({ - dark: "#191919", - light: "#191919" -}), -fastn.recordInstance({ - dark: "black", - light: "black" -})])); -fastn_utils.createNestedObject(global, "foo__mi", fastn.recordInstance({ - image: fastn.recordInstance({ - color: null, - linear_gradient: null, - src: fastn.recordInstance({ - dark: "https://s3-us-west-2.amazonaws.com/s.cdpn.io/18515/heart.svg", - light: "https://s3-us-west-2.amazonaws.com/s.cdpn.io/18515/heart.svg" - }) - }), - size: fastn_dom.MaskSize.Cover, - size_x: null, - size_y: null, - repeat: fastn_dom.MaskRepeat.NoRepeat, - position: fastn_dom.MaskPosition.Center -})); +fastn_utils.createNestedObject(global, "foo__colors", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "orange"); + record.set("light", "orange"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "indigo"); + record.set("light", "indigo"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "violet"); + record.set("light", "violet"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "cyan"); + record.set("light", "cyan"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "magenta"); + record.set("light", "magenta"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "lime"); + record.set("light", "lime"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "olive"); + record.set("light", "olive"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "maroon"); + record.set("light", "maroon"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "purple"); + record.set("light", "purple"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#e5e5e5"); + record.set("light", "#e5e5e5"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#ccc"); + record.set("light", "#ccc"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#b2b2b2"); + record.set("light", "#b2b2b2"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#999"); + record.set("light", "#999"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#7f7f7f"); + record.set("light", "#7f7f7f"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#666"); + record.set("light", "#666"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#4c4c4c"); + record.set("light", "#4c4c4c"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#333"); + record.set("light", "#333"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "#191919"); + record.set("light", "#191919"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; +}()])); +fastn_utils.createNestedObject(global, "foo__mi", function () { + let record = fastn.recordInstance({ + }); + record.set("image", function () { + let record = fastn.recordInstance({ + }); + record.set("color", null); + record.set("linear_gradient", null); + record.set("src", function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "https://s3-us-west-2.amazonaws.com/s.cdpn.io/18515/heart.svg"); + record.set("light", "https://s3-us-west-2.amazonaws.com/s.cdpn.io/18515/heart.svg"); + return record; + }()); + return record; + }()); + record.set("size", fastn_dom.MaskSize.Cover); + record.set("size_x", null); + record.set("size_y", null); + record.set("repeat", fastn_dom.MaskRepeat.NoRepeat); + record.set("position", fastn_dom.MaskPosition.Center); + return record; +}()); let foo__icon = function (parent, inherited, args) { let __fastn_super_package_name__ = __fastn_package_name__; diff --git a/ftd/t/js/69-chained-dot-value-in-functions.html b/ftd/t/js/69-chained-dot-value-in-functions.html index 52e68f366b..9138ef1bee 100644 --- a/ftd/t/js/69-chained-dot-value-in-functions.html +++ b/ftd/t/js/69-chained-dot-value-in-functions.html @@ -67,15 +67,21 @@ } } global["foo__some_details"] = foo__some_details; -fastn_utils.createNestedObject(global, "foo__meta", fastn.recordInstance({ - address: "Sam City in Some House", - phone_number: "+1234-56789" -})); -fastn_utils.createNestedObject(global, "foo__r", fastn.recordInstance({ - name: "Sam Wan", - age: 23, - meta: global.foo__meta -})); +fastn_utils.createNestedObject(global, "foo__meta", function () { + let record = fastn.recordInstance({ + }); + record.set("address", "Sam City in Some House"); + record.set("phone_number", "+1234-56789"); + return record; +}()); +fastn_utils.createNestedObject(global, "foo__r", function () { + let record = fastn.recordInstance({ + }); + record.set("name", "Sam Wan"); + record.set("age", 23); + record.set("meta", global.foo__meta); + return record; +}()); fastn_utils.createNestedObject(global, "foo__places", fastn.mutableList(["Bangalore", "Mumbai", "Chennai", @@ -107,14 +113,20 @@ } } global["foo__first_person_details"] = foo__first_person_details; -fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([fastn.recordInstance({ - age: 30, - meta: fastn.recordInstance({ - address: "Sam Ather City at Some Other House", - phone_number: "+987-654321" - }), - name: "Sam Ather" -}), +fastn_utils.createNestedObject(global, "foo__people", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("age", 30); + record.set("meta", function () { + let record = fastn.recordInstance({ + }); + record.set("address", "Sam Ather City at Some Other House"); + record.set("phone_number", "+987-654321"); + return record; + }()); + record.set("name", "Sam Ather"); + return record; +}(), global.foo__r])); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; diff --git a/ftd/t/js/72-document-breakpoint.html b/ftd/t/js/72-document-breakpoint.html index b1b0fd6190..634cc3d7b7 100644 --- a/ftd/t/js/72-document-breakpoint.html +++ b/ftd/t/js/72-document-breakpoint.html @@ -30,9 +30,12 @@ __fastn_package_name__ = "foo"; try { let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Document); - parenti0.setProperty(fastn_dom.PropertyKind.BreakpointWidth, fastn.recordInstance({ - mobile: 800 - }), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.BreakpointWidth, function () { + let record = fastn.recordInstance({ + }); + record.set("mobile", 800); + return record; + }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([ftd.device], function () { @@ -45,10 +48,13 @@ } } ), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); } finally { diff --git a/ftd/t/js/73-loops-inside-list.html b/ftd/t/js/73-loops-inside-list.html index 9f2dab96e2..ccd66e11bf 100644 --- a/ftd/t/js/73-loops-inside-list.html +++ b/ftd/t/js/73-loops-inside-list.html @@ -51,10 +51,13 @@ fastn_utils.getter(global.foo__places).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); return rooti0; }); }, @@ -62,10 +65,13 @@ fastn_utils.getter(global.foo__odds).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); rooti0.setProperty(fastn_dom.PropertyKind.IntegerValue, item, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "brown", - light: "brown" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "brown"); + record.set("light", "brown"); + return record; + }(), inherited); return rooti0; }); }, @@ -73,10 +79,13 @@ fastn_utils.getter(global.foo__persons).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item.get("name"), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); return rooti0; }); }, @@ -84,10 +93,13 @@ fastn_utils.getter(global.foo__persons).forLoop(root, function (root, item, index) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); rooti0.setProperty(fastn_dom.PropertyKind.IntegerValue, index, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); return rooti0; }); } @@ -111,10 +123,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.name, inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); }, function (root, inherited) { fastn_utils.getter(__args__.uis).forLoop(root, function (root, item, index) { @@ -139,18 +154,27 @@ 7, 9, 11])); -fastn_utils.createNestedObject(global, "foo__persons", fastn.mutableList([fastn.recordInstance({ - age: 28, - name: "John Doe" -}), -fastn.recordInstance({ - age: 24, - name: "Sam Wan" -}), -fastn.recordInstance({ - age: 30, - name: "Sam Ather" -})])); +fastn_utils.createNestedObject(global, "foo__persons", fastn.mutableList([function () { + let record = fastn.recordInstance({ + }); + record.set("age", 28); + record.set("name", "John Doe"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("age", 24); + record.set("name", "Sam Wan"); + return record; +}(), +function () { + let record = fastn.recordInstance({ + }); + record.set("age", 30); + record.set("name", "Sam Ather"); + return record; +}()])); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/78-module-using-record.html b/ftd/t/js/78-module-using-record.html index ab70472d1c..440be2a6dd 100644 --- a/ftd/t/js/78-module-using-record.html +++ b/ftd/t/js/78-module-using-record.html @@ -62,10 +62,13 @@ } } global["foo__header"] = foo__header; -fastn_utils.createNestedObject(global, "_78_data_for_module__user", fastn.recordInstance({ - is_logged_in: false, - user: null -})); +fastn_utils.createNestedObject(global, "_78_data_for_module__user", function () { + let record = fastn.recordInstance({ + }); + record.set("is_logged_in", false); + record.set("user", null); + return record; +}()); fastn_dom.codeData.availableThemes["coldark-theme.dark"] = "../../theme_css/coldark-theme.dark.css"; fastn_dom.codeData.availableThemes["coldark-theme.light"] = "../../theme_css/coldark-theme.light.css"; fastn_dom.codeData.availableThemes["coy-theme"] = "../../theme_css/coy-theme.css"; diff --git a/ftd/t/js/79-module-using-function.html b/ftd/t/js/79-module-using-function.html index de99333f61..979fd60af9 100644 --- a/ftd/t/js/79-module-using-function.html +++ b/ftd/t/js/79-module-using-function.html @@ -39,10 +39,13 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_78_data_for_module__user", fastn.recordInstance({ - is_logged_in: false, - user: null -})); +fastn_utils.createNestedObject(global, "_78_data_for_module__user", function () { + let record = fastn.recordInstance({ + }); + record.set("is_logged_in", false); + record.set("user", null); + return record; +}()); let _78_data_for_module__loggedIn = function (args) { let __fastn_super_package_name__ = __fastn_package_name__; @@ -104,10 +107,13 @@ parenti0.setProperty(fastn_dom.PropertyKind.Children, fastn.mutableList([function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Is user logged in ?", inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "black", - light: "black" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "black"); + record.set("light", "black"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Boolean); @@ -116,10 +122,13 @@ u: global._78_data_for_module__user, }, rooti0); }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); @@ -128,10 +137,13 @@ a: __args__.num, }, rooti0); }), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "blue", - light: "blue" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }(), inherited); }, function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); @@ -141,10 +153,13 @@ a: __args__.num, }, rooti0); }); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "green", - light: "green" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(), inherited); } ]), inherited); return parenti0; diff --git a/ftd/t/js/80-or-type-constant.html b/ftd/t/js/80-or-type-constant.html index d577a8be48..e64860fa90 100644 --- a/ftd/t/js/80-or-type-constant.html +++ b/ftd/t/js/80-or-type-constant.html @@ -58,11 +58,14 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "foo__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "foo__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); fastn_utils.createNestedObject(global, "foo__b", 1); fastn_utils.createNestedObject(global, "foo__small", 1); let foo__fancy_button = function (parent, inherited, args) diff --git a/ftd/t/js/81-or-type-test.html b/ftd/t/js/81-or-type-test.html index f8c4026f44..9f2ae93c31 100644 --- a/ftd/t/js/81-or-type-test.html +++ b/ftd/t/js/81-or-type-test.html @@ -36,11 +36,14 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); let foo__fancy_button = function (parent, inherited, args) { let __fastn_super_package_name__ = __fastn_package_name__; diff --git a/ftd/t/js/82-or-type-module.html b/ftd/t/js/82-or-type-module.html index e2860a4e07..8c5c1406e0 100644 --- a/ftd/t/js/82-or-type-module.html +++ b/ftd/t/js/82-or-type-module.html @@ -35,11 +35,14 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); fastn_utils.createNestedObject(global, "_80_or_type_constant__small", 1); let _80_or_type_constant__fancy_button = function (parent, inherited, args) { @@ -87,10 +90,13 @@ function (root, inherited) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Integer); rooti0.setProperty(fastn_dom.PropertyKind.IntegerValue, __args__.m.get("b"), inherited); - rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "red", - light: "red" - }), inherited); + rooti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(), inherited); } ]), inherited); return parenti0; diff --git a/ftd/t/js/86-import-or-type.html b/ftd/t/js/86-import-or-type.html index 33724ee7ce..0103b821ec 100644 --- a/ftd/t/js/86-import-or-type.html +++ b/ftd/t/js/86-import-or-type.html @@ -38,11 +38,14 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); fastn_utils.createNestedObject(global, "_80_or_type_constant__small", 1); let _80_or_type_constant__fancy_button = function (parent, inherited, args) { diff --git a/ftd/t/js/87-or-type-module-export.html b/ftd/t/js/87-or-type-module-export.html index 74dd2fec12..177fb4e6fa 100644 --- a/ftd/t/js/87-or-type-module-export.html +++ b/ftd/t/js/87-or-type-module-export.html @@ -36,11 +36,14 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); fastn_utils.createNestedObject(global, "_80_or_type_constant__small", 1); let _80_or_type_constant__fancy_button = function (parent, inherited, args) { diff --git a/ftd/t/js/88-module-reference-wrap-in-variant.html b/ftd/t/js/88-module-reference-wrap-in-variant.html index 7efff9aa88..996b52b824 100644 --- a/ftd/t/js/88-module-reference-wrap-in-variant.html +++ b/ftd/t/js/88-module-reference-wrap-in-variant.html @@ -49,15 +49,21 @@ } } global["main"] = main; -fastn_utils.createNestedObject(global, "_08_inherited__base_", fastn.recordInstance({ - light: "#FFFFFF", - dark: "#000000" -})); -fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", fastn.recordInstance({ - small: 1, - medium: 2, - large: 3 -})); +fastn_utils.createNestedObject(global, "_08_inherited__base_", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#FFFFFF"); + record.set("dark", "#000000"); + return record; +}()); +fastn_utils.createNestedObject(global, "_80_or_type_constant__button_type", function () { + let record = fastn.recordInstance({ + }); + record.set("small", 1); + record.set("medium", 2); + record.set("large", 3); + return record; +}()); let foo__button = function (parent, inherited, args) { let __fastn_super_package_name__ = __fastn_package_name__; @@ -92,14 +98,20 @@ } } ), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.recordInstance({ - dark: "white", - light: "white" - }), inherited); - parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "blue", - light: "blue" - })), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Color, function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "white"); + record.set("light", "white"); + return record; + }(), inherited); + parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "blue"); + record.set("light", "blue"); + return record; + }()), inherited); parenti0.setProperty(fastn_dom.PropertyKind.MinWidth, fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(240)), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Selectable, false, inherited); parenti0.setProperty(fastn_dom.PropertyKind.TextAlign, fastn_dom.TextAlign.Center, inherited); diff --git a/ftd/t/js/89-nested-or-type.html b/ftd/t/js/89-nested-or-type.html index 94a648f948..7b9a9598e0 100644 --- a/ftd/t/js/89-nested-or-type.html +++ b/ftd/t/js/89-nested-or-type.html @@ -44,10 +44,13 @@ __fastn_package_name__ = "foo"; try { let __args__ = { - background: fastn_dom.BackgroundStyle.Solid(fastn.recordInstance({ - dark: "yellow", - light: "yellow" - })), + background: fastn_dom.BackgroundStyle.Solid(function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "yellow"); + record.set("light", "yellow"); + return record; + }()), max_width: fastn_dom.Length.Px(70), }; inherited = fastn_utils.getInheritedValues(__args__, inherited, args); diff --git a/ftd/t/js/91-component-event.html b/ftd/t/js/91-component-event.html index ead346a847..637fac93e6 100644 --- a/ftd/t/js/91-component-event.html +++ b/ftd/t/js/91-component-event.html @@ -52,15 +52,21 @@ if (function () { return fastn_utils.getter(global.foo__flag); }()) { - return fastn.recordInstance({ - dark: "green", - light: "green" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "green"); + record.set("light", "green"); + return record; + }(); } else { - return fastn.recordInstance({ - dark: "red", - light: "red" - }); + return function () { + let record = fastn.recordInstance({ + }); + record.set("dark", "red"); + record.set("light", "red"); + return record; + }(); } } ), inherited); From 84e3311b90f9aea4ed72f38a0717336c0a44b6e7 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Tue, 23 Jan 2024 16:56:54 +0530 Subject: [PATCH 03/30] Fix: record referring its own field for list --- ftd/src/js/mod.rs | 47 ++++---------------------- ftd/src/js/value.rs | 47 ++++++++++++++++++++------ ftd/t/js/92-self-reference-record.ftd | 23 +++++++++++++ ftd/t/js/92-self-reference-record.html | 43 +++++++++++++++++++++-- 4 files changed, 107 insertions(+), 53 deletions(-) diff --git a/ftd/src/js/mod.rs b/ftd/src/js/mod.rs index 7965e3bf32..f89a2327cb 100644 --- a/ftd/src/js/mod.rs +++ b/ftd/src/js/mod.rs @@ -219,48 +219,15 @@ impl ftd::interpreter::Variable { has_rive_components: &mut bool, ) -> fastn_js::Ast { if let Ok(value) = self.value.value(doc.name, self.value.line_number()) { - if let ftd::interpreter::Kind::Record { name } = &self.kind.kind { - let record = doc.get_record(name, self.line_number).unwrap(); - let record_fields = value - .record_fields(doc.name, self.value.line_number()) - .unwrap(); - let mut fields = vec![]; - for field in record.fields { - if let Some(value) = record_fields.get(field.name.as_str()) { - fields.push(( - field.name.to_string(), - value.to_fastn_js_value_with_ui( - doc, - &ftd::js::ResolverData::new_with_record_definition_name(&Some( - name.to_string(), - )), - has_rive_components, - false, - ), - )); - } else { - fields.push(( - field.name.to_string(), - field - .get_default_value() - .unwrap() - .to_set_property_value_with_ui( - doc, - &ftd::js::ResolverData::new_with_record_definition_name(&Some( - name.to_string(), - )), - has_rive_components, - false, - ), - )); - } - } + if self.kind.is_record() { return fastn_js::Ast::RecordInstance(fastn_js::RecordInstance { name: self.name.to_string(), - fields: fastn_js::SetPropertyValue::Value(fastn_js::Value::Record { - fields, - other_references: vec![], - }), + fields: value.to_fastn_js_value( + doc, + &ftd::js::ResolverData::none(), + has_rive_components, + false, + ), prefix, }); } else if self.kind.is_list() { diff --git a/ftd/src/js/value.rs b/ftd/src/js/value.rs index 52a5a93f11..ef06a94a9a 100644 --- a/ftd/src/js/value.rs +++ b/ftd/src/js/value.rs @@ -430,17 +430,44 @@ impl ftd::interpreter::Value { .collect_vec(), }) } - ftd::interpreter::Value::Record { fields, .. } => { + ftd::interpreter::Value::Record { + fields: record_fields, + name, + } => { + let record = doc.get_record(name, 0).unwrap(); + let mut fields = vec![]; + for field in record.fields { + if let Some(value) = record_fields.get(field.name.as_str()) { + fields.push(( + field.name.to_string(), + value.to_fastn_js_value_with_ui( + doc, + &ftd::js::ResolverData::new_with_record_definition_name(&Some( + name.to_string(), + )), + has_rive_components, + false, + ), + )); + } else { + fields.push(( + field.name.to_string(), + field + .get_default_value() + .unwrap() + .to_set_property_value_with_ui( + doc, + &ftd::js::ResolverData::new_with_record_definition_name(&Some( + name.to_string(), + )), + has_rive_components, + false, + ), + )); + } + } fastn_js::SetPropertyValue::Value(fastn_js::Value::Record { - fields: fields - .iter() - .map(|(k, v)| { - ( - k.to_string(), - v.to_fastn_js_value(doc, rdata, should_return), - ) - }) - .collect_vec(), + fields, other_references: vec![], }) } diff --git a/ftd/t/js/92-self-reference-record.ftd b/ftd/t/js/92-self-reference-record.ftd index f72e3e26a9..6995512ddd 100644 --- a/ftd/t/js/92-self-reference-record.ftd +++ b/ftd/t/js/92-self-reference-record.ftd @@ -5,7 +5,30 @@ string full-name: $name-data.name -- name-data arpita: Arpita +-- name-data john: John +full-name: John Doe + + + -- display-name: $arpita +-- display-name: $name +for: name in $names + + + +-- name-data list names: + +-- name-data: $arpita + +-- name-data: FifthTry + +-- name-data: fastn +full-name: fastn framework + +-- name-data: $john + +-- end: names + -- component display-name: caption name-data name: diff --git a/ftd/t/js/92-self-reference-record.html b/ftd/t/js/92-self-reference-record.html index e28026450a..77a40ecc4c 100644 --- a/ftd/t/js/92-self-reference-record.html +++ b/ftd/t/js/92-self-reference-record.html @@ -18,11 +18,19 @@ -
Arpita
Arpita
- + diff --git a/fastn-core/tests/09-markdown-pages/output/default-78ABD81F996DF0CE0837D83DEF327F1ED626A2FAE4E0404378BDA33C03B37EF5.js b/fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js similarity index 88% rename from fastn-core/tests/09-markdown-pages/output/default-78ABD81F996DF0CE0837D83DEF327F1ED626A2FAE4E0404378BDA33C03B37EF5.js rename to fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js index 656784dedb..634917f291 100644 --- a/fastn-core/tests/09-markdown-pages/output/default-78ABD81F996DF0CE0837D83DEF327F1ED626A2FAE4E0404378BDA33C03B37EF5.js +++ b/fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js @@ -5526,563 +5526,1011 @@ ftd.follow_system_dark_mode = fastn.mutable(true); ftd.font_display = fastn.mutable("sans-serif"); ftd.font_copy = fastn.mutable("sans-serif"); ftd.font_code = fastn.mutable("sans-serif"); -ftd.default_types = fastn.recordInstance({ - heading_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(65), - size: fastn_dom.FontSize.Px(50), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(54), - size: fastn_dom.FontSize.Px(36), - weight: 400 - }) - }), - heading_medium: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(57), - size: fastn_dom.FontSize.Px(38), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(40), - size: fastn_dom.FontSize.Px(26), - weight: 400 - }) - }), - heading_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(31), - size: fastn_dom.FontSize.Px(24), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(29), - size: fastn_dom.FontSize.Px(22), - weight: 400 - }) - }), - heading_hero: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(104), - size: fastn_dom.FontSize.Px(80), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(64), - size: fastn_dom.FontSize.Px(48), - weight: 400 - }) - }), - heading_tiny: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(26), - size: fastn_dom.FontSize.Px(20), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - copy_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }), - copy_regular: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(30), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - copy_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(34), - size: fastn_dom.FontSize.Px(22), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(28), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - fine_print: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }), - blockquote: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - source_code: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(30), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - button_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - button_medium: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - button_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - link: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - label_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - label_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }) -}); -ftd.default_colors = fastn.recordInstance({ - background: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#18181b", - light: "#e7e7e4" - }), - code: fastn.recordInstance({ - dark: "#21222C", - light: "#F5F5F5" - }), - overlay: fastn.recordInstance({ - dark: "rgba(0, 0, 0, 0.8)", - light: "rgba(0, 0, 0, 0.8)" - }), - step_1: fastn.recordInstance({ - dark: "#141414", - light: "#f3f3f3" - }), - step_2: fastn.recordInstance({ - dark: "#585656", - light: "#c9cece" - }) - }), - border: fastn.recordInstance({ - dark: "#434547", - light: "#434547" - }), - border_strong: fastn.recordInstance({ - dark: "#919192", - light: "#919192" - }), - text: fastn.recordInstance({ - dark: "#a8a29e", - light: "#584b42" - }), - text_strong: fastn.recordInstance({ - dark: "#ffffff", - light: "#141414" - }), - shadow: fastn.recordInstance({ - dark: "#007f9b", - light: "#007f9b" - }), - scrim: fastn.recordInstance({ - dark: "#007f9b", - light: "#007f9b" - }), - cta_primary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#2dd4bf", - light: "#2dd4bf" - }), - border: fastn.recordInstance({ - dark: "#2b8074", - light: "#2b8074" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(44, 201, 181, 0.1)", - light: "rgba(44, 201, 181, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#2cbfac", - light: "#2cbfac" - }), - hover: fastn.recordInstance({ - dark: "#2c9f90", - light: "#2c9f90" - }), - pressed: fastn.recordInstance({ - dark: "#2cc9b5", - light: "#2cc9b5" - }), - text: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_secondary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - border: fastn.recordInstance({ - dark: "#209fdb", - light: "#209fdb" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(79, 178, 223, 0.1)", - light: "rgba(79, 178, 223, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#4fb1df", - light: "#4fb1df" - }), - hover: fastn.recordInstance({ - dark: "#40afe1", - light: "#40afe1" - }), - pressed: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - text: fastn.recordInstance({ - dark: "#ffffff", - light: "#584b42" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_tertiary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#556375", - light: "#556375" - }), - border: fastn.recordInstance({ - dark: "#e2e4e7", - light: "#e2e4e7" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(85, 99, 117, 0.1)", - light: "rgba(85, 99, 117, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#e0e2e6", - light: "#e0e2e6" - }), - hover: fastn.recordInstance({ - dark: "#c7cbd1", - light: "#c7cbd1" - }), - pressed: fastn.recordInstance({ - dark: "#3b4047", - light: "#3b4047" - }), - text: fastn.recordInstance({ - dark: "#ffffff", - light: "#ffffff" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_danger: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - border: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - border_disabled: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }), - disabled: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - focused: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - hover: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - pressed: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - text: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - text_disabled: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }) - }), - accent: fastn.recordInstance({ - primary: fastn.recordInstance({ - dark: "#2dd4bf", - light: "#2dd4bf" - }), - secondary: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - tertiary: fastn.recordInstance({ - dark: "#c5cbd7", - light: "#c5cbd7" - }) - }), - error: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#311b1f", - light: "#f5bdbb" - }), - border: fastn.recordInstance({ - dark: "#df2b2b", - light: "#df2b2b" - }), - text: fastn.recordInstance({ - dark: "#c62a21", - light: "#c62a21" - }) - }), - success: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#405508ad", - light: "#e3f0c4" - }), - border: fastn.recordInstance({ - dark: "#3d741f", - light: "#3d741f" - }), - text: fastn.recordInstance({ - dark: "#479f16", - light: "#467b28" - }) - }), - info: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#15223a", - light: "#c4edfd" - }), - border: fastn.recordInstance({ - dark: "#205694", - light: "#205694" - }), - text: fastn.recordInstance({ - dark: "#1f6feb", - light: "#205694" - }) - }), - warning: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#544607a3", - light: "#fbefba" - }), - border: fastn.recordInstance({ - dark: "#966220", - light: "#966220" - }), - text: fastn.recordInstance({ - dark: "#d07f19", - light: "#966220" - }) - }), - custom: fastn.recordInstance({ - eight: fastn.recordInstance({ - dark: "#d554b3", - light: "#d554b3" - }), - five: fastn.recordInstance({ - dark: "#eb57be", - light: "#eb57be" - }), - four: fastn.recordInstance({ - dark: "#7a65c7", - light: "#7a65c7" - }), - nine: fastn.recordInstance({ - dark: "#ec8943", - light: "#ec8943" - }), - one: fastn.recordInstance({ - dark: "#ed753a", - light: "#ed753a" - }), - seven: fastn.recordInstance({ - dark: "#7564be", - light: "#7564be" - }), - six: fastn.recordInstance({ - dark: "#ef8dd6", - light: "#ef8dd6" - }), - ten: fastn.recordInstance({ - dark: "#da7a4a", - light: "#da7a4a" - }), - three: fastn.recordInstance({ - dark: "#8fdcf8", - light: "#8fdcf8" - }), - two: fastn.recordInstance({ - dark: "#f3db5f", - light: "#f3db5f" - }) - }) -}); -ftd.breakpoint_width = fastn.recordInstance({ - mobile: 768 -}); +ftd.default_types = function () { + let record = fastn.recordInstance({ + }); + record.set("heading_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(50)); + record.set("line_height", fastn_dom.FontSize.Px(65)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(36)); + record.set("line_height", fastn_dom.FontSize.Px(54)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_medium", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(38)); + record.set("line_height", fastn_dom.FontSize.Px(57)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(26)); + record.set("line_height", fastn_dom.FontSize.Px(40)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(24)); + record.set("line_height", fastn_dom.FontSize.Px(31)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(22)); + record.set("line_height", fastn_dom.FontSize.Px(29)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_hero", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(80)); + record.set("line_height", fastn_dom.FontSize.Px(104)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(48)); + record.set("line_height", fastn_dom.FontSize.Px(64)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_tiny", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(20)); + record.set("line_height", fastn_dom.FontSize.Px(26)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("copy_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("copy_regular", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(30)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("copy_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(22)); + record.set("line_height", fastn_dom.FontSize.Px(34)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(28)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("fine_print", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("blockquote", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("source_code", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(30)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("button_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("button_medium", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("button_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("link", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("label_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("label_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + return record; +}(); +ftd.default_colors = function () { + let record = fastn.recordInstance({ + }); + record.set("background", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e7e7e4"); + record.set("dark", "#18181b"); + return record; + }()); + record.set("step_1", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f3f3f3"); + record.set("dark", "#141414"); + return record; + }()); + record.set("step_2", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c9cece"); + record.set("dark", "#585656"); + return record; + }()); + record.set("overlay", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(0, 0, 0, 0.8)"); + record.set("dark", "rgba(0, 0, 0, 0.8)"); + return record; + }()); + record.set("code", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F5F5F5"); + record.set("dark", "#21222C"); + return record; + }()); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#434547"); + record.set("dark", "#434547"); + return record; + }()); + record.set("border_strong", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#919192"); + record.set("dark", "#919192"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#584b42"); + record.set("dark", "#a8a29e"); + return record; + }()); + record.set("text_strong", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#141414"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("shadow", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#007f9b"); + record.set("dark", "#007f9b"); + return record; + }()); + record.set("scrim", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#007f9b"); + record.set("dark", "#007f9b"); + return record; + }()); + record.set("cta_primary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2dd4bf"); + record.set("dark", "#2dd4bf"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2c9f90"); + record.set("dark", "#2c9f90"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2cc9b5"); + record.set("dark", "#2cc9b5"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(44, 201, 181, 0.1)"); + record.set("dark", "rgba(44, 201, 181, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2cbfac"); + record.set("dark", "#2cbfac"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2b8074"); + record.set("dark", "#2b8074"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_secondary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#40afe1"); + record.set("dark", "#40afe1"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(79, 178, 223, 0.1)"); + record.set("dark", "rgba(79, 178, 223, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb1df"); + record.set("dark", "#4fb1df"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#209fdb"); + record.set("dark", "#209fdb"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#584b42"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_tertiary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#556375"); + record.set("dark", "#556375"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c7cbd1"); + record.set("dark", "#c7cbd1"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3b4047"); + record.set("dark", "#3b4047"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(85, 99, 117, 0.1)"); + record.set("dark", "rgba(85, 99, 117, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e0e2e6"); + record.set("dark", "#e0e2e6"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e2e4e7"); + record.set("dark", "#e2e4e7"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ffffff"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_danger", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + return record; + }()); + record.set("accent", function () { + let record = fastn.recordInstance({ + }); + record.set("primary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2dd4bf"); + record.set("dark", "#2dd4bf"); + return record; + }()); + record.set("secondary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("tertiary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c5cbd7"); + record.set("dark", "#c5cbd7"); + return record; + }()); + return record; + }()); + record.set("error", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f5bdbb"); + record.set("dark", "#311b1f"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c62a21"); + record.set("dark", "#c62a21"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#df2b2b"); + record.set("dark", "#df2b2b"); + return record; + }()); + return record; + }()); + record.set("success", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e3f0c4"); + record.set("dark", "#405508ad"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#467b28"); + record.set("dark", "#479f16"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3d741f"); + record.set("dark", "#3d741f"); + return record; + }()); + return record; + }()); + record.set("info", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c4edfd"); + record.set("dark", "#15223a"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#205694"); + record.set("dark", "#1f6feb"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#205694"); + record.set("dark", "#205694"); + return record; + }()); + return record; + }()); + record.set("warning", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#fbefba"); + record.set("dark", "#544607a3"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#966220"); + record.set("dark", "#d07f19"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#966220"); + record.set("dark", "#966220"); + return record; + }()); + return record; + }()); + record.set("custom", function () { + let record = fastn.recordInstance({ + }); + record.set("one", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ed753a"); + record.set("dark", "#ed753a"); + return record; + }()); + record.set("two", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f3db5f"); + record.set("dark", "#f3db5f"); + return record; + }()); + record.set("three", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#8fdcf8"); + record.set("dark", "#8fdcf8"); + return record; + }()); + record.set("four", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7a65c7"); + record.set("dark", "#7a65c7"); + return record; + }()); + record.set("five", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#eb57be"); + record.set("dark", "#eb57be"); + return record; + }()); + record.set("six", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ef8dd6"); + record.set("dark", "#ef8dd6"); + return record; + }()); + record.set("seven", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7564be"); + record.set("dark", "#7564be"); + return record; + }()); + record.set("eight", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#d554b3"); + record.set("dark", "#d554b3"); + return record; + }()); + record.set("nine", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ec8943"); + record.set("dark", "#ec8943"); + return record; + }()); + record.set("ten", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#da7a4a"); + record.set("dark", "#da7a4a"); + return record; + }()); + return record; + }()); + return record; +}(); +ftd.breakpoint_width = function () { + let record = fastn.recordInstance({ + }); + record.set("mobile", 768); + return record; +}(); ftd.device = fastn.mutable(fastn_dom.DeviceData.Mobile); -let inherited = fastn.recordInstance({ - colors: ftd.default_colors.getClone().setAndReturn("is_root", true), - types: ftd.default_types.getClone().setAndReturn("is_root", true) -}); +let inherited = function () { + let record = fastn.recordInstance({ + }); + record.set("colors", ftd.default_colors.getClone().setAndReturn("is_root", true)); + record.set("types", ftd.default_types.getClone().setAndReturn("is_root", true)); + return record; +}(); diff --git a/fastn-core/tests/09-markdown-pages/output/index.html b/fastn-core/tests/09-markdown-pages/output/index.html index 6bece1f842..f78a48c773 100644 --- a/fastn-core/tests/09-markdown-pages/output/index.html +++ b/fastn-core/tests/09-markdown-pages/output/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/default-60442A45CE8CA498324826B96263969BA79BCF620E0D33E850899224E185A685.js b/fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js similarity index 88% rename from fastn-core/tests/17-sitemap/output/default-60442A45CE8CA498324826B96263969BA79BCF620E0D33E850899224E185A685.js rename to fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js index 9601e85555..e393af90e1 100644 --- a/fastn-core/tests/17-sitemap/output/default-60442A45CE8CA498324826B96263969BA79BCF620E0D33E850899224E185A685.js +++ b/fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js @@ -5526,563 +5526,1011 @@ ftd.follow_system_dark_mode = fastn.mutable(true); ftd.font_display = fastn.mutable("sans-serif"); ftd.font_copy = fastn.mutable("sans-serif"); ftd.font_code = fastn.mutable("sans-serif"); -ftd.default_types = fastn.recordInstance({ - heading_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(65), - size: fastn_dom.FontSize.Px(50), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(54), - size: fastn_dom.FontSize.Px(36), - weight: 400 - }) - }), - heading_medium: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(57), - size: fastn_dom.FontSize.Px(38), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(40), - size: fastn_dom.FontSize.Px(26), - weight: 400 - }) - }), - heading_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(31), - size: fastn_dom.FontSize.Px(24), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(29), - size: fastn_dom.FontSize.Px(22), - weight: 400 - }) - }), - heading_hero: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(104), - size: fastn_dom.FontSize.Px(80), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(64), - size: fastn_dom.FontSize.Px(48), - weight: 400 - }) - }), - heading_tiny: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(26), - size: fastn_dom.FontSize.Px(20), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - copy_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }), - copy_regular: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(30), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - copy_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(34), - size: fastn_dom.FontSize.Px(22), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_copy, - line_height: fastn_dom.FontSize.Px(28), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - fine_print: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }), - blockquote: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - source_code: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(30), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_code, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - button_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - button_medium: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(21), - size: fastn_dom.FontSize.Px(16), - weight: 400 - }) - }), - button_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(24), - size: fastn_dom.FontSize.Px(18), - weight: 400 - }) - }), - link: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - label_large: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(19), - size: fastn_dom.FontSize.Px(14), - weight: 400 - }) - }), - label_small: fastn.recordInstance({ - desktop: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }), - mobile: fastn.recordInstance({ - font_family: ftd.font_display, - line_height: fastn_dom.FontSize.Px(16), - size: fastn_dom.FontSize.Px(12), - weight: 400 - }) - }) -}); -ftd.default_colors = fastn.recordInstance({ - background: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#18181b", - light: "#e7e7e4" - }), - code: fastn.recordInstance({ - dark: "#21222C", - light: "#F5F5F5" - }), - overlay: fastn.recordInstance({ - dark: "rgba(0, 0, 0, 0.8)", - light: "rgba(0, 0, 0, 0.8)" - }), - step_1: fastn.recordInstance({ - dark: "#141414", - light: "#f3f3f3" - }), - step_2: fastn.recordInstance({ - dark: "#585656", - light: "#c9cece" - }) - }), - border: fastn.recordInstance({ - dark: "#434547", - light: "#434547" - }), - border_strong: fastn.recordInstance({ - dark: "#919192", - light: "#919192" - }), - text: fastn.recordInstance({ - dark: "#a8a29e", - light: "#584b42" - }), - text_strong: fastn.recordInstance({ - dark: "#ffffff", - light: "#141414" - }), - shadow: fastn.recordInstance({ - dark: "#007f9b", - light: "#007f9b" - }), - scrim: fastn.recordInstance({ - dark: "#007f9b", - light: "#007f9b" - }), - cta_primary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#2dd4bf", - light: "#2dd4bf" - }), - border: fastn.recordInstance({ - dark: "#2b8074", - light: "#2b8074" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(44, 201, 181, 0.1)", - light: "rgba(44, 201, 181, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#2cbfac", - light: "#2cbfac" - }), - hover: fastn.recordInstance({ - dark: "#2c9f90", - light: "#2c9f90" - }), - pressed: fastn.recordInstance({ - dark: "#2cc9b5", - light: "#2cc9b5" - }), - text: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_secondary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - border: fastn.recordInstance({ - dark: "#209fdb", - light: "#209fdb" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(79, 178, 223, 0.1)", - light: "rgba(79, 178, 223, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#4fb1df", - light: "#4fb1df" - }), - hover: fastn.recordInstance({ - dark: "#40afe1", - light: "#40afe1" - }), - pressed: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - text: fastn.recordInstance({ - dark: "#ffffff", - light: "#584b42" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_tertiary: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#556375", - light: "#556375" - }), - border: fastn.recordInstance({ - dark: "#e2e4e7", - light: "#e2e4e7" - }), - border_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }), - disabled: fastn.recordInstance({ - dark: "rgba(85, 99, 117, 0.1)", - light: "rgba(85, 99, 117, 0.1)" - }), - focused: fastn.recordInstance({ - dark: "#e0e2e6", - light: "#e0e2e6" - }), - hover: fastn.recordInstance({ - dark: "#c7cbd1", - light: "#c7cbd1" - }), - pressed: fastn.recordInstance({ - dark: "#3b4047", - light: "#3b4047" - }), - text: fastn.recordInstance({ - dark: "#ffffff", - light: "#ffffff" - }), - text_disabled: fastn.recordInstance({ - dark: "#65b693", - light: "#65b693" - }) - }), - cta_danger: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - border: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - border_disabled: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }), - disabled: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - focused: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - hover: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - pressed: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - text: fastn.recordInstance({ - dark: "#1C1B1F", - light: "#1C1B1F" - }), - text_disabled: fastn.recordInstance({ - dark: "#feffff", - light: "#feffff" - }) - }), - accent: fastn.recordInstance({ - primary: fastn.recordInstance({ - dark: "#2dd4bf", - light: "#2dd4bf" - }), - secondary: fastn.recordInstance({ - dark: "#4fb2df", - light: "#4fb2df" - }), - tertiary: fastn.recordInstance({ - dark: "#c5cbd7", - light: "#c5cbd7" - }) - }), - error: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#311b1f", - light: "#f5bdbb" - }), - border: fastn.recordInstance({ - dark: "#df2b2b", - light: "#df2b2b" - }), - text: fastn.recordInstance({ - dark: "#c62a21", - light: "#c62a21" - }) - }), - success: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#405508ad", - light: "#e3f0c4" - }), - border: fastn.recordInstance({ - dark: "#3d741f", - light: "#3d741f" - }), - text: fastn.recordInstance({ - dark: "#479f16", - light: "#467b28" - }) - }), - info: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#15223a", - light: "#c4edfd" - }), - border: fastn.recordInstance({ - dark: "#205694", - light: "#205694" - }), - text: fastn.recordInstance({ - dark: "#1f6feb", - light: "#205694" - }) - }), - warning: fastn.recordInstance({ - base: fastn.recordInstance({ - dark: "#544607a3", - light: "#fbefba" - }), - border: fastn.recordInstance({ - dark: "#966220", - light: "#966220" - }), - text: fastn.recordInstance({ - dark: "#d07f19", - light: "#966220" - }) - }), - custom: fastn.recordInstance({ - eight: fastn.recordInstance({ - dark: "#d554b3", - light: "#d554b3" - }), - five: fastn.recordInstance({ - dark: "#eb57be", - light: "#eb57be" - }), - four: fastn.recordInstance({ - dark: "#7a65c7", - light: "#7a65c7" - }), - nine: fastn.recordInstance({ - dark: "#ec8943", - light: "#ec8943" - }), - one: fastn.recordInstance({ - dark: "#ed753a", - light: "#ed753a" - }), - seven: fastn.recordInstance({ - dark: "#7564be", - light: "#7564be" - }), - six: fastn.recordInstance({ - dark: "#ef8dd6", - light: "#ef8dd6" - }), - ten: fastn.recordInstance({ - dark: "#da7a4a", - light: "#da7a4a" - }), - three: fastn.recordInstance({ - dark: "#8fdcf8", - light: "#8fdcf8" - }), - two: fastn.recordInstance({ - dark: "#f3db5f", - light: "#f3db5f" - }) - }) -}); -ftd.breakpoint_width = fastn.recordInstance({ - mobile: 768 -}); +ftd.default_types = function () { + let record = fastn.recordInstance({ + }); + record.set("heading_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(50)); + record.set("line_height", fastn_dom.FontSize.Px(65)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(36)); + record.set("line_height", fastn_dom.FontSize.Px(54)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_medium", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(38)); + record.set("line_height", fastn_dom.FontSize.Px(57)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(26)); + record.set("line_height", fastn_dom.FontSize.Px(40)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(24)); + record.set("line_height", fastn_dom.FontSize.Px(31)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(22)); + record.set("line_height", fastn_dom.FontSize.Px(29)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_hero", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(80)); + record.set("line_height", fastn_dom.FontSize.Px(104)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(48)); + record.set("line_height", fastn_dom.FontSize.Px(64)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("heading_tiny", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(20)); + record.set("line_height", fastn_dom.FontSize.Px(26)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("copy_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("copy_regular", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(30)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("copy_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(22)); + record.set("line_height", fastn_dom.FontSize.Px(34)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(28)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_copy); + return record; + }()); + return record; + }()); + record.set("fine_print", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("blockquote", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("source_code", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(30)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_code); + return record; + }()); + return record; + }()); + record.set("button_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("button_medium", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(16)); + record.set("line_height", fastn_dom.FontSize.Px(21)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("button_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(18)); + record.set("line_height", fastn_dom.FontSize.Px(24)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("link", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("label_large", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(14)); + record.set("line_height", fastn_dom.FontSize.Px(19)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + record.set("label_small", function () { + let record = fastn.recordInstance({ + }); + record.set("desktop", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + record.set("mobile", function () { + let record = fastn.recordInstance({ + }); + record.set("size", fastn_dom.FontSize.Px(12)); + record.set("line_height", fastn_dom.FontSize.Px(16)); + record.set("letter_spacing", null); + record.set("weight", 400); + record.set("font_family", ftd.font_display); + return record; + }()); + return record; + }()); + return record; +}(); +ftd.default_colors = function () { + let record = fastn.recordInstance({ + }); + record.set("background", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e7e7e4"); + record.set("dark", "#18181b"); + return record; + }()); + record.set("step_1", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f3f3f3"); + record.set("dark", "#141414"); + return record; + }()); + record.set("step_2", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c9cece"); + record.set("dark", "#585656"); + return record; + }()); + record.set("overlay", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(0, 0, 0, 0.8)"); + record.set("dark", "rgba(0, 0, 0, 0.8)"); + return record; + }()); + record.set("code", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#F5F5F5"); + record.set("dark", "#21222C"); + return record; + }()); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#434547"); + record.set("dark", "#434547"); + return record; + }()); + record.set("border_strong", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#919192"); + record.set("dark", "#919192"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#584b42"); + record.set("dark", "#a8a29e"); + return record; + }()); + record.set("text_strong", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#141414"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("shadow", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#007f9b"); + record.set("dark", "#007f9b"); + return record; + }()); + record.set("scrim", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#007f9b"); + record.set("dark", "#007f9b"); + return record; + }()); + record.set("cta_primary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2dd4bf"); + record.set("dark", "#2dd4bf"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2c9f90"); + record.set("dark", "#2c9f90"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2cc9b5"); + record.set("dark", "#2cc9b5"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(44, 201, 181, 0.1)"); + record.set("dark", "rgba(44, 201, 181, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2cbfac"); + record.set("dark", "#2cbfac"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2b8074"); + record.set("dark", "#2b8074"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_secondary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#40afe1"); + record.set("dark", "#40afe1"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(79, 178, 223, 0.1)"); + record.set("dark", "rgba(79, 178, 223, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb1df"); + record.set("dark", "#4fb1df"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#209fdb"); + record.set("dark", "#209fdb"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#584b42"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_tertiary", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#556375"); + record.set("dark", "#556375"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c7cbd1"); + record.set("dark", "#c7cbd1"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3b4047"); + record.set("dark", "#3b4047"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "rgba(85, 99, 117, 0.1)"); + record.set("dark", "rgba(85, 99, 117, 0.1)"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e0e2e6"); + record.set("dark", "#e0e2e6"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e2e4e7"); + record.set("dark", "#e2e4e7"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ffffff"); + record.set("dark", "#ffffff"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#65b693"); + record.set("dark", "#65b693"); + return record; + }()); + return record; + }()); + record.set("cta_danger", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("hover", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("pressed", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("focused", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("border_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#1C1B1F"); + record.set("dark", "#1C1B1F"); + return record; + }()); + record.set("text_disabled", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#feffff"); + record.set("dark", "#feffff"); + return record; + }()); + return record; + }()); + record.set("accent", function () { + let record = fastn.recordInstance({ + }); + record.set("primary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#2dd4bf"); + record.set("dark", "#2dd4bf"); + return record; + }()); + record.set("secondary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#4fb2df"); + record.set("dark", "#4fb2df"); + return record; + }()); + record.set("tertiary", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c5cbd7"); + record.set("dark", "#c5cbd7"); + return record; + }()); + return record; + }()); + record.set("error", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f5bdbb"); + record.set("dark", "#311b1f"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c62a21"); + record.set("dark", "#c62a21"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#df2b2b"); + record.set("dark", "#df2b2b"); + return record; + }()); + return record; + }()); + record.set("success", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#e3f0c4"); + record.set("dark", "#405508ad"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#467b28"); + record.set("dark", "#479f16"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#3d741f"); + record.set("dark", "#3d741f"); + return record; + }()); + return record; + }()); + record.set("info", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#c4edfd"); + record.set("dark", "#15223a"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#205694"); + record.set("dark", "#1f6feb"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#205694"); + record.set("dark", "#205694"); + return record; + }()); + return record; + }()); + record.set("warning", function () { + let record = fastn.recordInstance({ + }); + record.set("base", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#fbefba"); + record.set("dark", "#544607a3"); + return record; + }()); + record.set("text", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#966220"); + record.set("dark", "#d07f19"); + return record; + }()); + record.set("border", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#966220"); + record.set("dark", "#966220"); + return record; + }()); + return record; + }()); + record.set("custom", function () { + let record = fastn.recordInstance({ + }); + record.set("one", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ed753a"); + record.set("dark", "#ed753a"); + return record; + }()); + record.set("two", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#f3db5f"); + record.set("dark", "#f3db5f"); + return record; + }()); + record.set("three", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#8fdcf8"); + record.set("dark", "#8fdcf8"); + return record; + }()); + record.set("four", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7a65c7"); + record.set("dark", "#7a65c7"); + return record; + }()); + record.set("five", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#eb57be"); + record.set("dark", "#eb57be"); + return record; + }()); + record.set("six", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ef8dd6"); + record.set("dark", "#ef8dd6"); + return record; + }()); + record.set("seven", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#7564be"); + record.set("dark", "#7564be"); + return record; + }()); + record.set("eight", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#d554b3"); + record.set("dark", "#d554b3"); + return record; + }()); + record.set("nine", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#ec8943"); + record.set("dark", "#ec8943"); + return record; + }()); + record.set("ten", function () { + let record = fastn.recordInstance({ + }); + record.set("light", "#da7a4a"); + record.set("dark", "#da7a4a"); + return record; + }()); + return record; + }()); + return record; +}(); +ftd.breakpoint_width = function () { + let record = fastn.recordInstance({ + }); + record.set("mobile", 768); + return record; +}(); ftd.device = fastn.mutable(fastn_dom.DeviceData.Mobile); -let inherited = fastn.recordInstance({ - colors: ftd.default_colors.getClone().setAndReturn("is_root", true), - types: ftd.default_types.getClone().setAndReturn("is_root", true) -}); +let inherited = function () { + let record = fastn.recordInstance({ + }); + record.set("colors", ftd.default_colors.getClone().setAndReturn("is_root", true)); + record.set("types", ftd.default_types.getClone().setAndReturn("is_root", true)); + return record; +}(); diff --git a/fastn-core/tests/17-sitemap/output/guide/install/index.html b/fastn-core/tests/17-sitemap/output/guide/install/index.html index 5231e922d2..ff1463860c 100644 --- a/fastn-core/tests/17-sitemap/output/guide/install/index.html +++ b/fastn-core/tests/17-sitemap/output/guide/install/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/index.html b/fastn-core/tests/17-sitemap/output/index.html index fe9f11c6a6..72ce8a3f0e 100644 --- a/fastn-core/tests/17-sitemap/output/index.html +++ b/fastn-core/tests/17-sitemap/output/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/install/index.html b/fastn-core/tests/17-sitemap/output/install/index.html index 5231e922d2..ff1463860c 100644 --- a/fastn-core/tests/17-sitemap/output/install/index.html +++ b/fastn-core/tests/17-sitemap/output/install/index.html @@ -14,7 +14,7 @@ - + From 7fe6585e0474b9b480b3174eaa6ba500872ba5bd Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Tue, 23 Jan 2024 20:29:13 +0530 Subject: [PATCH 08/30] version bump to 0.4.48 --- Cargo.lock | 2 +- fastn/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fc0c22310..f44df15edc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "fastn" -version = "0.4.47" +version = "0.4.48" dependencies = [ "clap", "colored", diff --git a/fastn/Cargo.toml b/fastn/Cargo.toml index 1ca5232481..fcacc20a12 100644 --- a/fastn/Cargo.toml +++ b/fastn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastn" -version = "0.4.47" +version = "0.4.48" authors.workspace = true edition.workspace = true license.workspace = true From 4eb9728072a85b7d4480be2666e094827ccd2982 Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Tue, 23 Jan 2024 20:33:43 +0530 Subject: [PATCH 09/30] updated versions of some github actions in release workflow --- .github/workflows/release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ad19e68f3..720d27fc15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,8 @@ jobs: env: CARGO_TERM_COLOR: always steps: - - uses: actions/checkout@main - - uses: actions/cache@v2 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -35,7 +35,7 @@ jobs: docker cp fastn-build:/home/rust/src/target/x86_64-unknown-linux-musl/release/fastn out/ - name: run fastn run: out/fastn --version - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: linux_musl_x86_64 path: out/fastn @@ -43,9 +43,9 @@ jobs: name: Build for Windows runs-on: windows-latest steps: - - uses: actions/checkout@main + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -63,7 +63,7 @@ jobs: args: --release - name: run fastn run: ./target/release/fastn.exe --version - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: windows_x64_latest path: target/release/fastn.exe @@ -80,7 +80,7 @@ jobs: with: arguments: /V3 /DCURRENT_WD=${{ github.workspace }} /DVERSION=${{ github.event.inputs.releaseTag }} additional-plugin-paths: ${{ github.workspace }}/NSIS_Plugins/Plugins - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: windows_x64_installer.exe path: windows_x64_installer.exe @@ -88,9 +88,9 @@ jobs: name: Build for MacOS runs-on: macos-latest steps: - - uses: actions/checkout@main + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -108,7 +108,7 @@ jobs: args: --release --features=auth - name: run fastn run: ./target/release/fastn --version - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: macos_x64_latest path: | @@ -118,7 +118,7 @@ jobs: runs-on: ubuntu-latest needs: [release-ubuntu, release-macos, release-windows] steps: - - uses: actions/checkout@main + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: macos_x64_latest From a5295cc13193ff3c6fcee8f6bcfbea0990137cd9 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Wed, 24 Jan 2024 19:37:13 +0530 Subject: [PATCH 10/30] Fix: evalexpr conversion to js --- fastn-js/src/to_js.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastn-js/src/to_js.rs b/fastn-js/src/to_js.rs index 15582c1c94..83e0ba8602 100644 --- a/fastn-js/src/to_js.rs +++ b/fastn-js/src/to_js.rs @@ -1054,13 +1054,13 @@ impl ExpressionGenerator { // like person.name, person.meta.address if chain_dot_operator_count > 1 { return format!( - "fastn_utils.getter({})", + "fastn_utils.getStaticValue({})", get_chained_getter_string(value.as_str()) ); } // When there is no chained dot operator value - format!("fastn_utils.getter({})", value) + format!("fastn_utils.getStaticValue({})", value) } else { value } From ce7f45bb97509472a09410e7ec4b9fef21ef01d4 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Thu, 25 Jan 2024 11:15:25 +0530 Subject: [PATCH 11/30] fix cargo test --- ftd/t/js/01-basic-module.html | 2 +- ftd/t/js/02-property.html | 2 +- ftd/t/js/03-common-properties.html | 6 +++--- ftd/t/js/04-variable.html | 8 ++++---- ftd/t/js/05-dynamic-dom-list.html | 6 +++--- ftd/t/js/10-color-test.html | 10 +++++----- ftd/t/js/11-device.html | 2 +- ftd/t/js/14-code.html | 4 ++-- ftd/t/js/15-function-call-in-property.html | 4 ++-- ftd/t/js/17-clone.html | 2 +- ftd/t/js/17-events.html | 2 +- ftd/t/js/24-re-export.html | 2 +- ftd/t/js/25-re-re-export.html | 2 +- ftd/t/js/27-for-loop.html | 4 ++-- ftd/t/js/29-dom-list.html | 2 +- ftd/t/js/30-web-component.html | 16 ++++++++-------- ftd/t/js/31-advance-list.html | 4 ++-- ftd/t/js/32-ftd-len.html | 6 +++--- ftd/t/js/33-list-indexing.html | 2 +- ftd/t/js/34-ftd-ui.html | 2 +- ftd/t/js/37-expander.html | 6 +++--- ftd/t/js/42-links.html | 4 ++-- ftd/t/js/44-module.html | 4 ++-- ftd/t/js/45-re-module.html | 6 +++--- ftd/t/js/45-re-re-module.html | 2 +- ftd/t/js/50-iframe-fullscreen.html | 4 ++-- ftd/t/js/51-markdown-table.html | 2 +- ftd/t/js/52-events.html | 6 +++--- ftd/t/js/57-code-dark-mode.html | 2 +- ftd/t/js/60-conditional-module-headers.html | 2 +- ftd/t/js/61-functions.html | 2 +- ftd/t/js/62-fallback-fonts.html | 6 +++--- ftd/t/js/66-backdrop-filter.html | 6 +++--- ftd/t/js/67-counter.html | 2 +- ftd/t/js/69-chained-dot-value-in-functions.html | 6 +++--- ftd/t/js/72-document-breakpoint.html | 2 +- ftd/t/js/78-module-using-record.html | 2 +- ftd/t/js/79-module-using-function.html | 6 +++--- ftd/t/js/80-or-type-constant.html | 6 +++--- ftd/t/js/81-or-type-test.html | 2 +- ftd/t/js/82-or-type-module.html | 2 +- ftd/t/js/86-import-or-type.html | 2 +- ftd/t/js/87-or-type-module-export.html | 2 +- ftd/t/js/88-body-children.html | 4 ++-- .../js/88-module-reference-wrap-in-variant.html | 4 ++-- ftd/t/js/91-component-event.html | 2 +- 46 files changed, 91 insertions(+), 91 deletions(-) diff --git a/ftd/t/js/01-basic-module.html b/ftd/t/js/01-basic-module.html index 21b5ade316..ff90b9e922 100644 --- a/ftd/t/js/01-basic-module.html +++ b/ftd/t/js/01-basic-module.html @@ -63,7 +63,7 @@ }(), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([global.foo__hover], function () { if (function () { - return fastn_utils.getter(global.foo__hover); + return fastn_utils.getStaticValue(global.foo__hover); }()) { return fastn_dom.BackgroundStyle.Solid(function () { let record = fastn.recordInstance({ diff --git a/ftd/t/js/02-property.html b/ftd/t/js/02-property.html index 825b2b3b53..4629b8cb1b 100644 --- a/ftd/t/js/02-property.html +++ b/ftd/t/js/02-property.html @@ -56,7 +56,7 @@ }); parenti4.setProperty(fastn_dom.PropertyKind.Width, fastn.formula([global.foo__flag], function () { if (function () { - return fastn_utils.getter(global.foo__flag); + return fastn_utils.getStaticValue(global.foo__flag); }()) { return fastn_dom.Resizing.Fixed(fastn_dom.Length.Percent(40)); } else { diff --git a/ftd/t/js/03-common-properties.html b/ftd/t/js/03-common-properties.html index 02e95a171b..682f96cae1 100644 --- a/ftd/t/js/03-common-properties.html +++ b/ftd/t/js/03-common-properties.html @@ -933,11 +933,11 @@ global.foo__bp, global.foo__value], function () { if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 0); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 0); }()) { return global.foo__og; } else if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 1); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 1); }()) { return global.foo__bp; } else { @@ -1891,7 +1891,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/04-variable.html b/ftd/t/js/04-variable.html index 936b07297f..303162df21 100644 --- a/ftd/t/js/04-variable.html +++ b/ftd/t/js/04-variable.html @@ -41,7 +41,7 @@ }); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn.formula([global.foo__i], function () { if (function () { - return (fastn_utils.getter(global.foo__i) > 10); + return (fastn_utils.getStaticValue(global.foo__i) > 10); }()) { return fastn_dom.Length.Px(4); } @@ -59,7 +59,7 @@ fastn_dom.conditionalDom(parent, [ global.foo__i ], function () { - return (fastn_utils.getter(global.foo__i) > 11); + return (fastn_utils.getStaticValue(global.foo__i) > 11); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello", inherited); @@ -84,7 +84,7 @@ return fastn_dom.conditionalDom(parent, [ index ], function () { - return (fastn_utils.getter(index) % 2 == 0); + return (fastn_utils.getStaticValue(index) % 2 == 0); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, item, inherited); @@ -102,7 +102,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/05-dynamic-dom-list.html b/ftd/t/js/05-dynamic-dom-list.html index a352011aaa..a853949a07 100644 --- a/ftd/t/js/05-dynamic-dom-list.html +++ b/ftd/t/js/05-dynamic-dom-list.html @@ -52,7 +52,7 @@ index, global.foo__value ], function () { - return (fastn_utils.getter(index) % 2 == fastn_utils.getter(global.foo__value)); + return (fastn_utils.getStaticValue(index) % 2 == fastn_utils.getStaticValue(global.foo__value)); }, function (root) { let rooti0 = foo__counter_list(root, inherited, { counter: fastn.wrapMutable(item) @@ -73,7 +73,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getter(__args__.a) + 1) % 2); + let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getStaticValue(__args__.a) + 1) % 2); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -106,7 +106,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/10-color-test.html b/ftd/t/js/10-color-test.html index 585a2dd5c4..1e82c43ce0 100644 --- a/ftd/t/js/10-color-test.html +++ b/ftd/t/js/10-color-test.html @@ -56,11 +56,11 @@ parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([global.foo__value, global.foo__value], function () { if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 0); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 0); }()) { return fastn_dom.BackgroundStyle.Solid(global.foo__bg_og); } else if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 1); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 1); }()) { return fastn_dom.BackgroundStyle.Solid(global.foo__bg_bp); } else { @@ -89,11 +89,11 @@ global.foo__bp, global.foo__value], function () { if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 0); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 0); }()) { return global.foo__og; } else if (function () { - return (fastn_utils.getter(global.foo__value) % 3 == 1); + return (fastn_utils.getStaticValue(global.foo__value) % 3 == 1); }()) { return global.foo__bp; } else { @@ -128,7 +128,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/11-device.html b/ftd/t/js/11-device.html index b5f716f664..15d55cd4de 100644 --- a/ftd/t/js/11-device.html +++ b/ftd/t/js/11-device.html @@ -84,7 +84,7 @@ return fastn_dom.conditionalDom(parent, [ __args__.show ], function () { - return fastn_utils.getter(__args__.show); + return fastn_utils.getStaticValue(__args__.show); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.addEventHandler(fastn_dom.Event.Click, function () { diff --git a/ftd/t/js/14-code.html b/ftd/t/js/14-code.html index 2142b28c38..e9342a6c53 100644 --- a/ftd/t/js/14-code.html +++ b/ftd/t/js/14-code.html @@ -170,7 +170,7 @@ fastn_dom.conditionalDom(root, [ ftd.dark_mode ], function () { - return (!fastn_utils.getter(ftd.dark_mode)); + return (!fastn_utils.getStaticValue(ftd.dark_mode)); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Code); rooti0.setProperty(fastn_dom.PropertyKind.Code, __args__.text, inherited); @@ -185,7 +185,7 @@ fastn_dom.conditionalDom(root, [ ftd.dark_mode ], function () { - return fastn_utils.getter(ftd.dark_mode); + return fastn_utils.getStaticValue(ftd.dark_mode); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Code); rooti0.setProperty(fastn_dom.PropertyKind.Code, __args__.text, inherited); diff --git a/ftd/t/js/15-function-call-in-property.html b/ftd/t/js/15-function-call-in-property.html index df0cfaf1b5..3beb83f1fb 100644 --- a/ftd/t/js/15-function-call-in-property.html +++ b/ftd/t/js/15-function-call-in-property.html @@ -53,7 +53,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -73,7 +73,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) * 2); + return (fastn_utils.getStaticValue(__args__.a) * 2); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/17-clone.html b/ftd/t/js/17-clone.html index 31825cec9f..7fd0b363df 100644 --- a/ftd/t/js/17-clone.html +++ b/ftd/t/js/17-clone.html @@ -83,7 +83,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + " yo "); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + " yo "); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/17-events.html b/ftd/t/js/17-events.html index a94d5baa0f..8488eb6764 100644 --- a/ftd/t/js/17-events.html +++ b/ftd/t/js/17-events.html @@ -62,7 +62,7 @@ }); parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.formula([global.foo__flag], function () { if (function () { - return fastn_utils.getter(global.foo__flag); + return fastn_utils.getStaticValue(global.foo__flag); }()) { return function () { let record = fastn.recordInstance({ diff --git a/ftd/t/js/24-re-export.html b/ftd/t/js/24-re-export.html index 2590d84538..d6b76cc912 100644 --- a/ftd/t/js/24-re-export.html +++ b/ftd/t/js/24-re-export.html @@ -51,7 +51,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/25-re-re-export.html b/ftd/t/js/25-re-re-export.html index dda29efdbb..a39cbc4709 100644 --- a/ftd/t/js/25-re-re-export.html +++ b/ftd/t/js/25-re-re-export.html @@ -55,7 +55,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/27-for-loop.html b/ftd/t/js/27-for-loop.html index 00f93adb84..c1aa98add4 100644 --- a/ftd/t/js/27-for-loop.html +++ b/ftd/t/js/27-for-loop.html @@ -32,7 +32,7 @@ return fastn_dom.conditionalDom(parent, [ index ], function () { - return (fastn_utils.getter(index) >= 2); + return (fastn_utils.getStaticValue(index) >= 2); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([index, @@ -64,7 +64,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/29-dom-list.html b/ftd/t/js/29-dom-list.html index 70bc83cef1..a46cce2bab 100644 --- a/ftd/t/js/29-dom-list.html +++ b/ftd/t/js/29-dom-list.html @@ -185,7 +185,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/30-web-component.html b/ftd/t/js/30-web-component.html index 55584411eb..62b7b47d4f 100644 --- a/ftd/t/js/30-web-component.html +++ b/ftd/t/js/30-web-component.html @@ -153,7 +153,7 @@ rooti0.setProperty(fastn_dom.PropertyKind.MarginVertical, fastn_dom.Length.Px(40), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Wrap, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return true; } @@ -209,7 +209,7 @@ rooti0.setProperty(fastn_dom.PropertyKind.BorderRadius, fastn_dom.Length.Px(5), inherited); rooti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([__args__.mouse_in], function () { if (function () { - return fastn_utils.getter(__args__.mouse_in); + return fastn_utils.getStaticValue(__args__.mouse_in); }()) { return fastn_dom.BackgroundStyle.Solid(function () { let record = fastn.recordInstance({ @@ -236,7 +236,7 @@ fastn_dom.conditionalDom(root, [ __args__.show_link ], function () { - return fastn_utils.getter(__args__.show_link); + return fastn_utils.getStaticValue(__args__.show_link); }, function (root) { let rooti0 = foo__demo_link(root, inherited); return rooti0; @@ -324,7 +324,7 @@ let parenti0 = fastn_dom.createKernel(parent, fastn_dom.ElementKind.Column); parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return fastn_dom.Resizing.FillContainer; } else { @@ -348,7 +348,7 @@ ftd.device, inherited.get("types").get("heading_small")], function () { if (function () { - return (fastn_utils.getter(ftd.device) !== "mobile"); + return (fastn_utils.getStaticValue(ftd.device) !== "mobile"); }()) { return inherited.get("types").get("heading_medium"); } else { @@ -402,7 +402,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); parenti0.setProperty(fastn_dom.PropertyKind.Padding, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) !== "mobile"); + return (fastn_utils.getStaticValue(ftd.device) !== "mobile"); }()) { return fastn_dom.Length.Px(40); } else { @@ -421,7 +421,7 @@ rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn_dom.Resizing.FillContainer, inherited); rooti0.setProperty(fastn_dom.PropertyKind.Wrap, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return true; } @@ -432,7 +432,7 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Column); rooti0.setProperty(fastn_dom.PropertyKind.Width, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return fastn_dom.Resizing.FillContainer; } else { diff --git a/ftd/t/js/31-advance-list.html b/ftd/t/js/31-advance-list.html index 81aaebc963..8ed1e0ee54 100644 --- a/ftd/t/js/31-advance-list.html +++ b/ftd/t/js/31-advance-list.html @@ -215,7 +215,7 @@ __args__.ns.get("score"), ftd.empty ], function () { - return (fastn_utils.getter(__args__.ns.get("name")) !== fastn_utils.getter(ftd.empty) && fastn_utils.getter(__args__.ns.get("score")) !== fastn_utils.getter(ftd.empty)); + return (fastn_utils.getStaticValue(__args__.ns.get("name")) !== fastn_utils.getStaticValue(ftd.empty) && fastn_utils.getStaticValue(__args__.ns.get("score")) !== fastn_utils.getStaticValue(ftd.empty)); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Submit", inherited); @@ -271,7 +271,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + 1); + return (fastn_utils.getStaticValue(__args__.a) + 1); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/32-ftd-len.html b/ftd/t/js/32-ftd-len.html index 865c8a7cd8..81c9e0d184 100644 --- a/ftd/t/js/32-ftd-len.html +++ b/ftd/t/js/32-ftd-len.html @@ -76,7 +76,7 @@ rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.formula([index, index], function () { if (function () { - return (fastn_utils.getter(index) % 3 == 1); + return (fastn_utils.getStaticValue(index) % 3 == 1); }()) { return function () { let record = fastn.recordInstance({ @@ -86,7 +86,7 @@ return record; }(); } else if (function () { - return (fastn_utils.getter(index) % 3 == 2); + return (fastn_utils.getStaticValue(index) % 3 == 2); }()) { return function () { let record = fastn.recordInstance({ @@ -186,7 +186,7 @@ fastn_dom.conditionalDom(root, [ __args__.current_value ], function () { - return (fastn_utils.getter(__args__.current_value) !== null); + return (fastn_utils.getStaticValue(__args__.current_value) !== null); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.current_value, inherited); diff --git a/ftd/t/js/33-list-indexing.html b/ftd/t/js/33-list-indexing.html index 4f2da99a79..57a557dba4 100644 --- a/ftd/t/js/33-list-indexing.html +++ b/ftd/t/js/33-list-indexing.html @@ -56,7 +56,7 @@ fastn_dom.conditionalDom(parent, [ fastn_utils.getListItem(global.foo__names.get(2)) ], function () { - return (fastn_utils.getter(fastn_utils.getListItem(global.foo__names.get(2))) !== null); + return (fastn_utils.getStaticValue(fastn_utils.getListItem(global.foo__names.get(2))) !== null); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn_utils.getListItem(global.foo__names.get(2)), inherited); diff --git a/ftd/t/js/34-ftd-ui.html b/ftd/t/js/34-ftd-ui.html index 340036f6b1..59949566f7 100644 --- a/ftd/t/js/34-ftd-ui.html +++ b/ftd/t/js/34-ftd-ui.html @@ -75,7 +75,7 @@ index, __args__.is_active ], function () { - return (fastn_utils.getter(__args__.is_active) == fastn_utils.getter(index)); + return (fastn_utils.getStaticValue(__args__.is_active) == fastn_utils.getStaticValue(index)); }, function (root) { let rooti0 = foo__box(root, inherited, { uis: item.get("elements") diff --git a/ftd/t/js/37-expander.html b/ftd/t/js/37-expander.html index 73f8d1d998..944d01f5b6 100644 --- a/ftd/t/js/37-expander.html +++ b/ftd/t/js/37-expander.html @@ -125,7 +125,7 @@ fastn_dom.conditionalDom(root, [ __args__.open ], function () { - return (!fastn_utils.getter(__args__.open)); + return (!fastn_utils.getStaticValue(__args__.open)); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "O", inherited); @@ -136,7 +136,7 @@ fastn_dom.conditionalDom(root, [ __args__.open ], function () { - return fastn_utils.getter(__args__.open); + return fastn_utils.getStaticValue(__args__.open); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "X", inherited); @@ -149,7 +149,7 @@ fastn_dom.conditionalDom(root, [ __args__.open ], function () { - return fastn_utils.getter(__args__.open); + return fastn_utils.getStaticValue(__args__.open); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, __args__.body, inherited); diff --git a/ftd/t/js/42-links.html b/ftd/t/js/42-links.html index 7235d171e0..356633c9e4 100644 --- a/ftd/t/js/42-links.html +++ b/ftd/t/js/42-links.html @@ -32,7 +32,7 @@ fastn_dom.conditionalDom(parent, [ ftd.device ], function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello from mobile", inherited); @@ -49,7 +49,7 @@ fastn_dom.conditionalDom(parent, [ ftd.device ], function () { - return (fastn_utils.getter(ftd.device) == "desktop"); + return (fastn_utils.getStaticValue(ftd.device) == "desktop"); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello from desktop", inherited); diff --git a/ftd/t/js/44-module.html b/ftd/t/js/44-module.html index 51e344f98a..c02f3e680b 100644 --- a/ftd/t/js/44-module.html +++ b/ftd/t/js/44-module.html @@ -51,7 +51,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -130,7 +130,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " ++++ " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " ++++ " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/45-re-module.html b/ftd/t/js/45-re-module.html index 88f0928e97..29c7e590a8 100644 --- a/ftd/t/js/45-re-module.html +++ b/ftd/t/js/45-re-module.html @@ -59,7 +59,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -138,7 +138,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " ++++ " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " ++++ " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -151,7 +151,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " ****** " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " ****** " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/45-re-re-module.html b/ftd/t/js/45-re-re-module.html index 5a677ef96a..1eef51b347 100644 --- a/ftd/t/js/45-re-re-module.html +++ b/ftd/t/js/45-re-re-module.html @@ -49,7 +49,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/50-iframe-fullscreen.html b/ftd/t/js/50-iframe-fullscreen.html index 964788b160..4ea6de07c9 100644 --- a/ftd/t/js/50-iframe-fullscreen.html +++ b/ftd/t/js/50-iframe-fullscreen.html @@ -68,11 +68,11 @@ parenti0.setProperty(fastn_dom.PropertyKind.MinHeight, fastn.formula([ftd.device, ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "desktop"); + return (fastn_utils.getStaticValue(ftd.device) == "desktop"); }()) { return fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(400)); } else if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return fastn_dom.Resizing.Fixed(fastn_dom.Length.Px(200)); } diff --git a/ftd/t/js/51-markdown-table.html b/ftd/t/js/51-markdown-table.html index 043d38d1bb..ac5e6fb8b8 100644 --- a/ftd/t/js/51-markdown-table.html +++ b/ftd/t/js/51-markdown-table.html @@ -76,7 +76,7 @@ rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "This is a markdown table below:\n\n| Elements | Components |\n| :---------- | :--------- |\n| heading | `ds.h1` |\n| image | `ds.image` |\n| code-block | `ds.code` |\n| code-block | `ds.code` |", inherited); rooti0.setProperty(fastn_dom.PropertyKind.Color, fastn.formula([global.foo__flag], function () { if (function () { - return fastn_utils.getter(global.foo__flag); + return fastn_utils.getStaticValue(global.foo__flag); }()) { return function () { let record = fastn.recordInstance({ diff --git a/ftd/t/js/52-events.html b/ftd/t/js/52-events.html index 12808896a5..11c5b6b2a7 100644 --- a/ftd/t/js/52-events.html +++ b/ftd/t/js/52-events.html @@ -70,7 +70,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([__args__.idx, __args__.selected], function () { if (function () { - return (fastn_utils.getter(__args__.selected) == fastn_utils.getter(__args__.idx)); + return (fastn_utils.getStaticValue(__args__.selected) == fastn_utils.getStaticValue(__args__.idx)); }()) { return fastn_dom.BackgroundStyle.Solid(function () { let record = fastn.recordInstance({ @@ -95,7 +95,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getter(__args__.a) + 1) % fastn_utils.getter(__args__.n)); + let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getStaticValue(__args__.a) + 1) % fastn_utils.getStaticValue(__args__.n)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -114,7 +114,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getter(__args__.a) - 1) % fastn_utils.getter(__args__.n)); + let fastn_utils_val___args___a = fastn_utils.clone((fastn_utils.getStaticValue(__args__.a) - 1) % fastn_utils.getStaticValue(__args__.n)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/57-code-dark-mode.html b/ftd/t/js/57-code-dark-mode.html index 002f274cea..c0e0a61a09 100644 --- a/ftd/t/js/57-code-dark-mode.html +++ b/ftd/t/js/57-code-dark-mode.html @@ -44,7 +44,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.CodeLanguage, "ftd", inherited); parenti0.setProperty(fastn_dom.PropertyKind.CodeTheme, fastn.formula([ftd.dark_mode], function () { if (function () { - return fastn_utils.getter(ftd.dark_mode); + return fastn_utils.getStaticValue(ftd.dark_mode); }()) { return "fastn-theme.dark"; } else { diff --git a/ftd/t/js/60-conditional-module-headers.html b/ftd/t/js/60-conditional-module-headers.html index 83d4c912b3..be63beb0e0 100644 --- a/ftd/t/js/60-conditional-module-headers.html +++ b/ftd/t/js/60-conditional-module-headers.html @@ -36,7 +36,7 @@ title: fastn.formula([global.foo__title, global.foo__flag], function () { if (function () { - return (!fastn_utils.getter(global.foo__flag)); + return (!fastn_utils.getStaticValue(global.foo__flag)); }()) { return global.foo__title; } diff --git a/ftd/t/js/61-functions.html b/ftd/t/js/61-functions.html index 9abe049db0..bd25a81b5b 100644 --- a/ftd/t/js/61-functions.html +++ b/ftd/t/js/61-functions.html @@ -98,7 +98,7 @@ a: "Ritesh", b: "Rithik", }, args); - return (fastn_utils.getter(__args__.a) + " " + fastn_utils.getter(__args__.b)); + return (fastn_utils.getStaticValue(__args__.a) + " " + fastn_utils.getStaticValue(__args__.b)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/62-fallback-fonts.html b/ftd/t/js/62-fallback-fonts.html index 689cbe2e1f..2f06a6544e 100644 --- a/ftd/t/js/62-fallback-fonts.html +++ b/ftd/t/js/62-fallback-fonts.html @@ -46,7 +46,7 @@ global.foo__flag, global.foo__flag], function () { if (function () { - return (fastn_utils.getter(global.foo__flag) % 4 == 1); + return (fastn_utils.getStaticValue(global.foo__flag) % 4 == 1); }()) { return function () { let record = fastn.recordInstance({ @@ -56,7 +56,7 @@ return record; }(); } else if (function () { - return (fastn_utils.getter(global.foo__flag) % 4 == 2); + return (fastn_utils.getStaticValue(global.foo__flag) % 4 == 2); }()) { return function () { let record = fastn.recordInstance({ @@ -66,7 +66,7 @@ return record; }(); } else if (function () { - return (fastn_utils.getter(global.foo__flag) % 4 == 3); + return (fastn_utils.getStaticValue(global.foo__flag) % 4 == 3); }()) { return function () { let record = fastn.recordInstance({ diff --git a/ftd/t/js/66-backdrop-filter.html b/ftd/t/js/66-backdrop-filter.html index ba0bf79cda..9c7780db0f 100644 --- a/ftd/t/js/66-backdrop-filter.html +++ b/ftd/t/js/66-backdrop-filter.html @@ -55,15 +55,15 @@ global.foo__contrast_image, global.foo__set_multi_filters], function () { if (function () { - return fastn_utils.getter(global.foo__blur_image); + return fastn_utils.getStaticValue(global.foo__blur_image); }()) { return fastn_dom.BackdropFilter.Blur(fastn_dom.Length.Px(10)); } else if (function () { - return fastn_utils.getter(global.foo__contrast_image); + return fastn_utils.getStaticValue(global.foo__contrast_image); }()) { return fastn_dom.BackdropFilter.Contrast(fastn_dom.Length.Percent(30)); } else if (function () { - return fastn_utils.getter(global.foo__set_multi_filters); + return fastn_utils.getStaticValue(global.foo__set_multi_filters); }()) { return fastn_dom.BackdropFilter.Multi(global.foo__bdf); } diff --git a/ftd/t/js/67-counter.html b/ftd/t/js/67-counter.html index 1ddd46a313..f0c9c2a4a6 100644 --- a/ftd/t/js/67-counter.html +++ b/ftd/t/js/67-counter.html @@ -68,7 +68,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.BorderRadius, fastn_dom.Length.Px(5), inherited); parenti0.setProperty(fastn_dom.PropertyKind.Background, fastn.formula([__args__.count], function () { if (function () { - return (fastn_utils.getter(__args__.count) % 2 == 0); + return (fastn_utils.getStaticValue(__args__.count) % 2 == 0); }()) { return fastn_dom.BackgroundStyle.Solid(function () { let record = fastn.recordInstance({ diff --git a/ftd/t/js/69-chained-dot-value-in-functions.html b/ftd/t/js/69-chained-dot-value-in-functions.html index 4a25c34a6f..556713449f 100644 --- a/ftd/t/js/69-chained-dot-value-in-functions.html +++ b/ftd/t/js/69-chained-dot-value-in-functions.html @@ -61,7 +61,7 @@ let __args__ = fastn_utils.getArgs({ places: fastn.mutableList([]), }, args); - return ("This person named " + fastn_utils.getter(fastn_utils.getterByKey(__args__.person, "name")) + " has first visited " + fastn_utils.getter(fastn_utils.getterByKey(__args__.places, "0")) + " on " + fastn_utils.getter(__args__.date)); + return ("This person named " + fastn_utils.getStaticValue(fastn_utils.getterByKey(__args__.person, "name")) + " has first visited " + fastn_utils.getStaticValue(fastn_utils.getterByKey(__args__.places, "0")) + " on " + fastn_utils.getStaticValue(__args__.date)); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -93,7 +93,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return ("Person " + fastn_utils.getter(fastn_utils.getterByKey(__args__.p, "name")) + " lives at " + fastn_utils.getter(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.p, "meta"), "address")) + ". His contact number is " + fastn_utils.getter(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.p, "meta"), "phone_number"))); + return ("Person " + fastn_utils.getStaticValue(fastn_utils.getterByKey(__args__.p, "name")) + " lives at " + fastn_utils.getStaticValue(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.p, "meta"), "address")) + ". His contact number is " + fastn_utils.getStaticValue(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.p, "meta"), "phone_number"))); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -107,7 +107,7 @@ let __args__ = fastn_utils.getArgs({ people: fastn.mutableList([]), }, args); - return ("First Person is " + fastn_utils.getter(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "name")) + " lives at " + fastn_utils.getter(fastn_utils.getterByKey(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "meta"), "address")) + ". His contact number is " + fastn_utils.getter(fastn_utils.getterByKey(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "meta"), "phone_number"))); + return ("First Person is " + fastn_utils.getStaticValue(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "name")) + " lives at " + fastn_utils.getStaticValue(fastn_utils.getterByKey(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "meta"), "address")) + ". His contact number is " + fastn_utils.getStaticValue(fastn_utils.getterByKey(fastn_utils.getterByKey(fastn_utils.getterByKey(__args__.people, "0"), "meta"), "phone_number"))); } finally { __fastn_package_name__ = __fastn_super_package_name__; } diff --git a/ftd/t/js/72-document-breakpoint.html b/ftd/t/js/72-document-breakpoint.html index bb60db66a6..570d2235eb 100644 --- a/ftd/t/js/72-document-breakpoint.html +++ b/ftd/t/js/72-document-breakpoint.html @@ -40,7 +40,7 @@ let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([ftd.device], function () { if (function () { - return (fastn_utils.getter(ftd.device) == "mobile"); + return (fastn_utils.getStaticValue(ftd.device) == "mobile"); }()) { return "Mobile text"; } else { diff --git a/ftd/t/js/78-module-using-record.html b/ftd/t/js/78-module-using-record.html index 440be2a6dd..57cbbbed67 100644 --- a/ftd/t/js/78-module-using-record.html +++ b/ftd/t/js/78-module-using-record.html @@ -48,7 +48,7 @@ fastn_dom.conditionalDom(root, [ __args__.m.get("user").get("is_logged_in") ], function () { - return fastn_utils.getter(__args__.m.get("user").get("is_logged_in")); + return fastn_utils.getStaticValue(__args__.m.get("user").get("is_logged_in")); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "Hello", inherited); diff --git a/ftd/t/js/79-module-using-function.html b/ftd/t/js/79-module-using-function.html index 386739e08f..3be4631b1f 100644 --- a/ftd/t/js/79-module-using-function.html +++ b/ftd/t/js/79-module-using-function.html @@ -54,7 +54,7 @@ let __args__ = fastn_utils.getArgs({ u: global._78_data_for_module__user, }, args); - return fastn_utils.getter(fastn_utils.getterByKey(__args__.u, "is_logged_in")); + return fastn_utils.getStaticValue(fastn_utils.getterByKey(__args__.u, "is_logged_in")); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -67,7 +67,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - return (fastn_utils.getter(__args__.a) + 1); + return (fastn_utils.getStaticValue(__args__.a) + 1); } finally { __fastn_package_name__ = __fastn_super_package_name__; } @@ -80,7 +80,7 @@ try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/ftd/t/js/80-or-type-constant.html b/ftd/t/js/80-or-type-constant.html index e64860fa90..6a5b7b9a99 100644 --- a/ftd/t/js/80-or-type-constant.html +++ b/ftd/t/js/80-or-type-constant.html @@ -32,7 +32,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([global.foo__b, global.foo__small], function () { if (function () { - return (fastn_utils.getter(global.foo__b) == fastn_utils.getter(global.foo__small)); + return (fastn_utils.getStaticValue(global.foo__b) == fastn_utils.getStaticValue(global.foo__small)); }()) { return "Smol"; } else { @@ -44,7 +44,7 @@ global.foo__b, global.foo__button_type.get("medium") ], function () { - return (fastn_utils.getter(global.foo__b) !== fastn_utils.getter(global.foo__button_type.get("medium"))); + return (fastn_utils.getStaticValue(global.foo__b) !== fastn_utils.getStaticValue(global.foo__button_type.get("medium"))); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, "not medium", inherited); @@ -81,7 +81,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([__args__.bt, global.foo__small], function () { if (function () { - return (fastn_utils.getter(__args__.bt) == fastn_utils.getter(global.foo__small)); + return (fastn_utils.getStaticValue(__args__.bt) == fastn_utils.getStaticValue(global.foo__small)); }()) { return "Smol"; } else { diff --git a/ftd/t/js/81-or-type-test.html b/ftd/t/js/81-or-type-test.html index 9f2ae93c31..20a463e81f 100644 --- a/ftd/t/js/81-or-type-test.html +++ b/ftd/t/js/81-or-type-test.html @@ -57,7 +57,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([__args__.bt, global._80_or_type_constant__button_type.get("small")], function () { if (function () { - return (fastn_utils.getter(__args__.bt) == fastn_utils.getter(global._80_or_type_constant__button_type.get("small"))); + return (fastn_utils.getStaticValue(__args__.bt) == fastn_utils.getStaticValue(global._80_or_type_constant__button_type.get("small"))); }()) { return "Smol"; } else { diff --git a/ftd/t/js/82-or-type-module.html b/ftd/t/js/82-or-type-module.html index 21be40512a..f497963355 100644 --- a/ftd/t/js/82-or-type-module.html +++ b/ftd/t/js/82-or-type-module.html @@ -57,7 +57,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([__args__.bt, global._80_or_type_constant__small], function () { if (function () { - return (fastn_utils.getter(__args__.bt) == fastn_utils.getter(global._80_or_type_constant__small)); + return (fastn_utils.getStaticValue(__args__.bt) == fastn_utils.getStaticValue(global._80_or_type_constant__small)); }()) { return "Smol"; } else { diff --git a/ftd/t/js/86-import-or-type.html b/ftd/t/js/86-import-or-type.html index 0103b821ec..8f76418c27 100644 --- a/ftd/t/js/86-import-or-type.html +++ b/ftd/t/js/86-import-or-type.html @@ -60,7 +60,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([__args__.bt, global._80_or_type_constant__small], function () { if (function () { - return (fastn_utils.getter(__args__.bt) == fastn_utils.getter(global._80_or_type_constant__small)); + return (fastn_utils.getStaticValue(__args__.bt) == fastn_utils.getStaticValue(global._80_or_type_constant__small)); }()) { return "Smol"; } else { diff --git a/ftd/t/js/87-or-type-module-export.html b/ftd/t/js/87-or-type-module-export.html index 177fb4e6fa..9862c800ab 100644 --- a/ftd/t/js/87-or-type-module-export.html +++ b/ftd/t/js/87-or-type-module-export.html @@ -58,7 +58,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, fastn.formula([__args__.bt, global._80_or_type_constant__small], function () { if (function () { - return (fastn_utils.getter(__args__.bt) == fastn_utils.getter(global._80_or_type_constant__small)); + return (fastn_utils.getStaticValue(__args__.bt) == fastn_utils.getStaticValue(global._80_or_type_constant__small)); }()) { return "Smol"; } else { diff --git a/ftd/t/js/88-body-children.html b/ftd/t/js/88-body-children.html index 31d58e1691..a04780d156 100644 --- a/ftd/t/js/88-body-children.html +++ b/ftd/t/js/88-body-children.html @@ -34,7 +34,7 @@ fastn_dom.conditionalDom(root, [ global.foo__name ], function () { - return (fastn_utils.getter(global.foo__name) !== null); + return (fastn_utils.getStaticValue(global.foo__name) !== null); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Text); rooti0.setProperty(fastn_dom.PropertyKind.StringValue, global.foo__name, inherited); @@ -45,7 +45,7 @@ fastn_dom.conditionalDom(root, [ global.foo__name ], function () { - return (fastn_utils.getter(global.foo__name) !== null); + return (fastn_utils.getStaticValue(global.foo__name) !== null); }, function (root) { let rooti0 = fastn_dom.createKernel(root, fastn_dom.ElementKind.Code); rooti0.setProperty(fastn_dom.PropertyKind.Code, global.foo__name, inherited); diff --git a/ftd/t/js/88-module-reference-wrap-in-variant.html b/ftd/t/js/88-module-reference-wrap-in-variant.html index c1ba3f1dee..1ce0926f3c 100644 --- a/ftd/t/js/88-module-reference-wrap-in-variant.html +++ b/ftd/t/js/88-module-reference-wrap-in-variant.html @@ -86,11 +86,11 @@ __args__.type, global._80_or_type_constant__button_type.get("medium")], function () { if (function () { - return (fastn_utils.getter(__args__.type) == fastn_utils.getter(global._80_or_type_constant__button_type.get("small"))); + return (fastn_utils.getStaticValue(__args__.type) == fastn_utils.getStaticValue(global._80_or_type_constant__button_type.get("small"))); }()) { return fastn_dom.Length.Px(4); } else if (function () { - return (fastn_utils.getter(__args__.type) == fastn_utils.getter(global._80_or_type_constant__button_type.get("medium"))); + return (fastn_utils.getStaticValue(__args__.type) == fastn_utils.getStaticValue(global._80_or_type_constant__button_type.get("medium"))); }()) { return fastn_dom.Length.Px(8); } else { diff --git a/ftd/t/js/91-component-event.html b/ftd/t/js/91-component-event.html index fc8947c52f..2b3486a18b 100644 --- a/ftd/t/js/91-component-event.html +++ b/ftd/t/js/91-component-event.html @@ -50,7 +50,7 @@ parenti0.setProperty(fastn_dom.PropertyKind.StringValue, "Bar says hello", inherited); parenti0.setProperty(fastn_dom.PropertyKind.Color, fastn.formula([global.foo__flag], function () { if (function () { - return fastn_utils.getter(global.foo__flag); + return fastn_utils.getStaticValue(global.foo__flag); }()) { return function () { let record = fastn.recordInstance({ From 9c1a8c24742ee4a6deb01c5f4a03db6a1c17e897 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 13:00:56 +0530 Subject: [PATCH 12/30] fbt fixes --- ...FF4358BB4894EDDB170763E6A336AB864A42C60E877882D.js} | 10 +++++----- fastn-core/tests/08-static-assets/output/index.html | 2 +- ...304680196ED85255BEA2940931035B15D9EDD5B9BDE91B1.js} | 10 +++++----- fastn-core/tests/09-markdown-pages/output/index.html | 2 +- ...A535E0686A42517ABF4550F58AABE48A65F62F86F5B3192.js} | 10 +++++----- .../tests/17-sitemap/output/guide/install/index.html | 2 +- fastn-core/tests/17-sitemap/output/index.html | 2 +- fastn-core/tests/17-sitemap/output/install/index.html | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) rename fastn-core/tests/08-static-assets/output/{default-5E21A031D2CF33E1919FCF492427499F359280E06962E738FB92D984578FD54B.js => default-E84355011BD711F32FF4358BB4894EDDB170763E6A336AB864A42C60E877882D.js} (99%) rename fastn-core/tests/09-markdown-pages/output/{default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js => default-57979FCF16FD0C7FF304680196ED85255BEA2940931035B15D9EDD5B9BDE91B1.js} (99%) rename fastn-core/tests/17-sitemap/output/{default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js => default-3FDB48C0513F88622A535E0686A42517ABF4550F58AABE48A65F62F86F5B3192.js} (99%) diff --git a/fastn-core/tests/08-static-assets/output/default-5E21A031D2CF33E1919FCF492427499F359280E06962E738FB92D984578FD54B.js b/fastn-core/tests/08-static-assets/output/default-E84355011BD711F32FF4358BB4894EDDB170763E6A336AB864A42C60E877882D.js similarity index 99% rename from fastn-core/tests/08-static-assets/output/default-5E21A031D2CF33E1919FCF492427499F359280E06962E738FB92D984578FD54B.js rename to fastn-core/tests/08-static-assets/output/default-E84355011BD711F32FF4358BB4894EDDB170763E6A336AB864A42C60E877882D.js index f5e0ad615d..64421883af 100644 --- a/fastn-core/tests/08-static-assets/output/default-5E21A031D2CF33E1919FCF492427499F359280E06962E738FB92D984578FD54B.js +++ b/fastn-core/tests/08-static-assets/output/default-E84355011BD711F32FF4358BB4894EDDB170763E6A336AB864A42C60E877882D.js @@ -5336,7 +5336,7 @@ ftd.toggle = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getter(__args__.a)); + let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getStaticValue(__args__.a)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5353,7 +5353,7 @@ ftd.increment = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5370,7 +5370,7 @@ ftd.increment_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5387,7 +5387,7 @@ ftd.decrement = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5404,7 +5404,7 @@ ftd.decrement_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/fastn-core/tests/08-static-assets/output/index.html b/fastn-core/tests/08-static-assets/output/index.html index f5946ebb6e..5dbb54770f 100644 --- a/fastn-core/tests/08-static-assets/output/index.html +++ b/fastn-core/tests/08-static-assets/output/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js b/fastn-core/tests/09-markdown-pages/output/default-57979FCF16FD0C7FF304680196ED85255BEA2940931035B15D9EDD5B9BDE91B1.js similarity index 99% rename from fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js rename to fastn-core/tests/09-markdown-pages/output/default-57979FCF16FD0C7FF304680196ED85255BEA2940931035B15D9EDD5B9BDE91B1.js index 634917f291..4acb58c875 100644 --- a/fastn-core/tests/09-markdown-pages/output/default-463D0D0B4CA5D4DB59FDEEBB4A5041A15A9307500272BF806D0F556F2D10F92B.js +++ b/fastn-core/tests/09-markdown-pages/output/default-57979FCF16FD0C7FF304680196ED85255BEA2940931035B15D9EDD5B9BDE91B1.js @@ -5336,7 +5336,7 @@ ftd.toggle = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getter(__args__.a)); + let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getStaticValue(__args__.a)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5353,7 +5353,7 @@ ftd.increment = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5370,7 +5370,7 @@ ftd.increment_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5387,7 +5387,7 @@ ftd.decrement = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5404,7 +5404,7 @@ ftd.decrement_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/fastn-core/tests/09-markdown-pages/output/index.html b/fastn-core/tests/09-markdown-pages/output/index.html index f78a48c773..a5c8c97bc7 100644 --- a/fastn-core/tests/09-markdown-pages/output/index.html +++ b/fastn-core/tests/09-markdown-pages/output/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js b/fastn-core/tests/17-sitemap/output/default-3FDB48C0513F88622A535E0686A42517ABF4550F58AABE48A65F62F86F5B3192.js similarity index 99% rename from fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js rename to fastn-core/tests/17-sitemap/output/default-3FDB48C0513F88622A535E0686A42517ABF4550F58AABE48A65F62F86F5B3192.js index e393af90e1..ac228ce987 100644 --- a/fastn-core/tests/17-sitemap/output/default-60A4B489A7BCE2ADAD2C6A0608B39AA1CCCB0E63F909DAE282502527856B8922.js +++ b/fastn-core/tests/17-sitemap/output/default-3FDB48C0513F88622A535E0686A42517ABF4550F58AABE48A65F62F86F5B3192.js @@ -5336,7 +5336,7 @@ ftd.toggle = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getter(__args__.a)); + let fastn_utils_val___args___a = fastn_utils.clone(!fastn_utils.getStaticValue(__args__.a)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5353,7 +5353,7 @@ ftd.increment = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5370,7 +5370,7 @@ ftd.increment_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) + fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) + fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5387,7 +5387,7 @@ ftd.decrement = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - 1); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - 1); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } @@ -5404,7 +5404,7 @@ ftd.decrement_by = function (args) { try { let __args__ = fastn_utils.getArgs({ }, args); - let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getter(__args__.a) - fastn_utils.getter(__args__.v)); + let fastn_utils_val___args___a = fastn_utils.clone(fastn_utils.getStaticValue(__args__.a) - fastn_utils.getStaticValue(__args__.v)); if (fastn_utils_val___args___a instanceof fastn.mutableClass) { fastn_utils_val___args___a = fastn_utils_val___args___a.get(); } diff --git a/fastn-core/tests/17-sitemap/output/guide/install/index.html b/fastn-core/tests/17-sitemap/output/guide/install/index.html index ff1463860c..d939bd615e 100644 --- a/fastn-core/tests/17-sitemap/output/guide/install/index.html +++ b/fastn-core/tests/17-sitemap/output/guide/install/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/index.html b/fastn-core/tests/17-sitemap/output/index.html index 72ce8a3f0e..e5cb016928 100644 --- a/fastn-core/tests/17-sitemap/output/index.html +++ b/fastn-core/tests/17-sitemap/output/index.html @@ -14,7 +14,7 @@ - + diff --git a/fastn-core/tests/17-sitemap/output/install/index.html b/fastn-core/tests/17-sitemap/output/install/index.html index ff1463860c..d939bd615e 100644 --- a/fastn-core/tests/17-sitemap/output/install/index.html +++ b/fastn-core/tests/17-sitemap/output/install/index.html @@ -14,7 +14,7 @@ - + From cce1235c093a713b662900d23f90692b0b9f7599 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Thu, 25 Jan 2024 13:00:04 +0530 Subject: [PATCH 13/30] Fix: record self reference data cloning --- ftd/src/js/resolver.rs | 24 ++++++++++++++++-------- ftd/src/js/value.rs | 7 +++---- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ftd/src/js/resolver.rs b/ftd/src/js/resolver.rs index 782f291082..ec96610e8a 100644 --- a/ftd/src/js/resolver.rs +++ b/ftd/src/js/resolver.rs @@ -32,14 +32,6 @@ impl<'a> ResolverData<'a> { rdata } - pub(crate) fn new_with_record_definition_name( - record_definition_name: &'a Option, - ) -> ResolverData<'a> { - let mut rdata = ResolverData::none(); - rdata.record_definition_name = record_definition_name; - rdata - } - pub(crate) fn clone_with_default_inherited_variable(&self) -> ResolverData<'a> { ResolverData { component_definition_name: self.component_definition_name, @@ -118,4 +110,20 @@ impl<'a> ResolverData<'a> { doc_name: Some(doc_name), } } + + pub(crate) fn clone_with_new_record_definition_name( + &self, + record_definition_name: &'a Option, + ) -> ResolverData<'a> { + ResolverData { + component_definition_name: self.component_definition_name, + record_definition_name, + component_name: self.component_name.clone(), + loop_alias: self.loop_alias, + loop_counter_alias: self.loop_counter_alias, + inherited_variable_name: self.inherited_variable_name, + device: self.device, + doc_name: self.doc_name.clone(), + } + } } diff --git a/ftd/src/js/value.rs b/ftd/src/js/value.rs index ef06a94a9a..8ead68a819 100644 --- a/ftd/src/js/value.rs +++ b/ftd/src/js/value.rs @@ -442,9 +442,8 @@ impl ftd::interpreter::Value { field.name.to_string(), value.to_fastn_js_value_with_ui( doc, - &ftd::js::ResolverData::new_with_record_definition_name(&Some( - name.to_string(), - )), + &rdata + .clone_with_new_record_definition_name(&Some(name.to_string())), has_rive_components, false, ), @@ -457,7 +456,7 @@ impl ftd::interpreter::Value { .unwrap() .to_set_property_value_with_ui( doc, - &ftd::js::ResolverData::new_with_record_definition_name(&Some( + &rdata.clone_with_new_record_definition_name(&Some( name.to_string(), )), has_rive_components, From 614f123684764d855db61809254a3f2a26ff0f47 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 13:47:56 +0530 Subject: [PATCH 14/30] added tests --- ftd/t/js/93-reference-data.ftd | 77 ++++++++++++ ftd/t/js/93-reference-data.html | 207 ++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) create mode 100644 ftd/t/js/93-reference-data.ftd create mode 100644 ftd/t/js/93-reference-data.html diff --git a/ftd/t/js/93-reference-data.ftd b/ftd/t/js/93-reference-data.ftd new file mode 100644 index 0000000000..4b185337f1 --- /dev/null +++ b/ftd/t/js/93-reference-data.ftd @@ -0,0 +1,77 @@ +-- record company: +caption name: +ftd.color brand-color: + +-- record person: +caption name: +integer age: +company company-details: + +-- ftd.color ft-brand-color: +dark: rgb(239, 132, 53) +light: rgb(239, 132, 53) + +-- company fifthtry: FifthTry +brand-color: $ft-brand-color + +-- person list people: + +-- person: Harsh +age: 21 +company-details: $fifthtry + +-- person: Harshit +age: 20 +company-details: $fifthtry + +-- end: people + + + +-- display-people: $people +full-details: true + +-- component display-people: +caption person list people: +boolean full-details: + +-- ftd.container: + +-- display-person: $p.name +age: $p.age +company: $p.company-details +brand-color: $p.company-details.brand-color.light +if: { display-people.full-details } +for: $p in $display-people.people + +-- display-person: $p.name +age: $p.age +company: $p.company-details +brand-color: $p.company-details.brand-color.dark +if: { !display-people.full-details } +for: $p in $display-people.people + +-- end: ftd.container + +-- end: display-people + + + +-- component display-person: +caption name: +integer age: +company company: +ftd.color brand-color: + +-- ftd.row: +spacing.fixed.rem: 1 + +-- ftd.text: $display-person.name + +-- ftd.integer: $display-person.age + +-- ftd.text: $display-person.company.name + +-- end: ftd.row + +-- end: display-person diff --git a/ftd/t/js/93-reference-data.html b/ftd/t/js/93-reference-data.html new file mode 100644 index 0000000000..e5fba82de1 --- /dev/null +++ b/ftd/t/js/93-reference-data.html @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + +
Harsh
21
FifthTry
Harshit
20
FifthTry
+ + From 5fe44f15b0c522c2a734efe02d9d604a1bc24335 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 14:00:33 +0530 Subject: [PATCH 15/30] bumped version -> 0.4.49 --- Cargo.lock | 2 +- fastn/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f44df15edc..b047d7abeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "fastn" -version = "0.4.48" +version = "0.4.49" dependencies = [ "clap", "colored", diff --git a/fastn/Cargo.toml b/fastn/Cargo.toml index fcacc20a12..c762e189d5 100644 --- a/fastn/Cargo.toml +++ b/fastn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastn" -version = "0.4.48" +version = "0.4.49" authors.workspace = true edition.workspace = true license.workspace = true From 5cb8ef1c291962bc6d68d486fa6f388e927202d9 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 14:14:15 +0530 Subject: [PATCH 16/30] fixed tests --- ftd/t/js/93-reference-data.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ftd/t/js/93-reference-data.html b/ftd/t/js/93-reference-data.html index e5fba82de1..f456741b45 100644 --- a/ftd/t/js/93-reference-data.html +++ b/ftd/t/js/93-reference-data.html @@ -85,7 +85,7 @@ return fastn_dom.conditionalDom(root, [ __args__.full_details ], function () { - return fastn_utils.getter(__args__.full_details); + return fastn_utils.getStaticValue(__args__.full_details); }, function (root) { let rooti0 = foo__display_person(root, inherited, { name: item.get("name"), @@ -108,7 +108,7 @@ return fastn_dom.conditionalDom(root, [ __args__.full_details ], function () { - return (!fastn_utils.getter(__args__.full_details)); + return (!fastn_utils.getStaticValue(__args__.full_details)); }, function (root) { let rooti0 = foo__display_person(root, inherited, { name: item.get("name"), From 2bdfcba6cd4223aaf0e55006a8a30069c9384472 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 10:46:31 +0530 Subject: [PATCH 17/30] offline build/serve flag --- fastn-update/src/lib.rs | 53 ++++++++++++++++++++++++++--------------- fastn/src/main.rs | 11 +++++---- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/fastn-update/src/lib.rs b/fastn-update/src/lib.rs index 9a5d3e5f3a..15a8c249cd 100644 --- a/fastn-update/src/lib.rs +++ b/fastn-update/src/lib.rs @@ -32,6 +32,10 @@ pub enum ArchiveError { package: String, source: std::io::Error, }, + #[snafu(display( + "Failed to read the archive entry path for the entry '{name}' in the package '{package}'" + ))] + ArchiveEntryPathError { package: String, name: String }, #[snafu(display("Failed to unpack archive for package '{package}'"))] ArchiveEntryRead { package: String, @@ -91,6 +95,7 @@ async fn update_dependencies( packages_root: &fastn_ds::Path, current_package: &fastn_core::Package, pb: &indicatif::ProgressBar, + offline: bool, ) -> Result<(), UpdateError> { let mut stack = vec![current_package.clone()]; let mut resolved = std::collections::HashSet::new(); @@ -116,6 +121,8 @@ async fn update_dependencies( // 2. The checksums of the downloaded package manifest and the existing manifest do not match let should_download_archive = if !ds.exists(dependency_path).await { true + } else if offline { + false } else { let existing_manifest_bytes = ds.read_content(&manifest_path) @@ -192,23 +199,25 @@ async fn download_and_unpack_zip( std::io::Read::read_to_end(&mut entry, &mut buffer).context(ReadArchiveSnafu { package: package_name, })?; - if let Some(path) = entry.enclosed_name() { - let path = path.to_str().unwrap(); - let path_without_prefix = match path.split_once(std::path::MAIN_SEPARATOR) { - Some((_, path)) => path, - None => path, - }; - if manifest.files.get(path_without_prefix).is_none() { - continue; - } - let output_path = &dependency_path.join(path_without_prefix); - ds.write_content(output_path, buffer) - .await - .context(WriteArchiveContentSnafu { - package: package_name, - })?; - pb.tick(); + let path = entry.enclosed_name().context(ArchiveEntryPathSnafu { + package: package_name, + name: entry.name(), + })?; + let path = path.to_str().unwrap(); + let path_without_prefix = match path.split_once(std::path::MAIN_SEPARATOR) { + Some((_, path)) => path, + None => path, + }; + if manifest.files.get(path_without_prefix).is_none() { + continue; } + let output_path = &dependency_path.join(path_without_prefix); + ds.write_content(output_path, buffer) + .await + .context(WriteArchiveContentSnafu { + package: package_name, + })?; + pb.tick(); } } @@ -244,7 +253,7 @@ async fn get_manifest( } #[tracing::instrument(skip_all)] -pub async fn update(config: &fastn_core::Config) -> fastn_core::Result<()> { +pub async fn update(config: &fastn_core::Config, offline: bool) -> fastn_core::Result<()> { if config.package.dependencies.is_empty() { println!("No dependencies to update."); return Ok(()); @@ -260,8 +269,14 @@ pub async fn update(config: &fastn_core::Config) -> fastn_core::Result<()> { pb.set_style(spinner_style); pb.set_prefix("Updating dependencies"); - if let Err(e) = - update_dependencies(&config.ds, &config.packages_root, current_package, &pb).await + if let Err(e) = update_dependencies( + &config.ds, + &config.packages_root, + current_package, + &pb, + offline, + ) + .await { return Err(fastn_core::Error::UpdateError { message: e.to_string(), diff --git a/fastn/src/main.rs b/fastn/src/main.rs index 47961b93c3..b76d86b722 100644 --- a/fastn/src/main.rs +++ b/fastn/src/main.rs @@ -62,6 +62,8 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let mut config = fastn_core::Config::read_current(true).await?; + let offline = matches.get_flag("offline"); + if let Some(serve) = matches.subcommand_matches("serve") { let port = serve.value_of_("port").map(|p| match p.parse::() { Ok(v) => v, @@ -79,7 +81,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let external_css = serve.values_of_("external-css"); let inline_css = serve.values_of_("css"); - fastn_update::update(&config).await?; + fastn_update::update(&config, offline).await?; return fastn_core::listen( bind.as_str(), @@ -95,7 +97,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( } if matches.subcommand_matches("update").is_some() { - return fastn_update::update(&config).await; + return fastn_update::update(&config, offline).await; } if let Some(test) = matches.subcommand_matches("test") { @@ -113,7 +115,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( .add_inline_css(inline_css) .set_test_command_running(); - fastn_update::update(&config).await?; + fastn_update::update(&config, offline).await?; return fastn_core::test( &config, @@ -145,7 +147,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( .add_external_css(external_css) .add_inline_css(inline_css); - fastn_update::update(&config).await?; + fastn_update::update(&config, offline).await?; return fastn_core::build( &config, @@ -238,6 +240,7 @@ fn app(version: &'static str) -> clap::Command { .arg(clap::arg!(verbose: -v "Sets the level of verbosity")) .arg(clap::arg!(--test "Runs the command in test mode").hide(true)) .arg(clap::arg!(--trace "Activate tracing").hide(true)) + .arg(clap::arg!(--offline "Disables automatic package update checks to operate in offline mode")) .subcommand( // Initial subcommand format // fastn create-package [project-path] From a5063fbf44cc9df402289442c858e5e3907450b3 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 12:58:00 +0530 Subject: [PATCH 18/30] minor fixes --- fastn-update/src/lib.rs | 19 ++++++++++++++++--- fastn/src/main.rs | 13 ++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/fastn-update/src/lib.rs b/fastn-update/src/lib.rs index 15a8c249cd..f929e34b33 100644 --- a/fastn-update/src/lib.rs +++ b/fastn-update/src/lib.rs @@ -106,10 +106,25 @@ async fn update_dependencies( if resolved.contains(&dependency.package.name) { continue; } + let dep_package = &dependency.package; let package_name = dep_package.name.clone(); let dependency_path = &packages_root.join(&package_name); + if offline { + if package_name.eq(&fastn_core::FASTN_UI_INTERFACE) { + resolved.insert(package_name.to_string()); + continue; + } + + let dep_package = + resolve_dependency_package(ds, &dependency, dependency_path).await?; + resolved.insert(package_name.to_string()); + pb.inc_length(1); + stack.push(dep_package); + continue; + } + pb.set_message(format!("Resolving {}/manifest.json", &package_name)); let (manifest, manifest_bytes) = get_manifest(&package_name).await?; @@ -121,8 +136,6 @@ async fn update_dependencies( // 2. The checksums of the downloaded package manifest and the existing manifest do not match let should_download_archive = if !ds.exists(dependency_path).await { true - } else if offline { - false } else { let existing_manifest_bytes = ds.read_content(&manifest_path) @@ -160,7 +173,7 @@ async fn update_dependencies( })? } - if dependency.package.name.eq(&fastn_core::FASTN_UI_INTERFACE) { + if package_name.eq(&fastn_core::FASTN_UI_INTERFACE) { resolved.insert(package_name.to_string()); continue; } diff --git a/fastn/src/main.rs b/fastn/src/main.rs index b76d86b722..e17d776290 100644 --- a/fastn/src/main.rs +++ b/fastn/src/main.rs @@ -62,8 +62,6 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let mut config = fastn_core::Config::read_current(true).await?; - let offline = matches.get_flag("offline"); - if let Some(serve) = matches.subcommand_matches("serve") { let port = serve.value_of_("port").map(|p| match p.parse::() { Ok(v) => v, @@ -80,6 +78,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let inline_js = serve.values_of_("js"); let external_css = serve.values_of_("external-css"); let inline_css = serve.values_of_("css"); + let offline = serve.get_flag("offline"); fastn_update::update(&config, offline).await?; @@ -97,7 +96,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( } if matches.subcommand_matches("update").is_some() { - return fastn_update::update(&config, offline).await; + return fastn_update::update(&config, false).await; } if let Some(test) = matches.subcommand_matches("test") { @@ -106,6 +105,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let inline_js = test.values_of_("js"); let external_css = test.values_of_("external-css"); let inline_css = test.values_of_("css"); + let offline: bool = test.get_flag("offline"); config = config .add_edition(edition)? @@ -139,6 +139,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<( let external_css = build.values_of_("external-css"); let inline_css = build.values_of_("css"); let zip_url = build.value_of_("zip-url"); + let offline: bool = build.get_flag("offline"); config = config .add_edition(edition)? @@ -240,7 +241,6 @@ fn app(version: &'static str) -> clap::Command { .arg(clap::arg!(verbose: -v "Sets the level of verbosity")) .arg(clap::arg!(--test "Runs the command in test mode").hide(true)) .arg(clap::arg!(--trace "Activate tracing").hide(true)) - .arg(clap::arg!(--offline "Disables automatic package update checks to operate in offline mode")) .subcommand( // Initial subcommand format // fastn create-package [project-path] @@ -269,6 +269,7 @@ fn app(version: &'static str) -> clap::Command { .arg(clap::arg!(--"css" "CSS text added in ftd files") .action(clap::ArgAction::Append)) .arg(clap::arg!(--edition "The FTD edition")) + .arg(clap::arg!(--offline "Disables automatic package update checks to operate in offline mode")) ) .subcommand( clap::Command::new("fmt") @@ -293,6 +294,7 @@ fn app(version: &'static str) -> clap::Command { .arg(clap::arg!(--edition "The FTD edition")) .arg(clap::arg!(--"script" "Generates a script file (for debugging purposes)")) .arg(clap::arg!(--"verbose" "To provide more better logs (for debugging purposes)")) + .arg(clap::arg!(--offline "Disables automatic package update checks to operate in offline mode")) ) .subcommand( clap::Command::new("query") @@ -332,7 +334,8 @@ mod sub_command { .action(clap::ArgAction::Append)) .arg(clap::arg!(--"css" "CSS text added in ftd files") .action(clap::ArgAction::Append)) - .arg(clap::arg!(--"download-base-url" "If running without files locally, download needed files from here")); + .arg(clap::arg!(--"download-base-url" "If running without files locally, download needed files from here")) + .arg(clap::arg!(--offline "Disables automatic package update checks to operate in offline mode")); if cfg!(feature = "remote") { serve } else { From f6aeced8856c1c1dfbe4a45befeba3b723d55408 Mon Sep 17 00:00:00 2001 From: heulitig Date: Thu, 25 Jan 2024 15:41:42 +0530 Subject: [PATCH 19/30] reverting upload-artifact@v4 to v3 in release workflow --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 720d27fc15..c1c1f74ea4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: docker cp fastn-build:/home/rust/src/target/x86_64-unknown-linux-musl/release/fastn out/ - name: run fastn run: out/fastn --version - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: linux_musl_x86_64 path: out/fastn @@ -63,7 +63,7 @@ jobs: args: --release - name: run fastn run: ./target/release/fastn.exe --version - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: windows_x64_latest path: target/release/fastn.exe @@ -80,7 +80,7 @@ jobs: with: arguments: /V3 /DCURRENT_WD=${{ github.workspace }} /DVERSION=${{ github.event.inputs.releaseTag }} additional-plugin-paths: ${{ github.workspace }}/NSIS_Plugins/Plugins - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: windows_x64_installer.exe path: windows_x64_installer.exe @@ -108,7 +108,7 @@ jobs: args: --release --features=auth - name: run fastn run: ./target/release/fastn --version - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: macos_x64_latest path: | From af925fcc47932946e1e5555b3953b5a895e45e63 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 16:52:38 +0530 Subject: [PATCH 20/30] fix: static files not being copied in incremental build --- fastn-core/src/commands/build.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/fastn-core/src/commands/build.rs b/fastn-core/src/commands/build.rs index 0e426dc8d8..4dc77b54f3 100644 --- a/fastn-core/src/commands/build.rs +++ b/fastn-core/src/commands/build.rs @@ -305,14 +305,29 @@ async fn incremental_build( let mut processed: Vec = vec![]; if cache_hit { - let mut unresolved_dependencies: Vec = documents - .iter() - .filter(|(_, f)| f.is_ftd()) - .map(|(_, f)| remove_extension(f.get_id())) - .collect_vec(); + let mut unresolved_dependencies = vec![]; let mut resolved_dependencies: Vec = vec![]; let mut resolving_dependencies: Vec = vec![]; + for file in documents.values() { + // copy static files + if file.is_static() { + handle_file( + file, + config, + base_url, + ignore_failed, + test, + true, + Some(&mut c), + ) + .await?; + continue; + } + + unresolved_dependencies.push(remove_extension(file.get_id())); + } + while let Some(unresolved_dependency) = unresolved_dependencies.pop() { // println!("Current UR: {}", unresolved_dependency.as_str()); if let Some(doc) = c.documents.get(unresolved_dependency.as_str()) { From bd24dcd0721495662d473328270fdede63d5347b Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 18:06:46 +0530 Subject: [PATCH 21/30] bump version -> 0.4.50 --- Cargo.lock | 2 +- fastn/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b047d7abeb..11cde6d9dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "fastn" -version = "0.4.49" +version = "0.4.50" dependencies = [ "clap", "colored", diff --git a/fastn/Cargo.toml b/fastn/Cargo.toml index c762e189d5..03eeaddfab 100644 --- a/fastn/Cargo.toml +++ b/fastn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastn" -version = "0.4.49" +version = "0.4.50" authors.workspace = true edition.workspace = true license.workspace = true From 008568db5f9c6b86f1c40d0779901a071f00e59a Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 25 Jan 2024 18:19:09 +0530 Subject: [PATCH 22/30] Added tests --- ftd/t/js/92-self-reference-record.ftd | 4 ++++ ftd/t/js/92-self-reference-record.html | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ftd/t/js/92-self-reference-record.ftd b/ftd/t/js/92-self-reference-record.ftd index 6995512ddd..e9a1a11696 100644 --- a/ftd/t/js/92-self-reference-record.ftd +++ b/ftd/t/js/92-self-reference-record.ftd @@ -45,3 +45,7 @@ color: red -- end: ftd.column -- end: display-name + + +-- ftd.text: Now the full name is Arpita Jaiswal +if: { arpita.full-name == "Arpita" } diff --git a/ftd/t/js/92-self-reference-record.html b/ftd/t/js/92-self-reference-record.html index 77a40ecc4c..e02e86a290 100644 --- a/ftd/t/js/92-self-reference-record.html +++ b/ftd/t/js/92-self-reference-record.html @@ -18,7 +18,7 @@ -
Arpita
Arpita
Arpita
Arpita
FifthTry
FifthTry
fastn
fastn framework
John
John Doe