vl-convert-python 0.8.0__tar.gz → 0.9.0__tar.gz

{vl_convert_python-0.8.0 → vl_convert_python-0.9.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-python"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"
@@ -17,7 +17,7 @@ name = "vl_convert"
 crate-type = ["cdylib"]
 
 [dependencies]
-vl-convert-rs = { path = "local_dependencies/vl-convert-rs", version= "0.8.0" }
+vl-convert-rs = { path = "local_dependencies/vl-convert-rs", version= "0.9.0" }
 pyo3 = { version = "0.18.2", features = ["extension-module", "anyhow"] }
 lazy_static = "1.4.0"
 futures = "0.3.24"

{vl_convert_python-0.8.0 → vl_convert_python-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vl-convert-python
-Version: 0.8.0
+Version: 0.9.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 License-File: LICENSE

{vl_convert_python-0.8.0 → vl_convert_python-0.9.0}/local_dependencies/vl-convert-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-rs"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"
@@ -10,8 +10,9 @@ description = "Library for converting Vega-Lite visualization specifications to
 keywords = ["Visualization", "Vega", "Vega-Lite"]
 
 [dependencies]
-deno_runtime = "0.105.0"
-deno_core = "0.179.0"
+# Deno 1.30.3. Before updating deno_runtime/deno_core, see not in DEVELOP.md
+deno_runtime = "0.97.0"
+deno_core = "0.171.0"
 serde_json = {version="1.0.85", features=["preserve_order"]}
 serde = {version="1.0.145", features=["derive"]}
 futures = "0.3.24"
@@ -19,9 +20,9 @@ futures-util = "0.3.24"
 tokio = {version= "1.21", features=["rt-multi-thread"]}
 reqwest = {version="0.11.12", default-features=false, features=["rustls-tls"]}
 lazy_static = "1.4.0"
-usvg = "0.30.0"
-resvg = "0.30.0"
-tiny-skia = "0.8.2"
+usvg = "0.32.0"
+resvg = "0.32.0"
+tiny-skia = "0.9.0"
 fontdb = {version= "0.13.0", features=["fontconfig"]}
 
 [dev-dependencies]

{vl_convert_python-0.8.0 → vl_convert_python-0.9.0}/local_dependencies/vl-convert-rs/src/converter.rs

@@ -9,7 +9,7 @@ use deno_runtime::deno_core::anyhow::bail;
 use deno_runtime::deno_core::error::AnyError;
 use deno_runtime::deno_core::{serde_v8, v8, Extension};
 
-use deno_core::{op, ModuleCode};
+use deno_core::op;
 use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_core;
 use deno_runtime::deno_web::BlobStore;
@@ -102,7 +102,7 @@ struct InnerVlConverter {
 impl InnerVlConverter {
     async fn init_vega(&mut self) -> Result<(), AnyError> {
         if !self.vega_initialized {
-            let import_code = ModuleCode::from(format!(
+            let import_code = format!(
                 r#"
 var vega;
 import('{vega_url}').then((imported) => {{
@@ -116,15 +116,15 @@ import('{vega_themes_url}').then((imported) => {{
 "#,
                 vega_url = vega_url(),
                 vega_themes_url = vega_themes_url(),
-            ));
+            );
 
-            self.worker.execute_script("<anon>", import_code)?;
+            self.worker.execute_script("<anon>", &import_code)?;
             self.worker.run_event_loop(false).await?;
 
             // Override text width measurement in vega-scenegraph
             for path in self.module_loader.import_map.keys() {
                 if path.ends_with("vega-scenegraph.js") {
-                    let script_code = ModuleCode::from(format!(
+                    let script_code = format!(
                         r#"
 import('{url}').then((sg) => {{
     sg.textMetrics.width = (item, text) => {{
@@ -146,8 +146,8 @@ import('{url}').then((sg) => {{
 }})
 "#,
                         url = url_for_path(path)
-                    ));
-                    self.worker.execute_script("<anon>", script_code)?;
+                    );
+                    self.worker.execute_script("<anon>", &script_code)?;
                     self.worker.run_event_loop(false).await?;
                 }
             }
@@ -174,7 +174,7 @@ function vegaToSvg(vgSpec) {
     async fn init_vl_version(&mut self, vl_version: &VlVersion) -> Result<(), AnyError> {
         if !self.initialized_vl_versions.contains(vl_version) {
             // Create and evaluate import string
-            let import_code = ModuleCode::from(format!(
+            let import_code = format!(
                 r#"
 var {ver_name};
 import('{vl_url}').then((imported) => {{
@@ -183,14 +183,14 @@ import('{vl_url}').then((imported) => {{
 "#,
                 ver_name = format!("{:?}", vl_version),
                 vl_url = vl_version.to_url()
-            ));
+            );
 
-            self.worker.execute_script("<anon>", import_code)?;
+            self.worker.execute_script("<anon>", &import_code)?;
 
             self.worker.run_event_loop(false).await?;
 
             // Create and initialize function string
-            let function_code = ModuleCode::from(format!(
+            let function_code = format!(
                 r#"
 function compileVegaLite_{ver_name}(vlSpec, config, theme) {{
     let options = {{}};
@@ -224,9 +224,9 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
 }}
 "#,
                 ver_name = format!("{:?}", vl_version),
-            ));
+            );
 
-            self.worker.execute_script("<anon>", function_code)?;
+            self.worker.execute_script("<anon>", &function_code)?;
 
             self.worker.run_event_loop(false).await?;
 
@@ -245,7 +245,6 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
                 op_text_width::decl(),
                 op_get_json_arg::decl(),
             ])
-            .force_op_registration()
             .build();
 
         let create_web_worker_cb = Arc::new(|_| {
@@ -258,6 +257,7 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
         let options = WorkerOptions {
             bootstrap: Default::default(),
             extensions: vec![ext],
+            extensions_with_js: vec![],
             startup_snapshot: None,
             unsafely_ignore_certificate_errors: None,
             root_cert_store: None,
@@ -282,8 +282,8 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
             should_wait_for_inspector_session: false,
         };
 
-        let main_module =
-            deno_core::resolve_path("vl-convert-rs.js", Path::new(env!("CARGO_MANIFEST_DIR")))?;
+        let js_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("vl-convert-rs.js");
+        let main_module = deno_core::resolve_path(&js_path.to_string_lossy())?;
         let permissions = PermissionsContainer::new(Permissions::allow_all());
 
         let mut worker =
@@ -305,8 +305,7 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
         &mut self,
         script: &str,
     ) -> Result<serde_json::Value, AnyError> {
-        let code = ModuleCode::from(script.to_string());
-        let res = self.worker.js_runtime.execute_script("<anon>", code)?;
+        let res = self.worker.js_runtime.execute_script("<anon>", script)?;
 
         self.worker.run_event_loop(false).await?;
 
@@ -325,8 +324,7 @@ function vegaLiteToSvg_{ver_name}(vlSpec, config, theme) {{
     }
 
     async fn execute_script_to_string(&mut self, script: &str) -> Result<String, AnyError> {
-        let code = ModuleCode::from(script.to_string());
-        let res = self.worker.js_runtime.execute_script("<anon>", code)?;
+        let res = self.worker.js_runtime.execute_script("<anon>", script)?;
 
         self.worker.run_event_loop(false).await?;
 
@@ -415,7 +413,7 @@ vegaLiteToSvg_{ver_name:?}(
             config_arg_id = config_arg_id,
             theme_arg = theme_arg,
         );
-        self.worker.execute_script("<anon>", code)?;
+        self.worker.execute_script("<anon>", &code)?;
         self.worker.run_event_loop(false).await?;
 
         let value = self.execute_script_to_string("svg").await?;
@@ -437,7 +435,7 @@ vegaToSvg(
 "#,
             arg_id = arg_id
         );
-        self.worker.execute_script("<anon>", code)?;
+        self.worker.execute_script("<anon>", &code)?;
         self.worker.run_event_loop(false).await?;
 
         let value = self.execute_script_to_string("svg").await?;