Merge branch 'unstable' into stable

Author: markcda

.depl/config.yaml

@@ -1,5 +1,5 @@
 project_name: cc-monorepo
-version: 4
+version: 5
 langs:
   - rust
 targets:
@@ -18,20 +18,7 @@ cache_files:
   - .git
   - Cargo.lock
   - target
-artifacts:
-  - target/x86_64-unknown-linux-gnu/release/cc-static-server
-  - cc-static-server/static-server.yaml
-  - target/x86_64-unknown-linux-gnu/doc
 variables: []
-place_artifacts_into_project_root:
-  - from: target/x86_64-unknown-linux-gnu/release/cc-static-server
-    to: static-server/cc-static-server
-  - from: cc-static-server/static-server.yaml
-    to: static-server/static-server.yaml
-  - from: cc-error-pages/dist
-    to: cc-error-pages/dist
-  - from: target/x86_64-unknown-linux-gnu/doc
-    to: docs
 pipelines:
   - title: common-ops
     desc: Common monorepo operations
@@ -41,9 +28,11 @@ pipelines:
       - clippy
       - lint
     default: true
+    artifacts:
+      - from: target/x86_64-unknown-linux-gnu/doc
+        to: docs
     actions:
       - title: Lint `cc-utils` on x86-64
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -56,7 +45,6 @@ pipelines:
           commands:
             - bash_c: RUSTFLAGS='--cfg reqwest_unstable' cargo clippy --package cc-utils --target x86_64-unknown-linux-gnu
       - title: Lint `cc-utils` on wasm32
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -69,7 +57,6 @@ pipelines:
           commands:
             - bash_c: RUSTFLAGS='--cfg reqwest_unstable' cargo clippy --package cc-utils --target wasm32-unknown-unknown --no-default-features --features=reqwest
       - title: Lint `cc-ui-kit`
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -82,7 +69,6 @@ pipelines:
           commands:
             - bash_c: cargo clippy --package cc-ui-kit --target wasm32-unknown-unknown
       - title: Lint `cc-error-pages`
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -95,7 +81,6 @@ pipelines:
           commands:
             - bash_c: cargo clippy --package cc-error-pages --target wasm32-unknown-unknown
       - title: Lint `cc-server-kit`
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -108,7 +93,6 @@ pipelines:
           commands:
             - bash_c: RUSTFLAGS='--cfg reqwest_unstable' cargo clippy --package cc-server-kit --target x86_64-unknown-linux-gnu
       - title: Lint `cc-server-kit-dsl`
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -121,7 +105,6 @@ pipelines:
           commands:
             - bash_c: cargo clippy --package skdsl --target x86_64-unknown-linux-gnu
       - title: Lint `cc-static-server`
-        desc: Получено из `Cargo Clippy`.
         info: cargo-clippy@0.1.0
         tags:
           - cargo
@@ -134,7 +117,6 @@ pipelines:
           commands:
             - bash_c: cargo clippy --package cc-static-server --target x86_64-unknown-linux-gnu
       - title: Format
-        desc: Получено из `Format `.rs` files`.
         info: cargo-fmt@0.1.0
         tags: []
         exec_in_project_dir: true
@@ -145,7 +127,6 @@ pipelines:
           commands:
             - bash_c: cargo fmt -- --config tab_spaces=2,max_width=120 */**/*.rs
       - title: Test docs
-        desc: ''
         info: cargo-doc@0.1.0
         tags:
           - cargo
@@ -158,7 +139,6 @@ pipelines:
           commands:
             - bash_c: cargo test --doc
       - title: Generate docs
-        desc: ''
         info: cargo-doc@0.1.0
         tags:
           - cargo
@@ -178,17 +158,20 @@ pipelines:
       - clippy
       - lint
     default: true
+    artifacts:
+      - from: target/x86_64-unknown-linux-gnu/release/cc-static-server
+        to: static-server/cc-static-server
+      - from: cc-static-server/static-server.yaml
+        to: static-server/static-server.yaml
     actions:
       - title: Sync script to know Rust package version
-        desc: ""
         info: sync-rust-crate-ver@0.1.0
         tags: []
         exec_in_project_dir: false
         action:
           type: use_from_storage
           content_info: get-know-rust-package-version@latest
       - title: Cargo Build (Release)
