From e797b641a6bd18e4168ea74e75edb3bb5ead5245 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Tue, 28 Feb 2023 15:06:34 +0400 Subject: [PATCH 01/13] refactor(plugin-js): move env to plugin method params --- packages/js/plugin/src/PluginMethod.ts | 5 ++- packages/js/plugin/src/PluginModule.ts | 29 +++++-------- packages/js/plugin/src/PluginPackage.ts | 43 +++++++------------ packages/js/plugin/src/PluginWrapper.ts | 10 +++-- .../plugin/src/utils/GetPluginMethodsFunc.ts | 11 ++--- .../src/utils/PluginModuleWithMethods.ts | 25 ++++++----- 6 files changed, 56 insertions(+), 67 deletions(-) diff --git a/packages/js/plugin/src/PluginMethod.ts b/packages/js/plugin/src/PluginMethod.ts index 0e4fd77675..b7d65cb6c4 100644 --- a/packages/js/plugin/src/PluginMethod.ts +++ b/packages/js/plugin/src/PluginMethod.ts @@ -11,5 +11,6 @@ import { CoreClient, MaybeAsync } from "@polywrap/core-js"; */ export type PluginMethod< TArgs extends Record = Record, - TResult = unknown -> = (args: TArgs, client: CoreClient) => MaybeAsync; + TResult = unknown, + TEnv extends Record = Record +> = (args: TArgs, env: TEnv, client: CoreClient) => MaybeAsync; diff --git a/packages/js/plugin/src/PluginModule.ts b/packages/js/plugin/src/PluginModule.ts index 38c2f5730f..32d94747dc 100644 --- a/packages/js/plugin/src/PluginModule.ts +++ b/packages/js/plugin/src/PluginModule.ts @@ -4,38 +4,28 @@ import { PluginMethod } from "./PluginMethod"; import { CoreClient, WrapErrorCode } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; -export abstract class PluginModule< - TConfig, - TEnv extends Record = Record -> { - private _env: TEnv; +export abstract class PluginModule { private _config: TConfig; constructor(config: TConfig) { this._config = config; } - public get env(): TEnv { - return this._env; - } - public get config(): TConfig { return this._config; } - public setEnv(env: TEnv): void { - this._env = env; - } - public async _wrap_invoke< TArgs extends Record = Record, - TResult = unknown + TResult = unknown, + TEnv extends Record = Record >( method: string, args: TArgs, + env: TEnv, client: CoreClient ): Promise> { - const fn = this.getMethod(method); + const fn = this.getMethod(method); if (!fn) { return ResultErr(Error(`Plugin missing method "${method}"`)); @@ -48,7 +38,7 @@ export abstract class PluginModule< } try { - const data = await fn(args, client); + const data = await fn(args, env, client); return ResultOk(data); } catch (e) { e.code = WrapErrorCode.WRAPPER_INVOKE_ABORTED; @@ -58,13 +48,14 @@ export abstract class PluginModule< public getMethod< TArgs extends Record = Record, - TResult = unknown + TResult = unknown, + TEnv extends Record = Record >(method: string): PluginMethod | undefined { const fn: - | PluginMethod + | PluginMethod | undefined = ((this as unknown) as Record< string, - PluginMethod + PluginMethod >)[method]; return fn?.bind(this); diff --git a/packages/js/plugin/src/PluginPackage.ts b/packages/js/plugin/src/PluginPackage.ts index 793d2ec685..33ef4f4c81 100644 --- a/packages/js/plugin/src/PluginPackage.ts +++ b/packages/js/plugin/src/PluginPackage.ts @@ -6,45 +6,34 @@ import { IWrapPackage, Wrapper } from "@polywrap/core-js"; import { Result, ResultOk } from "@polywrap/result"; import { WrapManifest } from "@polywrap/wrap-manifest-types-js"; -export class PluginPackage< - TConfig, - TEnv extends Record = Record -> implements IWrapPackage { +export class PluginPackage implements IWrapPackage { constructor( - private _pluginModule: PluginModule, + private _pluginModule: PluginModule, private _manifest: WrapManifest ) {} - static from< - TConfig, - TEnv extends Record = Record - >( + static from( pluginModule: PluginModule, manifest?: WrapManifest - ): PluginPackage; - static from = Record>( - getPluginFuncs: GetPluginMethodsFunc, + ): PluginPackage; + static from( + getPluginFuncs: GetPluginMethodsFunc, manifest?: WrapManifest - ): PluginPackage; - static from< - TConfig, - TEnv extends Record = Record - >( - pluginModuleOrGetPluginFuncs: - | PluginModule - | GetPluginMethodsFunc, + ): PluginPackage; + static from( + pluginModuleOrGetPluginFuncs: PluginModule | GetPluginMethodsFunc, manifest?: WrapManifest - ): PluginPackage { + ): PluginPackage { if (typeof pluginModuleOrGetPluginFuncs === "function") { - const getPluginFuncs = pluginModuleOrGetPluginFuncs as GetPluginMethodsFunc; + const getPluginFuncs = pluginModuleOrGetPluginFuncs as GetPluginMethodsFunc; - return new PluginPackage( - new PluginModuleWithMethods(getPluginFuncs), + return new PluginPackage( + new PluginModuleWithMethods(getPluginFuncs), manifest || ({} as WrapManifest) - ) as PluginPackage; + ) as PluginPackage; } else { - return new PluginPackage( - pluginModuleOrGetPluginFuncs as PluginModule, + return new PluginPackage( + pluginModuleOrGetPluginFuncs as PluginModule, manifest || ({} as WrapManifest) ); } diff --git a/packages/js/plugin/src/PluginWrapper.ts b/packages/js/plugin/src/PluginWrapper.ts index 8ab78d2de4..408c7c83dd 100644 --- a/packages/js/plugin/src/PluginWrapper.ts +++ b/packages/js/plugin/src/PluginWrapper.ts @@ -49,9 +49,6 @@ export class PluginWrapper implements Wrapper { return ResultErr(error); } - // Set the module's environment - this._module.setEnv(options.env || {}); - let jsArgs: Record; // If the args are a msgpack buffer, deserialize it @@ -77,7 +74,12 @@ export class PluginWrapper implements Wrapper { } // Invoke the function - const result = await this._module._wrap_invoke(method, jsArgs, client); + const result = await this._module._wrap_invoke( + method, + jsArgs, + options.env || {}, + client + ); if (result.ok) { const data = result.value; diff --git a/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts b/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts index 9cb2bd2d81..eb393818d6 100644 --- a/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts +++ b/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts @@ -1,7 +1,8 @@ import { PluginModule, PluginMethod } from ".."; -export type GetPluginMethodsFunc< - TEnv extends Record = Record -> = ( - module: PluginModule -) => Record, unknown>>; +export type GetPluginMethodsFunc = ( + module: PluginModule +) => Record< + string, + PluginMethod, unknown, Record> +>; diff --git a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts index f69a80a42a..528d586f26 100644 --- a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts +++ b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts @@ -7,19 +7,19 @@ import { GetPluginMethodsFunc } from "./GetPluginMethodsFunc"; import { CoreClient, WrapErrorCode } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; -export class PluginModuleWithMethods< - TEnv extends Record = Record -> extends PluginModule { - constructor(private _getPluginMethods: GetPluginMethodsFunc) { +export class PluginModuleWithMethods extends PluginModule { + constructor(private _getPluginMethods: GetPluginMethodsFunc) { super({} as never); } async _wrap_invoke< TArgs extends Record = Record, - TResult = unknown + TResult = unknown, + TEnv extends Record = Record >( method: string, args: TArgs, + env: TEnv, client: CoreClient ): Promise> { const fn = this.getMethod(method); @@ -35,7 +35,7 @@ export class PluginModuleWithMethods< } try { - const data = await fn(args, client); + const data = await fn(args, env, client); return ResultOk(data); } catch (e) { e.code = WrapErrorCode.WRAPPER_INVOKE_ABORTED; @@ -45,11 +45,16 @@ export class PluginModuleWithMethods< getMethod< TArgs extends Record = Record, - TResult = unknown + TResult = unknown, + TEnv extends Record = Record >(method: string): PluginMethod | undefined { - const fn: PluginMethod | undefined = this._getPluginMethods( - this - )[method] as PluginMethod; + const fn: + | PluginMethod + | undefined = this._getPluginMethods(this)[method] as PluginMethod< + TArgs, + TResult, + TEnv + >; return fn?.bind(this); } From b3c3444f46671999bab82f4d0d2a42cc8f0730cf Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Tue, 28 Feb 2023 15:16:46 +0400 Subject: [PATCH 02/13] refactor(schema-bind): move env to plugin method params --- .../bindings/typescript/plugin/templates/module-ts.mustache | 3 ++- .../test-cases/cases/bind/sanity/output/plugin-ts/module.ts | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) 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 4441891954..160a9acf78 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 @@ -18,11 +18,12 @@ export interface Args_{{name}} { {{/methods}} {{/moduleType}} -export abstract class Module extends PluginModule { +export abstract class Module extends PluginModule { {{#moduleType}} {{#methods}} abstract {{name}}( args: Args_{{name}}, + env: {{#env}}{{#required}}Types.Env{{/required}}{{^required}}Types.Env | null{{/required}}{{/env}}{{^env}}null{{/env}}, client: CoreClient ): MaybeAsync<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>; {{^last}} 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 4f8dcb6dbb..5f8d3828b7 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 @@ -40,24 +40,28 @@ export interface Args_if { if: Types._else; } -export abstract class Module extends PluginModule { +export abstract class Module extends PluginModule { abstract moduleMethod( args: Args_moduleMethod, + env: null, client: CoreClient ): MaybeAsync; abstract objectMethod( args: Args_objectMethod, + env: Types.Env, client: CoreClient ): MaybeAsync; abstract optionalEnvMethod( args: Args_optionalEnvMethod, + env: Types.Env | null, client: CoreClient ): MaybeAsync; abstract if( args: Args_if, + env: null, client: CoreClient ): MaybeAsync; } From 022532cbeda03a705279adf3418b4349ee6e0b2f Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Mon, 6 Mar 2023 12:07:41 +0400 Subject: [PATCH 03/13] chore: minor fixes --- packages/test-cases/index.ts | 4 ++-- packages/test-cases/package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/test-cases/index.ts b/packages/test-cases/index.ts index b86122b1b1..aa1a073884 100644 --- a/packages/test-cases/index.ts +++ b/packages/test-cases/index.ts @@ -3,8 +3,8 @@ import { readFileSync, existsSync } from "fs"; import { normalizeLineEndings } from "@polywrap/os-js"; import admZip from 'adm-zip'; -const axios = require("axios"); -const shell = require("shelljs"); +import axios from "axios"; +import shell from "shelljs"; export const GetPathToBindTestFiles = () => `${__dirname}/cases/bind` export const GetPathToComposeTestFiles = () => `${__dirname}/cases/compose` diff --git a/packages/test-cases/package.json b/packages/test-cases/package.json index 7dd62cfd57..7492c2585b 100644 --- a/packages/test-cases/package.json +++ b/packages/test-cases/package.json @@ -12,6 +12,7 @@ "@polywrap/os-js": "0.10.0-pre.10" }, "devDependencies": { + "@types/shelljs": "0.8.9", "@types/adm-zip": "0.5.0", "adm-zip": "0.5.10", "axios": "1.2.2", From e5b398124aa1c9b825d908f60f07d678d5ea2205 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Tue, 14 Mar 2023 22:57:25 -0400 Subject: [PATCH 04/13] chore: implement as non-breaking changeset --- .../__tests__/core/wrap-features/env-case.ts | 6 +-- packages/js/client/src/__tests__/helpers.ts | 4 +- packages/js/plugin/package.json | 3 ++ packages/js/plugin/src/PluginMethod.ts | 2 +- packages/js/plugin/src/PluginModule.ts | 14 ++++--- packages/js/plugin/src/PluginPackage.ts | 41 ++++++++++++------- packages/js/plugin/src/PluginWrapper.ts | 13 +++++- .../plugin/src/utils/GetPluginMethodsFunc.ts | 6 ++- .../src/utils/PluginModuleWithMethods.ts | 18 ++++---- .../plugin/templates/module-ts.mustache | 6 +-- .../bind/sanity/output/plugin-ts/module.ts | 18 ++++---- yarn.lock | 8 ++++ 12 files changed, 87 insertions(+), 52 deletions(-) diff --git a/packages/js/client/src/__tests__/core/wrap-features/env-case.ts b/packages/js/client/src/__tests__/core/wrap-features/env-case.ts index 88864f6140..4360dd39f1 100644 --- a/packages/js/client/src/__tests__/core/wrap-features/env-case.ts +++ b/packages/js/client/src/__tests__/core/wrap-features/env-case.ts @@ -205,9 +205,9 @@ export const envTestCases = (implementation: string) => { resolver: RecursiveResolver.from([ { uri: implementationUri, - package: PluginPackage.from((module) => ({ - mockEnv: (): MockEnv => { - return module.env; + package: PluginPackage.from(() => ({ + mockEnv: (_, __, env: MockEnv): MockEnv => { + return env; }, })), }, diff --git a/packages/js/client/src/__tests__/helpers.ts b/packages/js/client/src/__tests__/helpers.ts index 2be08905d1..74a1a0b003 100644 --- a/packages/js/client/src/__tests__/helpers.ts +++ b/packages/js/client/src/__tests__/helpers.ts @@ -46,8 +46,8 @@ export const mockPluginRegistration = (uri: string | Uri) => { methodThatThrows: (_: unknown): string => { throw Error("I'm throwing!"); }, - mockEnv(): { a: number } & Record { - return this.env; + mockEnv(_, __, env): { a: number } & Record { + return env as unknown as { a: number } & Record; }, })), }; diff --git a/packages/js/plugin/package.json b/packages/js/plugin/package.json index 343fe30063..e47082f073 100644 --- a/packages/js/plugin/package.json +++ b/packages/js/plugin/package.json @@ -25,6 +25,9 @@ "@polywrap/tracing-js": "0.10.0-pre.11", "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" }, + "peerDependencies": { + "@polywrap/core-js": "0.10.x" + }, "devDependencies": { "@types/jest": "26.0.8", "jest": "26.6.3", diff --git a/packages/js/plugin/src/PluginMethod.ts b/packages/js/plugin/src/PluginMethod.ts index b7d65cb6c4..0575f94ba1 100644 --- a/packages/js/plugin/src/PluginMethod.ts +++ b/packages/js/plugin/src/PluginMethod.ts @@ -13,4 +13,4 @@ export type PluginMethod< TArgs extends Record = Record, TResult = unknown, TEnv extends Record = Record -> = (args: TArgs, env: TEnv, client: CoreClient) => MaybeAsync; +> = (args: TArgs, client: CoreClient, env: TEnv) => MaybeAsync; diff --git a/packages/js/plugin/src/PluginModule.ts b/packages/js/plugin/src/PluginModule.ts index 32d94747dc..04dbbd649d 100644 --- a/packages/js/plugin/src/PluginModule.ts +++ b/packages/js/plugin/src/PluginModule.ts @@ -4,7 +4,10 @@ import { PluginMethod } from "./PluginMethod"; import { CoreClient, WrapErrorCode } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; -export abstract class PluginModule { +export abstract class PluginModule< + TConfig, + TEnv extends Record = Record +> { private _config: TConfig; constructor(config: TConfig) { @@ -17,13 +20,12 @@ export abstract class PluginModule { public async _wrap_invoke< TArgs extends Record = Record, - TResult = unknown, - TEnv extends Record = Record + TResult = unknown >( method: string, args: TArgs, - env: TEnv, - client: CoreClient + client: CoreClient, + env: TEnv ): Promise> { const fn = this.getMethod(method); @@ -38,7 +40,7 @@ export abstract class PluginModule { } try { - const data = await fn(args, env, client); + const data = await fn(args, client, env); return ResultOk(data); } catch (e) { e.code = WrapErrorCode.WRAPPER_INVOKE_ABORTED; diff --git a/packages/js/plugin/src/PluginPackage.ts b/packages/js/plugin/src/PluginPackage.ts index 33ef4f4c81..a7da896417 100644 --- a/packages/js/plugin/src/PluginPackage.ts +++ b/packages/js/plugin/src/PluginPackage.ts @@ -6,34 +6,45 @@ import { IWrapPackage, Wrapper } from "@polywrap/core-js"; import { Result, ResultOk } from "@polywrap/result"; import { WrapManifest } from "@polywrap/wrap-manifest-types-js"; -export class PluginPackage implements IWrapPackage { +export class PluginPackage< + TConfig, + TEnv extends Record = Record +> implements IWrapPackage { constructor( - private _pluginModule: PluginModule, + private _pluginModule: PluginModule, private _manifest: WrapManifest ) {} - static from( - pluginModule: PluginModule, + static from< + TConfig, + TEnv extends Record = Record + >( + pluginModule: PluginModule, manifest?: WrapManifest - ): PluginPackage; - static from( - getPluginFuncs: GetPluginMethodsFunc, + ): PluginPackage; + static from< + TEnv extends Record = Record + >( + getPluginFuncs: GetPluginMethodsFunc, manifest?: WrapManifest - ): PluginPackage; - static from( - pluginModuleOrGetPluginFuncs: PluginModule | GetPluginMethodsFunc, + ): PluginPackage; + static from< + TConfig, + TEnv extends Record = Record + >( + pluginModuleOrGetPluginFuncs: PluginModule | GetPluginMethodsFunc, manifest?: WrapManifest - ): PluginPackage { + ): PluginPackage { if (typeof pluginModuleOrGetPluginFuncs === "function") { const getPluginFuncs = pluginModuleOrGetPluginFuncs as GetPluginMethodsFunc; - return new PluginPackage( + return new PluginPackage( new PluginModuleWithMethods(getPluginFuncs), manifest || ({} as WrapManifest) - ) as PluginPackage; + ) as PluginPackage; } else { - return new PluginPackage( - pluginModuleOrGetPluginFuncs as PluginModule, + return new PluginPackage( + pluginModuleOrGetPluginFuncs as PluginModule, manifest || ({} as WrapManifest) ); } diff --git a/packages/js/plugin/src/PluginWrapper.ts b/packages/js/plugin/src/PluginWrapper.ts index 408c7c83dd..677eaf979b 100644 --- a/packages/js/plugin/src/PluginWrapper.ts +++ b/packages/js/plugin/src/PluginWrapper.ts @@ -49,6 +49,15 @@ export class PluginWrapper implements Wrapper { return ResultErr(error); } + // NOTE: this is used just in case the module instance + // we're interacting with is from versions < 0.10 + const genericModule = this._module as unknown as Record; + if (genericModule.setEnv) { + (genericModule.setEnv as ((env: unknown) => void))( + options.env || {} + ); + } + let jsArgs: Record; // If the args are a msgpack buffer, deserialize it @@ -77,8 +86,8 @@ export class PluginWrapper implements Wrapper { const result = await this._module._wrap_invoke( method, jsArgs, - options.env || {}, - client + client, + options.env || {} ); if (result.ok) { diff --git a/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts b/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts index eb393818d6..6d95ce1467 100644 --- a/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts +++ b/packages/js/plugin/src/utils/GetPluginMethodsFunc.ts @@ -1,7 +1,9 @@ import { PluginModule, PluginMethod } from ".."; -export type GetPluginMethodsFunc = ( - module: PluginModule +export type GetPluginMethodsFunc< + TEnv extends Record = Record +> = ( + module: PluginModule ) => Record< string, PluginMethod, unknown, Record> diff --git a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts index 528d586f26..03b1e6d639 100644 --- a/packages/js/plugin/src/utils/PluginModuleWithMethods.ts +++ b/packages/js/plugin/src/utils/PluginModuleWithMethods.ts @@ -7,20 +7,21 @@ import { GetPluginMethodsFunc } from "./GetPluginMethodsFunc"; import { CoreClient, WrapErrorCode } from "@polywrap/core-js"; import { Result, ResultErr, ResultOk } from "@polywrap/result"; -export class PluginModuleWithMethods extends PluginModule { - constructor(private _getPluginMethods: GetPluginMethodsFunc) { +export class PluginModuleWithMethods< + TEnv extends Record = Record +> extends PluginModule { + constructor(private _getPluginMethods: GetPluginMethodsFunc) { super({} as never); } async _wrap_invoke< TArgs extends Record = Record, - TResult = unknown, - TEnv extends Record = Record + TResult = unknown >( method: string, args: TArgs, - env: TEnv, - client: CoreClient + client: CoreClient, + env: TEnv ): Promise> { const fn = this.getMethod(method); @@ -35,7 +36,7 @@ export class PluginModuleWithMethods extends PluginModule { } try { - const data = await fn(args, env, client); + const data = await fn(args, client, env); return ResultOk(data); } catch (e) { e.code = WrapErrorCode.WRAPPER_INVOKE_ABORTED; @@ -45,8 +46,7 @@ export class PluginModuleWithMethods extends PluginModule { getMethod< TArgs extends Record = Record, - TResult = unknown, - TEnv extends Record = Record + TResult = unknown >(method: string): PluginMethod | undefined { const fn: | PluginMethod 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 160a9acf78..2dd7672a60 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 @@ -18,13 +18,13 @@ export interface Args_{{name}} { {{/methods}} {{/moduleType}} -export abstract class Module extends PluginModule { +export abstract class Module extends PluginModule { {{#moduleType}} {{#methods}} abstract {{name}}( args: Args_{{name}}, - env: {{#env}}{{#required}}Types.Env{{/required}}{{^required}}Types.Env | null{{/required}}{{/env}}{{^env}}null{{/env}}, - client: CoreClient + client: CoreClient, + {{^env}}env?: null{{/env}}{{#env}}env{{^required}}?{{/required}}: Types.Env{{^required}} | null{{/required}}{{/env}}, ): MaybeAsync<{{#return}}{{#toTypescript}}{{toGraphQLType}}{{/toTypescript}}{{/return}}>; {{^last}} 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 5f8d3828b7..96d6faf2fb 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 @@ -40,28 +40,28 @@ export interface Args_if { if: Types._else; } -export abstract class Module extends PluginModule { +export abstract class Module extends PluginModule { abstract moduleMethod( args: Args_moduleMethod, - env: null, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; abstract objectMethod( args: Args_objectMethod, - env: Types.Env, - client: CoreClient + client: CoreClient, + env: Types.Env ): MaybeAsync; abstract optionalEnvMethod( args: Args_optionalEnvMethod, - env: Types.Env | null, - client: CoreClient + client: CoreClient, + env?: Types.Env | null ): MaybeAsync; abstract if( args: Args_if, - env: null, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } diff --git a/yarn.lock b/yarn.lock index e0d596bf96..70620eed78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2532,6 +2532,14 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59" integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now== +"@types/shelljs@0.8.9": + version "0.8.9" + resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.9.tgz#45dd8501aa9882976ca3610517dac3831c2fbbf4" + integrity sha512-flVe1dvlrCyQJN/SGrnBxqHG+RzXrVKsmjD8WS/qYHpq5UPjfq7UWFBENP0ZuOl0g6OpAlL6iBoLSvKYUUmyQw== + dependencies: + "@types/glob" "*" + "@types/node" "*" + "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" From fe2651aa917399713afe771d60aff4934d8f0b4e Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 13:10:37 +0400 Subject: [PATCH 05/13] fix: no need to use plugin-js in config-builder --- packages/js/client-config-builder/README.md | 4 +- .../js/client-config-builder/package.json | 1 - .../src/bundles/default.ts | 3 +- yarn.lock | 227 +++++++++++++----- 4 files changed, 166 insertions(+), 69 deletions(-) diff --git a/packages/js/client-config-builder/README.md b/packages/js/client-config-builder/README.md index c1bc868b5f..27e4cf8472 100644 --- a/packages/js/client-config-builder/README.md +++ b/packages/js/client-config-builder/README.md @@ -484,7 +484,7 @@ export const uriResolverExts: UriResolverExtBootloader = [ interface IDefaultPlugin { uri: Uri; - plugin: PluginPackage; + plugin: IWrapPackage; implements: Uri[]; } @@ -512,7 +512,7 @@ export const plugins: IDefaultPlugins = { }, fileSystem: { uri: Uri.from("plugin/file-system@1.0.0"), - plugin: fileSystemPlugin({}), + plugin: fileSystemPlugin({}) as any, implements: [Uri.from("ens/wraps.eth:file-system@1.0.0")], }, concurrent: { diff --git a/packages/js/client-config-builder/package.json b/packages/js/client-config-builder/package.json index d7fd1b83b3..1c12ffd789 100644 --- a/packages/js/client-config-builder/package.json +++ b/packages/js/client-config-builder/package.json @@ -29,7 +29,6 @@ "@polywrap/file-system-plugin-js": "~0.10.0-pre", "@polywrap/http-plugin-js": "~0.10.0-pre", "@polywrap/logger-plugin-js": "0.10.0-pre.10", - "@polywrap/plugin-js": "0.10.0-pre.11", "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.11", "@polywrap/uri-resolvers-js": "0.10.0-pre.11", "@polywrap/wasm-js": "0.10.0-pre.11", diff --git a/packages/js/client-config-builder/src/bundles/default.ts b/packages/js/client-config-builder/src/bundles/default.ts index 448872b054..d977f29d97 100644 --- a/packages/js/client-config-builder/src/bundles/default.ts +++ b/packages/js/client-config-builder/src/bundles/default.ts @@ -4,7 +4,6 @@ import * as ipfsHttpClient from "./embeds/ipfs-http-client/wrap"; import * as ipfsResolver from "./embeds/async-ipfs-resolver/wrap"; import { IWrapPackage, Uri } from "@polywrap/core-js"; -import { PluginPackage } from "@polywrap/plugin-js"; import { ethereumProviderPlugin, Connection, @@ -64,7 +63,7 @@ export const uriResolverExts: UriResolverExtBootloader = [ interface IDefaultPlugin { uri: Uri; - plugin: PluginPackage; + plugin: IWrapPackage; implements: Uri[]; } diff --git a/yarn.lock b/yarn.lock index 70620eed78..54748e67a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -114,32 +114,32 @@ integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13" - integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA== + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e" + integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.0" + "@babel/generator" "^7.21.3" "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.21.0" + "@babel/helper-module-transforms" "^7.21.2" "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.0" + "@babel/parser" "^7.21.3" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/traverse" "^7.21.3" + "@babel/types" "^7.21.3" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.21.0", "@babel/generator@^7.21.1": - version "7.21.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd" - integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA== +"@babel/generator@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce" + integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA== dependencies: - "@babel/types" "^7.21.0" + "@babel/types" "^7.21.3" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -182,7 +182,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.21.0": +"@babel/helper-module-transforms@^7.21.2": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== @@ -248,10 +248,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" - integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" + integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -346,26 +346,26 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75" - integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67" + integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.1" + "@babel/generator" "^7.21.3" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.2" - "@babel/types" "^7.21.2" + "@babel/parser" "^7.21.3" + "@babel/types" "^7.21.3" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1" - integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw== +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05" + integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -2061,9 +2061,9 @@ integrity sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g== "@opentelemetry/api@^1.0.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.0.tgz#2c91791a9ba6ca0a0f4aaac5e45d58df13639ac8" - integrity sha512-IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g== + version "1.4.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f" + integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA== "@opentelemetry/core@1.6.0": version "1.6.0" @@ -2142,6 +2142,11 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz#ed410c9eb0070491cff9fe914246ce41f88d6f74" integrity sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ== +"@polywrap/asyncify-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/asyncify-js/-/asyncify-js-0.9.6.tgz#a546a77e84c026bde4037d3e72e06a8035f4993b" + integrity sha512-cSfbrh+GZjzSSVm55YJNnyLEy0YkXdXLjLIlXKjUqg30d1nPB3qHvmZ32I0itcDIPYfyHiEu3dA33GG7Xo+5Gw== + "@polywrap/concurrent-plugin-js@~0.10.0-pre": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/concurrent-plugin-js/-/concurrent-plugin-js-0.10.0-pre.10.tgz#106e015173cabed5b043cbc2fac00a6ccf58f9a0" @@ -2160,10 +2165,26 @@ "@polywrap/tracing-js" "0.10.0-pre.10" "@polywrap/wrap-manifest-types-js" "0.10.0-pre.10" +"@polywrap/core-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/core-js/-/core-js-0.9.6.tgz#fe94e2c2f7b631f74f72920154ad2998498886c7" + integrity sha512-quvzASpFyk/Wp3wpdjir/9CNQXqzORnJD5YmJIzE/Hpe7r7FB3k0kLnn5f/0gxeMJccrCx/pXZFHp5GE2zJj2Q== + dependencies: + "@polywrap/asyncify-js" "0.9.6" + "@polywrap/msgpack-js" "0.9.6" + "@polywrap/result" "0.9.6" + "@polywrap/tracing-js" "0.9.6" + "@polywrap/wrap-manifest-types-js" "0.9.6" + graphql "15.5.0" + graphql-tag "2.10.4" + jsonschema "1.4.0" + semver "7.3.5" + yaml "2.1.3" + "@polywrap/ethereum-provider-js@~0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@polywrap/ethereum-provider-js/-/ethereum-provider-js-0.2.3.tgz#3a2c16115ba3c5b1cf8136fe9d528770a0c4572f" - integrity sha512-TY2Y33Oitt1elBaM/3OXulRZ22vI3vA7+Y+XVzhV7Az37GJm1tR8NDL05g3wBFqlps6zoTdmfR0zmFVtFvvAtw== + version "0.2.4" + resolved "https://registry.yarnpkg.com/@polywrap/ethereum-provider-js/-/ethereum-provider-js-0.2.4.tgz#3df1a6548da191618bb5cae7928c7427e69e0030" + integrity sha512-64xRnniboxxHNZ4/gD6SS4T+QmJPUMbIYZ2hyLODb2QgH3qDBiU+i4gdiQ/BL3T8Sn/0iOxvTIgZalVDJRh2iw== dependencies: "@ethersproject/address" "5.7.0" "@ethersproject/providers" "5.7.0" @@ -2179,6 +2200,13 @@ "@polywrap/core-js" "0.10.0-pre.10" "@polywrap/plugin-js" "0.10.0-pre.10" +"@polywrap/fs-plugin-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/fs-plugin-js/-/fs-plugin-js-0.9.6.tgz#6b0e24db256d08eb398ecfb53926a12ce341e05f" + integrity sha512-gQ8LhvoRhoedVy88ywb+xI8PQ13bJIMy8W13MEpREXZbb9WjAeaMPqO+Q6kim6uophE0Ck7JTmSNglkTx8C0ng== + dependencies: + "@polywrap/core-js" "0.9.6" + "@polywrap/http-plugin-js@~0.10.0-pre": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/http-plugin-js/-/http-plugin-js-0.10.0-pre.10.tgz#b746af5c0afbfa4d179c6a1c923708257cb2277e" @@ -2204,6 +2232,13 @@ dependencies: "@msgpack/msgpack" "2.7.2" +"@polywrap/msgpack-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/msgpack-js/-/msgpack-js-0.9.6.tgz#d600c106f265562b8421c2368ccb7ef32e19eb2c" + integrity sha512-TDmkrmEgdhDNwHKfhO74FTFbHyhhLP2tf5lgeEuT48gtkVT5UMoOmRG7sjPi59KMdb6Py2eXXb3/8JuHMu3JFg== + dependencies: + "@msgpack/msgpack" "2.7.2" + "@polywrap/plugin-js@0.10.0-pre.10": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/plugin-js/-/plugin-js-0.10.0-pre.10.tgz#090c1963f40ab862a09deda8c18e6d522fd2e3f2" @@ -2220,6 +2255,11 @@ resolved "https://registry.yarnpkg.com/@polywrap/result/-/result-0.10.0-pre.10.tgz#6e88ac447d92d8a10c7e7892a6371af29a072240" integrity sha512-SqNnEbXky4dFXgps2B2juFShq1024do0f1HLUbuj3MlIPp5aW9g9sfBslsy3YTnpg2QW7LFVT15crrJMgbowIQ== +"@polywrap/result@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/result/-/result-0.9.6.tgz#11592e485bd7a683276387dbe1a8e82dd00abb3c" + integrity sha512-YgjBfiuu7exBxVmCqrPOiUkiq4ew3CTN3U8wA1LIJK47PKnLmmmpl7JwNtkm6cAqm5th9B0mwUgSRsEBW99IzA== + "@polywrap/tracing-js@0.10.0-pre.10": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/tracing-js/-/tracing-js-0.10.0-pre.10.tgz#f50fb01883dcba4217a1711718aa53f3dd61cb1c" @@ -2232,6 +2272,18 @@ "@opentelemetry/sdk-trace-base" "1.6.0" "@opentelemetry/sdk-trace-web" "1.6.0" +"@polywrap/tracing-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/tracing-js/-/tracing-js-0.9.6.tgz#0d95b7cd31b45f6f9f57eb8999af800266afbbf6" + integrity sha512-Q8k/FeQUYGNDelaBx2L4oqzkSyDSgr7Nxl4Rm1B16liqUy+hsqyeGxiJ3obp5hnPCPq4hlogahyZA+8V+WGpzQ== + dependencies: + "@fetsorn/opentelemetry-console-exporter" "0.0.3" + "@opentelemetry/api" "1.2.0" + "@opentelemetry/exporter-trace-otlp-http" "0.32.0" + "@opentelemetry/resources" "1.6.0" + "@opentelemetry/sdk-trace-base" "1.6.0" + "@opentelemetry/sdk-trace-web" "1.6.0" + "@polywrap/wrap-manifest-schemas@0.9.3": version "0.9.3" resolved "https://registry.yarnpkg.com/@polywrap/wrap-manifest-schemas/-/wrap-manifest-schemas-0.9.3.tgz#cdf950bb8951fba72afd8300aaf9a0a8159d7c37" @@ -2246,6 +2298,16 @@ jsonschema "1.4.0" semver "7.3.8" +"@polywrap/wrap-manifest-types-js@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/wrap-manifest-types-js/-/wrap-manifest-types-js-0.9.6.tgz#339a157a58e276b3d08a5e87615b181d71e78c1d" + integrity sha512-OmO0XPnIpTMV2UNmMlyizJOwG41EjwsUCBTYyIEDnJOoe4E97ZUzZWfzHx+e0pb6r97ZfOIyR3a14kHymT7A+A== + dependencies: + "@polywrap/msgpack-js" "0.9.6" + json-schema-ref-parser "9.0.9" + jsonschema "1.4.0" + semver "7.3.5" + "@sinclair/typebox@^0.24.1": version "0.24.51" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" @@ -2475,9 +2537,9 @@ integrity sha512-wH6Tu9mbiOt0n5EvdoWy0VGQaJMHfLIxY/6wS0xLC7CV1taM6gESEzcYy0ZlWvxxiiljYvfDIvz4hHbUUDRlhw== "@types/node@*", "@types/node@^18.14.6": - version "18.14.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.6.tgz#ae1973dd2b1eeb1825695bb11ebfb746d27e3e93" - integrity sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA== + version "18.15.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.3.tgz#f0b991c32cfc6a4e7f3399d6cb4b8cf9a0315014" + integrity sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2912,6 +2974,14 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" @@ -3462,9 +3532,9 @@ camelcase@^6.0.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001449: - version "1.0.30001460" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz#31d2e26f0a2309860ed3eff154e03890d9d851a7" - integrity sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ== + version "1.0.30001466" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz#c1e6197c540392e09709ecaa9e3e403428c53375" + integrity sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w== capture-exit@^2.0.0: version "2.0.0" @@ -4290,9 +4360,9 @@ electron-fetch@^1.7.2: encoding "^0.1.13" electron-to-chromium@^1.4.284: - version "1.4.321" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.321.tgz#48b513fbeae39d431826bbafa2acb88309d8be55" - integrity sha512-ERuAqNq7YknVY3+47VbB+Q92kWH7O7sX3mkZINqZtsGJMQFb0dj71d5U3PRTihX03qt2NWIfZic2CCcGXOHJ7A== + version "1.4.330" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.330.tgz#4740378db7160d7210afb29800c74048cdf10a99" + integrity sha512-PqyefhybrVdjAJ45HaPLtuVaehiSw7C3ya0aad+rvmV53IVyXmYRk3pwIOb2TxTDTnmgQdn46NjMMaysx79/6Q== elliptic@6.5.4: version "6.5.4" @@ -4392,17 +4462,17 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" - integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== + version "1.21.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" + integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== dependencies: + array-buffer-byte-length "^1.0.0" available-typed-arrays "^1.0.5" call-bind "^1.0.2" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function-bind "^1.1.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" @@ -4410,8 +4480,8 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: has-property-descriptors "^1.0.0" has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.4" - is-array-buffer "^3.0.1" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" @@ -4419,11 +4489,12 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: is-string "^1.0.7" is-typed-array "^1.1.10" is-weakref "^1.0.2" - object-inspect "^1.12.2" + object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.7" string.prototype.trimend "^1.0.6" string.prototype.trimstart "^1.0.6" typed-array-length "^1.0.4" @@ -5392,6 +5463,11 @@ graphql-json-transform@^1.1.0-alpha.0: resolved "https://registry.yarnpkg.com/graphql-json-transform/-/graphql-json-transform-1.1.0-alpha.0.tgz#fb0c88d24840067e6c55ac64bbc8d4e5de245d2d" integrity sha512-I6lR/lYEezSz4iru0f7a/wR8Rzi3pCafk7S0bX2b/WQOtK0vKabxLShGBXIslsi0arMehIjvOPHJl7MpOUqj0w== +graphql-tag@2.10.4: + version "2.10.4" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.4.tgz#2f301a98219be8b178a6453bb7e33b79b66d8f83" + integrity sha512-O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA== + graphql@15.5.0: version "15.5.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5" @@ -5720,7 +5796,7 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" -internal-slot@^1.0.4: +internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -5912,7 +5988,7 @@ is-arguments@^1.0.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-array-buffer@^3.0.1: +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== @@ -6900,6 +6976,13 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +json-schema-ref-parser@9.0.9: + version "9.0.9" + resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#66ea538e7450b12af342fa3d5b8458bc1e1e013f" + integrity sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q== + dependencies: + "@apidevtools/json-schema-ref-parser" "9.0.9" + json-schema-to-typescript@11.0.2: version "11.0.2" resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-11.0.2.tgz#80348391abb4ffb75daf312380c2f01c552ffba8" @@ -7564,9 +7647,9 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: yallist "^4.0.0" minipass@^4.0.0: - version "4.2.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06" - integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ== + version "4.2.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb" + integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q== minizlib@^1.3.3: version "1.3.3" @@ -8143,7 +8226,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.12.2, object-inspect@^1.9.0: +object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== @@ -8910,9 +8993,9 @@ read@1, read@~1.0.1: mute-stream "~0.0.4" readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62" - integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -9240,6 +9323,13 @@ scrypt-js@3.0.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + semver@7.3.8, semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" @@ -9498,9 +9588,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== split-on-first@^1.0.0: version "1.1.0" @@ -9613,6 +9703,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" From 2b1a072e3f3bed98bf3bf7f139137348f4f86376 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 13:11:54 +0400 Subject: [PATCH 06/13] refactor: linting fix --- packages/js/plugin/src/PluginPackage.ts | 8 ++++---- packages/js/plugin/src/PluginWrapper.ts | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/js/plugin/src/PluginPackage.ts b/packages/js/plugin/src/PluginPackage.ts index a7da896417..6f42e72c2f 100644 --- a/packages/js/plugin/src/PluginPackage.ts +++ b/packages/js/plugin/src/PluginPackage.ts @@ -22,9 +22,7 @@ export class PluginPackage< pluginModule: PluginModule, manifest?: WrapManifest ): PluginPackage; - static from< - TEnv extends Record = Record - >( + static from = Record>( getPluginFuncs: GetPluginMethodsFunc, manifest?: WrapManifest ): PluginPackage; @@ -32,7 +30,9 @@ export class PluginPackage< TConfig, TEnv extends Record = Record >( - pluginModuleOrGetPluginFuncs: PluginModule | GetPluginMethodsFunc, + pluginModuleOrGetPluginFuncs: + | PluginModule + | GetPluginMethodsFunc, manifest?: WrapManifest ): PluginPackage { if (typeof pluginModuleOrGetPluginFuncs === "function") { diff --git a/packages/js/plugin/src/PluginWrapper.ts b/packages/js/plugin/src/PluginWrapper.ts index 677eaf979b..7281f40b2c 100644 --- a/packages/js/plugin/src/PluginWrapper.ts +++ b/packages/js/plugin/src/PluginWrapper.ts @@ -51,11 +51,9 @@ export class PluginWrapper implements Wrapper { // NOTE: this is used just in case the module instance // we're interacting with is from versions < 0.10 - const genericModule = this._module as unknown as Record; + const genericModule = (this._module as unknown) as Record; if (genericModule.setEnv) { - (genericModule.setEnv as ((env: unknown) => void))( - options.env || {} - ); + (genericModule.setEnv as (env: unknown) => void)(options.env || {}); } let jsArgs: Record; From a50780d1d72b2471f33c534b2d88eca02aada651 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 13:35:03 +0400 Subject: [PATCH 07/13] fix: uri-resolver tests --- packages/js/client-config-builder/README.md | 2 +- ...olve a URI resolver extension wrapper.json | 20 ++--- .../histories/can resolve cache - 1.json | 20 ++--- ...cting by a URI resolver extension - 1.json | 20 ++--- ...te recursion when resolved at runtime.json | 20 ++--- ...after URI resolver extension redirect.json | 20 ++--- .../core/uri-resolution/histories/sanity.json | 22 ++--- .../plugin/templates/module-ts.mustache | 2 +- yarn.lock | 81 ------------------- 9 files changed, 63 insertions(+), 144 deletions(-) diff --git a/packages/js/client-config-builder/README.md b/packages/js/client-config-builder/README.md index 27e4cf8472..e19093738e 100644 --- a/packages/js/client-config-builder/README.md +++ b/packages/js/client-config-builder/README.md @@ -512,7 +512,7 @@ export const plugins: IDefaultPlugins = { }, fileSystem: { uri: Uri.from("plugin/file-system@1.0.0"), - plugin: fileSystemPlugin({}) as any, + plugin: fileSystemPlugin({}), implements: [Uri.from("ens/wraps.eth:file-system@1.0.0")], }, concurrent: { diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json index 859bcf2b40..cb2eca7980 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json index 0cf4f0c94e..43712d2027 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json index 859bcf2b40..cb2eca7980 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json index a138c3adf0..333992f9e6 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json index 2db2c74572..9303fb2a77 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json index 7b5fb2905e..2666cde70d 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json @@ -58,14 +58,14 @@ ] ], "wrap://ens/uri.eth => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)", - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => StaticResolver - Miss", - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -76,25 +76,25 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => StaticResolver - Miss", - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => StaticResolver - Miss", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] 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 2dd7672a60..ac87418014 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 @@ -24,7 +24,7 @@ export abstract class Module extends PluginModule; {{^last}} diff --git a/yarn.lock b/yarn.lock index 54748e67a5..c937883398 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2142,11 +2142,6 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz#ed410c9eb0070491cff9fe914246ce41f88d6f74" integrity sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ== -"@polywrap/asyncify-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/asyncify-js/-/asyncify-js-0.9.6.tgz#a546a77e84c026bde4037d3e72e06a8035f4993b" - integrity sha512-cSfbrh+GZjzSSVm55YJNnyLEy0YkXdXLjLIlXKjUqg30d1nPB3qHvmZ32I0itcDIPYfyHiEu3dA33GG7Xo+5Gw== - "@polywrap/concurrent-plugin-js@~0.10.0-pre": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/concurrent-plugin-js/-/concurrent-plugin-js-0.10.0-pre.10.tgz#106e015173cabed5b043cbc2fac00a6ccf58f9a0" @@ -2165,22 +2160,6 @@ "@polywrap/tracing-js" "0.10.0-pre.10" "@polywrap/wrap-manifest-types-js" "0.10.0-pre.10" -"@polywrap/core-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/core-js/-/core-js-0.9.6.tgz#fe94e2c2f7b631f74f72920154ad2998498886c7" - integrity sha512-quvzASpFyk/Wp3wpdjir/9CNQXqzORnJD5YmJIzE/Hpe7r7FB3k0kLnn5f/0gxeMJccrCx/pXZFHp5GE2zJj2Q== - dependencies: - "@polywrap/asyncify-js" "0.9.6" - "@polywrap/msgpack-js" "0.9.6" - "@polywrap/result" "0.9.6" - "@polywrap/tracing-js" "0.9.6" - "@polywrap/wrap-manifest-types-js" "0.9.6" - graphql "15.5.0" - graphql-tag "2.10.4" - jsonschema "1.4.0" - semver "7.3.5" - yaml "2.1.3" - "@polywrap/ethereum-provider-js@~0.2.3": version "0.2.4" resolved "https://registry.yarnpkg.com/@polywrap/ethereum-provider-js/-/ethereum-provider-js-0.2.4.tgz#3df1a6548da191618bb5cae7928c7427e69e0030" @@ -2200,13 +2179,6 @@ "@polywrap/core-js" "0.10.0-pre.10" "@polywrap/plugin-js" "0.10.0-pre.10" -"@polywrap/fs-plugin-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/fs-plugin-js/-/fs-plugin-js-0.9.6.tgz#6b0e24db256d08eb398ecfb53926a12ce341e05f" - integrity sha512-gQ8LhvoRhoedVy88ywb+xI8PQ13bJIMy8W13MEpREXZbb9WjAeaMPqO+Q6kim6uophE0Ck7JTmSNglkTx8C0ng== - dependencies: - "@polywrap/core-js" "0.9.6" - "@polywrap/http-plugin-js@~0.10.0-pre": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/http-plugin-js/-/http-plugin-js-0.10.0-pre.10.tgz#b746af5c0afbfa4d179c6a1c923708257cb2277e" @@ -2232,13 +2204,6 @@ dependencies: "@msgpack/msgpack" "2.7.2" -"@polywrap/msgpack-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/msgpack-js/-/msgpack-js-0.9.6.tgz#d600c106f265562b8421c2368ccb7ef32e19eb2c" - integrity sha512-TDmkrmEgdhDNwHKfhO74FTFbHyhhLP2tf5lgeEuT48gtkVT5UMoOmRG7sjPi59KMdb6Py2eXXb3/8JuHMu3JFg== - dependencies: - "@msgpack/msgpack" "2.7.2" - "@polywrap/plugin-js@0.10.0-pre.10": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/plugin-js/-/plugin-js-0.10.0-pre.10.tgz#090c1963f40ab862a09deda8c18e6d522fd2e3f2" @@ -2255,11 +2220,6 @@ resolved "https://registry.yarnpkg.com/@polywrap/result/-/result-0.10.0-pre.10.tgz#6e88ac447d92d8a10c7e7892a6371af29a072240" integrity sha512-SqNnEbXky4dFXgps2B2juFShq1024do0f1HLUbuj3MlIPp5aW9g9sfBslsy3YTnpg2QW7LFVT15crrJMgbowIQ== -"@polywrap/result@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/result/-/result-0.9.6.tgz#11592e485bd7a683276387dbe1a8e82dd00abb3c" - integrity sha512-YgjBfiuu7exBxVmCqrPOiUkiq4ew3CTN3U8wA1LIJK47PKnLmmmpl7JwNtkm6cAqm5th9B0mwUgSRsEBW99IzA== - "@polywrap/tracing-js@0.10.0-pre.10": version "0.10.0-pre.10" resolved "https://registry.yarnpkg.com/@polywrap/tracing-js/-/tracing-js-0.10.0-pre.10.tgz#f50fb01883dcba4217a1711718aa53f3dd61cb1c" @@ -2272,18 +2232,6 @@ "@opentelemetry/sdk-trace-base" "1.6.0" "@opentelemetry/sdk-trace-web" "1.6.0" -"@polywrap/tracing-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/tracing-js/-/tracing-js-0.9.6.tgz#0d95b7cd31b45f6f9f57eb8999af800266afbbf6" - integrity sha512-Q8k/FeQUYGNDelaBx2L4oqzkSyDSgr7Nxl4Rm1B16liqUy+hsqyeGxiJ3obp5hnPCPq4hlogahyZA+8V+WGpzQ== - dependencies: - "@fetsorn/opentelemetry-console-exporter" "0.0.3" - "@opentelemetry/api" "1.2.0" - "@opentelemetry/exporter-trace-otlp-http" "0.32.0" - "@opentelemetry/resources" "1.6.0" - "@opentelemetry/sdk-trace-base" "1.6.0" - "@opentelemetry/sdk-trace-web" "1.6.0" - "@polywrap/wrap-manifest-schemas@0.9.3": version "0.9.3" resolved "https://registry.yarnpkg.com/@polywrap/wrap-manifest-schemas/-/wrap-manifest-schemas-0.9.3.tgz#cdf950bb8951fba72afd8300aaf9a0a8159d7c37" @@ -2298,16 +2246,6 @@ jsonschema "1.4.0" semver "7.3.8" -"@polywrap/wrap-manifest-types-js@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/wrap-manifest-types-js/-/wrap-manifest-types-js-0.9.6.tgz#339a157a58e276b3d08a5e87615b181d71e78c1d" - integrity sha512-OmO0XPnIpTMV2UNmMlyizJOwG41EjwsUCBTYyIEDnJOoe4E97ZUzZWfzHx+e0pb6r97ZfOIyR3a14kHymT7A+A== - dependencies: - "@polywrap/msgpack-js" "0.9.6" - json-schema-ref-parser "9.0.9" - jsonschema "1.4.0" - semver "7.3.5" - "@sinclair/typebox@^0.24.1": version "0.24.51" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" @@ -5463,11 +5401,6 @@ graphql-json-transform@^1.1.0-alpha.0: resolved "https://registry.yarnpkg.com/graphql-json-transform/-/graphql-json-transform-1.1.0-alpha.0.tgz#fb0c88d24840067e6c55ac64bbc8d4e5de245d2d" integrity sha512-I6lR/lYEezSz4iru0f7a/wR8Rzi3pCafk7S0bX2b/WQOtK0vKabxLShGBXIslsi0arMehIjvOPHJl7MpOUqj0w== -graphql-tag@2.10.4: - version "2.10.4" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.4.tgz#2f301a98219be8b178a6453bb7e33b79b66d8f83" - integrity sha512-O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA== - graphql@15.5.0: version "15.5.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5" @@ -6976,13 +6909,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-ref-parser@9.0.9: - version "9.0.9" - resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#66ea538e7450b12af342fa3d5b8458bc1e1e013f" - integrity sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q== - dependencies: - "@apidevtools/json-schema-ref-parser" "9.0.9" - json-schema-to-typescript@11.0.2: version "11.0.2" resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-11.0.2.tgz#80348391abb4ffb75daf312380c2f01c552ffba8" @@ -9323,13 +9249,6 @@ scrypt-js@3.0.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - semver@7.3.8, semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" From 4d9a52b184b1c3a316d26cd4ef9491abf7a38afd Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 13:52:38 +0400 Subject: [PATCH 08/13] fix: env --- .../cli/plugin/codegen/001-sanity/expected/wrap/module.ts | 6 ++++-- .../codegen/002-single-module/expected/wrap/module.ts | 3 ++- .../cli/plugin/codegen/003-env/expected/wrap/module.ts | 3 ++- .../codegen/004-env-sanitization/expected/wrap/module.ts | 3 ++- .../codegen/005-custom-config/expected/wrap/module.ts | 6 ++++-- .../006-custom-manifest-file/expected/wrap/module.ts | 6 ++++-- .../codegen/007-interface-comments/expected/wrap/module.ts | 6 ++++-- 7 files changed, 22 insertions(+), 11 deletions(-) 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 8a1f0fd9f1..cde1572906 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 @@ -20,11 +20,13 @@ export interface Args_methodTwo { export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } 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 e74a2c7a62..564b2cf3cc 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 @@ -16,6 +16,7 @@ export interface Args_method { export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } 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 1b4fbba3ba..b5c5bb3ef9 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 @@ -15,6 +15,7 @@ export interface Args_method { export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } 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 1b4fbba3ba..b5c5bb3ef9 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 @@ -15,6 +15,7 @@ export interface Args_method { export abstract class Module extends PluginModule { abstract method( args: Args_method, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } 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 8a1f0fd9f1..cde1572906 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 @@ -20,11 +20,13 @@ export interface Args_methodTwo { export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } 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 8a1f0fd9f1..cde1572906 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 @@ -20,11 +20,13 @@ export interface Args_methodTwo { export abstract class Module extends PluginModule { abstract methodOne( args: Args_methodOne, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; abstract methodTwo( args: Args_methodTwo, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/007-interface-comments/expected/wrap/module.ts b/packages/test-cases/cases/cli/plugin/codegen/007-interface-comments/expected/wrap/module.ts index 6741068993..e20eb64fa9 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/007-interface-comments/expected/wrap/module.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/007-interface-comments/expected/wrap/module.ts @@ -19,11 +19,13 @@ export interface Args_methodB { export abstract class Module extends PluginModule { abstract methodA( args: Args_methodA, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; abstract methodB( args: Args_methodB, - client: CoreClient + client: CoreClient, + env?: null ): MaybeAsync; } From 114d994f921ab7aef7b0a67af4d324c550aaf7ae Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 14:04:38 +0400 Subject: [PATCH 09/13] fix: cmd tests --- packages/cli/src/__tests__/e2e/build.plugin.spec.ts | 2 -- .../cases/cli/plugin/codegen/003-env/expected/wrap/module.ts | 2 +- .../cli/plugin/codegen/003-env/expected/wrap/wrap.info.ts | 3 +++ .../test-cases/cases/cli/plugin/codegen/003-env/schema.graphql | 2 +- .../codegen/004-env-sanitization/expected/wrap/module.ts | 2 +- .../codegen/004-env-sanitization/expected/wrap/wrap.info.ts | 3 +++ .../cli/plugin/codegen/004-env-sanitization/schema.graphql | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/__tests__/e2e/build.plugin.spec.ts b/packages/cli/src/__tests__/e2e/build.plugin.spec.ts index 977f46b79a..0d43180952 100644 --- a/packages/cli/src/__tests__/e2e/build.plugin.spec.ts +++ b/packages/cli/src/__tests__/e2e/build.plugin.spec.ts @@ -35,11 +35,9 @@ describe("e2e tests for build command - plugin project", () => { test(testCaseName, async () => { const { exitCode: code, stdout: output, stderr: error } = await Commands.build({ ...args, - codegen: true, }, { cwd: testCaseDir, }); - testCliOutput(testCaseDir, code, output, error); testBuildOutput(testCaseDir, buildDir); }); 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 b5c5bb3ef9..122cf48d5b 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 @@ -16,6 +16,6 @@ export abstract class Module extends PluginModule { abstract method( args: Args_method, client: CoreClient, - env?: null + env: Types.Env ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/wrap.info.ts b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/wrap.info.ts index 6518f6e3cc..2ca3663015 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/wrap.info.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/003-env/expected/wrap/wrap.info.ts @@ -43,6 +43,9 @@ export const manifest: WrapManifest = { "type": "String" } ], + "env": { + "required": true + }, "kind": 64, "name": "method", "required": true, diff --git a/packages/test-cases/cases/cli/plugin/codegen/003-env/schema.graphql b/packages/test-cases/cases/cli/plugin/codegen/003-env/schema.graphql index 62f5b70802..5e5d86c058 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/003-env/schema.graphql +++ b/packages/test-cases/cases/cli/plugin/codegen/003-env/schema.graphql @@ -5,5 +5,5 @@ type Env { type Module { method( str: String! - ): String! + ): String! @env(required: true) } 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 b5c5bb3ef9..5b17d8d70f 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 @@ -16,6 +16,6 @@ export abstract class Module extends PluginModule { abstract method( args: Args_method, client: CoreClient, - env?: null + env?: Types.Env | null ): MaybeAsync; } diff --git a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/wrap.info.ts b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/wrap.info.ts index 9e3fbbf09c..a9402e7bb6 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/wrap.info.ts +++ b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/expected/wrap/wrap.info.ts @@ -43,6 +43,9 @@ export const manifest: WrapManifest = { "type": "String" } ], + "env": { + "required": false + }, "kind": 64, "name": "method", "required": true, diff --git a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/schema.graphql b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/schema.graphql index 50786e40e4..130b524401 100644 --- a/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/schema.graphql +++ b/packages/test-cases/cases/cli/plugin/codegen/004-env-sanitization/schema.graphql @@ -5,5 +5,5 @@ type Env { type Module { method( str: String! - ): String! + ): String! @env(required: false) } From 684a6e65a5242e0e53d5068084856a26dae05d9e Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 14:52:25 +0400 Subject: [PATCH 10/13] fix: error --- packages/js/client/src/__tests__/core/error-structure.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/client/src/__tests__/core/error-structure.spec.ts b/packages/js/client/src/__tests__/core/error-structure.spec.ts index c6f599a812..367d8d6b6b 100644 --- a/packages/js/client/src/__tests__/core/error-structure.spec.ts +++ b/packages/js/client/src/__tests__/core/error-structure.spec.ts @@ -234,7 +234,7 @@ describe("Error structure", () => { expect(prev.args).toEqual('{\n "a": "Hey"\n}'); expect(prevOfPrev.source).toEqual({ file: "src/index.ts", - row: 8, + row: 13, col: 5, }); }); From f8cf85623cc93c3633e6a26bbec4164334ca1911 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 22:26:48 +0400 Subject: [PATCH 11/13] fix: issues --- packages/cli/src/__tests__/e2e/create.spec.ts | 36 ++++++++++++------- .../src/__tests__/e2e/test/test/package.json | 6 ++++ .../cli/src/__tests__/e2e/test/test/yarn.lock | 8 +++++ .../polywrap.wasm-linked.build.yaml | 11 ++++++ .../assemblyscript/polywrap.wasm-linked.yaml | 9 +++++ 5 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 packages/cli/src/__tests__/e2e/test/test/package.json create mode 100644 packages/cli/src/__tests__/e2e/test/test/yarn.lock create mode 100644 packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml create mode 100644 packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml diff --git a/packages/cli/src/__tests__/e2e/create.spec.ts b/packages/cli/src/__tests__/e2e/create.spec.ts index 56a654ca6c..791a60b8d0 100644 --- a/packages/cli/src/__tests__/e2e/create.spec.ts +++ b/packages/cli/src/__tests__/e2e/create.spec.ts @@ -134,7 +134,7 @@ describe("e2e tests for create command", () => { it("Should successfully generate project", async () => { rimraf.sync(`${__dirname}/test`); - const { exitCode: code, stdout: output } = await runCli({ + const { exitCode: code, stdout: output, stderr: error } = await runCli({ args: [ "create", project, @@ -149,6 +149,8 @@ describe("e2e tests for create command", () => { } }); + console.log({ code, output, error }) + expect(code).toEqual(0); expect(clearStyle(output)).toContain( "🔥 You are ready " @@ -163,9 +165,11 @@ describe("e2e tests for create command", () => { describe("template", () => { it("Should throw error for missing required argument - url", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ + const { exitCode: code, stdout: output, stderr: error } = await runCli({ args: ["create", "template"], - cli: polywrapCli, + config: { + cli: polywrapCli, + } }); expect(code).toEqual(1); @@ -174,9 +178,11 @@ describe("e2e tests for create command", () => { }); it("Should throw error for missing required argument - name", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ + const { exitCode: code, stdout: output, stderr: error } = await runCli({ args: ["create", "template", "lang"], - cli: polywrapCli, + config: { + cli: polywrapCli, + } }); expect(code).toEqual(1); @@ -185,9 +191,11 @@ describe("e2e tests for create command", () => { }); it("Should throw error for invalid url parameter", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ + const { exitCode: code, stdout: output, stderr: error } = await runCli({ args: ["create", "template", "lang", "demo"], - cli: polywrapCli, + config: { + cli: polywrapCli, + } }); expect(code).toEqual(1); @@ -200,9 +208,11 @@ describe("e2e tests for create command", () => { describe(format, () => { it("Should throw error for missing path argument for --output-dir option", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ + const { exitCode: code, stdout: output, stderr: error } = await runCli({ args: ["create", "template", url, "name", "-o"], - cli: polywrapCli, + config: { + cli: polywrapCli, + } }); expect(code).toEqual(1); @@ -215,7 +225,7 @@ describe("e2e tests for create command", () => { it("Should successfully generate project", async () => { rimraf.sync(`${__dirname}/test`); - const { exitCode: code, stdout: output } = await runCLI({ + const { exitCode: code, stdout: output } = await runCli({ args: [ "create", "template", @@ -224,8 +234,10 @@ describe("e2e tests for create command", () => { "-o", `${__dirname}/test`, ], - cwd: __dirname, - cli: polywrapCli, + config: { + cwd: __dirname, + cli: polywrapCli, + } }); expect(code).toEqual(0); diff --git a/packages/cli/src/__tests__/e2e/test/test/package.json b/packages/cli/src/__tests__/e2e/test/test/package.json new file mode 100644 index 0000000000..2fa4d1766b --- /dev/null +++ b/packages/cli/src/__tests__/e2e/test/test/package.json @@ -0,0 +1,6 @@ +{ + "name": "template", + "dependencies": { + "@polywrap/templates": "0.9.6" + } +} diff --git a/packages/cli/src/__tests__/e2e/test/test/yarn.lock b/packages/cli/src/__tests__/e2e/test/test/yarn.lock new file mode 100644 index 0000000000..2f67d4bcdf --- /dev/null +++ b/packages/cli/src/__tests__/e2e/test/test/yarn.lock @@ -0,0 +1,8 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@polywrap/templates@0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@polywrap/templates/-/templates-0.9.6.tgz#755d10b1a0d72c4d0e0f81054d42e48f1686d61c" + integrity sha512-Dlr8C5QFKbz7w2jWmwCJj4BS6KVFgYTVa+6CeP1kHXztzgF41U0gZ9ZvKZtqyuea2dYixzL8S+ol2yy/4CZGdQ== diff --git a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml new file mode 100644 index 0000000000..8df221b07c --- /dev/null +++ b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml @@ -0,0 +1,11 @@ +format: 0.3.0 +strategies: + image: + name: wrap-wasm-as-build-image + node_version: 16.13.0 + include: + - ./package.json + - ./src +linked_packages: + - name: "@polywrap/wasm-as" + path: ../../../wasm/as diff --git a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml new file mode 100644 index 0000000000..06c9f04803 --- /dev/null +++ b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml @@ -0,0 +1,9 @@ +format: 0.3.0 +project: + name: template-wasm-as + type: wasm/assemblyscript +source: + module: ./src/index.ts + schema: ./src/schema.graphql +extensions: + build: ./polywrap.wasm-linked.build.yaml From b5e76877cb034b0983e5b582211e5ac1c62cf579 Mon Sep 17 00:00:00 2001 From: Niraj Kamdar Date: Wed, 15 Mar 2023 22:54:20 +0400 Subject: [PATCH 12/13] fix: issues --- packages/js/client-config-builder/package.json | 6 +++--- packages/js/wasm/package.json | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/js/client-config-builder/package.json b/packages/js/client-config-builder/package.json index 4a58f2abc4..deae495d84 100644 --- a/packages/js/client-config-builder/package.json +++ b/packages/js/client-config-builder/package.json @@ -29,9 +29,9 @@ "@polywrap/file-system-plugin-js": "~0.10.0-pre", "@polywrap/http-plugin-js": "~0.10.0-pre", "@polywrap/logger-plugin-js": "0.10.0-pre.10", - "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.11", - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", - "@polywrap/wasm-js": "0.10.0-pre.11", + "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.12", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", + "@polywrap/wasm-js": "0.10.0-pre.12", "base64-to-uint8array": "1.0.0" }, "devDependencies": { diff --git a/packages/js/wasm/package.json b/packages/js/wasm/package.json index 34a554daa0..6c75f1b41d 100644 --- a/packages/js/wasm/package.json +++ b/packages/js/wasm/package.json @@ -26,6 +26,9 @@ "@polywrap/tracing-js": "0.10.0-pre.12", "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, + "peerDependencies": { + "@polywrap/core-js": "0.10.x" + }, "devDependencies": { "@polywrap/cli-js": "0.10.0-pre.12", "@types/jest": "26.0.8", From 7d200b0805246ec4426b75d158f69275b412084e Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Wed, 15 Mar 2023 16:55:26 -0400 Subject: [PATCH 13/13] chore: remove needless files --- packages/cli/src/__tests__/e2e/create.spec.ts | 4 +--- packages/cli/src/__tests__/e2e/test/test/package.json | 6 ------ packages/cli/src/__tests__/e2e/test/test/yarn.lock | 8 -------- .../assemblyscript/polywrap.wasm-linked.build.yaml | 11 ----------- .../wasm/assemblyscript/polywrap.wasm-linked.yaml | 9 --------- 5 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 packages/cli/src/__tests__/e2e/test/test/package.json delete mode 100644 packages/cli/src/__tests__/e2e/test/test/yarn.lock delete mode 100644 packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml delete mode 100644 packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml diff --git a/packages/cli/src/__tests__/e2e/create.spec.ts b/packages/cli/src/__tests__/e2e/create.spec.ts index e997a56412..8f417c0f29 100644 --- a/packages/cli/src/__tests__/e2e/create.spec.ts +++ b/packages/cli/src/__tests__/e2e/create.spec.ts @@ -144,7 +144,7 @@ describe("e2e tests for create command", () => { it("Should successfully generate project", async () => { rimraf.sync(`${__dirname}/test`); - const { exitCode: code, stdout: output, stderr: error } = await runCli({ + const { exitCode: code, stdout: output } = await runCli({ args: [ "create", project, @@ -163,8 +163,6 @@ describe("e2e tests for create command", () => { } }); - console.log({ code, output, error }) - expect(code).toEqual(0); expect(clearStyle(output)).toContain( "🔥 You are ready " diff --git a/packages/cli/src/__tests__/e2e/test/test/package.json b/packages/cli/src/__tests__/e2e/test/test/package.json deleted file mode 100644 index 2fa4d1766b..0000000000 --- a/packages/cli/src/__tests__/e2e/test/test/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "template", - "dependencies": { - "@polywrap/templates": "0.9.6" - } -} diff --git a/packages/cli/src/__tests__/e2e/test/test/yarn.lock b/packages/cli/src/__tests__/e2e/test/test/yarn.lock deleted file mode 100644 index 2f67d4bcdf..0000000000 --- a/packages/cli/src/__tests__/e2e/test/test/yarn.lock +++ /dev/null @@ -1,8 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@polywrap/templates@0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@polywrap/templates/-/templates-0.9.6.tgz#755d10b1a0d72c4d0e0f81054d42e48f1686d61c" - integrity sha512-Dlr8C5QFKbz7w2jWmwCJj4BS6KVFgYTVa+6CeP1kHXztzgF41U0gZ9ZvKZtqyuea2dYixzL8S+ol2yy/4CZGdQ== diff --git a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml deleted file mode 100644 index 8df221b07c..0000000000 --- a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.build.yaml +++ /dev/null @@ -1,11 +0,0 @@ -format: 0.3.0 -strategies: - image: - name: wrap-wasm-as-build-image - node_version: 16.13.0 - include: - - ./package.json - - ./src -linked_packages: - - name: "@polywrap/wasm-as" - path: ../../../wasm/as diff --git a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml b/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml deleted file mode 100644 index 06c9f04803..0000000000 --- a/packages/templates/wasm/assemblyscript/polywrap.wasm-linked.yaml +++ /dev/null @@ -1,9 +0,0 @@ -format: 0.3.0 -project: - name: template-wasm-as - type: wasm/assemblyscript -source: - module: ./src/index.ts - schema: ./src/schema.graphql -extensions: - build: ./polywrap.wasm-linked.build.yaml