Merge pull request #751 from wado-lang/claude/refactor-wasi-to-cm-attribute-wJyuO

Rename #[wasi("...")] attribute to #[cm("...")] for general CM support

Author: gfx

docs/compiler.md

@@ -281,7 +281,7 @@ The `WasiRegistry` module (`component_model.rs`) collects WASI import informatio
 
 **Purpose:**
 
-- Extract WASI version strings from `#[wasi(...)]` attributes (e.g., `0.3.0-rc-2025-09-16`)
+- Extract WASI version strings from `#[cm(...)]` attributes (e.g., `0.3.0-rc-2025-09-16`)
 - Map effect methods to function names using a unified naming scheme
 - Track which WASI interfaces are used for conditional import generation
 
@@ -336,7 +336,7 @@ Instead of a hardcoded whitelist, interfaces are included based on type support:
 To fully eliminate hardcoded CM structures, the registry would need to:
 
 1. Track WASI types (enums, resources) in addition to effect functions
-2. Parse enum variants from `#[wasi(...)]` annotated enums in wasi/\*.wado
+2. Parse enum variants from `#[cm(...)]` annotated enums in wasi/\*.wado
 3. Generate CM type definitions dynamically from parsed definitions
 
 ### Async Export Functions (`export async fn`)

docs/spec.md

@@ -2874,11 +2874,11 @@ assert rw as u32 == 3;
 // They produce a compile error; use bitwise operators (|, &, ^) instead
 ```
 
-Flags are implemented as newtypes over `u32`. Member names can carry `#[wasi("...")]` attributes for WIT/Component Model name mapping:
+Flags are implemented as newtypes over `u32`. Member names can carry `#[cm("...")]` attributes for Component Model name mapping:
 
 ```wado
 pub flags PathFlags {
-    #[wasi("symlink-follow")]
+    #[cm("symlink-follow")]
     SymlinkFollow,
 }
 ```
