diff --git a/packages/cli/src/lib/defaults/build-images/wasm/assemblyscript/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-images/wasm/assemblyscript/Dockerfile.mustache index e7519b153c..e233c527ec 100644 --- a/packages/cli/src/lib/defaults/build-images/wasm/assemblyscript/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-images/wasm/assemblyscript/Dockerfile.mustache @@ -39,6 +39,5 @@ RUN ./node_modules/.bin/asc {{dir}}/wrap/entry.ts \ --use abort={{dir}}/wrap/entry/wrapAbort \ --optimize --importMemory \ --runtime stub \ - --runPasses asyncify \ - --transform @serial-as/transform + --runPasses asyncify {{/polywrap_module}} diff --git a/packages/js/client/src/__tests__/e2e/test-cases.ts b/packages/js/client/src/__tests__/e2e/test-cases.ts index 52d8c0de63..39493c523a 100644 --- a/packages/js/client/src/__tests__/e2e/test-cases.ts +++ b/packages/js/client/src/__tests__/e2e/test-cases.ts @@ -632,40 +632,68 @@ export const runJsonTypeTest = async ( client: PolywrapClient, uri: string ) => { - const fromJson = await client.invoke<{ x: number; y: number }>({ + type Json = string; + const value = JSON.stringify({ foo: "bar", bar: "bar" }) + const parseResponse = await client.invoke<{ parse: Json }>({ uri, - method: "fromJson", + method: "parse", input: { - json: JSON.stringify({ x: 1, y: 2 }), - }, - }); + value + } + }) - expect(fromJson.error).toBeFalsy(); - expect(fromJson.data).toBeTruthy(); - expect(fromJson.data).toMatchObject({ - x: 1, - y: 2, - }); + expect(parseResponse.data).toEqual(value); + + const values = [ + JSON.stringify({ bar: "foo" }), + JSON.stringify({ baz: "fuz" }), + ]; - const toJson = await client.invoke<{ str: string }>({ + const stringifyResponse = await client.invoke<{ stringify: Json}>({ uri, - method: "toJson", + method: "stringify", input: { - pair: { - x: 1, - y: 2, - }, + values + } + }) + + expect(stringifyResponse.data).toEqual(values.join("")); + + const object = { + jsonA: JSON.stringify({ foo: "bar" }), + jsonB: JSON.stringify({ fuz: "baz" }), + }; + + const stringifyObjectResponse = await client.invoke<{ + stringifyObject: string; + }>({ + uri, + method: "stringifyObject", + input: { + object, }, }); - expect(toJson.error).toBeFalsy(); - expect(toJson.data).toBeTruthy(); - expect(toJson.data).toBe( - JSON.stringify({ - x: 1, - y: 2, - }) + expect(stringifyObjectResponse.data).toEqual( + object.jsonA + object.jsonB ); + + const json = { + valueA: 5, + valueB: "foo", + valueC: true + } + + const methodJSONResponse = await client.invoke<{ + methodJSON: Json; + }>({ + uri, + method: "methodJSON", + input: json + }); + + const methodJSONResult = JSON.stringify(json); + expect(methodJSONResponse.data).toEqual(methodJSONResult); }; export const runLargeTypesTest = async ( diff --git a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache index ab841d2923..67b0c6616d 100644 --- a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache +++ b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serialize{{type}}, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from "../.."; -@serializable export class {{type}} { public static uri: string = "{{uri}}"; @@ -40,6 +37,4 @@ export class {{type}} { static read(reader: Read): {{type}} { return read{{type}}(reader); } - - {{> json_methods}} } diff --git a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/json_methods.mustache b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/json_methods.mustache deleted file mode 100644 index baa2597301..0000000000 --- a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/json_methods.mustache +++ /dev/null @@ -1,7 +0,0 @@ -static toJson(type: {{type}}): JSON.Value { - return JSONSerializer.encode(type); -} - -static fromJson(json: JSON.Value): {{type}} { - return (new JSONDeserializer(json)).decode<{{type}}>(); -} diff --git a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache index 9bdd689ad6..027abfc84a 100644 --- a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache +++ b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serialize{{type}}, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from ".."; -@serializable export class {{type}} { {{#properties}} {{#handleKeywords}}{{name}}{{/handleKeywords}}: {{#toWasm}}{{toGraphQLType}}{{/toWasm}}; @@ -37,6 +34,4 @@ export class {{type}} { static read(reader: Read): {{type}} { return read{{type}}(reader); } - - {{> json_methods}} } diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts index cd97ce73c5..079edb851d 100644 --- a/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serializeAnotherType, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from ".."; -@serializable export class AnotherType { prop: string | null; circular: Types.CustomType | null; @@ -37,12 +34,4 @@ export class AnotherType { static read(reader: Read): AnotherType { return readAnotherType(reader); } - - static toJson(type: AnotherType): JSON.Value { - return JSONSerializer.encode(type); - } - - static fromJson(json: JSON.Value): AnotherType { - return (new JSONDeserializer(json)).decode(); - } } diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts index 0edc7a7894..106ba4ec4c 100644 --- a/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serializeCustomType, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from ".."; -@serializable export class CustomType { str: string; optStr: string | null; @@ -71,12 +68,4 @@ export class CustomType { static read(reader: Read): CustomType { return readCustomType(reader); } - - static toJson(type: CustomType): JSON.Value { - return JSONSerializer.encode(type); - } - - static fromJson(json: JSON.Value): CustomType { - return (new JSONDeserializer(json)).decode(); - } } diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/Env/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/Env/index.ts index 09dee2ac73..b1d03b3c41 100644 --- a/packages/test-cases/cases/bind/sanity/output/wasm-as/Env/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/wasm-as/Env/index.ts @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serializeEnv, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from ".."; -@serializable export class Env { prop: string; optProp: string | null; @@ -37,12 +34,4 @@ export class Env { static read(reader: Read): Env { return readEnv(reader); } - - static toJson(type: Env): JSON.Value { - return JSONSerializer.encode(type); - } - - static fromJson(json: JSON.Value): Env { - return (new JSONDeserializer(json)).decode(); - } } diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_AnotherObject/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_AnotherObject/index.ts index 6a52f417bb..71b2e624e2 100644 --- a/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_AnotherObject/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_AnotherObject/index.ts @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serializeTestImport_AnotherObject, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from "../.."; -@serializable export class TestImport_AnotherObject { public static uri: string = "testimport.uri.eth"; @@ -38,12 +35,4 @@ export class TestImport_AnotherObject { static read(reader: Read): TestImport_AnotherObject { return readTestImport_AnotherObject(reader); } - - static toJson(type: TestImport_AnotherObject): JSON.Value { - return JSONSerializer.encode(type); - } - - static fromJson(json: JSON.Value): TestImport_AnotherObject { - return (new JSONDeserializer(json)).decode(); - } } diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_Object/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_Object/index.ts index fc03152ed8..2994b902f7 100644 --- a/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_Object/index.ts +++ b/packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_Object/index.ts @@ -4,9 +4,7 @@ import { Nullable, BigInt, BigNumber, - JSON, - JSONSerializer, - JSONDeserializer, + JSON } from "@polywrap/wasm-as"; import { serializeTestImport_Object, @@ -16,7 +14,6 @@ import { } from "./serialization"; import * as Types from "../.."; -@serializable export class TestImport_Object { public static uri: string = "testimport.uri.eth"; @@ -45,12 +42,4 @@ export class TestImport_Object { static read(reader: Read): TestImport_Object { return readTestImport_Object(reader); } - - static toJson(type: TestImport_Object): JSON.Value { - return JSONSerializer.encode(type); - } - - static fromJson(json: JSON.Value): TestImport_Object { - return (new JSONDeserializer(json)).decode(); - } } diff --git a/packages/test-cases/cases/wrappers/wasm-as/json-type/schema.graphql b/packages/test-cases/cases/wrappers/wasm-as/json-type/schema.graphql index ccae1af02b..cb60b87271 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/json-type/schema.graphql +++ b/packages/test-cases/cases/wrappers/wasm-as/json-type/schema.graphql @@ -1,9 +1,24 @@ type Module { - fromJson(json: JSON!): Pair! - toJson(pair: Pair!): JSON! -} + parse( + value: String! + ): JSON! + + stringify( + values: [JSON!]! + ): String! -type Pair { - x: Int! - y: Int! + stringifyObject( + object: Object! + ): String! + + methodJSON( + valueA: Int! + valueB: String! + valueC: Boolean! + ): JSON! } + +type Object { + jsonA: JSON! + jsonB: JSON! +} \ No newline at end of file diff --git a/packages/test-cases/cases/wrappers/wasm-as/json-type/src/index.ts b/packages/test-cases/cases/wrappers/wasm-as/json-type/src/index.ts index 1f9a6be8db..553f2b5b52 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/json-type/src/index.ts +++ b/packages/test-cases/cases/wrappers/wasm-as/json-type/src/index.ts @@ -1,14 +1,36 @@ import { - Input_fromJson, - Input_toJson, - Pair + Input_parse, + Input_stringify, + Input_stringifyObject, + Input_methodJSON } from "./wrap"; import { JSON } from "@polywrap/wasm-as"; -export function fromJson(input: Input_fromJson): Pair { - return Pair.fromJson(input.json); +export function parse(input: Input_parse): JSON.Value { + return JSON.parse(input.value); } -export function toJson(input: Input_toJson): JSON.Value { - return Pair.toJson(input.pair); +export function stringify(input: Input_stringify): string { + let str = ""; + for (let i = 0; i < input.values.length; ++i) { + const value = input.values[i]; + str += value.stringify(); + } + return str; } + +export function stringifyObject(input: Input_stringifyObject): string { + let str = ""; + str += input.object.jsonA.stringify(); + str += input.object.jsonB.stringify(); + return str; +} + +export function methodJSON(input: Input_methodJSON): JSON.Value { + const result = JSON.Value.Object(); + result.set("valueA", JSON.from(input.valueA)); + result.set("valueB", JSON.from(input.valueB)); + result.set("valueC", JSON.from(input.valueC)); + + return result; +} \ No newline at end of file diff --git a/packages/test-cases/cases/wrappers/wasm-rs/json-type/schema.graphql b/packages/test-cases/cases/wrappers/wasm-rs/json-type/schema.graphql index ccae1af02b..cb60b87271 100644 --- a/packages/test-cases/cases/wrappers/wasm-rs/json-type/schema.graphql +++ b/packages/test-cases/cases/wrappers/wasm-rs/json-type/schema.graphql @@ -1,9 +1,24 @@ type Module { - fromJson(json: JSON!): Pair! - toJson(pair: Pair!): JSON! -} + parse( + value: String! + ): JSON! + + stringify( + values: [JSON!]! + ): String! -type Pair { - x: Int! - y: Int! + stringifyObject( + object: Object! + ): String! + + methodJSON( + valueA: Int! + valueB: String! + valueC: Boolean! + ): JSON! } + +type Object { + jsonA: JSON! + jsonB: JSON! +} \ No newline at end of file diff --git a/packages/test-cases/cases/wrappers/wasm-rs/json-type/src/lib.rs b/packages/test-cases/cases/wrappers/wasm-rs/json-type/src/lib.rs index 9c157f5361..771fd3f151 100644 --- a/packages/test-cases/cases/wrappers/wasm-rs/json-type/src/lib.rs +++ b/packages/test-cases/cases/wrappers/wasm-rs/json-type/src/lib.rs @@ -3,10 +3,26 @@ pub use wrap::*; use polywrap_wasm_rs::JSON; use serde_json::*; -pub fn from_json(input: InputFromJson) -> Pair { - serde_json::from_value::(input.json).unwrap() +pub fn stringify(input: InputStringify) -> String { + let mut new_string = String::from(""); + for object in &input.values { + new_string.push_str(&object.to_string()); + } + new_string } -pub fn to_json(input: InputToJson) -> JSON::Value { - JSON::to_value(&input.pair).unwrap() +pub fn parse(input: InputParse) -> JSON::Value { JSON::from_str(&input.value).unwrap() } + +pub fn stringify_object(input: InputStringifyObject) -> String { + let mut new_string = String::from(&input.object.json_a.to_string()); + new_string.push_str(&input.object.json_b.to_string()); + new_string } + +pub fn method_j_s_o_n(input: InputMethodJSON) -> JSON::Value { + json!({ + "valueA": input.value_a, + "valueB": input.value_b, + "valueC": input.value_c + }) +} \ No newline at end of file diff --git a/packages/wasm/as/assembly/json/index.ts b/packages/wasm/as/assembly/json/index.ts index dd01d736aa..2925c6b247 100644 --- a/packages/wasm/as/assembly/json/index.ts +++ b/packages/wasm/as/assembly/json/index.ts @@ -1,5 +1 @@ -export { - ValueDeserializer as JSONDeserializer, - ValueSerializer as JSONSerializer, - JSON, -} from "@web3api/serial-as-json"; +export * from "@web3api/assemblyscript-json"; diff --git a/packages/wasm/as/package.json b/packages/wasm/as/package.json index cd88d632ac..b66b8ce24a 100644 --- a/packages/wasm/as/package.json +++ b/packages/wasm/as/package.json @@ -21,8 +21,7 @@ "test:ci": "asp --summary" }, "dependencies": { - "@serial-as/transform": "1.0.2", - "@web3api/serial-as-json": "1.0.4", + "@web3api/assemblyscript-json": "1.2.0", "as-bigint": "0.5.3", "as-bignumber": "0.2.0", "as-container": "0.6.1" diff --git a/yarn.lock b/yarn.lock index 8da8eb0bc5..c4327bce52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3081,10 +3081,10 @@ "@octokit/types" "^6.0.3" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^12.1.0": - version "12.1.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.1.0.tgz#a68b60e969f26dee0eb7d127c65a84967f2d3a6e" - integrity sha512-kQzJh3ZUv3lDpi6M+uekMRHULvf9DlWoI1XgKN6nPeGDzkSgtkhVq1MMz3bFKQ6H6GbdC3ZqG/a6VzKhIx0VeA== +"@octokit/openapi-types@^12.4.0": + version "12.4.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.4.0.tgz#fd8bf5db72bd566c5ba2cb76754512a9ebe66e71" + integrity sha512-Npcb7Pv30b33U04jvcD7l75yLU0mxhuX2Xqrn51YyZ5WTkF04bpbxLaZ6GcaTqu03WZQHoO/Gbfp95NGRueDUA== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -3092,11 +3092,11 @@ integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== "@octokit/plugin-paginate-rest@^2.16.8": - version "2.18.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.18.0.tgz#e412977782690a4134b0a4aa2f536cca7a2ca125" - integrity sha512-n5/AzIoy5Wzp85gqzSbR+dWQDHlyHZrGijnDfLh452547Ynu0hCvszH7EfRE0eqM5ZjfkplO0k+q+P8AAIIJEA== + version "2.19.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.19.0.tgz#b52eae6ecacfa1f5583dc2cc0985cfbed3ca78b0" + integrity sha512-hQ4Qysg2hNmEMuZeJkvyzM4eSZiTifOKqYAMsW8FnxFKowhuwWICSgBQ9Gn9GpUmgKB7qaf1hFvMjYaTAg5jQA== dependencies: - "@octokit/types" "^6.35.0" + "@octokit/types" "^6.36.0" "@octokit/plugin-request-log@^1.0.4": version "1.0.4" @@ -3104,11 +3104,11 @@ integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== "@octokit/plugin-rest-endpoint-methods@^5.12.0": - version "5.14.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.14.0.tgz#758e01ac40998e607feaea7f80220c69990814ae" - integrity sha512-MRnMs4Dcm1OSaz/g/RLr4YY9otgysS7vN5SUkHGd7t+R8323cHsHFoEWHYPSmgUC0BieHRhvnCRWb4i3Pl+Lgg== + version "5.15.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.15.0.tgz#6c8251b55c33315a6e53e5b55654f72023ed5049" + integrity sha512-Gsw9+Xm56jVhfbJoy4pt6eOOyf8/3K6CAnx1Sl7U2GhZWcg8MR6YgXWnpfdF69S2ViMXLA7nfvTDAsZpFlkLRw== dependencies: - "@octokit/types" "^6.35.0" + "@octokit/types" "^6.36.0" deprecation "^2.3.1" "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": @@ -3142,12 +3142,12 @@ "@octokit/plugin-request-log" "^1.0.4" "@octokit/plugin-rest-endpoint-methods" "^5.12.0" -"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.35.0": - version "6.35.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.35.0.tgz#11cd9a679c32b4a6c36459ae2ec3ac4de0104f71" - integrity sha512-DhLfdUuv3H37u6jBDfkwamypx3HflHg29b26nbA6iVFYkAlZ5cMEtu/9pQoihGnQE5M7jJFnNo25Rr1UwQNF8Q== +"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.36.0": + version "6.37.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.37.0.tgz#32eb78edb34cf5cea4ba5753ab8db75b776d617a" + integrity sha512-BXWQhFKRkjX4dVW5L2oYa0hzWOAqsEsujXsQLSdepPoDZfYdubrD1KDGpyNldGXtR8QM/WezDcxcIN1UKJMGPA== dependencies: - "@octokit/openapi-types" "^12.1.0" + "@octokit/openapi-types" "^12.4.0" "@opentelemetry/api-metrics@0.20.0": version "0.20.0" @@ -3284,21 +3284,6 @@ "@opentelemetry/semantic-conventions" "0.20.0" "@opentelemetry/tracing" "0.20.0" -"@serial-as/core@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@serial-as/core/-/core-1.0.2.tgz#a3b21d6962fed7aaae978d63bc0551be65b36ea6" - integrity sha512-aJFMzEn5eztHI5ZcxCGYiRXuj8xVQt+JGTzCVHq/NMBHubAi4MC48/e3VVjqGoHo+FdPlnGropx08YPrc3ENCw== - dependencies: - "@serial-as/transform" "1.0.2" - as-bignum "^0.2.17" - -"@serial-as/transform@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@serial-as/transform/-/transform-1.0.2.tgz#95ed7aa2879f13825ea4b404718ee1eca9ad71c7" - integrity sha512-1Uti3bxGYrkN1yhV0aVuAQ46dsEvWXUDVQ+2btC5nFo0N2UJ8860K3HVc6y3Xm2pEDMW/6IrmfZoapNV1E3jMw== - dependencies: - visitor-as "^0.7.0-1" - "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -3941,15 +3926,6 @@ resolved "https://registry.yarnpkg.com/@web3api/assemblyscript-json/-/assemblyscript-json-1.2.0.tgz#f01f11f12a66cd1a319d43f12e476307d1ad3da8" integrity sha512-x+wchJpH1giJzXj3dYs8vh2SKMXepeqVXiaFV/YCtXg4X/KaUnxi0kp5JugbEAyEJurEScH1YuV6IvGhGui/fw== -"@web3api/serial-as-json@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@web3api/serial-as-json/-/serial-as-json-1.0.4.tgz#87724866b823182591ab6831c7c24b87f713a520" - integrity sha512-ip5VsRFIXIlqiPxAivNnS/UoyuMZiflKz2ljgjJABmeFhwbuuoMxUO/efHc85mqZ2AGbG1n4K8q+mcH8hqchcQ== - dependencies: - "@serial-as/core" "1.0.2" - "@web3api/assemblyscript-json" "1.2.0" - as-base64 "^0.2.0" - "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -4612,21 +4588,11 @@ arrify@^2.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -as-base64@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/as-base64/-/as-base64-0.2.0.tgz#b4bed937c93bfb6524b932b517e1b8571a0dd518" - integrity sha512-j6JxprAVN4SXUcZiSChuMBf0JJOCdh5OfrHAepluxmFWuDZZm+YjmfNSk8djUHRPEB+Ui5HGvrz46GLvTJf3ig== - as-bigint@0.5.3, as-bigint@^0.5.1: version "0.5.3" resolved "https://registry.yarnpkg.com/as-bigint/-/as-bigint-0.5.3.tgz#a0647d0b7ce835077aca33115e71eb26a83df8be" integrity sha512-tg9iTO/vPeovOM5CSk1WxYcsfBd/cd3twhBW5PrpcGUfiSEXlPB69eOxFKvSbZnpuDxBAyQ4YBgEkfnYL89Czw== -as-bignum@^0.2.17: - version "0.2.18" - resolved "https://registry.yarnpkg.com/as-bignum/-/as-bignum-0.2.18.tgz#61ed4dd07d4a62107bde227fdb4370190217bf0b" - integrity sha512-5LODrOr7wvS643oh7PHfyRtbBO9vCcU69vNNvrqh5yovrApM9nRHDeT5XcqnaSI8TqK9ZhN12qhZnq4rdIGcwQ== - as-bignumber@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/as-bignumber/-/as-bignumber-0.2.0.tgz#13feb2e5054c8a2d557618de2e507af39cfb7532" @@ -5362,15 +5328,14 @@ browserslist@4.10.0: pkg-up "^3.1.0" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.20.4, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.20.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477" - integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw== + version "4.21.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.0.tgz#7ab19572361a140ecd1e023e2c1ed95edda0cefe" + integrity sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA== dependencies: - caniuse-lite "^1.0.30001349" - electron-to-chromium "^1.4.147" - escalade "^3.1.1" + caniuse-lite "^1.0.30001358" + electron-to-chromium "^1.4.164" node-releases "^2.0.5" - picocolors "^1.0.0" + update-browserslist-db "^1.0.0" bs-logger@0.x: version "0.2.6" @@ -5639,10 +5604,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001349: - version "1.0.30001357" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz#dec7fc4158ef6ad24690d0eec7b91f32b8cb1b5d" - integrity sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001358: + version "1.0.30001358" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz#473d35dabf5e448b463095cab7924e96ccfb8c00" + integrity sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw== capture-exit@^2.0.0: version "2.0.0" @@ -6370,17 +6335,17 @@ copyfiles@2.4.1: yargs "^16.1.0" core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.6.2: - version "3.23.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b" - integrity sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A== + version "3.23.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.2.tgz#5cbf8a9c8812d665392845b85ae91b5bcc7b615c" + integrity sha512-lrgZvxFwbQp9v7E8mX0rJ+JX7Bvh4eGULZXA1IAyjlsnWvCdw6TF8Tg6xtaSUSJMrSrMaLdpmk+V54LM1dvfOA== dependencies: browserslist "^4.20.4" semver "7.0.0" core-js-pure@^3.20.2: - version "3.23.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.23.1.tgz#0b27e4c3ad46178b84e790dbbb81987218ab82ad" - integrity sha512-3qNgf6TqI3U1uhuSYRzJZGfFd4T+YlbyVPl+jgRiKjdZopvG4keZQwWZDAWpu1UH9nCgTpUzIV3GFawC7cJsqg== + version "3.23.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.23.2.tgz#efe5e486469c5ed2d088d76e973eb12e74a930e7" + integrity sha512-t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA== core-js@^2.4.0: version "2.6.12" @@ -6388,9 +6353,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.5.0: - version "3.23.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78" - integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w== + version "3.23.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.2.tgz#e07a60ca8b14dd129cabdc3d2551baf5a01c76f0" + integrity sha512-ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ== core-util-is@1.0.2: version "1.0.2" @@ -7319,10 +7284,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.4.147: - version "1.4.161" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz#49cb5b35385bfee6cc439d0a04fbba7a7a7f08a1" - integrity sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.4.164: + version "1.4.164" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.164.tgz#3d0f5c83557d8ec8a7faa531e498f198c3bd974a" + integrity sha512-K7iy5y6XyP9Pzh3uaDti0KC4JUNT6T1tLG5RTOmesqq2YgAJpYYYJ32m+anvZYjCV35llPTEh87kvEV/uSsiyQ== elliptic@6.5.4, elliptic@^6.5.3: version "6.5.4" @@ -17660,6 +17625,14 @@ upath@^2.0.1: resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== +update-browserslist-db@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz#6c47cb996f34afb363e924748e2f6e4d983c6fc1" + integrity sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -17860,14 +17833,6 @@ visitor-as@^0.6.0: lodash.clonedeep "^4.5.0" ts-mixer "^5.4.1" -visitor-as@^0.7.0-1: - version "0.7.0-2" - resolved "https://registry.yarnpkg.com/visitor-as/-/visitor-as-0.7.0-2.tgz#28f1c51801a677f14c4487c78a85ad541cfe382d" - integrity sha512-JDviqVnGn8i5qafLYuZUGlNeyc/8STIBnmNiXizvHO29xxJDaHNHxbr4Gh+9ksIJvMh9TNQKBeSyT2tldNbpJw== - dependencies: - lodash.clonedeep "^4.5.0" - ts-mixer "^5.4.1" - vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"