vl-convert-python 1.2.0__tar.gz → 1.2.2__tar.gz

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/Cargo.lock

@@ -6144,7 +6144,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vl-convert"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -6161,7 +6161,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-pdf"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "anyhow",
  "itertools 0.12.0",
@@ -6177,7 +6177,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-python"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "futures",
  "lazy_static",
@@ -6189,7 +6189,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "deno_core",
  "deno_emit",
@@ -6221,7 +6221,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-vendor"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "anyhow",
  "dircpy",

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/PKG-INFO

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

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-pdf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-pdf"
-version = "1.2.0"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-python"
-version = "1.2.0"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-rs"
-version = "1.2.0"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-rs/src/converter.rs

@@ -394,6 +394,63 @@ function vegaToSvg(vgSpec, allowedBaseUrls, formatLocale, timeFormatLocale, erro
     return svgPromise
 }
 
+function cloneScenegraph(obj) {
+    const keys = [
+      'marktype', 'name', 'role', 'interactive', 'clip', 'items', 'zindex',
+      'x', 'y', 'width', 'height', 'align', 'baseline',             // layout
+      'fill', 'fillOpacity', 'opacity', 'blend',                    // fill
+      'x1', 'y1', 'stops', 'offset', 'color',                       // gradient
+      'stroke', 'strokeOpacity', 'strokeWidth', 'strokeCap',        // stroke
+      'strokeJoin',
+      'strokeDash', 'strokeDashOffset',                             // stroke dash
+      'strokeForeground', 'strokeOffset',                           // group
+      'startAngle', 'endAngle', 'innerRadius', 'outerRadius',       // arc
+      'cornerRadius', 'padAngle',                                   // arc, rect
+      'cornerRadiusTopLeft', 'cornerRadiusTopRight',                // rect, group
+      'cornerRadiusBottomLeft', 'cornerRadiusBottomRight',
+      'interpolate', 'tension', 'orient', 'defined',                // area, line
+      'url', 'aspect', 'smooth',                                    // image
+      'path', 'scaleX', 'scaleY',                                   // path
+      'x2', 'y2',                                                   // rule
+      'size', 'shape',                                              // symbol
+      'text', 'angle', 'theta', 'radius', 'dir', 'dx', 'dy',        // text
+      'ellipsis', 'limit', 'lineBreak', 'lineHeight',
+      'font', 'fontSize', 'fontWeight', 'fontStyle', 'fontVariant', // font
+      'description', 'aria', 'ariaRole', 'ariaRoleDescription'      // aria
+    ];
+
+    // Check if the input is an object (including an array) or null
+    if (typeof obj !== 'object' || obj === null) {
+        return obj;
+    }
+
+    // Initialize the clone as an array or object based on the input type
+    const clone = Array.isArray(obj) ? [] : {};
+
+    // If the object is an array, iterate over its elements
+    if (Array.isArray(obj)) {
+        for (let i = 0; i < obj.length; i++) {
+            // Apply the function recursively to each element
+            clone.push(cloneScenegraph(obj[i]));
+        }
+    } else {
+        // If the object is not an array, iterate over its keys
+        for (const key in obj) {
+            // Clone only the properties with specified keys
+            if (key === "shape" && typeof obj[key] === "function") {
+                // Convert path object to SVG path string.
+                // Initialize context. This is needed for obj.shape(obj) to work.
+                obj.shape.context();
+                clone["shape"] = obj.shape(obj) ?? "";
+            } else if (keys.includes(key)) {
+                clone[key] = cloneScenegraph(obj[key]);
+            }
+        }
+    }
+
+    return clone;
+}
+
 function vegaToScenegraph(vgSpec, allowedBaseUrls, formatLocale, timeFormatLocale, errors) {
     if (formatLocale != null) {
         vega.formatLocale(formatLocale);
@@ -411,7 +468,18 @@ function vegaToScenegraph(vgSpec, allowedBaseUrls, formatLocale, timeFormatLocal
         }
     }).then(() => {
         return view.runAsync().then(
-            () => JSON.parse(JSON.parse(vega.sceneToJSON(view.scenegraph())))
+            () => {
+                let padding = view.padding();
+                return {
+                    width: Math.max(0, view._viewWidth + padding.left + padding.right),
+                    height: Math.max(0, view._viewHeight + padding.top + padding.bottom),
+                    origin: [
+                        padding.left + view._origin[0],
+                        padding.top + view._origin[1]
+                    ],
+                    scenegraph: cloneScenegraph(view.scenegraph().root)
+                }
+            }
         ).finally(() => {
             view.finalize();
             vega.resetDefaultLocale();

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-rs/src/module_loader/import_map.rs

@@ -8,11 +8,11 @@ use std::str::FromStr;
 
 pub const SKYPACK_URL: &str = "https://cdn.skypack.dev";
 pub const VEGA_PATH: &str =
-    "/pin/vega@v5.26.1-qzT1gQErRVzfnh254DSg/mode=imports,min/optimized/vega.js";
+    "/pin/vega@v5.27.0-6S239Sria1XovqGora8j/mode=imports,min/optimized/vega.js";
 pub const VEGA_THEMES_PATH: &str =
     "/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js";
 pub const VEGA_EMBED_PATH: &str =
-    "/pin/vega-embed@v6.23.0-Fpmq39rehEH8HWtd6nzv/mode=imports,min/optimized/vega-embed.js";
+    "/pin/vega-embed@v6.24.0-w7baSqpeCYEV2w1fHJn2/mode=imports,min/optimized/vega-embed.js";
 pub const DEBOUNCE_PATH: &str = "/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js";
 
 pub fn url_for_path(path: &str) -> String {
@@ -148,7 +148,7 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-canvas@v1.2.7-hCEcvULuKIOqBVGX1Tn8/dist=es2020,mode=imports,min/optimized/vega-canvas.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-canvas@v1.2.7-hCEcvULuKIOqBVGX1Tn8/dist=es2020,mode=imports,min/optimized/vega-canvas.js").to_string());
     m.insert("/-/vega-crossfilter@v4.1.1-0AUAt51ACgvwsfDQr3R4/dist=es2020,mode=imports,min/optimized/vega-crossfilter.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-crossfilter@v4.1.1-0AUAt51ACgvwsfDQr3R4/dist=es2020,mode=imports,min/optimized/vega-crossfilter.js").to_string());
     m.insert("/-/vega-dataflow@v5.7.5-asKYS4gpPLMPf64pSozt/dist=es2020,mode=imports,min/optimized/vega-dataflow.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-dataflow@v5.7.5-asKYS4gpPLMPf64pSozt/dist=es2020,mode=imports,min/optimized/vega-dataflow.js").to_string());
-    m.insert("/-/vega-embed@v6.23.0-Fpmq39rehEH8HWtd6nzv/dist=es2020,mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-embed@v6.23.0-Fpmq39rehEH8HWtd6nzv/dist=es2020,mode=imports,min/optimized/vega-embed.js").to_string());
+    m.insert("/-/vega-embed@v6.24.0-w7baSqpeCYEV2w1fHJn2/dist=es2020,mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-embed@v6.24.0-w7baSqpeCYEV2w1fHJn2/dist=es2020,mode=imports,min/optimized/vega-embed.js").to_string());
     m.insert("/-/vega-encode@v4.9.2-73LzBc3ioSKmAYWtrrRd/dist=es2020,mode=imports,min/optimized/vega-encode.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-encode@v4.9.2-73LzBc3ioSKmAYWtrrRd/dist=es2020,mode=imports,min/optimized/vega-encode.js").to_string());
     m.insert("/-/vega-event-selector@v3.0.1-UgiEAWJA4WQL4DTKnV4R/dist=es2020,mode=imports,min/optimized/vega-event-selector.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-event-selector@v3.0.1-UgiEAWJA4WQL4DTKnV4R/dist=es2020,mode=imports,min/optimized/vega-event-selector.js").to_string());
     m.insert("/-/vega-expression@v5.1.0-2VnsdaYPtQ6Pi5w8JxN8/dist=es2020,mode=imports,min/optimized/vega-expression.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-expression@v5.1.0-2VnsdaYPtQ6Pi5w8JxN8/dist=es2020,mode=imports,min/optimized/vega-expression.js").to_string());
