Merge pull request #1859 from polywrap/origin-0.11-dev

dOrgJelli · web-flow · commit c4875d7195d5 · 2023-08-20T20:52:46.000-04:00
Prep Origin 0.11.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Polywrap Origin (0.11.2)
+## Bugs
+**`@polywrap/templates`:**
+* [PR-1855](https://github.com/polywrap/cli/pull/1855) **Update TypeScript App Codegen**
+* [PR-1858](https://github.com/polywrap/cli/pull/1858) **Update Client Version**
+
 # Polywrap Origin (0.11.1)
 ## Bugs
 **`polywrap` CLI:**
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.11.1
+0.11.2
diff --git a/WRAP_TEST_HARNESS b/WRAP_TEST_HARNESS
@@ -1 +1 @@
-chore/latest-rust-wrap-bindings
+master
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,24 +43,24 @@
     "@ethersproject/providers": "5.6.8",
     "@ethersproject/wallet": "5.6.2",
     "@formatjs/intl": "1.8.2",
-    "@polywrap/asyncify-js": "0.12.0",
-    "@polywrap/client-config-builder-js": "0.12.0",
-    "@polywrap/client-js": "0.12.0",
-    "@polywrap/core-js": "0.12.0",
+    "@polywrap/asyncify-js": "~0.12.0",
+    "@polywrap/client-config-builder-js": "~0.12.0",
+    "@polywrap/client-js": "~0.12.0",
+    "@polywrap/core-js": "~0.12.0",
     "@polywrap/ethereum-wallet-js": "~0.1.0",
     "@polywrap/logging-js": "0.11.1",
     "@polywrap/os-js": "0.11.1",
     "@polywrap/polywrap-manifest-types-js": "0.11.1",
-    "@polywrap/result": "0.12.0",
+    "@polywrap/result": "~0.12.0",
     "@polywrap/schema-bind": "0.11.1",
     "@polywrap/schema-compose": "0.11.1",
     "@polywrap/schema-parse": "0.11.1",
-    "@polywrap/sys-config-bundle-js": "0.12.0",
-    "@polywrap/uri-resolver-extensions-js": "0.12.0",
-    "@polywrap/uri-resolvers-js": "0.12.0",
-    "@polywrap/wasm-js": "0.12.0",
-    "@polywrap/web3-config-bundle-js": "0.12.0",
-    "@polywrap/wrap-manifest-types-js": "0.12.0",
+    "@polywrap/sys-config-bundle-js": "~0.12.0",
+    "@polywrap/uri-resolver-extensions-js": "~0.12.0",
+    "@polywrap/uri-resolvers-js": "~0.12.0",
+    "@polywrap/wasm-js": "~0.12.0",
+    "@polywrap/web3-config-bundle-js": "~0.12.0",
+    "@polywrap/wrap-manifest-types-js": "~0.12.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",
diff --git a/packages/cli/src/lib/defaults/infra-modules/http/server/package.json b/packages/cli/src/lib/defaults/infra-modules/http/server/package.json
@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@polywrap/msgpack-js": "0.9.3",
+    "@polywrap/msgpack-js": "~0.12.0",
     "@types/multer": "1.4.7",
     "dotenv": "8.6.0",
     "express": "4.18.1",
diff --git a/packages/js/validation/package.json b/packages/js/validation/package.json
@@ -19,10 +19,10 @@
   },
   "dependencies": {
     "@polywrap/schema-compose": "0.11.1",
-    "@polywrap/wrap-manifest-types-js": "0.12.0"
+    "@polywrap/wrap-manifest-types-js": "~0.12.0"
   },
   "devDependencies": {
-    "@polywrap/msgpack-js": "0.10.0",
+    "@polywrap/msgpack-js": "~0.12.0",
     "@polywrap/os-js": "0.11.1",
     "@types/jest": "26.0.8",
     "jest": "26.6.3",
diff --git a/packages/schema/bind/package.json b/packages/schema/bind/package.json
@@ -19,10 +19,10 @@
     "copy:templates": "copyfiles -u 1 src/**/*.mustache build/"
   },
   "dependencies": {
-    "@polywrap/client-js": "0.12.0",
+    "@polywrap/client-js": "~0.12.0",
     "@polywrap/os-js": "0.11.1",
     "@polywrap/schema-parse": "0.11.1",
-    "@polywrap/wrap-manifest-types-js": "0.12.0",
+    "@polywrap/wrap-manifest-types-js": "~0.12.0",
     "mustache": "4.0.1"
   },
   "devDependencies": {
diff --git a/packages/schema/bind/src/bindings/index.ts b/packages/schema/bind/src/bindings/index.ts
@@ -43,7 +43,7 @@ export function getGenerateBindingFn(
       );
     case "app-ts":
       return WrapBindgen.getGenerateBindingFn(
-        "https://github.com/polywrap/wrap-abi-bindgen/tree/wrap-0.1/implementations/app-typescript"
+        "https://github.com/polywrap/wrap-abi-bindgen/tree/nk/ts-app-codegen/implementations/app-typescript"
       );
     default:
       throw Error(`Error: Language binding unsupported - ${bindLanguage}`);
diff --git a/packages/schema/compose/package.json b/packages/schema/compose/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@polywrap/schema-parse": "0.11.1",
-    "@polywrap/wrap-manifest-types-js": "0.12.0",
+    "@polywrap/wrap-manifest-types-js": "~0.12.0",
     "graphql": "15.5.0",
     "mustache": "4.0.1"
   },
diff --git a/packages/schema/parse/package.json b/packages/schema/parse/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@dorgjelli/graphql-schema-cycles": "1.1.4",
-    "@polywrap/wrap-manifest-types-js": "0.12.0",
+    "@polywrap/wrap-manifest-types-js": "~0.12.0",
     "graphql": "15.5.0"
   },
   "devDependencies": {
diff --git a/packages/templates/app/typescript/package.json b/packages/templates/app/typescript/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@types/node": "18.15.0",
-    "polywrap": "0.11.1",
+    "polywrap": "~0.11.1",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
   }
