Merge pull request #1480 from polywrap/pileks/refactor-client-updates

Refactor: ClientConfigBuilder-specific `BuilderConfig` object for configuration handling

Author: pileks

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,33 +1,30 @@
-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 () => {
+    it("Should return undefined when undefined is provided for wrapperEnvsPath", async () => {
       const envs = await parseWrapperEnvsOption(undefined);
 
       expect(envs).toBeUndefined();
     });
 
+    it("Should return undefined when false is provided for wrapperEnvsPath", async () => {
+      const envs = await parseWrapperEnvsOption(false);
+
+      expect(envs).toBeUndefined();
+    });
+
     it("Should throw for a nonexistent wrapper-env file", async () => {
       const nonExistentFilePath = path.join(
         __dirname,

packages/cli/src/commands/build.ts

@@ -30,9 +30,8 @@ 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 { Uri } from "@polywrap/core-js";
 
 const defaultOutputDir = "./build";
 const defaultStrategy = SupportedStrategies.VM;
@@ -178,11 +177,11 @@ async function run(options: Required<BuildCommandOptions>) {
   const configBuilder = await parseClientConfigOption(clientConfig);
 
   if (envs) {
-    configBuilder.addEnvs(envs as Env<Uri>[]);
+    configBuilder.addEnvs(envs);
   }
 
   // Get Client
-  const client = new PolywrapClient(configBuilder.buildCoreConfig(), {
+  const client = new PolywrapClient(configBuilder.build(), {
     noDefaults: true,
   });
 

packages/cli/src/commands/codegen.ts

@@ -18,8 +18,7 @@ import {
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 import { defaultCodegenDir } from "../lib/defaults/defaultCodegenDir";
 
-import { Env, PolywrapClient } from "@polywrap/client-js";
-import { Uri } from "@polywrap/core-js";
+import { PolywrapClient } from "@polywrap/client-js";
 
 const pathStr = intlMsg.commands_codegen_options_o_path();
 const defaultManifestStr = defaultPolywrapManifest.join(" | ");
@@ -103,11 +102,11 @@ async function run(options: Required<CodegenCommandOptions>) {
   const configBuilder = await parseClientConfigOption(clientConfig);
 
   if (envs) {
-    configBuilder.addEnvs(envs as Env<Uri>[]);
+    configBuilder.addEnvs(envs);
   }
 
   // Get Client
-  const client = new PolywrapClient(configBuilder.buildCoreConfig(), {
+  const client = new PolywrapClient(configBuilder.build(), {
     noDefaults: true,
   });
 

packages/cli/src/commands/docgen.ts

@@ -18,10 +18,9 @@ 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 { Uri } from "@polywrap/core-js";
 
 const commandToPathMap: Record<string, string> = {
   schema: schemaScriptPath,
@@ -141,7 +140,7 @@ async function run(
   const configBuilder = await parseClientConfigOption(clientConfig);
 
   if (envs) {
-    configBuilder.addEnvs(envs as Env<Uri>[]);
+    configBuilder.addEnvs(envs);
   }
 
   let project = await getProjectFromManifest(manifestFile, logger);
@@ -161,7 +160,7 @@ async function run(
   // Resolve custom script
   const customScript = require.resolve(commandToPathMap[action]);
 
-  const client = new PolywrapClient(configBuilder.buildCoreConfig(), {
+  const client = new PolywrapClient(configBuilder.build(), {
     noDefaults: true,
   });
 

packages/cli/src/commands/test.ts

@@ -23,7 +23,6 @@ import { createLogger } from "./utils/createLogger";
 import path from "path";
 import yaml from "yaml";
 import fs from "fs";
-import { Env, Uri } from "@polywrap/core-js";
 
 export interface TestCommandOptions extends BaseCommandOptions {
   clientConfig: string | false;
@@ -109,7 +108,7 @@ const _run = async (options: Required<TestCommandOptions>) => {
   const configBuilder = await parseClientConfigOption(clientConfig);
 
   if (envs) {
-    configBuilder.addEnvs(envs as Env<Uri>[]);
+    configBuilder.addEnvs(envs);
   }
 
   const manifestPath = path.resolve(manifestFile);

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/helpers/validate-client-config.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 | false | 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;
 }