fix: Fix the release action

.github/workflows/release-elixir.yaml

@@ -10,13 +10,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install extism shared library
-        shell: bash
-        run: |
-          mkdir -p /home/runner/.local/bin/  
-          export PATH="/home/runner/.local/bin/:$PATH"
-          curl https://raw.githubusercontent.com/extism/cli/main/install.sh | sh
-          extism --sudo --prefix /usr/local install
+
       - name: Setup Elixir Host SDK
         uses: erlef/setup-beam@v1
         with:

.github/workflows/release-python.yaml

@@ -23,6 +23,7 @@ jobs:
         run: |
           cd python
           cp ../LICENSE .
+          cp ../README.md .
           make clean
           make prepare
           poetry build

.github/workflows/release-ruby.yaml

@@ -21,5 +21,5 @@ jobs:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_TOKEN }}
         run: |
           cd ruby
-          make publish RUBYGEMS_API_KEY=$RUBYGEMS_API_KEY
+          make publish
       

browser/Makefile

@@ -1,25 +0,0 @@
-.PHONY: test
-
-prepare:
-	npm install
-
-test: prepare
-	npm run test
-
-clean:
-	echo "No clean implemented"
-
-publish: clean prepare
-	npm publish
-
-format:
-	npx prettier --write src
-
-lint:
-	npx prettier --check src
-
-docs:
-	npx typedoc --out doc src
-
-show-docs: docs
-	open doc/index.html

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extism/runtime-browser",
-  "version": "0.1.0",
+  "version": "0.0.1",
   "description": "Extism runtime in the browser",
   "scripts": {
     "build": "node build.js && tsc --emitDeclarationOnly --outDir dist",

browser/src/index.test.ts

@@ -12,7 +12,7 @@ describe('', () => {
     const ctx = new ExtismContext();
     const plugin = await ctx.newPlugin({ wasm: [{ data: data }] });
     const functions = await plugin.getExports();
-    expect(Object.keys(functions).filter((x) => !x.startsWith('__') && x !== 'memory')).toEqual(['count_vowels']);
+    expect(Object.keys(functions).filter(x => !x.startsWith("__") && x !== "memory")).toEqual(['count_vowels']);
     let output = await plugin.call('count_vowels', 'this is a test');
     expect(parse(output)).toEqual({ count: 4 });
     output = await plugin.call('count_vowels', 'this is a test again');

elixir/mix.exs

@@ -4,8 +4,8 @@ defmodule Extism.MixProject do
   def project do
     [
       app: :extism,
-      version: "0.1.0",
-      elixir: "~> 1.12",
+      version: "0.0.1",
+      elixir: "~> 1.14",
       start_permanent: Mix.env() == :prod,
       deps: deps(),
       package: package(),

elixir/native/extism_nif/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "extism_nif"
-version = "0.1.0"
+version = "0.0.1-rc.6"
 edition = "2021"
 authors = ["Benjamin Eckel <bhelx@simst.im>"]
 
@@ -11,5 +11,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rustler = "0.26.0"
-extism = { version = "0.1.0" }
+extism = { version = "0.0.1-rc.6" }
 log = "0.4"

elixir/native/extism_nif/src/lib.rs

@@ -1,10 +1,10 @@
-use extism::{Context, Plugin};
-use rustler::{Atom, Env, ResourceArc, Term};
-use std::mem;
-use std::path::Path;
+use rustler::{Atom, Env, Term, ResourceArc};
+use extism::{Plugin, Context};
 use std::str;
+use std::path::Path;
 use std::str::FromStr;
 use std::sync::RwLock;
+use std::mem;
 
 mod atoms {
     rustler::atoms! {
@@ -15,12 +15,9 @@ mod atoms {
 }
 
 struct ExtismContext {
-    ctx: RwLock<Context>,
+    ctx: RwLock<Context>
 }
 
-unsafe impl Sync for ExtismContext {}
-unsafe impl Send for ExtismContext {}
-
 fn load(env: Env, _: Term) -> bool {
     rustler::resource!(ExtismContext, env);
     true
@@ -30,16 +27,15 @@ fn to_rustler_error(extism_error: extism::Error) -> rustler::Error {
     match extism_error {
         extism::Error::UnableToLoadPlugin(msg) => rustler::Error::Term(Box::new(msg)),
         extism::Error::Message(msg) => rustler::Error::Term(Box::new(msg)),
-        extism::Error::Json(json_err) => rustler::Error::Term(Box::new(json_err.to_string())),
-        extism::Error::Runtime(e) => rustler::Error::Term(Box::new(e.to_string())),
+        extism::Error::Json(json_err) => rustler::Error::Term(Box::new(json_err.to_string()))
     }
 }
 
 #[rustler::nif]
 fn context_new() -> ResourceArc<ExtismContext> {
-    ResourceArc::new(ExtismContext {
-        ctx: RwLock::new(Context::new()),
-    })
+    ResourceArc::new(
+        ExtismContext { ctx: RwLock::new(Context::new()) }
+    )
 }
 
 #[rustler::nif]
@@ -55,11 +51,7 @@ fn context_free(ctx: ResourceArc<ExtismContext>) {
 }
 
 #[rustler::nif]
-fn plugin_new_with_manifest(
-    ctx: ResourceArc<ExtismContext>,
-    manifest_payload: String,
-    wasi: bool,
-) -> Result<i32, rustler::Error> {
+fn plugin_new_with_manifest(ctx: ResourceArc<ExtismContext>, manifest_payload: String, wasi: bool) -> Result<i32, rustler::Error> {
     let context = &ctx.ctx.write().unwrap();
     let result = match Plugin::new(context, manifest_payload, wasi) {
         Err(e) => Err(to_rustler_error(e)),
@@ -75,22 +67,17 @@ fn plugin_new_with_manifest(
 }
 
 #[rustler::nif]
-fn plugin_call(
-    ctx: ResourceArc<ExtismContext>,
-    plugin_id: i32,
-    name: String,
-    input: String,
-) -> Result<String, rustler::Error> {
+fn plugin_call(ctx: ResourceArc<ExtismContext>, plugin_id: i32, name: String, input: String) -> Result<String, rustler::Error> {
     let context = &ctx.ctx.read().unwrap();
-    let mut plugin = unsafe { Plugin::from_id(plugin_id, context) };
+    let plugin = unsafe { Plugin::from_id(plugin_id, context) };
     let result = match plugin.call(name, input) {
         Err(e) => Err(to_rustler_error(e)),
-        Ok(result) => match str::from_utf8(&result) {
-            Ok(output) => Ok(output.to_string()),
-            Err(_e) => Err(rustler::Error::Term(Box::new(
-                "Could not read output from plugin",
-            ))),
-        },
+        Ok(result) => {
+            match str::from_utf8(&result) {
+                Ok(output) => Ok(output.to_string()),
+                Err(_e) => Err(rustler::Error::Term(Box::new("Could not read output from plugin")))
+            }
+        }
     };
     // this forget should be safe because the context will clean up
     // all it's plugins when it is dropped
@@ -99,17 +86,14 @@ fn plugin_call(
 }
 
 #[rustler::nif]
-fn plugin_update_manifest(
-    ctx: ResourceArc<ExtismContext>,
-    plugin_id: i32,
-    manifest_payload: String,
-    wasi: bool,
-) -> Result<(), rustler::Error> {
+fn plugin_update_manifest(ctx: ResourceArc<ExtismContext>, plugin_id: i32, manifest_payload: String, wasi: bool) -> Result<(), rustler::Error> {
     let context = &ctx.ctx.read().unwrap();
     let mut plugin = unsafe { Plugin::from_id(plugin_id, context) };
     let result = match plugin.update(manifest_payload, wasi) {
-        Ok(()) => Ok(()),
-        Err(e) => Err(to_rustler_error(e)),
+        Ok(()) => {
+            Ok(())
+        },
+        Err(e) => Err(to_rustler_error(e))
     };
     // this forget should be safe because the context will clean up
     // all it's plugins when it is dropped
@@ -129,28 +113,19 @@ fn plugin_free(ctx: ResourceArc<ExtismContext>, plugin_id: i32) -> Result<(), ru
 fn set_log_file(filename: String, log_level: String) -> Result<Atom, rustler::Error> {
     let path = Path::new(&filename);
     match log::Level::from_str(&log_level) {
-        Err(_e) => Err(rustler::Error::Term(Box::new(format!(
-            "{} not a valid log level",
-            log_level
-        )))),
+        Err(_e) => Err(rustler::Error::Term(Box::new(format!("{} not a valid log level", log_level)))),
         Ok(level) => {
             if extism::set_log_file(path, Some(level)) {
                 Ok(atoms::ok())
             } else {
-                Err(rustler::Error::Term(Box::new(
-                    "Did not set log file, received false from the API.",
-                )))
+                Err(rustler::Error::Term(Box::new("Did not set log file, received false from the API.")))
             }
         }
     }
 }
 
 #[rustler::nif]
-fn plugin_has_function(
-    ctx: ResourceArc<ExtismContext>,
-    plugin_id: i32,
-    function_name: String,
-) -> Result<bool, rustler::Error> {
+fn plugin_has_function(ctx: ResourceArc<ExtismContext>, plugin_id: i32, function_name: String) -> Result<bool, rustler::Error> {
     let context = &ctx.ctx.read().unwrap();
     let plugin = unsafe { Plugin::from_id(plugin_id, context) };
     let has_function = plugin.has_function(function_name);

haskell/Example.hs

@@ -18,6 +18,6 @@ handlePlugin plugin = do
     exitSuccess) res
 
 main = do
-  context <- Extism.newContext
+  context <- Extism.newContext ()
   plugin <- Extism.pluginFromManifest context (manifest [wasmFile "../wasm/code.wasm"]) False
   try handlePlugin plugin

haskell/extism.cabal

@@ -1,4 +1,4 @@
-cabal-version:      3.0
+cabal-version:      2.4
 name:               extism
 version:            0.0.1
 
@@ -23,41 +23,22 @@ category: Plugins, WebAssembly
 extra-source-files: CHANGELOG.md
 
 library
-    exposed-modules: Extism
-    reexported-modules: Extism.Manifest
+    exposed-modules: Extism Extism.Manifest
 
-    -- Modules included in this library but not exported.
-    other-modules: Extism.Bindings
-
-    -- LANGUAGE extensions used by modules in this package.
-    -- other-extensions:
-    build-depends:    
-          base >= 1.6.0
-        , bytestring
-        , json
-        , manifest
-    hs-source-dirs:   src
-    default-language: Haskell2010
-    extra-libraries: extism
-    extra-lib-dirs: /usr/local/lib
-
-library manifest
-    exposed-modules: Extism.Manifest
-    
-    visibility: public
-    
     -- Modules included in this library but not exported.
     other-modules:
 
     -- LANGUAGE extensions used by modules in this package.
     -- other-extensions:
     build-depends:    
-          base
+          base ^>=4.16.1.0
         , bytestring
         , base64-bytestring
         , json
-    hs-source-dirs:   manifest
+    hs-source-dirs:   src
     default-language: Haskell2010
+    extra-libraries: extism
+    extra-lib-dirs: /usr/local/lib
     
 Test-Suite extism-example
     type:       exitcode-stdio-1.0

haskell/src/Extism.hs

@@ -1,17 +1,36 @@
+{-# LANGUAGE ForeignFunctionInterface #-}
+
 module Extism (module Extism, module Extism.Manifest) where
-import Data.Int
-import Data.Word
-import Control.Monad (void)
+import GHC.Int
+import GHC.Word
+import Foreign.C.Types
+import Foreign.Ptr
 import Foreign.ForeignPtr
 import Foreign.C.String
-import Foreign.Ptr
+import Control.Monad (void)
 import Data.ByteString as B
 import Data.ByteString.Internal (c2w, w2c)
 import Data.ByteString.Unsafe (unsafeUseAsCString)
 import Data.Bifunctor (second)
-import Text.JSON (encode, toJSObject)
-import Extism.Manifest (Manifest, toString, toJSONValue)
-import Extism.Bindings
+import Text.JSON (JSON, toJSObject, toJSString, encode, JSValue(JSNull, JSString))
+import Extism.Manifest (Manifest, toString)
+
+newtype ExtismContext = ExtismContext () deriving Show
+
+foreign import ccall unsafe "extism.h extism_context_new" extism_context_new :: IO (Ptr ExtismContext)
+foreign import ccall unsafe "extism.h &extism_context_free" extism_context_free :: FunPtr (Ptr ExtismContext -> IO ())
+foreign import ccall unsafe "extism.h extism_plugin_new" extism_plugin_new :: Ptr ExtismContext -> Ptr Word8 -> Word64 -> CBool -> IO Int32
+foreign import ccall unsafe "extism.h extism_plugin_update" extism_plugin_update :: Ptr ExtismContext -> Int32 -> Ptr Word8 -> Word64 -> CBool -> IO CBool
+foreign import ccall unsafe "extism.h extism_plugin_call" extism_plugin_call :: Ptr ExtismContext -> Int32 -> CString -> Ptr Word8 -> Word64 -> IO Int32
+foreign import ccall unsafe "extism.h extism_plugin_function_exists" extism_plugin_function_exists :: Ptr ExtismContext -> Int32 -> CString -> IO CBool
+foreign import ccall unsafe "extism.h extism_error" extism_error :: Ptr ExtismContext -> Int32 -> IO CString
+foreign import ccall unsafe "extism.h extism_plugin_output_length" extism_plugin_output_length :: Ptr ExtismContext -> Int32 -> IO Word64
+foreign import ccall unsafe "extism.h extism_plugin_output_data" extism_plugin_output_data :: Ptr ExtismContext -> Int32 -> IO (Ptr Word8)
+foreign import ccall unsafe "extism.h extism_log_file" extism_log_file :: CString -> CString -> IO CBool
+foreign import ccall unsafe "extism.h extism_plugin_config" extism_plugin_config :: Ptr ExtismContext -> Int32 -> Ptr Word8 -> Int64 -> IO CBool
+foreign import ccall unsafe "extism.h extism_plugin_free" extism_plugin_free :: Ptr ExtismContext -> Int32 -> IO ()
+foreign import ccall unsafe "extism.h extism_context_reset" extism_context_reset :: Ptr ExtismContext -> IO ()
+foreign import ccall unsafe "extism.h extism_version" extism_version :: IO CString
 
 -- Context manages plugins
 newtype Context = Context (ForeignPtr ExtismContext)
@@ -45,8 +64,8 @@ reset (Context ctx) =
   withForeignPtr ctx extism_context_reset
 
 -- Create a new context
-newContext :: IO Context
-newContext = do
+newContext :: () -> IO Context
+newContext () = do
   ptr <- extism_context_new
   fptr <- newForeignPtr extism_context_free ptr
   return (Context fptr)
@@ -54,7 +73,7 @@ newContext = do
 -- Execute a function with a new context that is destroyed when it returns
 withContext :: (Context -> IO a) -> IO a
 withContext f = do
-  ctx <- newContext
+  ctx <- newContext ()
   f ctx
 
 -- Create a plugin from a WASM module, `useWasi` determines if WASI should
@@ -107,13 +126,16 @@ updateManifest plugin manifest useWasi =
 isValid :: Plugin -> Bool
 isValid (Plugin _ p) = p >= 0
 
+convertMaybeString Nothing = JSNull
+convertMaybeString (Just s) = JSString (toJSString s)
+
 -- Set configuration values for a plugin
 setConfig :: Plugin -> [(String, Maybe String)] -> IO Bool
 setConfig (Plugin (Context ctx) plugin) x =
   if plugin < 0
     then return False
   else
-    let obj = toJSObject [(k, toJSONValue v) | (k, v) <- x] in
+    let obj = toJSObject [(k, convertMaybeString v) | (k, v) <- x] in
     let bs = toByteString (encode obj) in
     let length = fromIntegral (B.length bs) in
     unsafeUseAsCString bs (\s -> do

haskell/src/Extism/Bindings.hs

@@ -1,26 +0,0 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
-
-module Extism.Bindings where
-
-import Foreign.C.Types
-import Foreign.Ptr
-import Foreign.C.String
-import Data.Int
-import Data.Word
-
-newtype ExtismContext = ExtismContext () deriving Show
-
-foreign import ccall unsafe "extism.h extism_context_new" extism_context_new :: IO (Ptr ExtismContext)
-foreign import ccall unsafe "extism.h &extism_context_free" extism_context_free :: FunPtr (Ptr ExtismContext -> IO ())
-foreign import ccall unsafe "extism.h extism_plugin_new" extism_plugin_new :: Ptr ExtismContext -> Ptr Word8 -> Word64 -> CBool -> IO Int32
-foreign import ccall unsafe "extism.h extism_plugin_update" extism_plugin_update :: Ptr ExtismContext -> Int32 -> Ptr Word8 -> Word64 -> CBool -> IO CBool
-foreign import ccall unsafe "extism.h extism_plugin_call" extism_plugin_call :: Ptr ExtismContext -> Int32 -> CString -> Ptr Word8 -> Word64 -> IO Int32
-foreign import ccall unsafe "extism.h extism_plugin_function_exists" extism_plugin_function_exists :: Ptr ExtismContext -> Int32 -> CString -> IO CBool
-foreign import ccall unsafe "extism.h extism_error" extism_error :: Ptr ExtismContext -> Int32 -> IO CString
-foreign import ccall unsafe "extism.h extism_plugin_output_length" extism_plugin_output_length :: Ptr ExtismContext -> Int32 -> IO Word64
-foreign import ccall unsafe "extism.h extism_plugin_output_data" extism_plugin_output_data :: Ptr ExtismContext -> Int32 -> IO (Ptr Word8)
-foreign import ccall unsafe "extism.h extism_log_file" extism_log_file :: CString -> CString -> IO CBool
-foreign import ccall unsafe "extism.h extism_plugin_config" extism_plugin_config :: Ptr ExtismContext -> Int32 -> Ptr Word8 -> Int64 -> IO CBool
-foreign import ccall unsafe "extism.h extism_plugin_free" extism_plugin_free :: Ptr ExtismContext -> Int32 -> IO ()
-foreign import ccall unsafe "extism.h extism_context_reset" extism_context_reset :: Ptr ExtismContext -> IO ()
-foreign import ccall unsafe "extism.h extism_version" extism_version :: IO CString

haskell/src/Extism/Manifest.hs

@@ -1,10 +1,7 @@
-{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
-
 module Extism.Manifest where
 
 import Text.JSON
   (
-    JSON,
     JSValue(JSNull, JSString, JSArray),
     toJSString, showJSON, makeObj, encode
   )
@@ -12,12 +9,16 @@ import qualified Data.ByteString as B
 import qualified Data.ByteString.Base64 as B64
 import qualified Data.ByteString.Char8 as BS (unpack)
 
-makeArray x = JSArray [toJSONValue a | a <- x]
+valueOrNull f Nothing = JSNull
+valueOrNull f (Just x) = f x
+makeString s = JSString (toJSString s)
+stringOrNull = valueOrNull makeString
+makeArray f [] = JSNull
+makeArray f x = JSArray [f a | a <- x]
+filterNulls obj = [(a, b) | (a, b) <- obj, not (isNull b)]
+mapObj f x = makeObj (filterNulls [(a, f b) | (a, b) <- x])
 isNull JSNull = True
 isNull _ = False
-filterNulls obj = [(a, b) | (a, b) <- obj, not (isNull b)]
-object x = makeObj $ filterNulls x
-(.=) a b = (a, toJSONValue b)
 
 newtype Memory = Memory
   {
@@ -26,37 +27,32 @@ newtype Memory = Memory
 
 class JSONValue a where
   toJSONValue :: a -> JSValue
-  
-instance {-# OVERLAPS #-} (JSON a) => (JSONValue a) where
-  toJSONValue j = showJSON j
-
-instance {-# OVERLAPS #-} (JSONValue a) => (JSONValue (Maybe a)) where
-  toJSONValue Nothing = JSNull
-  toJSONValue (Just x) = toJSONValue x
 
 instance JSONValue Memory where
-  toJSONValue (Memory max) =
-    object [
-      "max" .= max
-    ]
+  toJSONValue x =
+    case memoryMax x of
+      Nothing -> makeObj []
+      Just max -> makeObj [("max", showJSON max)]
 
-data HTTPRequest = HTTPRequest
+data HttpRequest = HttpRequest
   {
     url :: String
-  , header :: Maybe [(String, String)]
+  , header :: [(String, String)]
   , method :: Maybe String
   }
 
-requestObj (HTTPRequest url header method) =
-  [
-    "url" .= url ,
-    "header" .= header,
-    "method" .= method
+requestObj x =
+  let meth = stringOrNull $ method x in
+  let h = mapObj makeString $ header x in
+  filterNulls [
+    ("url", makeString $ url x),
+    ("header", h),
+    ("method", meth)
   ]
 
-instance JSONValue HTTPRequest where
+instance JSONValue HttpRequest where
   toJSONValue x =
-    object $ requestObj x
+    makeObj $ requestObj x
 
 data WasmFile = WasmFile
   {
@@ -66,11 +62,14 @@ data WasmFile = WasmFile
   }
 
 instance JSONValue WasmFile where
-  toJSONValue (WasmFile path name hash) =
-    object [
-      "path" .= path,
-      "name" .= name,
-      "hash" .= hash
+  toJSONValue x =
+    let path = makeString $ filePath x in
+    let name = stringOrNull $ fileName x in
+    let hash = stringOrNull $ fileHash x in
+    makeObj $ filterNulls [
+      ("path", path),
+      ("name", name),
+      ("hash", hash)
     ]
 
 data WasmCode = WasmCode
@@ -82,26 +81,30 @@ data WasmCode = WasmCode
 
 
 instance JSONValue WasmCode where
-  toJSONValue (WasmCode x name hash) =
-    let bytes = BS.unpack $ B64.encode x in
-    object [
-      "data" .= bytes,
-      "name" .= name,
-      "hash" .= hash
+  toJSONValue x =
+    let bytes = makeString $ BS.unpack $ B64.encode $ codeBytes x in
+    let name = stringOrNull $ codeName x in
+    let hash = stringOrNull $ codeHash x in
+    makeObj $ filterNulls [
+      ("data", bytes),
+      ("name", name),
+      ("hash", hash)
     ]
 
 data WasmURL = WasmURL
   {
-    req :: HTTPRequest
+    req :: HttpRequest
   , urlName :: Maybe String
   , urlHash :: Maybe String
   }
 
 
 instance JSONValue WasmURL where
-  toJSONValue (WasmURL req name hash) =
-    let request = requestObj $ req in
-    object $ "name" .= name : "hash" .= hash : request
+  toJSONValue x =
+    let request = requestObj $ req x in
+    let name = stringOrNull $ urlName x in
+    let hash = stringOrNull $ urlHash x in
+    makeObj $ filterNulls $ ("name", name) : ("hash", hash) : request
 
 data Wasm = File WasmFile | Code WasmCode | URL WasmURL
 
@@ -118,7 +121,7 @@ wasmFile path =
 
 wasmURL :: String -> String -> Wasm
 wasmURL method url =
-  let r = HTTPRequest { url = url, header = Nothing, method = Just method } in
+  let r = HttpRequest { url = url, header = [], method = Just method } in
   URL WasmURL { req = r, urlName = Nothing, urlHash = Nothing }
 
 wasmCode :: B.ByteString -> Wasm
@@ -140,8 +143,8 @@ data Manifest = Manifest
   {
     wasm :: [Wasm]
   , memory :: Maybe Memory
-  , config :: Maybe [(String, String)]
-  , allowedHosts :: Maybe [String]
+  , config :: [(String, String)]
+  , allowed_hosts :: [String]
   }
 
 manifest :: [Wasm] -> Manifest
@@ -149,29 +152,32 @@ manifest wasm =
   Manifest {
     wasm = wasm,
     memory = Nothing,
-    config = Nothing,
-    allowedHosts = Nothing
+    config = [],
+    allowed_hosts = []
   }
 
 withConfig :: Manifest -> [(String, String)] -> Manifest
 withConfig m config =
-  m { config = Just config }
+  m { config = config }
 
 
 withHosts :: Manifest -> [String] -> Manifest
 withHosts m hosts =
-  m { allowedHosts = Just hosts }
+  m { allowed_hosts = hosts }
 
 instance JSONValue Manifest where
-  toJSONValue (Manifest wasm memory config hosts) =
-    let w = makeArray wasm in
-    object [
-      "wasm" .= w,
-      "memory" .= memory,
-      "config" .= config,
-      "allowed_hosts" .= hosts
+  toJSONValue x =
+    let w = makeArray toJSONValue $ wasm x in
+    let mem = valueOrNull toJSONValue $ memory x in
+    let c = mapObj makeString $ config x in
+    let hosts = makeArray makeString $ allowed_hosts x in
+    makeObj $ filterNulls [
+      ("wasm", w),
+      ("memory", mem),
+      ("config", c),
+      ("allowed_hosts", hosts)
     ]
 
-toString :: (JSONValue a) => a -> String
-toString v =
-  encode (toJSONValue v)
+toString :: Manifest -> String
+toString manifest =
+  encode (toJSONValue manifest)

libextism.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: extism
 Description: The Extism universal plug-in system.
-Version: 0.1.0
+Version: 0.0.1
 Cflags: -I${includedir}
 Libs: -L${libdir} -lextism

libextism/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libextism"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"

manifest/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "extism-manifest"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"

node/example.mjs

@@ -1,5 +1,5 @@
-const { withContext, Context } = require('./dist/index.js');
-const { readFileSync } = require('fs');
+import { withContext, Context } from "./dist/index.js";
+import { readFileSync } from "fs";
 
 withContext(async function (context) {
   let wasm = readFileSync("../wasm/code.wasm");

node/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@extism/extism",
-  "version": "0.0.1",
+  "version": "0.0.1-rc.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@extism/extism",
-      "version": "0.0.1",
+      "version": "0.0.1-rc.6",
       "license": "BSD-3-Clause",
       "dependencies": {
         "ffi-napi": "^4.0.3"

node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extism/extism",
-  "version": "0.1.0",
+  "version": "0.0.1",
   "description": "Extism Host SDK for Node",
   "keywords": [
     "extism",
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "prepare": "npm run build",
-    "example": "node example.js",
+    "example": "node example.mjs",
     "build": "tsc",
     "test": "jest --coverage"
   },

python/README.md

@@ -1,3 +0,0 @@
-# Extism Python Host SDK
-
-See [https://extism.org/docs/integrate-into-your-codebase/python-host-sdk/](https://extism.org/docs/integrate-into-your-codebase/python-host-sdk/).

python/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "extism"
-version = "0.1.0"
+version = "0.0.1"
 description = "Extism Host SDK for python"
 authors = ["The Extism Authors <oss@extism.org>"]
 license = "BSD-3-Clause"
-readme = "README.md"
+readme = "../README.md"
 
 [tool.poetry.dependencies]
 python = "^3.7"

ruby/Makefile

@@ -1,4 +1,3 @@
-RUBYGEMS_API_KEY ?=
 
 .PHONY: prepare test
 
@@ -10,15 +9,11 @@ test: prepare
 	bundle exec rake test
 
 clean:
-	rm -f extism-*.gem
-
-publish-local: clean prepare
-	gem build extism.gemspec
-	gem push extism-*.gem
+	rm extism-*.gem
 
 publish: clean prepare
 	gem build extism.gemspec
-	GEM_HOST_API_KEY=$(RUBYGEMS_API_KEY) gem push extism-*.gem
+	gem push extism-*.gem
 
 lint:
 	bundle exec rufo --check .

ruby/extism.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "ffi", ">= 1.0.0"
+  # spec.add_dependency "example-gem", "~> 1.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

ruby/lib/extism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Extism
-  VERSION = "0.1.0"
+  VERSION = "0.0.1"
 end

runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "extism-runtime"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
@@ -22,7 +22,7 @@ log4rs = "1.1"
 url = "2"
 glob = "0.3"
 ureq = {version = "2.5", optional=true}
-extism-manifest = { version = "0.1.0", path = "../manifest" }
+extism-manifest = { version = "0.0.1-rc.6", path = "../manifest" }
 pretty-hex = { version = "0.3" }
 
 [features]

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "extism"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
@@ -9,8 +9,8 @@ repository = "https://github.com/extism/extism"
 description = "Extism Host SDK for Rust"
 
 [dependencies]
-extism-manifest = { version = "0.1.0", path = "../manifest" }
-extism-runtime = { version = "0.1.0", path = "../runtime"}
+extism-manifest = { version = "0.0.1-rc.6", path = "../manifest" }
+extism-runtime = { version = "0.0.1-rc.6", path = "../runtime"}
 serde_json = "1"
 log = "0.4"
 thiserror = "1"