Plugin refactor

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 build:interfaces && yarn link:schema && 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",

packages/cli/package.json

@@ -47,7 +47,6 @@
     "@polywrap/ens-resolver-plugin-js": "0.9.3",
     "@polywrap/ethereum-plugin-js": "0.9.3",
     "@polywrap/ipfs-plugin-js": "0.9.3",
-    "@polywrap/msgpack-js": "0.9.3",
     "@polywrap/os-js": "0.9.3",
     "@polywrap/polywrap-manifest-types-js": "0.9.3",
     "@polywrap/schema-bind": "0.9.3",

packages/cli/src/__tests__/unit/jobrunner.spec.ts

@@ -3,26 +3,27 @@ import { buildWrapper } from "@polywrap/test-env-js";
 import { testCases } from "./jobrunner-test-cases";
 import { JobRunner } from "../../lib";
 import path from "path";
-import { PolywrapClient } from "@polywrap/client-js";
+import { ClientConfigBuilder, ClientConfig } from "@polywrap/client-config-builder-js";
 
 jest.setTimeout(200000);
 
 describe("workflow JobRunner", () => {
-
-  let client: PolywrapClient;
+  let defaultConfig: ClientConfig;
 
   beforeAll(async () => {
     await buildWrapper(
       path.join(GetPathToTestWrappers(), "wasm-as", "simple-calculator")
     );
-    client = new PolywrapClient({});
+    defaultConfig = new ClientConfigBuilder().addDefaults().build();
   });
 
   for (const testCase of testCases) {
     it(testCase.name, async () => {
-      expect(client).toBeTruthy();
       const ids = Object.keys(testCase.workflow.jobs);
-      const jobRunner = new JobRunner(client, testCase.onExecution);
+      const jobRunner = new JobRunner(
+        defaultConfig,
+        testCase.onExecution
+      );
       await jobRunner.run(testCase.workflow.jobs, ids);
     });
   }

packages/cli/src/commands/build.ts

@@ -25,8 +25,9 @@ import {
 
 import path from "path";
 import readline from "readline";
-import { PolywrapClient, PolywrapClientConfig } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import { PolywrapManifest } from "@polywrap/polywrap-manifest-types-js";
+import { ClientConfig } from "@polywrap/client-config-builder-js";
 
 const defaultOutputDir = "./build";
 const defaultStrategy = SupportedStrategies.VM;
@@ -37,7 +38,7 @@ const pathStr = intlMsg.commands_build_options_o_path();
 type BuildCommandOptions = {
   manifestFile: string;
   outputDir: string;
-  clientConfig: Partial<PolywrapClientConfig>;
+  clientConfig: Partial<ClientConfig>;
   codegen: boolean; // defaults to true
   watch?: boolean;
   strategy: SupportedStrategies;

packages/cli/src/commands/codegen.ts

@@ -18,9 +18,10 @@ import {
 } from "../lib";
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 
-import { PolywrapClient, PolywrapClientConfig } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import path from "path";
 import fs from "fs";
+import { ClientConfig } from "@polywrap/client-config-builder-js";
 
 const defaultCodegenDir = "./src/wrap";
 const defaultPublishDir = "./build";
@@ -33,7 +34,7 @@ type CodegenCommandOptions = {
   codegenDir: string;
   publishDir: string;
   script?: string;
-  clientConfig: Partial<PolywrapClientConfig>;
+  clientConfig: Partial<ClientConfig>;
   verbose?: boolean;
   quiet?: boolean;
   logFile?: string;

packages/cli/src/commands/docgen.ts

@@ -17,9 +17,10 @@ import { scriptPath as jsdocScriptPath } from "../lib/docgen/jsdoc";
 import { scriptPath as schemaScriptPath } from "../lib/docgen/schema";
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 
-import { PolywrapClient, PolywrapClientConfig } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import chalk from "chalk";
 import { Argument } from "commander";
+import { ClientConfig } from "@polywrap/client-config-builder-js";
 
 const commandToPathMap: Record<string, string> = {
   schema: schemaScriptPath,
@@ -35,7 +36,7 @@ const pathStr = intlMsg.commands_codegen_options_o_path();
 type DocgenCommandOptions = {
   manifestFile: string;
   docgenDir: string;
-  clientConfig: Partial<PolywrapClientConfig>;
+  clientConfig: Partial<ClientConfig>;
   imports: boolean;
   verbose?: boolean;
   quiet?: boolean;

packages/cli/src/commands/run.ts

@@ -18,13 +18,13 @@ import {
 } from "../lib";
 import { createLogger } from "./utils/createLogger";
 
-import { PolywrapClient, PolywrapClientConfig } from "@polywrap/client-js";
 import path from "path";
 import yaml from "yaml";
 import fs from "fs";
+import { ClientConfig } from "@polywrap/client-config-builder-js";
 
 type WorkflowCommandOptions = {
-  clientConfig: Partial<PolywrapClientConfig>;
+  clientConfig: Partial<ClientConfig>;
   manifest: string;
   jobs?: string[];
   validationScript?: string;
@@ -95,7 +95,6 @@ const _run = async (options: WorkflowCommandOptions) => {
     logFile,
   } = options;
   const logger = createLogger({ verbose, quiet, logFile });
-  const client = new PolywrapClient(clientConfig);
 
   const manifestPath = path.resolve(manifest);
   const workflow = await loadWorkflowManifest(manifestPath, logger);
@@ -128,7 +127,7 @@ const _run = async (options: WorkflowCommandOptions) => {
     workflowOutput.push(output);
   };
 
-  const jobRunner = new JobRunner(client, onExecution);
+  const jobRunner = new JobRunner(clientConfig, onExecution);
   await jobRunner.run(workflow.jobs, jobs ?? Object.keys(workflow.jobs));
 
   if (outputFile) {

packages/cli/src/lib/build-strategies/strategies/DockerImageStrategy.ts

@@ -266,7 +266,10 @@ export class DockerImageBuildStrategy extends BuildStrategy<BuildImageId> {
         }
         await runCommand(
           `docker buildx build -f ${dockerfile} -t ${imageName} ${rootDir} ${cacheFrom} ${cacheTo} --output=type=docker`,
-          this.project.logger
+          this.project.logger,
+          undefined,
+          undefined,
+          true
         );
       } else {
         await runCommand(
@@ -277,7 +280,9 @@ export class DockerImageBuildStrategy extends BuildStrategy<BuildImageId> {
             : {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 DOCKER_BUILDKIT: "true",
-              }
+              },
+          undefined,
+          true
         );
       }
 

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

@@ -5,13 +5,13 @@ import { Deployer } from "../../../deploy";
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
 import { Uri } from "@polywrap/core-js";
-import { PolywrapClient } from "@polywrap/client-js";
 import {
   ethereumPlugin,
   Connections,
   Connection,
 } from "@polywrap/ethereum-plugin-js";
 import { embeddedWrappers } from "@polywrap/test-env-js";
+import { PolywrapClient } from "@polywrap/client-js";
 
 class ENSRecursiveNameRegisterPublisher implements Deployer {
   async execute(
@@ -62,10 +62,10 @@ class ENSRecursiveNameRegisterPublisher implements Deployer {
           to: embeddedWrappers.sha3,
         },
       ],
-      plugins: [
+      packages: [
         {
           uri: ethereumPluginUri,
-          plugin: ethereumPlugin({
+          package: ethereumPlugin({
             connections: new Connections({
               networks: {
                 [network]: new Connection({

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

@@ -5,13 +5,13 @@ import { Deployer } from "../../../deploy";
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
 import { Uri } from "@polywrap/core-js";
-import { PolywrapClient } from "@polywrap/client-js";
 import {
-  ethereumPlugin,
   Connections,
   Connection,
+  ethereumPlugin,
 } from "@polywrap/ethereum-plugin-js";
 import { embeddedWrappers } from "@polywrap/test-env-js";
+import { PolywrapClient } from "@polywrap/client-js";
 
 const contentHash = require("content-hash");
 
@@ -59,10 +59,10 @@ class ENSPublisher implements Deployer {
           to: embeddedWrappers.sha3,
         },
       ],
-      plugins: [
+      packages: [
         {
           uri: ethereumPluginUri,
-          plugin: ethereumPlugin({
+          package: ethereumPlugin({
             connections: new Connections({
               networks: {
                 [network]: new Connection({

packages/cli/src/lib/defaults/infra-modules/http/server/package.json

@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@polywrap/msgpack-js": "0.7.0",
+    "@polywrap/msgpack-js": "0.9.3",
     "@types/multer": "1.4.7",
     "dotenv": "8.6.0",
     "express": "4.18.1",

packages/cli/src/lib/helpers/index.ts

@@ -1,4 +1,3 @@
-export * from "./client";
 export * from "./metadata";
 export * from "./uuid";
 export * from "./validate-client-config";

packages/cli/src/lib/helpers/validate-client-config.ts

@@ -3,16 +3,14 @@ import { intlMsg } from "../intl";
 import {
   Env,
   InterfaceImplementations,
-  PluginPackage,
-  PluginRegistration,
+  IUriRedirect,
   Uri,
-  UriRedirect,
-  PolywrapClientConfig,
 } from "@polywrap/client-js";
+import { ClientConfig } from "@polywrap/client-config-builder-js";
 
-export function validateRedirects<
-  TUri extends PluginPackage<unknown> | Uri | string
->(redirects: readonly UriRedirect<TUri>[]): void {
+export function validateRedirects<TUri extends Uri | string>(
+  redirects: readonly IUriRedirect<TUri>[]
+): void {
   if (!Array.isArray(redirects)) {
     throw new Error(intlMsg.commands_run_error_redirectsExportNotArray());
   }
@@ -43,50 +41,6 @@ export function validateRedirects<
   }
 }
 
-export function validatePlugins<TUri extends Uri | string = string>(
-  plugins: readonly PluginRegistration<TUri>[]
-): void {
-  if (!Array.isArray(plugins)) {
-    throw new Error(intlMsg.commands_run_error_pluginsExportNotArray());
-  }
-
-  // Ensure each plugin in the array is valid
-  for (let i = 0; i < plugins.length; ++i) {
-    const plugin = plugins[i];
-    if (typeof plugin !== "object") {
-      throw new Error(
-        intlMsg.commands_run_error_pluginsItemNotObject({
-          index: i.toString(),
-        })
-      );
-    } else if (typeof plugin.uri !== "string") {
-      throw new Error(
-        intlMsg.commands_run_error_pluginsItemUriNotString({
-          index: i.toString(),
-        })
-      );
-    } else if (typeof plugin.plugin !== "object") {
-      throw new Error(
-        intlMsg.commands_run_error_pluginsItemPluginNotObject({
-          index: i.toString(),
-        })
-      );
-    } else if (typeof plugin.plugin.factory !== "function") {
-      throw new Error(
-        intlMsg.commands_run_error_pluginsItemPluginFactoryNotFunction({
-          index: i.toString(),
-        })
-      );
-    } else if (typeof plugin.plugin.manifest !== "object") {
-      throw new Error(
-        intlMsg.commands_run_error_pluginsItemPluginManifestNotObject({
-          index: i.toString(),
-        })
-      );
-    }
-  }
-}
-
 export function validateInterfaces<TUri extends Uri | string = string>(
   interfaces: readonly InterfaceImplementations<TUri>[]
 ): void {
@@ -167,13 +121,10 @@ export function validateEnvs<TUri extends Uri | string = string>(
   }
 }
 
-export function validateClientConfig(
-  config: Partial<PolywrapClientConfig>
-): void {
+export function validateClientConfig(config: Partial<ClientConfig>): void {
   if (!config || typeof config !== "object") {
     throw new Error(intlMsg.commands_run_error_clientConfigNotObject());
   }
-  if (config.plugins) validatePlugins(config.plugins);
   if (config.envs) validateEnvs(config.envs);
   if (config.interfaces) validateInterfaces(config.interfaces);
   if (config.redirects) validateRedirects(config.redirects);