From 911c570199a1d72e85eef622b64559818e2769c0 Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Wed, 7 Jun 2023 14:15:34 -0700 Subject: [PATCH 1/9] Updating rust release to properly login Signed-off-by: Shivansh Vij --- .github/workflows/releases.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/releases.yaml b/.github/workflows/releases.yaml index aa65875..165c813 100644 --- a/.github/workflows/releases.yaml +++ b/.github/workflows/releases.yaml @@ -20,9 +20,9 @@ jobs: - name: Cargo build run: cargo build --release - name: Publish to crates.io - run: cargo publish --token $CRATES_IO_TOKEN + run: cargo publish env: - CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }} + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} Typescript: runs-on: ubuntu-latest steps: From c8e608addf8fcd70646f3ad4a3b3ab19d34f03bc Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Wed, 7 Jun 2023 15:44:03 -0700 Subject: [PATCH 2/9] Changing `license` in package.json to be SPDX compliant --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a949a9..2d805d8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@loopholelabs/polyglot", "version": "1.1.0", - "license": "apache-2.0", + "license": "Apache-2.0", "description": "A high-performance serialization framework used for encoding and decoding arbitrary datastructures across languages.", "homepage": "https://github.com/loopholelabs/polyglot", "source": "index.ts", From c1408869647360ff7d002c2262d09d1aa582ab12 Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Mon, 12 Jun 2023 13:29:43 -0400 Subject: [PATCH 3/9] Bumping dependency versions --- package-lock.json | 94 +++++++++++++++++++++++------------------------ package.json | 6 +-- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec4f84f..f964bc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,13 +7,13 @@ "": { "name": "@loopholelabs/polyglot", "version": "1.1.0", - "license": "apache-2.0", + "license": "Apache-2.0", "devDependencies": { "@types/jest": "^29.5.2", "@types/json-bigint": "^1.0.1", - "@types/node": "^20.2.5", - "@typescript-eslint/eslint-plugin": "^5.59.9", - "@typescript-eslint/parser": "^5.59.9", + "@types/node": "^20.3.0", + "@typescript-eslint/eslint-plugin": "^5.59.10", + "@typescript-eslint/parser": "^5.59.10", "eslint": "^8.42.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", @@ -1340,9 +1340,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.2.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz", - "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==", + "version": "20.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.0.tgz", + "integrity": "sha512-cumHmIAf6On83X7yP+LrsEyUOf/YlociZelmpRYaGFydoaPdxdt80MAbu6vWerQT2COCp2nPvHdsbD7tHn/YlQ==", "dev": true }, "node_modules/@types/prettier": { @@ -1385,15 +1385,15 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz", - "integrity": "sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.10.tgz", + "integrity": "sha512-L6Tu+ZNAsLW9N7KveQOojmi6AbVyrXfsd33P4i/8vkLdx/t4pA4xzTm/oPr5rp3odsNzeRZ0TKP2wYpaTdnL6Q==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.9", - "@typescript-eslint/type-utils": "5.59.9", - "@typescript-eslint/utils": "5.59.9", + "@typescript-eslint/scope-manager": "5.59.10", + "@typescript-eslint/type-utils": "5.59.10", + "@typescript-eslint/utils": "5.59.10", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -1419,14 +1419,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.9.tgz", - "integrity": "sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.10.tgz", + "integrity": "sha512-+CUYrEnvTpFJPjpNMRo1VcGh65ZYPmoDWbNsJS2QVeOxaiMa0wlngmP3AE09kRoXxtYQUAgRJvFTcnsTrkiaqQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.9", - "@typescript-eslint/types": "5.59.9", - "@typescript-eslint/typescript-estree": "5.59.9", + "@typescript-eslint/scope-manager": "5.59.10", + "@typescript-eslint/types": "5.59.10", + "@typescript-eslint/typescript-estree": "5.59.10", "debug": "^4.3.4" }, "engines": { @@ -1446,13 +1446,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz", - "integrity": "sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.10.tgz", + "integrity": "sha512-V8VE6b8O/ynZg8RvtICv1LqDhPnwPXm9eVsrOqeI4Bjk2SpOUOneI3Qp9/tu8z5q0RkE34fAastk8IzmsC6GnA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.9", - "@typescript-eslint/visitor-keys": "5.59.9" + "@typescript-eslint/types": "5.59.10", + "@typescript-eslint/visitor-keys": "5.59.10" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1463,13 +1463,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz", - "integrity": "sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.10.tgz", + "integrity": "sha512-ZkEMhDvvYLrK2kUf+nWXf/0mHRn5cL2VFxh0CqvPcA0Kmod6YuaSEqZpq93l+2BicYkymVui6a43Ni7fszUn/A==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.9", - "@typescript-eslint/utils": "5.59.9", + "@typescript-eslint/typescript-estree": "5.59.10", + "@typescript-eslint/utils": "5.59.10", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1490,9 +1490,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.9.tgz", - "integrity": "sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.10.tgz", + "integrity": "sha512-SEvEzdTbOgiaK8B891Zx7z92v3DBLzYvqWq2Jp5ne/4q8OUAb6Ydm/Ge4A0EawTezzmFR+09LJWFWzVztEifeA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1503,13 +1503,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz", - "integrity": "sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.10.tgz", + "integrity": "sha512-orXkvjDDAcB6gyxLCqdoJF5KcOHI6RBoizMj4AhgXyidifJHL3gqib3nNbQ2VNDQfJRnyc6pkezN63QAkEWDUA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.9", - "@typescript-eslint/visitor-keys": "5.59.9", + "@typescript-eslint/types": "5.59.10", + "@typescript-eslint/visitor-keys": "5.59.10", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1530,17 +1530,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.9.tgz", - "integrity": "sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.10.tgz", + "integrity": "sha512-Z02P8jPTyCNX+4pPn3H2z+AjLKwdNNmI284bX9HaUhWPhp/xxBlTMSvodycWOBYUCODK6d/8IVgQmMZ7JBhVbw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.9", - "@typescript-eslint/types": "5.59.9", - "@typescript-eslint/typescript-estree": "5.59.9", + "@typescript-eslint/scope-manager": "5.59.10", + "@typescript-eslint/types": "5.59.10", + "@typescript-eslint/typescript-estree": "5.59.10", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -1556,12 +1556,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.9", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz", - "integrity": "sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q==", + "version": "5.59.10", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.10.tgz", + "integrity": "sha512-AdeBi2ItKCtUd+SpNMNKFoaA8QM5IoXPBEXXHsbRn+J51Pk4yWQVf4uah67r9msAojmbtjDquyNqxXPFNJ38yg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.9", + "@typescript-eslint/types": "5.59.10", "eslint-visitor-keys": "^3.3.0" }, "engines": { diff --git a/package.json b/package.json index 2d805d8..0b9dc68 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "devDependencies": { "@types/jest": "^29.5.2", "@types/json-bigint": "^1.0.1", - "@types/node": "^20.2.5", - "@typescript-eslint/eslint-plugin": "^5.59.9", - "@typescript-eslint/parser": "^5.59.9", + "@types/node": "^20.3.0", + "@typescript-eslint/eslint-plugin": "^5.59.10", + "@typescript-eslint/parser": "^5.59.10", "eslint": "^8.42.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", From 25362c2e325bd5f1101869cd8f9fb8164aa1b3bc Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Mon, 12 Jun 2023 13:31:49 -0400 Subject: [PATCH 4/9] Bumping dependency versions --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index add44cf..491aac2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,11 @@ byteorder = "1" [dev-dependencies] serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.82" -base64 = "0.21.0" +serde_json = "1.0.96" +base64 = "0.21.2" num_enum = "0.6.1" [profile.release] opt-level = 3 lto = true -codegen-units = 1 \ No newline at end of file +codegen-units = 1 From 0fe0f95ae38b85fdd2da7397c9c83952a24a79ee Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Mon, 12 Jun 2023 18:10:03 -0400 Subject: [PATCH 5/9] Fix: Decode None Crashes (#19) * Bumping dependency versions * Fixing cargo Signed-off-by: Shivansh Vij --------- Verified that this PR functions. Signed-off-by: Shivansh Vij --- CHANGELOG.md | 4 ++++ decoder.rs | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 340483d..6ebd3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixes + +- Fixing the `decode_none` Rust function which would previously crash if it was decoding from a buffer of size 0. + ## [v1.1.0] - 2023-06-07 ### Changes diff --git a/decoder.rs b/decoder.rs index 4bef024..c9302a5 100644 --- a/decoder.rs +++ b/decoder.rs @@ -75,12 +75,15 @@ pub trait Decoder { impl Decoder for Cursor<&mut Vec> { fn decode_none(&mut self) -> bool { - if let Ok(kind) = self.read_u8() { - if kind == Kind::None as u8 { - return true; + match self.read_u8() { + Ok(kind) => { + if kind == Kind::None as u8 { + return true; + } + self.set_position(self.position() - 1); } + Err(_) => {} } - self.set_position(self.position() - 1); false } From a7d5107be8825011b22b7bf8d609989ab820d8c9 Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Mon, 12 Jun 2023 18:17:33 -0400 Subject: [PATCH 6/9] Staging v1.1.1 (#20) * Bumping versions to v1.1.1 Signed-off-by: Shivansh Vij * Updating changelog with dependency changes Signed-off-by: Shivansh Vij --------- Signed-off-by: Shivansh Vij --- CHANGELOG.md | 13 +- Cargo.toml | 2 +- package-lock.json | 386 ++++++++++++++++++++-------------------- package.json | 6 +- version/current_version | 2 +- 5 files changed, 210 insertions(+), 199 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ebd3fc..3fea122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,26 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v1.1.1] - 2023-06-12 + ### Fixes - Fixing the `decode_none` Rust function which would previously crash if it was decoding from a buffer of size 0. +### Dependencies + +- Bumping Typescript `@typescript-eslint/eslint-plugin` from `^5.59.10` to `^5.59.11` +- Bumping Typescript `@typescript-eslint/parser` from `^5.59.10` to `^5.59.11` +- Bumping Typescript `@types/node` from `^20.2.5` to `^20.3.0` +- Bumping Rust `serde_json` from `1.0.82` to `1.0.96` +- Bumping Rust `base64` from `0.21.0` to `0.21.2` + ## [v1.1.0] - 2023-06-07 ### Changes - Merging Typescript, Golang, and Rust implementations into a single repository -[unreleased]: https://github.com/loopholelabs/scale/compare/v1.1.0...HEAD +[unreleased]: https://github.com/loopholelabs/scale/compare/v1.1.1...HEAD +[v1.1.1]: https://github.com/loopholelabs/scale/compare/v1.1.1 [v1.1.0]: https://github.com/loopholelabs/scale/compare/v1.1.0 diff --git a/Cargo.toml b/Cargo.toml index 491aac2..d5bb82c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polyglot_rs" -version = "1.1.0" +version = "1.1.1" edition = "2021" description="A high-performance serialization framework used for encoding and decoding arbitrary datastructures across languages." license = "Apache-2.0" diff --git a/package-lock.json b/package-lock.json index f964bc1..21b3169 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "@loopholelabs/polyglot", - "version": "1.1.0", + "version": "1.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@loopholelabs/polyglot", - "version": "1.1.0", + "version": "1.1.1", "license": "Apache-2.0", "devDependencies": { "@types/jest": "^29.5.2", "@types/json-bigint": "^1.0.1", "@types/node": "^20.3.0", - "@typescript-eslint/eslint-plugin": "^5.59.10", - "@typescript-eslint/parser": "^5.59.10", + "@typescript-eslint/eslint-plugin": "^5.59.11", + "@typescript-eslint/parser": "^5.59.11", "eslint": "^8.42.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", @@ -44,42 +44,42 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", + "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.22.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz", - "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz", + "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.1.tgz", - "integrity": "sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz", + "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.22.0", - "@babel/helper-compilation-targets": "^7.22.1", - "@babel/helper-module-transforms": "^7.22.1", - "@babel/helpers": "^7.22.0", - "@babel/parser": "^7.22.0", - "@babel/template": "^7.21.9", - "@babel/traverse": "^7.22.1", - "@babel/types": "^7.22.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helpers": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -110,12 +110,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.3.tgz", - "integrity": "sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz", + "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==", "dev": true, "dependencies": { - "@babel/types": "^7.22.3", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -125,13 +125,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz", - "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz", + "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.0", - "@babel/helper-validator-option": "^7.21.0", + "@babel/compat-data": "^7.22.5", + "@babel/helper-validator-option": "^7.22.5", "browserslist": "^4.21.3", "lru-cache": "^5.1.1", "semver": "^6.3.0" @@ -153,151 +153,151 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz", - "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", + "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", + "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/types": "^7.21.0" + "@babel/template": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", - "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", + "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", "dev": true, "dependencies": { - "@babel/types": "^7.21.4" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz", - "integrity": "sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz", + "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.1", - "@babel/helper-module-imports": "^7.21.4", - "@babel/helper-simple-access": "^7.21.5", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.21.9", - "@babel/traverse": "^7.22.1", - "@babel/types": "^7.22.0" + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz", - "integrity": "sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz", - "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "dependencies": { - "@babel/types": "^7.21.5" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", + "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", - "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", + "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.3.tgz", - "integrity": "sha512-jBJ7jWblbgr7r6wYZHMdIqKc73ycaTcCaWRq4/2LpuPHcx7xMlZvpGQkOYc9HeSjn6rcx15CPlgVcBtZ4WZJ2w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz", + "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==", "dev": true, "dependencies": { - "@babel/template": "^7.21.9", - "@babel/traverse": "^7.22.1", - "@babel/types": "^7.22.3" + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -377,9 +377,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz", - "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz", + "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -449,12 +449,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz", - "integrity": "sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -551,12 +551,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz", - "integrity": "sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -566,33 +566,33 @@ } }, "node_modules/@babel/template": { - "version": "7.21.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz", - "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/parser": "^7.21.9", - "@babel/types": "^7.21.5" + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.4.tgz", - "integrity": "sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.22.3", - "@babel/helper-environment-visitor": "^7.22.1", - "@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.22.4", - "@babel/types": "^7.22.4", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz", + "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -610,13 +610,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz", - "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", + "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1209,9 +1209,9 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz", - "integrity": "sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.1.0.tgz", + "integrity": "sha512-w1qd368vtrwttm1PRJWPW1QHlbmHrVDGs1eBH/jZvRPUFS4MNXV9Q33EQdjOdeAxZ7O8+3wM7zxztm2nfUSyKw==", "dev": true, "dependencies": { "@sinonjs/commons": "^3.0.0" @@ -1385,15 +1385,15 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.10.tgz", - "integrity": "sha512-L6Tu+ZNAsLW9N7KveQOojmi6AbVyrXfsd33P4i/8vkLdx/t4pA4xzTm/oPr5rp3odsNzeRZ0TKP2wYpaTdnL6Q==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz", + "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.10", - "@typescript-eslint/type-utils": "5.59.10", - "@typescript-eslint/utils": "5.59.10", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/type-utils": "5.59.11", + "@typescript-eslint/utils": "5.59.11", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -1419,14 +1419,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.10.tgz", - "integrity": "sha512-+CUYrEnvTpFJPjpNMRo1VcGh65ZYPmoDWbNsJS2QVeOxaiMa0wlngmP3AE09kRoXxtYQUAgRJvFTcnsTrkiaqQ==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz", + "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.10", - "@typescript-eslint/types": "5.59.10", - "@typescript-eslint/typescript-estree": "5.59.10", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/typescript-estree": "5.59.11", "debug": "^4.3.4" }, "engines": { @@ -1446,13 +1446,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.10.tgz", - "integrity": "sha512-V8VE6b8O/ynZg8RvtICv1LqDhPnwPXm9eVsrOqeI4Bjk2SpOUOneI3Qp9/tu8z5q0RkE34fAastk8IzmsC6GnA==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz", + "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.10", - "@typescript-eslint/visitor-keys": "5.59.10" + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/visitor-keys": "5.59.11" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1463,13 +1463,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.10.tgz", - "integrity": "sha512-ZkEMhDvvYLrK2kUf+nWXf/0mHRn5cL2VFxh0CqvPcA0Kmod6YuaSEqZpq93l+2BicYkymVui6a43Ni7fszUn/A==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz", + "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.10", - "@typescript-eslint/utils": "5.59.10", + "@typescript-eslint/typescript-estree": "5.59.11", + "@typescript-eslint/utils": "5.59.11", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1490,9 +1490,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.10.tgz", - "integrity": "sha512-SEvEzdTbOgiaK8B891Zx7z92v3DBLzYvqWq2Jp5ne/4q8OUAb6Ydm/Ge4A0EawTezzmFR+09LJWFWzVztEifeA==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz", + "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1503,13 +1503,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.10.tgz", - "integrity": "sha512-orXkvjDDAcB6gyxLCqdoJF5KcOHI6RBoizMj4AhgXyidifJHL3gqib3nNbQ2VNDQfJRnyc6pkezN63QAkEWDUA==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz", + "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.10", - "@typescript-eslint/visitor-keys": "5.59.10", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/visitor-keys": "5.59.11", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1530,17 +1530,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.10.tgz", - "integrity": "sha512-Z02P8jPTyCNX+4pPn3H2z+AjLKwdNNmI284bX9HaUhWPhp/xxBlTMSvodycWOBYUCODK6d/8IVgQmMZ7JBhVbw==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz", + "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.10", - "@typescript-eslint/types": "5.59.10", - "@typescript-eslint/typescript-estree": "5.59.10", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/typescript-estree": "5.59.11", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -1556,12 +1556,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.10", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.10.tgz", - "integrity": "sha512-AdeBi2ItKCtUd+SpNMNKFoaA8QM5IoXPBEXXHsbRn+J51Pk4yWQVf4uah67r9msAojmbtjDquyNqxXPFNJ38yg==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz", + "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.10", + "@typescript-eslint/types": "5.59.11", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -2036,9 +2036,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001495", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz", - "integrity": "sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==", + "version": "1.0.30001502", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz", + "integrity": "sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg==", "dev": true, "funding": [ { @@ -2096,9 +2096,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, "node_modules/cliui": { @@ -2355,9 +2355,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.424", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.424.tgz", - "integrity": "sha512-KOfOIoEE0b3L0CTDgqS+NpokmcBdxpqLIPtp9PL0v5GAMZmZXa9uoUfWJdEy63MNy6jMvKHkBVUYY5DSuqqpdw==", + "version": "1.4.428", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.428.tgz", + "integrity": "sha512-L7uUknyY286of0AYC8CKfgWstD0Smk2DvHDi9F0GWQhSH90Bzi7iDrmCbZKz75tYJxeGSAc7TYeKpmbjMDoh1w==", "dev": true }, "node_modules/emittery": { @@ -2877,18 +2877,6 @@ "node": ">=4.0" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/espree": { "version": "9.5.2", "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", @@ -3055,6 +3043,18 @@ "node": ">=8.6.0" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -3311,15 +3311,15 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/globals": { diff --git a/package.json b/package.json index 0b9dc68..7136683 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@loopholelabs/polyglot", - "version": "1.1.0", + "version": "1.1.1", "license": "Apache-2.0", "description": "A high-performance serialization framework used for encoding and decoding arbitrary datastructures across languages.", "homepage": "https://github.com/loopholelabs/polyglot", @@ -17,8 +17,8 @@ "@types/jest": "^29.5.2", "@types/json-bigint": "^1.0.1", "@types/node": "^20.3.0", - "@typescript-eslint/eslint-plugin": "^5.59.10", - "@typescript-eslint/parser": "^5.59.10", + "@typescript-eslint/eslint-plugin": "^5.59.11", + "@typescript-eslint/parser": "^5.59.11", "eslint": "^8.42.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", diff --git a/version/current_version b/version/current_version index 992977a..9cb4db9 100644 --- a/version/current_version +++ b/version/current_version @@ -1 +1 @@ -v1.1.0 \ No newline at end of file +v1.1.1 \ No newline at end of file From 535cc47a85ea3b66b619009eb32ca1b2946498e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 14:57:46 -0700 Subject: [PATCH 7/9] Bump word-wrap from 1.2.3 to 1.2.4 (#22) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21b3169..2a47c39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6387,9 +6387,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true, "engines": { "node": ">=0.10.0" From 93f3a9e21051c2eda42fba03f3c45fb6ce2d477a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20S=C3=B8rlie?= Date: Sat, 26 Aug 2023 17:59:54 -0400 Subject: [PATCH 8/9] Fix: Integers negative (#24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix varint decoding bug * Adding wrapped overflow Signed-off-by: Shivansh Vij * Test encode/decode not necessary Signed-off-by: Shivansh Vij --------- Signed-off-by: Shivansh Vij Co-authored-by: Shivansh Vij Co-authored-by: Alex Sørlie --- Cargo.toml | 4 ++-- decode.go | 20 ++++++++++++-------- decode_test.go | 22 ++++++++++++++++++++-- decoder.rs | 17 ++++++++++++----- decoder.test.ts | 14 ++++++++++---- 5 files changed, 56 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d5bb82c..5110e36 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,8 +26,8 @@ byteorder = "1" [dev-dependencies] serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.96" -base64 = "0.21.2" +serde_json = "1.0.105" +base64 = "0.21.3" num_enum = "0.6.1" [profile.release] diff --git a/decode.go b/decode.go index 354084c..b9d58cf 100644 --- a/decode.go +++ b/decode.go @@ -245,11 +245,13 @@ func decodeInt32(b []byte) ([]byte, int32, error) { if i > VarIntLen32 && cb > 1 { return b, 0, InvalidInt32 } - // End of varint, add the last bits and cast to signed integer - x := int32((ux | uint32(cb)<> 1) - // Flip the bits if the sign bit is set + // End of varint, add the last bits + ux |= uint32(cb) << s + // Separate value and sign + x := int32(ux >> 1) + // If sign bit is set, negate the number if ux&1 != 0 { - x = ^x + x = -(x + 1) } return b[i+1:], x, nil } @@ -271,11 +273,13 @@ func decodeInt64(b []byte) ([]byte, int64, error) { if i > VarIntLen64 && cb > 1 { return b, 0, InvalidInt64 } - // End of varint, add the last bits and cast to signed integer - x := int64((ux | uint64(cb)<> 1) - // Flip the bits if the sign bit is set + // End of varint, add the last bits + ux |= uint64(cb) << s + // Separate value and sign + x := int64(ux >> 1) + // If sign bit is set, negate the number if ux&1 != 0 { - x = ^x + x = -(x + 1) } return b[i+1:], x, nil } diff --git a/decode_test.go b/decode_test.go index f268157..baebdfd 100644 --- a/decode_test.go +++ b/decode_test.go @@ -456,7 +456,7 @@ func TestDecodeInt32(t *testing.T) { t.Parallel() p := NewBuffer() - v := int32(-2147483648) + v := int32(2147483647) encodeInt32(p, v) var value int32 @@ -466,6 +466,15 @@ func TestDecodeInt32(t *testing.T) { assert.Equal(t, v, value) assert.Equal(t, 0, len(remaining)) + v = int32(-2147483647) + p.Reset() + encodeInt32(p, v) + + remaining, value, err = decodeInt32(p.Bytes()) + assert.NoError(t, err) + assert.Equal(t, v, value) + assert.Equal(t, 0, len(remaining)) + _, _, err = decodeInt32((p.Bytes())[1:]) assert.ErrorIs(t, err, InvalidInt32) @@ -491,7 +500,7 @@ func TestDecodeInt64(t *testing.T) { t.Parallel() p := NewBuffer() - v := int64(-9223372036854775808) + v := int64(9223372036854775807) encodeInt64(p, v) var value int64 @@ -501,6 +510,15 @@ func TestDecodeInt64(t *testing.T) { assert.Equal(t, v, value) assert.Equal(t, 0, len(remaining)) + v = int64(-9223372036854775807) + p.Reset() + encodeInt64(p, v) + + remaining, value, err = decodeInt64(p.Bytes()) + assert.NoError(t, err) + assert.Equal(t, v, value) + assert.Equal(t, 0, len(remaining)) + _, _, err = decodeInt64((p.Bytes())[1:]) assert.ErrorIs(t, err, InvalidInt64) diff --git a/decoder.rs b/decoder.rs index c9302a5..369eb4c 100644 --- a/decoder.rs +++ b/decoder.rs @@ -254,9 +254,10 @@ impl Decoder for Cursor<&mut Vec> { for _ in 0..VARINT_LEN32 { let byte = self.read_u8().ok().ok_or(DecodingError::InvalidI32)?; if byte < CONTINUATION { - let mut x = ((ux | (byte as u32) << s) >> 1) as i32; + ux |= (byte as u32) << s; + let mut x = (ux >> 1) as i32; if ux & 1 != 0 { - x = !x + x = x.wrapping_add(1).wrapping_neg(); } return Ok(x); } @@ -277,9 +278,10 @@ impl Decoder for Cursor<&mut Vec> { for _ in 0..VARINT_LEN64 { let byte = self.read_u8().ok().ok_or(DecodingError::InvalidI64)?; if byte < CONTINUATION { - let mut x = ((ux | (byte as u64) << s) >> 1) as i64; + ux |= (byte as u64) << s; + let mut x = (ux >> 1) as i64; if ux & 1 != 0 { - x = !x + x = x.wrapping_add(1).wrapping_neg(); } return Ok(x); } @@ -503,13 +505,18 @@ mod tests { #[test] fn test_decode_i32() { let mut encoder = Cursor::new(Vec::with_capacity(512)); - let v = -2147483648 as i32; + let v = -2147483648; + let vneg = -32; encoder.encode_i32(v).unwrap(); + encoder.encode_i32(vneg).unwrap(); let mut decoder = Cursor::new(encoder.get_mut()); let val = decoder.decode_i32().unwrap(); assert_eq!(val, v); + let val = decoder.decode_i32().unwrap(); + assert_eq!(val, vneg); + let error = decoder.decode_i32().unwrap_err(); assert_eq!(error, DecodingError::InvalidI32); } diff --git a/decoder.test.ts b/decoder.test.ts index 29c6d78..1749425 100644 --- a/decoder.test.ts +++ b/decoder.test.ts @@ -149,28 +149,34 @@ describe("Decoder", () => { }); it("Can decode Int32", () => { - const expected = -2147483648; + const expected = 2147483647; + const expectedNegative = -2147483647; - const encoded = new Encoder().int32(expected).bytes; + const encoded = new Encoder().int32(expected).int32(expectedNegative).bytes; const decoder = new Decoder(encoded); const value = decoder.int32(); + const valueNegative = decoder.int32(); expect(value).toBe(expected); + expect(valueNegative).toBe(expectedNegative); expect(decoder.length).toBe(0); expect(() => decoder.int32()).toThrowError(InvalidInt32Error); }); it("Can decode Int64", () => { - const expected = -9223372036854775808n; + const expected = 9223372036854775807n; + const expectedNegative = -9223372036854775807n; - const encoded = new Encoder().int64(expected).bytes; + const encoded = new Encoder().int64(expected).int64(expectedNegative).bytes; const decoder = new Decoder(encoded); const value = decoder.int64(); + const valueNegative = decoder.int64(); expect(value).toBe(expected); + expect(valueNegative).toBe(expectedNegative); expect(decoder.length).toBe(0); expect(() => decoder.int64()).toThrowError(InvalidInt64Error); From 1c3c6c6dfc2637ffcc091b349f0602e724ea83c8 Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Sat, 26 Aug 2023 15:25:17 -0700 Subject: [PATCH 9/9] Updating changelog v1.1.2 (#25) Signed-off-by: Shivansh Vij --- CHANGELOG.md | 9 ++++++++- Cargo.toml | 2 +- go.mod | 4 ++-- go.sum | 13 ++++--------- package.json | 2 +- version/current_version | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fea122..3505e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v1.1.2] - 2023-08-26 + +### Fixes + +- Fixes an issue where decoding certain i32 or i64 values would result in an incorrect value being returned. + ## [v1.1.1] - 2023-06-12 ### Fixes @@ -27,6 +33,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Merging Typescript, Golang, and Rust implementations into a single repository -[unreleased]: https://github.com/loopholelabs/scale/compare/v1.1.1...HEAD +[unreleased]: https://github.com/loopholelabs/scale/compare/v1.1.2...HEAD +[v1.1.2]: https://github.com/loopholelabs/scale/compare/v1.1.2 [v1.1.1]: https://github.com/loopholelabs/scale/compare/v1.1.1 [v1.1.0]: https://github.com/loopholelabs/scale/compare/v1.1.0 diff --git a/Cargo.toml b/Cargo.toml index 5110e36..5fa688e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polyglot_rs" -version = "1.1.1" +version = "1.1.2" edition = "2021" description="A high-performance serialization framework used for encoding and decoding arbitrary datastructures across languages." license = "Apache-2.0" diff --git a/go.mod b/go.mod index 5bb4a8a..87c164f 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/loopholelabs/polyglot go 1.18 require ( - github.com/stretchr/testify v1.7.5 - google.golang.org/protobuf v1.28.0 + github.com/stretchr/testify v1.8.4 + google.golang.org/protobuf v1.31.0 ) require ( diff --git a/go.sum b/go.sum index 2c66880..e4eba30 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -6,18 +5,14 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/package.json b/package.json index 7136683..65b185c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@loopholelabs/polyglot", - "version": "1.1.1", + "version": "1.1.2", "license": "Apache-2.0", "description": "A high-performance serialization framework used for encoding and decoding arbitrary datastructures across languages.", "homepage": "https://github.com/loopholelabs/polyglot", diff --git a/version/current_version b/version/current_version index 9cb4db9..efdb8b1 100644 --- a/version/current_version +++ b/version/current_version @@ -1 +1 @@ -v1.1.1 \ No newline at end of file +v1.1.2 \ No newline at end of file