@@ -164,7 +164,6 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
-    m.insert("/-/vega-lite@v5.15.0-l27jdbpFztiLqmj2Waun/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.15.0-l27jdbpFztiLqmj2Waun/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.16.3-Hw7pZxUuaiVgThsNMjY9/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.16.3-Hw7pZxUuaiVgThsNMjY9/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
@@ -175,22 +174,22 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-regression@v1.2.0-qmJkAzTyLtlu9jZBRY67/dist=es2020,mode=imports,min/optimized/vega-regression.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-regression@v1.2.0-qmJkAzTyLtlu9jZBRY67/dist=es2020,mode=imports,min/optimized/vega-regression.js").to_string());
     m.insert("/-/vega-runtime@v6.1.4-aFKCWR0DKdVqzAheQZ7x/dist=es2020,mode=imports,min/optimized/vega-runtime.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-runtime@v6.1.4-aFKCWR0DKdVqzAheQZ7x/dist=es2020,mode=imports,min/optimized/vega-runtime.js").to_string());
     m.insert("/-/vega-scale@v7.3.1-hys32hcqPKVC7s5pBJV0/dist=es2020,mode=imports,min/optimized/vega-scale.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-scale@v7.3.1-hys32hcqPKVC7s5pBJV0/dist=es2020,mode=imports,min/optimized/vega-scale.js").to_string());