@@ -4346,23 +4346,23 @@ export async fn handle(request: Request) -> Result<Response, ErrorCode> {
 - The `task return` expression is type-checked against the declared return type of the enclosing `export async fn`.
 - The `async` keyword on a function declaration has no effect on callers; Wado is fully colorless. `async` only appears in `export async fn` declarations to signal CM async calling convention at the component boundary.
 
-### Attribute Syntax for WASI Linking
+### Attribute Syntax for Component Model Linking
 
-Use `#[wasi(...)]` attributes to link Wado definitions to WASI interfaces:
+Use `#[cm(...)]` attributes to link Wado definitions to Component Model interfaces:
 
 ```wado
-// Link an effect interface to a WASI interface
-#[wasi("wasi:cli/stdout@0.3.0-rc-2025-09-16")]
+// Link an effect interface to a CM interface
+#[cm("wasi:cli/stdout@0.3.0-rc-2025-09-16")]
 pub effect Stdout {
-    #[wasi("wasi:cli/stdout@0.3.0-rc-2025-09-16#write-via-stream")]
+    #[cm("wasi:cli/stdout@0.3.0-rc-2025-09-16#write-via-stream")]
     fn write_via_stream(data: Stream<u8>) -> Result<(), ErrorCode>;
 }
 
-// Link a resource to a WASI resource
-#[wasi("wasi:cli/terminal-output@0.3.0-rc-2025-09-16")]
+// Link a resource to a CM resource
+#[cm("wasi:cli/terminal-output@0.3.0-rc-2025-09-16")]
 resource TerminalOutput;
 
-// Link an enum to a WASI enum
+// Link an enum to a CM enum
 pub enum ErrorCode {  // Maps to WIT: enum error-code
     Io,               // Maps to WIT: io
     IllegalByteSequence,  // Maps to WIT: illegal-byte-sequence
@@ -4542,9 +4542,9 @@ fn realloc(oldptr: i32, oldsize: i32, align: i32, newsize: i32) -> i32;
 
 Marks a function as providing a compiler feature. The compiler uses these flags to enable optimizations and synthesis passes (e.g., `array_append`, `string_append`, `option`, `result`, `default`). Used in `core:prelude` method implementations.
 
-#### `#[wasi("interface@version")]` / `#[wasi_params(...)]`
+#### `#[cm("namespace:pkg/interface@version")]` / `#[cm_params(...)]`
 
-Links Wado definitions (effects, resources, enums) to WASI interfaces. See [Attribute Syntax for WASI Linking](#attribute-syntax-for-wasi-linking).
+Links Wado definitions (effects, resources, enums) to Component Model interfaces. See [Attribute Syntax for Component Model Linking](#attribute-syntax-for-component-model-linking).
 
 ### The "mem" Core Module
 

docs/wep-2026-04-01-tide.md

@@ -87,7 +87,7 @@ Pipeline:
 
 ### Unified Attribute: `#[cm("...")]`
 
-The current `#[wasi("...")]` attribute is WASI-specific. Tide introduces a generalized `#[cm("...")]` attribute for all Component Model ABI mappings, with the namespace encoded in the value:
+The `#[cm("...")]` attribute provides Component Model ABI mappings for all namespaces, with the namespace encoded in the value:
 
 ```wado
 // Web API binding
@@ -97,7 +97,7 @@ pub resource Element extends Node { ... }
 #[cm("web:dom#Element.getAttribute")]
 fn get_attribute(&self, name: String) -> Option<String>;
 
-// WASI binding (replaces #[wasi("...")])
+// WASI binding
 #[cm("wasi:http/types@0.3.0#request")]
 pub resource Request { ... }
 ```
@@ -111,7 +111,7 @@ Sub-attributes for method kinds:
 #[cm("web:url#[static]URL.createObjectURL")]  // static method
 ```
 
-Parameter name mapping (replaces `#[wasi_params(...)]`):
+Parameter name mapping:
 
 ```wado
 #[cm_params("self", "qualified-name")]
@@ -931,7 +931,7 @@ Organized by W3C/WHATWG specification, mirroring how `wasi/` is organized by WAS
 ### Language Changes Required
 
 - `resource extends` syntax — new compiler feature for resource inheritance.
-- `#[cm("...")]` attribute — replaces `#[wasi("...")]` for all CM bindings.
+- `#[cm("...")]` attribute — Component Model bindings with namespace in the value string.
 - `downcast::<T>()` built-in on resources with `extends`.
 - Implicit upcast coercion for resource reference types.
 

wado-cli/src/dump.rs

@@ -508,17 +508,17 @@ async fn run_single(opts: &DumpOptions, input: &str) {
                         .map(|t| format!(" -> {t}"))
                         .unwrap_or_default();
                     let wasi = f
-                        .wasi_import
+                        .cm_import
                         .as_ref()
-                        .map(|w| format!(" [wasi: {}]", w.interface_path()))
+                        .map(|w| format!(" [cm: {}]", w.interface_path()))
                         .unwrap_or_default();
                     format!("fn({}){ret}{effects}{wasi}", f.params.join(", "))
                 }
                 wado_compiler::symbol::SymbolKind::Effect(e) => {
                     let wasi = e
-                        .wasi_import
+                        .cm_import
                         .as_ref()
-                        .map(|w| format!(" [wasi: {}]", w.interface_path()))
+                        .map(|w| format!(" [cm: {}]", w.interface_path()))
                         .unwrap_or_default();
                     format!("effect{{ {} }}{wasi}", e.methods.join(", "))
                 }
@@ -553,9 +553,9 @@ async fn run_single(opts: &DumpOptions, input: &str) {
                 }
                 wado_compiler::symbol::SymbolKind::Resource(r) => {
                     let wasi = r
-                        .wasi_import
+                        .cm_import
                         .as_ref()
-                        .map(|w| format!(" [wasi: {}]", w.interface_path()))
+                        .map(|w| format!(" [cm: {}]", w.interface_path()))
                         .unwrap_or_default();
                     format!("resource{{ {} }}{wasi}", r.methods.join(", "))
                 }

wado-compiler/lib/wasi/cli/environment.wado

@@ -3,7 +3,7 @@
 // Source files:
 //   - vendor/wasmtime/crates/wasi/src/p3/wit/deps/cli.wit
 
-#[wasi("wasi:cli/environment@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/environment@0.3.0-rc-2026-03-15")]
 pub effect Environment {
     /// Get the POSIX-style environment variables.
     /// 
@@ -13,14 +13,14 @@ pub effect Environment {
     /// Morally, these are a value import, but until value imports are available
     /// in the component model, this import function should return the same
     /// values each time it is called.
-    #[wasi("wasi:cli/environment@0.3.0-rc-2026-03-15#get-environment")]
+    #[cm("wasi:cli/environment@0.3.0-rc-2026-03-15#get-environment")]
     fn get_environment() -> Array<[String, String]>;
     /// Get the POSIX-style arguments to the program.
-    #[wasi("wasi:cli/environment@0.3.0-rc-2026-03-15#get-arguments")]
+    #[cm("wasi:cli/environment@0.3.0-rc-2026-03-15#get-arguments")]
     fn get_arguments() -> Array<String>;
     /// Return a path that programs should use as their initial current working
     /// directory, interpreting `.` as shorthand for this.
-    #[wasi("wasi:cli/environment@0.3.0-rc-2026-03-15#get-initial-cwd")]
+    #[cm("wasi:cli/environment@0.3.0-rc-2026-03-15#get-initial-cwd")]
     fn get_initial_cwd() -> Option<String>;
 }
 

wado-compiler/lib/wasi/cli/exit.wado

@@ -3,11 +3,11 @@
 // Source files:
 //   - vendor/wasmtime/crates/wasi/src/p3/wit/deps/cli.wit
 
-#[wasi("wasi:cli/exit@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/exit@0.3.0-rc-2026-03-15")]
 pub effect Exit {
     /// Exit the current instance and any linked instances.
-    #[wasi("wasi:cli/exit@0.3.0-rc-2026-03-15#exit")]
-    #[wasi_params("status")]
+    #[cm("wasi:cli/exit@0.3.0-rc-2026-03-15#exit")]
+    #[cm_params("status")]
     fn exit(status: Result<(), ()>);
     /// Exit the current instance and any linked instances, reporting the
     /// specified status code to the host.
@@ -17,8 +17,8 @@ pub effect Exit {
     /// 
     /// This function does not return; the effect is analogous to a trap, but
     /// without the connotation that something bad has happened.
-    #[wasi("wasi:cli/exit@0.3.0-rc-2026-03-15#exit-with-code")]
-    #[wasi_params("status-code")]
+    #[cm("wasi:cli/exit@0.3.0-rc-2026-03-15#exit-with-code")]
+    #[cm_params("status-code")]
     fn exit_with_code(status_code: u8);
 }
 

wado-compiler/lib/wasi/cli/run.wado

@@ -3,10 +3,10 @@
 // Source files:
 //   - vendor/wasmtime/crates/wasi/src/p3/wit/deps/cli.wit
 
-#[wasi("wasi:cli/run@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/run@0.3.0-rc-2026-03-15")]
 pub effect Run {
     /// Run the program.
-    #[wasi("wasi:cli/run@0.3.0-rc-2026-03-15#run")]
+    #[cm("wasi:cli/run@0.3.0-rc-2026-03-15#run")]
     async fn run() -> Result<(), ()>;
 }
 

wado-compiler/lib/wasi/cli/stderr.wado

@@ -6,7 +6,7 @@
 use { ErrorCode } from "wasi:cli/types.wado";
 
 
-#[wasi("wasi:cli/stderr@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/stderr@0.3.0-rc-2026-03-15")]
 pub effect Stderr {
     /// Write the given stream to stderr.
     /// 
@@ -16,8 +16,8 @@ pub effect Stderr {
     /// 
     /// Otherwise if there is an error the readable end of the stream will be
     /// dropped and this function will return an error-code.
-    #[wasi("wasi:cli/stderr@0.3.0-rc-2026-03-15#write-via-stream")]
-    #[wasi_params("data")]
+    #[cm("wasi:cli/stderr@0.3.0-rc-2026-03-15#write-via-stream")]
+    #[cm_params("data")]
     fn write_via_stream(data: Stream<u8>) -> Future<Result<(), ErrorCode>>;
 }
 

wado-compiler/lib/wasi/cli/stdin.wado

@@ -6,7 +6,7 @@
 use { ErrorCode } from "wasi:cli/types.wado";
 
 
-#[wasi("wasi:cli/stdin@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/stdin@0.3.0-rc-2026-03-15")]
 pub effect Stdin {
     /// Return a stream for reading from stdin.
     /// 
@@ -21,7 +21,7 @@ pub effect Stdin {
     /// 
     /// Multiple streams may be active at the same time. The behavior of concurrent
     /// reads is implementation-specific.
-    #[wasi("wasi:cli/stdin@0.3.0-rc-2026-03-15#read-via-stream")]
+    #[cm("wasi:cli/stdin@0.3.0-rc-2026-03-15#read-via-stream")]
     fn read_via_stream() -> [Stream<u8>, Future<Result<(), ErrorCode>>];
 }
 

wado-compiler/lib/wasi/cli/stdout.wado

@@ -6,7 +6,7 @@
 use { ErrorCode } from "wasi:cli/types.wado";
 
 
-#[wasi("wasi:cli/stdout@0.3.0-rc-2026-03-15")]
+#[cm("wasi:cli/stdout@0.3.0-rc-2026-03-15")]
 pub effect Stdout {
     /// Write the given stream to stdout.
     /// 
@@ -16,8 +16,8 @@ pub effect Stdout {
     /// 
     /// Otherwise if there is an error the readable end of the stream will be
     /// dropped and this function will return an error-code.
-    #[wasi("wasi:cli/stdout@0.3.0-rc-2026-03-15#write-via-stream")]
-    #[wasi_params("data")]
+    #[cm("wasi:cli/stdout@0.3.0-rc-2026-03-15#write-via-stream")]
+    #[cm_params("data")]
     fn write_via_stream(data: Stream<u8>) -> Future<Result<(), ErrorCode>>;
 }