Use Result type and throw fewer errors in Client and Core

package.json

@@ -25,7 +25,7 @@
     "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:interfaces && yarn build:plugins && yarn build:resolver:plugins && yarn build:config && yarn build:client && yarn build:test-env && yarn build:cli",
+    "build": "yarn build:core && yarn link:schema && yarn build:interfaces && yarn build:plugins && yarn build:resolver:plugins && yarn build:config && yarn build:client && yarn build:test-env && yarn build:cli",
     "build:core": "lerna run build --no-private --ignore @polywrap/*-plugin-js --ignore @polywrap/client-config-builder-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",
     "build:plugins": "lerna run build --scope @polywrap/*-plugin-js --ignore @polywrap/*-resolver-plugin-js",
@@ -38,9 +38,10 @@
     "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 ../",
     "link:manifests:wrap": "cd packages/js/manifests/wrap && (yarn unlink || true) && yarn link && cd ../../../../dependencies && yarn link @polywrap/wrap-manifest-types-js && cd ../",
-    "link:schema": "yarn link:schema:parse && yarn link:schema:compose",
+    "link:schema": "yarn link:schema:parse && yarn link:schema:compose && yarn link:schema:bind",
     "link:schema:parse": "cd packages/schema/parse && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @polywrap/schema-parse && cd ../",
     "link:schema:compose": "cd packages/schema/compose && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @polywrap/schema-compose && cd ../",
+    "link:schema:bind": "cd packages/schema/bind && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @polywrap/schema-bind && cd ../",
     "lint": "lerna run lint",
     "lint:fix": "lerna run lint -- --fix",
     "lint:ci": "yarn lint",

packages/cli/src/lib/SchemaComposer.ts

@@ -127,13 +127,12 @@ export class SchemaComposer {
       }
     }
 
-    try {
-      const manifest = await this._client.getManifest(new Uri(uri));
-      return manifest.abi;
-    } catch (e) {
-      gluegun.print.error(e);
-      throw e;
+    const manifest = await this._client.getManifest(new Uri(uri));
+    if (!manifest.ok) {
+      gluegun.print.error(manifest.error);
+      throw manifest.error;
     }
+    return manifest.value.abi;
   }
 
   private async _loadGraphqlAbi(

packages/cli/src/lib/defaults/deploy-modules/ens-recursive-name-register/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { Deployer } from "../../../deploy/deployer";
+import { Deployer } from "../../../deploy";
 
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
@@ -76,7 +76,7 @@ class ENSRecursiveNameRegisterPublisher implements Deployer {
       ],
     });
 
-    const { data: signerAddress } = await client.invoke<string>({
+    const signerAddress = await client.invoke<string>({
       method: "getSignerAddress",
       uri: ethereumPluginUri,
       args: {
@@ -86,40 +86,38 @@ class ENSRecursiveNameRegisterPublisher implements Deployer {
       },
     });
 
-    if (!signerAddress) {
+    if (!signerAddress.ok) {
       throw new Error("Could not get signer");
     }
 
-    const { data: registerData, error } = await client.invoke<{ hash: string }>(
-      {
-        method: "registerDomainAndSubdomainsRecursively",
-        uri: ensWrapperUri,
-        args: {
-          domain: ensDomain,
-          owner: signerAddress,
-          resolverAddress: config.ensResolverAddress,
-          ttl: "0",
-          registrarAddress: config.ensRegistrarAddress,
-          registryAddress: config.ensRegistryAddress,
-          connection: {
-            networkNameOrChainId: network,
-          },
+    const registerData = await client.invoke<{ hash: string }>({
+      method: "registerDomainAndSubdomainsRecursively",
+      uri: ensWrapperUri,
+      args: {
+        domain: ensDomain,
+        owner: signerAddress.value,
+        resolverAddress: config.ensResolverAddress,
+        ttl: "0",
+        registrarAddress: config.ensRegistrarAddress,
+        registryAddress: config.ensRegistryAddress,
+        connection: {
+          networkNameOrChainId: network,
         },
-      }
-    );
+      },
+    });
 
-    if (!registerData) {
+    if (!registerData.ok) {
       throw new Error(
         `Could not register domain '${ensDomain}'` +
-          (error ? `\nError: ${error.message}` : "")
+          (registerData.error ? `\nError: ${registerData.error.message}` : "")
       );
     }
 
     await client.invoke({
       method: "awaitTransaction",
       uri: ethereumPluginUri,
       args: {
-        txHash: registerData.hash,
+        txHash: registerData.value.hash,
         confirmations: 1,
         timeout: 15000,
         connection: {

packages/cli/src/lib/defaults/deploy-modules/ens/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { Deployer } from "../../../deploy/deployer";
+import { Deployer } from "../../../deploy";
 
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
@@ -77,7 +77,7 @@ class ENSPublisher implements Deployer {
       ],
     });
 
-    const { data: resolver } = await client.invoke<string>({
+    const resolver = await client.invoke<string>({
       method: "getResolver",
       uri: ensWrapperUri,
       args: {
@@ -89,38 +89,38 @@ class ENSPublisher implements Deployer {
       },
     });
 
-    if (!resolver) {
+    if (!resolver.ok) {
       throw new Error(`Could not get resolver for '${config.domainName}'`);
     }
 
-    if (resolver === "0x0000000000000000000000000000000000000000") {
+    if (resolver.value === "0x0000000000000000000000000000000000000000") {
       throw new Error(`Resolver not set for '${config.domainName}'`);
     }
 
     const hash = "0x" + contentHash.fromIpfs(cid);
 
-    const { data: setContenthashData } = await client.invoke<{ hash: string }>({
+    const setContenthashData = await client.invoke<{ hash: string }>({
       method: "setContentHash",
       uri: ensWrapperUri,
       args: {
         domain: config.domainName,
         cid: hash,
-        resolverAddress: resolver,
+        resolverAddress: resolver.value,
         connection: {
           networkNameOrChainId: network,
         },
       },
     });
 
-    if (!setContenthashData) {
+    if (!setContenthashData.ok) {
       throw new Error(`Could not set contentHash for '${config.domainName}'`);
     }
 
     await client.invoke({
       method: "awaitTransaction",
       uri: ethereumPluginUri,
       args: {
-        txHash: setContenthashData.hash,
+        txHash: setContenthashData.value.hash,
         confirmations: 1,
         timeout: 15000,
         connection: {

packages/cli/src/lib/workflow/JobRunner.ts

@@ -191,10 +191,10 @@ export class JobRunner {
       args: args,
     });
 
-    if (invokeResult.error) {
-      return { ...invokeResult, status: JobStatus.FAILED };
+    if (!invokeResult.ok) {
+      return { error: invokeResult.error, status: JobStatus.FAILED };
     } else {
-      return { ...invokeResult, status: JobStatus.SUCCEED };
+      return { data: invokeResult.value, status: JobStatus.SUCCEED };
     }
   }
 

packages/cli/src/lib/workflow/types.ts

@@ -1,4 +1,4 @@
-import { ClientConfig, InvokeResult, Uri } from "@polywrap/core-js";
+import { ClientConfig, Uri } from "@polywrap/core-js";
 
 export interface Step {
   uri: string | Uri;
@@ -15,7 +15,9 @@ export enum JobStatus {
   SKIPPED = "SKIPPED",
 }
 
-export interface JobResult<TData = unknown> extends InvokeResult<TData> {
+export interface JobResult<TData = unknown> {
+  data?: TData;
+  error?: Error;
   status: JobStatus;
 }