slint-ui 1.6.0-nightly.2024060319 → 1.7.0-nightly.2024060413

package/Cargo.toml

@@ -12,7 +12,7 @@ keywords = ["gui", "toolkit", "graphics", "design", "ui"]
 license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0"
 repository = "https://github.com/slint-ui/slint"
 rust-version = "1.73"
-version = "1.6.0"
+version = "1.7.0"
 categories = ["gui", "development-tools"]
 build = "build.rs"
 
@@ -40,11 +40,11 @@ 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 = "2d849d3df1c5c32e14c06ae699fcee45dcf276a7", version = "=1.6.0", default-features = false }
-i-slint-core = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "2d849d3df1c5c32e14c06ae699fcee45dcf276a7", version = "=1.6.0", default-features = false }
-i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "2d849d3df1c5c32e14c06ae699fcee45dcf276a7", version = "=1.6.0", default-features = false }
-slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "2d849d3df1c5c32e14c06ae699fcee45dcf276a7", version = "=1.6.0"}
-spin_on = "0.1"
+i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "e0c0e8d09c1577c9a231216eb462cffd3d16c199", version = "=1.7.0", default-features = false }
+i-slint-core = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "e0c0e8d09c1577c9a231216eb462cffd3d16c199", version = "=1.7.0", default-features = false }
+i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "e0c0e8d09c1577c9a231216eb462cffd3d16c199", version = "=1.7.0", default-features = false }
+slint-interpreter = { default-features = false , features = ["display-diagnostics", "internal", "compat-1-2"] , git = "https://github.com/slint-ui/slint", rev = "e0c0e8d09c1577c9a231216eb462cffd3d16c199", version = "=1.7.0"}
+spin_on = { version = "0.1" }
 css-color-parser2 = { version = "1.0.1" }
 itertools = { version = "0.12" }
 send_wrapper = { version = "0.6.0" }

package/binaries.json

@@ -1,6 +1,6 @@
 {
   "name": "@slint-ui/slint-ui-binary",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "binaryName": "slint-ui",
   "package": "@slint-ui/slint-ui-binary",
   "napi": {

package/index.js

@@ -517,6 +517,22 @@ function loadSlint(loadData) {
                     });
                 }
             });
+            instance.definition().functions.forEach((cb) => {
+                let functionName = cb.replace(/-/g, "_");
+                if (componentHandle[functionName] !== undefined) {
+                    console.warn("Duplicated function name " + functionName);
+                }
+                else {
+                    Object.defineProperty(componentHandle, cb.replace(/-/g, "_"), {
+                        get() {
+                            return function () {
+                                return instance.invoke(cb, Array.from(arguments));
+                            };
+                        },
+                        enumerable: true,
+                    });
+                }
+            });
             // globals
             instance.definition().globals.forEach((globalName) => {
                 if (componentHandle[globalName] !== undefined) {
@@ -560,6 +576,22 @@ function loadSlint(loadData) {
                             });
                         }
                     });