-    m.insert("/-/vega-scenegraph@v4.11.1-t7X1dmv0ePHm76Ol8yPQ/dist=es2020,mode=imports,min/optimized/vega-scenegraph.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-scenegraph@v4.11.1-t7X1dmv0ePHm76Ol8yPQ/dist=es2020,mode=imports,min/optimized/vega-scenegraph.js").to_string());
+    m.insert("/-/vega-scenegraph@v4.11.2-ECjtKQ59x40n6e1Sr54c/dist=es2020,mode=imports,min/optimized/vega-scenegraph.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-scenegraph@v4.11.2-ECjtKQ59x40n6e1Sr54c/dist=es2020,mode=imports,min/optimized/vega-scenegraph.js").to_string());
     m.insert("/-/vega-schema-url-parser@v2.2.0-YmXJGRcKOXOac3VG4xfw/dist=es2020,mode=imports,min/optimized/vega-schema-url-parser.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-schema-url-parser@v2.2.0-YmXJGRcKOXOac3VG4xfw/dist=es2020,mode=imports,min/optimized/vega-schema-url-parser.js").to_string());
     m.insert("/-/vega-selections@v5.4.2-kOpqaoZxiZQE5rKxTnvY/dist=es2020,mode=imports,min/optimized/vega-selections.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-selections@v5.4.2-kOpqaoZxiZQE5rKxTnvY/dist=es2020,mode=imports,min/optimized/vega-selections.js").to_string());
     m.insert("/-/vega-statistics@v1.9.0-Qw8CjSQVQOg2M6VMgsme/dist=es2020,mode=imports,min/optimized/vega-statistics.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-statistics@v1.9.0-Qw8CjSQVQOg2M6VMgsme/dist=es2020,mode=imports,min/optimized/vega-statistics.js").to_string());
     m.insert("/-/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/dist=es2020,mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/dist=es2020,mode=imports,min/optimized/vega-themes.js").to_string());
     m.insert("/-/vega-time@v2.1.1-Q1TxQbneCNdh5ryZm2Gf/dist=es2020,mode=imports,min/optimized/vega-time.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-time@v2.1.1-Q1TxQbneCNdh5ryZm2Gf/dist=es2020,mode=imports,min/optimized/vega-time.js").to_string());
