slint-ui 1.9.0-nightly.2024101112 → 1.9.0-nightly.2024101520

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 = "f8f1d468a0aba1b11e7f9fb71739e46a178d4415", version = "=1.9.0", default-features = false }
-i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "f8f1d468a0aba1b11e7f9fb71739e46a178d4415", version = "=1.9.0", default-features = false }
-i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "f8f1d468a0aba1b11e7f9fb71739e46a178d4415", 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 = "f8f1d468a0aba1b11e7f9fb71739e46a178d4415", version = "=1.9.0"}
+i-slint-compiler = { features = ["default"] , git = "https://github.com/slint-ui/slint", rev = "11128809fb744a93af668082edb0790ef7421d86", version = "=1.9.0", default-features = false }
+i-slint-core = { features = ["default", "gettext-rs"] , git = "https://github.com/slint-ui/slint", rev = "11128809fb744a93af668082edb0790ef7421d86", version = "=1.9.0", default-features = false }
+i-slint-backend-selector = { git = "https://github.com/slint-ui/slint", rev = "11128809fb744a93af668082edb0790ef7421d86", 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 = "11128809fb744a93af668082edb0790ef7421d86", version = "=1.9.0"}
 spin_on = { version = "0.1" }
 css-color-parser2 = { version = "1.0.1" }
 itertools = { version = "0.13" }

package/dist/index.d.ts

@@ -170,6 +170,10 @@ export interface LoadFileOptions {
      * Sets library paths used for looking up `@library` imports to the specified map of library names to paths.
      */
     libraryPaths?: Record<string, string>;
+    /**
+     * @hidden
+     */
+    fileLoader?: (path: string) => string;
 }
 /**
  * Loads the specified Slint file and returns an object containing functions to construct the exported

package/dist/index.js

@@ -88,6 +88,9 @@ function loadSlint(loadData) {
         if (typeof options.libraryPaths !== "undefined") {
             compiler.libraryPaths = options.libraryPaths;
         }
+        if (typeof options.fileLoader !== "undefined") {
+            compiler.fileLoader = options.fileLoader;
+        }
     }
     const definitions = loadData.from === "file"
         ? compiler.buildFromPath(filePath)

package/package.json

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

package/rust/interpreter/component_compiler.rs

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 use crate::to_js_unknown;
+use crate::RefCountedReference;
 
 use super::JsComponentDefinition;
 use super::JsDiagnostic;
 use i_slint_compiler::langtype::Type;
 use itertools::Itertools;
 use napi::Env;
+use napi::JsFunction;
+use napi::JsString;
 use napi::JsUnknown;
 use slint_interpreter::Compiler;
 use slint_interpreter::Value;
@@ -164,6 +167,64 @@ impl JsComponentCompiler {
             .collect::<HashMap<String, JsUnknown>>()
     }
 
+    #[napi(setter)]
+    pub fn set_file_loader(&mut self, env: Env, callback: JsFunction) -> napi::Result<()> {
+        let function_ref = std::rc::Rc::new(RefCountedReference::new(&env, callback)?);
+
+        self.internal.set_file_loader(move |path| {
+            let path = PathBuf::from(path);
+            let function_ref = function_ref.clone();
+            Box::pin({
+                async move {
+                    let Ok(callback) = function_ref.get::<JsFunction>() else {
+                        return Some(Err(std::io::Error::other(
+                            "Node.js: cannot access file loader callback.",
+                        )));
+                    };
+
+                    let Ok(path) = env.create_string(path.display().to_string().as_str()) else {
+                        return Some(Err(std::io::Error::other(
+                            "Node.js: wrong argunemt for callback file_loader.",
+                        )));
+                    };
+
+                    let result = match callback.call(None, &[path]) {
+                        Ok(result) => result,
+                        Err(err) => {
+                            return Some(Err(std::io::Error::other(err.to_string())));
+                        }
+                    };
+
+                    let js_string: napi::Result<JsString> = result.try_into();
+
+                    let Ok(js_string) = js_string else {
+                        return Some(Err(std::io::Error::other(
+                        "Node.js: cannot read return value of file loader callback as js string.",
+                    )));
+                    };
+
+                    let Ok(utf8_string) = js_string.into_utf8() else {
+                        return Some(Err(std::io::Error::other(
+                        "Node.js: cannot convert return value of file loader callback into utf8.",
+                    )));
+                    };
+
+                    if let Ok(str) = utf8_string.as_str() {
+                        let string = str.to_string();
+
+                        return Some(Ok(string));
+                    };
+
+                    Some(Err(std::io::Error::other(
+                        "Node.js: cannot convert return value of file loader callback into string.",
+                    )))
+                }
+            })
+        });
+
+        Ok(())
+    }
+
     /// Compile a .slint file into a ComponentDefinition
     ///
     /// Returns the compiled `ComponentDefinition` if there were no errors.

package/rust-module.d.ts

@@ -101,6 +101,7 @@ export class ComponentCompiler {
   get diagnostics(): Array<Diagnostic>
   get structs(): Record<string, unknown>
   get enums(): Record<string, unknown>
+  set fileLoader(callback: (...args: any[]) => any)
   /**
    * Compile a .slint file into a ComponentDefinition
    *

package/typescript/index.ts

@@ -247,6 +247,11 @@ export interface LoadFileOptions {
      * Sets library paths used for looking up `@library` imports to the specified map of library names to paths.
      */
     libraryPaths?: Record<string, string>;
+
+    /**
+     * @hidden
+     */
+    fileLoader?: (path: string) => string;
 }
 
 type LoadData =
@@ -285,6 +290,9 @@ function loadSlint(loadData: LoadData): Object {
         if (typeof options.libraryPaths !== "undefined") {
             compiler.libraryPaths = options.libraryPaths;
         }
+        if (typeof options.fileLoader !== "undefined") {
+            compiler.fileLoader = options.fileLoader;
+        }
     }
 
     const definitions =