-        desc: Build the Rust project with Cargo default settings in release mode
         info: cargo-rel@0.1.0
         tags:
           - rust
@@ -206,7 +189,6 @@ pipelines:
               show_success_output: false
               show_bash_c: true
       - title: UPX Compress
-        desc: Compress the binary with UPX.
         info: upx-compress@0.1.0
         tags:
           - upx
@@ -242,7 +224,6 @@ pipelines:
                           type: plain
                           value: target/x86_64-unknown-linux-gnu/release/cc-static-server
       - title: Auto-upload CC Static Server to Deployer's Storage
-        desc: ""
         info: auto-upload-static-server@0.1.0
         tags: []
         exec_in_project_dir: false
@@ -275,9 +256,11 @@ pipelines:
       - wasm
       - web
     default: true
+    artifacts:
+      - from: cc-error-pages/dist
+        to: cc-error-pages/dist
     actions:
       - title: Format `leptos` macroses
-        desc: Format Leptos `.rs` files
         info: leptos-fmt@0.1.0
         tags:
           - rust
@@ -298,7 +281,6 @@ pipelines:
               show_bash_c: true
               only_when_fresh: false
       - title: Format Rust code
-        desc: Format `.rs` files
         info: cargo-fmt@0.1.0
         tags:
           - rust
@@ -316,7 +298,6 @@ pipelines:
               show_bash_c: true
               only_when_fresh: false
       - title: Compile Tailwind Styles
-        desc: Получено из `Compile Tailwind Styles`. Compile application style classes with `tailwindcss` JS util.
         info: tailwind-css@0.1.0
         tags:
           - rust
@@ -334,7 +315,6 @@ pipelines:
               show_bash_c: true
               only_when_fresh: false
       - title: Trunk Build
-        desc: Получено из `Trunk Build`. Build WASM application with `trunk` in release mode.
         info: trunk-release@0.1.0
         tags:
           - cargo
@@ -351,13 +331,16 @@ pipelines:
           supported_langs:
             - rust
           commands:
-            - bash_c: trunk build --release --config cc-error-pages/Trunk.toml
+            - bash_c: >
+                RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" 
+                CARGO_UNSTABLE_BUILD_STD="std,panic_abort" 
+                CARGO_UNSTABLE_BUILD_STD_FEATURES="optimize_for_size,panic_immediate_abort" 
+                trunk build --release --config cc-error-pages/Trunk.toml
               ignore_fails: false
               show_success_output: false
               show_bash_c: true
               only_when_fresh: false
       - title: Optimize WASM
-        desc: Run `wasm-opt` with `-Oz` argument inside `dist` folder
         info: wasm-opt@0.1.0
         tags:
           - wasm
@@ -371,7 +354,7 @@ pipelines:
           supported_langs:
             - rust
           commands:
-            - bash_c: wasm-opt -Oz --all-features -o {file} {file}
+            - bash_c: wasm-opt -Oz --all-features --strip-debug -o {file} {file}
               ignore_fails: false
               show_success_output: false
               show_bash_c: true
@@ -388,7 +371,6 @@ pipelines:
                           type: plain
                           value: cc-error-pages/dist/cc-error-pages_bg.wasm
       - title: Add `tailwind.css` from `public` to `dist`
-        desc: ""
         info: add-tailwind-css-to-dist-folder@0.1.0
         tags: []
         exec_in_project_dir: false
@@ -403,7 +385,6 @@ pipelines:
               show_bash_c: true
               only_when_fresh: false
       - title: Add `favicon.ico` from `public` to `dist`
-        desc: ""
         info: add-favicon-to-dist-folder@0.1.0
         tags: []
         exec_in_project_dir: false
@@ -425,6 +406,9 @@ pipelines:
       - clippy
       - lint
     default: true
+    artifacts:
+      - from: target/x86_64-unknown-linux-gnu/release/skdsl
+        to: skdsl
     actions:
       - title: Lint
         info: cargo-clippy@0.1.0
@@ -456,7 +440,6 @@ pipelines:
           commands:
             - bash_c: cd cc-server-kit-dsl && cargo fmt -- --config tab_spaces=2,max_width=120 */**/*.rs
       - title: Cargo Build (Release)
