slint-ui 1.9.0-nightly.2024102609 → 1.9.0-nightly.2024102921

package/Cargo.toml

@@ -41,10 +41,10 @@ accessibility = ["slint-interpreter/accessibility"]
 [dependencies]
 napi = { version = "2.14.0", default-features = false, features = ["napi8"] }
 napi-derive = "2.14.0"
-i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "e01a121165c24e96dbf37644f9c6cfc319582f18", version = "=1.9.0", default-features = false }
-i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "e01a121165c24e96dbf37644f9c6cfc319582f18", version = "=1.9.0", default-features = false }
-i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "e01a121165c24e96dbf37644f9c6cfc319582f18", version = "=1.9.0", default-features = false }
-slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "e01a121165c24e96dbf37644f9c6cfc319582f18", version = "=1.9.0"}
+i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "d00655b05962adae3559778c05c7e2e81aa4e9f7", version = "=1.9.0", default-features = false }
+i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "d00655b05962adae3559778c05c7e2e81aa4e9f7", version = "=1.9.0", default-features = false }
+i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "d00655b05962adae3559778c05c7e2e81aa4e9f7", version = "=1.9.0", default-features = false }
+slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "d00655b05962adae3559778c05c7e2e81aa4e9f7", version = "=1.9.0"}
 spin_on = { version = "0.1" }
 css-color-parser2 = { version = "1.0.1" }
 itertools = { version = "0.13" }

package/LICENSES/LicenseRef-Slint-Software-3.0.md

@@ -1,6 +1,6 @@
 # Slint Software License
 
-Version 3.0
+Version 3.0.1
 
 ## Preamble
 
@@ -24,18 +24,12 @@ Desktop Application, Mobile Application, and Web Application are hereafter refer
 
 The grant of rights in section 1 are conditional, provided that You do all of the following:
 
-(a) You have purchased an appropriate **Pricing Plan** (*Startup & Individual* / *Small Enterprise* / *Enterprise*) and the required amount of seats to cover all individual users of the Software associated with the designing, developing, or testing your Application or Embedded System. For clarity, each individual user is counted as one seat.
+(a) You have purchased an appropriate **Paid License Plan** ([see Annex 1](#annex-1-paid-license-plans)) and the required amount of seats to cover all individual users of the Software associated with the designing, developing, or testing your Application or Embedded System. For clarity, each individual user is counted as one seat.
 
 (b) In the case that You are distributing the Software as as part of an Embedded System, You have purchased an appropriate quantity of **Royalties**, one Royalty for each Embedded System.
 
 (c) You have fully paid all applicable fees (**Fees**) pursuant to Section 6.
 
-*Startup & Individual Plan* is limited to individuals as well as individual companies with a staff headcount of less than 10 with either turnover or balance sheet of 2MEUR or less.
-
-*Small Enterprise Plan* is limited to individual companies with a staff headcount of less than 50 with either turnover or balance sheet of 10MEUR or less.
-
-*Enterprise Plan* is available to all individuals and individual companies.
-
 ## 3. Limitations
 
 The License does not permit to distribute or make the Software publicly available alone and without integration into an Application or into an Embedded System. For this purpose you may use the Software under the GNU General Public License, version 3.
@@ -87,3 +81,41 @@ In the event that any provision of this License will, for any reason, be determi
 ## 10. Governing Law
 
 This Agreement shall be construed, interpreted, and governed by the laws of the Federal Republic of Germany.
+
+## Annex 1: Paid License Plans
+
+### Enterprise Plan
+
+The following is included as part of the plan
+
+(a) No restriction on the number of applications that are developed with Slint.
+
+(b) Live Preview.
+
+(c) Standard Support that includes addressing technical queries, troubleshooting, and rectifying bugs or errors (faults) present in the latest official stable release.
+
+(d) Perpetual Fallback License that allows continued use of a specific Slint version, including all bugfix updates (i.e., all Z releases within the X.Y.Z version), without an active subscription. This license applies only to those versions of Slint for which at least 12 consecutive months of subscription have been paid.
+
+(e) GUI Test Framework.
+
+### Small Enterprise Plan
+
+This plan is limited to individual companies with a staff headcount between 10 and 50 and either a turnover or balance sheet total of 10 million EUR or less.
+
+The following is included as part of the plan
+
+(a) No restriction on the number of applications that are developed with Slint.
+
+(b) Live Preview.
+
+(c) Standard Support that includes addressing technical queries, troubleshooting, and rectifying bugs or errors (faults) present in the latest official stable release.
+
+### Startup & Individual Plan
+
+This plan is limited to individuals and individual companies with a staff headcount of less than 10 and either a turnover or balance sheet total of 2 million EUR or less.
+
+The following is included as part of the plan
+
+(a) No restriction on the number of applications that are developed with Slint.
+
+(b) Live Preview.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slint-ui",
-  "version": "1.9.0-nightly.2024102609",
+  "version": "1.9.0-nightly.2024102921",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/slint-ui/slint",
@@ -67,10 +67,10 @@
     "@napi-rs/cli": "2.16.5"
   },
   "optionalDependencies": {
-    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.9.0-nightly.2024102609",
-    "@slint-ui/slint-ui-binary-darwin-x64": "1.9.0-nightly.2024102609",
-    "@slint-ui/slint-ui-binary-darwin-arm64": "1.9.0-nightly.2024102609",
-    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.9.0-nightly.2024102609",
-    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.9.0-nightly.2024102609"
+    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.9.0-nightly.2024102921",
+    "@slint-ui/slint-ui-binary-darwin-x64": "1.9.0-nightly.2024102921",
+    "@slint-ui/slint-ui-binary-darwin-arm64": "1.9.0-nightly.2024102921",
+    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.9.0-nightly.2024102921",
+    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.9.0-nightly.2024102921"
   }
 }

