Bumped to 0.4.0, updated libs, added version match check

.github/workflows/pipeline.yaml

@@ -40,6 +40,8 @@ jobs:
         with:
           command: test
           args: --all-features
+      - name: Check versions
+        run: tests/check_versions.sh
 
   fixed-nightly-clippy:
     name: Fixed Nightly clippy (wasm32)

CHANGES.md

@@ -1,15 +1,17 @@
 <!-- markdownlint-configure-file { "no-duplicate-heading": { "siblings_only": true } } -->
 
 <!-- markdownlint-disable-next-line first-line-h1 -->
-## Unreleased
+## 0.4.0 - 2023-11-08
 
 ### Added
 
 * `LazyCache::forget`
+* Check for vertigo/vertigo-cli major.minor versions mismatch. Error is printed on CLI and JavaScript console.
 
 ### Fixed
 
 * `LazyCache::force_update` really forces the update even if value not expired
+* `JsJson` and `JsValue`` list size as u32 - fixes large DOM updates
 
 ## 0.3.2 - 2023-07-17
 

Makefile.toml

@@ -87,4 +87,3 @@ script = [
 
 [tasks.lint]
 script = "cargo run --bin lint-project"
-

crates/vertigo-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vertigo-cli"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 description = "Reactive Real-DOM library with SSR for Rust - packaging/serving tool"
 categories = ["command-line-utilities", "development-tools", "development-tools::build-utils", "wasm", "web-programming"]
@@ -20,18 +20,19 @@ path = "src/main.rs"
 clap = { version = "4.0", features = ["derive"] }
 hex = "0.4"
 include_dir = "0.7"
+pkg-version = "1"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 sha2 = "0.10"
-wasmtime = "6.0"
+wasmtime = "14.0"
 log = "0.4"
 env_logger = "0.10"
 tokio = { version = "1.25", features = ["full"] }
 tokio-stream = "0.1"
 axum = { version = "0.6.12", features = ["macros"] }
-axum-extra = "0.7.2"
+axum-extra = "0.8.0"
 tower-http = { version = "0.4", features = ["fs"] }
 reqwest = "0.11.14"
-notify = "5.1.0"
+notify = "6.1.1"
 poem = { version = "1.3.55", features = ["sse"] }
 futures = "0.3.26"

crates/vertigo-cli/src/serve/html/html_response.rs

@@ -88,7 +88,7 @@ impl HtmlResponse {
 
             for (env_name, env_value) in &self.env {
                 html.add_attr(format!("data-env-{env_name}"), env_value);
-            }    
+            }
         } else {
             return (StatusCode::INTERNAL_SERVER_ERROR, "root: the html element was expected".into());
         }

crates/vertigo-cli/src/serve/html/ordered_map.rs

@@ -23,8 +23,8 @@ impl OrderedMap {
         if self.data.contains_key(&name) {
             let mut order = self.order
                 .iter()
+                .filter(|&item_name| item_name != &name)
                 .cloned()
-                .filter(|item_name| item_name != &name)
                 .collect::<Vec<_>>();
 
             order.push(name);

crates/vertigo-cli/src/serve/wasm/mod.rs

@@ -5,3 +5,6 @@ mod data_context;
 
 pub use wasm_instance::{Message, FetchRequest, FetchResponse, WasmInstance};
 pub use get_now::get_now;
+
+const VERTIGO_VERSION_MAJOR: u32 = pkg_version::pkg_version_major!();
+const VERTIGO_VERSION_MINOR: u32 = pkg_version::pkg_version_minor!();

crates/vertigo-cli/src/serve/wasm/wasm_instance.rs

@@ -19,7 +19,7 @@ use crate::serve::{
 };
 
 use super::get_now;
-use super::js_value_match::{Match};
+use super::js_value_match::Match;
 
 #[derive(Debug)]
 pub enum Message {
@@ -330,7 +330,7 @@ impl WasmInstance {
 
                     if let Ok(env_name) = match_get_env(&value) {
                         let env_value = request.env(env_name);
-                        
+
                         let result = match env_value {
                             Some(value) => JsValue::String(value),
                             None => JsValue::Null,
@@ -423,7 +423,10 @@ impl WasmInstance {
     }
 
     pub fn call_vertigo_entry_function(&mut self) {
-        self.call_function::<(), ()>("vertigo_entry_function", ()).unwrap();
+        self.call_function::<(u32, u32), ()>(
+            "vertigo_entry_function",
+            (super::VERTIGO_VERSION_MAJOR, super::VERTIGO_VERSION_MINOR),
+        ).unwrap();
     }
 
     pub fn wasm_callback(&mut self, callback_id: u64, params: JsValue) -> JsValue {

crates/vertigo-cli/src/watch/sse.rs

@@ -1,5 +1,5 @@
 use std::task::Poll;
-use futures::{stream::{Stream, StreamExt}};
+use futures::stream::{Stream, StreamExt};
 use poem::{
     handler,
     web::{sse::{Event, SSE}, Data},

crates/vertigo-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vertigo-macro"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 description = "Reactive Real-DOM library with SSR for Rust - macros"
 edition = "2021"
@@ -13,10 +13,11 @@ proc-macro = true
 [dependencies]
 pest = "2.5"
 pest_derive = "2.1"
+pkg-version = "1"
 proc-macro2 = "1.0"
 proc-macro-error = "1.0"
 syn = { version = "1.0", features=["full"] }
-itertools = "0.10"
+itertools = "0.11"
 syn-rsx = "0.8"
 sha2 = "0.10"
 hex = "0.4"

crates/vertigo-macro/src/lib.rs

@@ -17,9 +17,7 @@ use html_parser::{dom_inner, dom_element_inner};
 use proc_macro::{TokenStream, Span};
 use syn::{Visibility, __private::ToTokens};
 
-use crate::{
-    css_parser::generate_css_string,
-};
+use crate::css_parser::generate_css_string;
 use bind::{bind_macro_fn, bind_spawn_fn, bind_rc_fn};
 
 #[proc_macro]
@@ -140,12 +138,22 @@ pub fn main(_attr: TokenStream, input: TokenStream) -> TokenStream {
 
     let input: proc_macro2::TokenStream = input2.into();
 
+    const VERTIGO_VERSION_MAJOR: u32 = pkg_version::pkg_version_major!();
+    const VERTIGO_VERSION_MINOR: u32 = pkg_version::pkg_version_minor!();
+
     quote! {
         #input
 
         #[no_mangle]
-        pub fn vertigo_entry_function() {
+        pub fn vertigo_entry_function(version: (u32, u32)) {
             vertigo::start_app(#name);
+            if true || version.0 != #VERTIGO_VERSION_MAJOR || version.1 != #VERTIGO_VERSION_MINOR {
+                vertigo::log::error!(
+                    "Vertigo version mismatch, server {}.{} != client {}.{}",
+                    version.0, version.1,
+                    #VERTIGO_VERSION_MAJOR, #VERTIGO_VERSION_MINOR
+                );
+            }
         }
     }.into()
 }

crates/vertigo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vertigo"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 description = "Reactive Real-DOM library with SSR for Rust"
 readme = "README.md"
@@ -14,4 +14,4 @@ edition = "2021"
 
 [dependencies]
 log = { version = "0.4", features=["std"] }
-vertigo-macro = { path = "../../crates/vertigo-macro", version="0.3.1" }
+vertigo-macro = { path = "../../crates/vertigo-macro", version = "0.4.0" }

crates/vertigo/src/driver_module/src_js/index.ts

@@ -1,5 +1,9 @@
 import { WasmModule } from "./wasm_module";
 
+// vertigo-cli compatibility version, change together with package version.
+const VERTIGO_COMPAT_VERSION_MAJOR = 0;
+const VERTIGO_COMPAT_VERSION_MINOR = 4;
+
 const moduleRun: Set<string> = new Set();
 
 const runModule = async (wasm: string) => {
@@ -18,8 +22,8 @@ const runModule = async (wasm: string) => {
     console.info(`Wasm module: "${wasm}" -> start`);
     const wasmModule = await WasmModule.create(wasm);
     console.info(`Wasm module: "${wasm}" -> initialized`);
-    wasmModule.vertigo_entry_function();
-    console.info(`Wasm module: "${wasm}" -> launched vertigo_entry_function`);
+    wasmModule.vertigo_entry_function(VERTIGO_COMPAT_VERSION_MAJOR, VERTIGO_COMPAT_VERSION_MINOR);
+    console.info(`Wasm module: "${wasm}" -> launched vertigo_entry_function with version ${VERTIGO_COMPAT_VERSION_MAJOR}.${VERTIGO_COMPAT_VERSION_MINOR}`);
 };
 
 const findAndRunModule = async () => {

crates/vertigo/src/driver_module/src_js/wasm_module.ts

@@ -15,7 +15,7 @@ export type ExportType = {
     alloc: (size: number) => number,
     free: (pointer: number) => void,
     wasm_callback: (callback_id: bigint, value_ptr: number) => bigint,  //result => pointer: 32bit, size: 32bit
-    vertigo_entry_function: () => void,
+    vertigo_entry_function: (major: number, minor: number) => void,
 }
 
 export class WasmModule {
@@ -27,8 +27,8 @@ export class WasmModule {
         this.wasm = wasm;
     }
 
-    public vertigo_entry_function() {
-        this.wasm.exports.vertigo_entry_function();
+    public vertigo_entry_function(major: number, minor: number) {
+        this.wasm.exports.vertigo_entry_function(major, minor);
     }
 
     public static async create(wasmBinPath: string): Promise<WasmModule> {

crates/vertigo/src/driver_module/wasm_run.js

@@ -1879,8 +1879,8 @@ class WasmModule {
     constructor(wasm) {
         this.wasm = wasm;
     }
-    vertigo_entry_function() {
-        this.wasm.exports.vertigo_entry_function();
+    vertigo_entry_function(major, minor) {
+        this.wasm.exports.vertigo_entry_function(major, minor);
     }
     static async create(wasmBinPath) {
         let wasmModule = null;
@@ -1924,6 +1924,9 @@ class WasmModule {
     }
 }
 
+// vertigo-cli compatibility version, change together with package version.
+const VERTIGO_COMPAT_VERSION_MAJOR = 0;
+const VERTIGO_COMPAT_VERSION_MINOR = 4;
 const moduleRun = new Set();
 const runModule = async (wasm) => {
     if (moduleRun.has(wasm)) {
@@ -1938,8 +1941,8 @@ const runModule = async (wasm) => {
     console.info(`Wasm module: "${wasm}" -> start`);
     const wasmModule = await WasmModule.create(wasm);
     console.info(`Wasm module: "${wasm}" -> initialized`);
-    wasmModule.vertigo_entry_function();
-    console.info(`Wasm module: "${wasm}" -> launched vertigo_entry_function`);
+    wasmModule.vertigo_entry_function(VERTIGO_COMPAT_VERSION_MAJOR, VERTIGO_COMPAT_VERSION_MINOR);
+    console.info(`Wasm module: "${wasm}" -> launched vertigo_entry_function with version ${VERTIGO_COMPAT_VERSION_MAJOR}.${VERTIGO_COMPAT_VERSION_MINOR}`);
 };
 const findAndRunModule = async () => {
     document.querySelectorAll('*[data-vertigo-run-wasm]').forEach((node) => {

crates/vertigo/src/lib.rs

@@ -225,7 +225,6 @@ pub use vertigo_macro::css_block;
 
 pub mod html_entities;
 
-
 pub struct DriverConstruct {
     driver: Driver,
     subscription: ValueMut<Option<DomNode>>,

demo/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vertigo-demo"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 edition = "2021"
 
@@ -9,4 +9,4 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 log = "0.4.17"
-vertigo = { path = "../../crates/vertigo", version = "0.3.1" }
+vertigo = { path = "../../crates/vertigo", version = "0.4.0" }

examples/counter/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "vertigo-example-counter"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-vertigo = { path = "../../crates/vertigo", version = "0.3.2" }
+vertigo = { path = "../../crates/vertigo", version = "0.4.0" }

examples/router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vertigo-example-router"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 edition = "2021"
 
@@ -9,4 +9,4 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 log = "0.4.14"
-vertigo = { path = "../../crates/vertigo", version = "0.3.2" }
+vertigo = { path = "../../crates/vertigo", version = "0.4.0" }

examples/trafficlights/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "vertigo-example-trafficlights"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Grzegorz Szeliga <szeligagrzegorz@gmail.com>", "Michał Pokrywka <wolfmoon@o2.pl>"]
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-vertigo = { path = "../../crates/vertigo", version = "0.3.2" }
+vertigo = { path = "../../crates/vertigo", version = "0.4.0" }

tests/check_versions.sh

@@ -0,0 +1,39 @@
+VERTIGO_VERSION=`grep version crates/vertigo/Cargo.toml | head -1 | awk -F'[ ".]' '{printf("%s.%s", $4, $5)}'`
+MACRO_VERSION=`grep version crates/vertigo-macro/Cargo.toml | head -1 | awk -F'[ ".]' '{printf("%s.%s", $4, $5)}'`
+CLI_VERSION=`grep version crates/vertigo-cli/Cargo.toml | head -1 | awk -F'[ ".]' '{printf("%s.%s", $4, $5)}'`
+
+TS_MAJOR=`grep "const VERTIGO_COMPAT_VERSION_MAJOR" crates/vertigo/src/driver_module/src_js/index.ts | awk -F'[ ;]' '{print($4)}'`
+TS_MINOR=`grep "const VERTIGO_COMPAT_VERSION_MINOR" crates/vertigo/src/driver_module/src_js/index.ts | awk -F'[ ;]' '{print($4)}'`
+JS_MAJOR=`grep "const VERTIGO_COMPAT_VERSION_MAJOR" crates/vertigo/src/driver_module/wasm_run.js | awk -F'[ ;]' '{print($4)}'`
+JS_MINOR=`grep "const VERTIGO_COMPAT_VERSION_MINOR" crates/vertigo/src/driver_module/wasm_run.js | awk -F'[ ;]' '{print($4)}'`
+
+TS_VERSION="${TS_MAJOR}.${TS_MINOR}"
+JS_VERSION="${JS_MAJOR}.${JS_MINOR}"
+
+echo VERTIGO_VERSION $VERTIGO_VERSION
+echo MACRO_VERSION $MACRO_VERSION
+echo CLI_VERSION $CLI_VERSION
+echo TS_VERSION $TS_VERSION
+echo JS_VERSION $JS_VERSION
+
+if [ "$VERTIGO_VERSION" != "$MACRO_VERSION" ]
+then
+    echo "MACRO VERSION MISMATCH!" && exit 1
+fi
+
+if [ "$VERTIGO_VERSION" != "$CLI_VERSION" ]
+then
+    echo "CLI VERSION MISMATCH!" && exit 2
+fi
+
+if [ "$VERTIGO_VERSION" != "$TS_VERSION" ]
+then
+    echo "TS MAJOR/MINOR MISMATCH!" && exit 3
+fi
+
+if [ "$VERTIGO_VERSION" != "$JS_VERSION" ]
+then
+    echo "JS MAJOR/MINOR MISMATCH! JS not build?" && exit 4
+fi
+
+echo "OK"

tutorial.md

@@ -2,7 +2,7 @@
 <!-- markdownlint-disable no-inline-html -->
 
 <!-- markdownlint-disable-next-line no-emphasis-as-heading -->
-*Up to date with version 0.3.2*
+*Up to date with version 0.4.0*
 
 <!-- markdownlint-disable-next-line heading-increment -->
 ### Table of contents