Merge pull request #1813 from polywrap/pileks/chore/client-0.12

update Polywrap Client used by CLI to 0.12-pre.1
polywrap · Jul 14, 2023 · 272778a · 272778a
2 parents 85059f9 + cae7946
commit 272778a
Show file tree

Hide file tree

Showing 30 changed files with 228 additions and 1,150 deletions.
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
   },
   "resolutions": {
     "@types/react": "16.9.0",
-    "@types/react-dom": "16.9.0"
+    "@types/react-dom": "16.9.0",
+    "@types/node": "18.15.0"
   }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,22 +43,24 @@
     "@ethersproject/providers": "5.6.8",
     "@ethersproject/wallet": "5.6.2",
     "@formatjs/intl": "1.8.2",
-    "@polywrap/asyncify-js": "0.11.0",
-    "@polywrap/client-config-builder-js": "0.11.0",
-    "@polywrap/client-js": "0.11.0",
-    "@polywrap/core-js": "0.11.0",
+    "@polywrap/asyncify-js": "0.12.0-pre.1",
+    "@polywrap/client-config-builder-js": "0.12.0-pre.1",
+    "@polywrap/client-js": "0.12.0-pre.1",
+    "@polywrap/core-js": "0.12.0-pre.1",
     "@polywrap/ethereum-provider-js": "0.3.1",
     "@polywrap/logging-js": "0.11.0-pre.2",
     "@polywrap/os-js": "0.11.0-pre.2",
     "@polywrap/polywrap-manifest-types-js": "0.11.0-pre.2",
-    "@polywrap/result": "0.11.0",
+    "@polywrap/result": "0.12.0-pre.1",
     "@polywrap/schema-bind": "0.11.0-pre.2",
     "@polywrap/schema-compose": "0.11.0-pre.2",
     "@polywrap/schema-parse": "0.11.0-pre.2",
-    "@polywrap/uri-resolver-extensions-js": "0.11.0",
-    "@polywrap/uri-resolvers-js": "0.11.0",
-    "@polywrap/wasm-js": "0.11.0",
-    "@polywrap/wrap-manifest-types-js": "0.11.0",
+    "@polywrap/uri-resolver-extensions-js": "0.12.0-pre.1",
+    "@polywrap/uri-resolvers-js": "0.12.0-pre.1",
+    "@polywrap/wasm-js": "0.12.0-pre.1",
+    "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1",
+    "@polywrap/web3-config-bundle-js": "0.12.0-pre.1",
+    "@polywrap/sys-config-bundle-js": "0.12.0-pre.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",
@@ -86,7 +88,7 @@
     "@types/fs-extra": "9.0.12",
     "@types/jest": "26.0.8",
     "@types/mustache": "4.0.1",
-    "@types/node": "18.14.6",
+    "@types/node": "18.15.0",
     "@types/prettier": "2.6.0",
     "@types/rimraf": "3.0.0",
     "dir-compare": "3.3.0",

diff --git a/packages/cli/src/__tests__/unit/jobrunner.spec.ts b/packages/cli/src/__tests__/unit/jobrunner.spec.ts
@@ -1,6 +1,9 @@
 import path from "path";
 import { GetPathToTestWrappers } from "@polywrap/test-cases";
