slint-ui 1.9.0-nightly.2024101621 → 1.9.0-nightly.2024101718

package/Cargo.toml

@@ -41,14 +41,15 @@ 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 = "0d2892004d94837b3d609eb31c1abca105867d98", version = "=1.9.0", default-features = false }
-i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "0d2892004d94837b3d609eb31c1abca105867d98", version = "=1.9.0", default-features = false }
-i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "0d2892004d94837b3d609eb31c1abca105867d98", 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 = "0d2892004d94837b3d609eb31c1abca105867d98", version = "=1.9.0"}
+i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "617dc19f8ebc9302d5d17ce3c0e6e27278bcbbb3", version = "=1.9.0", default-features = false }
+i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "617dc19f8ebc9302d5d17ce3c0e6e27278bcbbb3", version = "=1.9.0", default-features = false }
+i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "617dc19f8ebc9302d5d17ce3c0e6e27278bcbbb3", 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 = "617dc19f8ebc9302d5d17ce3c0e6e27278bcbbb3", version = "=1.9.0"}
 spin_on = { version = "0.1" }
 css-color-parser2 = { version = "1.0.1" }
 itertools = { version = "0.13" }
 send_wrapper = { version = "0.6.0" }
+smol_str = { version = "0.3.1" }
 
 [build-dependencies]
 napi-build = "2.1.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slint-ui",
-  "version": "1.9.0-nightly.2024101621",
+  "version": "1.9.0-nightly.2024101718",
   "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.2024101621",
-    "@slint-ui/slint-ui-binary-darwin-x64": "1.9.0-nightly.2024101621",
-    "@slint-ui/slint-ui-binary-darwin-arm64": "1.9.0-nightly.2024101621",
-    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.9.0-nightly.2024101621",
-    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.9.0-nightly.2024101621"
+    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.9.0-nightly.2024101718",
+    "@slint-ui/slint-ui-binary-darwin-x64": "1.9.0-nightly.2024101718",
+    "@slint-ui/slint-ui-binary-darwin-arm64": "1.9.0-nightly.2024101718",
+    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.9.0-nightly.2024101718",
+    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.9.0-nightly.2024101718"
   }
 }

package/rust/interpreter/component_compiler.rs

@@ -14,6 +14,7 @@ use napi::JsString;
 use napi::JsUnknown;
 use slint_interpreter::Compiler;
 use slint_interpreter::Value;
+use smol_str::StrExt;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
@@ -147,14 +148,14 @@ impl JsComponentCompiler {
                     let mut o = env.create_object().ok()?;
 
                     for value in en.values.iter() {
-                        let value = value.replace('-', "_");
+                        let value = value.replace_smolstr("-", "_");
                         o.set_property(
                             env.create_string(&value).ok()?,
                             env.create_string(&value).ok()?.into_unknown(),
                         )
                         .ok()?;
                     }
-                    return Some((en.name.clone(), o.into_unknown()));
+                    return Some((en.name.to_string(), o.into_unknown()));
                 }
                 _ => return None,
             }

package/rust/interpreter/value.rs

@@ -13,6 +13,7 @@ use napi::bindgen_prelude::*;
 use napi::{Env, JsBoolean, JsNumber, JsObject, JsString, JsUnknown, Result};
 use napi_derive::napi;
 use slint_interpreter::Value;
+use smol_str::SmolStr;
 
 #[napi(js_name = "ValueType")]
 pub enum JsValueType {
@@ -229,7 +230,7 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
                         } else {
                             to_value(env, prop, pro_ty)?
                         };
-                        Ok((pro_name.clone(), prop_value))
+                        Ok((pro_name.to_string(), prop_value))
                     })
                     .collect::<Result<_, _>>()?,
             ))
@@ -260,7 +261,7 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
         }
         Type::Enumeration(e) => {
             let js_string: JsString = unknown.try_into()?;
-            let value: String = js_string.into_utf8()?.as_str()?.into();
+            let value: SmolStr = js_string.into_utf8()?.as_str()?.into();
 
             if !e.values.contains(&value) {
                 return Err(napi::Error::from_reason(format!(
@@ -269,7 +270,7 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
                 )));
             }
 
-            Ok(Value::EnumerationValue(e.name.clone(), value))
+            Ok(Value::EnumerationValue(e.name.to_string(), value.to_string()))
         }
         Type::Invalid
         | Type::Model