refactor chapter 6 into 1 chapter for running and 1 for composing/distributing

Author: macovedj

component-model/book.toml

@@ -9,6 +9,14 @@ title = "The WebAssembly Component Model"
 git-repository-url = "https://github.com/bytecodealliance/component-docs/tree/main/component-model"
 edit-url-template = "https://github.com/bytecodealliance/component-docs/tree/main/component-model/{path}"
 additional-css = ["theme/head.hbs"]
+[output.html.redirect]
+"/creating-and-consuming/composing.html" = "/composing-and-distributing/composing.html"
+"/creating-and-consuming/distributing.html" = "/composing-and-distributing/distributing.html"
+"/creating-and-consuming/running.html" = "/running-components.html"
+"/creating-and-consuming/authoring.html" = "/language-support.html"
+"/creating-and-consuming.html" = "/language-support.html"
+"/runtimes/wasmtime.html" = "/running-components/wasmtime.html"
+"/runtimes/jco.html" = "/running-components/jco.html"
 
 [preprocessor.alerts]
 

component-model/src/SUMMARY.md

@@ -22,16 +22,14 @@
   - [JavaScript](./language-support/javascript.md)
   - [Python](./language-support/python.md)
   - [Rust](./language-support/rust.md)
-- [Creating and Consuming Components](./creating-and-consuming.md)
-  - [Composing Components](./creating-and-consuming/composing.md)
-  - [Distributing and Fetching Components and WIT](./creating-and-consuming/distributing.md)
+- [Running Components](./running-components.md)
+  - [Wasmtime](./running-components/wasmtime.md)
+  - [jco](./running-components/jco.md)
+- [Consuming and Distributing Components](./composing-and-distributing.md)
+  - [Composing Components](./composing-and-distributing/composing.md)
+  - [Distributing and Fetching Components and WIT](./composing-and-distributing/distributing.md)
 - [Tutorial](./tutorial.md)
 
-# Runtime Support
-
-- [Wasmtime](./runtimes/wasmtime.md)
-- [jco](./runtimes/jco.md)
-
 # Advanced Topics
 
 - [Canonical ABI](./advanced/canonical-abi.md)

component-model/src/creating-and-consuming.md renamed to component-model/src/composing-and-distributing.md

@@ -1,3 +1,3 @@
-# Creating and Consuming Components
+# Composing and Distributing Components
 
 The component model defines how components interface to each other and to hosts. This section describes how to work with components - from authoring them in custom code or by composing existing components, through to using them in applications and distributing them via registries.

component-model/src/creating-and-consuming/composing.md renamed to component-model/src/composing-and-distributing/composing.md

@@ -23,9 +23,9 @@ The WebAssembly Component Model is a broad-reaching architecture for building in
 [Python]: ./language-support/python.md
 [Rust]: ./language-support/rust.md
 
-[Composing]: ./creating-and-consuming/composing.md
-[Running]: ./creating-and-consuming/running.md
-[Distributing]: ./creating-and-consuming/distributing.md
+[Composing]: ./composing-and-distributing/composing.md
+[Running]: ./running-components/running.md
+[Distributing]: ./composing-and-distributing/distributing.md
 
 > [!NOTE]
 >This documentation is aimed at _users_ of the component model: developers of libraries and applications.

component-model/src/creating-and-consuming/distributing.md renamed to component-model/src/composing-and-distributing/distributing.md

@@ -89,4 +89,4 @@ working with WebAssembly modules and components.
 You can "run" a component by calling one of its exports. Hosts and runtimes often only support
 running components with certain exports. The [`wasmtime`](https://github.com/bytecodealliance/wasmtime) CLI can only run "command" components, so in
 order to run the `add` function above, it first must be composed with a primary "command" component
-that calls it. See [documentation on running components](./runtimes/wasmtime.md) for more details.
+that calls it. See [documentation on running components](./running-components/wasmtime.md) for more details.

component-model/src/introduction.md

@@ -54,7 +54,7 @@ download a pre-existing interface that defines what your component should do.
 The [`adder` world][adder-world] contains an interface with a single `add` function that sums two numbers:
 
 ```wit
-{{#include ../../exmaples/tutorial/wit/adder/world.wit}}
+{{#include ../../examples/tutorial/wit/adder/world.wit}}
 ```
 
 > [!NOTE]

component-model/src/language-support.md

@@ -207,7 +207,7 @@ world root {
 ```
 
 As the import is unfulfilled, the `calculator.wasm` component could not run by itself in its current form. To fulfill the `add` import, so that
-only `calculate` is exported, you would need to [compose the `calculator.wasm` with some `adder.wasm` into a single, self-contained component](../creating-and-consuming/composing.md).
+only `calculate` is exported, you would need to [compose the `calculator.wasm` with some `adder.wasm` into a single, self-contained component](../composing-and-distributing/composing.md).
 
 ## Creating a command component with `cargo component`
 
@@ -284,7 +284,7 @@ As mentioned above, `cargo component build` doesn't generate a WIT file for a co
     }
     ```
 
-5. [Compose the command component with the `.wasm` components that implement the imports.](../creating-and-consuming/composing.md)
+5. [Compose the command component with the `.wasm` components that implement the imports.](../composing-and-distributing/composing.md)
 
 6. Run the composed component:
 
@@ -488,7 +488,7 @@ To use the calculator engine in another component, that component must import th
     }
     ```
 
-You can now build the command component and [compose it with the `.wasm` component that implements the resource.](../creating-and-consuming/composing.md). You can then run the composed command with `wasmtime run`.
+You can now build the command component and [compose it with the `.wasm` component that implements the resource.](../composing-and-distributing/composing.md). You can then run the composed command with `wasmtime run`.
 
 ### Implementing and exporting a resource implementation in a host
 

component-model/src/language-support/javascript.md

@@ -0,0 +1,3 @@
+# Running Components
+
+There are two standard wit worlds that runtimes support. These worlds are the [`wasi:cli/command` world](https://github.com/WebAssembly/wasi-cli/blob/main/wit/command.wit) and the [`wasi:http/proxy` world](https://github.com/WebAssembly/wasi-http/blob/main/wit/proxy.wit). All other wit worlds and interfaces are considered to be custom.  In the following sections, you'll see how to run components that implement either world, as well as how to invoke custom exports.