Merge pull request #1749 from polywrap/origin-0.10-dev

Prep Origin 0.10.3 | /workflows/release-pr

Author: dOrgJelli

.github/workflows/ci-javascript.yaml

@@ -214,10 +214,13 @@ jobs:
           mv wrappers packages/test-cases/cases
 
       - name: Test cli:unit
-        run: yarn test:cli:unit
+        run: yarn test:unit
+        working-directory: ./packages/cli
 
       - name: Test cli:e2e:p1
-        run: yarn test:cli:e2e:p1
+        run: yarn test:e2e:p1
+        working-directory: ./packages/cli
 
       - name: Test cli:e2e:p2
-        run: yarn test:cli:e2e:p2
+        run: yarn test:e2e:p2
+        working-directory: ./packages/cli

CHANGELOG.md

@@ -1,3 +1,20 @@
+# Polywrap Origin (0.10.3)
+## Features
+**`polywrap` CLI:**
+* [PR-1747](https://github.com/polywrap/toolchain/pull/1747) **Add Rust & Python plugin template projects to CLI's `create` command**
+  * The `create` command now supports `plugin/rust` and `plugin/python` project types.
+
+## Bugs
+**`@polywrap/schema-bind`:**
+* [PR-1734](https://github.com/polywrap/toolchain/pull/1734) **Update `plugin/python` Bindings**
+  * Update `wrap.info` python module embedding.
+* [PR-1728](https://github.com/polywrap/toolchain/pull/1728) **Update `plugin/rust` Bindings**
+  * Modify JSON serialization within rust plugin's bindings.
+* [PR-1736](https://github.com/polywrap/toolchain/pull/1736) **Properly emit function name when `Env` is missing**
+  * Fixed the error message that's emitted when an environment is not supplied to a function that requires it.
+* [PR-1733](https://github.com/polywrap/toolchain/pull/1733) **Add imported `Env` to `propertyDeps` transform**
+  * Adds imported `Env` to `propertyDeps` transform, so that now codegen properly generates imports for dependencies of imported env.
+
 # Polywrap Origin (0.10.2)
 ## Bugs
 **`@polywrap/schema-bind`:**

VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

packages/cli/src/commands/create.ts

@@ -29,7 +29,7 @@ const urlStr = intlMsg.commands_create_options_t_url();
 export const supportedLangs = {
   wasm: ["assemblyscript", "rust", "interface"] as const,
   app: ["typescript"] as const,
-  plugin: ["typescript"] as const,
+  plugin: ["typescript", "rust", "python"] as const,
 };
 
 export type ProjectType = keyof typeof supportedLangs;

packages/schema/bind/src/bindings/assemblyscript/wasm/templates/imported/env-type/index-ts.mustache

@@ -1,6 +1,7 @@
 import {
   Read,
   Write,
+  Box,
   BigInt,
   BigNumber,
   JSON,

packages/schema/bind/src/bindings/assemblyscript/wasm/templates/module-type/wrapped-ts.mustache

@@ -15,7 +15,7 @@ export function {{name}}Wrapped(module: ModuleBase, argsBuf: ArrayBuffer, env_si
   {{#env}}
   {{#required}}
   if (env_size == 0) {
-    throw new Error("Environment is not set, and it is required by method 'objectMethod'")
+    throw new Error("Environment is not set, and it is required by method '{{name}}'")
   }
 
   const envBuf = wrap_load_env(env_size);

packages/schema/bind/src/bindings/python/plugin/index.ts

@@ -40,6 +40,11 @@ const sort = (obj: Record<string, unknown>) =>
 export const generateBinding: GenerateBindingFn = (
   options: BindOptions
 ): BindOutput => {
+  const escapedAbi = JSON.stringify(
+    sort((options.abi as unknown) as Record<string, unknown>)
+  ).replace(/\n/g, "\\n");
+  const formattedAbi = JSON.stringify(JSON.parse(escapedAbi), null, 2);
+
   // Apply Abi transforms
   const abi = applyTransforms(options.abi);
 
@@ -55,9 +60,7 @@ export const generateBinding: GenerateBindingFn = (
     name: options.projectName,
     type: "plugin",
     version: latestWrapManifestVersion,
-    abi: Buffer.from(
-      JSON.stringify(sort((options.abi as unknown) as Record<string, unknown>))
-    ).toString("base64"),
+    abi: formattedAbi,
   };
 
   output.entries = renderTemplates(templatePath(""), { ...abi, manifest }, {});

packages/schema/bind/src/bindings/python/plugin/templates/wrap_info-py.mustache

@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import json
-from base64 import b64decode
 
 from polywrap_manifest import WrapManifest
 
 {{#manifest}}
-abi = json.loads(b64decode("{{abi}}").decode("utf-8"))
+abi = json.loads("""
+{{abi}}
+""")
 
 manifest = WrapManifest.parse_obj({
     "name": "{{name}}",

packages/schema/bind/src/bindings/rust/plugin/templates/module-rs.mustache

@@ -2,9 +2,8 @@
 ///       All modifications will be overwritten.
 
 use std::sync::Arc;
-use polywrap_core::{invoke::Invoker};
-use polywrap_plugin::error::PluginError;
-use polywrap_plugin::module::PluginModule;
+use polywrap_core::invoke::Invoker;
+use polywrap_plugin::{error::PluginError, module::PluginModule};
 use serde::{Serialize, Deserialize};
 use super::types::*;
 

packages/schema/bind/src/bindings/rust/plugin/templates/types-rs.mustache

@@ -3,16 +3,12 @@
 
 // NOTE: This is an auto-generated file.
 //       All modifications will be overwritten.
+use polywrap_core::{invoke::Invoker, uri::Uri};
+use polywrap_msgpack::{decode, serialize};
+use polywrap_plugin::{error::PluginError, BigInt, BigNumber, Map, JSON};
 use serde::{Serialize, Deserialize};
-use num_bigint::BigInt;
-use bigdecimal::BigDecimal as BigNumber;
-use serde_json as JSON;
-use polywrap_msgpack::extensions::generic_map::GenericMap as Map;
 {{#importedModuleTypes}}
 use std::sync::Arc;
-use polywrap_msgpack::{decode, serialize};
-use polywrap_core::{invoke::{Invoker}, uri::Uri};
-use polywrap_plugin::error::PluginError;
 {{/importedModuleTypes}}
 
 // Env START //
@@ -129,7 +125,7 @@ impl {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "{{name}}".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;
 
@@ -168,7 +164,7 @@ impl<'a> {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}}<'a
         .map_err(|e| PluginError::SubinvocationError {
             uri: uri.to_string(),
             method: "{{name}}".to_string(),
-            args: serde_json::to_string(&args).unwrap(),
+            args: JSON::to_string(&args).unwrap(),
             exception: e.to_string(),
         })?;