-    m.insert("/-/vega-tooltip@v0.33.0-DfMhYyd4NOGdbNfmDNiw/dist=es2020,mode=imports,min/optimized/vega-tooltip.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-tooltip@v0.33.0-DfMhYyd4NOGdbNfmDNiw/dist=es2020,mode=imports,min/optimized/vega-tooltip.js").to_string());
-    m.insert("/-/vega-transforms@v4.11.0-WGMpHJSv6jDchyWlqRvP/dist=es2020,mode=imports,min/optimized/vega-transforms.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-transforms@v4.11.0-WGMpHJSv6jDchyWlqRvP/dist=es2020,mode=imports,min/optimized/vega-transforms.js").to_string());
+    m.insert("/-/vega-tooltip@v0.34.0-YVV3uKnnOnCt2kW7Vclb/dist=es2020,mode=imports,min/optimized/vega-tooltip.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-tooltip@v0.34.0-YVV3uKnnOnCt2kW7Vclb/dist=es2020,mode=imports,min/optimized/vega-tooltip.js").to_string());
+    m.insert("/-/vega-transforms@v4.11.1-RhFnNq7TnH1umseD2FsT/dist=es2020,mode=imports,min/optimized/vega-transforms.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-transforms@v4.11.1-RhFnNq7TnH1umseD2FsT/dist=es2020,mode=imports,min/optimized/vega-transforms.js").to_string());
     m.insert("/-/vega-util@v1.17.2-LUfkDhormMyfWqy3Ts6U/dist=es2020,mode=imports,min/optimized/vega-util.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-util@v1.17.2-LUfkDhormMyfWqy3Ts6U/dist=es2020,mode=imports,min/optimized/vega-util.js").to_string());
     m.insert("/-/vega-view-transforms@v4.5.9-LiB26zIbxiHZW70fnrDI/dist=es2020,mode=imports,min/optimized/vega-view-transforms.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-view-transforms@v4.5.9-LiB26zIbxiHZW70fnrDI/dist=es2020,mode=imports,min/optimized/vega-view-transforms.js").to_string());
-    m.insert("/-/vega-view@v5.11.1-FQ9r1BvJOMHegkomXDyj/dist=es2020,mode=imports,min/optimized/vega-view.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-view@v5.11.1-FQ9r1BvJOMHegkomXDyj/dist=es2020,mode=imports,min/optimized/vega-view.js").to_string());
+    m.insert("/-/vega-view@v5.12.0-cCWaN8IOCLu8oOg9KxwN/dist=es2020,mode=imports,min/optimized/vega-view.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-view@v5.12.0-cCWaN8IOCLu8oOg9KxwN/dist=es2020,mode=imports,min/optimized/vega-view.js").to_string());
     m.insert("/-/vega-voronoi@v4.2.2-oQ1o0oW6SZfwHLCCdDRf/dist=es2020,mode=imports,min/optimized/vega-voronoi.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-voronoi@v4.2.2-oQ1o0oW6SZfwHLCCdDRf/dist=es2020,mode=imports,min/optimized/vega-voronoi.js").to_string());
     m.insert("/-/vega-wordcloud@v4.1.4-J5ewLsaJzX7o65uuoGqD/dist=es2020,mode=imports,min/optimized/vega-wordcloud.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-wordcloud@v4.1.4-J5ewLsaJzX7o65uuoGqD/dist=es2020,mode=imports,min/optimized/vega-wordcloud.js").to_string());
-    m.insert("/-/vega@v5.26.1-qzT1gQErRVzfnh254DSg/dist=es2020,mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega@v5.26.1-qzT1gQErRVzfnh254DSg/dist=es2020,mode=imports,min/optimized/vega.js").to_string());
+    m.insert("/-/vega@v5.27.0-6S239Sria1XovqGora8j/dist=es2020,mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega@v5.27.0-6S239Sria1XovqGora8j/dist=es2020,mode=imports,min/optimized/vega.js").to_string());
     m.insert("/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js").to_string());
