Merge pull request #1172 from polywrap/origin-dev

Prep 0.4.1

.eslintrc.js

@@ -2,10 +2,8 @@ module.exports = {
   root: true,
   ignorePatterns: [
     "**/wrap/**/*.*",
-    "**/wrap-man/**/*.*",
     "**/infra-modules/**/*.*",
     "**/build/**/*.*",
-    "**/build-man/**/*.*",
     "**/__tests__/**/*.*",
     "**/node_modules/**/*.*",
     "**/coverage/**/*.*"

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Polywrap Origin (0.4.1)
+## Features
+* [PR-1171](https://github.com/polywrap/monorepo/pull/1171) `@polywrap/schema-bind`: Handle reserve words (keywords) for object, enum, and method names.
+
+## Bugs
+* [PR-1168](https://github.com/polywrap/monorepo/pull/1168) `@polywrap/schema-bind`: Fix imported optional map issue in Rust bindings.
+* [PR-1167](https://github.com/polywrap/monorepo/pull/1167) Remove all `wrap-man` folders, that were published to solve the plugin's circular dependency issue.
+
 # Polywrap Origin (0.4.0)
 ## Features
 * [PR-1091](https://github.com/polywrap/monorepo/pull/1091) `@polywrap/polywrap-manifest-schemas`: Polywrap project manifests (`polywrap.yaml`, `polywrap.app.yaml`, `polywrap.plugin.yaml`) have a new format `0.2.0`, which restructures the manifest into 3 top level properties: `project`, `source`, and `extensions`. Additionally all project manifests can be given the `polywrap.yaml` file name.

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

package.json

@@ -25,14 +25,13 @@
     "clean": "npx rimraf ./**/node_modules ./**/yarn.lock ./**/build ./**/coverage ./**/.polywrap",
     "dependencies:install": "cd dependencies && yarn",
     "preinstall": "yarn dependencies:install",
-    "build": "yarn build:core && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli && yarn build:plugins:patch",
+    "build": "yarn build:core && yarn build:interfaces && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli",
     "build:core": "lerna run build --no-private --ignore @polywrap/*-plugin-js --ignore polywrap --ignore @polywrap/client-js --ignore @polywrap/react --ignore @polywrap/test-env-js --ignore @polywrap/*-interface",
     "build:interfaces": "lerna run build --scope @polywrap/*-interface --concurrency 1",
     "build:plugins": "lerna run build --scope @polywrap/*-plugin-js --concurrency 1",
     "build:client": "lerna run build --scope @polywrap/client-js --scope @polywrap/react",
     "build:test-env": "lerna run build --scope @polywrap/test-env-js",
     "build:cli": "lerna run build --scope polywrap",
-    "build:plugins:patch": "cd packages/js/plugins/ethereum && yarn codegen:patch && cd ../http && yarn codegen:patch && lerna run codegen:patch --scope @polywrap/*-plugin-js --concurrency 1",
     "link:interface:deps": "yarn link:manifests && yarn link:schema",
     "link:manifests": "yarn link:manifests:polywrap && yarn link:manifests:wrap",
     "link:manifests:polywrap": "cd packages/js/manifests/polywrap && (yarn unlink || true) && yarn link && cd ../../../../dependencies && yarn link @polywrap/polywrap-manifest-types-js && cd ../",

packages/js/client/src/__tests__/e2e/wasm-as.spec.ts

@@ -95,18 +95,18 @@ describe("wasm-as test cases", () => {
 
     const query = await client.invoke({
       uri: ensUri,
-      method: "method1",
+      method: "if",
       args: {
-        const: {
-          const: "successfully used reserved keyword",
+        if: {
+          else: "successfully used reserved keyword",
         },
       },
     });
 
     expect(query.error).toBeFalsy();
     expect(query.data).toBeTruthy();
     expect(query.data).toMatchObject({
-      const: "result: successfully used reserved keyword",
+      else: "successfully used reserved keyword",
     });
   });
 

packages/js/plugins/ethereum/package.json

@@ -12,9 +12,8 @@
     "build"
   ],
   "scripts": {
-    "build": "rimraf ./build && tsc --project tsconfig.build.json",
+    "build": "rimraf ./build && yarn codegen && tsc --project tsconfig.build.json",
     "codegen": "node ../../../../dependencies/node_modules/polywrap/bin/polywrap plugin codegen",
-    "codegen:patch": "node ../../../cli/bin/polywrap plugin codegen && rimraf ./src/wrap",
     "lint": "eslint --color -c ../../../../.eslintrc.js src/",
     "test": "jest --passWithNoTests --runInBand --verbose",
     "test:ci": "jest --passWithNoTests --runInBand --detectOpenHandles --verbose",

packages/js/plugins/ethereum/src/Connection.ts

@@ -1,4 +1,4 @@
-import { Connection as SchemaConnection } from "./wrap-man";
+import { Connection as SchemaConnection } from "./wrap";
 
 import { Signer, ethers } from "ethers";
 import {

packages/js/plugins/ethereum/src/__tests__/e2e.spec.ts

@@ -1,5 +1,5 @@
 import { ethereumPlugin } from "..";
-import * as Schema from "../wrap-man";
+import * as Schema from "../wrap";
 
 import { PolywrapClient, defaultIpfsProviders } from "@polywrap/client-js";
 import { ensResolverPlugin } from "@polywrap/ens-resolver-plugin-js";

packages/js/plugins/ethereum/src/__tests__/integration/src/index.ts

@@ -31,7 +31,8 @@ import {
   Args_sendRPC,
   Args_sendTransaction,
   Args_sendTransactionAndWait,
-  Args_signMessage, Args_requestAccounts,
+  Args_signMessage,
+  Args_requestAccounts,
 } from "./wrap";
 import { BigInt } from "@polywrap/wasm-as";
 

packages/js/plugins/ethereum/src/index.ts

@@ -37,7 +37,7 @@ import {
   Network,
   Connection as SchemaConnection,
   manifest,
-} from "./wrap-man";
+} from "./wrap";
 import {
   Connections,
   Connection,

packages/js/plugins/ethereum/src/utils/mapping.ts

@@ -1,4 +1,4 @@
-import { Access, TxReceipt, TxResponse, TxRequest, Log } from "../wrap-man";
+import { Access, TxReceipt, TxResponse, TxRequest, Log } from "../wrap";
 
 import { ethers } from "ethers";