update deps 2023-12-02 (#142)

* update vl-convert-pdf deps * Update deno * Update pyo3 * license
vega · Dec 2, 2023 · 3c8610c · 3c8610c
1 parent 4887a5b
commit 3c8610c
Show file tree

Hide file tree

Showing 10 changed files with 1,470 additions and 3,302 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/thirdparty_rust.yaml b/thirdparty_rust.yaml
diff --git a/vl-convert-pdf/Cargo.toml b/vl-convert-pdf/Cargo.toml
@@ -10,13 +10,13 @@ description = "Crate to convert SVG to PDF with embedded text"
 keywords = ["SVG", "PDF"]
 
 [dependencies]
-svg2pdf = "0.9.0"
-pdf-writer = "0.9.1"
+svg2pdf = "0.9.1"
+pdf-writer = "0.9.2"
 usvg = "0.36.0"
 anyhow = "1.0.71"
 ttf-parser = "0.20.0"
 subsetter = "0.1.1"
 miniz_oxide = "0.7.1"
 siphasher = "1.0.0"
-itertools = "0.11.0"
+itertools = "0.12.0"
 unicode-bidi = "0.3.13"
diff --git a/vl-convert-python/Cargo.toml b/vl-convert-python/Cargo.toml
@@ -18,9 +18,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 vl-convert-rs = { path = "../vl-convert-rs", version= "1.0.1-rc1" }
-pyo3 = { version = "0.19.0", features = ["extension-module", "anyhow", "abi3-py37"] }
+pyo3 = { version = "0.20.0", features = ["extension-module", "anyhow", "abi3-py37"] }
 lazy_static = "1.4.0"
 futures = "0.3.28"
-pythonize = "0.19.0"
+pythonize = "0.20.0"
 tokio = { version= "1.32" }
 
diff --git a/vl-convert-python/thirdparty_rust.yaml b/vl-convert-python/thirdparty_rust.yaml
diff --git a/vl-convert-rs/Cargo.toml b/vl-convert-rs/Cargo.toml
@@ -12,11 +12,11 @@ keywords = ["Visualization", "Vega", "Vega-Lite"]
 [dependencies]
 vl-convert-pdf = {path= "../vl-convert-pdf", version= "1.0.1-rc1" }
 
-# Deno 1.37.2. Before updating deno_runtime/deno_core, see note in DEVELOP.md
-deno_runtime = "0.129.0"
-deno_core = "0.222.0"
-deno_emit = "0.31.1"
-deno_graph = "0.59.1"
+# Deno 1.38.4. Before updating deno_runtime/deno_core, see note in DEVELOP.md
+deno_runtime = "0.134.0"
+deno_core = "0.232.0"
+deno_emit = "0.31.4"
+deno_graph = "0.61.1"
 serde_json = {version="1.0.106", features=["preserve_order"]}
 serde = {version="1.0.188", features=["derive"]}
 futures = "0.3.28"

diff --git a/vl-convert-rs/src/converter.rs b/vl-convert-rs/src/converter.rs
@@ -15,7 +15,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, Op};
+use deno_core::{op2, ModuleCode, Op};
 use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_core;
 use deno_runtime::deno_web::BlobStore;
@@ -41,6 +41,8 @@ use image::io::Reader as ImageReader;
 
 use crate::text::{op_text_width, FONT_DB, USVG_OPTIONS};
 
+deno_core::extension!(vl_convert_converter_runtime, ops = [op_get_json_arg]);
+
 lazy_static! {
     pub static ref TOKIO_RUNTIME: tokio::runtime::Runtime =
         tokio::runtime::Builder::new_current_thread()
@@ -223,7 +225,8 @@ fn set_json_arg(arg: serde_json::Value) -> Result<i32, AnyError> {
     Ok(id)
 }
 
-#[op]
+#[op2]
+#[string]
 fn op_get_json_arg(arg_id: i32) -> Result<String, AnyError> {
     match JSON_ARGS.lock() {
         Ok(mut guard) => {
@@ -511,6 +514,7 @@ function vegaLiteToScenegraph_{ver_name}(vlSpec, config, theme, warnings, allowe
             bootstrap: Default::default(),
             extensions: vec![ext],
             startup_snapshot: None,
+            skip_op_registration: false,
             create_params: None,
             unsafely_ignore_certificate_errors: None,
             root_cert_store_provider: None,
@@ -533,6 +537,7 @@ function vegaLiteToScenegraph_{ver_name}(vlSpec, config, theme, warnings, allowe
             should_wait_for_inspector_session: false,
             fs: Arc::new(RealFs),
             feature_checker: Arc::new(Default::default()),
+            strace_ops: None,
         };
 
         let main_module =

diff --git a/vl-convert-rs/src/text.rs b/vl-convert-rs/src/text.rs
@@ -2,14 +2,16 @@ use crate::anyhow;
 use crate::anyhow::{anyhow, bail};
 use crate::image_loading::custom_string_resolver;
 use deno_core::error::AnyError;
-use deno_core::op;
+use deno_core::op2;
 use serde::Deserialize;
 use serde_json::Value;
 use std::collections::HashSet;
 use std::sync::Mutex;
 use usvg::fontdb::Database;
 use usvg::{ImageHrefResolver, TreeParsing, TreeTextToPath};
 
+deno_core::extension!(vl_convert_text_runtime, ops = [op_text_width]);
+
 lazy_static! {
     pub static ref USVG_OPTIONS: Mutex<usvg::Options> = Mutex::new(init_usvg_options());
     pub static ref FONT_DB: Mutex<Database> = Mutex::new(init_font_db());
@@ -179,8 +181,8 @@ impl TextInfo {
     }
 }
 
-#[op]
-pub fn op_text_width(text_info_str: String) -> Result<f64, AnyError> {
+#[op2(fast)]
+pub fn op_text_width(#[string] text_info_str: String) -> Result<f64, AnyError> {
     let text_info = match serde_json::from_str::<TextInfo>(&text_info_str) {
         Ok(text_info) => text_info,
         Err(err) => bail!("Failed to deserialize text info: {}", err.to_string()),

diff --git a/vl-convert-rs/thirdparty_rust.yaml b/vl-convert-rs/thirdparty_rust.yaml
diff --git a/vl-convert/thirdparty_rust.yaml b/vl-convert/thirdparty_rust.yaml