Features/wasm components

.gitignore

@@ -28,6 +28,7 @@ test/wasm_source/target/*
 test/wasm_link_test/target/*
 test/wasm_link_dep_test/target/*
 test/wasm_link_import_test/target/*
+test/support/todo_list/target/*
 
 .mix_tasks
 **/.DS_Store

.tool-versions

@@ -1,2 +1,3 @@
 erlang 27.0
 elixir 1.17.0-otp-27
+rust 1.81.0

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "rust-analyzer.linkedProjects": [
+    "./native/wasmex/Cargo.toml"
+  ]
+}

lib/wasmex/component.ex

@@ -0,0 +1,29 @@
+defmodule Wasmex.Component do
+  @type t :: %__MODULE__{
+          resource: binary(),
+          reference: reference()
+        }
+
+  defstruct resource: nil,
+            # The actual NIF store resource.
+            # Normally the compiler will happily do stuff like inlining the
+            # resource in attributes. This will convert the resource into an
+            # empty binary with no warning. This will make that harder to
+            # accidentally do.
+            reference: nil
+
+  def __wrap_resource__(resource) do
+    %__MODULE__{
+      resource: resource,
+      reference: make_ref()
+    }
+  end
+
+  def new(store_or_caller, component_bytes) do
+    %{resource: store_or_caller_resource} = store_or_caller
+    case Wasmex.Native.component_new(store_or_caller_resource, component_bytes) do
+      {:error, err} -> {:error, err}
+      resource -> {:ok, __wrap_resource__(resource)}
+    end
+  end
+end

lib/wasmex/component_instance.ex

@@ -0,0 +1,30 @@
+defmodule Wasmex.Component.Instance do
+  @type t :: %__MODULE__{
+          resource: binary(),
+          reference: reference()
+        }
+
+  defstruct resource: nil,
+            # The actual NIF store resource.
+            # Normally the compiler will happily do stuff like inlining the
+            # resource in attributes. This will convert the resource into an
+            # empty binary with no warning. This will make that harder to
+            # accidentally do.
+            reference: nil
+
+  def __wrap_resource__(resource) do
+    %__MODULE__{
+      resource: resource,
+      reference: make_ref()
+    }
+  end
+
+  def new(store_or_caller, component) do
+    %{resource: store_or_caller_resource} = store_or_caller
+    %{resource: component_resource} = component
+    case Wasmex.Native.component_instance_new(store_or_caller_resource, component_resource) do
+      {:error, err} -> {:error, err}
+      resource -> {:ok, __wrap_resource__(resource)}
+    end
+  end
+end

lib/wasmex/component_store.ex

@@ -0,0 +1,26 @@
+defmodule Wasmex.ComponentStore do
+  alias Wasmex.Engine
+  alias Wasmex.Wasi.WasiOptions
+
+  defstruct resource: nil, reference: nil
+
+  def __wrap_resource__(resource) do
+    %__MODULE__{
+      resource: resource,
+      reference: make_ref()
+    }
+  end
+
+  def new(%WasiOptions{} = options, store_limits \\ nil, engine \\ nil) do
+    %Engine{resource: engine_resource} = engine || Engine.default()
+
+    case Wasmex.Native.store_new_wasi_p2(
+           options,
+           store_limits,
+           engine_resource
+         ) do
+      {:error, err} -> {:error, err}
+      resource -> {:ok, __MODULE__.__wrap_resource__(resource)}
+    end
+  end
+end

lib/wasmex/engine_config.ex

@@ -19,7 +19,8 @@ defmodule Wasmex.EngineConfig do
   defstruct consume_fuel: false,
             cranelift_opt_level: :none,
             wasm_backtrace_details: false,
-            memory64: false
+            memory64: false,
+            wasm_component_model: true
 
   @type t :: %__MODULE__{
           consume_fuel: boolean(),

lib/wasmex/native.ex

@@ -5,23 +5,8 @@ defmodule Wasmex.Native do
   version = mix_config[:version]
   github_url = mix_config[:package][:links]["GitHub"]
 
-  use RustlerPrecompiled,
-    otp_app: :wasmex,
-    base_url: "#{github_url}/releases/download/v#{version}",
-    version: version,
-    targets: ~w(
-      aarch64-apple-darwin
-      aarch64-unknown-linux-gnu
-      aarch64-unknown-linux-musl
-      riscv64gc-unknown-linux-gnu
-      x86_64-apple-darwin
-      x86_64-pc-windows-gnu
-      x86_64-pc-windows-msvc
-      x86_64-unknown-freebsd
-      x86_64-unknown-linux-gnu
-      x86_64-unknown-linux-musl
-    ),
-    force_build: System.get_env("WASMEX_BUILD") in ["1", "true"]
+  use Rustler,
+    otp_app: :wasmex
 
   def engine_new(_engine_config), do: error()
   def engine_precompile_module(_engine_resource, _bytes), do: error()
@@ -80,10 +65,22 @@ defmodule Wasmex.Native do
 
   def store_new(_store_limits, _engine_resource), do: error()
   def store_new_wasi(_wasi_options, _store_limits, _engine_resource), do: error()
+  def store_new_wasi_p2(_wasi_options, _store_limits, _engine_resource), do: error()
 
   def store_or_caller_get_fuel(_store_or_caller_resource), do: error()
   def store_or_caller_set_fuel(_store_or_caller_resource, _fuel), do: error()
 
+
+  def component_new(_store, _component_bytes), do: error()
+
+  def component_instance_new(_store, _component), do: error()
+
+  def exec_func(_store, _instance, _function_name), do: error()
+
+  def todo_instantiate(_store, _component), do: error()
+  def todo_init(_store, _instance), do: error()
+  def todo_add(_store, _instance, _todo, _list), do: error()
+
   # When the NIF is loaded, it will override functions in this module.
   # Calling error is handles the case when the nif could not be loaded.
   defp error, do: :erlang.nif_error(:nif_not_loaded)

mix.exs

@@ -9,6 +9,7 @@ defmodule Wasmex.MixProject do
       version: @version,
       elixir: "~> 1.12",
       start_permanent: Mix.env() == :prod,
+      elixirc_paths: elixirc_paths(Mix.env()),
       name: "wasmex",
       description: description(),
       package: package(),
@@ -37,6 +38,10 @@ defmodule Wasmex.MixProject do
     "Wasmex is an Elixir library for executing WebAssembly binaries"
   end
 
+    # Specifies which paths to compile per environment.
+  defp elixirc_paths(:test), do: ["lib", "test/support"]
+  defp elixirc_paths(_), do: ["lib"]
+
   defp package() do
     [
       # These are the default files included in the package