diff --git a/packages/templates/app/typescript/src/index.ts b/packages/templates/app/typescript/src/index.ts
@@ -1,36 +1,30 @@
-import {
-  Logging_Module,
-  Ethereum_Module,
-} from "./wrap";
-
-import { PolywrapClient } from "@polywrap/client-js";
-
-const client = new PolywrapClient();
+import { Ethereum, Logging } from "./wrap";
 
 async function main() {
   console.log("Invoking: Logging.info(...)");
 
-  await Logging_Module.info({
+  const logger = new Logging();
+
+  await logger.info({
     message: "Hello there",
-  }, client);
+  });
 
-  await Logging_Module.info({
+  await logger.info({
     message: "Hello again",
-  }, client);
+  });
 
-  await Logging_Module.info({
+  await logger.info({
     message: "One last time...",
-  }, client);
+  });
 
   console.log("Invoking: Ethereum.encodeParams(...)");
 
-  const result = await Ethereum_Module.encodeParams(
-    {
-      types: ["address", "uint256"],
-      values: ["0xB1B7586656116D546033e3bAFF69BFcD6592225E", "500"],
-    },
-    client
-  );
+  const eth = new Ethereum();
+
+  const result = await eth.encodeParams({
+    types: ["address", "uint256"],
+    values: ["0xB1B7586656116D546033e3bAFF69BFcD6592225E", "500"],
+  });
 
   if (result.ok) {
     console.log(`Ethereum.encodeParams:\n${result.value}`);
diff --git a/packages/templates/plugin/python/package.json b/packages/templates/plugin/python/package.json
@@ -3,6 +3,6 @@
   "private": true,
   "version": "0.11.1",
   "dependencies": {
-    "polywrap": "0.11.1"
+    "polywrap": "~0.11.1"
   }
 }
diff --git a/packages/templates/plugin/rust/package.json b/packages/templates/plugin/rust/package.json
@@ -3,6 +3,6 @@
   "private": true,
   "version": "0.11.1",
   "dependencies": {
-    "polywrap": "0.11.1"
+    "polywrap": "~0.11.1"
   }
 }
diff --git a/packages/templates/wasm/interface/package.json b/packages/templates/wasm/interface/package.json
@@ -2,6 +2,6 @@
   "name": "templates-interface",
   "private": true,
   "dependencies": {
-    "polywrap": "0.11.0-pre.2"
+    "polywrap": "~0.11.0"
   }
 }
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/004-default-build/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/004-default-build/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/005-default-dockerfile/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/005-default-dockerfile/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/006-custom-dockerfile/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/006-custom-dockerfile/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/007-linked-packages/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/007-linked-packages/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/009-docker-buildx/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/009-docker-buildx/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/010-custom-config/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/010-custom-config/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/011-custom-config/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/011-custom-config/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/014-override-config/package.json b/packages/test-cases/cases/cli/build-cmd/wasm/assemblyscript/014-override-config/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/001-sanity-assemblyscript/package.json b/packages/test-cases/cases/cli/codegen/wasm/001-sanity-assemblyscript/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/003-invalid-codegen-script/package.json b/packages/test-cases/cases/cli/codegen/wasm/003-invalid-codegen-script/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/004-codegen-script/package.json b/packages/test-cases/cases/cli/codegen/wasm/004-codegen-script/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/005-custom-config/package.json b/packages/test-cases/cases/cli/codegen/wasm/005-custom-config/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/006-custom-manifest-file/package.json b/packages/test-cases/cases/cli/codegen/wasm/006-custom-manifest-file/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/codegen/wasm/007-override-config/package.json b/packages/test-cases/cases/cli/codegen/wasm/007-override-config/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.3.0"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/packages/test-cases/cases/cli/test/run-test-wrapper/package.json b/packages/test-cases/cases/cli/test/run-test-wrapper/package.json
@@ -7,7 +7,7 @@
     "build": "polywrap build"
   },
   "dependencies": {
-    "@polywrap/wasm-as": "0.9.3"
+    "@polywrap/wasm-as": "^0.11.0"
   },
   "devDependencies": {
     "assemblyscript": "0.19.23"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-chore/latest-rust-wrap-bindings`
	`1`	`+master`