fix type hints; bump version to 0.9.0 (#49)

This fixes the type hints so Python, pdoc3, etc. can handle them -- not just
MyPy.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "componentize-py"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 exclude = ["cpython"]
 

Cargo.toml

@@ -13,15 +13,15 @@ snapshot, which may differ from later revisions.
 ## Prerequisites
 
 * `Wasmtime` 16.0.0 (later versions may use a different, incompatible `wasi-cli` snapshot)
-* `componentize-py` 0.8.0
+* `componentize-py` 0.9.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v16.0.0.
 
 ```
 cargo install --version 16.0.0 wasmtime-cli
-pip install componentize-py==0.8.0
+pip install componentize-py==0.9.0
 ```
 
 ## Running the demo

examples/cli/README.md

@@ -14,15 +14,15 @@ which may differ from later revisions.
 ## Prerequisites
 
 * `Wasmtime` 16.0.0 (later versions may use a different, incompatible `wasi-http` snapshot)
-* `componentize-py` 0.8.0
+* `componentize-py` 0.9.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v16.0.0.
 
 ```
 cargo install --version 16.0.0 wasmtime-cli
-pip install componentize-py==0.8.0
+pip install componentize-py==0.9.0
 ```
 
 ## Running the demo

examples/http/README.md

@@ -11,7 +11,7 @@ within a guest component.
 ## Prerequisites
 
 * `wasmtime` 16.0.0 (later versions may use a different, incompatible `wasi-cli` snapshot)
-* `componentize-py` 0.8.0
+* `componentize-py` 0.9.0
 * `NumPy`, built for WASI
 
 Note that we use an unofficial build of NumPy since the upstream project does
@@ -23,7 +23,7 @@ https://github.com/bytecodealliance/wasmtime/releases/tag/v16.0.0.
 
 ```
 cargo install --version 16.0.0 wasmtime-cli
-pip install componentize-py==0.8.0
+pip install componentize-py==0.9.0
 curl -OL https://github.com/dicej/wasi-wheels/releases/download/v0.0.1/numpy-wasi.tar.gz
 tar xf numpy-wasi.tar.gz
 ```

examples/matrix-math/README.md

@@ -14,15 +14,15 @@ snapshot, which may differ from later revisions.
 ## Prerequisites
 
 * `Wasmtime` 16.0.0 (later versions may use a different, incompatible `wasi-cli` snapshot)
-* `componentize-py` 0.8.0
+* `componentize-py` 0.9.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v16.0.0.
 
 ```
 cargo install --version 16.0.0 wasmtime-cli
-pip install componentize-py==0.8.0
+pip install componentize-py==0.9.0
 ```
 
 ## Running the demo

examples/tcp/README.md

@@ -7,7 +7,7 @@ features = ["pyo3/extension-module"]
 
 [project]
 name = "componentize-py"
-version = "0.8.0"
+version = "0.9.0"
 description = "Tool to package Python applications as WebAssembly components"
 readme = "README.md"
 license = { file = "LICENSE" }

pyproject.toml

@@ -71,10 +71,6 @@ pub struct Bindings {
     ///
     /// This will be created if it does not already exist.
     pub output_dir: PathBuf,
-
-    /// Disable type annotations
-    #[arg(short = 'n', long)]
-    pub no_typings: bool,
 }
 
 pub fn run<T: Into<OsString> + Clone, I: IntoIterator<Item = T>>(args: I) -> Result<()> {
@@ -92,7 +88,6 @@ fn generate_bindings(common: Common, bindings: Bindings) -> Result<()> {
             .unwrap_or_else(|| Path::new("wit").to_owned()),
         common.world.as_deref(),
         &bindings.output_dir,
-        !bindings.no_typings,
     )
 }
 

src/command.rs

@@ -167,17 +167,12 @@ impl Invoker for MyInvoker {
     }
 }
 
-pub fn generate_bindings(
-    wit_path: &Path,
-    world: Option<&str>,
-    output_dir: &Path,
-    with_typings: bool,
-) -> Result<()> {
+pub fn generate_bindings(wit_path: &Path, world: Option<&str>, output_dir: &Path) -> Result<()> {
     let (resolve, world) = parse_wit(wit_path, world)?;
     let summary = Summary::try_new(&resolve, world)?;
     let world_dir = output_dir.join(resolve.worlds[world].name.to_snake_case().escape());
     fs::create_dir_all(&world_dir)?;
-    summary.generate_code(&world_dir, with_typings, true)?;
+    summary.generate_code(&world_dir, true)?;
 
     Ok(())
 }
@@ -378,7 +373,7 @@ pub async fn componentize(
         .as_ref()
         .and_then(|(p, c)| c.bindings.as_deref().map(|f| (p, f)))
     {
-        summary.generate_code(world_dir.path(), false, false)?;
+        summary.generate_code(world_dir.path(), false)?;
 
         let paths = python_path
             .iter()
@@ -405,7 +400,7 @@ pub async fn componentize(
         let module = resolve.worlds[world].name.to_snake_case();
         let world_dir = world_dir.path().join(&module);
         fs::create_dir_all(&world_dir)?;
-        summary.generate_code(&world_dir, false, false)?;
+        summary.generate_code(&world_dir, false)?;
 
         (vec!["world".to_owned()], module)
     };

src/lib.rs

@@ -29,14 +29,13 @@ fn python_componentize(
 
 #[pyo3::pyfunction]
 #[pyo3(name = "generate_bindings")]
-#[pyo3(signature = (wit_path, world, output_dir, with_typings))]
+#[pyo3(signature = (wit_path, world, output_dir))]
 fn python_generate_bindings(
     wit_path: PathBuf,
     world: Option<&str>,
     output_dir: PathBuf,
-    with_typings: bool,
 ) -> PyResult<()> {
-    crate::generate_bindings(&wit_path, world, &output_dir, with_typings)
+    crate::generate_bindings(&wit_path, world, &output_dir)
         .map_err(|e| PyAssertionError::new_err(format!("{e:?}")))
 }