package/rust/interpreter/component_compiler.rs

@@ -114,10 +114,11 @@ impl JsComponentCompiler {
     pub fn structs(&self, env: Env) -> HashMap<String, JsUnknown> {
         fn convert_type(env: &Env, ty: &Type) -> Option<(String, JsUnknown)> {
             match ty {
-                Type::Struct { fields, name: Some(name), node: Some(_), .. } => {
+                Type::Struct(s) if s.name.is_some() && s.node.is_some() => {
+                    let name = s.name.as_ref().unwrap();
                     let struct_instance = to_js_unknown(
                         env,
-                        &Value::Struct(slint_interpreter::Struct::from_iter(fields.iter().map(
+                        &Value::Struct(slint_interpreter::Struct::from_iter(s.fields.iter().map(
                             |(name, field_type)| {
                                 (
                                     name.to_string(),

package/rust/interpreter/component_instance.rs

@@ -133,10 +133,10 @@ impl JsComponentInstance {
                 ))
             })?;
 
-        if let Type::Callback { return_type, .. } = ty {
+        if let Type::Callback(callback) = ty {
             self.inner
                 .set_callback(callback_name.as_str(), {
-                    let return_type = return_type.clone();
+                    let return_type = callback.return_type.clone();
                     let callback_name = callback_name.clone();
 
                     move |args| {
@@ -160,18 +160,13 @@ impl JsComponentInstance {
                             }
                         };
 
-                        if let Some(return_type) = &return_type {
-                            if let Ok(value) = super::to_value(&env, result, return_type) {
-                                return value;
-                            } else {
-                                eprintln!(
-                                    "Node.js: cannot convert return type of callback {}",
-                                    callback_name
-                                );
-                                return slint_interpreter::default_value_for_type(return_type);
-                            }
-                        } else {
+                        if matches!(return_type, Type::Void) {
                             Value::Void
+                        } else if let Ok(value) = super::to_value(&env, result, &return_type) {
+                            return value;
+                        } else {
+                            eprintln!("Node.js: cannot convert return type of callback {callback_name}");
+                            return slint_interpreter::default_value_for_type(&return_type);
                         }
                     }
                 })
@@ -206,10 +201,10 @@ impl JsComponentInstance {
                 ))
             })?;
 
-        if let Type::Callback { return_type, .. } = ty {
+        if let Type::Callback(callback) = ty {
             self.inner
                 .set_global_callback(global_name.as_str(), callback_name.as_str(), {
-                    let return_type = return_type.clone();
+                    let return_type = callback.return_type.clone();
                     let global_name = global_name.clone();
                     let callback_name = callback_name.clone();
 
@@ -237,18 +232,13 @@ impl JsComponentInstance {
                             }
                         };
 
-                        if let Some(return_type) = &return_type {
-                            if let Ok(value) = super::to_value(&env, result, return_type) {
-                                return value;
-                            } else {
-                                eprintln!(
-                                    "Node.js: cannot convert return type of callback {}",
-                                    callback_name
-                                );
-                                return slint_interpreter::default_value_for_type(return_type);
-                            }
-                        } else {
+                        if matches!(return_type, Type::Void) {
                             Value::Void
+                        } else if let Ok(value) = super::to_value(&env, result, &return_type) {
+                            return value;
+                        } else {
+                            eprintln!("Node.js: cannot convert return type of callback {callback_name}");
+                            return slint_interpreter::default_value_for_type(&return_type);
                         }
                     }
                 })
@@ -260,6 +250,32 @@ impl JsComponentInstance {
         Err(napi::Error::from_reason(format!("{} is not a callback", callback_name).as_str()))
     }
 
+    fn invoke_args(
+        env: Env,
+        callback_name: &String,
+        arguments: Vec<JsUnknown>,
+        args: &Vec<Type>,
+    ) -> Result<Vec<Value>> {
+        let count = args.len();
+        let args = arguments
+            .into_iter()
+            .zip(args.into_iter())
+            .map(|(a, ty)| super::value::to_value(&env, a, &ty))
+            .collect::<Result<Vec<_>, _>>()?;
+        if args.len() != count {
+            return Err(napi::Error::from_reason(
+                format!(
+                    "{} expect {} arguments, but {} where provided",
+                    callback_name,
+                    count,
+                    args.len()
+                )
+                .as_str(),
+            ));
+        }
+        Ok(args)
+    }
+
     #[napi]
     pub fn invoke(
         &self,
@@ -280,25 +296,8 @@ impl JsComponentInstance {
             })?;
 
         let args = match ty {
-            Type::Callback { args, .. } | Type::Function { args, .. } => {
-                let count = args.len();
-                let args = arguments
-                    .into_iter()
-                    .zip(args.into_iter())
-                    .map(|(a, ty)| super::value::to_value(&env, a, &ty))
-                    .collect::<Result<Vec<_>, _>>()?;
-                if args.len() != count {
-                    return Err(napi::Error::from_reason(
-                        format!(
-                            "{} expect {} arguments, but {} where provided",
-                            callback_name,
-                            count,
-                            args.len()
-                        )
-                        .as_str(),
-                    ));
-                }
-                args
+            Type::Callback(function) | Type::Function(function) => {
+                Self::invoke_args(env, &callback_name, arguments, &function.args)?
             }
             _ => {
                 return Err(napi::Error::from_reason(
@@ -340,25 +339,8 @@ impl JsComponentInstance {
             })?;
 
         let args = match ty {
-            Type::Callback { args, .. } | Type::Function { args, .. } => {
-                let count = args.len();
-                let args = arguments
-                    .into_iter()
-                    .zip(args.into_iter())
-                    .map(|(a, ty)| super::value::to_value(&env, a, &ty))
-                    .collect::<Result<Vec<_>, _>>()?;
-                if args.len() != count {
-                    return Err(napi::Error::from_reason(
-                        format!(
-                            "{} expect {} arguments, but {} where provided",
-                            callback_name,
-                            count,
-                            args.len()
-                        )
-                        .as_str(),
-                    ));
-                }
-                args
+            Type::Callback(function) | Type::Function(function) => {
+                Self::invoke_args(env, &callback_name, arguments, &function.args)?
             }
             _ => {
                 return Err(napi::Error::from_reason(

package/rust/interpreter/value.rs

@@ -216,11 +216,11 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
                 Ok(Value::Image(Image::from_rgba8(pixel_buffer)))
             }
         }
-        Type::Struct { fields, name: _, node: _, rust_attributes: _ } => {
+        Type::Struct(s) => {
             let js_object = unknown.coerce_to_object()?;
 
             Ok(Value::Struct(
-                fields
+                s.fields
                     .iter()
                     .map(|(pro_name, pro_ty)| {
                         let prop: JsUnknown = js_object