Merge pull request #50 from rylev/import-dependencies

Switch --defined flag for import-dependencies flag

Author: peterhuene

README.md

@@ -65,26 +65,26 @@ wac encode -o output.wasm input.wac
 
 This will encode `input.wac` as a WebAssembly component named `output.wasm`.
 
-By default, `wac` will import dependencies rather than defining  (i.e.
-embedding) them in the output component; to define dependencies in the output
-component, use the `--define` flag:
+#### Dependencies
+
+By default, `wac` will create a component that embeds its dependencies (i.e. packages
+referenced in a WAC source file) inside of itself rather than importing those dependencies;
+to cause dependencies to be imported in the output component, use the
+`--import-dependencies` flag:
 
 ```
-wac encode --define -o output.wasm input.wac
+wac encode --import-dependencies -o output.wasm input.wac
 ```
 
-#### Dependencies
-
-Dependencies (i.e. packages referenced in a WAC source file) may be located
-within a `deps` subdirectory, with an expected structure of:
+Dependencies may be located within a `deps` subdirectory, with an expected structure of:
 
 ```
 deps/
 ├─ <namespace>/
 │  ├─ <package>.wasm
 ``````
-If the `wit` build-time feature is enabled, the dependency may be a directory
-containing a WIT package:
+
+The dependency may be also be a WIT file or a directory containing a WIT package:
 
 ```
 deps/
@@ -97,7 +97,7 @@ deps/
 The `--deps-dir` CLI option may be used to specify a different directory to
 search for dependencies.
 
-Dependencies may also be specified with the `--dep` CLI option:
+The location of specific dependencies may also be specified with the `--dep` CLI option:
 
 ```
 wac encode --dep foo:bar=./baz.wasm -o output.wasm input.wac

src/commands/encode.rs

@@ -45,11 +45,13 @@ pub struct EncodeCommand {
     #[clap(long, short = 't')]
     pub wat: bool,
 
-    /// Whether to not to define referenced packages.
+    /// Whether the composed component imports its dependencies.
     ///
-    /// If not specified, all referenced packages will be imported.
-    #[clap(long)]
-    pub define: bool,
+    /// If false, all referenced dependent packages will be defined within the component.
+    ///
+    /// Defaults to false.
+    #[clap(long, short)]
+    pub import_dependencies: bool,
 
     /// The path to write the output to.
     ///
@@ -97,7 +99,7 @@ impl EncodeCommand {
         }
 
         let mut bytes = resolved.encode(EncodingOptions {
-            define_packages: self.define,
+            define_packages: !self.import_dependencies,
         })?;
         if !self.no_validate {
             Validator::new_with_features(WasmFeatures {