From 38d1c376d1d76b089782aac877d92a57d5a995ce Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Tue, 20 Jun 2023 19:00:53 +0530 Subject: [PATCH 1/5] fix!: client-config-builder name We discussed to change the names of some of the metods in config builder to more appropiate name. Ex: addWrapper -> setWrapper Another change is renaming interface to ClientConfigBuilder from IClientConfigBuilder and rename ClientConfigBuilder to PolywrapClientConfigBuilder --- packages/client-config-builder/README.md | 138 +++++++++--------- .../examples/quickstart.ts | 32 ++-- .../src/BaseClientConfigBuilder.ts | 56 +++---- ...lder.ts => PolywrapClientConfigBuilder.ts} | 10 +- .../__tests__/client-config-builder.spec.ts | 106 +++++++------- .../src/bundles/default.ts | 14 +- packages/client-config-builder/src/index.ts | 2 +- ...onfigBuilder.ts => ClientConfigBuilder.ts} | 128 ++++++++-------- .../client-config-builder/src/types/index.ts | 2 +- 9 files changed, 244 insertions(+), 244 deletions(-) rename packages/client-config-builder/src/{ClientConfigBuilder.ts => PolywrapClientConfigBuilder.ts} (91%) rename packages/client-config-builder/src/types/{IClientConfigBuilder.ts => ClientConfigBuilder.ts} (57%) diff --git a/packages/client-config-builder/README.md b/packages/client-config-builder/README.md index 4e1d22431..8b3f8cb22 100644 --- a/packages/client-config-builder/README.md +++ b/packages/client-config-builder/README.md @@ -8,16 +8,16 @@ Supports building configs using method chaining or imperatively. ### Initialize -Initialize a ClientConfigBuilder using the [constructor](#constructor) +Initialize a PolywrapClientConfigBuilder using the [constructor](#constructor) ```typescript // start with a blank slate (typical usage) - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); ``` ### Configure -Add client configuration with [add](#add), or flexibly mix and match builder [configuration methods](#addwrapper) to add and remove configuration items. +Add client configuration with [add](#add), or flexibly mix and match builder [configuration methods](#setwrapper) to add and remove configuration items. ```typescript // add multiple items to the configuration using the catch-all `add` method @@ -32,9 +32,9 @@ Add client configuration with [add](#add), or flexibly mix and match builder [co // add or remove items by chaining method calls builder - .addPackage("wrap://plugin/package", httpPlugin({})) + .setPackage("wrap://plugin/package", httpPlugin({})) .removePackage("wrap://plugin/package") - .addPackages({ + .setPackages({ "wrap://plugin/http": httpPlugin({}), "wrap://plugin/filesystem": fileSystemPlugin({}), }); @@ -71,7 +71,7 @@ A complete example using all or most of the available methods. ```typescript // init - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); // add the default bundle first to override its entries later builder.addDefaults(); @@ -88,7 +88,7 @@ A complete example using all or most of the available methods. // add and remove wrappers builder - .addWrapper( + .setWrapper( "wrap://ens/wrapper.eth", await WasmWrapper.from( new Uint8Array([1, 2, 3]), @@ -96,7 +96,7 @@ A complete example using all or most of the available methods. ) ) .removeWrapper("wrap://ens/wrapper.eth") - .addWrappers({ + .setWrappers({ "wrap://ens/wrapper.eth": await WasmWrapper.from( new Uint8Array([1, 2, 3]), new Uint8Array([1, 2, 3]) @@ -105,9 +105,9 @@ A complete example using all or most of the available methods. // add and remove wrap packages builder - .addPackage("wrap://plugin/package", httpPlugin({})) + .setPackage("wrap://plugin/package", httpPlugin({})) .removePackage("wrap://plugin/package") - .addPackages({ + .setPackages({ "wrap://plugin/package": httpPlugin({}), }); @@ -138,9 +138,9 @@ A complete example using all or most of the available methods. // add or remove URI redirects builder - .addRedirect("wrap://ens/from.eth", "wrap://ens/to.eth") + .setRedirect("wrap://ens/from.eth", "wrap://ens/to.eth") .removeRedirect("wrap://ens/from.eth") - .addRedirects({ + .setRedirects({ "wrap://ens/from.eth": "wrap://ens/to.eth", }); @@ -154,12 +154,12 @@ A complete example using all or most of the available methods. # Reference -## ClientConfigBuilder +## PolywrapClientConfigBuilder ### Constructor ```ts /** - * Instantiate a ClientConfigBuilder + * Instantiate a PolywrapClientConfigBuilder */ constructor() ``` @@ -168,36 +168,36 @@ A complete example using all or most of the available methods. ```ts /** * Add a partial BuilderConfig - * This is equivalent to calling each of the plural add functions: `addEnvs`, `addWrappers`, etc. + * This is equivalent to calling each of the plural add functions: `addEnvs`, `setWrappers`, etc. * * @param config: a partial BuilderConfig - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - add(config: Partial): IClientConfigBuilder; + add(config: Partial): ClientConfigBuilder; ``` -### addWrapper +### setWrapper ```ts /** * Add an embedded wrapper * * @param uri: uri of wrapper * @param wrapper: wrapper to be added - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addWrapper(uri: string, wrapper: Wrapper): IClientConfigBuilder; + setWrapper(uri: string, wrapper: Wrapper): ClientConfigBuilder; ``` -### addWrappers +### setWrappers ```ts /** * Add one or more embedded wrappers. - * This is equivalent to calling addWrapper for each wrapper. + * This is equivalent to calling setWrapper for each wrapper. * * @param uriWrappers: an object where keys are uris and wrappers are value - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addWrappers(uriWrappers: Record): IClientConfigBuilder; + setWrappers(uriWrappers: Record): ClientConfigBuilder; ``` ### removeWrapper @@ -206,33 +206,33 @@ A complete example using all or most of the available methods. * Remove an embedded wrapper * * @param uri: the wrapper's URI - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeWrapper(uri: string): IClientConfigBuilder; + removeWrapper(uri: string): ClientConfigBuilder; ``` -### addPackage +### setPackage ```ts /** * Add an embedded wrap package * * @param uri: uri of wrapper * @param wrapPackage: package to be added - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addPackage(uri: string, wrapPackage: IWrapPackage): IClientConfigBuilder; + setPackage(uri: string, wrapPackage: IWrapPackage): ClientConfigBuilder; ``` -### addPackages +### setPackages ```ts /** * Add one or more embedded wrap packages - * This is equivalent to calling addPackage for each package + * This is equivalent to calling setPackage for each package * * @param uriPackages: an object where keys are uris and packages are value - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addPackages(uriPackages: Record): IClientConfigBuilder; + setPackages(uriPackages: Record): ClientConfigBuilder; ``` ### removePackage @@ -241,9 +241,9 @@ A complete example using all or most of the available methods. * Remove an embedded wrap package * * @param uri: the package's URI - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removePackage(uri: string): IClientConfigBuilder; + removePackage(uri: string): ClientConfigBuilder; ``` ### addEnv @@ -254,9 +254,9 @@ A complete example using all or most of the available methods. * * @param uri: the wrapper's URI to associate with the Env * @param env: an object with the env variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addEnv(uri: string, env: Record): IClientConfigBuilder; + addEnv(uri: string, env: Record): ClientConfigBuilder; ``` ### addEnvs @@ -266,11 +266,11 @@ A complete example using all or most of the available methods. * This is equivalent to calling addEnv for each Env * * @param uriEnvs: and object where key is the uri and value is the another object with the env variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addEnvs( uriEnvs: Record> - ): IClientConfigBuilder; + ): ClientConfigBuilder; ``` ### removeEnv @@ -279,9 +279,9 @@ A complete example using all or most of the available methods. * Remove an Env * * @param uri: the URI associated with the Env - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeEnv(uri: string): IClientConfigBuilder; + removeEnv(uri: string): ClientConfigBuilder; ``` ### setEnv @@ -292,9 +292,9 @@ A complete example using all or most of the available methods. * * @param uri: the wrapper's URI to associate with the Env * @param env: an object with the environment variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - setEnv(uri: string, env: Record): IClientConfigBuilder; + setEnv(uri: string, env: Record): ClientConfigBuilder; ``` ### addInterfaceImplementation @@ -304,12 +304,12 @@ A complete example using all or most of the available methods. * * @param interfaceUri: the URI of the interface * @param implementationUri: the URI of the implementation - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder; + ): ClientConfigBuilder; ``` ### addInterfaceImplementations @@ -319,12 +319,12 @@ A complete example using all or most of the available methods. * * @param interfaceUri: the URI of the interface * @param implementationUris: a list of URIs for the implementations - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addInterfaceImplementations( interfaceUri: string, implementationUris: Array - ): IClientConfigBuilder; + ): ClientConfigBuilder; ``` ### removeInterfaceImplementation @@ -334,35 +334,35 @@ A complete example using all or most of the available methods. * * @param interfaceUri: the URI of the interface * @param implementationUri: the URI of the implementation - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ removeInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder; + ): ClientConfigBuilder; ``` -### addRedirect +### setRedirect ```ts /** * Add a redirect from one URI to another * * @param from: the URI to redirect from * @param to: the URI to redirect to - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addRedirect(from: string, to: string): IClientConfigBuilder; + setRedirect(from: string, to: string): ClientConfigBuilder; ``` -### addRedirects +### setRedirects ```ts /** * Add an array of URI redirects * * @param redirects: an object where key is from and value is to - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addRedirects(redirects: Record): IClientConfigBuilder; + setRedirects(redirects: Record): ClientConfigBuilder; ``` ### removeRedirect @@ -371,9 +371,9 @@ A complete example using all or most of the available methods. * Remove a URI redirect * * @param from: the URI that is being redirected - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeRedirect(from: string): IClientConfigBuilder; + removeRedirect(from: string): ClientConfigBuilder; ``` ### addResolver @@ -390,9 +390,9 @@ A complete example using all or most of the available methods. * | UriResolverLike[]; * * @param resolver: A UriResolverLike - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addResolver(resolver: UriResolverLike): IClientConfigBuilder; + addResolver(resolver: UriResolverLike): ClientConfigBuilder; ``` ### addResolvers @@ -409,9 +409,9 @@ A complete example using all or most of the available methods. * | UriResolverLike[]; * * @param resolvers: A list of UriResolverLike - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addResolvers(resolvers: UriResolverLike[]): IClientConfigBuilder; + addResolvers(resolvers: UriResolverLike[]): ClientConfigBuilder; ``` ### addDefaults @@ -419,9 +419,9 @@ A complete example using all or most of the available methods. /** * Add the default configuration bundle * - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addDefaults(): IClientConfigBuilder; + addDefaults(): ClientConfigBuilder; ``` ### build @@ -563,14 +563,14 @@ export const plugins: IDefaultPlugins = { }; export function getConfig(): BuilderConfig { - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); // Add all embedded packages for (const embed of Object.values(embeds)) { - builder.addPackage(embed.uri.uri, embed.package); + builder.setPackage(embed.uri.uri, embed.package); // Add source redirect - builder.addRedirect(embed.source.uri, embed.uri.uri); + builder.setRedirect(embed.source.uri, embed.uri.uri); // Add source implementation builder.addInterfaceImplementation(embed.source.uri, embed.uri.uri); @@ -578,12 +578,12 @@ export function getConfig(): BuilderConfig { // Add all plugin packages for (const plugin of Object.values(plugins)) { - builder.addPackage(plugin.uri.uri, plugin.plugin); + builder.setPackage(plugin.uri.uri, plugin.plugin); // Add all interface implementations & redirects for (const interfaceUri of plugin.implements) { builder.addInterfaceImplementation(interfaceUri.uri, plugin.uri.uri); - builder.addRedirect(interfaceUri.uri, plugin.uri.uri); + builder.setRedirect(interfaceUri.uri, plugin.uri.uri); } } @@ -596,7 +596,7 @@ export function getConfig(): BuilderConfig { ...uriResolverExts.slice(2).map((x: Uri) => x.uri), ] ); - builder.addRedirect(uriResolverExts[1].from.uri, uriResolverExts[1].to.uri); + builder.setRedirect(uriResolverExts[1].from.uri, uriResolverExts[1].to.uri); // Configure the ipfs-uri-resolver provider endpoints & retry counts builder.addEnv(embeds.ipfsResolver.source.uri, { diff --git a/packages/client-config-builder/examples/quickstart.ts b/packages/client-config-builder/examples/quickstart.ts index bc099f197..aa8b6664d 100644 --- a/packages/client-config-builder/examples/quickstart.ts +++ b/packages/client-config-builder/examples/quickstart.ts @@ -1,4 +1,4 @@ -import { ClientConfigBuilder } from "../build"; +import { PolywrapClientConfigBuilder } from "../build"; // eslint-disable-next-line import/no-extraneous-dependencies import { WasmWrapper } from "@polywrap/wasm-js"; @@ -10,17 +10,17 @@ import { import { fileSystemPlugin } from "@polywrap/file-system-plugin-js"; import { CoreClientConfig } from "@polywrap/core-js"; -export function initialize(): ClientConfigBuilder { +export function initialize(): PolywrapClientConfigBuilder { // $start: quickstart-initialize // start with a blank slate (typical usage) - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); // $end return builder; } -export function configure(): ClientConfigBuilder { - const builder = new ClientConfigBuilder(); +export function configure(): PolywrapClientConfigBuilder { + const builder = new PolywrapClientConfigBuilder(); // $start: quickstart-configure // add multiple items to the configuration using the catch-all `add` method @@ -35,9 +35,9 @@ export function configure(): ClientConfigBuilder { // add or remove items by chaining method calls builder - .addPackage("wrap://plugin/package", httpPlugin({})) + .setPackage("wrap://plugin/package", httpPlugin({})) .removePackage("wrap://plugin/package") - .addPackages({ + .setPackages({ "wrap://plugin/http": httpPlugin({}), "wrap://plugin/filesystem": fileSystemPlugin({}), }); @@ -50,8 +50,8 @@ export function configure(): ClientConfigBuilder { return builder; } -export function build(): ClientConfigBuilder | CoreClientConfig { - const builder = new ClientConfigBuilder(); +export function build(): PolywrapClientConfigBuilder | CoreClientConfig { + const builder = new PolywrapClientConfigBuilder(); // $start: quickstart-build // accepted by either the PolywrapClient or the PolywrapCoreClient @@ -74,7 +74,7 @@ export function build(): ClientConfigBuilder | CoreClientConfig { export async function example(): Promise { // $start: quickstart-example // init - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); // add the default bundle first to override its entries later builder.addDefaults(); @@ -91,7 +91,7 @@ export async function example(): Promise { // add and remove wrappers builder - .addWrapper( + .setWrapper( "wrap://ens/wrapper.eth", await WasmWrapper.from( new Uint8Array([1, 2, 3]), @@ -99,7 +99,7 @@ export async function example(): Promise { ) ) .removeWrapper("wrap://ens/wrapper.eth") - .addWrappers({ + .setWrappers({ "wrap://ens/wrapper.eth": await WasmWrapper.from( new Uint8Array([1, 2, 3]), new Uint8Array([1, 2, 3]) @@ -108,9 +108,9 @@ export async function example(): Promise { // add and remove wrap packages builder - .addPackage("wrap://plugin/package", httpPlugin({})) + .setPackage("wrap://plugin/package", httpPlugin({})) .removePackage("wrap://plugin/package") - .addPackages({ + .setPackages({ "wrap://plugin/package": httpPlugin({}), }); @@ -141,9 +141,9 @@ export async function example(): Promise { // add or remove URI redirects builder - .addRedirect("wrap://ens/from.eth", "wrap://ens/to.eth") + .setRedirect("wrap://ens/from.eth", "wrap://ens/to.eth") .removeRedirect("wrap://ens/from.eth") - .addRedirects({ + .setRedirects({ "wrap://ens/from.eth": "wrap://ens/to.eth", }); diff --git a/packages/client-config-builder/src/BaseClientConfigBuilder.ts b/packages/client-config-builder/src/BaseClientConfigBuilder.ts index d1f502b2c..886b3d437 100644 --- a/packages/client-config-builder/src/BaseClientConfigBuilder.ts +++ b/packages/client-config-builder/src/BaseClientConfigBuilder.ts @@ -1,4 +1,4 @@ -import { BuilderConfig, IClientConfigBuilder } from "./types"; +import { BuilderConfig, ClientConfigBuilder } from "./types"; import { CoreClientConfig, @@ -8,7 +8,7 @@ import { } from "@polywrap/core-js"; import { UriResolverLike } from "@polywrap/uri-resolvers-js"; -export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { +export abstract class BaseClientConfigBuilder implements ClientConfigBuilder { protected _config: BuilderConfig = { envs: {}, interfaces: {}, @@ -18,28 +18,28 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { resolvers: [], }; - abstract addDefaults(): IClientConfigBuilder; + abstract addDefaults(): ClientConfigBuilder; abstract build(): CoreClientConfig; get config(): BuilderConfig { return this._config; } - add(config: Partial): IClientConfigBuilder { + add(config: Partial): ClientConfigBuilder { if (config.envs) { this.addEnvs(config.envs); } if (config.redirects) { - this.addRedirects(config.redirects); + this.setRedirects(config.redirects); } if (config.wrappers) { - this.addWrappers(config.wrappers); + this.setWrappers(config.wrappers); } if (config.packages) { - this.addPackages(config.packages); + this.setPackages(config.packages); } if (config.interfaces) { @@ -57,47 +57,47 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { return this; } - addWrapper(uri: string, wrapper: Wrapper): IClientConfigBuilder { + setWrapper(uri: string, wrapper: Wrapper): ClientConfigBuilder { this._config.wrappers[this.sanitizeUri(uri)] = wrapper; return this; } - addWrappers(uriWrappers: Record): IClientConfigBuilder { + setWrappers(uriWrappers: Record): ClientConfigBuilder { for (const uri in uriWrappers) { - this.addWrapper(this.sanitizeUri(uri), uriWrappers[uri]); + this.setWrapper(this.sanitizeUri(uri), uriWrappers[uri]); } return this; } - removeWrapper(uri: string): IClientConfigBuilder { + removeWrapper(uri: string): ClientConfigBuilder { delete this._config.wrappers[this.sanitizeUri(uri)]; return this; } - addPackage(uri: string, wrapPackage: IWrapPackage): IClientConfigBuilder { + setPackage(uri: string, wrapPackage: IWrapPackage): ClientConfigBuilder { this._config.packages[this.sanitizeUri(uri)] = wrapPackage; return this; } - addPackages(uriPackages: Record): IClientConfigBuilder { + setPackages(uriPackages: Record): ClientConfigBuilder { for (const uri in uriPackages) { - this.addPackage(this.sanitizeUri(uri), uriPackages[uri]); + this.setPackage(this.sanitizeUri(uri), uriPackages[uri]); } return this; } - removePackage(uri: string): IClientConfigBuilder { + removePackage(uri: string): ClientConfigBuilder { delete this._config.packages[this.sanitizeUri(uri)]; return this; } - addEnv(uri: string, env: Record): IClientConfigBuilder { + addEnv(uri: string, env: Record): ClientConfigBuilder { const sanitizedUri = this.sanitizeUri(uri); this._config.envs[sanitizedUri] = { ...this._config.envs[sanitizedUri], @@ -107,7 +107,7 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { return this; } - addEnvs(envs: Record>): IClientConfigBuilder { + addEnvs(envs: Record>): ClientConfigBuilder { for (const [uri, env] of Object.entries(envs)) { this.addEnv(this.sanitizeUri(uri), env); } @@ -115,13 +115,13 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { return this; } - removeEnv(uri: string): IClientConfigBuilder { + removeEnv(uri: string): ClientConfigBuilder { delete this._config.envs[this.sanitizeUri(uri)]; return this; } - setEnv(uri: string, env: Record): IClientConfigBuilder { + setEnv(uri: string, env: Record): ClientConfigBuilder { this._config.envs[this.sanitizeUri(uri)] = env; return this; @@ -130,7 +130,7 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { addInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder { + ): ClientConfigBuilder { const existingInterface = this._config.interfaces[ this.sanitizeUri(interfaceUri) ]; @@ -149,7 +149,7 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { addInterfaceImplementations( interfaceUri: string, implementationUris: Array | Set - ): IClientConfigBuilder { + ): ClientConfigBuilder { const existingInterface = this._config.interfaces[ this.sanitizeUri(interfaceUri) ]; @@ -173,7 +173,7 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { removeInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder { + ): ClientConfigBuilder { const existingInterface = this._config.interfaces[ this.sanitizeUri(interfaceUri) ]; @@ -193,33 +193,33 @@ export abstract class BaseClientConfigBuilder implements IClientConfigBuilder { return this; } - addRedirect(from: string, to: string): IClientConfigBuilder { + setRedirect(from: string, to: string): ClientConfigBuilder { this._config.redirects[this.sanitizeUri(from)] = this.sanitizeUri(to); return this; } - addRedirects(redirects: Record): IClientConfigBuilder { + setRedirects(redirects: Record): ClientConfigBuilder { for (const uri in redirects) { - this.addRedirect(this.sanitizeUri(uri), this.sanitizeUri(redirects[uri])); + this.setRedirect(this.sanitizeUri(uri), this.sanitizeUri(redirects[uri])); } return this; } - removeRedirect(from: string): IClientConfigBuilder { + removeRedirect(from: string): ClientConfigBuilder { delete this._config.redirects[this.sanitizeUri(from)]; return this; } - addResolver(resolver: UriResolverLike): IClientConfigBuilder { + addResolver(resolver: UriResolverLike): ClientConfigBuilder { this._config.resolvers.push(resolver); return this; } - addResolvers(resolvers: UriResolverLike[]): IClientConfigBuilder { + addResolvers(resolvers: UriResolverLike[]): ClientConfigBuilder { for (const resolver of resolvers) { this.addResolver(resolver); } diff --git a/packages/client-config-builder/src/ClientConfigBuilder.ts b/packages/client-config-builder/src/PolywrapClientConfigBuilder.ts similarity index 91% rename from packages/client-config-builder/src/ClientConfigBuilder.ts rename to packages/client-config-builder/src/PolywrapClientConfigBuilder.ts index b32d0ea73..e6ba99970 100644 --- a/packages/client-config-builder/src/ClientConfigBuilder.ts +++ b/packages/client-config-builder/src/PolywrapClientConfigBuilder.ts @@ -1,6 +1,6 @@ import { DefaultBundle } from "./bundles"; import { BaseClientConfigBuilder } from "./BaseClientConfigBuilder"; -import { BuildOptions, IClientConfigBuilder, BuilderConfig } from "./types"; +import { BuildOptions, ClientConfigBuilder, BuilderConfig } from "./types"; import { CoreClientConfig, @@ -21,16 +21,16 @@ import { } from "@polywrap/uri-resolvers-js"; import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js"; -export class ClientConfigBuilder extends BaseClientConfigBuilder { - // $start: ClientConfigBuilder-constructor +export class PolywrapClientConfigBuilder extends BaseClientConfigBuilder { + // $start: PolywrapClientConfigBuilder-constructor /** - * Instantiate a ClientConfigBuilder + * Instantiate a PolywrapClientConfigBuilder */ constructor() /* $ */ { super(); } - addDefaults(): IClientConfigBuilder { + addDefaults(): ClientConfigBuilder { return this.add(DefaultBundle.getConfig()); } diff --git a/packages/client-config-builder/src/__tests__/client-config-builder.spec.ts b/packages/client-config-builder/src/__tests__/client-config-builder.spec.ts index 2f473ca83..6b74a9d4d 100644 --- a/packages/client-config-builder/src/__tests__/client-config-builder.spec.ts +++ b/packages/client-config-builder/src/__tests__/client-config-builder.spec.ts @@ -1,4 +1,4 @@ -import { ClientConfigBuilder } from "../ClientConfigBuilder"; +import { PolywrapClientConfigBuilder } from "../PolywrapClientConfigBuilder"; import { CoreClient, Uri, @@ -30,7 +30,7 @@ class MockUriResolver implements IUriResolver { } describe("Client config builder", () => { - const emptyBuilderConfig = new ClientConfigBuilder().config; + const emptyBuilderConfig = new PolywrapClientConfigBuilder().config; const testEnv1: Record> = { "wrap://ens/test.plugin.one": { test: "value" }, @@ -81,7 +81,7 @@ describe("Client config builder", () => { ); it("should build an empty partial config", () => { - const clientConfig = new ClientConfigBuilder().build(); + const clientConfig = new PolywrapClientConfigBuilder().build(); expect(clientConfig.envs).toStrictEqual(new UriMap()); expect(clientConfig.interfaces).toStrictEqual(new UriMap()); @@ -95,7 +95,7 @@ describe("Client config builder", () => { resolvers: [testUriResolver], }; - const builder = new ClientConfigBuilder().add(configObject); + const builder = new PolywrapClientConfigBuilder().add(configObject); const clientConfig = builder.build(); const builderConfig = builder.config; @@ -127,7 +127,7 @@ describe("Client config builder", () => { }); it("should succesfully add and merge two config objects and build", () => { - const builder = new ClientConfigBuilder() + const builder = new PolywrapClientConfigBuilder() .add({ envs: testEnv1, interfaces: testInterface1, @@ -175,7 +175,7 @@ describe("Client config builder", () => { }); it("should successfully add the default config", () => { - const builder = new ClientConfigBuilder().addDefaults(); + const builder = new PolywrapClientConfigBuilder().addDefaults(); const clientConfig = builder.build(); const builderConfig = builder.config; @@ -197,7 +197,7 @@ describe("Client config builder", () => { }, }; - const config = new ClientConfigBuilder().addEnv(envUri, env).build(); + const config = new PolywrapClientConfigBuilder().addEnv(envUri, env).build(); if (!config.envs || config.envs.size !== 1) { fail(["Expected 1 env, received:", config.envs]); @@ -217,7 +217,7 @@ describe("Client config builder", () => { }, }; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addEnv(envUri, env1) .addEnv(envUri, env2) .build(); @@ -232,7 +232,7 @@ describe("Client config builder", () => { }); it("should succesfully add two separate envs", () => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addEnv(Object.keys(testEnvs)[0], Object.values(testEnvs)[0]) .addEnv(Object.keys(testEnvs)[1], Object.values(testEnvs)[1]) .build(); @@ -250,7 +250,7 @@ describe("Client config builder", () => { }); it("should remove an env", () => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addEnv(Object.keys(testEnvs)[0], Object.values(testEnvs)[0]) .addEnv(Object.keys(testEnvs)[1], Object.values(testEnvs)[1]) .removeEnv(Object.keys(testEnvs)[0]) @@ -272,7 +272,7 @@ describe("Client config builder", () => { foo: "bar", }; - const config = new ClientConfigBuilder().setEnv(envUri, env).build(); + const config = new PolywrapClientConfigBuilder().setEnv(envUri, env).build(); if (!config.envs || config.envs.size !== 1) { fail(["Expected 1 env, received:", config.envs]); @@ -291,7 +291,7 @@ describe("Client config builder", () => { bar: "baz", }; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addEnv(envUri, env1) .setEnv(envUri, env2) .build(); @@ -307,7 +307,7 @@ describe("Client config builder", () => { const interfaceUri = "wrap://ens/some.interface.eth"; const implUri = "wrap://ens/interface.impl.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementation(interfaceUri, implUri) .build(); @@ -325,7 +325,7 @@ describe("Client config builder", () => { const implUri1 = "wrap://ens/interface.impl1.eth"; const implUri2 = "wrap://ens/interface.impl2.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementation(interfaceUri, implUri1) .addInterfaceImplementation(interfaceUri, implUri2) .build(); @@ -349,7 +349,7 @@ describe("Client config builder", () => { const implUri3 = "wrap://ens/interface.impl3.eth"; const implUri4 = "wrap://ens/interface.impl4.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementation(interfaceUri1, implUri1) .addInterfaceImplementation(interfaceUri2, implUri2) .addInterfaceImplementation(interfaceUri1, implUri3) @@ -373,7 +373,7 @@ describe("Client config builder", () => { const implUri1 = "wrap://ens/interface.impl1.eth"; const implUri2 = "wrap://ens/interface.impl2.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementations(interfaceUri, [implUri1, implUri2]) .build(); @@ -394,7 +394,7 @@ describe("Client config builder", () => { const implUri2 = "wrap://ens/interface.impl2.eth"; const implUri3 = "wrap://ens/interface.impl3.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementations(interfaceUri, [implUri1]) .addInterfaceImplementations(interfaceUri, [implUri2, implUri3]) .build(); @@ -423,7 +423,7 @@ describe("Client config builder", () => { const implUri5 = "wrap://ens/interface.impl5.eth"; const implUri6 = "wrap://ens/interface.impl6.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementation(interfaceUri1, implUri1) .addInterfaceImplementation(interfaceUri2, implUri2) .addInterfaceImplementations(interfaceUri1, [implUri3, implUri5]) @@ -454,7 +454,7 @@ describe("Client config builder", () => { const implUri1 = "wrap://ens/interface.impl1.eth"; const implUri2 = "wrap://ens/interface.impl2.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementations(interfaceUri1, [implUri1, implUri2]) .addInterfaceImplementations(interfaceUri2, [implUri1, implUri2]) .removeInterfaceImplementation(interfaceUri1, implUri2) @@ -478,7 +478,7 @@ describe("Client config builder", () => { const implUri1 = "wrap://ens/interface.impl1.eth"; const implUri2 = "wrap://ens/interface.impl2.eth"; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addInterfaceImplementations(interfaceUri1, [implUri1, implUri2]) .addInterfaceImplementations(interfaceUri2, [implUri1, implUri2]) .removeInterfaceImplementation(interfaceUri1, implUri1) @@ -500,7 +500,7 @@ describe("Client config builder", () => { const from = "wrap://ens/from.this.ens"; const to = "wrap://ens/to.that.ens"; - const builder = new ClientConfigBuilder().addRedirect(from, to); + const builder = new PolywrapClientConfigBuilder().setRedirect(from, to); const config = builder.build(); const builderConfig = builder.config; @@ -520,9 +520,9 @@ describe("Client config builder", () => { const from2 = "wrap://ens/from.this2.ens"; const to2 = "wrap://ens/to.that2.ens"; - const builder = new ClientConfigBuilder() - .addRedirect(from1, to1) - .addRedirect(from2, to2); + const builder = new PolywrapClientConfigBuilder() + .setRedirect(from1, to1) + .setRedirect(from2, to2); const config = builder.build(); const builderConfig = builder.config; @@ -543,10 +543,10 @@ describe("Client config builder", () => { const to1 = "wrap://ens/to.that1.ens"; const to2 = "wrap://ens/to.that2.ens"; - const builder = new ClientConfigBuilder() - .addRedirect(from1, to1) - .addRedirect(from2, to1) - .addRedirect(from1, to2); + const builder = new PolywrapClientConfigBuilder() + .setRedirect(from1, to1) + .setRedirect(from2, to1) + .setRedirect(from1, to2); const config = builder.build(); const builderConfig = builder.config; @@ -566,9 +566,9 @@ describe("Client config builder", () => { const to1 = "wrap://ens/to.that1.ens"; const from2 = "wrap://ens/from.this2.ens"; const to2 = "wrap://ens/to.that2.ens"; - const builder = new ClientConfigBuilder() - .addRedirect(from1, to1) - .addRedirect(from2, to2) + const builder = new PolywrapClientConfigBuilder() + .setRedirect(from1, to1) + .setRedirect(from2, to2) .removeRedirect(from1); const config = builder.build(); @@ -589,7 +589,7 @@ describe("Client config builder", () => { "wrap://ens/to.eth" ); - const builder = new ClientConfigBuilder().addResolver(uriResolver); + const builder = new PolywrapClientConfigBuilder().addResolver(uriResolver); const config = builder.build(); const builderConfig = builder.config; @@ -608,7 +608,7 @@ describe("Client config builder", () => { "wrap://ens/to2.eth" ); - const builder = new ClientConfigBuilder() + const builder = new PolywrapClientConfigBuilder() .addResolver(uriResolver1) .addResolver(uriResolver2); @@ -624,7 +624,7 @@ describe("Client config builder", () => { const shortUri = "ens/some1.wrapper.eth"; const longUri = "wrap://ens/some2.wrapper.eth"; - const builderConfig1 = new ClientConfigBuilder() + const builderConfig1 = new PolywrapClientConfigBuilder() .addEnv(shortUri, { foo: "bar" }) .addEnv(longUri, { bar: "baz" }).config; @@ -637,7 +637,7 @@ describe("Client config builder", () => { }, }); - const builderConfig2 = new ClientConfigBuilder() + const builderConfig2 = new PolywrapClientConfigBuilder() .add(builderConfig1) .removeEnv(shortUri).config; @@ -652,7 +652,7 @@ describe("Client config builder", () => { const shortUri = "ens/some1.wrapper.eth"; const longUri = "wrap://ens/some2.wrapper.eth"; - const builderConfig1 = new ClientConfigBuilder() + const builderConfig1 = new PolywrapClientConfigBuilder() .addInterfaceImplementation(shortUri, longUri) .addInterfaceImplementation(longUri, shortUri).config; @@ -661,7 +661,7 @@ describe("Client config builder", () => { [Uri.from(longUri).uri]: new Set([Uri.from(shortUri).uri]), }); - const builderConfig2 = new ClientConfigBuilder() + const builderConfig2 = new PolywrapClientConfigBuilder() .add(builderConfig1) .removeInterfaceImplementation(shortUri, longUri).config; @@ -674,16 +674,16 @@ describe("Client config builder", () => { const shortUri = "ens/some1.wrapper.eth"; const longUri = "wrap://ens/some2.wrapper.eth"; - const builderConfig1 = new ClientConfigBuilder() - .addRedirect(shortUri, longUri) - .addRedirect(longUri, shortUri).config; + const builderConfig1 = new PolywrapClientConfigBuilder() + .setRedirect(shortUri, longUri) + .setRedirect(longUri, shortUri).config; expect(builderConfig1.redirects).toStrictEqual({ [Uri.from(shortUri).uri]: Uri.from(longUri).uri, [Uri.from(longUri).uri]: Uri.from(shortUri).uri, }); - const builderConfig2 = new ClientConfigBuilder() + const builderConfig2 = new PolywrapClientConfigBuilder() .add(builderConfig1) .removeRedirect(shortUri).config; @@ -699,7 +699,7 @@ describe("Client config builder", () => { getManifest: jest.fn(), }; - const builderConfig = new ClientConfigBuilder().addPackage(uri, pkg).config; + const builderConfig = new PolywrapClientConfigBuilder().setPackage(uri, pkg).config; expect(builderConfig.packages).toStrictEqual({ [uri]: pkg, @@ -714,7 +714,7 @@ describe("Client config builder", () => { getManifest: jest.fn(), }; - const builderConfig = new ClientConfigBuilder().addPackages({ + const builderConfig = new PolywrapClientConfigBuilder().setPackages({ [uri1]: pkg, [uri2]: pkg, }).config; @@ -733,8 +733,8 @@ describe("Client config builder", () => { getManifest: jest.fn(), }; - const builderConfig = new ClientConfigBuilder() - .addPackages({ + const builderConfig = new PolywrapClientConfigBuilder() + .setPackages({ [uri1]: pkg, [uri2]: pkg, }) @@ -753,7 +753,7 @@ describe("Client config builder", () => { getManifest: jest.fn(), }; - const builderConfig1 = new ClientConfigBuilder().addPackages({ + const builderConfig1 = new PolywrapClientConfigBuilder().setPackages({ [shortUri]: pkg, [longUri]: pkg, }).config; @@ -763,7 +763,7 @@ describe("Client config builder", () => { [Uri.from(longUri).uri]: pkg, }); - const builderConfig2 = new ClientConfigBuilder() + const builderConfig2 = new PolywrapClientConfigBuilder() .add(builderConfig1) .removePackage(shortUri).config; @@ -780,7 +780,7 @@ describe("Client config builder", () => { invoke: jest.fn(), }; - const builderConfig = new ClientConfigBuilder().addWrapper(uri, wrapper) + const builderConfig = new PolywrapClientConfigBuilder().setWrapper(uri, wrapper) .config; expect(builderConfig.wrappers).toStrictEqual({ @@ -798,7 +798,7 @@ describe("Client config builder", () => { invoke: jest.fn(), }; - const builderConfig = new ClientConfigBuilder().addWrappers({ + const builderConfig = new PolywrapClientConfigBuilder().setWrappers({ [uri1]: wrapper, [uri2]: wrapper, }).config; @@ -819,8 +819,8 @@ describe("Client config builder", () => { invoke: jest.fn(), }; - const builderConfig = new ClientConfigBuilder() - .addWrappers({ + const builderConfig = new PolywrapClientConfigBuilder() + .setWrappers({ [uri1]: wrapper, [uri2]: wrapper, }) @@ -840,7 +840,7 @@ describe("Client config builder", () => { invoke: jest.fn(), }; - const builderConfig1 = new ClientConfigBuilder().addWrappers({ + const builderConfig1 = new PolywrapClientConfigBuilder().setWrappers({ [shortUri]: wrapper, [longUri]: wrapper, }).config; @@ -850,7 +850,7 @@ describe("Client config builder", () => { [Uri.from(longUri).uri]: wrapper, }); - const builderConfig2 = new ClientConfigBuilder() + const builderConfig2 = new PolywrapClientConfigBuilder() .add(builderConfig1) .removeWrapper(shortUri).config; diff --git a/packages/client-config-builder/src/bundles/default.ts b/packages/client-config-builder/src/bundles/default.ts index c50d9d96a..f951d18a1 100644 --- a/packages/client-config-builder/src/bundles/default.ts +++ b/packages/client-config-builder/src/bundles/default.ts @@ -1,4 +1,4 @@ -import { ClientConfigBuilder } from "../ClientConfigBuilder"; +import { PolywrapClientConfigBuilder } from "../PolywrapClientConfigBuilder"; import { BuilderConfig } from "../types"; import * as ipfsHttpClient from "./embeds/ipfs-http-client/wrap"; import * as ipfsResolver from "./embeds/async-ipfs-resolver/wrap"; @@ -138,14 +138,14 @@ export const plugins: IDefaultPlugins = { }; export function getConfig(): BuilderConfig { - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); // Add all embedded packages for (const embed of Object.values(embeds)) { - builder.addPackage(embed.uri.uri, embed.package); + builder.setPackage(embed.uri.uri, embed.package); // Add source redirect - builder.addRedirect(embed.source.uri, embed.uri.uri); + builder.setRedirect(embed.source.uri, embed.uri.uri); // Add source implementation builder.addInterfaceImplementation(embed.source.uri, embed.uri.uri); @@ -153,12 +153,12 @@ export function getConfig(): BuilderConfig { // Add all plugin packages for (const plugin of Object.values(plugins)) { - builder.addPackage(plugin.uri.uri, plugin.plugin); + builder.setPackage(plugin.uri.uri, plugin.plugin); // Add all interface implementations & redirects for (const interfaceUri of plugin.implements) { builder.addInterfaceImplementation(interfaceUri.uri, plugin.uri.uri); - builder.addRedirect(interfaceUri.uri, plugin.uri.uri); + builder.setRedirect(interfaceUri.uri, plugin.uri.uri); } } @@ -171,7 +171,7 @@ export function getConfig(): BuilderConfig { ...uriResolverExts.slice(2).map((x: Uri) => x.uri), ] ); - builder.addRedirect(uriResolverExts[1].from.uri, uriResolverExts[1].to.uri); + builder.setRedirect(uriResolverExts[1].from.uri, uriResolverExts[1].to.uri); // Configure the ipfs-uri-resolver provider endpoints & retry counts builder.addEnv(embeds.ipfsResolver.source.uri, { diff --git a/packages/client-config-builder/src/index.ts b/packages/client-config-builder/src/index.ts index a9932dcdc..b71784731 100644 --- a/packages/client-config-builder/src/index.ts +++ b/packages/client-config-builder/src/index.ts @@ -1,4 +1,4 @@ export * from "./types"; export * from "./BaseClientConfigBuilder"; -export * from "./ClientConfigBuilder"; +export * from "./PolywrapClientConfigBuilder"; export * from "./bundles"; diff --git a/packages/client-config-builder/src/types/IClientConfigBuilder.ts b/packages/client-config-builder/src/types/ClientConfigBuilder.ts similarity index 57% rename from packages/client-config-builder/src/types/IClientConfigBuilder.ts rename to packages/client-config-builder/src/types/ClientConfigBuilder.ts index edc5f8fdf..ebe355d57 100644 --- a/packages/client-config-builder/src/types/IClientConfigBuilder.ts +++ b/packages/client-config-builder/src/types/ClientConfigBuilder.ts @@ -4,10 +4,10 @@ import { BuildOptions } from "./BuildOptions"; import { CoreClientConfig, Wrapper, IWrapPackage } from "@polywrap/core-js"; import { UriResolverLike } from "@polywrap/uri-resolvers-js"; -export interface IClientConfigBuilder { +export interface ClientConfigBuilder { config: BuilderConfig; - // $start: IClientConfigBuilder-build + // $start: ClientConfigBuilder-build /** * Build a sanitized core client configuration that can be passed to the PolywrapClient or PolywrapCoreClient constructors * @@ -17,211 +17,211 @@ export interface IClientConfigBuilder { build(options?: BuildOptions): CoreClientConfig; // $end - // $start: IClientConfigBuilder-add + // $start: ClientConfigBuilder-add /** * Add a partial BuilderConfig * This is equivalent to calling each of the plural add functions: `addEnvs`, `addWrappers`, etc. * * @param config: a partial BuilderConfig - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - add(config: Partial): IClientConfigBuilder; + add(config: Partial): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addDefaults + // $start: ClientConfigBuilder-addDefaults /** * Add the default configuration bundle * - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addDefaults(): IClientConfigBuilder; + addDefaults(): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addWrapper + // $start: ClientConfigBuilder-setWrapper /** * Add an embedded wrapper * * @param uri: uri of wrapper * @param wrapper: wrapper to be added - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addWrapper(uri: string, wrapper: Wrapper): IClientConfigBuilder; + setWrapper(uri: string, wrapper: Wrapper): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addWrappers + // $start: ClientConfigBuilder-setWrappers /** * Add one or more embedded wrappers. - * This is equivalent to calling addWrapper for each wrapper. + * This is equivalent to calling setWrapper for each wrapper. * * @param uriWrappers: an object where keys are uris and wrappers are value - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addWrappers(uriWrappers: Record): IClientConfigBuilder; + setWrappers(uriWrappers: Record): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-removeWrapper + // $start: ClientConfigBuilder-removeWrapper /** * Remove an embedded wrapper * * @param uri: the wrapper's URI - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeWrapper(uri: string): IClientConfigBuilder; + removeWrapper(uri: string): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addPackage + // $start: ClientConfigBuilder-setPackage /** * Add an embedded wrap package * * @param uri: uri of wrapper * @param wrapPackage: package to be added - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addPackage(uri: string, wrapPackage: IWrapPackage): IClientConfigBuilder; + setPackage(uri: string, wrapPackage: IWrapPackage): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addPackages + // $start: ClientConfigBuilder-setPackages /** * Add one or more embedded wrap packages - * This is equivalent to calling addPackage for each package + * This is equivalent to calling setPackage for each package * * @param uriPackages: an object where keys are uris and packages are value - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addPackages(uriPackages: Record): IClientConfigBuilder; + setPackages(uriPackages: Record): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-removePackage + // $start: ClientConfigBuilder-removePackage /** * Remove an embedded wrap package * * @param uri: the package's URI - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removePackage(uri: string): IClientConfigBuilder; + removePackage(uri: string): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addEnv + // $start: ClientConfigBuilder-addEnv /** * Add an Env. * If an Env is already associated with the uri, it is modified. * * @param uri: the wrapper's URI to associate with the Env * @param env: an object with the env variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addEnv(uri: string, env: Record): IClientConfigBuilder; + addEnv(uri: string, env: Record): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addEnvs + // $start: ClientConfigBuilder-addEnvs /** * Add one or more Envs * This is equivalent to calling addEnv for each Env * * @param uriEnvs: and object where key is the uri and value is the another object with the env variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addEnvs( uriEnvs: Record> - ): IClientConfigBuilder; + ): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-removeEnv + // $start: ClientConfigBuilder-removeEnv /** * Remove an Env * * @param uri: the URI associated with the Env - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeEnv(uri: string): IClientConfigBuilder; + removeEnv(uri: string): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-setEnv + // $start: ClientConfigBuilder-setEnv /** * Add an Env. * If an Env is already associated with the uri, it is replaced. * * @param uri: the wrapper's URI to associate with the Env * @param env: an object with the environment variables for the uri - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - setEnv(uri: string, env: Record): IClientConfigBuilder; + setEnv(uri: string, env: Record): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addInterfaceImplementation + // $start: ClientConfigBuilder-addInterfaceImplementation /** * Register an implementation of a single interface * * @param interfaceUri: the URI of the interface * @param implementationUri: the URI of the implementation - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder; + ): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addInterfaceImplementations + // $start: ClientConfigBuilder-addInterfaceImplementations /** * Register one or more implementation of a single interface * * @param interfaceUri: the URI of the interface * @param implementationUris: a list of URIs for the implementations - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ addInterfaceImplementations( interfaceUri: string, implementationUris: Array - ): IClientConfigBuilder; + ): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-removeInterfaceImplementation + // $start: ClientConfigBuilder-removeInterfaceImplementation /** * Remove an implementation of a single interface * * @param interfaceUri: the URI of the interface * @param implementationUri: the URI of the implementation - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ removeInterfaceImplementation( interfaceUri: string, implementationUri: string - ): IClientConfigBuilder; + ): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addRedirect + // $start: ClientConfigBuilder-setRedirect /** * Add a redirect from one URI to another * * @param from: the URI to redirect from * @param to: the URI to redirect to - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addRedirect(from: string, to: string): IClientConfigBuilder; + setRedirect(from: string, to: string): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addRedirects + // $start: ClientConfigBuilder-setRedirects /** * Add an array of URI redirects * * @param redirects: an object where key is from and value is to - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addRedirects(redirects: Record): IClientConfigBuilder; + setRedirects(redirects: Record): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-removeRedirect + // $start: ClientConfigBuilder-removeRedirect /** * Remove a URI redirect * * @param from: the URI that is being redirected - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - removeRedirect(from: string): IClientConfigBuilder; + removeRedirect(from: string): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addResolver + // $start: ClientConfigBuilder-addResolver /** * Add a URI Resolver, capable of resolving a URI to a wrapper * @@ -234,12 +234,12 @@ export interface IClientConfigBuilder { * | UriResolverLike[]; * * @param resolver: A UriResolverLike - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addResolver(resolver: UriResolverLike): IClientConfigBuilder; + addResolver(resolver: UriResolverLike): ClientConfigBuilder; // $end - // $start: IClientConfigBuilder-addResolvers + // $start: ClientConfigBuilder-addResolvers /** * Add one or more URI Resolvers, capable of resolving URIs to wrappers * @@ -252,8 +252,8 @@ export interface IClientConfigBuilder { * | UriResolverLike[]; * * @param resolvers: A list of UriResolverLike - * @returns IClientConfigBuilder (mutated self) + * @returns ClientConfigBuilder (mutated self) */ - addResolvers(resolvers: UriResolverLike[]): IClientConfigBuilder; + addResolvers(resolvers: UriResolverLike[]): ClientConfigBuilder; // $end } diff --git a/packages/client-config-builder/src/types/index.ts b/packages/client-config-builder/src/types/index.ts index 2d1ce18b8..a0ee26879 100644 --- a/packages/client-config-builder/src/types/index.ts +++ b/packages/client-config-builder/src/types/index.ts @@ -1,3 +1,3 @@ export * from "./configs"; -export * from "./IClientConfigBuilder"; +export * from "./ClientConfigBuilder"; export * from "./BuildOptions"; From d16fb9cac814c2ce450c914fa55c98c1fe73b044 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Thu, 22 Jun 2023 00:29:27 +0530 Subject: [PATCH 2/5] fix: issue --- packages/client/src/PolywrapClient.ts | 4 +- yarn.lock | 621 +++++++++++++------------- 2 files changed, 319 insertions(+), 306 deletions(-) diff --git a/packages/client/src/PolywrapClient.ts b/packages/client/src/PolywrapClient.ts index 978bb0686..164cc3176 100644 --- a/packages/client/src/PolywrapClient.ts +++ b/packages/client/src/PolywrapClient.ts @@ -24,7 +24,7 @@ import { WrapManifest, } from "@polywrap/wrap-manifest-types-js"; import { Tracer, TracerConfig } from "@polywrap/tracing-js"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; export class PolywrapClient extends PolywrapCoreClient { // $start: PolywrapClient-constructor @@ -34,7 +34,7 @@ export class PolywrapClient extends PolywrapCoreClient { * @param config - a client configuration */ constructor(config?: CoreClientConfig) /* $ */ { - super(config ?? new ClientConfigBuilder().addDefaults().build()); + super(config ?? new PolywrapClientConfigBuilder().addDefaults().build()); } /** diff --git a/yarn.lock b/yarn.lock index 7496e732e..f0ed975fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,157 +20,157 @@ call-me-maybe "^1.0.1" js-yaml "^4.1.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" + integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: - "@babel/highlight" "^7.18.6" + "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.5.tgz#887a54ebe20c9f21edf27caf4ffcf8da6fdd5bd2" - integrity sha512-M+XAiQ7GzQ3FDPf0KOLkugzptnIypt0X0ma0wmlTKPR3IchgNFdx2JXxZdvd18JY5s7QkaFD/qyX0dsMpog/Ug== +"@babel/compat-data@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" + integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== "@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.5.tgz#92f753e8b9f96e15d4b398dbe2f25d1408c9c426" - integrity sha512-9M398B/QH5DlfCOTKDZT1ozXr0x8uBEeFd+dJraGUZGiaNpGCDVGCc14hZexsMblw3XxltJ+6kSvogp9J+5a9g== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" + integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helpers" "^7.21.5" - "@babel/parser" "^7.21.5" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helpers" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.21.5", "@babel/generator@^7.7.2": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" - integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== +"@babel/generator@^7.22.5", "@babel/generator@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" + integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA== dependencies: - "@babel/types" "^7.21.5" + "@babel/types" "^7.22.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-compilation-targets@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366" - integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w== +"@babel/helper-compilation-targets@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02" + integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw== dependencies: - "@babel/compat-data" "^7.21.5" - "@babel/helper-validator-option" "^7.21.0" + "@babel/compat-data" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" browserslist "^4.21.3" lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-environment-visitor@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" - integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== - -"@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" - integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== - dependencies: - "@babel/types" "^7.21.4" - -"@babel/helper-module-transforms@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420" - integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw== - dependencies: - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-module-imports" "^7.21.4" - "@babel/helper-simple-access" "^7.21.5" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" - integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== - -"@babel/helper-simple-access@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" - integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" - integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-option@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" - integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== - -"@babel/helpers@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08" - integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" +"@babel/helper-environment-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" + integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== + +"@babel/helper-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" + integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== + dependencies: + "@babel/template" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-imports@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" + integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-transforms@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" + integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + +"@babel/helper-simple-access@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" + integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-split-export-declaration@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08" + integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + +"@babel/helper-validator-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== + +"@babel/helper-validator-option@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" + integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== + +"@babel/helpers@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820" + integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q== + dependencies: + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/highlight@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" + integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.5.tgz#821bb520118fd25b982eaf8d37421cf5c64a312b" - integrity sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" + integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -208,11 +208,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-jsx@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" - integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" + integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -264,44 +264,44 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8" - integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/template@^7.20.7", "@babel/template@^7.3.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" - integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== - dependencies: - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.5" - "@babel/types" "^7.21.5" + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272" + integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/template@^7.22.5", "@babel/template@^7.3.3": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" + integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" + integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" - integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" + integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== dependencies: - "@babel/helper-string-parser" "^7.21.5" - "@babel/helper-validator-identifier" "^7.19.1" + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" "@bcherny/json-schema-ref-parser@9.0.9": @@ -2062,11 +2062,11 @@ integrity sha512-/ZhREKykF1hg5H/mm8vQHqv7MSedfCnwzbsNwYuLmH/IUtQi2t7NyD2XXavSLq5PFOHA/apPueatbSFTeIgBdA== "@polywrap/cli-js@~0.10.0": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/cli-js/-/cli-js-0.10.2.tgz#980f84fb72cc08d9d49bce88d1ad02245b664a33" - integrity sha512-jHX21SQd1SjGcSxdR1dyeQU/Z5RvlC4kwqrqXZx/nOpMWVtz0kR1YR2/C5dqyjzTzHHGoPLifeQNns13BIkh9A== + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/cli-js/-/cli-js-0.10.5.tgz#e9ef62205c865f085cfd9b2ac99d7d5ccd038512" + integrity sha512-jtLCuzFWHVoXoe6hELlriAI+XYH4bbysa9XyhyIvfKHiauaUIszOTBtIVeG1YTOvsHIS3bo4bakQL0vmuurm+Q== dependencies: - polywrap "0.10.2" + polywrap "0.10.5" spawn-command "0.0.2-1" "@polywrap/client-config-builder-js@0.10.0": @@ -2196,10 +2196,10 @@ "@polywrap/core-js" "0.10.0" "@polywrap/plugin-js" "0.10.0" -"@polywrap/logging-js@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/logging-js/-/logging-js-0.10.2.tgz#cc89544e82440400de682ed7af4ad0eaef89f864" - integrity sha512-mglQRHNJULl3F4YPRPkUUL1Zp/IjRfaNarXgXR4NLlEINU3+pzshGuJoMGCj2/mUWjsox3L8OjfzCjVBy+N+vw== +"@polywrap/logging-js@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/logging-js/-/logging-js-0.10.5.tgz#0624c871751e81c444de42d9f96d0beb60b46236" + integrity sha512-7bOvPDjAnEyfe16gxCLQ9R9UnCHT9WS2qqwKAGtTJCAsI+frFRIa//IszJzFNRfmDFGbpcl3AfQxSZHmZ3GrWw== "@polywrap/msgpack-js@0.10.0": version "0.10.0" @@ -2215,10 +2215,10 @@ dependencies: "@msgpack/msgpack" "2.7.2" -"@polywrap/os-js@0.10.2", "@polywrap/os-js@~0.10.0": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/os-js/-/os-js-0.10.2.tgz#26ea20d96ffbe328900bc6bf6b646a9d1cbcac9a" - integrity sha512-bTShjmw9vBcI6ZdC/rLdFlWuWXh2Xha6B/He+vzA4/vF5I9eyAxABfrsl4/ySqFFSsLdMITeQRzyFQXfcd0+FQ== +"@polywrap/os-js@0.10.5", "@polywrap/os-js@~0.10.0": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/os-js/-/os-js-0.10.5.tgz#b9ecae978f69edc341aedec1867161d1e609eb3a" + integrity sha512-Xh7KqCQy2aEoHDGQE5eV2ykCDjhCRzUVryiF+P/HbfxG//bW6Wte4e97H4tcuD8RkApYVaGjmUTAlvX+g+26AQ== "@polywrap/plugin-js@0.10.0": version "0.10.0" @@ -2242,18 +2242,18 @@ "@polywrap/tracing-js" "0.10.0-pre.10" "@polywrap/wrap-manifest-types-js" "0.10.0-pre.10" -"@polywrap/polywrap-manifest-schemas@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/polywrap-manifest-schemas/-/polywrap-manifest-schemas-0.10.2.tgz#369c9e12d9260b971ac2ff57dda2b886595435bb" - integrity sha512-5AggU1dz6pIXs0FfpxToyXcZdF31+3Ap3TdmOCnlOImhTDiYBaHj9wnvaffIm5TCe97QTTiND7KSljKtMd51Pg== +"@polywrap/polywrap-manifest-schemas@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/polywrap-manifest-schemas/-/polywrap-manifest-schemas-0.10.5.tgz#52630cf6fd5cb37143c283e1b846f479d1386eaa" + integrity sha512-Av3uu6nufqqM44lHfw1dc/1SJrLjQwE4ezEMajRLYhP5TXhgjAeFSMRUhBTzv0gHCIzK0rYIyrNBPra8hKEQBw== -"@polywrap/polywrap-manifest-types-js@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/polywrap-manifest-types-js/-/polywrap-manifest-types-js-0.10.2.tgz#5777888497429db6767c68ba2cf8ae1e4c0a44b3" - integrity sha512-bHlCp74W0dXMPI3ZZslTIWIuHMVaWKRv/OQ6UAS+d1pMoIgDdAA5xkNorW+rfRaRQWeGMTRdqBi7i/PPh+mrYA== +"@polywrap/polywrap-manifest-types-js@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/polywrap-manifest-types-js/-/polywrap-manifest-types-js-0.10.5.tgz#c9f8749052123fe6b2bed8c2a9a80f437ff9adf6" + integrity sha512-ip1ld2CsMrUk4DnhXImHcnkVslVqxoT3UTH6YI4JnKgV/m0PKXXOll3ZfYPnFfkZMTbbOeBeuKRfb+j0dRzz6g== dependencies: - "@polywrap/logging-js" "0.10.2" - "@polywrap/polywrap-manifest-schemas" "0.10.2" + "@polywrap/logging-js" "0.10.5" + "@polywrap/polywrap-manifest-schemas" "0.10.5" jsonschema "1.4.0" semver "7.5.0" yaml "2.2.2" @@ -2268,30 +2268,30 @@ resolved "https://registry.yarnpkg.com/@polywrap/result/-/result-0.10.0-pre.10.tgz#6e88ac447d92d8a10c7e7892a6371af29a072240" integrity sha512-SqNnEbXky4dFXgps2B2juFShq1024do0f1HLUbuj3MlIPp5aW9g9sfBslsy3YTnpg2QW7LFVT15crrJMgbowIQ== -"@polywrap/schema-bind@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/schema-bind/-/schema-bind-0.10.2.tgz#219c5fe618357be2d83a28739cf7048706cbbd7d" - integrity sha512-7PObwLAgdd/uwReG1yi70SvtlFlL4KtYqBaLtjQeDO8Iocx0y+MnI11VnGdAI/vY+Qu8L5IlG3yFN/hhXZu5hQ== +"@polywrap/schema-bind@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/schema-bind/-/schema-bind-0.10.5.tgz#9e209cda45df101b66076b57da403d1480e65ab1" + integrity sha512-7/pej+HHoqpzC8mXAcvk2m3GLCeQ0Rld3g9C26ffElvTB4nBqEBCNbOdZJn1/BSIzQEGq+D6kZAsCJRs/kBTkg== dependencies: - "@polywrap/os-js" "0.10.2" - "@polywrap/schema-parse" "0.10.2" + "@polywrap/os-js" "0.10.5" + "@polywrap/schema-parse" "0.10.5" "@polywrap/wrap-manifest-types-js" "0.10.0" mustache "4.0.1" -"@polywrap/schema-compose@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/schema-compose/-/schema-compose-0.10.2.tgz#6a4bf769605d5508e4ab5655b8e5a3526b1640b3" - integrity sha512-S1b0W2yhqLZduXVVh2k18aQ96SFoqmmQOxXL8zG4dbOOFs1k5VvO45rKHhC/Yy8TmT0TGs0IWSiU5Iq5P6KdGA== +"@polywrap/schema-compose@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/schema-compose/-/schema-compose-0.10.5.tgz#e3f8580ae16888868c961f3c2b705cf2b4302e5b" + integrity sha512-gxr7Bbr3c1kefvyFOJxGK5om01sOibYm3hG8H6bijXTOMEtGLDLyzTJMok9IXzKvu7X8Pdm2yG9C1X73cuvJRw== dependencies: - "@polywrap/schema-parse" "0.10.2" + "@polywrap/schema-parse" "0.10.5" "@polywrap/wrap-manifest-types-js" "0.10.0" graphql "15.5.0" mustache "4.0.1" -"@polywrap/schema-parse@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@polywrap/schema-parse/-/schema-parse-0.10.2.tgz#d4436555602dbd645051a5686ec05a342f749a99" - integrity sha512-9lO5l4pOlc4+VW4XJrWEXkiXjtsUvqiiZRJAX57Q58zRXenUrDq/DS4SukmY+Bls8By+4+WMya+Mgfg4LZS7kQ== +"@polywrap/schema-parse@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@polywrap/schema-parse/-/schema-parse-0.10.5.tgz#7a67d975fa66f7d051adb3adbc78ae3a98e8a09b" + integrity sha512-jtqPjS1LzYhtchZwivNcAND+l3ILcLtnMkZlcnMMTfbgEc6tWJRLiCS6JlHnQK+BuxccSW5G8Khxwde6HPCvYg== dependencies: "@dorgjelli/graphql-schema-cycles" "1.1.4" "@polywrap/wrap-manifest-types-js" "0.10.0" @@ -2381,19 +2381,19 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== -"@sinonjs/commons@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" - integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== +"@sinonjs/commons@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" + integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== dependencies: type-detect "4.0.8" "@sinonjs/fake-timers@^10.0.2": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c" - integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw== + version "10.3.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" + integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== dependencies: - "@sinonjs/commons" "^2.0.0" + "@sinonjs/commons" "^3.0.0" "@tootallnate/once@1": version "1.1.2" @@ -2416,9 +2416,9 @@ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" - integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== "@types/adm-zip@0.5.0": version "0.5.0" @@ -2428,9 +2428,9 @@ "@types/node" "*" "@types/babel__core@^7.1.14": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" - integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b" + integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw== dependencies: "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" @@ -2454,11 +2454,11 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.18.5" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80" - integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf" + integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg== dependencies: - "@babel/types" "^7.3.0" + "@babel/types" "^7.20.7" "@types/glob@*": version "8.1.0" @@ -2511,9 +2511,9 @@ pretty-format "^29.0.0" "@types/json-schema@^7.0.11", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.6": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + version "7.0.12" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" + integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== "@types/json5@^0.0.29": version "0.0.29" @@ -2521,9 +2521,9 @@ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== "@types/lodash@^4.14.182": - version "4.14.194" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76" - integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g== + version "4.14.195" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632" + integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg== "@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" @@ -2545,10 +2545,15 @@ resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-4.0.1.tgz#e4d421ed2d06d463b120621774185a5cd1b92d77" integrity sha512-wH6Tu9mbiOt0n5EvdoWy0VGQaJMHfLIxY/6wS0xLC7CV1taM6gESEzcYy0ZlWvxxiiljYvfDIvz4hHbUUDRlhw== -"@types/node@*", "@types/node@^18.14.6": - version "18.16.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.2.tgz#2f610ea71034b3971c312192377f8a7178eb57f1" - integrity sha512-GQW/JL/5Fz/0I8RpeBG9lKp0+aNcXEaVL71c0D2Q0QHDTFvlYKT7an0onCUXj85anv7b4/WesqdfchLc0jtsCg== +"@types/node@*": + version "20.3.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" + integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== + +"@types/node@^18.14.6": + version "18.16.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.18.tgz#85da09bafb66d4bc14f7c899185336d0c1736390" + integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2566,9 +2571,9 @@ integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== "@types/prettier@^2.1.5", "@types/prettier@^2.6.1": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" - integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== + version "2.7.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" + integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== "@types/prop-types@*": version "15.7.5" @@ -2751,9 +2756,9 @@ acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.4.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== + version "8.9.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" + integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== add-stream@^1.0.0: version "1.0.0" @@ -3256,14 +3261,14 @@ browser-readablestream-to-it@^1.0.1, browser-readablestream-to-it@^1.0.3: integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== browserslist@^4.21.3: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== + version "4.21.9" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" + integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" + caniuse-lite "^1.0.30001503" + electron-to-chromium "^1.4.431" + node-releases "^2.0.12" + update-browserslist-db "^1.0.11" bs-logger@0.x: version "0.2.6" @@ -3381,10 +3386,10 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001449: - version "1.0.30001481" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" - integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== +caniuse-lite@^1.0.30001503: + version "1.0.30001506" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz#35bd814b310a487970c585430e9e80ee23faf14b" + integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw== caseless@~0.12.0: version "0.12.0" @@ -3483,9 +3488,9 @@ cids@^1.0.0: uint8arrays "^3.0.0" cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" + integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== class-is@^1.1.0: version "1.1.0" @@ -4060,10 +4065,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.4.284: - version "1.4.377" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.377.tgz#7f326a0b2c1b96eca6bb65907addc505d0d15989" - integrity sha512-H3BYG6DW5Z+l0xcfXaicJGxrpA4kMlCxnN71+iNX+dBLkRMOdVJqFJiAmbNZZKA1zISpRg17JR03qGifXNsJtw== +electron-to-chromium@^1.4.431: + version "1.4.435" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.435.tgz#761c34300603b9f1234f0b6155870d3002435db6" + integrity sha512-B0CBWVFhvoQCW/XtjRzgrmqcgVWg6RXOEM/dK59+wFV93BFGR6AeNKc4OyhM+T3IhJaOOG8o/V+33Y2mwJWtzw== elliptic@6.5.4: version "6.5.4" @@ -4129,9 +4134,9 @@ env-paths@^2.2.0: integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== envinfo@^7.7.4: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + version "7.9.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.9.0.tgz#47594a13081be0d9be6e513534e8c58dbb26c7a1" + integrity sha512-RODB4txU+xImYDemN5DqaKC0CHk05XSVkOX4pq0hK26Qx+1LChkuOyUDlGEjYb3ACr0n9qBhFjg37hQuJvpkRQ== err-code@^2.0.0, err-code@^2.0.2, err-code@^2.0.3: version "2.0.3" @@ -4592,9 +4597,9 @@ fast-deep-equal@^3.1.1: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" + integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== fast-fifo@^1.0.0: version "1.2.0" @@ -4840,12 +4845,13 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-iterator@^1.0.2: @@ -5548,9 +5554,9 @@ is-circular@^1.0.2: integrity sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA== is-core-module@^2.11.0, is-core-module@^2.5.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== dependencies: has "^1.0.3" @@ -6789,9 +6795,9 @@ minimalistic-crypto-utils@^1.0.1: integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== minimatch@*: - version "9.0.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56" - integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w== + version "9.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" + integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== dependencies: brace-expansion "^2.0.1" @@ -6885,10 +6891,10 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" - integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== minizlib@^1.3.3: version "1.3.3" @@ -7158,9 +7164,9 @@ next-tick@1, next-tick@^1.1.0: integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + version "2.6.11" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -7202,10 +7208,10 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.8: - version "2.0.10" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" - integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== +node-releases@^2.0.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" + integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== noms@0.0.0: version "0.0.0" @@ -7757,9 +7763,9 @@ pify@^5.0.0: integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== pirates@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== pkg-dir@^4.2.0: version "4.2.0" @@ -7768,10 +7774,10 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -polywrap@0.10.2, polywrap@~0.10.0: - version "0.10.2" - resolved "https://registry.yarnpkg.com/polywrap/-/polywrap-0.10.2.tgz#ed70f76459c7a57c99932aea220b1ccba054e778" - integrity sha512-MH28MdM9XcdE2Y3kvK8wyvJ7GXKe9X34i3IdbcrGzy/tc1ki3RAzUazse7tLMX1qnatUsJSgNC+wF8Bfae/Jhg== +polywrap@0.10.5, polywrap@~0.10.0: + version "0.10.5" + resolved "https://registry.yarnpkg.com/polywrap/-/polywrap-0.10.5.tgz#e49faaa0d917df6779c2cad0d70a3941bccc1f07" + integrity sha512-1/dQCiI+JQH55hO0fsT3RX3p5vCDV8tdjzFeJLQRU7WolKaN9qTw0GFo1PThnnIdpFLMp+jtDCPAgImmamZqJQ== dependencies: "@apidevtools/json-schema-ref-parser" "9.0.9" "@ethersproject/providers" "5.6.8" @@ -7782,13 +7788,13 @@ polywrap@0.10.2, polywrap@~0.10.0: "@polywrap/client-js" "0.10.0" "@polywrap/core-js" "0.10.0" "@polywrap/ethereum-provider-js-v1" "npm:@polywrap/ethereum-provider-js@~0.2.4" - "@polywrap/logging-js" "0.10.2" - "@polywrap/os-js" "0.10.2" - "@polywrap/polywrap-manifest-types-js" "0.10.2" + "@polywrap/logging-js" "0.10.5" + "@polywrap/os-js" "0.10.5" + "@polywrap/polywrap-manifest-types-js" "0.10.5" "@polywrap/result" "0.10.0" - "@polywrap/schema-bind" "0.10.2" - "@polywrap/schema-compose" "0.10.2" - "@polywrap/schema-parse" "0.10.2" + "@polywrap/schema-bind" "0.10.5" + "@polywrap/schema-compose" "0.10.5" + "@polywrap/schema-parse" "0.10.5" "@polywrap/uri-resolver-extensions-js" "0.10.0" "@polywrap/uri-resolvers-js" "0.10.0" "@polywrap/wasm-js" "0.10.0" @@ -7953,9 +7959,9 @@ q@^1.5.1: integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qs@^6.9.4: - version "6.11.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" - integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== dependencies: side-channel "^1.0.4" @@ -8384,13 +8390,20 @@ semver@7.4.0: dependencies: lru-cache "^6.0.0" -semver@7.5.0, semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: +semver@7.5.0: version "7.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== dependencies: lru-cache "^6.0.0" +semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: + version "7.5.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" + integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== + dependencies: + lru-cache "^6.0.0" + semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -8819,13 +8832,13 @@ tar@^4.4.12: yallist "^3.1.1" tar@^6.0.2, tar@^6.1.0: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -9029,9 +9042,9 @@ tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.1.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== tsutils@^3.17.1: version "3.21.0" @@ -9211,7 +9224,7 @@ upath@^2.0.1: resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== -update-browserslist-db@^1.0.10: +update-browserslist-db@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== From 42cb066a94f7462d57dc8da21a285a588194e767 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Thu, 22 Jun 2023 00:47:58 +0530 Subject: [PATCH 3/5] refactor: names --- packages/client/README.md | 2 +- packages/client/examples/quickstart.ts | 4 +- .../__tests__/core/embedded-package.spec.ts | 10 ++-- .../__tests__/core/embedded-wrapper.spec.ts | 10 ++-- .../__tests__/core/error-structure.spec.ts | 14 +++--- .../client/src/__tests__/core/sanity.spec.ts | 4 +- .../src/__tests__/core/type-test-cases.ts | 6 +-- .../src/__tests__/core/uri-resolution.spec.ts | 4 +- .../src/__tests__/core/wasm-wrapper.spec.ts | 10 ++-- .../__tests__/core/wrap-features/env-case.ts | 46 +++++++++---------- .../interface-implementation-case.ts | 14 +++--- .../core/wrap-features/subinvoke-case.ts | 6 +-- packages/core-client/README.md | 2 +- packages/core-client/examples/quickstart.ts | 11 +++-- 14 files changed, 72 insertions(+), 71 deletions(-) diff --git a/packages/client/README.md b/packages/client/README.md index 9d5ca0b14..f0bcceb47 100644 --- a/packages/client/README.md +++ b/packages/client/README.md @@ -30,7 +30,7 @@ Use the PolywrapClient [constructor](#constructor) to instantiate the client wit Use the `@polywrap/client-config-builder-js` package to build a custom configuration for your project. ```ts - const config = new ClientConfigBuilder().addDefaults().build(); + const config = new PolywrapClientConfigBuilder().addDefaults().build(); const client = new PolywrapClient(config); ``` diff --git a/packages/client/examples/quickstart.ts b/packages/client/examples/quickstart.ts index 4872b7381..2968f4273 100644 --- a/packages/client/examples/quickstart.ts +++ b/packages/client/examples/quickstart.ts @@ -1,4 +1,4 @@ -import { ClientConfigBuilder, PolywrapClient } from "../build"; +import { PolywrapClientConfigBuilder, PolywrapClient } from "../build"; export function instantiate(): PolywrapClient { // /* $: quickstart-instantiate */ import { PolywrapClient } from "@polywrap/client-js"; @@ -11,7 +11,7 @@ export function instantiate(): PolywrapClient { export function configure(): PolywrapClient { // $start: quickstart-configure - const config = new ClientConfigBuilder().addDefaults().build(); + const config = new PolywrapClientConfigBuilder().addDefaults().build(); const client = new PolywrapClient(config); // $end diff --git a/packages/client/src/__tests__/core/embedded-package.spec.ts b/packages/client/src/__tests__/core/embedded-package.spec.ts index 66b0f872d..d3cd5b7b1 100644 --- a/packages/client/src/__tests__/core/embedded-package.spec.ts +++ b/packages/client/src/__tests__/core/embedded-package.spec.ts @@ -5,7 +5,7 @@ import { InMemoryFileReader, WasmPackage } from "@polywrap/wasm-js"; import { IWrapPackage } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; import { PolywrapClient } from "../../PolywrapClient"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; jest.setTimeout(200000); @@ -20,9 +20,9 @@ describe("Embedded package", () => { ); let wrapPackage = WasmPackage.from(manifestBuffer, wasmModuleBuffer); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addPackage(wrapperUri, wrapPackage) + .setPackage(wrapperUri, wrapPackage) .build(); const client = new PolywrapClient(config); @@ -141,9 +141,9 @@ const testEmbeddedPackageWithFile = async ( filePath: string, fileText: string ) => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addPackage(wrapperUri, wrapPackage) + .setPackage(wrapperUri, wrapPackage) .build(); const client = new PolywrapClient(config); diff --git a/packages/client/src/__tests__/core/embedded-wrapper.spec.ts b/packages/client/src/__tests__/core/embedded-wrapper.spec.ts index 915e73446..5efd07d09 100644 --- a/packages/client/src/__tests__/core/embedded-wrapper.spec.ts +++ b/packages/client/src/__tests__/core/embedded-wrapper.spec.ts @@ -5,7 +5,7 @@ import { WasmWrapper, InMemoryFileReader } from "@polywrap/wasm-js"; import { Wrapper } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; import { PolywrapClient } from "../../PolywrapClient"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; jest.setTimeout(200000); @@ -22,9 +22,9 @@ describe("Embedded wrapper", () => { wasmModuleBuffer ); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addWrapper(simpleWrapperUri, wrapper) + .setWrapper(simpleWrapperUri, wrapper) .build(); const client = new PolywrapClient(config); @@ -136,9 +136,9 @@ const testEmbeddedWrapperWithFile = async ( filePath: string, fileText: string ) => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addWrapper(simpleWrapperUri, wrapper) + .setWrapper(simpleWrapperUri, wrapper) .build(); const client = new PolywrapClient(config); diff --git a/packages/client/src/__tests__/core/error-structure.spec.ts b/packages/client/src/__tests__/core/error-structure.spec.ts index 682e5713a..fa47edd42 100644 --- a/packages/client/src/__tests__/core/error-structure.spec.ts +++ b/packages/client/src/__tests__/core/error-structure.spec.ts @@ -8,7 +8,7 @@ import { WrapError, WrapErrorCode } from "@polywrap/core-js"; import { mockPluginRegistration } from "../helpers"; import { msgpackDecode, msgpackEncode } from "@polywrap/msgpack-js"; import { - ClientConfigBuilder, + PolywrapClientConfigBuilder, DefaultBundle, } from "@polywrap/client-config-builder-js"; @@ -160,9 +160,9 @@ describe("Error structure", () => { }); test("Subinvoke error two layers deep", async () => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addRedirects({ + .setRedirects({ "ens/imported-invoke.eth": asInvokeWrapperUri.uri, "ens/imported-subinvoke.eth": asSubinvokeWrapperUri.uri, }); @@ -335,9 +335,9 @@ describe("Error structure", () => { }); test("Subinvoke error two layers deep", async () => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addRedirects({ + .setRedirects({ "ens/imported-invoke.eth": rsInvokeWrapperUri.uri, "ens/imported-subinvoke.eth": rsSubinvokeWrapperUri.uri, }); @@ -400,8 +400,8 @@ describe("Error structure", () => { describe("Plugin wrapper", () => { const mockPlugin = mockPluginRegistration("plugin/mock") - const config = new ClientConfigBuilder() - .addDefaults().addPackage(mockPlugin.uri.uri, mockPlugin.package) + const config = new PolywrapClientConfigBuilder() + .addDefaults().setPackage(mockPlugin.uri.uri, mockPlugin.package) const client = new PolywrapClient(config.build()); test("Invoke a plugin wrapper with malformed args", async () => { const result = await client.invoke({ diff --git a/packages/client/src/__tests__/core/sanity.spec.ts b/packages/client/src/__tests__/core/sanity.spec.ts index 98b6218c2..892697ffa 100644 --- a/packages/client/src/__tests__/core/sanity.spec.ts +++ b/packages/client/src/__tests__/core/sanity.spec.ts @@ -6,7 +6,7 @@ import { IUriPackage, IUriRedirect } from "@polywrap/core-js"; import { ResultErr } from "@polywrap/result"; import { StaticResolver, UriResolverLike } from "@polywrap/uri-resolvers-js"; import { WasmPackage } from "@polywrap/wasm-js"; -import { ClientConfigBuilder, DefaultBundle } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder, DefaultBundle } from "@polywrap/client-config-builder-js"; import { CoreClientConfig } from "@polywrap/core-js"; jest.setTimeout(200000); @@ -14,7 +14,7 @@ jest.setTimeout(200000); describe("sanity", () => { test("default client config", () => { const clientConfig = new PolywrapClient().getConfig(); - const expectedConfig = new ClientConfigBuilder().add(DefaultBundle.getConfig()).build(); + const expectedConfig = new PolywrapClientConfigBuilder().add(DefaultBundle.getConfig()).build(); expect( JSON.stringify(clientConfig, null, 2) diff --git a/packages/client/src/__tests__/core/type-test-cases.ts b/packages/client/src/__tests__/core/type-test-cases.ts index ba2c28b02..20e88e7d4 100644 --- a/packages/client/src/__tests__/core/type-test-cases.ts +++ b/packages/client/src/__tests__/core/type-test-cases.ts @@ -2,14 +2,14 @@ import { memoryStoragePlugin, ErrResult } from "../helpers"; import { PolywrapClient } from "../../PolywrapClient"; import BigNumber from "bignumber.js"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { GetPathToTestWrappers } from "@polywrap/test-cases"; export const typeTestCases = (implementation: string) => { describe("types test cases", () => { test(`asyncify ${implementation}`, async () => { - const builder = new ClientConfigBuilder(); - builder.addDefaults().addPackage( + const builder = new PolywrapClientConfigBuilder(); + builder.addDefaults().setPackage( "wrap://ens/memory-storage.polywrap.eth", memoryStoragePlugin() ); diff --git a/packages/client/src/__tests__/core/uri-resolution.spec.ts b/packages/client/src/__tests__/core/uri-resolution.spec.ts index 7adc14e1a..dff3e94db 100644 --- a/packages/client/src/__tests__/core/uri-resolution.spec.ts +++ b/packages/client/src/__tests__/core/uri-resolution.spec.ts @@ -5,7 +5,7 @@ import { UriResolutionResult, } from "@polywrap/core-js"; import { Result } from "@polywrap/result"; -import { PolywrapClient, ClientConfigBuilder } from "../../"; +import { PolywrapClient, PolywrapClientConfigBuilder } from "../../"; jest.setTimeout(200000); @@ -54,7 +54,7 @@ describe("URI resolution", () => { const fromUri = new Uri(`test/from.eth`); const redirectUri = new Uri(`test/to.eth`); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() .addResolver({ tryResolveUri: async (uri: Uri) => { diff --git a/packages/client/src/__tests__/core/wasm-wrapper.spec.ts b/packages/client/src/__tests__/core/wasm-wrapper.spec.ts index e98170ff9..90797788e 100644 --- a/packages/client/src/__tests__/core/wasm-wrapper.spec.ts +++ b/packages/client/src/__tests__/core/wasm-wrapper.spec.ts @@ -5,7 +5,7 @@ import { Uri, PolywrapClient, IWrapPackage } from "../.."; import { WrapManifest } from "@polywrap/wrap-manifest-types-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { UriResolver } from "@polywrap/uri-resolvers-js"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { mockPluginRegistration, ErrResult } from "../helpers"; jest.setTimeout(200000); @@ -94,10 +94,10 @@ describe("wasm-wrapper", () => { }); it("should invoke wrapper with custom redirects", async () => { - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addRedirect(wrapperUri.uri, "wrap://ens/mock.polywrap.eth") - .addPackage("wrap://ens/mock.polywrap.eth", mockPlugin()) + .setRedirect(wrapperUri.uri, "wrap://ens/mock.polywrap.eth") + .setPackage("wrap://ens/mock.polywrap.eth", mockPlugin()) .build(); const client = new PolywrapClient(config); @@ -117,7 +117,7 @@ describe("wasm-wrapper", () => { }); it("should allow clone + reconfigure of redirects", async () => { - let builder = new ClientConfigBuilder() + let builder = new PolywrapClientConfigBuilder() .add({ packages: { "wrap://ens/mock.polywrap.eth": mockPlugin() }, }) diff --git a/packages/client/src/__tests__/core/wrap-features/env-case.ts b/packages/client/src/__tests__/core/wrap-features/env-case.ts index a718df742..4909da21f 100644 --- a/packages/client/src/__tests__/core/wrap-features/env-case.ts +++ b/packages/client/src/__tests__/core/wrap-features/env-case.ts @@ -2,7 +2,7 @@ import { PluginPackage } from "@polywrap/plugin-js"; import { RecursiveResolver } from "@polywrap/uri-resolvers-js"; import { PolywrapClient } from "../../../PolywrapClient"; import { mockPluginRegistration } from "../../helpers"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { Uri, UriMap } from "@polywrap/core-js"; import { GetPathToTestWrappers } from "@polywrap/test-cases"; @@ -14,7 +14,7 @@ export const envTestCases = (implementation: string) => { const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`; const wrapperUri = Uri.from(`file/${wrapperPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults(); const client = new PolywrapClient(builder.build()); @@ -51,7 +51,7 @@ export const envTestCases = (implementation: string) => { [wrapperUri.uri]: env }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults() .addEnvs(envs); @@ -107,7 +107,7 @@ export const envTestCases = (implementation: string) => { [wrapperUri.uri]: env }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults() .addEnvs(envs); @@ -127,7 +127,7 @@ export const envTestCases = (implementation: string) => { const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`; const wrapperUri = Uri.from(`file/${wrapperPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults(); @@ -179,7 +179,7 @@ export const envTestCases = (implementation: string) => { [wrapperUri.uri]: env }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults() .addEnvs(envs); @@ -199,7 +199,7 @@ export const envTestCases = (implementation: string) => { const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`; const wrapperUri = Uri.from(`file/${wrapperPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults(); @@ -253,11 +253,11 @@ export const envTestCases = (implementation: string) => { [envUri.uri]: env }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults() .addEnvs(envs) - .addRedirect(redirectFromUri.uri, wrapperUri.uri); + .setRedirect(redirectFromUri.uri, wrapperUri.uri); const client = new PolywrapClient(builder.build()); @@ -282,9 +282,9 @@ export const envTestCases = (implementation: string) => { const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`); const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri); + .setRedirect("mock/main", subinvokedUri); const client = new PolywrapClient(builder.build()); @@ -322,9 +322,9 @@ export const envTestCases = (implementation: string) => { "mock/main": subinvokedEnv }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri) + .setRedirect("mock/main", subinvokedUri) .addEnvs(envs); const client = new PolywrapClient(builder.build()); @@ -380,9 +380,9 @@ export const envTestCases = (implementation: string) => { "mock/main": subinvokedEnv }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri) + .setRedirect("mock/main", subinvokedUri) .addEnvs(envs); const client = new PolywrapClient(builder.build()); @@ -402,9 +402,9 @@ export const envTestCases = (implementation: string) => { const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`); const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri); + .setRedirect("mock/main", subinvokedUri); const client = new PolywrapClient(builder.build()); @@ -456,9 +456,9 @@ export const envTestCases = (implementation: string) => { "mock/main": subinvokedEnv }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri) + .setRedirect("mock/main", subinvokedUri) .addEnvs(envs); const client = new PolywrapClient(builder.build()); @@ -478,9 +478,9 @@ export const envTestCases = (implementation: string) => { const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`); const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri); + .setRedirect("mock/main", subinvokedUri); const client = new PolywrapClient(builder.build()); @@ -543,9 +543,9 @@ export const envTestCases = (implementation: string) => { "mock/main": subinvokedEnv }; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder.addDefaults() - .addRedirect("mock/main", subinvokedUri) + .setRedirect("mock/main", subinvokedUri) .addEnvs(envs); const client = new PolywrapClient(builder.build()); diff --git a/packages/client/src/__tests__/core/wrap-features/interface-implementation-case.ts b/packages/client/src/__tests__/core/wrap-features/interface-implementation-case.ts index 03ecdebce..a379680dd 100644 --- a/packages/client/src/__tests__/core/wrap-features/interface-implementation-case.ts +++ b/packages/client/src/__tests__/core/wrap-features/interface-implementation-case.ts @@ -4,7 +4,7 @@ import { PolywrapClient, UriMap, } from "../../../index"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { UriResolver } from "@polywrap/uri-resolvers-js"; import { mockPluginRegistration } from "../../helpers"; import { GetPathToTestWrappers } from "@polywrap/test-cases"; @@ -18,7 +18,7 @@ export const interfaceInvokeCase = (implementation: string) => { const implementationPath = `${GetPathToTestWrappers()}/interface-invoke/01-implementation/implementations/${implementation}`; const implementationUri = `fs/${implementationPath}`; - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() .addInterfaceImplementation(interfaceUri, implementationUri); const client = new PolywrapClient(config.build()); @@ -158,7 +158,7 @@ export const interfaceInvokeCase = (implementation: string) => { const implementationUri1 = Uri.from("wrap://ens/implementation1.eth"); const implementationUri2 = Uri.from("wrap://ens/implementation2.eth"); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() .addInterfaceImplementations(interfaceUri.uri, [ implementationUri1.uri, @@ -181,7 +181,7 @@ export const interfaceInvokeCase = (implementation: string) => { const implementationUri1 = Uri.from("wrap://ens/implementation1.eth"); const implementationUri2 = Uri.from("wrap://ens/implementation2.eth"); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() .addInterfaceImplementations(interfaceUri.uri, [ implementationUri1.uri, @@ -193,7 +193,7 @@ export const interfaceInvokeCase = (implementation: string) => { const implementationUris = (client.getInterfaces() ?? new UriMap).get(interfaceUri); - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); const defaultClientConfig = builder.addDefaults().build(); expect(implementationUris).toEqual([ @@ -273,9 +273,9 @@ export const interfaceInvokeCase = (implementation: string) => { "wrap://mock/some-implementation2" ); - const config = new ClientConfigBuilder() + const config = new PolywrapClientConfigBuilder() .addDefaults() - .addRedirect(oldInterfaceUri.uri, newInterfaceUri.uri) + .setRedirect(oldInterfaceUri.uri, newInterfaceUri.uri) .addInterfaceImplementation(oldInterfaceUri.uri, implementation1Uri.uri) .addInterfaceImplementation(newInterfaceUri.uri, implementation2Uri.uri) .build(); diff --git a/packages/client/src/__tests__/core/wrap-features/subinvoke-case.ts b/packages/client/src/__tests__/core/wrap-features/subinvoke-case.ts index 6c994ddb0..752f8ca88 100644 --- a/packages/client/src/__tests__/core/wrap-features/subinvoke-case.ts +++ b/packages/client/src/__tests__/core/wrap-features/subinvoke-case.ts @@ -1,5 +1,5 @@ import { GetPathToTestWrappers } from "@polywrap/test-cases"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { PolywrapClient } from "../../../PolywrapClient"; export const subinvokeCase = (implementation: string) => { @@ -8,10 +8,10 @@ export const subinvokeCase = (implementation: string) => { const subinvokeUri = `file/${GetPathToTestWrappers()}/subinvoke/00-subinvoke/implementations/${implementation}`; const wrapperUri = `file/${GetPathToTestWrappers()}/subinvoke/01-invoke/implementations/${implementation}`; - const builder = new ClientConfigBuilder(); + const builder = new PolywrapClientConfigBuilder(); builder .addDefaults() - .addRedirect("ens/imported-subinvoke.eth", subinvokeUri); + .setRedirect("ens/imported-subinvoke.eth", subinvokeUri); const client = new PolywrapClient(builder.build()); diff --git a/packages/core-client/README.md b/packages/core-client/README.md index 78922e1fa..d55e321b6 100644 --- a/packages/core-client/README.md +++ b/packages/core-client/README.md @@ -20,7 +20,7 @@ npm install --save @polywrap/core-client-js Use the `@polywrap/client-config-builder-js` package to build a CoreClientConfig for your project, then use the PolywrapCoreClient [constructor](#constructor) to instantiate the client with your config. ```ts - const config = new ClientConfigBuilder().addDefaults().build(); + const config = new PolywrapClientConfigBuilder().addDefaults().build(); const client = new PolywrapCoreClient(config); ``` diff --git a/packages/core-client/examples/quickstart.ts b/packages/core-client/examples/quickstart.ts index c55ca0d4e..791687fd5 100644 --- a/packages/core-client/examples/quickstart.ts +++ b/packages/core-client/examples/quickstart.ts @@ -1,10 +1,11 @@ import { PolywrapCoreClient } from "../build"; -import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; + +import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js"; import { Uri } from "@polywrap/core-js"; export function instantiate(): PolywrapCoreClient { // $start: quickstart-instantiate - const config = new ClientConfigBuilder().addDefaults().build(); + const config = new PolywrapClientConfigBuilder().addDefaults().build(); const client = new PolywrapCoreClient(config); // $end @@ -13,7 +14,7 @@ export function instantiate(): PolywrapCoreClient { } export async function invoke(): Promise { - const config = new ClientConfigBuilder().addDefaults().build(); + const config = new PolywrapClientConfigBuilder().addDefaults().build(); const client = new PolywrapCoreClient(config); @@ -22,8 +23,8 @@ export async function invoke(): Promise { uri: Uri.from("ens/helloworld.dev.polywrap.eth"), method: "logMessage", args: { - message: "Hello World!" - } + message: "Hello World!", + }, }); if (!result.ok) throw result.error; From 2e95ec36e893d793ed04e7b1bb6b7b8f39611927 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Mon, 26 Jun 2023 14:17:58 -0400 Subject: [PATCH 4/5] chore: fix bad merge --- .../src/bundles/default.ts | 185 ------------------ 1 file changed, 185 deletions(-) delete mode 100644 packages/client-config-builder/src/bundles/default.ts diff --git a/packages/client-config-builder/src/bundles/default.ts b/packages/client-config-builder/src/bundles/default.ts deleted file mode 100644 index f951d18a1..000000000 --- a/packages/client-config-builder/src/bundles/default.ts +++ /dev/null @@ -1,185 +0,0 @@ -import { PolywrapClientConfigBuilder } from "../PolywrapClientConfigBuilder"; -import { BuilderConfig } from "../types"; -import * as ipfsHttpClient from "./embeds/ipfs-http-client/wrap"; -import * as ipfsResolver from "./embeds/async-ipfs-resolver/wrap"; - -import { IWrapPackage, Uri } from "@polywrap/core-js"; -import * as EthProviderV1 from "@polywrap/ethereum-provider-js-v1"; -import * as EthProvider from "@polywrap/ethereum-provider-js"; -import { httpPlugin } from "@polywrap/http-plugin-js"; -import { fileSystemPlugin } from "@polywrap/file-system-plugin-js"; -import { loggerPlugin } from "@polywrap/logger-plugin-js"; -import { concurrentPromisePlugin } from "@polywrap/concurrent-plugin-js"; -import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js"; -import { IUriRedirect } from "@polywrap/core-js"; - -// $start: getDefaultConfig -export const ipfsProviders: string[] = [ - "https://ipfs.wrappers.io", - "https://ipfs.io", -]; - -interface IDefaultEmbed { - uri: Uri; - package: IWrapPackage; - source: Uri; -} - -interface IDefaultEmbeds { - ipfsHttpClient: IDefaultEmbed; - ipfsResolver: IDefaultEmbed; -} - -export const embeds: IDefaultEmbeds = { - ipfsHttpClient: { - uri: Uri.from("embed/ipfs-http-client@1.0.0"), - package: ipfsHttpClient.wasmPackage, - source: Uri.from("ens/wraps.eth:ipfs-http-client@1.0.0"), - }, - ipfsResolver: { - uri: Uri.from("embed/async-ipfs-uri-resolver-ext@1.0.1"), - package: ipfsResolver.wasmPackage, - source: Uri.from("ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1"), - }, -}; - -type UriResolverExtBootloader = [IDefaultEmbed, IUriRedirect, ...Uri[]]; - -export const uriResolverExts: UriResolverExtBootloader = [ - embeds.ipfsResolver, - { - from: Uri.from("ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.1"), - to: Uri.from("ipfs/QmXcHWtKkfrFmcczdMSXH7udsSyV3UJeoWzkaUqGBm1oYs"), - }, - Uri.from("ens/wraps.eth:http-uri-resolver-ext@1.0.1"), - Uri.from("ens/wraps.eth:file-system-uri-resolver-ext@1.0.1"), - Uri.from("ens/wraps.eth:ens-uri-resolver-ext@1.0.1"), - Uri.from("ens/wraps.eth:ens-ipfs-contenthash-uri-resolver-ext@1.0.1"), -]; - -interface IDefaultPlugin { - uri: Uri; - plugin: IWrapPackage; - implements: Uri[]; -} - -interface IDefaultPlugins { - logger: IDefaultPlugin; - http: IDefaultPlugin; - fileSystem: IDefaultPlugin; - concurrent: IDefaultPlugin; - ethereumProviderV1: IDefaultPlugin; - ethereumProviderV2: IDefaultPlugin; -} - -export const plugins: IDefaultPlugins = { - logger: { - uri: Uri.from("plugin/logger@1.0.0"), - plugin: loggerPlugin({}), - implements: [Uri.from("ens/wraps.eth:logger@1.0.0")], - }, - http: { - uri: Uri.from("plugin/http@1.1.0"), - plugin: httpPlugin({}), - implements: [ - Uri.from("ens/wraps.eth:http@1.1.0"), - Uri.from("ens/wraps.eth:http@1.0.0"), - ], - }, - fileSystem: { - uri: Uri.from("plugin/file-system@1.0.0"), - plugin: fileSystemPlugin({}), - implements: [Uri.from("ens/wraps.eth:file-system@1.0.0")], - }, - concurrent: { - uri: Uri.from("plugin/concurrent@1.0.0"), - plugin: concurrentPromisePlugin({}), - implements: [Uri.from("ens/wraps.eth:concurrent@1.0.0")], - }, - ethereumProviderV1: { - uri: Uri.from("plugin/ethereum-provider@1.1.0"), - plugin: EthProviderV1.plugin({ - connections: new EthProviderV1.Connections({ - networks: { - mainnet: new EthProviderV1.Connection({ - provider: - "https://mainnet.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6", - }), - goerli: new EthProviderV1.Connection({ - provider: - "https://goerli.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6", - }), - }, - }), - }), - implements: [ - Uri.from("ens/wraps.eth:ethereum-provider@1.1.0"), - Uri.from("ens/wraps.eth:ethereum-provider@1.0.0"), - ], - }, - ethereumProviderV2: { - uri: Uri.from("plugin/ethereum-provider@2.0.0"), - plugin: EthProvider.plugin({ - connections: new EthProvider.Connections({ - networks: { - mainnet: new EthProvider.Connection({ - provider: - "https://mainnet.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6", - }), - goerli: new EthProvider.Connection({ - provider: - "https://goerli.infura.io/v3/b00b2c2cc09c487685e9fb061256d6a6", - }), - }, - }), - }), - implements: [Uri.from("ens/wraps.eth:ethereum-provider@2.0.0")], - }, -}; - -export function getConfig(): BuilderConfig { - const builder = new PolywrapClientConfigBuilder(); - - // Add all embedded packages - for (const embed of Object.values(embeds)) { - builder.setPackage(embed.uri.uri, embed.package); - - // Add source redirect - builder.setRedirect(embed.source.uri, embed.uri.uri); - - // Add source implementation - builder.addInterfaceImplementation(embed.source.uri, embed.uri.uri); - } - - // Add all plugin packages - for (const plugin of Object.values(plugins)) { - builder.setPackage(plugin.uri.uri, plugin.plugin); - - // Add all interface implementations & redirects - for (const interfaceUri of plugin.implements) { - builder.addInterfaceImplementation(interfaceUri.uri, plugin.uri.uri); - builder.setRedirect(interfaceUri.uri, plugin.uri.uri); - } - } - - // Add all uri-resolver-ext interface implementations - builder.addInterfaceImplementations( - ExtendableUriResolver.defaultExtInterfaceUris[0].uri, - [ - uriResolverExts[0].source.uri, - uriResolverExts[1].from.uri, - ...uriResolverExts.slice(2).map((x: Uri) => x.uri), - ] - ); - builder.setRedirect(uriResolverExts[1].from.uri, uriResolverExts[1].to.uri); - - // Configure the ipfs-uri-resolver provider endpoints & retry counts - builder.addEnv(embeds.ipfsResolver.source.uri, { - provider: ipfsProviders[0], - fallbackProviders: ipfsProviders.slice(1), - retries: { tryResolveUri: 2, getFile: 2 }, - }); - - return builder.config; -} -// $end From cf8a21c9d59f6b718f7caa8631a2ca6a2ff49863 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Mon, 26 Jun 2023 14:22:45 -0400 Subject: [PATCH 5/5] chore: update CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c693d6b5a..9d98ff945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,14 @@ * Valid config bundle packages are expected to export a `bundle` value, which is of type `Bundle`. ## Breaking Changes +**`@polywrap/client-config-builder-js`:** +* [PR-47](https://github.com/polywrap/javascript-client/pull/47) **Renaming For Improved Accuracy** + * Renamed `ClientConfigBuilder` to `PolywrapClientConfigBuilder` + * Renamed `IClientConfigBuilder` to `ClientConfigBuilder` + * Renamed `addWrapper(s)` to `setWrapper(s)` + * Renamed `addPackage(s)` to `setPackage(s)` + * Renamed `addRedirect(s)` to `setRedirect(s)` + **`@polywrap/core-js`:** * [PR-32](https://github.com/polywrap/javascript-client/pull/32) **Rename `getEnvFromUriHistory` to `getEnvFromResolutionPath`**