+                    instance.definition().globalFunctions(globalName).forEach((cb) => {
+                        let functionName = cb.replace(/-/g, "_");
+                        if (globalObject[functionName] !== undefined) {
+                            console.warn("Duplicated function name " + cb + " on global " + global);
+                        }
+                        else {
+                            Object.defineProperty(globalObject, cb.replace(/-/g, "_"), {
+                                get() {
+                                    return function () {
+                                        return instance.invokeGlobal(globalName, cb, Array.from(arguments));
+                                    };
+                                },
+                                enumerable: true,
+                            });
+                        }
+                    });
                     Object.defineProperty(componentHandle, globalName, {
                         get() {
                             return globalObject;

package/index.ts

@@ -350,7 +350,7 @@ export class ArrayModel<T> extends Model<T> {
 
     /**
      * Removes the last element from the array and returns it.
-     * 
+     *
      * @returns The removed element or undefined if the array is empty.
      */
     pop(): T | undefined {
@@ -780,6 +780,23 @@ function loadSlint(loadData: LoadData): Object {
                 }
             });
 
+            instance!.definition().functions.forEach((cb) => {
+                let functionName = cb.replace(/-/g, "_");
+
+                if (componentHandle[functionName] !== undefined) {
+                    console.warn("Duplicated function name " + functionName);
+                } else {
+                    Object.defineProperty(componentHandle, cb.replace(/-/g, "_"), {
+                        get() {
+                            return function () {
+                                return instance!.invoke(cb, Array.from(arguments));
+                            };
+                        },
+                        enumerable: true,
+                    });
+                }
+            });
+
             // globals
             instance!.definition().globals.forEach((globalName) => {
                 if (componentHandle[globalName] !== undefined) {
@@ -825,6 +842,23 @@ function loadSlint(loadData: LoadData): Object {
                         }
                     });
 
+                    instance!.definition().globalFunctions(globalName).forEach((cb) => {
+                        let functionName = cb.replace(/-/g, "_");
+
+                        if (globalObject[functionName] !== undefined) {
+                            console.warn("Duplicated function name " + cb + " on global " + global);
+                        } else {
+                            Object.defineProperty(globalObject, cb.replace(/-/g, "_"), {
+                                get() {
+                                    return function () {
+                                        return instance!.invokeGlobal(globalName, cb, Array.from(arguments));
+                                    };
+                                },
+                                enumerable: true,
+                            });
+                        }
+                    });
+
                     Object.defineProperty(componentHandle, globalName, {
                         get() {
                             return globalObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slint-ui",
-  "version": "1.6.0-nightly.2024060319",
+  "version": "1.7.0-nightly.2024060413",
   "main": "index.js",
   "types": "index.d.ts",
   "homepage": "https://github.com/slint-ui/slint",
@@ -59,10 +59,10 @@
     "@napi-rs/cli": "^2.16.5"
   },
   "optionalDependencies": {
-    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.6.0-nightly.2024060319",
-    "@slint-ui/slint-ui-binary-darwin-x64": "1.6.0-nightly.2024060319",
-    "@slint-ui/slint-ui-binary-darwin-arm64": "1.6.0-nightly.2024060319",
-    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.6.0-nightly.2024060319",
-    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.6.0-nightly.2024060319"
+    "@slint-ui/slint-ui-binary-linux-x64-gnu": "1.7.0-nightly.2024060413",
+    "@slint-ui/slint-ui-binary-darwin-x64": "1.7.0-nightly.2024060413",
+    "@slint-ui/slint-ui-binary-darwin-arm64": "1.7.0-nightly.2024060413",
+    "@slint-ui/slint-ui-binary-win32-x64-msvc": "1.7.0-nightly.2024060413",
+    "@slint-ui/slint-ui-binary-win32-ia32-msvc": "1.7.0-nightly.2024060413"
   }
 }

package/rust-module.d.ts

@@ -112,9 +112,11 @@ export class ComponentDefinition {
   constructor()
   get properties(): Array<JsProperty>
   get callbacks(): Array<string>
+  get functions(): Array<string>
   get globals(): Array<string>
   globalProperties(globalName: string): Array<JsProperty> | null
   globalCallbacks(globalName: string): Array<string> | null
+  globalFunctions(globalName: string): Array<string> | null
   create(): JsComponentInstance
   get name(): string
 }

package/src/interpreter/component_definition.rs

@@ -1,6 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
+use i_slint_compiler::langtype::Type;
 use napi::Result;
 use slint_interpreter::ComponentDefinition;
 
@@ -39,6 +40,15 @@ impl JsComponentDefinition {
         self.internal.callbacks().collect()
     }
 
+    #[napi(getter)]
+    pub fn functions(&self) -> Vec<String> {
+        self.internal
+            .properties_and_callbacks()
+            .filter(|(_, ty)| matches!(ty, Type::Function { .. }))
+            .map(|(s, _)| s)
+            .collect()
+    }
+
     #[napi(getter)]
     pub fn globals(&self) -> Vec<String> {
         self.internal.globals().collect()
@@ -57,6 +67,13 @@ impl JsComponentDefinition {
         self.internal.global_callbacks(global_name.as_str()).map(|iter| iter.collect())
     }
 
+    #[napi]
+    pub fn global_functions(&self, global_name: String) -> Option<Vec<String>> {
+        self.internal.global_properties_and_callbacks(global_name.as_str()).map(|iter| {
+            iter.filter(|(_, ty)| matches!(ty, Type::Function { .. })).map(|(s, _)| s).collect()
+        })
+    }
+
     #[napi]
     pub fn create(&self) -> Result<JsComponentInstance> {
         Ok(self.internal.create().map_err(|e| napi::Error::from_reason(e.to_string()))?.into())

package/src/interpreter/component_instance.rs

@@ -239,29 +239,32 @@ impl JsComponentInstance {
                 )
             })?;
 
-        let args = if let Type::Callback { args, .. } = ty {
-            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 {
+        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
+            }
+            _ => {
                 return Err(napi::Error::from_reason(
-                    format!(
-                        "{} expect {} arguments, but {} where provided",
-                        callback_name,
-                        count,
-                        args.len()
-                    )
-                    .as_str(),
+                    format!("{} is not a callback or a function", callback_name).as_str(),
                 ));
             }
-            args
-        } else {
-            return Err(napi::Error::from_reason(
-                format!("{} is not a callback", callback_name).as_str(),
-            ));
         };
 
         let result = self
@@ -296,29 +299,36 @@ impl JsComponentInstance {
                 )
             })?;
 
-        let args = if let Type::Callback { args, .. } = ty {
-            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 {
+        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
+            }
+            _ => {
                 return Err(napi::Error::from_reason(
                     format!(
-                        "{} expect {} arguments, but {} where provided",
-                        callback_name,
-                        count,
-                        args.len()
+                        "{} is not a callback or a function on global {}",
+                        callback_name, global_name
                     )
                     .as_str(),
                 ));
             }
-            args
-        } else {
-            return Err(napi::Error::from_reason(
-                format!("{} is not a callback on global {}", callback_name, global_name).as_str(),
-            ));
         };
 
         let result = self