refactor: client and client-config-builder

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

@@ -3,8 +3,7 @@ import { buildWrapper } from "@polywrap/test-env-js";
 import { testCases } from "./jobrunner-test-cases";
 import { JobRunner } from "../../lib";
 import path from "path";
-import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
-import { IClientConfigBuilder } from "@polywrap/client-config-builder-js/build/IClientConfigBuilder";
+import { ClientConfigBuilder, IClientConfigBuilder } from "@polywrap/client-config-builder-js";
 
 jest.setTimeout(200000);
 

packages/cli/src/__tests__/unit/option-parsers/option-parsers.spec.ts

@@ -1,26 +1,17 @@
-import { Uri } from "@polywrap/core-js";
 import path from "path";
 import { parseWrapperEnvsOption } from "../../../lib";
 
 describe("unit tests for option-parsers", () => {
   describe("wrapper-envs", () => {
-    const sampleFileEnvs = [
-      {
-        uri: Uri.from("wrap://ens/hello-world.polywrap.eth"),
-        env: {
-          foo: "bar",
+    const sampleFileEnvs = {
+      "ens/ethereum.polywrap.eth": {
+        connection: {
+          networkNameOrChainId: "mainnet",
+          node: "https://mainnet.infura.io/v3/some_api_key",
         },
       },
-      {
-        uri: Uri.from("ens/ethereum.polywrap.eth"),
-        env: {
-          connection: {
-            node: "https://mainnet.infura.io/v3/some_api_key",
-            networkNameOrChainId: "mainnet",
-          },
-        },
-      },
-    ];
+      "ens/hello-world.polywrap.eth": { foo: "bar" },
+    };
 
     it("Should return undefined when no filename is provided", async () => {
       const envs = await parseWrapperEnvsOption(undefined);

packages/cli/src/commands/build.ts

@@ -30,7 +30,7 @@ import {
 import { defaultCodegenDir } from "../lib/defaults/defaultCodegenDir";
 
 import readline from "readline";
-import { Env, PolywrapClient } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import { PolywrapManifest } from "@polywrap/polywrap-manifest-types-js";
 import { IClientConfigBuilder } from "@polywrap/client-config-builder-js";
 
@@ -49,9 +49,9 @@ type BuildCommandOptions = {
   manifestFile: string;
   outputDir: string;
   configBuilder: IClientConfigBuilder;
-  codegen: boolean; // defaults to false
+  wrapperEnvs: Record<string, Record<string, unknown>>;
+  codegen: boolean; // defaults to true
   codegenDir: string;
-  wrapperEnvs: Env[];
   watch?: boolean;
   strategy: SupportedStrategies;
   verbose?: boolean;

packages/cli/src/commands/codegen.ts

@@ -18,7 +18,7 @@ import {
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 import { defaultCodegenDir } from "../lib/defaults/defaultCodegenDir";
 
-import { Env, PolywrapClient } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import { IClientConfigBuilder } from "@polywrap/client-config-builder-js";
 
 const pathStr = intlMsg.commands_codegen_options_o_path();
@@ -29,7 +29,7 @@ type CodegenCommandOptions = {
   codegenDir: string;
   script?: string;
   configBuilder: IClientConfigBuilder;
-  wrapperEnvs: Env[];
+  wrapperEnvs: Record<string, Record<string, unknown>>;
   verbose?: boolean;
   quiet?: boolean;
   logFile?: string;

packages/cli/src/commands/docgen.ts

@@ -18,7 +18,7 @@ import { scriptPath as jsdocScriptPath } from "../lib/docgen/jsdoc";
 import { scriptPath as schemaScriptPath } from "../lib/docgen/schema";
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 
-import { Env, PolywrapClient } from "@polywrap/client-js";
+import { PolywrapClient } from "@polywrap/client-js";
 import chalk from "chalk";
 import { Argument } from "commander";
 import { IClientConfigBuilder } from "@polywrap/client-config-builder-js";
@@ -38,7 +38,7 @@ type DocgenCommandOptions = {
   manifestFile: string;
   docgenDir: string;
   configBuilder: IClientConfigBuilder;
-  wrapperEnvs: Env[];
+  wrapperEnvs: Record<string, Record<string, unknown>>;
   imports: boolean;
   verbose?: boolean;
   quiet?: boolean;

packages/cli/src/commands/test.ts

@@ -24,11 +24,10 @@ import path from "path";
 import yaml from "yaml";
 import fs from "fs";
 import { IClientConfigBuilder } from "@polywrap/client-config-builder-js";
-import { Env } from "@polywrap/core-js";
 
 type WorkflowCommandOptions = {
   configBuilder: IClientConfigBuilder;
-  wrapperEnvs: Env[];
+  wrapperEnvs: Record<string, Record<string, unknown>>;
   manifest: string;
   jobs?: string[];
   validationScript?: string;

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

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

packages/cli/src/lib/option-parsers/wrapper-envs.ts

@@ -1,15 +1,14 @@
 import { loadEnvironmentVariables } from "../system";
 
 import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
-import { Env, Uri } from "@polywrap/core-js";
 import fs from "fs";
 import YAML from "yaml";
 
 type WrapperEnvs = Record<string, Record<string, unknown>>;
 
 export async function parseWrapperEnvsOption(
   wrapperEnvsPath: string | undefined
-): Promise<Readonly<Env<Uri>[]> | undefined> {
+): Promise<Readonly<Record<string, Record<string, unknown>>> | undefined> {
   if (!wrapperEnvsPath) {
     return undefined;
   }
@@ -41,5 +40,5 @@ export async function parseWrapperEnvsOption(
     builder.addEnv(env, wrapperEnvs[env]);
   }
 
-  return builder.buildCoreConfig().envs;
+  return builder.config.envs;
 }

packages/cli/src/lib/test-env/client-config.ts

@@ -1,7 +1,9 @@
 import { getTestEnvProviders } from "./providers";
 
-import { PolywrapClientConfig } from "@polywrap/client-js";
-import { defaultIpfsProviders } from "@polywrap/client-config-builder-js";
+import {
+  BuilderConfig,
+  defaultIpfsProviders,
+} from "@polywrap/client-config-builder-js";
 import { ensResolverPlugin } from "@polywrap/ens-resolver-plugin-js";
 import {
   ethereumPlugin,
@@ -11,7 +13,7 @@ import {
 import { ipfsPlugin } from "@polywrap/ipfs-plugin-js";
 import { ensAddresses } from "@polywrap/test-env-js";
 
-export function getTestEnvClientConfig(): Partial<PolywrapClientConfig> {
+export function getTestEnvClientConfig(): Partial<BuilderConfig> {
   // TODO: move this into its own package, since it's being used everywhere?
   // maybe have it exported from test-env.
   const providers = getTestEnvProviders();
@@ -25,48 +27,36 @@ export function getTestEnvClientConfig(): Partial<PolywrapClientConfig> {
   const ensAddress = ensAddresses.ensAddress;
 
   return {
-    envs: [
-      {
-        uri: "wrap://ens/ipfs.polywrap.eth",
-        env: {
-          provider: ipfsProvider,
-          fallbackProviders: defaultIpfsProviders,
-        },
-      },
-    ],
-    packages: [
-      {
-        uri: "wrap://ens/ethereum.polywrap.eth",
-        package: ethereumPlugin({
-          connections: new Connections({
-            networks: {
-              testnet: new Connection({
-                provider: ethProvider,
-              }),
-              mainnet: new Connection({
-                provider:
-                  "https://mainnet.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6",
-              }),
-              goerli: new Connection({
-                provider:
-                  "https://goerli.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6",
-              }),
-            },
-          }),
-        }),
+    envs: {
+      "wrap://ens/ipfs.polywrap.eth": {
+        provider: ipfsProvider,
+        fallbackProviders: defaultIpfsProviders,
       },
-      {
-        uri: "wrap://ens/ipfs.polywrap.eth",
-        package: ipfsPlugin({}),
-      },
-      {
-        uri: "wrap://ens/ens-resolver.polywrap.eth",
-        package: ensResolverPlugin({
-          addresses: {
-            testnet: ensAddress,
+    },
+    packages: {
+      "wrap://ens/ethereum.polywrap.eth": ethereumPlugin({
+        connections: new Connections({
+          networks: {
+            testnet: new Connection({
+              provider: ethProvider,
+            }),
+            mainnet: new Connection({
+              provider:
+                "https://mainnet.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6",
+            }),
+            goerli: new Connection({
+              provider:
+                "https://goerli.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6",
+            }),
           },
         }),
-      },
-    ],
+      }),
+      "wrap://ens/ipfs.polywrap.eth": ipfsPlugin({}),
+      "wrap://ens/ens-resolver.polywrap.eth": ensResolverPlugin({
+        addresses: {
+          testnet: ensAddress,
+        },
+      }),
+    },
   };
 }