diff --git a/readme.md b/readme.md index 6c55134..3c1b03f 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ object templates can define several options for each property: - `transforms`: uses this property as an input of a new object - `subobjects`: creates a parent-child relationship between this and at least one more object, based on the properties sharing a value and their transformations - `conditions`: values other properties need to hold for this property to be valid -- `duplicates`: makes the property act as an array +- `array`: makes the property act as an array for more information, see the wiki! diff --git a/server/src/modules/meta/bool.rs b/server/src/modules/meta/bool.rs index 0448bc3..cdddc68 100644 --- a/server/src/modules/meta/bool.rs +++ b/server/src/modules/meta/bool.rs @@ -5,7 +5,7 @@ pub const TEMPLATE: &str = r#" transforms = [] subobjects = [] conditions = [] -duplicates = false +array = false "#; pub fn validate(obj: &ObjectInstance) -> Result<(), String> { diff --git a/server/src/modules/meta/connection.rs b/server/src/modules/meta/connection.rs index e7119e0..13036db 100644 --- a/server/src/modules/meta/connection.rs +++ b/server/src/modules/meta/connection.rs @@ -8,19 +8,19 @@ conditions = [ ["input.variant", "subobject"] ["input.variant", "custom"] ] -duplicates = false +array = false [input.from] transforms = ["meta/text:value"] subobjects = [] conditions = [] -duplicates = true +array = true [input.to] transforms = ["meta/text:value"] subobjects = [] conditions = [] -duplicates = true +array = true [input.property] transforms = ["meta/text:value"] @@ -29,7 +29,7 @@ conditions = [ ["input.variant", "transform"] ["input.variant", "subobject"] ] -duplicates = false +array = false [input.value] transforms = ["meta/text:value"] @@ -37,5 +37,5 @@ subobjects = [] conditions = [ ["input.variant", "custom"] ] -duplicates = false +array = false "#; diff --git a/server/src/modules/meta/dummy.rs b/server/src/modules/meta/dummy.rs index 5a3f8a2..6b0e707 100644 --- a/server/src/modules/meta/dummy.rs +++ b/server/src/modules/meta/dummy.rs @@ -3,5 +3,5 @@ pub const TEMPLATE: &str = r#" transforms = ["meta/text:value"] subobjects = [] conditions = [] -duplicates = false +array = false "#; diff --git a/server/src/modules/meta/number.rs b/server/src/modules/meta/number.rs index 93e5c1b..aebe6ac 100644 --- a/server/src/modules/meta/number.rs +++ b/server/src/modules/meta/number.rs @@ -8,13 +8,13 @@ pub const TEMPLATE: &str = r#" transforms = [] subobjects = [] conditions = [] -duplicates = false +array = false [local.length] transforms = ["meta/number:value"] subobjects = [] conditions = [] -duplicates = false +array = false "#; pub const TEMPLATE_LOCAL: &str = r#" diff --git a/server/src/modules/meta/text.rs b/server/src/modules/meta/text.rs index 84c73b4..38d9d7d 100644 --- a/server/src/modules/meta/text.rs +++ b/server/src/modules/meta/text.rs @@ -8,13 +8,13 @@ pub const TEMPLATE: &str = r#" transforms = [] subobjects = [] conditions = [] -duplicates = false +array = false [local.length] transforms = ["meta/number:value"] subobjects = [] conditions = [] -duplicates = false +array = false "#; diff --git a/server/src/types.rs b/server/src/types.rs index 89179ba..f54a115 100644 --- a/server/src/types.rs +++ b/server/src/types.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; #[derive(Serialize, Deserialize, Debug, Default, Clone)] pub struct ObjectInstance { - pub variant: usize, + pub version: usize, pub plotted: bool, pub created: String, pub edited: String, @@ -42,7 +42,7 @@ pub struct ObjectTemplateProperty { pub transforms: Vec, pub subobjects: Vec, pub conditions: Vec<[String; 2]>, - pub duplicates: bool + pub array: bool } #[derive(Deserialize, Debug, Default)]