Decouple runtime-only pd-vm from pd-edge ABI

Author: fffonion

.github/workflows/ci.yml

@@ -19,16 +19,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: rustscript
-      - uses: actions/checkout@v4
-        with:
-          repository: rustscript-lang/pd-edge
-          path: pd-edge
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
       - name: Format check
         working-directory: rustscript
         run: cargo fmt --all -- --check
+      - name: Runtime-only dependency check
+        working-directory: rustscript
+        run: cargo check -p pd-vm --no-default-features --features runtime
       - name: Clippy
         working-directory: rustscript
         run: cargo clippy --workspace --all-targets --all-features
@@ -47,10 +46,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: rustscript
-      - uses: actions/checkout@v4
-        with:
-          repository: rustscript-lang/pd-edge
-          path: pd-edge
       - uses: dtolnay/rust-toolchain@stable
       - name: Build pd-vm CLI
         working-directory: rustscript

.github/workflows/publish-crates.yml

@@ -39,11 +39,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: rustscript
-      - name: Checkout pd-edge dependency
-        uses: actions/checkout@v4
-        with:
-          repository: rustscript-lang/pd-edge
-          path: pd-edge
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
       - name: Publish crates

Cargo.lock

@@ -26,9 +26,10 @@ name = "vm"
 [features]
 default = ["runtime", "cli", "cranelift-jit", "http", "tls", "websocket"]
 runtime = []
-http = ["edge_abi/http"]
+edge-abi = ["dep:edge_abi"]
+http = ["edge-abi", "edge_abi/http"]
 http2 = ["http", "edge_abi/http2"]
-mqtt = ["edge_abi/mqtt"]
+mqtt = ["edge-abi", "edge_abi/mqtt"]
 tls = ["http", "edge_abi/tls"]
 websocket = ["http", "edge_abi/websocket"]
 webrtc = ["http", "edge_abi/webrtc"]
@@ -55,7 +56,7 @@ cranelift-jit = { version = "0.129.1", optional = true }
 cranelift-module = { version = "0.129.1", optional = true }
 cranelift-native = { version = "0.129.1", optional = true }
 pd-host-function = { path = "./pd-host-function", version = "0.1.0" }
-edge_abi = { package = "pd-edge-abi", path = "../pd-edge/pd-edge-abi", version = "0.1.0", default-features = false }
+edge_abi = { package = "pd-edge-abi", version = "0.1.1", default-features = false, optional = true }
 futures-channel = "0.3"
 paste = "1"
 regex = "1"

Cargo.toml

@@ -16,4 +16,4 @@ runtime = ["vm/runtime"]
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 vm = { package = "pd-vm", path = "..", default-features = false }
-edge_abi = { package = "pd-edge-abi", path = "../../pd-edge/pd-edge-abi" }
+edge_abi = { package = "pd-edge-abi", version = "0.1.1" }

pd-vm-wasm/Cargo.toml

@@ -117,6 +117,7 @@ pub struct StructDecl {
 }
 
 fn known_host_accepts_arity(name: &str, arity: u8) -> bool {
+    #[cfg(feature = "edge-abi")]
     if let Some(function) = edge_abi::function_by_name(name) {
         return function.param_types.len() == usize::from(arity);
     }

src/compiler/ir.rs

@@ -14,6 +14,7 @@ pub(super) fn is_virtual_host_namespace_spec(spec: &str) -> bool {
     is_ident_start(first) && chars.all(is_ident_continue)
 }
 
+#[cfg(feature = "edge-abi")]
 fn abi_value_type_to_value_type(value: edge_abi::AbiValueType) -> ValueType {
     match value {
         edge_abi::AbiValueType::Unknown => ValueType::Unknown,
@@ -29,15 +30,25 @@ fn abi_value_type_to_value_type(value: edge_abi::AbiValueType) -> ValueType {
 }
 
 fn known_host_return_type(name: &str) -> ValueType {
-    edge_abi::function_by_name(name)
-        .map(|function| abi_value_type_to_value_type(function.return_type))
+    edge_host_return_type(name)
         .or_else(|| {
             default_host_callable(name)
                 .and_then(|callable| parse_host_return_value_type(callable.signature.return_type))
         })
         .unwrap_or(ValueType::Unknown)
 }
 
+#[cfg(feature = "edge-abi")]
+fn edge_host_return_type(name: &str) -> Option<ValueType> {
+    edge_abi::function_by_name(name)
+        .map(|function| abi_value_type_to_value_type(function.return_type))
+}
+
+#[cfg(not(feature = "edge-abi"))]
+fn edge_host_return_type(_name: &str) -> Option<ValueType> {
+    None
+}
+
 fn known_host_return_schema(name: &str) -> Option<TypeSchema> {
     default_host_callable(name)
         .and_then(|callable| parse_host_return_schema(callable.signature.return_type))
@@ -102,6 +113,7 @@ fn parse_simple_host_return_schema(spec: &str) -> Option<TypeSchema> {
 }
 
 fn known_host_accepts_arity(name: &str, arity: u8) -> bool {
+    #[cfg(feature = "edge-abi")]
     if let Some(function) = edge_abi::function_by_name(name) {
         return function.param_types.len() == usize::from(arity);
     }

src/compiler/parser/symbols.rs

@@ -1,6 +1,8 @@
 use std::collections::{HashMap, HashSet};
 
-use crate::builtins::{BuiltinFunction, CallableParam, CallableParamType};
+use crate::builtins::BuiltinFunction;
+#[cfg(feature = "edge-abi")]
+use crate::builtins::{CallableParam, CallableParamType};
 
 use super::super::CompileError;
 use super::super::TypingMode;
@@ -1221,23 +1223,30 @@ pub(super) fn known_host_signature(name: &str) -> Option<HostCallableSignature>
         });
     }
 
-    let function = edge_abi::function_by_name(name)?;
-    Some(HostCallableSignature {
-        name: name.to_string(),
-        params: function
-            .param_names
-            .iter()
-            .copied()
-            .zip(function.param_types.iter().copied())
-            .map(|(param_name, param_type)| CallableParam {
-                name: param_name,
-                ty: callable_param_type_from_abi(param_type),
-                optional: false,
-            })
-            .collect(),
-    })
+    #[cfg(feature = "edge-abi")]
+    {
+        let function = edge_abi::function_by_name(name)?;
+        Some(HostCallableSignature {
+            name: name.to_string(),
+            params: function
+                .param_names
+                .iter()
+                .copied()
+                .zip(function.param_types.iter().copied())
+                .map(|(param_name, param_type)| CallableParam {
+                    name: param_name,
+                    ty: callable_param_type_from_abi(param_type),
+                    optional: false,
+                })
+                .collect(),
+        })
+    }
+
+    #[cfg(not(feature = "edge-abi"))]
+    None
 }
 
+#[cfg(feature = "edge-abi")]
 pub(super) fn callable_param_type_from_abi(value: edge_abi::AbiParamType) -> CallableParamType {
     match value {
         edge_abi::AbiParamType::Any => CallableParamType::Any,