-import { ClientConfigBuilder, PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
+import {
+  PolywrapClientConfigBuilder,
+  ClientConfigBuilder,
+} from "@polywrap/client-config-builder-js";
 import { testCases } from "./jobrunner-test-cases";
 import { JobRunner } from "../../lib";
 
@@ -17,17 +20,19 @@ describe("workflow JobRunner", () => {
       "00-subinvoke",
       "implementations",
       "rs"
-    )}`
+    )}`;
 
     const invokeUri = `fs/${path.join(
       GetPathToTestWrappers(),
       "subinvoke",
       "01-invoke",
       "implementations",
       "rs"
-    )}`
+    )}`;
 
-    configBuilder.setRedirect("ens/imported-invoke.eth", invokeUri).setRedirect("ens/imported-subinvoke.eth", subinvokeUri);
+    configBuilder
+      .setRedirect("ens/imported-invoke.eth", invokeUri)
+      .setRedirect("ens/imported-subinvoke.eth", subinvokeUri);
     configBuilder.addDefaults();
   });
 

diff --git a/packages/cli/src/lib/defaults/deploy-modules/ens-recursive-name-register/index.ts b/packages/cli/src/lib/defaults/deploy-modules/ens-recursive-name-register/index.ts
@@ -10,7 +10,7 @@ import {
   PolywrapClientConfigBuilder,
   PolywrapClient,
 } from "@polywrap/client-js";
-import { Web3 } from "@polywrap/client-config-builder-js";
+import * as Web3 from "@polywrap/web3-config-bundle-js";
 import {
   Connection,
   Connections,

diff --git a/packages/cli/src/lib/defaults/deploy-modules/ens/index.ts b/packages/cli/src/lib/defaults/deploy-modules/ens/index.ts
@@ -7,10 +7,10 @@ import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
 import { IWrapPackage, Uri } from "@polywrap/core-js";
 import {
-  PolywrapClient,
   PolywrapClientConfigBuilder,
+  PolywrapClient,
 } from "@polywrap/client-js";
-import { Web3 } from "@polywrap/client-config-builder-js";
+import * as Web3 from "@polywrap/web3-config-bundle-js";
 import {
   Connection,
   Connections,

diff --git a/packages/cli/src/lib/defaults/deploy-modules/ipfs/index.ts b/packages/cli/src/lib/defaults/deploy-modules/ipfs/index.ts
@@ -2,10 +2,8 @@ import { DeployModule } from "../../../deploy";
 
 import { Uri } from "@polywrap/core-js";
 import { PolywrapClient } from "@polywrap/client-js";
-import {
-  PolywrapClientConfigBuilder,
-  Web3,
-} from "@polywrap/client-config-builder-js";
+import * as Sys from "@polywrap/sys-config-bundle-js";
+import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
 import fs from "fs";
 
 const isValidUri = (uri: Uri) =>
@@ -100,7 +98,7 @@ class IPFSDeployer implements DeployModule {
     const client: PolywrapClient = new PolywrapClient(clientConfig);
 
     const result = await client.invoke<AddResult[]>({
-      uri: Web3.bundle.ipfsHttpClient.uri,
+      uri: Sys.bundle.ipfsHttpClient.uri,
       method: "addDir",
       args: (args as unknown) as Record<string, unknown>,
     });

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
@@ -27,7 +27,7 @@
     "@types/file-saver": "2.0.5",
     "@types/fs-extra": "7.0.0",
     "@types/jest": "26.0.8",
-    "@types/node": "18.14.6",
+    "@types/node": "18.15.0",
     "jest": "26.6.3",
     "nodemon": "2.0.19",
     "rimraf": "3.0.2",

diff --git a/packages/cli/src/lib/option-parsers/client-config.ts b/packages/cli/src/lib/option-parsers/client-config.ts
@@ -2,11 +2,9 @@ import { intlMsg } from "../intl";
 import { importTypescriptModule } from "../system";
 import { getTestEnvClientConfig } from "../test-env";
 
-import {
-  PolywrapClientConfigBuilder,
-  ClientConfigBuilder,
-} from "@polywrap/client-config-builder-js";
+import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
 import path from "path";
+import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
 
 export async function parseClientConfigOption(
   clientConfig: string | undefined | false

diff --git a/packages/cli/src/lib/test-env/client-config.ts b/packages/cli/src/lib/test-env/client-config.ts
@@ -1,14 +1,18 @@
 import { getTestEnvProviders } from "./providers";
 import { ETH_ENS_IPFS_MODULE_CONSTANTS } from "../../lib";
 
-import { BuilderConfig, Web3 } from "@polywrap/client-config-builder-js";
+import {
+  BuilderConfig,
+  PolywrapClientConfigBuilder,
+} from "@polywrap/client-config-builder-js";
+import * as Web3 from "@polywrap/web3-config-bundle-js";
+import * as Sys from "@polywrap/sys-config-bundle-js";
 import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js";
 import {
   ethereumProviderPlugin,
   Connections,
   Connection,
 } from "@polywrap/ethereum-provider-js";
-import { PolywrapClientConfigBuilder } from "@polywrap/client-js";
 import { IWrapPackage } from "@polywrap/core-js";
 
 export function getTestEnvClientConfig(): Partial<BuilderConfig> {
@@ -27,9 +31,8 @@ export function getTestEnvClientConfig(): Partial<BuilderConfig> {
   const builder = new PolywrapClientConfigBuilder()
     .addDefaults()
     .addEnvs({
-      [Web3.bundle.ipfsResolver.uri]: {
+      [Sys.bundle.ipfsResolver.uri]: {
         provider: ipfsProvider,
-        fallbackProviders: Web3.ipfsProviders,
         retries: { tryResolveUri: 1, getFile: 1 },
       },
       "proxy/testnet-ens-uri-resolver-ext": {

diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.deploy/0.4.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.deploy/0.4.0.ts
@@ -55,7 +55,7 @@ export interface Step {
     [k: string]: unknown;
   };
   /**
-   * URI to pass into the deploy step.
+   * URI or name of other step prefixed with '$$' to pass into the deploy step.
    */
-  uri: string | string;
+  uri: string;
 }
diff --git a/packages/js/os/package.json b/packages/js/os/package.json
@@ -16,7 +16,7 @@
     "lint": "eslint --color -c ../../../.eslintrc.js src/"
   },
   "devDependencies": {
-    "@types/node": "18.14.6",
+    "@types/node": "18.15.0",
     "rimraf": "3.0.2",
     "typescript": "4.9.5"
   },

diff --git a/packages/js/validation/package.json b/packages/js/validation/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@polywrap/schema-compose": "0.11.0-pre.2",
-    "@polywrap/wrap-manifest-types-js": "0.10.0"
+    "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1"
   },
   "devDependencies": {
     "@polywrap/msgpack-js": "0.10.0",

diff --git a/packages/manifests/polywrap/formats/polywrap.deploy/0.4.0.json b/packages/manifests/polywrap/formats/polywrap.deploy/0.4.0.json
@@ -60,18 +60,8 @@
           "type": "object"
         },
         "uri": {
-          "description": "URI to pass into the deploy step.",
-          "oneOf": [
-            {
-              "type": "string",
-              "description": "Valid WRAP URI"
-            },
-            {
-              "type": "string",
-              "description": "Name of another step, prefixed with '$'",
-              "pattern": "^\\$.*"
-            }
-          ]
+          "description": "URI or name of other step prefixed with '$$' to pass into the deploy step.",
+          "type": "string"
         }
       }
     }

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.11.0",
+    "@polywrap/client-js": "0.12.0-pre.1",
     "@polywrap/os-js": "0.11.0-pre.2",
     "@polywrap/schema-parse": "0.11.0-pre.2",
-    "@polywrap/wrap-manifest-types-js": "0.11.0",
+    "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1",
     "mustache": "4.0.1"
   },
   "devDependencies": {

diff --git a/packages/schema/bind/src/bindings/wrap-bindgen.ts b/packages/schema/bind/src/bindings/wrap-bindgen.ts
@@ -3,8 +3,8 @@ import { Args_generateBindings, GenerateBindingFn, Output } from "./types";
 
 import {
   PolywrapClient,
-  PolywrapClientConfigBuilder,
   ExtendableUriResolver,
+  PolywrapClientConfigBuilder,
 } from "@polywrap/client-js";
 import { OutputEntry } from "@polywrap/os-js";
 

diff --git a/packages/schema/compose/package.json b/packages/schema/compose/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@polywrap/schema-parse": "0.11.0-pre.2",
-    "@polywrap/wrap-manifest-types-js": "0.10.0",
+    "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1",
     "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.10.0",
+    "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1",
     "graphql": "15.5.0"
   },
   "devDependencies": {

diff --git a/packages/templates/app/typescript/package.json b/packages/templates/app/typescript/package.json
@@ -8,10 +8,10 @@
     "test": "ts-node ./src/index.ts"
   },
   "dependencies": {
-    "@polywrap/client-js": "~0.10.0"
+    "@polywrap/client-js": "~0.12.0-pre.1"
   },
   "devDependencies": {
-    "@types/node": "18.14.6",
+    "@types/node": "18.15.0",
     "polywrap": "0.11.0-pre.2",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"

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.0-pre.2",
   "dependencies": {
-    "polywrap": "~0.10.2"
+    "polywrap": "0.11.0-pre.2"
   }
 }
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.0-pre.2",
   "dependencies": {
-    "polywrap": "~0.10.2"
+    "polywrap": "0.11.0-pre.2"
   }
 }
diff --git a/packages/templates/plugin/typescript/package.json b/packages/templates/plugin/typescript/package.json
@@ -11,15 +11,15 @@
     "test:watch": "yarn test -- --watch"
   },
   "dependencies": {
-    "@polywrap/core-js": "~0.10.0",
-    "@polywrap/plugin-js": "~0.10.0"
+    "@polywrap/core-js": "~0.12.0-pre.1",
+    "@polywrap/plugin-js": "~0.12.0-pre.1"
   },
   "peerDependencies": {
-    "@polywrap/core-js": "0.10.x",
-    "@polywrap/plugin-js": "0.10.x"
+    "@polywrap/core-js": "0.12.x",
+    "@polywrap/plugin-js": "0.12.x"
   },
   "devDependencies": {
-    "@polywrap/client-js": "~0.10.0",
+    "@polywrap/client-js": "~0.12.0-pre.1",
     "@types/jest": "26.0.8",
     "@types/prettier": "2.6.0",
     "jest": "26.6.3",

diff --git a/packages/templates/plugin/typescript/src/__tests__/e2e.spec.ts b/packages/templates/plugin/typescript/src/__tests__/e2e.spec.ts
@@ -1,4 +1,4 @@
-import { ClientConfigBuilder, IWrapPackage, PolywrapClient } from "@polywrap/client-js";
+import { PolywrapClientConfigBuilder, IWrapPackage, PolywrapClient } from "@polywrap/client-js";
 import { samplePlugin } from "../";
 
 describe("e2e", () => {
@@ -7,9 +7,9 @@ describe("e2e", () => {
 
   beforeAll(() => {
     // Add the samplePlugin to the PolywrapClient
-    const config = new ClientConfigBuilder()
+    const config = new PolywrapClientConfigBuilder()
       .addDefaults()
-      .addPackage(
+      .setPackage(
         uri,
         samplePlugin({
           defaultValue: "foo bar",

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.10.2"
+    "polywrap": "0.11.0-pre.2"
   }
 }
diff --git a/packages/templates/wasm/rust/Cargo.toml b/packages/templates/wasm/rust/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-polywrap-wasm-rs = { version = "~0.10.2" }
+polywrap-wasm-rs = { version = "0.11.0-pre.0" }
 serde = { version = "1.0", features = ["derive"] }
 
 [lib]

diff --git a/packages/test-cases/cases/cli/codegen/wasm/001-sanity-assemblyscript/polywrap.yaml b/packages/test-cases/cases/cli/codegen/wasm/001-sanity-assemblyscript/polywrap.yaml
@@ -1,4 +1,4 @@
-format: 0.4.0
+format: 0.5.0
 project:
   name: test-project
   type: wasm/assemblyscript

diff --git a/packages/test-cases/cases/cli/codegen/wasm/002-sanity-rust/polywrap.yaml b/packages/test-cases/cases/cli/codegen/wasm/002-sanity-rust/polywrap.yaml
@@ -1,9 +1,9 @@
-format: 0.4.0
+format: 0.5.0
 project:
   name: ObjectTypes
   type: wasm/rust
 source:
   schema: ./schema.graphql
   module: ./Cargo.toml
 extensions:
-  build: ./polywrap.build.yaml
+  build: ./polywrap.build.yaml
diff --git a/packages/test-cases/cases/cli/deploy/.gitignore b/packages/test-cases/cases/cli/deploy/.gitignore
@@ -0,0 +1 @@
+URI.txt
diff --git a/packages/test-cases/cases/cli/deploy/001-sanity/URI.txt b/packages/test-cases/cases/cli/deploy/001-sanity/URI.txt