-        desc: Build the Rust project with Cargo default settings in release mode
         info: cargo-rel@0.1.0
         tags:
           - rust
@@ -474,7 +457,6 @@ pipelines:
               show_success_output: false
               show_bash_c: true
       - title: UPX Compress
-        desc: Compress the binary with UPX.
         info: upx-compress@0.1.0
         tags:
           - upx
@@ -540,7 +522,10 @@ pipelines:
     info: cc-services-skdsl-debug@0.1.0
     tags:
       - cargo
-    default: true
+    default: false
+    artifacts:
+      - from: target/x86_64-unknown-linux-gnu/debug/skdsl
+        to: skdsl-debug
     actions:
       - title: Lint
         info: cargo-clippy@0.1.0
@@ -559,7 +544,6 @@ pipelines:
           commands:
             - bash_c: cargo clippy --package skdsl --target x86_64-unknown-linux-gnu
       - title: Cargo Build
-        desc: Build the Rust project with Cargo default settings in release mode
         info: cargo-build@0.1.0
         tags:
           - rust

Cargo.toml

@@ -10,7 +10,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 license = "MIT"
 authors = ["Klimenty Titov <aclo.create@gmail.com>"]
@@ -27,8 +27,11 @@ bytes = "1"
 clap = { version = "4", features = ["derive"] }
 console_error_panic_hook = "0.1.7"
 console_log = "1"
+dashmap = "6.1"
 encoding_rs = "0.8"
 flate2 = { version = "1", default-features = false }
+fs-change-notifier = "0.1.3"
+headers = "0.4"
 http-body-util = "0.1"
 icondata = { version = "0.5", default-features = false }
 leptos = { version = "0.7", default-features = false }
@@ -38,14 +41,14 @@ leptos_router = "0.7"
 leptos-use = { version = "0.15.5", default-features = false }
 log = "0.4"
 mime = "0.3"
-notify = "6.1"
+notify = "8.0"
 opentelemetry = "0.29"
 opentelemetry-otlp = { version = "0.29", default-features = false }
 opentelemetry_sdk = { version = "0.29", default-features = false }
 reqwest = { version = "0.12", default-features = false }
 rmp-serde = "1.3"
 rustls = "0.23"
-salvo = { git = "https://github.com/salvo-rs/salvo.git", version = "0.79.0", default-features = false }
+salvo = { version = "^0.80.0", default-features = false }
 serde = { version = "1", default-features = false }
 serde_yaml = "0.9"
 smart-patcher = { git = "https://github.com/impulse-sw/smart-patcher.git", tag = "0.2.1", default-features = false }

TODO.md

@@ -0,0 +1,4 @@
+# TODO
+
+- [ ] add type definition support inside SK DSL
+- [ ] add API client generation support inside SK DSL

cc-server-kit-dsl/src/entities/api.rs

@@ -400,12 +400,12 @@ pub fn generate_api_endpoint(endpoint: &Api, tag: &TaggedApi, api_desc: &File) -
 
   if let Some(Outgoing::Body(body)) = outgoing.iter().find(|o| o.is_body()) {
     match body {
-      super::outgoing::OutBody::Ok => lines.push(String::from("  ok!()")),
-      super::outgoing::OutBody::Plain => lines.push(String::from("  plain!(text)")),
-      super::outgoing::OutBody::Html => lines.push(String::from("  html!(text)")),
-      super::outgoing::OutBody::File => lines.push(String::from("  file_upload!(filepath, filename)")),
-      super::outgoing::OutBody::Json { .. } => lines.push(String::from("  json!(data)")),
-      super::outgoing::OutBody::MsgPack { .. } => lines.push(String::from("  msgpack!(data)")),
+      super::outgoing::OutBody::Ok => lines.push(String::from("  // ok!()")),
+      super::outgoing::OutBody::Plain => lines.push(String::from("  // plain!(text)")),
+      super::outgoing::OutBody::Html => lines.push(String::from("  // html!(text)")),
+      super::outgoing::OutBody::File => lines.push(String::from("  // file_upload!(filepath, filename)")),
+      super::outgoing::OutBody::Json { .. } => lines.push(String::from("  // json!(data)")),
+      super::outgoing::OutBody::MsgPack { .. } => lines.push(String::from("  // msgpack!(data)")),
     }
   }