Merge pull request #1484 from polywrap/pileks/bugfix/client-config-builder-wrapper-cache

`ClientConfigBuilder` - move wrapperCache and resolver from constructor to buildCoreConfig

Author: Niraj-Kamdar

packages/js/client-config-builder/README.md

@@ -13,12 +13,6 @@ Initialize a ClientConfigBuilder using the [constructor](#constructor)
 ```typescript
   // start with a blank slate (typical usage)
   const builder = new ClientConfigBuilder();
-
-  // instantiate a builder with a custom cache and/or resolver
-  const _builder = new ClientConfigBuilder(
-    new WrapperCache(),
-    RecursiveResolver.from([])
-  );
 ```
 
 ### Configure
@@ -63,7 +57,13 @@ Finally, build a ClientConfig or CoreClientConfig to pass to the PolywrapClient
   const clientConfig = builder.build();
 
   // accepted by either the PolywrapClient or the PolywrapCoreClient
-  const coreClientConfig = builder.buildCoreConfig();
+  let coreClientConfig = builder.buildCoreConfig();
+
+  // build with a custom cache and/or resolver
+  coreClientConfig = builder.buildCoreConfig(
+    new WrapperCache(),
+    RecursiveResolver.from([])
+  );
 ```
 
 ### Example
@@ -197,14 +197,8 @@ export interface ClientConfig {
 ```ts
   /**
    * Instantiate a ClientConfigBuilder
-   *
-   * @param _wrapperCache?: a wrapper cache to be used in place of the default wrapper cache
-   * @param _resolver?: a uri resolver to be used in place of any added redirects, wrappers, packages, and resolvers when building a CoreClientConfig
    */
-  constructor(
-    private readonly _wrapperCache?: IWrapperCache,
-    private readonly _resolver?: IUriResolver<unknown>
-  ) 
+  constructor() 
 ```
 
 ### add

packages/js/client-config-builder/examples/quickstart.ts

@@ -11,15 +11,9 @@ export function initialize(): ClientConfigBuilder {
   // $start: quickstart-initialize
   // start with a blank slate (typical usage)
   const builder = new ClientConfigBuilder();
-
-  // instantiate a builder with a custom cache and/or resolver
-  const _builder = new ClientConfigBuilder(
-    new WrapperCache(),
-    RecursiveResolver.from([])
-  );
   // $end
 
-  return builder ?? _builder;
+  return builder;
 }
 
 export function configure(): ClientConfigBuilder {
@@ -66,7 +60,13 @@ export function build():
   const clientConfig = builder.build();
 
   // accepted by either the PolywrapClient or the PolywrapCoreClient
-  const coreClientConfig = builder.buildCoreConfig();
+  let coreClientConfig = builder.buildCoreConfig();
+
+  // build with a custom cache and/or resolver
+  coreClientConfig = builder.buildCoreConfig(
+    new WrapperCache(),
+    RecursiveResolver.from([])
+  );
   // $end
 
   return builder ?? clientConfig ?? coreClientConfig;

packages/js/client-config-builder/src/BaseClientConfigBuilder.ts

@@ -12,8 +12,9 @@ import {
   IUriRedirect,
   IUriWrapper,
   IUriPackage,
+  IUriResolver,
 } from "@polywrap/core-js";
-import { UriResolverLike } from "@polywrap/uri-resolvers-js";
+import { IWrapperCache, UriResolverLike } from "@polywrap/uri-resolvers-js";
 
 export abstract class BaseClientConfigBuilder implements IClientConfigBuilder {
   protected _config: BuilderConfig = {
@@ -26,7 +27,10 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder {
   };
 
   abstract addDefaults(): IClientConfigBuilder;
-  abstract buildCoreConfig(): CoreClientConfig;
+  abstract buildCoreConfig(
+    wrapperCache?: IWrapperCache,
+    resolver?: IUriResolver<unknown>
+  ): CoreClientConfig;
 
   get config(): BuilderConfig {
     return this._config;

packages/js/client-config-builder/src/ClientConfigBuilder.ts

@@ -16,29 +16,26 @@ export class ClientConfigBuilder extends BaseClientConfigBuilder {
   // $start: ClientConfigBuilder-constructor
   /**
    * Instantiate a ClientConfigBuilder
-   *
-   * @param _wrapperCache?: a wrapper cache to be used in place of the default wrapper cache
-   * @param _resolver?: a uri resolver to be used in place of any added redirects, wrappers, packages, and resolvers when building a CoreClientConfig
    */
-  constructor(
-    private readonly _wrapperCache?: IWrapperCache,
-    private readonly _resolver?: IUriResolver<unknown>
-  ) /* $ */ {
+  constructor() /* $ */ {
     super();
   }
 
   addDefaults(): IClientConfigBuilder {
     return this.add(getDefaultConfig());
   }
 
-  buildCoreConfig(): CoreClientConfig {
+  buildCoreConfig(
+    wrapperCache?: IWrapperCache,
+    resolver?: IUriResolver<unknown>
+  ): CoreClientConfig {
     const clientConfig = this.build();
 
     return {
       envs: clientConfig.envs,
       interfaces: clientConfig.interfaces,
       resolver:
-        this._resolver ??
+        resolver ??
         RecursiveResolver.from(
           PackageToWrapperCacheResolver.from(
             [
@@ -50,7 +47,7 @@ export class ClientConfigBuilder extends BaseClientConfigBuilder {
               ...clientConfig.resolvers,
               new ExtendableUriResolver(),
             ],
-            this._wrapperCache ?? new WrapperCache()
+            wrapperCache ?? new WrapperCache()
           )
         ),
     };

packages/js/client-config-builder/src/helpers/buildPolywrapCoreClientConfig.ts

@@ -151,11 +151,7 @@ export function buildPolywrapCoreClientConfig<
   noDefaults = false
 ): CoreClientConfig {
   if (!builder) {
-    if (config && "wrapperCache" in config) {
-      builder = new ClientConfigBuilder(config.wrapperCache);
-    } else {
-      builder = new ClientConfigBuilder();
-    }
+    builder = new ClientConfigBuilder();
   }
 
   if (!noDefaults) {
@@ -168,7 +164,9 @@ export function buildPolywrapCoreClientConfig<
     builder.add(sanitizeConfig(config));
   }
 
-  const sanitizedConfig = builder.buildCoreConfig();
+  if (config && "wrapperCache" in config) {
+    return builder.buildCoreConfig(config.wrapperCache);
+  }
 
-  return sanitizedConfig;
+  return builder.buildCoreConfig();
 }