Skip to content

Commit 42cb066

Browse files
Niraj-KamdarNiraj-Kamdar
committed
refactor: names
1 parent d16fb9c commit 42cb066

14 files changed

Lines changed: 72 additions & 71 deletions

‎packages/client/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use the PolywrapClient [constructor](#constructor) to instantiate the client wit
3030
Use the `@polywrap/client-config-builder-js` package to build a custom configuration for your project.
3131

3232
```ts
33-
const config = new ClientConfigBuilder().addDefaults().build();
33+
const config = new PolywrapClientConfigBuilder().addDefaults().build();
3434

3535
const client = new PolywrapClient(config);
3636
```

‎packages/client/examples/quickstart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ClientConfigBuilder, PolywrapClient } from "../build";
1+
import { PolywrapClientConfigBuilder, PolywrapClient } from "../build";
22

33
export function instantiate(): PolywrapClient {
44
// /* $: quickstart-instantiate */ import { PolywrapClient } from "@polywrap/client-js";
@@ -11,7 +11,7 @@ export function instantiate(): PolywrapClient {
1111

1212
export function configure(): PolywrapClient {
1313
// $start: quickstart-configure
14-
const config = new ClientConfigBuilder().addDefaults().build();
14+
const config = new PolywrapClientConfigBuilder().addDefaults().build();
1515

1616
const client = new PolywrapClient(config);
1717
// $end

‎packages/client/src/__tests__/core/embedded-package.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { InMemoryFileReader, WasmPackage } from "@polywrap/wasm-js";
55
import { IWrapPackage } from "@polywrap/core-js";
66
import { Result, ResultErr, ResultOk } from "@polywrap/result";
77
import { PolywrapClient } from "../../PolywrapClient";
8-
import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
8+
import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
99

1010
jest.setTimeout(200000);
1111

@@ -20,9 +20,9 @@ describe("Embedded package", () => {
2020
);
2121

2222
let wrapPackage = WasmPackage.from(manifestBuffer, wasmModuleBuffer);
23-
const config = new ClientConfigBuilder()
23+
const config = new PolywrapClientConfigBuilder()
2424
.addDefaults()
25-
.addPackage(wrapperUri, wrapPackage)
25+
.setPackage(wrapperUri, wrapPackage)
2626
.build();
2727
const client = new PolywrapClient(config);
2828

@@ -141,9 +141,9 @@ const testEmbeddedPackageWithFile = async (
141141
filePath: string,
142142
fileText: string
143143
) => {
144-
const config = new ClientConfigBuilder()
144+
const config = new PolywrapClientConfigBuilder()
145145
.addDefaults()
146-
.addPackage(wrapperUri, wrapPackage)
146+
.setPackage(wrapperUri, wrapPackage)
147147
.build();
148148

149149
const client = new PolywrapClient(config);

‎packages/client/src/__tests__/core/embedded-wrapper.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { WasmWrapper, InMemoryFileReader } from "@polywrap/wasm-js";
55
import { Wrapper } from "@polywrap/core-js";
66
import { Result, ResultErr, ResultOk } from "@polywrap/result";
77
import { PolywrapClient } from "../../PolywrapClient";
8-
import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
8+
import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
99

1010
jest.setTimeout(200000);
1111

@@ -22,9 +22,9 @@ describe("Embedded wrapper", () => {
2222
wasmModuleBuffer
2323
);
2424

25-
const config = new ClientConfigBuilder()
25+
const config = new PolywrapClientConfigBuilder()
2626
.addDefaults()
27-
.addWrapper(simpleWrapperUri, wrapper)
27+
.setWrapper(simpleWrapperUri, wrapper)
2828
.build();
2929

3030
const client = new PolywrapClient(config);
@@ -136,9 +136,9 @@ const testEmbeddedWrapperWithFile = async (
136136
filePath: string,
137137
fileText: string
138138
) => {
139-
const config = new ClientConfigBuilder()
139+
const config = new PolywrapClientConfigBuilder()
140140
.addDefaults()
141-
.addWrapper(simpleWrapperUri, wrapper)
141+
.setWrapper(simpleWrapperUri, wrapper)
142142
.build();
143143

144144
const client = new PolywrapClient(config);

‎packages/client/src/__tests__/core/error-structure.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { WrapError, WrapErrorCode } from "@polywrap/core-js";
88
import { mockPluginRegistration } from "../helpers";
99
import { msgpackDecode, msgpackEncode } from "@polywrap/msgpack-js";
1010
import {
11-
ClientConfigBuilder,
11+
PolywrapClientConfigBuilder,
1212
DefaultBundle,
1313
} from "@polywrap/client-config-builder-js";
1414

@@ -160,9 +160,9 @@ describe("Error structure", () => {
160160
});
161161

162162
test("Subinvoke error two layers deep", async () => {
163-
const config = new ClientConfigBuilder()
163+
const config = new PolywrapClientConfigBuilder()
164164
.addDefaults()
165-
.addRedirects({
165+
.setRedirects({
166166
"ens/imported-invoke.eth": asInvokeWrapperUri.uri,
167167
"ens/imported-subinvoke.eth": asSubinvokeWrapperUri.uri,
168168
});
@@ -335,9 +335,9 @@ describe("Error structure", () => {
335335
});
336336

337337
test("Subinvoke error two layers deep", async () => {
338-
const config = new ClientConfigBuilder()
338+
const config = new PolywrapClientConfigBuilder()
339339
.addDefaults()
340-
.addRedirects({
340+
.setRedirects({
341341
"ens/imported-invoke.eth": rsInvokeWrapperUri.uri,
342342
"ens/imported-subinvoke.eth": rsSubinvokeWrapperUri.uri,
343343
});
@@ -400,8 +400,8 @@ describe("Error structure", () => {
400400

401401
describe("Plugin wrapper", () => {
402402
const mockPlugin = mockPluginRegistration("plugin/mock")
403-
const config = new ClientConfigBuilder()
404-
.addDefaults().addPackage(mockPlugin.uri.uri, mockPlugin.package)
403+
const config = new PolywrapClientConfigBuilder()
404+
.addDefaults().setPackage(mockPlugin.uri.uri, mockPlugin.package)
405405
const client = new PolywrapClient(config.build());
406406
test("Invoke a plugin wrapper with malformed args", async () => {
407407
const result = await client.invoke<Uint8Array>({

‎packages/client/src/__tests__/core/sanity.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import { IUriPackage, IUriRedirect } from "@polywrap/core-js";
66
import { ResultErr } from "@polywrap/result";
77
import { StaticResolver, UriResolverLike } from "@polywrap/uri-resolvers-js";
88
import { WasmPackage } from "@polywrap/wasm-js";
9-
import { ClientConfigBuilder, DefaultBundle } from "@polywrap/client-config-builder-js";
9+
import { PolywrapClientConfigBuilder, DefaultBundle } from "@polywrap/client-config-builder-js";
1010
import { CoreClientConfig } from "@polywrap/core-js";
1111

1212
jest.setTimeout(200000);
1313

1414
describe("sanity", () => {
1515
test("default client config", () => {
1616
const clientConfig = new PolywrapClient().getConfig();
17-
const expectedConfig = new ClientConfigBuilder().add(DefaultBundle.getConfig()).build();
17+
const expectedConfig = new PolywrapClientConfigBuilder().add(DefaultBundle.getConfig()).build();
1818

1919
expect(
2020
JSON.stringify(clientConfig, null, 2)

‎packages/client/src/__tests__/core/type-test-cases.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { memoryStoragePlugin, ErrResult } from "../helpers";
22
import { PolywrapClient } from "../../PolywrapClient";
33

44
import BigNumber from "bignumber.js";
5-
import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
5+
import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
66
import { GetPathToTestWrappers } from "@polywrap/test-cases";
77

88
export const typeTestCases = (implementation: string) => {
99
describe("types test cases", () => {
1010
test(`asyncify ${implementation}`, async () => {
11-
const builder = new ClientConfigBuilder();
12-
builder.addDefaults().addPackage(
11+
const builder = new PolywrapClientConfigBuilder();
12+
builder.addDefaults().setPackage(
1313
"wrap://ens/memory-storage.polywrap.eth",
1414
memoryStoragePlugin()
1515
);

‎packages/client/src/__tests__/core/uri-resolution.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
UriResolutionResult,
66
} from "@polywrap/core-js";
77
import { Result } from "@polywrap/result";
8-
import { PolywrapClient, ClientConfigBuilder } from "../../";
8+
import { PolywrapClient, PolywrapClientConfigBuilder } from "../../";
99

1010
jest.setTimeout(200000);
1111

@@ -54,7 +54,7 @@ describe("URI resolution", () => {
5454
const fromUri = new Uri(`test/from.eth`);
5555
const redirectUri = new Uri(`test/to.eth`);
5656

57-
const config = new ClientConfigBuilder()
57+
const config = new PolywrapClientConfigBuilder()
5858
.addDefaults()
5959
.addResolver({
6060
tryResolveUri: async (uri: Uri) => {

‎packages/client/src/__tests__/core/wasm-wrapper.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Uri, PolywrapClient, IWrapPackage } from "../..";
55
import { WrapManifest } from "@polywrap/wrap-manifest-types-js";
66
import { PluginModule, PluginPackage } from "@polywrap/plugin-js";
77
import { UriResolver } from "@polywrap/uri-resolvers-js";
8-
import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
8+
import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
99
import { mockPluginRegistration, ErrResult } from "../helpers";
1010

1111
jest.setTimeout(200000);
@@ -94,10 +94,10 @@ describe("wasm-wrapper", () => {
9494
});
9595

9696
it("should invoke wrapper with custom redirects", async () => {
97-
const config = new ClientConfigBuilder()
97+
const config = new PolywrapClientConfigBuilder()
9898
.addDefaults()
99-
.addRedirect(wrapperUri.uri, "wrap://ens/mock.polywrap.eth")
100-
.addPackage("wrap://ens/mock.polywrap.eth", mockPlugin())
99+
.setRedirect(wrapperUri.uri, "wrap://ens/mock.polywrap.eth")
100+
.setPackage("wrap://ens/mock.polywrap.eth", mockPlugin())
101101
.build();
102102

103103
const client = new PolywrapClient(config);
@@ -117,7 +117,7 @@ describe("wasm-wrapper", () => {
117117
});
118118

119119
it("should allow clone + reconfigure of redirects", async () => {
120-
let builder = new ClientConfigBuilder()
120+
let builder = new PolywrapClientConfigBuilder()
121121
.add({
122122
packages: { "wrap://ens/mock.polywrap.eth": mockPlugin() },
123123
})

‎packages/client/src/__tests__/core/wrap-features/env-case.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PluginPackage } from "@polywrap/plugin-js";
22
import { RecursiveResolver } from "@polywrap/uri-resolvers-js";
33
import { PolywrapClient } from "../../../PolywrapClient";
44
import { mockPluginRegistration } from "../../helpers";
5-
import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
5+
import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
66
import { Uri, UriMap } from "@polywrap/core-js";
77
import { GetPathToTestWrappers } from "@polywrap/test-cases";
88

@@ -14,7 +14,7 @@ export const envTestCases = (implementation: string) => {
1414
const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`;
1515
const wrapperUri = Uri.from(`file/${wrapperPath}`);
1616

17-
const builder = new ClientConfigBuilder();
17+
const builder = new PolywrapClientConfigBuilder();
1818
builder.addDefaults();
1919

2020
const client = new PolywrapClient(builder.build());
@@ -51,7 +51,7 @@ export const envTestCases = (implementation: string) => {
5151
[wrapperUri.uri]: env
5252
};
5353

54-
const builder = new ClientConfigBuilder();
54+
const builder = new PolywrapClientConfigBuilder();
5555
builder
5656
.addDefaults()
5757
.addEnvs(envs);
@@ -107,7 +107,7 @@ export const envTestCases = (implementation: string) => {
107107
[wrapperUri.uri]: env
108108
};
109109

110-
const builder = new ClientConfigBuilder();
110+
const builder = new PolywrapClientConfigBuilder();
111111
builder
112112
.addDefaults()
113113
.addEnvs(envs);
@@ -127,7 +127,7 @@ export const envTestCases = (implementation: string) => {
127127
const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`;
128128
const wrapperUri = Uri.from(`file/${wrapperPath}`);
129129

130-
const builder = new ClientConfigBuilder();
130+
const builder = new PolywrapClientConfigBuilder();
131131
builder
132132
.addDefaults();
133133

@@ -179,7 +179,7 @@ export const envTestCases = (implementation: string) => {
179179
[wrapperUri.uri]: env
180180
};
181181

182-
const builder = new ClientConfigBuilder();
182+
const builder = new PolywrapClientConfigBuilder();
183183
builder
184184
.addDefaults()
185185
.addEnvs(envs);
@@ -199,7 +199,7 @@ export const envTestCases = (implementation: string) => {
199199
const wrapperPath = `${GetPathToTestWrappers()}/env-type/00-main/implementations/${implementation}`;
200200
const wrapperUri = Uri.from(`file/${wrapperPath}`);
201201

202-
const builder = new ClientConfigBuilder();
202+
const builder = new PolywrapClientConfigBuilder();
203203
builder
204204
.addDefaults();
205205

@@ -253,11 +253,11 @@ export const envTestCases = (implementation: string) => {
253253
[envUri.uri]: env
254254
};
255255

256-
const builder = new ClientConfigBuilder();
256+
const builder = new PolywrapClientConfigBuilder();
257257
builder
258258
.addDefaults()
259259
.addEnvs(envs)
260-
.addRedirect(redirectFromUri.uri, wrapperUri.uri);
260+
.setRedirect(redirectFromUri.uri, wrapperUri.uri);
261261

262262
const client = new PolywrapClient(builder.build());
263263

@@ -282,9 +282,9 @@ export const envTestCases = (implementation: string) => {
282282
const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`);
283283
const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`);
284284

285-
const builder = new ClientConfigBuilder();
285+
const builder = new PolywrapClientConfigBuilder();
286286
builder.addDefaults()
287-
.addRedirect("mock/main", subinvokedUri);
287+
.setRedirect("mock/main", subinvokedUri);
288288

289289
const client = new PolywrapClient(builder.build());
290290

@@ -322,9 +322,9 @@ export const envTestCases = (implementation: string) => {
322322
"mock/main": subinvokedEnv
323323
};
324324

325-
const builder = new ClientConfigBuilder();
325+
const builder = new PolywrapClientConfigBuilder();
326326
builder.addDefaults()
327-
.addRedirect("mock/main", subinvokedUri)
327+
.setRedirect("mock/main", subinvokedUri)
328328
.addEnvs(envs);
329329

330330
const client = new PolywrapClient(builder.build());
@@ -380,9 +380,9 @@ export const envTestCases = (implementation: string) => {
380380
"mock/main": subinvokedEnv
381381
};
382382

383-
const builder = new ClientConfigBuilder();
383+
const builder = new PolywrapClientConfigBuilder();
384384
builder.addDefaults()
385-
.addRedirect("mock/main", subinvokedUri)
385+
.setRedirect("mock/main", subinvokedUri)
386386
.addEnvs(envs);
387387

388388
const client = new PolywrapClient(builder.build());
@@ -402,9 +402,9 @@ export const envTestCases = (implementation: string) => {
402402
const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`);
403403
const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`);
404404

405-
const builder = new ClientConfigBuilder();
405+
const builder = new PolywrapClientConfigBuilder();
406406
builder.addDefaults()
407-
.addRedirect("mock/main", subinvokedUri);
407+
.setRedirect("mock/main", subinvokedUri);
408408

409409
const client = new PolywrapClient(builder.build());
410410

@@ -456,9 +456,9 @@ export const envTestCases = (implementation: string) => {
456456
"mock/main": subinvokedEnv
457457
};
458458

459-
const builder = new ClientConfigBuilder();
459+
const builder = new PolywrapClientConfigBuilder();
460460
builder.addDefaults()
461-
.addRedirect("mock/main", subinvokedUri)
461+
.setRedirect("mock/main", subinvokedUri)
462462
.addEnvs(envs);
463463

464464
const client = new PolywrapClient(builder.build());
@@ -478,9 +478,9 @@ export const envTestCases = (implementation: string) => {
478478
const { uri: subinvokerUri } = Uri.from(`file/${subinvokerPath}`);
479479
const { uri: subinvokedUri } = Uri.from(`file/${subinvokedPath}`);
480480

481-
const builder = new ClientConfigBuilder();
481+
const builder = new PolywrapClientConfigBuilder();
482482
builder.addDefaults()
483-
.addRedirect("mock/main", subinvokedUri);
483+
.setRedirect("mock/main", subinvokedUri);
484484

485485
const client = new PolywrapClient(builder.build());
486486

@@ -543,9 +543,9 @@ export const envTestCases = (implementation: string) => {
543543
"mock/main": subinvokedEnv
544544
};
545545

546-
const builder = new ClientConfigBuilder();
546+
const builder = new PolywrapClientConfigBuilder();
547547
builder.addDefaults()
548-
.addRedirect("mock/main", subinvokedUri)
548+
.setRedirect("mock/main", subinvokedUri)
549549
.addEnvs(envs);
550550

551551
const client = new PolywrapClient(builder.build());

0 commit comments

Comments
 (0)