-    m.insert("/pin/vega-embed@v6.23.0-Fpmq39rehEH8HWtd6nzv/mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-embed@v6.23.0-Fpmq39rehEH8HWtd6nzv/mode=imports,min/optimized/vega-embed.js").to_string());
+    m.insert("/pin/vega-embed@v6.24.0-w7baSqpeCYEV2w1fHJn2/mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-embed@v6.24.0-w7baSqpeCYEV2w1fHJn2/mode=imports,min/optimized/vega-embed.js").to_string());
     m.insert("/pin/vega-lite@v5.10.0-Vm0dgr6cpOyUiTjlPzt9/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.10.0-Vm0dgr6cpOyUiTjlPzt9/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.11.1-Q5Jhmb2acmWm03IObXvn/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.11.1-Q5Jhmb2acmWm03IObXvn/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/mode=imports,min/optimized/vega-lite.js").to_string());
@@ -201,7 +200,7 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/pin/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.9.3-QyXScylQe0TTmb9DRCES/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.9.3-QyXScylQe0TTmb9DRCES/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js").to_string());
-    m.insert("/pin/vega@v5.26.1-qzT1gQErRVzfnh254DSg/mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega@v5.26.1-qzT1gQErRVzfnh254DSg/mode=imports,min/optimized/vega.js").to_string());
+    m.insert("/pin/vega@v5.27.0-6S239Sria1XovqGora8j/mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega@v5.27.0-6S239Sria1XovqGora8j/mode=imports,min/optimized/vega.js").to_string());
     m
 }
 

{vl_convert_python-1.2.0 → vl_convert_python-1.2.2}/vl-convert-rs/tests/test_specs.rs

@@ -154,12 +154,12 @@ fn load_expected_scenegraph(
     name: &str,
     vl_version: VlVersion,
     theme: Option<&str>,
-) -> Option<Value> {
+) -> Option<String> {
     let spec_path = make_expected_scenegraph_path(name, vl_version, theme);
     let Some(p) = fs::read_to_string(&spec_path).ok() else {
         return None;
     };
-    serde_json::from_str(&p).ok()
+    Some(p)
 }
 
 fn write_failed_svg(name: &str, vl_version: VlVersion, theme: Option<&str>, img: &str) -> PathBuf {
@@ -223,12 +223,16 @@ fn check_svg(name: &str, vl_version: VlVersion, theme: Option<&str>, img: &str)
 
 fn check_scenegraph(name: &str, vl_version: VlVersion, theme: Option<&str>, sg: &Value) {
     let expected = load_expected_scenegraph(name, vl_version, theme);
-    if Some(sg) != expected.as_ref() {
-        let path = write_failed_scenegraph(name, vl_version, theme, sg);
-        panic!(
-            "Specs don't match for {}.sg.json. Failed image written to {:?}",
-            name, path
-        )
+    if let Some(expected) = &expected {
+        let result_pretty = serde_json::to_string_pretty(sg).unwrap();
+        if expected != &result_pretty {
+            let path = write_failed_scenegraph(name, vl_version, theme, sg);
+            println!(
+                "Scenegraphs don't match for {}.sg.json. Failed image written to {:?}",
+                name, path
+            );
+            assert_eq!(&result_pretty, expected)
+        }
     }
 }
 
@@ -590,8 +594,9 @@ mod test_scenegraph {
     #[rstest]
     fn test(
         #[values(
-            // This one has round-trip stable numeric values
-            "no_text_in_font_metrics"
+            "no_text_in_font_metrics",
+            "geoScale",
+            "table_heatmap",
         )]
         name: &str,
     ) {
@@ -642,6 +647,7 @@ mod test_png_no_theme {
         case("long_legend_label", 1.0),
         case("quakes_initial_selection", 1.0),
         case("geoScale", 1.0),
+        case("table_heatmap", 1.0),
     )]
     fn test(
         name: &str,