update dep

Author: NailxSharipov

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ishape_wasm"
-version = "2.2.0"
+version = "2.3.0"
 authors = ["Nail Sharipov <nailxsharipov@gmail.com>"]
 edition = "2021"
 description = "Triangulation and Boolean Operations for 2D Polygons. Supported operations: intersection, union, difference, XOR, and self-intersections for all polygon varieties."
@@ -16,14 +16,14 @@ codegen-units = 1
 crate-type = ["cdylib"]
 
 [dependencies]
-i_triangle = "~0.31"
-#i_triangle = { path = "../iTriangle/iTriangle" }
+i_triangle = { version = "~0.33", features = ["serde"] }
+#i_triangle = { path = "../iTriangle/iTriangle", features = ["serde"] }
 log = "0.4.22"
 console_log = "^1.0.0"
 console_error_panic_hook = "^0"
 
 
 wasm-bindgen = "^0.2"
-serde = { version = "^1.0", features = ["derive"] }
+serde = { version = "^1.0", default-features = false, features = ["derive", "alloc"] }
 serde-wasm-bindgen = "^0.6"
 

docs-gen/src/js/i_shape/ishape_wasm_bg.wasm

@@ -3,7 +3,7 @@
 <p align="center">
   <img src="readme/balloons.svg" width="250"/>
 </p>
-2D geometry library for triangulation and poly-bool operations such as union, intersection, difference and xor.
+A fast 2D geometry library in WebAssembly for JavaScript and TypeScript. Supports polygon boolean operations, buffering, and triangulation.
 
 ## [Demo](https://ishape-rust.github.io/iShape-js/overlay/stars_demo.html)
 Try out iShape with an interactive demo.

docs/js/i_shape/ishape_wasm_bg.wasm

@@ -5,7 +5,7 @@
     "Nail Sharipov <nailxsharipov@gmail.com>"
   ],
   "description": "Triangulation and Boolean Operations for 2D Polygons. Supported operations: intersection, union, difference, XOR, and self-intersections for all polygon varieties.",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "license": "MIT",
   "repository": {
     "type": "git",

pkg/README.md

@@ -1,3 +1,4 @@
+use alloc::vec::Vec;
 use crate::data::{NestedData, VectorsData};
 use crate::bool::fill_rule::FillRule;
 use crate::bool::overlay_rule::OverlayRule;
@@ -56,7 +57,7 @@ impl Overlay {
     }
 
     #[wasm_bindgen]
-    pub fn overlay(self, overlay_rule: OverlayRule, fill_rule: FillRule) -> JsValue {
+    pub fn overlay(mut self, overlay_rule: OverlayRule, fill_rule: FillRule) -> JsValue {
         let overlay_rule = RustOverlayRule::from(overlay_rule);
         let fill_rule = RustFillRule::from(fill_rule);
 
@@ -66,11 +67,16 @@ impl Overlay {
     }
 
     #[wasm_bindgen]
-    pub fn separate_vectors(self, fill_rule: FillRule) -> JsValue {
+    pub fn separate_vectors(mut self, fill_rule: FillRule) -> JsValue {
         let fill_rule = RustFillRule::from(fill_rule);
-        let float_graph = self.overlay.into_graph(fill_rule);
-        let vectors = float_graph.graph.extract_separate_vectors();
-        let data = VectorsData::create(vectors, &float_graph.adapter);
+        let data = if let Some(float_graph) = self.overlay.build_graph_view(fill_rule) {
+            let vectors = float_graph.graph.extract_separate_vectors();
+            VectorsData::create(vectors, &float_graph.adapter)
+        } else {
+            VectorsData {
+                vectors: Vec::new()
+            }
+        };
         serde_wasm_bindgen::to_value(&data).unwrap()
     }
 }

pkg/ishape_wasm_bg.wasm

@@ -1,14 +1,14 @@
+use alloc::vec::Vec;
 use i_triangle::i_overlay::i_float::adapter::FloatPointAdapter;
 use i_triangle::i_overlay::vector::edge::VectorEdge;
-use serde::{Deserialize, Serialize};
-use std::fmt;
+use core::fmt;
 use wasm_bindgen::JsValue;
 
 pub type ShapesData = Vec<ShapeData>;
 pub type ShapeData = Vec<ContourData>;
 pub type ContourData = Vec<[f64; 2]>;
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 #[serde(untagged)]
 pub(super) enum NestedData {
     Contour(ContourData),
@@ -27,7 +27,7 @@ impl NestedData {
     }
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(serde::Serialize, serde::Deserialize)]
 pub struct VectorData {
     pub ax: f64,
     pub ay: f64,
@@ -36,7 +36,7 @@ pub struct VectorData {
     pub fill: u8,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(serde::Serialize, serde::Deserialize)]
 pub struct VectorsData {
     pub vectors: Vec<VectorData>,
 }

pkg/package.json

@@ -1,3 +1,6 @@
+#![no_std]
+extern crate alloc;
+
 pub mod data;
 pub mod triangle;
 pub mod bool;

src/bool/overlay.rs

@@ -1,16 +1,16 @@
-use std::panic;
-use std::sync::Once;
-// use log::info;
-
-pub(crate) struct Logger {}
-
-static INIT_LOGGER: Once = Once::new();
-
-impl Logger {
-    pub(crate) fn prepare() {
-        panic::set_hook(Box::new(console_error_panic_hook::hook));
-        INIT_LOGGER.call_once(|| {
-            console_log::init_with_level(log::Level::Debug).expect("error initializing log");
-        });
-    }
-}
+// use std::panic;
+// use std::sync::Once;
+// // use log::info;
+// 
+// pub(crate) struct Logger {}
+// 
+// static INIT_LOGGER: Once = Once::new();
+// 
+// impl Logger {
+//     pub(crate) fn prepare() {
+//         panic::set_hook(Box::new(console_error_panic_hook::hook));
+//         INIT_LOGGER.call_once(|| {
+//             console_log::init_with_level(log::Level::Debug).expect("error initializing log");
+//         });
+//     }
+// }