From 5c4d93e103e0a2c3260d6740aa0a2854df867708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 19:54:37 +0200 Subject: [PATCH] Bump protobufjs from 6.11.3 to 7.2.4 Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fedor Indutnyy --- package.json | 7 +- patches/protobufjs+6.11.3.patch | 104 -- patches/protobufjs+7.2.4.patch | 1113 ++++++++++++++++++++++ patches/protobufjs-cli+1.1.1.patch | 18 + ts/services/storage.ts | 2 +- ts/services/storageRecordOps.ts | 24 +- ts/test-mock/messaging/stories_test.ts | 4 +- ts/test-node/Proto_unknown_field_test.ts | 12 +- ts/util/inspectProtobufs.ts | 8 +- ts/util/lint/exceptions.json | 6 + yarn.lock | 253 ++++- 11 files changed, 1391 insertions(+), 160 deletions(-) delete mode 100644 patches/protobufjs+6.11.3.patch create mode 100644 patches/protobufjs+7.2.4.patch create mode 100644 patches/protobufjs-cli+1.1.1.patch diff --git a/package.json b/package.json index 12eafaafc..319bc2e68 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "get-expire-time": "node ts/scripts/get-expire-time.js", "copy-components": "node ts/scripts/copy.js", "sass": "sass stylesheets/manifest.scss:stylesheets/manifest.css stylesheets/manifest_bridge.scss:stylesheets/manifest_bridge.css", - "build-module-protobuf": "pbjs --target static-module --force-long --no-verify --no-create --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js", + "build-module-protobuf": "pbjs --target static-module --force-long --no-typeurl --no-verify --no-create --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js", "clean-module-protobuf": "rm -f ts/protobuf/compiled.d.ts ts/protobuf/compiled.js", "build-protobuf": "yarn build-module-protobuf", "clean-protobuf": "yarn clean-module-protobuf", @@ -141,7 +141,7 @@ "parchment": "1.1.4", "pify": "3.0.0", "pino": "8.6.1", - "protobufjs": "6.11.3", + "protobufjs": "7.2.4", "proxy-agent": "5.0.0", "qrcode-generator": "1.4.4", "quill": "1.3.7", @@ -188,7 +188,7 @@ "@electron/fuses": "1.5.0", "@formatjs/intl": "2.6.7", "@mixer/parallel-prettier": "2.0.3", - "@signalapp/mock-server": "2.21.1", + "@signalapp/mock-server": "3.0.1", "@storybook/addon-a11y": "6.5.6", "@storybook/addon-actions": "6.5.6", "@storybook/addon-controls": "6.5.6", @@ -288,6 +288,7 @@ "patch-package": "6.4.7", "playwright": "1.33.0", "prettier": "2.8.0", + "protobufjs-cli": "1.1.1", "sass": "1.49.7", "sass-loader": "10.2.0", "sinon": "11.1.1", diff --git a/patches/protobufjs+6.11.3.patch b/patches/protobufjs+6.11.3.patch deleted file mode 100644 index 696102ffa..000000000 --- a/patches/protobufjs+6.11.3.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/node_modules/protobufjs/cli/lib/tsd-jsdoc/publish.js b/node_modules/protobufjs/cli/lib/tsd-jsdoc/publish.js -index 3846a99..6c5688a 100644 ---- a/node_modules/protobufjs/cli/lib/tsd-jsdoc/publish.js -+++ b/node_modules/protobufjs/cli/lib/tsd-jsdoc/publish.js -@@ -558,6 +558,13 @@ function handleClass(element, parent) { - handleElement(child, element); - }); - -+ writeln(); -+ if (is_interface) { -+ writeln("__unknownFields?: ReadonlyArray;"); -+ } else { -+ writeln("public __unknownFields?: ReadonlyArray;"); -+ } -+ - --indent; - writeln("}"); - -diff --git a/node_modules/protobufjs/src/decoder.js b/node_modules/protobufjs/src/decoder.js -index 491dd30..ec03e9f 100644 ---- a/node_modules/protobufjs/src/decoder.js -+++ b/node_modules/protobufjs/src/decoder.js -@@ -21,6 +21,7 @@ function decoder(mtype) { - ("r=Reader.create(r)") - ("var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (mtype.fieldsArray.filter(function(field) { return field.map; }).length ? ",k,value" : "")) - ("while(r.pos>>3){"); - -+ var unknownRef = "m" + util.safeProp("__unknownFields"); -+ - var i = 0; - for (; i < /* initializes */ mtype.fieldsArray.length; ++i) { - var field = mtype._fieldsArray[i].resolve(), -@@ -109,6 +112,11 @@ function decoder(mtype) { - } gen - ("default:") - ("r.skipType(t&7)") -+ ("if (!(%s)) {", unknownRef) -+ ("%s = []", unknownRef) -+ ("}") -+ -+ ("%s.push(r.buf.slice(unknownStartPos, r.pos))", unknownRef) - ("break") - - ("}") -diff --git a/node_modules/protobufjs/src/encoder.js b/node_modules/protobufjs/src/encoder.js -index c803e99..50cc3e6 100644 ---- a/node_modules/protobufjs/src/encoder.js -+++ b/node_modules/protobufjs/src/encoder.js -@@ -36,6 +36,21 @@ function encoder(mtype) { - // "when a message is serialized its known fields should be written sequentially by field number" - var fields = /* initializes */ mtype.fieldsArray.slice().sort(util.compareFieldsById); - -+ var unknownRef = "m" + util.safeProp("__unknownFields"); -+ -+ // Redecode unknown fields and apply them to the message before encoding -+ gen -+ ("var fullyUnknown=[]") -+ ("if(%s) {", unknownRef) -+ ("for(var i=0;i<%s.length;++i) {", unknownRef) -+ ("try {") -+ ("var known=this.ctor.decode(%s[i])", unknownRef) -+ ("fullyUnknown=fullyUnknown.concat(known.__unknownFields||[])") -+ ("m=Object.assign(known,m)") -+ ("}catch(_){}") -+ ("}") -+ ("}") -+ - for (var i = 0; i < fields.length; ++i) { - var field = fields[i].resolve(), - index = mtype._fieldsArray.indexOf(field), -@@ -94,6 +109,11 @@ function encoder(mtype) { - } - } - -+ gen -+ ("for(var i=0;i>>3){"); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ + var i = 0; + for (; i < /* initializes */ mtype.fieldsArray.length; ++i) { + var field = mtype._fieldsArray[i].resolve(), +@@ -1522,6 +1527,11 @@ function decoder(mtype) { + } gen + ("default:") + ("r.skipType(t&7)") ++ ("if (!(%s)) {", unknownRef) ++ ("%s = []", unknownRef) ++ ("}") ++ ++ ("%s.push(r.buf.slice(unknownStartPos, r.pos))", unknownRef) + ("break") + + ("}") +@@ -1579,6 +1589,21 @@ function encoder(mtype) { + // "when a message is serialized its known fields should be written sequentially by field number" + var fields = /* initializes */ mtype.fieldsArray.slice().sort(util.compareFieldsById); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ ++ // Redecode unknown fields and apply them to the message before encoding ++ gen ++ ("var fullyUnknown=[]") ++ ("if(%s) {", unknownRef) ++ ("for(var i=0;i<%s.length;++i) {", unknownRef) ++ ("try {") ++ ("var known=this.ctor.decode(%s[i])", unknownRef) ++ ("fullyUnknown=fullyUnknown.concat(known.$unknownFields||[])") ++ ("m=Object.assign(known,m)") ++ ("}catch(_){}") ++ ("}") ++ ("}") ++ + for (var i = 0; i < fields.length; ++i) { + var field = fields[i].resolve(), + index = mtype._fieldsArray.indexOf(field), +@@ -1637,6 +1662,11 @@ function encoder(mtype) { + } + } + ++ gen ++ ("for(var i=0;i -1) +@@ -4423,6 +4453,10 @@ function tryHandleExtension(root, field) { + var extendedType = field.parent.lookup(field.extend); + if (extendedType) { + var sisterField = new Field(field.fullName, field.id, field.type, field.rule, undefined, field.options); ++ //do not allow to extend same field twice to prevent the error ++ if (extendedType.get(sisterField.name)) { ++ return true; ++ } + sisterField.declaringField = field; + field.extensionField = sisterField; + extendedType.add(sisterField); +@@ -5851,7 +5885,7 @@ util.decorateEnum = function decorateEnum(object) { + util.setProperty = function setProperty(dst, path, value) { + function setProp(dst, path, value) { + var part = path.shift(); +- if (part === "__proto__") { ++ if (part === "__proto__" || part === "prototype") { + return dst; + } + if (path.length > 0) { +@@ -6379,7 +6413,7 @@ function newError(name) { + configurable: true, + }, + name: { +- get() { return name; }, ++ get: function get() { return name; }, + set: undefined, + enumerable: false, + // configurable: false would accurately preserve the behavior of +@@ -6389,7 +6423,7 @@ function newError(name) { + configurable: true, + }, + toString: { +- value() { return this.name + ": " + this.message; }, ++ value: function value() { return this.name + ": " + this.message; }, + writable: true, + enumerable: false, + configurable: true, +@@ -7196,6 +7230,11 @@ Writer.prototype.bytes = function write_bytes(value) { + return this.uint32(len)._push(writeBytes, len, value); + }; + ++ ++Writer.prototype._unknownField = function __unknownField(field) { ++ return this._push(writeBytes, field.length, field); ++}; ++ + /** + * Writes a string. + * @param {string} value Value to write +diff --git a/node_modules/protobufjs/dist/minimal/protobuf.js b/node_modules/protobufjs/dist/minimal/protobuf.js +index 0f4af1d..a3dd165 100644 +--- a/node_modules/protobufjs/dist/minimal/protobuf.js ++++ b/node_modules/protobufjs/dist/minimal/protobuf.js +@@ -1,6 +1,6 @@ + /*! +- * protobuf.js v7.1.0 (c) 2016, daniel wirtz +- * compiled fri, 09 sep 2022 03:02:57 utc ++ * protobuf.js v7.2.4 (c) 2016, daniel wirtz ++ * compiled wed, 12 jul 2023 00:03:48 utc + * licensed under the bsd-3-clause license + * see: https://github.com/dcodeio/protobuf.js for details + */ +@@ -2022,7 +2022,7 @@ function newError(name) { + configurable: true, + }, + name: { +- get() { return name; }, ++ get: function get() { return name; }, + set: undefined, + enumerable: false, + // configurable: false would accurately preserve the behavior of +@@ -2032,7 +2032,7 @@ function newError(name) { + configurable: true, + }, + toString: { +- value() { return this.name + ": " + this.message; }, ++ value: function value() { return this.name + ": " + this.message; }, + writable: true, + enumerable: false, + configurable: true, +@@ -2557,6 +2557,11 @@ Writer.prototype.bytes = function write_bytes(value) { + return this.uint32(len)._push(writeBytes, len, value); + }; + ++ ++Writer.prototype._unknownField = function __unknownField(field) { ++ return this._push(writeBytes, field.length, field); ++}; ++ + /** + * Writes a string. + * @param {string} value Value to write +diff --git a/node_modules/protobufjs/dist/protobuf.js b/node_modules/protobufjs/dist/protobuf.js +index eccc464..28a6fb8 100644 +--- a/node_modules/protobufjs/dist/protobuf.js ++++ b/node_modules/protobufjs/dist/protobuf.js +@@ -1,6 +1,6 @@ + /*! +- * protobuf.js v7.1.0 (c) 2016, daniel wirtz +- * compiled fri, 09 sep 2022 03:02:57 utc ++ * protobuf.js v7.2.4 (c) 2016, daniel wirtz ++ * compiled wed, 12 jul 2023 00:03:48 utc + * licensed under the bsd-3-clause license + * see: https://github.com/dcodeio/protobuf.js for details + */ +@@ -1530,18 +1530,20 @@ var Enum = require(15), + * @ignore + */ + function genValuePartial_fromObject(gen, field, fieldIndex, prop) { ++ var defaultAlreadyEmitted = false; + /* eslint-disable no-unexpected-multiline, block-scoped-var, no-redeclare */ + if (field.resolvedType) { + if (field.resolvedType instanceof Enum) { gen + ("switch(d%s){", prop); + for (var values = field.resolvedType.values, keys = Object.keys(values), i = 0; i < keys.length; ++i) { + // enum unknown values passthrough +- if (values[keys[i]] === field.typeDefault) { gen ++ if (values[keys[i]] === field.typeDefault && !defaultAlreadyEmitted) { gen + ("default:") + ("if(typeof(d%s)===\"number\"){m%s=d%s;break}", prop, prop, prop); + if (!field.repeated) gen // fallback to default value only for + // arrays, to avoid leaving holes. + ("break"); // for non-repeated fields, just ignore ++ defaultAlreadyEmitted = true; + } + gen + ("case%j:", keys[i]) +@@ -1834,6 +1836,7 @@ function decoder(mtype) { + ("r=Reader.create(r)") + ("var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (mtype.fieldsArray.filter(function(field) { return field.map; }).length ? ",k,value" : "")) + ("while(r.pos>>3){"); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ + var i = 0; + for (; i < /* initializes */ mtype.fieldsArray.length; ++i) { + var field = mtype._fieldsArray[i].resolve(), +@@ -1923,6 +1928,11 @@ function decoder(mtype) { + } gen + ("default:") + ("r.skipType(t&7)") ++ ("if (!(%s)) {", unknownRef) ++ ("%s = []", unknownRef) ++ ("}") ++ ++ ("%s.push(r.buf.slice(unknownStartPos, r.pos))", unknownRef) + ("break") + + ("}") +@@ -1980,6 +1990,21 @@ function encoder(mtype) { + // "when a message is serialized its known fields should be written sequentially by field number" + var fields = /* initializes */ mtype.fieldsArray.slice().sort(util.compareFieldsById); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ ++ // Redecode unknown fields and apply them to the message before encoding ++ gen ++ ("var fullyUnknown=[]") ++ ("if(%s) {", unknownRef) ++ ("for(var i=0;i<%s.length;++i) {", unknownRef) ++ ("try {") ++ ("var known=this.ctor.decode(%s[i])", unknownRef) ++ ("fullyUnknown=fullyUnknown.concat(known.$unknownFields||[])") ++ ("m=Object.assign(known,m)") ++ ("}catch(_){}") ++ ("}") ++ ("}") ++ + for (var i = 0; i < fields.length; ++i) { + var field = fields[i].resolve(), + index = mtype._fieldsArray.indexOf(field), +@@ -2038,6 +2063,11 @@ function encoder(mtype) { + } + } + ++ gen ++ ("for(var i=0;i -1) +@@ -5699,6 +5739,10 @@ function tryHandleExtension(root, field) { + var extendedType = field.parent.lookup(field.extend); + if (extendedType) { + var sisterField = new Field(field.fullName, field.id, field.type, field.rule, undefined, field.options); ++ //do not allow to extend same field twice to prevent the error ++ if (extendedType.get(sisterField.name)) { ++ return true; ++ } + sisterField.declaringField = field; + field.extensionField = sisterField; + extendedType.add(sisterField); +@@ -7547,7 +7591,7 @@ util.decorateEnum = function decorateEnum(object) { + util.setProperty = function setProperty(dst, path, value) { + function setProp(dst, path, value) { + var part = path.shift(); +- if (part === "__proto__") { ++ if (part === "__proto__" || part === "prototype") { + return dst; + } + if (path.length > 0) { +@@ -8075,7 +8119,7 @@ function newError(name) { + configurable: true, + }, + name: { +- get() { return name; }, ++ get: function get() { return name; }, + set: undefined, + enumerable: false, + // configurable: false would accurately preserve the behavior of +@@ -8085,7 +8129,7 @@ function newError(name) { + configurable: true, + }, + toString: { +- value() { return this.name + ": " + this.message; }, ++ value: function value() { return this.name + ": " + this.message; }, + writable: true, + enumerable: false, + configurable: true, +@@ -8892,6 +8936,11 @@ Writer.prototype.bytes = function write_bytes(value) { + return this.uint32(len)._push(writeBytes, len, value); + }; + ++ ++Writer.prototype._unknownField = function __unknownField(field) { ++ return this._push(writeBytes, field.length, field); ++}; ++ + /** + * Writes a string. + * @param {string} value Value to write +diff --git a/node_modules/protobufjs/ext/descriptor/index.d.ts b/node_modules/protobufjs/ext/descriptor/index.d.ts +index 1df2efc..da2a2c0 100644 +--- a/node_modules/protobufjs/ext/descriptor/index.d.ts ++++ b/node_modules/protobufjs/ext/descriptor/index.d.ts +@@ -1,4 +1,5 @@ + import * as $protobuf from "../.."; ++import Long = require("long"); + export const FileDescriptorSet: $protobuf.Type; + + export const FileDescriptorProto: $protobuf.Type; +@@ -58,6 +59,8 @@ export const GeneratedCodeInfo: $protobuf.Type & { + + export interface IFileDescriptorSet { + file: IFileDescriptorProto[]; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IFileDescriptorProto { +@@ -73,6 +76,8 @@ export interface IFileDescriptorProto { + options?: IFileOptions; + sourceCodeInfo?: any; + syntax?: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IFileOptions { +@@ -90,6 +95,8 @@ export interface IFileOptions { + ccEnableArenas?: boolean; + objcClassPrefix?: string; + csharpNamespace?: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + type IFileOptionsOptimizeMode = number; +@@ -105,20 +112,28 @@ export interface IDescriptorProto { + options?: IMessageOptions; + reservedRange?: IDescriptorProtoReservedRange[]; + reservedName?: string[]; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IMessageOptions { + mapEntry?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IDescriptorProtoExtensionRange { + start?: number; + end?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IDescriptorProtoReservedRange { + start?: number; + end?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IFieldDescriptorProto { +@@ -132,6 +147,8 @@ export interface IFieldDescriptorProto { + oneofIndex?: number; + jsonName?: any; + options?: IFieldOptions; ++ ++ $unknownFields?: ReadonlyArray; + } + + type IFieldDescriptorProtoLabel = number; +@@ -141,6 +158,8 @@ type IFieldDescriptorProtoType = number; + export interface IFieldOptions { + packed?: boolean; + jstype?: IFieldOptionsJSType; ++ ++ $unknownFields?: ReadonlyArray; + } + + type IFieldOptionsJSType = number; +@@ -149,32 +168,44 @@ export interface IEnumDescriptorProto { + name?: string; + value?: IEnumValueDescriptorProto[]; + options?: IEnumOptions; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IEnumValueDescriptorProto { + name?: string; + number?: number; + options?: any; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IEnumOptions { + allowAlias?: boolean; + deprecated?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IOneofDescriptorProto { + name?: string; + options?: any; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IServiceDescriptorProto { + name?: string; + method?: IMethodDescriptorProto[]; + options?: IServiceOptions; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IServiceOptions { + deprecated?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IMethodDescriptorProto { +@@ -184,8 +215,12 @@ export interface IMethodDescriptorProto { + options?: IMethodOptions; + clientStreaming?: boolean; + serverStreaming?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + export interface IMethodOptions { + deprecated?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } +diff --git a/node_modules/protobufjs/index.d.ts b/node_modules/protobufjs/index.d.ts +index 750ad2f..ffcbdbe 100644 +--- a/node_modules/protobufjs/index.d.ts ++++ b/node_modules/protobufjs/index.d.ts +@@ -16,27 +16,37 @@ export namespace common { + interface IAny { + typeUrl?: string; + bytes?: Uint8Array; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Duration message. */ + interface IDuration { + seconds?: (number|Long); + nanos?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Timestamp message. */ + interface ITimestamp { + seconds?: (number|Long); + nanos?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Empty message. */ + interface IEmpty { ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Struct message. */ + interface IStruct { + fields?: { [k: string]: IValue }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Value message. */ +@@ -48,56 +58,78 @@ export namespace common { + boolValue?: boolean; + structValue?: IStruct; + listValue?: IListValue; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.ListValue message. */ + interface IListValue { + values?: IValue[]; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.DoubleValue message. */ + interface IDoubleValue { + value?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.FloatValue message. */ + interface IFloatValue { + value?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Int64Value message. */ + interface IInt64Value { + value?: (number|Long); ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.UInt64Value message. */ + interface IUInt64Value { + value?: (number|Long); ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.Int32Value message. */ + interface IInt32Value { + value?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.UInt32Value message. */ + interface IUInt32Value { + value?: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.BoolValue message. */ + interface IBoolValue { + value?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.StringValue message. */ + interface IStringValue { + value?: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties of a google.protobuf.BytesValue message. */ + interface IBytesValue { + value?: Uint8Array; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -232,6 +264,8 @@ export class Enum extends ReflectionObject { + * @returns `true` if reserved, otherwise `false` + */ + public isReservedName(name: string): boolean; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Enum descriptor. */ +@@ -242,6 +276,8 @@ export interface IEnum { + + /** Enum options */ + options?: { [k: string]: any }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Reflected message field. */ +@@ -288,6 +324,8 @@ export class Field extends FieldBase { + * @returns Decorator function + */ + public static d>(fieldId: number, fieldType: (Constructor|string), fieldRule?: ("optional"|"required"|"repeated")): FieldDecorator; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Base class of all reflected message fields. This is not an actual class but here for the sake of having consistent type definitions. */ +@@ -369,6 +407,8 @@ export class FieldBase extends ReflectionObject { + * @throws {Error} If any reference cannot be resolved + */ + public resolve(): Field; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Field descriptor. */ +@@ -385,6 +425,8 @@ export interface IField { + + /** Field options */ + options?: { [k: string]: any }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Extension field descriptor. */ +@@ -392,6 +434,8 @@ export interface IExtensionField extends IField { + + /** Extended type */ + extend: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -494,6 +538,8 @@ export class MapField extends FieldBase { + * @returns Decorator function + */ + public static d }>(fieldId: number, fieldKeyType: ("int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"), fieldValueType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"|"bytes"|object|Constructor<{}>)): FieldDecorator; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Map field descriptor. */ +@@ -501,6 +547,8 @@ export interface IMapField extends IField { + + /** Key type */ + keyType: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Extension map field descriptor. */ +@@ -508,6 +556,8 @@ export interface IExtensionMapField extends IMapField { + + /** Extended type */ + extend: string; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Abstract runtime message. */ +@@ -589,6 +639,8 @@ export class Message { + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Reflected service method. */ +@@ -650,6 +702,8 @@ export class Method extends ReflectionObject { + * @returns Method descriptor + */ + public toJSON(toJSONOptions?: IToJSONOptions): IMethod; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Method descriptor. */ +@@ -678,6 +732,8 @@ export interface IMethod { + + /** Method options properly parsed into an object */ + parsedOptions?: { [k: string]: any }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Reflected namespace. */ +@@ -722,6 +778,8 @@ export class Namespace extends NamespaceBase { + * @returns `true` if reserved, otherwise `false` + */ + public static isReservedName(reserved: ((number[]|string)[]|undefined), name: string): boolean; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Base class of all reflection objects containing nested objects. This is not an actual class but here for the sake of having consistent type definitions. */ +@@ -847,6 +905,8 @@ export abstract class NamespaceBase extends ReflectionObject { + * @throws {Error} If `path` does not point to a service + */ + public lookupService(path: (string|string[])): Service; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Namespace descriptor. */ +@@ -857,6 +917,8 @@ export interface INamespace { + + /** Nested object descriptors */ + nested?: { [k: string]: AnyNestedObject }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Any extension field descriptor. */ +@@ -957,6 +1019,8 @@ export abstract class ReflectionObject { + * @returns Class name[, space, full name] + */ + public toString(): string; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Reflected oneof. */ +@@ -1016,6 +1080,8 @@ export class OneOf extends ReflectionObject { + * @returns Decorator function + */ + public static d(...fieldNames: string[]): OneOfDecorator; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Oneof descriptor. */ +@@ -1026,6 +1092,8 @@ export interface IOneOf { + + /** Oneof options */ + options?: { [k: string]: any }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1060,6 +1128,8 @@ export interface IParserResult { + + /** Populated root instance */ + root: Root; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Options modifying the behavior of {@link parse}. */ +@@ -1073,6 +1143,8 @@ export interface IParseOptions { + + /** Use trailing comment when both leading comment and trailing comment exist. */ + preferTrailingComment?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Options modifying the behavior of JSON serialization. */ +@@ -1080,6 +1152,8 @@ export interface IToJSONOptions { + + /** Serializes comments. */ + keepComments?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1220,6 +1294,8 @@ export class Reader { + * @returns `this` + */ + public skipType(wireType: number): Reader; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Wire format reader using node buffers. */ +@@ -1236,6 +1312,8 @@ export class BufferReader extends Reader { + * @returns Value read + */ + public bytes(): Buffer; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Root namespace wrapping all types, enums, services, sub-namespaces etc. that belong together. */ +@@ -1309,6 +1387,8 @@ export class Root extends NamespaceBase { + * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid + */ + public loadSync(filename: (string|string[]), options?: IParseOptions): Root; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** +@@ -1374,6 +1454,8 @@ export namespace rpc { + * @returns `this` + */ + public end(endedByRPC?: boolean): rpc.Service; ++ ++ public $unknownFields?: ReadonlyArray; + } + } + +@@ -1433,6 +1515,8 @@ export class Service extends NamespaceBase { + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public create(rpcImpl: RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): rpc.Service; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Service descriptor. */ +@@ -1440,6 +1524,8 @@ export interface IService extends INamespace { + + /** Method descriptors */ + methods: { [k: string]: IMethod }; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1496,6 +1582,8 @@ export interface ITokenizerHandle { + + /** Current line number */ + line: number; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1683,6 +1771,8 @@ export class Type extends NamespaceBase { + * @returns Decorator function + */ + public static d>(typeName?: string): TypeDecorator; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Message type descriptor. */ +@@ -1702,6 +1792,8 @@ export interface IType extends INamespace { + + /** Whether a legacy group or not */ + group?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Conversion options as used by {@link Type#toObject} and {@link Message.toObject}. */ +@@ -1742,6 +1834,8 @@ export interface IConversionOptions { + + /** Performs additional JSON compatibility conversions, i.e. NaN and Infinity to strings */ + json?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1838,6 +1932,8 @@ export namespace types { + /** Constructor type. */ + export interface Constructor extends Function { + new(...params: any[]): T; prototype: T; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Properties type. */ +@@ -1848,6 +1944,8 @@ type Properties = { [P in keyof T]?: T[P] }; + * This is a minimal stand-alone definition of a Buffer instance. The actual type is that exported by node's typings. + */ + export interface Buffer extends Uint8Array { ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1864,6 +1962,8 @@ export interface Long { + + /** Whether unsigned or not */ + unsigned: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +@@ -1961,6 +2061,8 @@ export namespace util { + * @returns Length + */ + public length(): number; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Whether running within node or not. */ +@@ -2088,6 +2190,8 @@ export namespace util { + + /** So far decoded message instance. */ + public instance: Message; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** +@@ -2298,6 +2402,8 @@ export namespace util { + * @returns `this` + */ + public emit(evt: string, ...args: any[]): this; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Reads / writes floats / doubles from / to buffers. */ +@@ -2497,6 +2603,8 @@ export interface IWrapper { + + /** To object converter */ + toObject?: WrapperToObjectConverter; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** Wire format writer using `Uint8Array` if available, otherwise `Array`. */ +@@ -2664,6 +2772,8 @@ export class Writer { + * @returns Finished buffer + */ + public finish(): Uint8Array; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** Wire format writer using node buffers. */ +@@ -2684,6 +2794,8 @@ export class BufferWriter extends Writer { + * @returns Finished buffer + */ + public finish(): Buffer; ++ ++ public $unknownFields?: ReadonlyArray; + } + + /** +@@ -2723,6 +2835,8 @@ export interface IFetchOptions { + + /** If `true`, forces the use of XMLHttpRequest */ + xhr?: boolean; ++ ++ $unknownFields?: ReadonlyArray; + } + + /** +diff --git a/node_modules/protobufjs/src/decoder.js b/node_modules/protobufjs/src/decoder.js +index f55451f..31aa011 100644 +--- a/node_modules/protobufjs/src/decoder.js ++++ b/node_modules/protobufjs/src/decoder.js +@@ -21,6 +21,7 @@ function decoder(mtype) { + ("r=Reader.create(r)") + ("var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (mtype.fieldsArray.filter(function(field) { return field.map; }).length ? ",k,value" : "")) + ("while(r.pos>>3){"); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ + var i = 0; + for (; i < /* initializes */ mtype.fieldsArray.length; ++i) { + var field = mtype._fieldsArray[i].resolve(), +@@ -110,6 +113,11 @@ function decoder(mtype) { + } gen + ("default:") + ("r.skipType(t&7)") ++ ("if (!(%s)) {", unknownRef) ++ ("%s = []", unknownRef) ++ ("}") ++ ++ ("%s.push(r.buf.slice(unknownStartPos, r.pos))", unknownRef) + ("break") + + ("}") +diff --git a/node_modules/protobufjs/src/encoder.js b/node_modules/protobufjs/src/encoder.js +index c803e99..c44439e 100644 +--- a/node_modules/protobufjs/src/encoder.js ++++ b/node_modules/protobufjs/src/encoder.js +@@ -36,6 +36,21 @@ function encoder(mtype) { + // "when a message is serialized its known fields should be written sequentially by field number" + var fields = /* initializes */ mtype.fieldsArray.slice().sort(util.compareFieldsById); + ++ var unknownRef = "m" + util.safeProp("$unknownFields"); ++ ++ // Redecode unknown fields and apply them to the message before encoding ++ gen ++ ("var fullyUnknown=[]") ++ ("if(%s) {", unknownRef) ++ ("for(var i=0;i<%s.length;++i) {", unknownRef) ++ ("try {") ++ ("var known=this.ctor.decode(%s[i])", unknownRef) ++ ("fullyUnknown=fullyUnknown.concat(known.$unknownFields||[])") ++ ("m=Object.assign(known,m)") ++ ("}catch(_){}") ++ ("}") ++ ("}") ++ + for (var i = 0; i < fields.length; ++i) { + var field = fields[i].resolve(), + index = mtype._fieldsArray.indexOf(field), +@@ -94,6 +109,11 @@ function encoder(mtype) { + } + } + ++ gen ++ ("for(var i=0;i;"); ++ } else { ++ writeln("public $unknownFields?: ReadonlyArray;"); ++ } ++ + --indent; + writeln("}"); + diff --git a/ts/services/storage.ts b/ts/services/storage.ts index 6ac78a973..a1622722c 100644 --- a/ts/services/storage.ts +++ b/ts/services/storage.ts @@ -1936,7 +1936,7 @@ export async function reprocessUnknownFields(): Promise { 'Inserted records must have storageRecord' ); - if (!item.storageRecord.__unknownFields?.length) { + if (!item.storageRecord.$unknownFields?.length) { return undefined; } diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts index b2af15949..b330b20db 100644 --- a/ts/services/storageRecordOps.ts +++ b/ts/services/storageRecordOps.ts @@ -116,11 +116,11 @@ function addUnknownFields( conversation: ConversationModel, details: Array ): void { - if (record.__unknownFields) { + if (record.$unknownFields) { details.push('adding unknown fields'); conversation.set({ storageUnknownFields: Bytes.toBase64( - Bytes.concatenate(record.__unknownFields) + Bytes.concatenate(record.$unknownFields) ), }); } else if (conversation.get('storageUnknownFields')) { @@ -142,7 +142,7 @@ function applyUnknownFields( conversation.idForLogging() ); // eslint-disable-next-line no-param-reassign - record.__unknownFields = [Bytes.fromBase64(storageUnknownFields)]; + record.$unknownFields = [Bytes.fromBase64(storageUnknownFields)]; } } @@ -502,7 +502,7 @@ export function toStoryDistributionListRecord( storyDistributionListRecord.recipientUuids = storyDistributionList.members; if (storyDistributionList.storageUnknownFields) { - storyDistributionListRecord.__unknownFields = [ + storyDistributionListRecord.$unknownFields = [ storyDistributionList.storageUnknownFields, ]; } @@ -529,7 +529,7 @@ export function toStickerPackRecord( } if (stickerPack.storageUnknownFields) { - stickerPackRecord.__unknownFields = [stickerPack.storageUnknownFields]; + stickerPackRecord.$unknownFields = [stickerPack.storageUnknownFields]; } return stickerPackRecord; @@ -1513,7 +1513,7 @@ export async function mergeStoryDistributionListRecord( storyDistributionListRecord.recipientUuids || [] ).map(UUID.cast); - if (storyDistributionListRecord.__unknownFields) { + if (storyDistributionListRecord.$unknownFields) { details.push('adding unknown fields'); } @@ -1532,8 +1532,8 @@ export async function mergeStoryDistributionListRecord( storageID, storageVersion, - storageUnknownFields: storyDistributionListRecord.__unknownFields - ? Bytes.concatenate(storyDistributionListRecord.__unknownFields) + storageUnknownFields: storyDistributionListRecord.$unknownFields + ? Bytes.concatenate(storyDistributionListRecord.$unknownFields) : null, storageNeedsSync: Boolean(localStoryDistributionList?.storageNeedsSync), }; @@ -1559,7 +1559,7 @@ export async function mergeStoryDistributionListRecord( const oldStorageVersion = localStoryDistributionList.storageVersion; const needsToClearUnknownFields = - !storyDistributionListRecord.__unknownFields && + !storyDistributionListRecord.$unknownFields && localStoryDistributionList.storageUnknownFields; if (needsToClearUnknownFields) { @@ -1627,11 +1627,11 @@ export async function mergeStickerPackRecord( const localStickerPack = await dataInterface.getStickerPackInfo(id); - if (stickerPackRecord.__unknownFields) { + if (stickerPackRecord.$unknownFields) { details.push('adding unknown fields'); } - const storageUnknownFields = stickerPackRecord.__unknownFields - ? Bytes.concatenate(stickerPackRecord.__unknownFields) + const storageUnknownFields = stickerPackRecord.$unknownFields + ? Bytes.concatenate(stickerPackRecord.$unknownFields) : null; let stickerPack: StickerPackInfoType; diff --git a/ts/test-mock/messaging/stories_test.ts b/ts/test-mock/messaging/stories_test.ts index 5904bebbc..d07814fea 100644 --- a/ts/test-mock/messaging/stories_test.ts +++ b/ts/test-mock/messaging/stories_test.ts @@ -152,12 +152,12 @@ describe('story/messaging', function unknownContacts() { }, storyMessageRecipients: [ { - destinationUuid: first.device.uuid, + destinationServiceId: first.device.uuid, distributionListIds: [DISTRIBUTION1], isAllowedToReply: true, }, { - destinationUuid: second.device.uuid, + destinationServiceId: second.device.uuid, distributionListIds: [DISTRIBUTION2], isAllowedToReply: true, }, diff --git a/ts/test-node/Proto_unknown_field_test.ts b/ts/test-node/Proto_unknown_field_test.ts index b9352f59b..0d67c5ca5 100644 --- a/ts/test-node/Proto_unknown_field_test.ts +++ b/ts/test-node/Proto_unknown_field_test.ts @@ -46,7 +46,7 @@ const { Partial, Full } = (Root as any).fromJSON({ }, }).nested.test; -describe('Proto#__unknownFields', () => { +describe('Proto#$unknownFields', () => { it('should encode and decode with unknown fields', () => { const full = Full.encode({ a: 'hello', @@ -58,20 +58,20 @@ describe('Proto#__unknownFields', () => { const partial = Partial.decode(full); assert.strictEqual(partial.a, 'hello'); assert.strictEqual(partial.c, 42); - assert.strictEqual(partial.__unknownFields.length, 2); + assert.strictEqual(partial.$unknownFields.length, 2); assert.strictEqual( - Buffer.from(partial.__unknownFields[0]).toString('hex'), + Buffer.from(partial.$unknownFields[0]).toString('hex'), '1001' ); assert.strictEqual( - Buffer.from(partial.__unknownFields[1]).toString('hex'), + Buffer.from(partial.$unknownFields[1]).toString('hex'), '22046f686169' ); const encoded = Partial.encode({ a: partial.a, c: partial.c, - __unknownFields: partial.__unknownFields, + $unknownFields: partial.$unknownFields, }).finish(); const decoded = Full.decode(encoded); @@ -83,7 +83,7 @@ describe('Proto#__unknownFields', () => { const concat = Partial.encode({ a: partial.a, c: partial.c, - __unknownFields: [Buffer.concat(partial.__unknownFields)], + $unknownFields: [Buffer.concat(partial.$unknownFields)], }).finish(); const decodedConcat = Full.decode(concat); diff --git a/ts/util/inspectProtobufs.ts b/ts/util/inspectProtobufs.ts index 44238325d..43820da32 100644 --- a/ts/util/inspectProtobufs.ts +++ b/ts/util/inspectProtobufs.ts @@ -4,14 +4,14 @@ import { Reader } from 'protobufjs'; type MessageWithUnknownFields = { - __unknownFields?: ReadonlyArray; + $unknownFields?: ReadonlyArray; }; /** * Returns an array of the tags of unknown fields in a protobuf message. * * Clients may use slightly different definitions of our protos, in cases where - * we don't recognize a field, we store it in `__unknownFields`. + * we don't recognize a field, we store it in `$unknownFields`. * * For example: * @@ -28,7 +28,7 @@ type MessageWithUnknownFields = { * } * ``` * - * If we receive a message with `baz` set, we'll store it in `__unknownFields`. + * If we receive a message with `baz` set, we'll store it in `$unknownFields`. * * This function will then return `[2]`. */ @@ -36,7 +36,7 @@ export function inspectUnknownFieldTags( message: MessageWithUnknownFields ): Array { return ( - message.__unknownFields?.map(field => { + message.$unknownFields?.map(field => { // https://protobuf.dev/programming-guides/encoding/ // The first byte of a field is a varint encoding the tag bit-shifted << 3 // eslint-disable-next-line no-bitwise diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 6b2dac2d9..b5ee93503 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -892,6 +892,12 @@ "reasonCategory": "testCode", "updated": "2022-06-01T22:57:44.591Z" }, + { + "rule": "DOM-innerHTML", + "path": "node_modules/jsdoc/templates/default/static/scripts/prettify/prettify.js", + "reasonCategory": "testCode", + "updated": "2023-07-12T01:02:31.061Z" + }, { "rule": "eval", "path": "node_modules/loader-runner/lib/loadLoader.js", diff --git a/yarn.lock b/yarn.lock index c271a3e73..86619b760 100644 --- a/yarn.lock +++ b/yarn.lock @@ -370,6 +370,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== +"@babel/parser@^7.20.15": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae" + integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" @@ -1894,6 +1899,13 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jsdoc/salty@^0.2.1": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692" + integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw== + dependencies: + lodash "^4.17.21" + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" @@ -2280,18 +2292,17 @@ node-gyp-build "^4.2.3" uuid "^8.3.0" -"@signalapp/mock-server@2.21.1": - version "2.21.1" - resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-2.21.1.tgz#31ac756a8db0509cf6065b7c6b8139c7dc54c24d" - integrity sha512-pycdxIyv8/vPJSl5GZkTTbeFHVq3keefpfuqhVN6ZnP7UfKc0EJ5n3STcTN1V6AdNkdntK82pt47836ln9Wmrg== +"@signalapp/mock-server@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-3.0.1.tgz#9f5e7d8ed207af191eadc33667708013a332b522" + integrity sha512-TXATTeczq6O1apT3SNPYFYG8/Z9MMRzmRfwZgl5JyyfjJcR00+b2GSW0G5qVONeVr6r6wS5zbUBDhcZ8+b04OA== dependencies: "@signalapp/libsignal-client" "^0.24.0" debug "^4.3.2" long "^4.0.0" micro "^9.3.4" microrouter "^3.1.3" - protobufjs "^6.10.2" - typescript "^4.9.5" + protobufjs "^7.2.4" url-pattern "^1.0.3" uuid "^8.3.2" ws "^8.4.2" @@ -4065,6 +4076,11 @@ dependencies: "@types/node" "*" +"@types/linkify-it@*": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" + integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== + "@types/linkify-it@2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806" @@ -4080,7 +4096,7 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== -"@types/long@4.0.1", "@types/long@^4.0.1": +"@types/long@4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== @@ -4090,6 +4106,14 @@ resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03" integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w== +"@types/markdown-it@^12.2.3": + version "12.2.3" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" + integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== + dependencies: + "@types/linkify-it" "*" + "@types/mdurl" "*" + "@types/mdast@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" @@ -4097,6 +4121,11 @@ dependencies: "@types/unist" "*" +"@types/mdurl@*": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" + integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== + "@types/memoizee@0.4.2": version "0.4.2" resolved "https://registry.yarnpkg.com/@types/memoizee/-/memoizee-0.4.2.tgz#a500158999a8144a9b46cf9a9fb49b15f1853573" @@ -4143,12 +4172,7 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@>=13.7.0": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c" - integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw== - -"@types/node@18.15.11", "@types/node@^18.11.18": +"@types/node@*", "@types/node@18.15.11", "@types/node@>=13.7.0", "@types/node@^18.11.18": version "18.15.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== @@ -5015,6 +5039,11 @@ acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== +acorn@^8.9.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + address@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -5938,7 +5967,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.3.5, bluebird@^3.5.0, bluebird@^3.5.5: +bluebird@^3.3.5, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -6039,6 +6068,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^1.8.2: version "1.8.5" resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" @@ -6499,6 +6535,13 @@ casual@1.6.2: mersenne-twister "^1.0.1" moment "^2.15.2" +catharsis@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121" + integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A== + dependencies: + lodash "^4.17.15" + ccount@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" @@ -8354,6 +8397,11 @@ entities@^4.2.0: resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== +entities@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + env-paths@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" @@ -8599,7 +8647,12 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.8.1: +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.13.0, escodegen@^1.8.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== @@ -8813,6 +8866,11 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== + eslint@8.30.0: version "8.30.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50" @@ -8858,6 +8916,15 @@ eslint@8.30.0: strip-json-comments "^3.1.0" text-table "^0.2.0" +espree@^9.0.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f" + integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + espree@^9.4.0: version "9.4.1" resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" @@ -10060,6 +10127,17 @@ glob@^7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -11818,6 +11896,34 @@ js-yaml@4.1.0, js-yaml@^4.1.0: dependencies: argparse "^2.0.1" +js2xmlparser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a" + integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA== + dependencies: + xmlcreate "^2.0.4" + +jsdoc@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e" + integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg== + dependencies: + "@babel/parser" "^7.20.15" + "@jsdoc/salty" "^0.2.1" + "@types/markdown-it" "^12.2.3" + bluebird "^3.7.2" + catharsis "^0.9.0" + escape-string-regexp "^2.0.0" + js2xmlparser "^4.0.2" + klaw "^3.0.0" + markdown-it "^12.3.2" + markdown-it-anchor "^8.4.1" + marked "^4.0.10" + mkdirp "^1.0.4" + requizzle "^0.2.3" + strip-json-comments "^3.1.0" + underscore "~1.13.2" + jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -12026,6 +12132,13 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +klaw@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" + integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== + dependencies: + graceful-fs "^4.1.9" + kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -12132,6 +12245,13 @@ linkify-it@2.2.0: dependencies: uc.micro "^1.0.1" +linkify-it@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e" + integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== + dependencies: + uc.micro "^1.0.1" + load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -12320,6 +12440,11 @@ long@4.0.0, long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" +long@^5.0.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" + integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== + longest-streak@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" @@ -12506,6 +12631,22 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== +markdown-it-anchor@^8.4.1: + version "8.6.7" + resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634" + integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA== + +markdown-it@^12.3.2: + version "12.3.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== + dependencies: + argparse "^2.0.1" + entities "~2.1.0" + linkify-it "^3.0.1" + mdurl "^1.0.1" + uc.micro "^1.0.5" + markdown-table@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" @@ -12513,6 +12654,11 @@ markdown-table@^2.0.0: dependencies: repeat-string "^1.0.0" +marked@^4.0.10: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -12659,7 +12805,7 @@ mdn-data@2.0.30: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== -mdurl@^1.0.0: +mdurl@^1.0.0, mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== @@ -13062,6 +13208,13 @@ minimatch@^3.0.5, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -14962,10 +15115,26 @@ property-information@^5.0.0, property-information@^5.3.0: dependencies: xtend "^4.0.0" -protobufjs@6.11.3, protobufjs@^6.10.2: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== +protobufjs-cli@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704" + integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA== + dependencies: + chalk "^4.0.0" + escodegen "^1.13.0" + espree "^9.0.0" + estraverse "^5.1.0" + glob "^8.0.0" + jsdoc "^4.0.0" + minimist "^1.2.0" + semver "^7.1.2" + tmp "^0.2.1" + uglify-js "^3.7.7" + +protobufjs@7.2.4, protobufjs@^7.2.4: + version "7.2.4" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.4.tgz#3fc1ec0cdc89dd91aef9ba6037ba07408485c3ae" + integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -14977,9 +15146,8 @@ protobufjs@6.11.3, protobufjs@^6.10.2: "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" "@types/node" ">=13.7.0" - long "^4.0.0" + long "^5.0.0" proxy-addr@~2.0.7: version "2.0.7" @@ -16028,6 +16196,13 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +requizzle@^0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" + integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== + dependencies: + lodash "^4.17.21" + reselect@4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.2.tgz#7bf642992d143d4f3b0f2dca8aa52018808a1d51" @@ -16381,6 +16556,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.2: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" @@ -17687,7 +17869,7 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@^0.2.0: +tmp@^0.2.0, tmp@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== @@ -17994,20 +18176,25 @@ typescript@5.1.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw== -typescript@^4.9.5: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - uc.micro@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" +uc.micro@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" + integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== + uglify-js@^3.1.4: version "3.13.5" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113" integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw== +uglify-js@^3.7.7: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -18038,6 +18225,11 @@ underscore@>=1.8.3: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== +underscore@~1.13.2: + version "1.13.6" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" + integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== + unfetch@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" @@ -18956,6 +19148,11 @@ xmlbuilder@^9.0.7: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlcreate@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be" + integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg== + xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"