diff --git a/packages/cli/src/__tests__/unit/jobrunner.spec.ts b/packages/cli/src/__tests__/unit/jobrunner.spec.ts index 43b775c373..7d7e94a548 100644 --- a/packages/cli/src/__tests__/unit/jobrunner.spec.ts +++ b/packages/cli/src/__tests__/unit/jobrunner.spec.ts @@ -3,13 +3,13 @@ import { buildWrapper } from "@polywrap/test-env-js"; import { testCases } from "./jobrunner-test-cases"; import { JobRunner } from "../../lib"; import path from "path"; -import { ClientConfigBuilder, CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfigBuilder, ClientConfig } from "@polywrap/client-config-builder-js"; import { Uri } from "@polywrap/core-js"; jest.setTimeout(200000); describe("workflow JobRunner", () => { - let defaultConfig: CustomClientConfig; + let defaultConfig: ClientConfig; beforeAll(async () => { await buildWrapper( diff --git a/packages/cli/src/commands/build.ts b/packages/cli/src/commands/build.ts index f3e915586c..bc01146137 100644 --- a/packages/cli/src/commands/build.ts +++ b/packages/cli/src/commands/build.ts @@ -27,7 +27,7 @@ import path from "path"; import readline from "readline"; import { PolywrapClient, Uri } from "@polywrap/client-js"; import { PolywrapManifest } from "@polywrap/polywrap-manifest-types-js"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; const defaultOutputDir = "./build"; const defaultStrategy = SupportedStrategies.VM; @@ -38,7 +38,7 @@ const pathStr = intlMsg.commands_build_options_o_path(); type BuildCommandOptions = { manifestFile: string; outputDir: string; - clientConfig: Partial>; + clientConfig: Partial>; codegen: boolean; // defaults to true watch?: boolean; strategy: SupportedStrategies; diff --git a/packages/cli/src/commands/codegen.ts b/packages/cli/src/commands/codegen.ts index b274a20719..c818d6bad9 100644 --- a/packages/cli/src/commands/codegen.ts +++ b/packages/cli/src/commands/codegen.ts @@ -21,7 +21,7 @@ import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator"; import { PolywrapClient, Uri } from "@polywrap/client-js"; import path from "path"; import fs from "fs"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; const defaultCodegenDir = "./src/wrap"; const defaultPublishDir = "./build"; @@ -34,7 +34,7 @@ type CodegenCommandOptions = { codegenDir: string; publishDir: string; script?: string; - clientConfig: Partial>; + clientConfig: Partial>; verbose?: boolean; quiet?: boolean; logFile?: string; diff --git a/packages/cli/src/commands/docgen.ts b/packages/cli/src/commands/docgen.ts index cef8dd2e71..04d0f867ae 100644 --- a/packages/cli/src/commands/docgen.ts +++ b/packages/cli/src/commands/docgen.ts @@ -20,7 +20,7 @@ import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator"; import { PolywrapClient, Uri } from "@polywrap/client-js"; import chalk from "chalk"; import { Argument } from "commander"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; const commandToPathMap: Record = { schema: schemaScriptPath, @@ -36,7 +36,7 @@ const pathStr = intlMsg.commands_codegen_options_o_path(); type DocgenCommandOptions = { manifestFile: string; docgenDir: string; - clientConfig: Partial>; + clientConfig: Partial>; imports: boolean; verbose?: boolean; quiet?: boolean; diff --git a/packages/cli/src/commands/run.ts b/packages/cli/src/commands/run.ts index c99bfa24e3..6333c3d7fe 100644 --- a/packages/cli/src/commands/run.ts +++ b/packages/cli/src/commands/run.ts @@ -22,10 +22,10 @@ import { Uri } from "@polywrap/client-js"; import path from "path"; import yaml from "yaml"; import fs from "fs"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; type WorkflowCommandOptions = { - clientConfig: Partial>; + clientConfig: Partial>; manifest: string; jobs?: string[]; validationScript?: string; diff --git a/packages/cli/src/lib/helpers/validate-client-config.ts b/packages/cli/src/lib/helpers/validate-client-config.ts index 9e3ba5ed55..af7952fe30 100644 --- a/packages/cli/src/lib/helpers/validate-client-config.ts +++ b/packages/cli/src/lib/helpers/validate-client-config.ts @@ -6,7 +6,7 @@ import { IUriRedirect, Uri, } from "@polywrap/client-js"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; export function validateRedirects( redirects: readonly IUriRedirect[] @@ -122,7 +122,7 @@ export function validateEnvs( } export function validateClientConfig( - config: Partial> + config: Partial> ): void { if (!config || typeof config !== "object") { throw new Error(intlMsg.commands_run_error_clientConfigNotObject()); diff --git a/packages/cli/src/lib/option-parsers/client-config.ts b/packages/cli/src/lib/option-parsers/client-config.ts index 590454063d..3b7064abe6 100644 --- a/packages/cli/src/lib/option-parsers/client-config.ts +++ b/packages/cli/src/lib/option-parsers/client-config.ts @@ -6,13 +6,13 @@ import { getTestEnvClientConfig } from "../test-env"; import { Uri } from "@polywrap/core-js"; import { ClientConfigBuilder, - CustomClientConfig, + ClientConfig, } from "@polywrap/client-config-builder-js"; import path from "path"; export async function parseClientConfigOption( clientConfig: string | undefined -): Promise>> { +): Promise>> { const builder = new ClientConfigBuilder().addDefaults(); try { diff --git a/packages/cli/src/lib/workflow/JobRunner.ts b/packages/cli/src/lib/workflow/JobRunner.ts index e1bd95d3e2..3ec01973a3 100644 --- a/packages/cli/src/lib/workflow/JobRunner.ts +++ b/packages/cli/src/lib/workflow/JobRunner.ts @@ -1,19 +1,19 @@ import { JobResult, Status, Step } from "./types"; import { PolywrapClient } from "@polywrap/client-js"; -import { Client, MaybeAsync, Uri } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync, Uri } from "@polywrap/core-js"; import { WorkflowJobs } from "@polywrap/polywrap-manifest-types-js"; import { ClientConfigBuilder, - CustomClientConfig, + ClientConfig, } from "@polywrap/client-config-builder-js"; export class JobRunner { private jobOutput: Map; - private client: Client; + private client: CoreClient; constructor( - private clientConfig: Partial>, + private clientConfig: Partial>, private onExecution?: (id: string, JobResult: JobResult) => MaybeAsync ) { this.jobOutput = new Map(); diff --git a/packages/cli/src/lib/workflow/types.ts b/packages/cli/src/lib/workflow/types.ts index 52ba95057c..90201501d4 100644 --- a/packages/cli/src/lib/workflow/types.ts +++ b/packages/cli/src/lib/workflow/types.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { Uri } from "@polywrap/core-js"; export interface Step { @@ -7,7 +7,7 @@ export interface Step { args?: { [k: string]: unknown; }; - config?: CustomClientConfig; + config?: ClientConfig; } export enum Status { diff --git a/packages/js/client-config-builder/src/CustomClientConfig.ts b/packages/js/client-config-builder/src/ClientConfig.ts similarity index 87% rename from packages/js/client-config-builder/src/CustomClientConfig.ts rename to packages/js/client-config-builder/src/ClientConfig.ts index 97487d12e7..ada14f129c 100644 --- a/packages/js/client-config-builder/src/CustomClientConfig.ts +++ b/packages/js/client-config-builder/src/ClientConfig.ts @@ -8,7 +8,7 @@ import { } from "@polywrap/core-js"; import { UriResolverLike } from "@polywrap/uri-resolvers-js"; -export type CustomClientConfig = { +export type ClientConfig = { readonly envs: Env[]; readonly interfaces: InterfaceImplementations[]; readonly redirects: IUriRedirect[]; diff --git a/packages/js/client-config-builder/src/ClientConfigBuilder.ts b/packages/js/client-config-builder/src/ClientConfigBuilder.ts index 851903f11f..fde7520b57 100644 --- a/packages/js/client-config-builder/src/ClientConfigBuilder.ts +++ b/packages/js/client-config-builder/src/ClientConfigBuilder.ts @@ -1,8 +1,8 @@ import { getDefaultConfig } from "./bundles"; -import { CustomClientConfig } from "./CustomClientConfig"; +import { ClientConfig } from "./ClientConfig"; import { - ClientConfig, + CoreClientConfig, Uri, IUriResolver, IUriPackage, @@ -22,7 +22,7 @@ import { import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js"; export class ClientConfigBuilder { - private _config: CustomClientConfig = { + private _config: ClientConfig = { envs: [], interfaces: [], redirects: [], @@ -31,7 +31,7 @@ export class ClientConfigBuilder { resolvers: [], }; - add(config: Partial>): ClientConfigBuilder { + add(config: Partial>): ClientConfigBuilder { if (config.envs) { this.addEnvs(config.envs); } @@ -352,14 +352,14 @@ export class ClientConfigBuilder { return this; } - build(): CustomClientConfig { + build(): ClientConfig { return this._config; } buildDefault( wrapperCache?: IWrapperCache, resolver?: IUriResolver - ): ClientConfig { + ): CoreClientConfig { return { envs: this._config.envs, interfaces: this._config.interfaces, diff --git a/packages/js/client-config-builder/src/__tests__/client-config-builder.spec.ts b/packages/js/client-config-builder/src/__tests__/client-config-builder.spec.ts index 231892d122..c27ffa4c28 100644 --- a/packages/js/client-config-builder/src/__tests__/client-config-builder.spec.ts +++ b/packages/js/client-config-builder/src/__tests__/client-config-builder.spec.ts @@ -1,6 +1,6 @@ import { ClientConfigBuilder } from "../ClientConfigBuilder"; import { - Client, + CoreClient, Env, InterfaceImplementations, Uri, @@ -22,7 +22,7 @@ class NamedUriResolver implements IUriResolver { } tryResolveUri( uri: Uri, - client: Client + client: CoreClient ): Promise> { throw new Error("Method not implemented."); } diff --git a/packages/js/client-config-builder/src/bundles/getDefaultConfig.ts b/packages/js/client-config-builder/src/bundles/getDefaultConfig.ts index f2074b999a..3706b4a263 100644 --- a/packages/js/client-config-builder/src/bundles/getDefaultConfig.ts +++ b/packages/js/client-config-builder/src/bundles/getDefaultConfig.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "../CustomClientConfig"; +import { ClientConfig } from "../ClientConfig"; import { IUriPackage, Uri } from "@polywrap/core-js"; import { ipfsPlugin } from "@polywrap/ipfs-plugin-js"; @@ -15,7 +15,7 @@ import { fileSystemPlugin } from "@polywrap/fs-plugin-js"; import { loggerPlugin } from "@polywrap/logger-plugin-js"; import { fileSystemResolverPlugin } from "@polywrap/fs-resolver-plugin-js"; -export const getDefaultConfig = (): CustomClientConfig => { +export const getDefaultConfig = (): ClientConfig => { return { envs: [ { diff --git a/packages/js/client-config-builder/src/index.ts b/packages/js/client-config-builder/src/index.ts index 14e4fd55cf..ce72c63807 100644 --- a/packages/js/client-config-builder/src/index.ts +++ b/packages/js/client-config-builder/src/index.ts @@ -1,3 +1,3 @@ export * from "./ClientConfigBuilder"; -export * from "./CustomClientConfig"; +export * from "./ClientConfig"; export * from "./bundles"; diff --git a/packages/js/client/src/PolywrapClient.ts b/packages/js/client/src/PolywrapClient.ts index 01c0f90aff..274ca06047 100644 --- a/packages/js/client/src/PolywrapClient.ts +++ b/packages/js/client/src/PolywrapClient.ts @@ -4,7 +4,7 @@ import { PolywrapClientConfig } from "./PolywrapClientConfig"; import { Wrapper, - Client, + CoreClient, Env, GetFileOptions, GetImplementationsOptions, @@ -38,7 +38,7 @@ import { Tracer, TracerConfig, TracingLevel } from "@polywrap/tracing-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; import { ClientConfigBuilder } from "@polywrap/client-config-builder-js"; -export class PolywrapClient implements Client { +export class PolywrapClient implements CoreClient { private _config: PolywrapCoreClientConfig; /** diff --git a/packages/js/client/src/PolywrapClientConfig.ts b/packages/js/client/src/PolywrapClientConfig.ts index ca875d3d48..d20f424276 100644 --- a/packages/js/client/src/PolywrapClientConfig.ts +++ b/packages/js/client/src/PolywrapClientConfig.ts @@ -1,10 +1,10 @@ import { Uri } from "@polywrap/core-js"; import { IWrapperCache } from "@polywrap/uri-resolvers-js"; import { TracerConfig } from "@polywrap/tracing-js"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; export interface PolywrapClientConfig - extends CustomClientConfig { + extends ClientConfig { readonly wrapperCache?: IWrapperCache; readonly tracerConfig?: Readonly>; } diff --git a/packages/js/client/src/PolywrapCoreClientConfig.ts b/packages/js/client/src/PolywrapCoreClientConfig.ts index 1cc24a17b4..aa5baf913c 100644 --- a/packages/js/client/src/PolywrapCoreClientConfig.ts +++ b/packages/js/client/src/PolywrapCoreClientConfig.ts @@ -1,8 +1,8 @@ -import { ClientConfig, Uri } from "@polywrap/core-js"; +import { CoreClientConfig, Uri } from "@polywrap/core-js"; import { TracerConfig } from "@polywrap/tracing-js"; export interface PolywrapCoreClientConfig< TUri extends Uri | string = Uri | string -> extends ClientConfig { +> extends CoreClientConfig { readonly tracerConfig?: Readonly>; } diff --git a/packages/js/client/src/__tests__/e2e/memory-storage.ts b/packages/js/client/src/__tests__/e2e/memory-storage.ts index 403dda6b45..0e09637aed 100644 --- a/packages/js/client/src/__tests__/e2e/memory-storage.ts +++ b/packages/js/client/src/__tests__/e2e/memory-storage.ts @@ -1,5 +1,9 @@ -import { Client } from "@polywrap/core-js"; -import { PluginFactory, PluginModule, PluginPackage } from "@polywrap/plugin-js"; +import { CoreClient } from "@polywrap/core-js"; +import { + PluginFactory, + PluginModule, + PluginPackage, +} from "@polywrap/plugin-js"; import { WrapManifest } from "@polywrap/wrap-manifest-types-js"; type NoConfig = Record; @@ -11,13 +15,16 @@ function sleep(ms: number) { export const makeMemoryStoragePlugin: PluginFactory = () => { class MemoryStoragePlugin extends PluginModule { private _value: number; - - async getData(_: {}, _client: Client): Promise { + + async getData(_: {}, _client: CoreClient): Promise { await sleep(50); return this._value; } - - async setData(args: { value: number }, _client: Client): Promise { + + async setData( + args: { value: number }, + _client: CoreClient + ): Promise { await sleep(50); this._value = args.value; return true; diff --git a/packages/js/client/src/__tests__/e2e/test-cases.ts b/packages/js/client/src/__tests__/e2e/test-cases.ts index e625046a50..eb01cfd1ff 100644 --- a/packages/js/client/src/__tests__/e2e/test-cases.ts +++ b/packages/js/client/src/__tests__/e2e/test-cases.ts @@ -1,9 +1,9 @@ -import { Client, Uri } from "../../"; +import { CoreClient, Uri } from "../../"; import { BigNumber } from "bignumber.js"; import { ErrResult } from "../utils/resultTypes"; export const runAsyncifyTest = async ( - client: Client, + client: CoreClient, wrapperUri: string ) => { const subsequentInvokes = await client.invoke({ @@ -112,15 +112,13 @@ export const runAsyncifyTest = async ( }, }); - if (!setDataWithManyStructuredArgs.ok) fail(setDataWithManyStructuredArgs.error); + if (!setDataWithManyStructuredArgs.ok) + fail(setDataWithManyStructuredArgs.error); expect(setDataWithManyStructuredArgs.value).toBeTruthy(); expect(setDataWithManyStructuredArgs.value).toBe(true); }; -export const runBigIntTypeTest = async ( - client: Client, - uri: string -) => { +export const runBigIntTypeTest = async (client: CoreClient, uri: string) => { { const response = await client.invoke({ uri, @@ -166,10 +164,7 @@ export const runBigIntTypeTest = async ( } }; -export const runBigNumberTypeTest = async ( - client: Client, - uri: string -) => { +export const runBigNumberTypeTest = async (client: CoreClient, uri: string) => { { const response = await client.invoke({ uri, @@ -217,7 +212,7 @@ export const runBigNumberTypeTest = async ( } }; -export const runBytesTypeTest = async (client: Client, uri: string) => { +export const runBytesTypeTest = async (client: CoreClient, uri: string) => { const response = await client.invoke({ uri, method: "bytesMethod", @@ -235,7 +230,7 @@ export const runBytesTypeTest = async (client: Client, uri: string) => { ); }; -export const runEnumTypesTest = async (client: Client, uri: string) => { +export const runEnumTypesTest = async (client: CoreClient, uri: string) => { let method1a = await client.invoke({ uri, method: "method1", @@ -292,11 +287,13 @@ export const runEnumTypesTest = async (client: Client, uri: string) => { }; export const runImplementationsTest = async ( - client: Client, + client: CoreClient, interfaceUri: string, implementationUri: string ) => { - const implResult = client.getImplementations(interfaceUri, { applyRedirects: false }); + const implResult = client.getImplementations(interfaceUri, { + applyRedirects: false, + }); if (!implResult.ok) fail(implResult.error); expect(implResult.value).toEqual([new Uri(implementationUri).uri]); @@ -322,7 +319,10 @@ export const runImplementationsTest = async ( }), ]); - const okResults = results.filter((x) => x.ok) as { ok: true, value: unknown }[]; + const okResults = results.filter((x) => x.ok) as { + ok: true; + value: unknown; + }[]; expect(okResults.length).toEqual(results.length); expect(okResults[0].value).toEqual({ uint8: 1, @@ -332,13 +332,15 @@ export const runImplementationsTest = async ( }; export const runGetImplementationsTest = async ( - client: Client, + client: CoreClient, aggregatorUri: string, interfaceUri: string, implementationUri: string ) => { let implUri = new Uri(implementationUri); - const implResult = client.getImplementations(interfaceUri, { applyRedirects: false }); + const implResult = client.getImplementations(interfaceUri, { + applyRedirects: false, + }); if (!implResult.ok) fail(implResult.error); expect(implResult.value).toEqual([implUri.uri]); @@ -364,10 +366,7 @@ export const runGetImplementationsTest = async ( expect(moduleMethodResult.value).toEqual("Test String 2"); }; -export const runInvalidTypesTest = async ( - client: Client, - uri: string -) => { +export const runInvalidTypesTest = async (client: CoreClient, uri: string) => { let invalidBoolIntSent = await client.invoke({ uri, method: "boolMethod", @@ -375,7 +374,7 @@ export const runInvalidTypesTest = async ( arg: 10, }, }); - invalidBoolIntSent = invalidBoolIntSent as { ok: false, error: Error }; + invalidBoolIntSent = invalidBoolIntSent as { ok: false; error: Error }; expect(invalidBoolIntSent.error).toBeTruthy(); expect(invalidBoolIntSent.error?.message).toMatch( /Property must be of type 'bool'. Found 'int'./ @@ -438,7 +437,11 @@ export const runInvalidTypesTest = async ( ); }; -export const runJsonTypeTest = async (client: Client, uri: string, testReserved: boolean = false) => { +export const runJsonTypeTest = async ( + client: CoreClient, + uri: string, + testReserved: boolean = false +) => { type Json = string; const value = JSON.stringify({ foo: "bar", bar: "bar" }); const parseResponse = await client.invoke({ @@ -465,7 +468,7 @@ export const runJsonTypeTest = async (client: Client, uri: string, testReserved: }, }); - if(!stringifyResponse.ok) fail(stringifyResponse.error); + if (!stringifyResponse.ok) fail(stringifyResponse.error); expect(stringifyResponse.value).toEqual(values.join("")); const object = { @@ -502,22 +505,25 @@ export const runJsonTypeTest = async (client: Client, uri: string, testReserved: if (testReserved) { const reserved = { const: "hello", if: true }; - const parseReservedResponse = await client.invoke<{ const: string; if: boolean }>({ + const parseReservedResponse = await client.invoke<{ + const: string; + if: boolean; + }>({ uri, method: "parseReserved", args: { - json: JSON.stringify(reserved) + json: JSON.stringify(reserved), }, }); if (!parseReservedResponse.ok) fail(parseReservedResponse.error); expect(parseReservedResponse.value).toEqual(reserved); - + const stringifyReservedResponse = await client.invoke({ uri, method: "stringifyReserved", args: { - reserved + reserved, }, }); @@ -526,10 +532,7 @@ export const runJsonTypeTest = async (client: Client, uri: string, testReserved: } }; -export const runLargeTypesTest = async ( - client: Client, - uri: string -) => { +export const runLargeTypesTest = async (client: CoreClient, uri: string) => { const largeStr = new Array(5000).join("polywrap "); const largeBytes = new Uint8Array(Buffer.from(largeStr)); const largeStrArray = []; @@ -563,10 +566,7 @@ export const runLargeTypesTest = async ( }); }; -export const runNumberTypesTest = async ( - client: Client, - uri: string -) => { +export const runNumberTypesTest = async (client: CoreClient, uri: string) => { let i8Underflow = await client.invoke({ uri, method: "i8Method", @@ -653,10 +653,7 @@ export const runNumberTypesTest = async ( ); }; -export const runObjectTypesTest = async ( - client: Client, - uri: string -) => { +export const runObjectTypesTest = async (client: CoreClient, uri: string) => { const method1a = await client.invoke({ uri, method: "method1", @@ -806,7 +803,7 @@ export const runObjectTypesTest = async ( }); }; -export const runMapTypeTest = async (client: Client, uri: string) => { +export const runMapTypeTest = async (client: CoreClient, uri: string) => { const mapClass = new Map().set("Hello", 1).set("Heyo", 50); const nestedMapClass = new Map>().set( "Nested", @@ -901,7 +898,7 @@ export const runMapTypeTest = async (client: Client, uri: string) => { }; export const runSimpleStorageTest = async ( - client: Client, + client: CoreClient, wrapperUri: string ) => { const deploy = await client.invoke({ @@ -951,7 +948,7 @@ export const runSimpleStorageTest = async ( }; export const runSimpleEnvTest = async ( - client: Client, + client: CoreClient, wrapperUri: string ) => { const getEnvResult = await client.invoke({ @@ -973,7 +970,7 @@ export const runSimpleEnvTest = async ( args: { arg: "not set", }, - env: { } + env: {}, }); getEnvNotSetResult = getEnvNotSetResult as ErrResult; expect(getEnvNotSetResult.error).toBeTruthy(); @@ -999,7 +996,7 @@ export const runSimpleEnvTest = async ( }; export const runComplexEnvs = async ( - client: Client, + client: CoreClient, wrapperUri: string ) => { const methodRequireEnvResult = await client.invoke({ @@ -1065,7 +1062,8 @@ export const runComplexEnvs = async ( arg: "string", }, }); - if (!methodRequireEnvModuleTimeResult.ok) fail(methodRequireEnvModuleTimeResult.error); + if (!methodRequireEnvModuleTimeResult.ok) + fail(methodRequireEnvModuleTimeResult.error); expect(methodRequireEnvModuleTimeResult.value).toEqual({ str: "string", optFilledStr: "optional string", @@ -1099,7 +1097,7 @@ export const runComplexEnvs = async ( bool: true, en: "FIRST", array: [32, 23], - } + }, }); if (!mockUpdatedEnvResult.ok) fail(mockUpdatedEnvResult.error); expect(mockUpdatedEnvResult.value).toEqual({ @@ -1120,17 +1118,14 @@ export const runComplexEnvs = async ( }); }; -export const runSubinvokeTest = async ( - client: PolywrapClient, - uri: string, -) => { +export const runSubinvokeTest = async (client: PolywrapClient, uri: string) => { { const response = await client.invoke({ uri, method: "add", args: { a: 1, - b: 2 + b: 2, }, }); @@ -1138,4 +1133,4 @@ export const runSubinvokeTest = async ( expect(response.value).toBeTruthy(); expect(response.value).toEqual(3); } -}; \ No newline at end of file +}; diff --git a/packages/js/core/src/types/Client.ts b/packages/js/core/src/types/CoreClient.ts similarity index 91% rename from packages/js/core/src/types/Client.ts rename to packages/js/core/src/types/CoreClient.ts index 5948a3f9df..f6a72cd853 100644 --- a/packages/js/core/src/types/Client.ts +++ b/packages/js/core/src/types/CoreClient.ts @@ -6,14 +6,14 @@ import { Uri, InterfaceImplementations, Env, -} from "./"; +} from "."; import { IUriResolver } from "../uri-resolution"; import { UriResolverHandler } from "./UriResolver"; import { WrapManifest } from "@polywrap/wrap-manifest-types-js"; import { Result } from "@polywrap/result"; -export interface ClientConfig { +export interface CoreClientConfig { readonly redirects?: Readonly[]>; readonly interfaces?: Readonly[]>; readonly envs?: Readonly[]>; @@ -33,12 +33,12 @@ export interface GetImplementationsOptions { applyRedirects?: boolean; } -export interface Client +export interface CoreClient extends Invoker, QueryHandler, SubscriptionHandler, UriResolverHandler { - getConfig(): ClientConfig; + getConfig(): CoreClientConfig; getRedirects(): readonly IUriRedirect[] | undefined; diff --git a/packages/js/core/src/types/index.ts b/packages/js/core/src/types/index.ts index 99cef6b5ac..462080bc83 100644 --- a/packages/js/core/src/types/index.ts +++ b/packages/js/core/src/types/index.ts @@ -1,5 +1,5 @@ export * from "./Wrapper"; -export * from "./Client"; +export * from "./CoreClient"; export * from "./Invoke"; export * from "./MaybeAsync"; export * from "./Query"; diff --git a/packages/js/core/src/uri-resolution/IUriResolver.ts b/packages/js/core/src/uri-resolution/IUriResolver.ts index 0a2aea76ae..f714219241 100644 --- a/packages/js/core/src/uri-resolution/IUriResolver.ts +++ b/packages/js/core/src/uri-resolution/IUriResolver.ts @@ -1,4 +1,4 @@ -import { Uri, Client } from ".."; +import { Uri, CoreClient } from ".."; import { IUriResolutionContext } from "./IUriResolutionContext"; import { UriPackageOrWrapper } from "./UriPackageOrWrapper"; @@ -7,7 +7,7 @@ import { Result } from "@polywrap/result"; export interface IUriResolver { tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise>; } diff --git a/packages/js/core/src/utils/getEnvFromUriHistory.ts b/packages/js/core/src/utils/getEnvFromUriHistory.ts index d128bcbeb4..6266e5475a 100644 --- a/packages/js/core/src/utils/getEnvFromUriHistory.ts +++ b/packages/js/core/src/utils/getEnvFromUriHistory.ts @@ -1,8 +1,8 @@ -import { Uri, Client, Env } from "../types"; +import { Uri, CoreClient, Env } from "../types"; export const getEnvFromUriHistory = ( uriHistory: Uri[], - client: Client + client: CoreClient ): Env | undefined => { for (const uri of uriHistory) { const env = client.getEnvByUri(uri); diff --git a/packages/js/plugin/src/PluginMethod.ts b/packages/js/plugin/src/PluginMethod.ts index 8138d06599..0e4fd77675 100644 --- a/packages/js/plugin/src/PluginMethod.ts +++ b/packages/js/plugin/src/PluginMethod.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; /** * Invocable plugin method. @@ -12,4 +12,4 @@ import { Client, MaybeAsync } from "@polywrap/core-js"; export type PluginMethod< TArgs extends Record = Record, TResult = unknown -> = (args: TArgs, client: Client) => MaybeAsync; +> = (args: TArgs, client: CoreClient) => MaybeAsync; diff --git a/packages/js/plugin/src/PluginModule.ts b/packages/js/plugin/src/PluginModule.ts index e86e645d43..739f0ff7f3 100644 --- a/packages/js/plugin/src/PluginModule.ts +++ b/packages/js/plugin/src/PluginModule.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { PluginMethod } from "./PluginMethod"; -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; export abstract class PluginModule< @@ -33,7 +33,7 @@ export abstract class PluginModule< >( method: string, args: TArgs, - client: Client + client: CoreClient ): Promise> { const fn = this.getMethod(method); diff --git a/packages/js/plugin/src/PluginWrapper.ts b/packages/js/plugin/src/PluginWrapper.ts index 4f62aa172e..b1540953e4 100644 --- a/packages/js/plugin/src/PluginWrapper.ts +++ b/packages/js/plugin/src/PluginWrapper.ts @@ -2,7 +2,7 @@ import { PluginModule } from "./PluginModule"; import { Wrapper, - Client, + CoreClient, InvokeOptions, InvocableResult, Uri, @@ -42,7 +42,7 @@ export class PluginWrapper implements Wrapper { @Tracer.traceMethod("PluginWrapper: invoke", TracingLevel.High) public async invoke( options: InvokeOptions, - client: Client + client: CoreClient ): Promise> { Tracer.setAttribute( "label", diff --git a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts index 2add3f36dd..665e264fff 100644 --- a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts +++ b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts @@ -4,7 +4,7 @@ import { PluginMethod } from "../PluginMethod"; import { PluginModule } from "../PluginModule"; import { GetPluginMethodsFunc } from "./GetPluginMethodsFunc"; -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import { Result, ResultOk } from "@polywrap/result"; export class PluginModuleWithMethods< @@ -20,7 +20,7 @@ export class PluginModuleWithMethods< >( method: string, args: TArgs, - client: Client + client: CoreClient ): Promise> { const fn = this.getMethod(method); diff --git a/packages/js/plugins/ethereum/src/__tests__/e2e.spec.ts b/packages/js/plugins/ethereum/src/__tests__/e2e.spec.ts index 9fa4851674..b93a5ab56f 100644 --- a/packages/js/plugins/ethereum/src/__tests__/e2e.spec.ts +++ b/packages/js/plugins/ethereum/src/__tests__/e2e.spec.ts @@ -2,7 +2,7 @@ import * as Schema from "../wrap"; import { PolywrapClient, Uri } from "@polywrap/client-js"; -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { initTestEnvironment, stopTestEnvironment, @@ -52,7 +52,7 @@ describe("Ethereum Plugin", () => { let ensAddress: string; let resolverAddress: string; let registrarAddress: string; - let defaultConfig: Partial>; + let defaultConfig: Partial>; let viewMethodsAddress: string; const signer = "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"; diff --git a/packages/js/plugins/ethereum/src/__tests__/helpers/getDefaultConfig.ts b/packages/js/plugins/ethereum/src/__tests__/helpers/getDefaultConfig.ts index 77c06db332..e7382166dd 100644 --- a/packages/js/plugins/ethereum/src/__tests__/helpers/getDefaultConfig.ts +++ b/packages/js/plugins/ethereum/src/__tests__/helpers/getDefaultConfig.ts @@ -5,12 +5,12 @@ import { ethereumPlugin, Connections } from "../.."; import { providers } from "@polywrap/test-env-js"; import { defaultIpfsProviders, - CustomClientConfig, + ClientConfig, } from "@polywrap/client-config-builder-js"; export const getDefaultConfig = ( connections: Connections -): Partial> => { +): Partial> => { return { envs: [ { diff --git a/packages/js/plugins/ethereum/src/index.ts b/packages/js/plugins/ethereum/src/index.ts index dc559b1d29..a6f95bb920 100644 --- a/packages/js/plugins/ethereum/src/index.ts +++ b/packages/js/plugins/ethereum/src/index.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, Module, Args_callContractView, Args_callContractStatic, @@ -64,7 +64,7 @@ export class EthereumPlugin extends Module { async callContractView( args: Args_callContractView, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const abi = constructAbi(args.method); @@ -76,7 +76,7 @@ export class EthereumPlugin extends Module { async callContractStatic( args: Args_callContractStatic, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const abi = constructAbi(args.method); @@ -110,7 +110,10 @@ export class EthereumPlugin extends Module { } } - async getBalance(args: Args_getBalance, _client: Client): Promise { + async getBalance( + args: Args_getBalance, + _client: CoreClient + ): Promise { const connection = await this._getConnection(args.connection); return ( await connection @@ -121,14 +124,14 @@ export class EthereumPlugin extends Module { async encodeParams( args: Args_encodeParams, - _client: Client + _client: CoreClient ): Promise { return defaultAbiCoder.encode(args.types, parseArgs(args.values)); } async encodeFunction( args: Args_encodeFunction, - _client: Client + _client: CoreClient ): Promise { const functionInterface = ethers.Contract.getInterface([args.method]); return functionInterface.encodeFunctionData( @@ -139,28 +142,28 @@ export class EthereumPlugin extends Module { async solidityPack( args: Args_solidityPack, - _client: Client + _client: CoreClient ): Promise { return ethers.utils.solidityPack(args.types, parseArgs(args.values)); } async solidityKeccak256( args: Args_solidityKeccak256, - _client: Client + _client: CoreClient ): Promise { return ethers.utils.solidityKeccak256(args.types, parseArgs(args.values)); } async soliditySha256( args: Args_soliditySha256, - _client: Client + _client: CoreClient ): Promise { return ethers.utils.soliditySha256(args.types, parseArgs(args.values)); } async getSignerAddress( args: Args_getSignerAddress, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); return await connection.getSigner().getAddress(); @@ -168,7 +171,7 @@ export class EthereumPlugin extends Module { async getSignerBalance( args: Args_getSignerBalance, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); return ( @@ -178,7 +181,7 @@ export class EthereumPlugin extends Module { async getSignerTransactionCount( args: Args_getSignerTransactionCount, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); return ( @@ -188,14 +191,17 @@ export class EthereumPlugin extends Module { ).toString(); } - async getGasPrice(args: Args_getGasPrice, _client: Client): Promise { + async getGasPrice( + args: Args_getGasPrice, + _client: CoreClient + ): Promise { const connection = await this._getConnection(args.connection); return (await connection.getSigner().getGasPrice()).toString(); } async estimateTransactionGas( args: Args_estimateTransactionGas, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); return ( @@ -205,7 +211,7 @@ export class EthereumPlugin extends Module { async estimateContractCallGas( args: Args_estimateContractCallGas, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const abi = constructAbi(args.method); @@ -227,7 +233,7 @@ export class EthereumPlugin extends Module { async checkAddress( args: Args_checkAddress, - _client: Client + _client: CoreClient ): Promise { let address = args.address; @@ -248,19 +254,19 @@ export class EthereumPlugin extends Module { } } - async toWei(args: Args_toWei, _client: Client): Promise { + async toWei(args: Args_toWei, _client: CoreClient): Promise { const weiAmount = ethers.utils.parseEther(args.eth); return weiAmount.toString(); } - async toEth(args: Args_toEth, _client: Client): Promise { + async toEth(args: Args_toEth, _client: CoreClient): Promise { const etherAmount = ethers.utils.formatEther(args.wei); return etherAmount.toString(); } async waitForEvent( args: Args_waitForEvent, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const abi = constructAbi(args.event); @@ -293,7 +299,7 @@ export class EthereumPlugin extends Module { async awaitTransaction( args: Args_awaitTransaction, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const provider = connection.getProvider(); @@ -307,7 +313,10 @@ export class EthereumPlugin extends Module { return Mapping.toTxReceipt(res); } - async getNetwork(args: Args_getNetwork, _client: Client): Promise { + async getNetwork( + args: Args_getNetwork, + _client: CoreClient + ): Promise { const connection = await this._getConnection(args.connection); const provider = connection.getProvider(); const network = await provider.getNetwork(); @@ -320,7 +329,7 @@ export class EthereumPlugin extends Module { async requestAccounts( args: Args_requestAccounts, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const provider = connection.getProvider(); @@ -329,7 +338,7 @@ export class EthereumPlugin extends Module { public async callContractMethod( args: Args_callContractMethod, - _client: Client + _client: CoreClient ): Promise { const res = await this._callContractMethod(args); return Mapping.toTxResponse(res); @@ -337,7 +346,7 @@ export class EthereumPlugin extends Module { public async callContractMethodAndWait( args: Args_callContractMethodAndWait, - _client: Client + _client: CoreClient ): Promise { const response = await this._callContractMethod(args); const res = await response.wait(); @@ -346,7 +355,7 @@ export class EthereumPlugin extends Module { public async sendTransaction( args: Args_sendTransaction, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const signer = connection.getSigner(); @@ -356,7 +365,7 @@ export class EthereumPlugin extends Module { public async sendTransactionAndWait( args: Args_sendTransactionAndWait, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const signer = connection.getSigner(); @@ -369,7 +378,7 @@ export class EthereumPlugin extends Module { public async deployContract( args: Args_deployContract, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); const signer = connection.getSigner(); @@ -382,13 +391,16 @@ export class EthereumPlugin extends Module { public async signMessage( args: Args_signMessage, - _client: Client + _client: CoreClient ): Promise { const connection = await this._getConnection(args.connection); return await connection.getSigner().signMessage(args.message); } - public async sendRPC(args: Args_sendRPC, _client: Client): Promise { + public async sendRPC( + args: Args_sendRPC, + _client: CoreClient + ): Promise { const connection = await this._getConnection(args.connection); const provider = connection.getProvider(); const response = await provider.send(args.method, args.params); diff --git a/packages/js/plugins/file-system/src/index.ts b/packages/js/plugins/file-system/src/index.ts index fbb948f088..0f02710860 100644 --- a/packages/js/plugins/file-system/src/index.ts +++ b/packages/js/plugins/file-system/src/index.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, Module, manifest, Args_readFile, @@ -18,7 +18,10 @@ import { PluginFactory, PluginPackage } from "@polywrap/plugin-js"; type NoConfig = Record; export class FileSystemPlugin extends Module { - async readFile(args: Args_readFile, _client: Client): Promise { + async readFile( + args: Args_readFile, + _client: CoreClient + ): Promise { return fs.promises .readFile(args.path) .then((buffer) => new Uint8Array(buffer)); @@ -26,27 +29,27 @@ export class FileSystemPlugin extends Module { async readFileAsString( args: Args_readFileAsString, - _client: Client + _client: CoreClient ): Promise { return fs.promises.readFile(args.path, { encoding: fileSystemEncodingToBufferEncoding(args.encoding), }); } - async exists(args: Args_exists, _client: Client): Promise { + async exists(args: Args_exists, _client: CoreClient): Promise { return fs.existsSync(args.path); } async writeFile( args: Args_writeFile, - _client: Client + _client: CoreClient ): Promise { await fs.promises.writeFile(args.path, Buffer.from(args.data)); return true; } - async mkdir(args: Args_mkdir, _client: Client): Promise { + async mkdir(args: Args_mkdir, _client: CoreClient): Promise { await fs.promises.mkdir(args.path, { recursive: args.recursive ?? false, }); @@ -54,7 +57,7 @@ export class FileSystemPlugin extends Module { return true; } - async rm(args: Args_rm, _client: Client): Promise { + async rm(args: Args_rm, _client: CoreClient): Promise { await fs.promises.rm(args.path, { recursive: args.recursive ?? false, force: args.force ?? false, @@ -63,7 +66,7 @@ export class FileSystemPlugin extends Module { return true; } - async rmdir(args: Args_rmdir, _client: Client): Promise { + async rmdir(args: Args_rmdir, _client: CoreClient): Promise { await fs.promises.rmdir(args.path); return true; diff --git a/packages/js/plugins/http/src/__tests__/unit/index.test.ts b/packages/js/plugins/http/src/__tests__/unit/index.test.ts index 43a9afa90d..2157ccc202 100644 --- a/packages/js/plugins/http/src/__tests__/unit/index.test.ts +++ b/packages/js/plugins/http/src/__tests__/unit/index.test.ts @@ -1,5 +1,5 @@ import { HttpPlugin } from "../.."; -import { Http_ResponseTypeEnum, Client } from "../../wrap"; +import { Http_ResponseTypeEnum, CoreClient } from "../../wrap"; import axios, { AxiosResponse, AxiosRequestConfig } from "axios"; @@ -42,7 +42,7 @@ describe("test http plugin", () => { responseType: Http_ResponseTypeEnum.TEXT, }, }, - {} as Client + {} as CoreClient ); expect(mockedAxios.get).lastCalledWith("/api/test", { @@ -85,7 +85,7 @@ describe("test http plugin", () => { responseType: "BINARY", }, }, - {} as Client + {} as CoreClient ); expect(mockedAxios.get).lastCalledWith("/api/test", { @@ -138,7 +138,7 @@ describe("test http plugin", () => { responseType: "TEXT", }, }, - {} as Client + {} as CoreClient ); expect(mockedAxios.post).lastCalledWith("/api/test", "{request: 1001}", { @@ -182,7 +182,7 @@ describe("test http plugin", () => { responseType: "BINARY", }, }, - {} as Client + {} as CoreClient ); expect(mockedAxios.post).lastCalledWith("/api/test", "{request: 1001}", { diff --git a/packages/js/plugins/http/src/index.ts b/packages/js/plugins/http/src/index.ts index e9d79dc315..ce1b573d42 100644 --- a/packages/js/plugins/http/src/index.ts +++ b/packages/js/plugins/http/src/index.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, Module, Args_get, Args_post, @@ -16,7 +16,7 @@ type NoConfig = Record; export class HttpPlugin extends Module { public async get( args: Args_get, - _client: Client + _client: CoreClient ): Promise { const response = await axios.get( args.url, @@ -27,7 +27,7 @@ export class HttpPlugin extends Module { public async post( args: Args_post, - _client: Client + _client: CoreClient ): Promise { const response = await axios.post( args.url, diff --git a/packages/js/plugins/ipfs/src/__tests__/e2e.spec.ts b/packages/js/plugins/ipfs/src/__tests__/e2e.spec.ts index 5c037591a0..9f6d647522 100644 --- a/packages/js/plugins/ipfs/src/__tests__/e2e.spec.ts +++ b/packages/js/plugins/ipfs/src/__tests__/e2e.spec.ts @@ -6,17 +6,20 @@ import { } from "@polywrap/test-env-js"; import { Ipfs_Module } from "../wrap"; -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import { ResultOk } from "@polywrap/result"; import { PolywrapClient } from "@polywrap/client-js"; -import createIpfsClient, { IpfsClient, IpfsFileInfo } from "@polywrap/ipfs-http-client-lite"; +import createIpfsClient, { + IpfsClient, + IpfsFileInfo, +} from "@polywrap/ipfs-http-client-lite"; import { UriResolver } from "@polywrap/uri-resolvers-js"; import { ipfsPlugin } from ".."; jest.setTimeout(300000); describe("IPFS Plugin", () => { - let client: Client; + let client: CoreClient; let ipfs: IpfsClient; const sampleFileTextContents = "Hello World!"; diff --git a/packages/js/plugins/ipfs/src/index.ts b/packages/js/plugins/ipfs/src/index.ts index c6f0c5074f..0221442b93 100644 --- a/packages/js/plugins/ipfs/src/index.ts +++ b/packages/js/plugins/ipfs/src/index.ts @@ -10,14 +10,14 @@ import { execSimple, execFallbacks } from "./utils/exec"; import { ExecOptions } from "./ExecOptions"; import { getExecOptions } from "./getExecOptions"; -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import createIpfsClient, { IpfsClient } from "@polywrap/ipfs-http-client-lite"; import { PluginFactory, PluginPackage } from "@polywrap/plugin-js"; export type NoConfig = Record; export class IpfsPlugin extends Module { - public async cat(args: Args_cat, _client: Client): Promise { + public async cat(args: Args_cat, _client: CoreClient): Promise { const options = getExecOptions(args.options, this.env); return await this._execWithOptions( @@ -31,7 +31,7 @@ export class IpfsPlugin extends Module { public async resolve( args: Args_resolve, - _client: Client + _client: CoreClient ): Promise { const options = getExecOptions(args.options, this.env); diff --git a/packages/js/plugins/uri-resolvers/ens-resolver/src/index.ts b/packages/js/plugins/uri-resolvers/ens-resolver/src/index.ts index e081af3f76..53f6c37c06 100644 --- a/packages/js/plugins/uri-resolvers/ens-resolver/src/index.ts +++ b/packages/js/plugins/uri-resolvers/ens-resolver/src/index.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, Module, Args_tryResolveUri, Args_getFile, @@ -38,7 +38,7 @@ export class EnsResolverPlugin extends Module { async tryResolveUri( args: Args_tryResolveUri, - client: Client + client: CoreClient ): Promise { if (args.authority !== "ens") { return null; @@ -63,11 +63,11 @@ export class EnsResolverPlugin extends Module { return { uri: null, manifest: null }; } - getFile(_args: Args_getFile, _client: Client): Bytes | null { + getFile(_args: Args_getFile, _client: CoreClient): Bytes | null { return null; } - async ensToCID(domain: string, client: Client): Promise { + async ensToCID(domain: string, client: CoreClient): Promise { const ensAbi = { resolver: "function resolver(bytes32 node) external view returns (address)", diff --git a/packages/js/plugins/uri-resolvers/file-system-resolver/src/index.ts b/packages/js/plugins/uri-resolvers/file-system-resolver/src/index.ts index 42803f4c14..d497102c08 100644 --- a/packages/js/plugins/uri-resolvers/file-system-resolver/src/index.ts +++ b/packages/js/plugins/uri-resolvers/file-system-resolver/src/index.ts @@ -1,6 +1,6 @@ import { Bytes, - Client, + CoreClient, FileSystem_Module, Args_getFile, Args_tryResolveUri, @@ -17,7 +17,7 @@ type NoConfig = Record; export class FileSystemResolverPlugin extends Module { async tryResolveUri( args: Args_tryResolveUri, - _client: Client + _client: CoreClient ): Promise { if (args.authority !== "fs" && args.authority !== "file") { return null; @@ -52,7 +52,10 @@ export class FileSystemResolverPlugin extends Module { return { uri: null, manifest }; } - async getFile(args: Args_getFile, _client: Client): Promise { + async getFile( + args: Args_getFile, + _client: CoreClient + ): Promise { try { const fileResult = await FileSystem_Module.readFile( { path: args.path }, diff --git a/packages/js/plugins/uri-resolvers/http-resolver/src/index.ts b/packages/js/plugins/uri-resolvers/http-resolver/src/index.ts index 8c13313d57..e8b684a834 100644 --- a/packages/js/plugins/uri-resolvers/http-resolver/src/index.ts +++ b/packages/js/plugins/uri-resolvers/http-resolver/src/index.ts @@ -2,7 +2,7 @@ import { Args_getFile, Args_tryResolveUri, Bytes, - Client, + CoreClient, Http_Module, manifest, Module, @@ -17,7 +17,7 @@ export class HttpResolverPlugin extends Module { // uri-resolver.core.polywrap.eth public async tryResolveUri( args: Args_tryResolveUri, - _client: Client + _client: CoreClient ): Promise { if (args.authority !== "http" && args.authority !== "https") { return null; @@ -55,7 +55,7 @@ export class HttpResolverPlugin extends Module { public async getFile( args: Args_getFile, - client: Client + client: CoreClient ): Promise { try { const resolveResult = await Http_Module.get( diff --git a/packages/js/plugins/uri-resolvers/ipfs-resolver/src/index.ts b/packages/js/plugins/uri-resolvers/ipfs-resolver/src/index.ts index 63f727fb4f..840ee85ea1 100644 --- a/packages/js/plugins/uri-resolvers/ipfs-resolver/src/index.ts +++ b/packages/js/plugins/uri-resolvers/ipfs-resolver/src/index.ts @@ -2,7 +2,7 @@ import { Args_getFile, Args_tryResolveUri, Bytes, - Client, + CoreClient, Ipfs_Module, manifest, Module, @@ -18,7 +18,7 @@ export class IpfsResolverPlugin extends Module { // uri-resolver.core.polywrap.eth public async tryResolveUri( args: Args_tryResolveUri, - _client: Client + _client: CoreClient ): Promise { if (args.authority !== "ipfs") { return null; @@ -58,7 +58,7 @@ export class IpfsResolverPlugin extends Module { public async getFile( args: Args_getFile, - client: Client + client: CoreClient ): Promise { try { let provider: string | undefined = undefined; diff --git a/packages/js/plugins/ws/src/__tests__/e2e/e2e.spec.ts b/packages/js/plugins/ws/src/__tests__/e2e/e2e.spec.ts index bc38a0fe70..e9dba64183 100644 --- a/packages/js/plugins/ws/src/__tests__/e2e/e2e.spec.ts +++ b/packages/js/plugins/ws/src/__tests__/e2e/e2e.spec.ts @@ -3,7 +3,7 @@ import { Message } from "../../wrap"; import WS from "jest-websocket-mock"; import { PolywrapClient } from "@polywrap/client-js" -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import { UriResolver } from "@polywrap/uri-resolvers-js"; import { PluginPackage } from "@polywrap/plugin-js"; @@ -138,7 +138,7 @@ describe("WebSocket plugin", () => { setup(); const callbackPlugin = PluginPackage.from(() => ({ - callback(args: { data: string }, _client: Client): void { + callback(args: { data: string }, _client: CoreClient): void { msgs.push(args.data); }, })); diff --git a/packages/js/plugins/ws/src/__tests__/e2e/integration.spec.ts b/packages/js/plugins/ws/src/__tests__/e2e/integration.spec.ts index 7cb17a83aa..0fc1c90cde 100644 --- a/packages/js/plugins/ws/src/__tests__/e2e/integration.spec.ts +++ b/packages/js/plugins/ws/src/__tests__/e2e/integration.spec.ts @@ -1,4 +1,4 @@ -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; import { buildWrapper } from "@polywrap/test-env-js"; import WS from "jest-websocket-mock"; import { PluginPackage } from "@polywrap/plugin-js"; @@ -8,7 +8,7 @@ jest.setTimeout(360000); describe("e2e tests for WsPlugin", () => { describe("integration", () => { - let client: Client; + let client: CoreClient; let server: WS; const wrapperPath = `${__dirname}/integration`; @@ -46,15 +46,17 @@ describe("e2e tests for WsPlugin", () => { let msgs: string[] = []; const memoryPlugin = PluginPackage.from(() => ({ - callback(args: { data: string }, _client: Client): void { + callback(args: { data: string }, _client: CoreClient): void { msgs.push(args.data); }, })); - client = getClient([{ - uri: "wrap://ens/memory.polywrap.eth", - package: memoryPlugin, - }]); + client = getClient([ + { + uri: "wrap://ens/memory.polywrap.eth", + package: memoryPlugin, + }, + ]); await client.invoke({ uri, @@ -83,11 +85,14 @@ describe("e2e tests for WsPlugin", () => { let value: Record = {}; const memoryPlugin = PluginPackage.from(() => ({ - set(args: { key: string; value: string }, _client: Client): boolean { + set( + args: { key: string; value: string }, + _client: CoreClient + ): boolean { value[args.key] = args.value; return true; }, - get(args: { key: string }, _client: Client): string | null { + get(args: { key: string }, _client: CoreClient): string | null { return value[args.key] ?? null; }, })); diff --git a/packages/js/plugins/ws/src/index.ts b/packages/js/plugins/ws/src/index.ts index 8576c010b8..9eac814330 100644 --- a/packages/js/plugins/ws/src/index.ts +++ b/packages/js/plugins/ws/src/index.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, Module, Message, Callback, @@ -24,7 +24,7 @@ export class WsPlugin extends Module { private _caches: Record = {}; private _mutex = true; - public async open(args: Args_open, _client: Client): Promise { + public async open(args: Args_open, _client: CoreClient): Promise { const id = this._sockets.length; const socket = new WebSocket(args.url); this._sockets.push(socket); @@ -40,7 +40,7 @@ export class WsPlugin extends Module { }); } - public async close(args: Args_close, _client: Client): Promise { + public async close(args: Args_close, _client: CoreClient): Promise { this._sockets[args.id].close(); return await new Promise((resolve) => { this._sockets[args.id].onclose = () => { @@ -49,12 +49,12 @@ export class WsPlugin extends Module { }); } - public send(args: Args_send, _client: Client): boolean { + public send(args: Args_send, _client: CoreClient): boolean { this._sockets[args.id].send(args.message); return true; } - public addCallback(args: Args_addCallback, _client: Client): boolean { + public addCallback(args: Args_addCallback, _client: CoreClient): boolean { const callbackId = this._callbackId(args.callback); this._callbacks[callbackId] = async (msg) => { await _client.invoke<{ callback: boolean }>({ @@ -70,7 +70,10 @@ export class WsPlugin extends Module { return true; } - public removeCallback(args: Args_removeCallback, _client: Client): boolean { + public removeCallback( + args: Args_removeCallback, + _client: CoreClient + ): boolean { const callbackId = this._callbackId(args.callback); this._sockets[args.id].removeEventListener( "message", @@ -79,7 +82,7 @@ export class WsPlugin extends Module { return true; } - public addCache(args: Args_addCache, _client: Client): boolean { + public addCache(args: Args_addCache, _client: CoreClient): boolean { const callback = { uri: args.id.toString(), method: "cache" }; const callbackId = this._callbackId(callback); this._caches[args.id] = []; @@ -103,7 +106,7 @@ export class WsPlugin extends Module { return true; } - public removeCache(args: Args_removeCache, _client: Client): boolean { + public removeCache(args: Args_removeCache, _client: CoreClient): boolean { const callback = { uri: args.id.toString(), method: "cache" }; const callbackId = this._callbackId(callback); this._sockets[args.id].removeEventListener( @@ -115,7 +118,7 @@ export class WsPlugin extends Module { public async receive( args: Args_receive, - _client: Client + _client: CoreClient ): Promise { return await new Promise((resolve) => { let interval: ReturnType; diff --git a/packages/js/uri-resolver-extensions/src/ExtendableUriResolver.ts b/packages/js/uri-resolver-extensions/src/ExtendableUriResolver.ts index 4b2f400069..27fba53da5 100644 --- a/packages/js/uri-resolver-extensions/src/ExtendableUriResolver.ts +++ b/packages/js/uri-resolver-extensions/src/ExtendableUriResolver.ts @@ -2,7 +2,7 @@ import { UriResolverWrapper } from "./UriResolverWrapper"; import { Uri, - Client, + CoreClient, IUriResolver, getImplementations, coreInterfaceUris, @@ -15,10 +15,7 @@ import { UriResolutionResult, } from "@polywrap/uri-resolvers-js"; -export class ExtendableUriResolver extends UriResolverAggregatorBase< - Error, - Error -> { +export class ExtendableUriResolver extends UriResolverAggregatorBase { private readonly resolverName: string; constructor(resolverName?: string) { @@ -28,7 +25,7 @@ export class ExtendableUriResolver extends UriResolverAggregatorBase< async getUriResolvers( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise[], Error>> { const getImplementationsResult = getImplementations( @@ -52,7 +49,7 @@ export class ExtendableUriResolver extends UriResolverAggregatorBase< async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { const result = await this.getUriResolvers(uri, client, resolutionContext); diff --git a/packages/js/uri-resolver-extensions/src/ResolverExtensionLoader.ts b/packages/js/uri-resolver-extensions/src/ResolverExtensionLoader.ts index efc2c12d6e..bdb9caa397 100644 --- a/packages/js/uri-resolver-extensions/src/ResolverExtensionLoader.ts +++ b/packages/js/uri-resolver-extensions/src/ResolverExtensionLoader.ts @@ -1,10 +1,15 @@ -import { Uri, Client, Wrapper, IUriResolutionContext } from "@polywrap/core-js"; +import { + Uri, + CoreClient, + Wrapper, + IUriResolutionContext, +} from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; export const loadResolverExtension = async ( currentUri: Uri, resolverExtensionUri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> => { const result = await client.tryResolveUri({ diff --git a/packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts b/packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts index 4152a907c6..b367d8df4d 100644 --- a/packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts +++ b/packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts @@ -1,5 +1,5 @@ import { - Client, + CoreClient, combinePaths, InvokeOptions, InvokeResult, @@ -14,7 +14,7 @@ export class UriResolverExtensionFileReader implements IFileReader { constructor( private readonly resolverExtensionUri: Uri, private readonly wrapperUri: Uri, - private readonly client: Client + private readonly client: CoreClient ) {} async readFile(filePath: string): Promise> { diff --git a/packages/js/uri-resolver-extensions/src/UriResolverWrapper.ts b/packages/js/uri-resolver-extensions/src/UriResolverWrapper.ts index f9ef84f963..ba7ed50958 100644 --- a/packages/js/uri-resolver-extensions/src/UriResolverWrapper.ts +++ b/packages/js/uri-resolver-extensions/src/UriResolverWrapper.ts @@ -3,7 +3,7 @@ import { loadResolverExtension } from "./ResolverExtensionLoader"; import { Uri, - Client, + CoreClient, UriResolverInterface, IUriResolutionContext, UriPackageOrWrapper, @@ -26,7 +26,7 @@ export class UriResolverWrapper extends ResolverWithHistory { protected async _tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { const result = await tryResolveUriWithImplementation( @@ -60,7 +60,7 @@ export class UriResolverWrapper extends ResolverWithHistory { const tryResolveUriWithImplementation = async ( uri: Uri, implementationUri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise< Result diff --git a/packages/js/uri-resolvers/src/aggregator/UriResolverAggregator.ts b/packages/js/uri-resolvers/src/aggregator/UriResolverAggregator.ts index 87caf7d7bf..dc7123501b 100644 --- a/packages/js/uri-resolvers/src/aggregator/UriResolverAggregator.ts +++ b/packages/js/uri-resolvers/src/aggregator/UriResolverAggregator.ts @@ -2,16 +2,16 @@ import { UriResolverAggregatorBase } from "./UriResolverAggregatorBase"; import { UriResolver, UriResolverLike } from "../helpers"; import { Result, ResultOk } from "@polywrap/result"; -import { IUriResolver, Uri, Client } from "@polywrap/core-js"; +import { IUriResolver, Uri, CoreClient } from "@polywrap/core-js"; export type GetResolversFunc = ( uri: Uri, - client: Client + client: CoreClient ) => Promise[]>; export type GetResolversWithErrorFunc = ( uri: Uri, - client: Client + client: CoreClient ) => Promise[], TError>>; export class UriResolverAggregator< @@ -27,7 +27,7 @@ export class UriResolverAggregator< constructor( resolvers: ( uri: Uri, - client: Client + client: CoreClient ) => Promise[], TGetResolversError>>, resolverName?: string ); @@ -49,7 +49,7 @@ export class UriResolverAggregator< async getUriResolvers( uri: Uri, - client: Client + client: CoreClient ): Promise[], TGetResolversError>> { if (Array.isArray(this.resolvers)) { return ResultOk(this.resolvers); diff --git a/packages/js/uri-resolvers/src/aggregator/UriResolverAggregatorBase.ts b/packages/js/uri-resolvers/src/aggregator/UriResolverAggregatorBase.ts index e5c526579c..7247fd0523 100644 --- a/packages/js/uri-resolvers/src/aggregator/UriResolverAggregatorBase.ts +++ b/packages/js/uri-resolvers/src/aggregator/UriResolverAggregatorBase.ts @@ -3,7 +3,7 @@ import { UriResolutionResult } from "../helpers"; import { IUriResolver, Uri, - Client, + CoreClient, IUriResolutionContext, UriPackageOrWrapper, } from "@polywrap/core-js"; @@ -15,13 +15,13 @@ export abstract class UriResolverAggregatorBase< > implements IUriResolver { abstract getUriResolvers( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise[], TGetResolversError>>; async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise< Result @@ -53,7 +53,7 @@ export abstract class UriResolverAggregatorBase< protected async tryResolveUriWithResolvers( uri: Uri, - client: Client, + client: CoreClient, resolvers: IUriResolver[], resolutionContext: IUriResolutionContext ): Promise> { diff --git a/packages/js/uri-resolvers/src/cache/PackageToWrapperCacheResolver.ts b/packages/js/uri-resolvers/src/cache/PackageToWrapperCacheResolver.ts index 615f9ba99e..ca7198aa51 100644 --- a/packages/js/uri-resolvers/src/cache/PackageToWrapperCacheResolver.ts +++ b/packages/js/uri-resolvers/src/cache/PackageToWrapperCacheResolver.ts @@ -4,7 +4,7 @@ import { UriResolver, UriResolutionResult, UriResolverLike } from "../helpers"; import { IUriResolver, Uri, - Client, + CoreClient, IUriResolutionContext, UriPackageOrWrapper, } from "@polywrap/core-js"; @@ -41,7 +41,7 @@ export class PackageToWrapperCacheResolver async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { const wrapper = await this.cache.get(uri); diff --git a/packages/js/uri-resolvers/src/helpers/RecursiveResolver.ts b/packages/js/uri-resolvers/src/helpers/RecursiveResolver.ts index e4117f4179..eb46c971b9 100644 --- a/packages/js/uri-resolvers/src/helpers/RecursiveResolver.ts +++ b/packages/js/uri-resolvers/src/helpers/RecursiveResolver.ts @@ -7,7 +7,7 @@ import { Result } from "@polywrap/result"; import { IUriResolver, Uri, - Client, + CoreClient, IUriResolutionContext, UriPackageOrWrapper, } from "@polywrap/core-js"; @@ -24,7 +24,7 @@ export class RecursiveResolver async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { if (resolutionContext.isResolving(uri)) { @@ -56,7 +56,7 @@ export class RecursiveResolver private async tryResolveAgainIfRedirect( result: Result, uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { if (result.ok && result.value.type === "uri") { diff --git a/packages/js/uri-resolvers/src/helpers/ResolverWithHistory.ts b/packages/js/uri-resolvers/src/helpers/ResolverWithHistory.ts index 09f4394b02..d435589d35 100644 --- a/packages/js/uri-resolvers/src/helpers/ResolverWithHistory.ts +++ b/packages/js/uri-resolvers/src/helpers/ResolverWithHistory.ts @@ -1,7 +1,7 @@ import { IUriResolver, Uri, - Client, + CoreClient, IUriResolutionContext, UriPackageOrWrapper, } from "@polywrap/core-js"; @@ -11,7 +11,7 @@ export abstract class ResolverWithHistory implements IUriResolver { async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { const result = await this._tryResolveUri(uri, client, resolutionContext); @@ -32,7 +32,7 @@ export abstract class ResolverWithHistory protected abstract _tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise>; } diff --git a/packages/js/uri-resolvers/src/helpers/ResolverWithLoopGuard.ts b/packages/js/uri-resolvers/src/helpers/ResolverWithLoopGuard.ts index 2e55cf131d..9ea8ea8697 100644 --- a/packages/js/uri-resolvers/src/helpers/ResolverWithLoopGuard.ts +++ b/packages/js/uri-resolvers/src/helpers/ResolverWithLoopGuard.ts @@ -6,7 +6,7 @@ import { UriResolver } from "./UriResolver"; import { IUriResolver, Uri, - Client, + CoreClient, IUriResolutionContext, UriPackageOrWrapper, } from "@polywrap/core-js"; @@ -26,7 +26,7 @@ export class ResolverWithLoopGuard async tryResolveUri( uri: Uri, - client: Client, + client: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { if (resolutionContext.isResolving(uri)) { diff --git a/packages/js/uri-resolvers/src/helpers/UriResolver.ts b/packages/js/uri-resolvers/src/helpers/UriResolver.ts index c26994e152..f9b55411bc 100644 --- a/packages/js/uri-resolvers/src/helpers/UriResolver.ts +++ b/packages/js/uri-resolvers/src/helpers/UriResolver.ts @@ -8,7 +8,7 @@ import { Result } from "@polywrap/result"; import { IUriResolver, Uri, - Client, + CoreClient, IUriRedirect, IUriPackage, IUriWrapper, @@ -30,7 +30,7 @@ export class UriResolver { return new UriResolverAggregator( resolverLike as ( uri: Uri, - client: Client + client: CoreClient ) => Promise>, resolverName ) as IUriResolver; diff --git a/packages/js/uri-resolvers/src/legacy/LegacyRedirectsResolver.ts b/packages/js/uri-resolvers/src/legacy/LegacyRedirectsResolver.ts index ffb2384d3b..216b1e96c3 100644 --- a/packages/js/uri-resolvers/src/legacy/LegacyRedirectsResolver.ts +++ b/packages/js/uri-resolvers/src/legacy/LegacyRedirectsResolver.ts @@ -1,12 +1,12 @@ import { RedirectResolver } from ".."; import { UriResolverAggregator } from ".."; -import { Uri, Client } from "@polywrap/core-js"; +import { Uri, CoreClient } from "@polywrap/core-js"; export class LegacyRedirectsResolver extends UriResolverAggregator { constructor() { super( - async (uri: Uri, client: Client) => + async (uri: Uri, client: CoreClient) => client .getRedirects() ?.map( diff --git a/packages/js/uri-resolvers/src/static/StaticResolver.ts b/packages/js/uri-resolvers/src/static/StaticResolver.ts index 34163642da..0ec59c350d 100644 --- a/packages/js/uri-resolvers/src/static/StaticResolver.ts +++ b/packages/js/uri-resolvers/src/static/StaticResolver.ts @@ -1,7 +1,7 @@ import { UriResolutionResult, UriResolverLike } from "../helpers"; import { - Client, + CoreClient, IUriResolutionContext, IUriResolver, Uri, @@ -12,8 +12,7 @@ import { } from "@polywrap/core-js"; import { Result } from "@polywrap/result"; -export class StaticResolver - implements IUriResolver { +export class StaticResolver implements IUriResolver { constructor(public uriMap: Map) {} static from( @@ -71,7 +70,7 @@ export class StaticResolver async tryResolveUri( uri: Uri, - _: Client, + _: CoreClient, resolutionContext: IUriResolutionContext ): Promise> { const uriPackageOrWrapper = this.uriMap.get(uri.uri); diff --git a/packages/js/wasm/src/WasmWrapper.ts b/packages/js/wasm/src/WasmWrapper.ts index 84bab85961..1cb83f16d0 100644 --- a/packages/js/wasm/src/WasmWrapper.ts +++ b/packages/js/wasm/src/WasmWrapper.ts @@ -13,7 +13,7 @@ import { Wrapper, Uri, InvokeOptions, - Client, + CoreClient, InvocableResult, isBuffer, GetFileOptions, @@ -139,7 +139,7 @@ export class WasmWrapper implements Wrapper { @Tracer.traceMethod("WasmWrapper: invoke", TracingLevel.High) public async invoke( options: InvokeOptions, - client: Client + client: CoreClient ): Promise> { Tracer.setAttribute( "label", diff --git a/packages/js/wasm/src/imports.ts b/packages/js/wasm/src/imports.ts index 0ec6338fe2..4cecf0ae82 100644 --- a/packages/js/wasm/src/imports.ts +++ b/packages/js/wasm/src/imports.ts @@ -5,10 +5,10 @@ import { readBytes, readString, writeBytes, writeString } from "./buffer"; import { State } from "./WasmWrapper"; import { msgpackEncode } from "@polywrap/msgpack-js"; -import { Client } from "@polywrap/core-js"; +import { CoreClient } from "@polywrap/core-js"; export const createImports = (config: { - client: Client; + client: CoreClient; memory: WebAssembly.Memory; state: State; abort: (message: string) => never; diff --git a/packages/schema/bind/src/bindings/typescript/app/templates/types-ts.mustache b/packages/schema/bind/src/bindings/typescript/app/templates/types-ts.mustache index f02416fdc8..280ace82ea 100644 --- a/packages/schema/bind/src/bindings/typescript/app/templates/types-ts.mustache +++ b/packages/schema/bind/src/bindings/typescript/app/templates/types-ts.mustache @@ -3,7 +3,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -100,7 +100,7 @@ export const {{type}} = { {{#methods}} {{name}}: async ( args: {{parent.type}}_Args_{{name}}, - client: Client, + client: CoreClient, uri: string = "{{parent.uri}}" ): Promise> => { return client.invoke<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>({ diff --git a/packages/schema/bind/src/bindings/typescript/plugin/templates/index-ts.mustache b/packages/schema/bind/src/bindings/typescript/plugin/templates/index-ts.mustache index 315871f96d..4f5ca809d5 100644 --- a/packages/schema/bind/src/bindings/typescript/plugin/templates/index-ts.mustache +++ b/packages/schema/bind/src/bindings/typescript/plugin/templates/index-ts.mustache @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/schema/bind/src/bindings/typescript/plugin/templates/module-ts.mustache b/packages/schema/bind/src/bindings/typescript/plugin/templates/module-ts.mustache index 9c65a304bc..c51297e089 100644 --- a/packages/schema/bind/src/bindings/typescript/plugin/templates/module-ts.mustache +++ b/packages/schema/bind/src/bindings/typescript/plugin/templates/module-ts.mustache @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; {{#moduleType}} {{#methods}} @@ -27,7 +27,7 @@ export abstract class Module< abstract {{name}}( args: Args_{{name}}, - client: Client + client: CoreClient ): MaybeAsync<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>; {{/methods}} {{/moduleType}} diff --git a/packages/schema/bind/src/bindings/typescript/plugin/templates/types-ts.mustache b/packages/schema/bind/src/bindings/typescript/plugin/templates/types-ts.mustache index fe7452afe4..00dc85df95 100644 --- a/packages/schema/bind/src/bindings/typescript/plugin/templates/types-ts.mustache +++ b/packages/schema/bind/src/bindings/typescript/plugin/templates/types-ts.mustache @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client,{{#interfaceTypes.length}} + CoreClient,{{#interfaceTypes.length}} Result,{{/interfaceTypes.length}} InvokeResult } from "@polywrap/core-js"; @@ -112,7 +112,7 @@ export const {{type}} = { {{#methods}} {{name}}: async ( args: {{parent.type}}_Args_{{name}}, - client: Client + client: CoreClient ): Promise> => { return client.invoke<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>({ uri: "{{parent.uri}}", @@ -137,7 +137,7 @@ export class {{#detectKeyword}}{{type}}{{/detectKeyword}} { {{#methods}} public async {{name}} ( args: {{parent.type}}_Args_{{name}}, - client: Client + client: CoreClient ): Promise> { return client.invoke<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>({ uri: this.uri, @@ -163,7 +163,7 @@ export class {{#detectKeyword}}{{namespace}}{{/detectKeyword}} { {{#capabilities}} {{#getImplementations}} {{#enabled}} - public static getImplementations(client: Client): Result { + public static getImplementations(client: CoreClient): Result { return client.getImplementations(this.uri, {}); } {{/enabled}} diff --git a/packages/templates/wasm/assemblyscript/src/__tests__/utils.ts b/packages/templates/wasm/assemblyscript/src/__tests__/utils.ts index 9db483949d..d57390c992 100644 --- a/packages/templates/wasm/assemblyscript/src/__tests__/utils.ts +++ b/packages/templates/wasm/assemblyscript/src/__tests__/utils.ts @@ -1,13 +1,17 @@ -import { ClientConfig } from "@polywrap/client-js"; +import { CoreClientConfig } from "@polywrap/client-js"; import { ensResolverPlugin } from "@polywrap/ens-resolver-plugin-js"; -import { Connection, Connections, ethereumPlugin } from "@polywrap/ethereum-plugin-js"; +import { + Connection, + Connections, + ethereumPlugin, +} from "@polywrap/ethereum-plugin-js"; import { ipfsPlugin } from "@polywrap/ipfs-plugin-js"; export function getPlugins( ethereum: string, ipfs: string, ensAddress: string -): Partial { +): Partial { return { redirects: [], plugins: [ @@ -25,7 +29,7 @@ export function getPlugins( connections: new Connections({ networks: { testnet: new Connection({ provider: ethereum }), - mainnet: new Connection({ provider: "http://localhost:8546", }), + mainnet: new Connection({ provider: "http://localhost:8546" }), }, defaultNetwork: "testnet", }), @@ -33,4 +37,4 @@ export function getPlugins( }, ], }; -} \ No newline at end of file +} diff --git a/packages/test-cases/cases/bind/sanity/output/app-ts/types.ts b/packages/test-cases/cases/bind/sanity/output/app-ts/types.ts index 03a1469314..28617e361e 100644 --- a/packages/test-cases/cases/bind/sanity/output/app-ts/types.ts +++ b/packages/test-cases/cases/bind/sanity/output/app-ts/types.ts @@ -3,7 +3,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -185,39 +185,39 @@ interface TestImport_Module_Args_returnsArrayOfEnums { export const TestImport_Module = { importedMethod: async ( args: TestImport_Module_Args_importedMethod, - client: Client, + client: CoreClient, uri: string = "testimport.uri.eth" ): Promise> => { return client.invoke({ uri, method: "importedMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, anotherMethod: async ( args: TestImport_Module_Args_anotherMethod, - client: Client, + client: CoreClient, uri: string = "testimport.uri.eth" ): Promise> => { return client.invoke({ uri, method: "anotherMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, returnsArrayOfEnums: async ( args: TestImport_Module_Args_returnsArrayOfEnums, - client: Client, + client: CoreClient, uri: string = "testimport.uri.eth" ): Promise>> => { return client.invoke>({ uri, method: "returnsArrayOfEnums", - args: args as unknown as Record + args: (args as unknown) as Record, }); - } -} + }, +}; /// Imported Modules END /// diff --git a/packages/test-cases/cases/bind/sanity/output/plugin-ts/index.ts b/packages/test-cases/cases/bind/sanity/output/plugin-ts/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/bind/sanity/output/plugin-ts/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/plugin-ts/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/bind/sanity/output/plugin-ts/module.ts b/packages/test-cases/cases/bind/sanity/output/plugin-ts/module.ts index cb81a0a55b..aa0c37e5ea 100644 --- a/packages/test-cases/cases/bind/sanity/output/plugin-ts/module.ts +++ b/packages/test-cases/cases/bind/sanity/output/plugin-ts/module.ts @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_moduleMethod { @@ -38,30 +38,21 @@ export interface Args_if { if: Types._else; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract moduleMethod( args: Args_moduleMethod, - client: Client + client: CoreClient ): MaybeAsync; abstract objectMethod( args: Args_objectMethod, - client: Client + client: CoreClient ): MaybeAsync; abstract optionalEnvMethod( args: Args_optionalEnvMethod, - client: Client + client: CoreClient ): MaybeAsync; - abstract if( - args: Args_if, - client: Client - ): MaybeAsync; + abstract if(args: Args_if, client: CoreClient): MaybeAsync; } diff --git a/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts b/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts index 451dffce31..cdcdb4485f 100644 --- a/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts +++ b/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts @@ -5,11 +5,7 @@ import * as Types from "./"; // @ts-ignore -import { - Client, - Result, - InvokeResult -} from "@polywrap/core-js"; +import { CoreClient, Result, InvokeResult } from "@polywrap/core-js"; export type UInt = number; export type UInt8 = number; @@ -199,39 +195,38 @@ interface TestImport_Module_Args_returnsArrayOfEnums { export class TestImport_Module { public static interfaceUri: string = "testimport.uri.eth"; - constructor(public uri: string) { - } + constructor(public uri: string) {} - public async importedMethod ( + public async importedMethod( args: TestImport_Module_Args_importedMethod, - client: Client + client: CoreClient ): Promise> { return client.invoke({ uri: this.uri, method: "importedMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); } - public async anotherMethod ( + public async anotherMethod( args: TestImport_Module_Args_anotherMethod, - client: Client + client: CoreClient ): Promise> { return client.invoke({ uri: this.uri, method: "anotherMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); } - public async returnsArrayOfEnums ( + public async returnsArrayOfEnums( args: TestImport_Module_Args_returnsArrayOfEnums, - client: Client + client: CoreClient ): Promise>> { return client.invoke>({ uri: this.uri, method: "returnsArrayOfEnums", - args: args as unknown as Record + args: (args as unknown) as Record, }); } } @@ -241,7 +236,9 @@ export class TestImport_Module { export class TestImport { static uri: string = "testimport.uri.eth"; - public static getImplementations(client: Client): Result { + public static getImplementations( + client: CoreClient + ): Result { return client.getImplementations(this.uri, {}); } } diff --git a/packages/test-cases/cases/cli/app/codegen/004-custom-config/config.ts b/packages/test-cases/cases/cli/app/codegen/004-custom-config/config.ts index eff24d7c27..aaf921f218 100644 --- a/packages/test-cases/cases/cli/app/codegen/004-custom-config/config.ts +++ b/packages/test-cases/cases/cli/app/codegen/004-custom-config/config.ts @@ -1,6 +1,6 @@ import { ClientConfigBuilder, - CustomClientConfig, + ClientConfig, } from "@polywrap/client-config-builder-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { @@ -31,7 +31,7 @@ const mockPlugin = () => { return PluginPackage.from(new MockPlugin({ val: 0 }), mockPluginManifest); }; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { return { packages: [ { diff --git a/packages/test-cases/cases/cli/docgen/002-custom-config/config.ts b/packages/test-cases/cases/cli/docgen/002-custom-config/config.ts index 593dae0647..6306d59d75 100644 --- a/packages/test-cases/cases/cli/docgen/002-custom-config/config.ts +++ b/packages/test-cases/cases/cli/docgen/002-custom-config/config.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { latestWrapManifestVersion, @@ -28,7 +28,7 @@ const mockPlugin = () => { return PluginPackage.from(new MockPlugin({ val: 0 }), mockPluginManifest); }; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { return { packages: [ { diff --git a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/module.ts index d80585a809..d08b1a1fda 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/module.ts @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_methodOne { @@ -15,20 +15,14 @@ export interface Args_methodTwo { arg: Types.UInt32; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: Client + client: CoreClient ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/types.ts index 3172a4e4b0..75ae05ea60 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -346,311 +346,311 @@ interface Ethereum_Module_Args_sendRPC { export const Ethereum_Module = { callContractView: async ( args: Ethereum_Module_Args_callContractView, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractView", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractStatic: async ( args: Ethereum_Module_Args_callContractStatic, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractStatic", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getBalance: async ( args: Ethereum_Module_Args_getBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeParams: async ( args: Ethereum_Module_Args_encodeParams, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeParams", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeFunction: async ( args: Ethereum_Module_Args_encodeFunction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeFunction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityPack: async ( args: Ethereum_Module_Args_solidityPack, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityPack", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityKeccak256: async ( args: Ethereum_Module_Args_solidityKeccak256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityKeccak256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, soliditySha256: async ( args: Ethereum_Module_Args_soliditySha256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "soliditySha256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerAddress: async ( args: Ethereum_Module_Args_getSignerAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerBalance: async ( args: Ethereum_Module_Args_getSignerBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerTransactionCount: async ( args: Ethereum_Module_Args_getSignerTransactionCount, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerTransactionCount", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getGasPrice: async ( args: Ethereum_Module_Args_getGasPrice, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getGasPrice", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateTransactionGas: async ( args: Ethereum_Module_Args_estimateTransactionGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateTransactionGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateContractCallGas: async ( args: Ethereum_Module_Args_estimateContractCallGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateContractCallGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, checkAddress: async ( args: Ethereum_Module_Args_checkAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "checkAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toWei: async ( args: Ethereum_Module_Args_toWei, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toWei", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toEth: async ( args: Ethereum_Module_Args_toEth, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toEth", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, awaitTransaction: async ( args: Ethereum_Module_Args_awaitTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "awaitTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, waitForEvent: async ( args: Ethereum_Module_Args_waitForEvent, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "waitForEvent", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getNetwork: async ( args: Ethereum_Module_Args_getNetwork, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getNetwork", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, requestAccounts: async ( args: Ethereum_Module_Args_requestAccounts, - client: Client + client: CoreClient ): Promise>> => { return client.invoke>({ uri: "ens/ethereum.polywrap.eth", method: "requestAccounts", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethod: async ( args: Ethereum_Module_Args_callContractMethod, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethodAndWait: async ( args: Ethereum_Module_Args_callContractMethodAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethodAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransaction: async ( args: Ethereum_Module_Args_sendTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransactionAndWait: async ( args: Ethereum_Module_Args_sendTransactionAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransactionAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, deployContract: async ( args: Ethereum_Module_Args_deployContract, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "deployContract", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, signMessage: async ( args: Ethereum_Module_Args_signMessage, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "signMessage", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendRPC: async ( args: Ethereum_Module_Args_sendRPC, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendRPC", - args: args as unknown as Record + args: (args as unknown) as Record, }); - } -} + }, +}; /// Imported Modules END /// diff --git a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/module.ts index f9668a2f3e..0643894c24 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/module.ts @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_method { @@ -11,15 +11,9 @@ export interface Args_method { optStr?: Types.String | null; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/types.ts index 3172a4e4b0..75ae05ea60 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -346,311 +346,311 @@ interface Ethereum_Module_Args_sendRPC { export const Ethereum_Module = { callContractView: async ( args: Ethereum_Module_Args_callContractView, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractView", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractStatic: async ( args: Ethereum_Module_Args_callContractStatic, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractStatic", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getBalance: async ( args: Ethereum_Module_Args_getBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeParams: async ( args: Ethereum_Module_Args_encodeParams, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeParams", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeFunction: async ( args: Ethereum_Module_Args_encodeFunction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeFunction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityPack: async ( args: Ethereum_Module_Args_solidityPack, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityPack", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityKeccak256: async ( args: Ethereum_Module_Args_solidityKeccak256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityKeccak256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, soliditySha256: async ( args: Ethereum_Module_Args_soliditySha256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "soliditySha256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerAddress: async ( args: Ethereum_Module_Args_getSignerAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerBalance: async ( args: Ethereum_Module_Args_getSignerBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerTransactionCount: async ( args: Ethereum_Module_Args_getSignerTransactionCount, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerTransactionCount", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getGasPrice: async ( args: Ethereum_Module_Args_getGasPrice, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getGasPrice", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateTransactionGas: async ( args: Ethereum_Module_Args_estimateTransactionGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateTransactionGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateContractCallGas: async ( args: Ethereum_Module_Args_estimateContractCallGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateContractCallGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, checkAddress: async ( args: Ethereum_Module_Args_checkAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "checkAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toWei: async ( args: Ethereum_Module_Args_toWei, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toWei", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toEth: async ( args: Ethereum_Module_Args_toEth, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toEth", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, awaitTransaction: async ( args: Ethereum_Module_Args_awaitTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "awaitTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, waitForEvent: async ( args: Ethereum_Module_Args_waitForEvent, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "waitForEvent", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getNetwork: async ( args: Ethereum_Module_Args_getNetwork, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getNetwork", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, requestAccounts: async ( args: Ethereum_Module_Args_requestAccounts, - client: Client + client: CoreClient ): Promise>> => { return client.invoke>({ uri: "ens/ethereum.polywrap.eth", method: "requestAccounts", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethod: async ( args: Ethereum_Module_Args_callContractMethod, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethodAndWait: async ( args: Ethereum_Module_Args_callContractMethodAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethodAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransaction: async ( args: Ethereum_Module_Args_sendTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransactionAndWait: async ( args: Ethereum_Module_Args_sendTransactionAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransactionAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, deployContract: async ( args: Ethereum_Module_Args_deployContract, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "deployContract", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, signMessage: async ( args: Ethereum_Module_Args_signMessage, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "signMessage", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendRPC: async ( args: Ethereum_Module_Args_sendRPC, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendRPC", - args: args as unknown as Record + args: (args as unknown) as Record, }); - } -} + }, +}; /// Imported Modules END /// diff --git a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/module.ts index a2294ddca8..437a2407c2 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/module.ts @@ -3,22 +3,16 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_method { str: Types.String; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/types.ts index 6dbf11884a..3ee39fd838 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/module.ts index a2294ddca8..437a2407c2 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/module.ts @@ -3,22 +3,16 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_method { str: Types.String; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/types.ts index fee545ff08..a2a3e3bb29 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/config.ts b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/config.ts index 337d73bebe..0513b0a80e 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/config.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/config.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { latestWrapManifestVersion } from "@polywrap/wrap-manifest-types-js"; import { parseSchema } from "@polywrap/schema-parse"; @@ -37,7 +37,7 @@ const mockPlugin = () => { }); }; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { return { packages: [ { diff --git a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/module.ts index d80585a809..d08b1a1fda 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/module.ts @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_methodOne { @@ -15,20 +15,14 @@ export interface Args_methodTwo { arg: Types.UInt32; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: Client + client: CoreClient ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/types.ts index 3172a4e4b0..75ae05ea60 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/005-custom-config/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -346,311 +346,311 @@ interface Ethereum_Module_Args_sendRPC { export const Ethereum_Module = { callContractView: async ( args: Ethereum_Module_Args_callContractView, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractView", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractStatic: async ( args: Ethereum_Module_Args_callContractStatic, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractStatic", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getBalance: async ( args: Ethereum_Module_Args_getBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeParams: async ( args: Ethereum_Module_Args_encodeParams, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeParams", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeFunction: async ( args: Ethereum_Module_Args_encodeFunction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeFunction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityPack: async ( args: Ethereum_Module_Args_solidityPack, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityPack", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityKeccak256: async ( args: Ethereum_Module_Args_solidityKeccak256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityKeccak256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, soliditySha256: async ( args: Ethereum_Module_Args_soliditySha256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "soliditySha256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerAddress: async ( args: Ethereum_Module_Args_getSignerAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerBalance: async ( args: Ethereum_Module_Args_getSignerBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerTransactionCount: async ( args: Ethereum_Module_Args_getSignerTransactionCount, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerTransactionCount", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getGasPrice: async ( args: Ethereum_Module_Args_getGasPrice, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getGasPrice", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateTransactionGas: async ( args: Ethereum_Module_Args_estimateTransactionGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateTransactionGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateContractCallGas: async ( args: Ethereum_Module_Args_estimateContractCallGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateContractCallGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, checkAddress: async ( args: Ethereum_Module_Args_checkAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "checkAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toWei: async ( args: Ethereum_Module_Args_toWei, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toWei", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toEth: async ( args: Ethereum_Module_Args_toEth, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toEth", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, awaitTransaction: async ( args: Ethereum_Module_Args_awaitTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "awaitTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, waitForEvent: async ( args: Ethereum_Module_Args_waitForEvent, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "waitForEvent", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getNetwork: async ( args: Ethereum_Module_Args_getNetwork, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getNetwork", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, requestAccounts: async ( args: Ethereum_Module_Args_requestAccounts, - client: Client + client: CoreClient ): Promise>> => { return client.invoke>({ uri: "ens/ethereum.polywrap.eth", method: "requestAccounts", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethod: async ( args: Ethereum_Module_Args_callContractMethod, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethodAndWait: async ( args: Ethereum_Module_Args_callContractMethodAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethodAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransaction: async ( args: Ethereum_Module_Args_sendTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransactionAndWait: async ( args: Ethereum_Module_Args_sendTransactionAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransactionAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, deployContract: async ( args: Ethereum_Module_Args_deployContract, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "deployContract", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, signMessage: async ( args: Ethereum_Module_Args_signMessage, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "signMessage", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendRPC: async ( args: Ethereum_Module_Args_sendRPC, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendRPC", - args: args as unknown as Record + args: (args as unknown) as Record, }); - } -} + }, +}; /// Imported Modules END /// diff --git a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/index.ts b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/index.ts index 315871f96d..4f5ca809d5 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/index.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/index.ts @@ -5,4 +5,4 @@ export * from "./wrap.info"; export * from "./module"; export * from "./types"; -export { Client } from "@polywrap/core-js"; +export { CoreClient } from "@polywrap/core-js"; diff --git a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/module.ts index d80585a809..d08b1a1fda 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/module.ts @@ -3,7 +3,7 @@ import * as Types from "./types"; -import { Client, MaybeAsync } from "@polywrap/core-js"; +import { CoreClient, MaybeAsync } from "@polywrap/core-js"; import { PluginModule } from "@polywrap/plugin-js"; export interface Args_methodOne { @@ -15,20 +15,14 @@ export interface Args_methodTwo { arg: Types.UInt32; } -export abstract class Module< - TConfig -> extends PluginModule< - TConfig, - Types.Env -> { - +export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: Client + client: CoreClient ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: Client + client: CoreClient ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/types.ts b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/types.ts index 3172a4e4b0..75ae05ea60 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/types.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/006-custom-manifest-file/expected/wrap/types.ts @@ -6,7 +6,7 @@ import * as Types from "./"; // @ts-ignore import { - Client, + CoreClient, InvokeResult } from "@polywrap/core-js"; @@ -346,311 +346,311 @@ interface Ethereum_Module_Args_sendRPC { export const Ethereum_Module = { callContractView: async ( args: Ethereum_Module_Args_callContractView, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractView", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractStatic: async ( args: Ethereum_Module_Args_callContractStatic, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractStatic", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getBalance: async ( args: Ethereum_Module_Args_getBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeParams: async ( args: Ethereum_Module_Args_encodeParams, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeParams", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, encodeFunction: async ( args: Ethereum_Module_Args_encodeFunction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "encodeFunction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityPack: async ( args: Ethereum_Module_Args_solidityPack, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityPack", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, solidityKeccak256: async ( args: Ethereum_Module_Args_solidityKeccak256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "solidityKeccak256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, soliditySha256: async ( args: Ethereum_Module_Args_soliditySha256, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "soliditySha256", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerAddress: async ( args: Ethereum_Module_Args_getSignerAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerBalance: async ( args: Ethereum_Module_Args_getSignerBalance, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerBalance", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getSignerTransactionCount: async ( args: Ethereum_Module_Args_getSignerTransactionCount, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getSignerTransactionCount", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getGasPrice: async ( args: Ethereum_Module_Args_getGasPrice, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getGasPrice", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateTransactionGas: async ( args: Ethereum_Module_Args_estimateTransactionGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateTransactionGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, estimateContractCallGas: async ( args: Ethereum_Module_Args_estimateContractCallGas, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "estimateContractCallGas", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, checkAddress: async ( args: Ethereum_Module_Args_checkAddress, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "checkAddress", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toWei: async ( args: Ethereum_Module_Args_toWei, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toWei", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, toEth: async ( args: Ethereum_Module_Args_toEth, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "toEth", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, awaitTransaction: async ( args: Ethereum_Module_Args_awaitTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "awaitTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, waitForEvent: async ( args: Ethereum_Module_Args_waitForEvent, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "waitForEvent", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, getNetwork: async ( args: Ethereum_Module_Args_getNetwork, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "getNetwork", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, requestAccounts: async ( args: Ethereum_Module_Args_requestAccounts, - client: Client + client: CoreClient ): Promise>> => { return client.invoke>({ uri: "ens/ethereum.polywrap.eth", method: "requestAccounts", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethod: async ( args: Ethereum_Module_Args_callContractMethod, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethod", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, callContractMethodAndWait: async ( args: Ethereum_Module_Args_callContractMethodAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "callContractMethodAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransaction: async ( args: Ethereum_Module_Args_sendTransaction, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransaction", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendTransactionAndWait: async ( args: Ethereum_Module_Args_sendTransactionAndWait, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendTransactionAndWait", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, deployContract: async ( args: Ethereum_Module_Args_deployContract, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "deployContract", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, signMessage: async ( args: Ethereum_Module_Args_signMessage, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "signMessage", - args: args as unknown as Record + args: (args as unknown) as Record, }); }, sendRPC: async ( args: Ethereum_Module_Args_sendRPC, - client: Client + client: CoreClient ): Promise> => { return client.invoke({ uri: "ens/ethereum.polywrap.eth", method: "sendRPC", - args: args as unknown as Record + args: (args as unknown) as Record, }); - } -} + }, +}; /// Imported Modules END /// diff --git a/packages/test-cases/cases/cli/run/008-custom-config/config.ts b/packages/test-cases/cases/cli/run/008-custom-config/config.ts index 40537beefc..8071702486 100644 --- a/packages/test-cases/cases/cli/run/008-custom-config/config.ts +++ b/packages/test-cases/cases/cli/run/008-custom-config/config.ts @@ -1,7 +1,7 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import path from "path"; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { const wrapperPath = path.join(__dirname, "..", "run-test-wrapper"); const wrapperUri = `fs/${path.resolve(wrapperPath)}/build`; return { diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/010-custom-config/config.ts b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/010-custom-config/config.ts index 3b230d7cef..d61dd5a11c 100644 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/010-custom-config/config.ts +++ b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/010-custom-config/config.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { latestWrapManifestVersion } from "@polywrap/wrap-manifest-types-js"; @@ -119,7 +119,7 @@ const mockPlugin = () => { ); }; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { return { packages: [ { diff --git a/packages/test-cases/cases/cli/wasm/codegen/005-custom-config/config.ts b/packages/test-cases/cases/cli/wasm/codegen/005-custom-config/config.ts index 9178697334..db89960cfb 100644 --- a/packages/test-cases/cases/cli/wasm/codegen/005-custom-config/config.ts +++ b/packages/test-cases/cases/cli/wasm/codegen/005-custom-config/config.ts @@ -1,4 +1,4 @@ -import { CustomClientConfig } from "@polywrap/client-config-builder-js"; +import { ClientConfig } from "@polywrap/client-config-builder-js"; import { IWrapPackage } from "@polywrap/core-js"; import { PluginModule, PluginPackage } from "@polywrap/plugin-js"; import { @@ -34,7 +34,7 @@ const mockPlugin = (): IWrapPackage => { }); }; -export function getCustomConfig(): Partial> { +export function getCustomConfig(): Partial> { return { packages: [ {