diff --git a/CHANGELOG.md b/CHANGELOG.md index 52748dcd2..f40bcca24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.155.0](https://github.com/stephenh/ts-proto/compare/v1.154.0...v1.155.0) (2023-07-15) + + +### Features + +* Upgrade to long 5.0.0. ([#882](https://github.com/stephenh/ts-proto/issues/882)) ([4c1e7a6](https://github.com/stephenh/ts-proto/commit/4c1e7a6e02f974f193063a83ce7a472b14f2d2d0)) + # [1.154.0](https://github.com/stephenh/ts-proto/compare/v1.153.3...v1.154.0) (2023-07-15) diff --git a/integration/angular/package.json b/integration/angular/package.json index b51db82b0..54e08d3ca 100644 --- a/integration/angular/package.json +++ b/integration/angular/package.json @@ -19,7 +19,7 @@ "@angular/platform-browser": "~9.1.9", "@angular/platform-browser-dynamic": "~9.1.9", "@angular/router": "~9.1.9", - "long": "^4.0.0", + "long": "^5.0.0", "rxjs": "~6.5.4", "tslib": "^1.10.0", "zone.js": "~0.10.2" diff --git a/integration/bytes-node/google/protobuf/wrappers.ts b/integration/bytes-node/google/protobuf/wrappers.ts index fa227fba0..1bbfbcb1d 100644 --- a/integration/bytes-node/google/protobuf/wrappers.ts +++ b/integration/bytes-node/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/extensions/extensions-test.ts b/integration/extensions/extensions-test.ts index 1d7bafe33..984c8c70b 100644 --- a/integration/extensions/extensions-test.ts +++ b/integration/extensions/extensions-test.ts @@ -1,103 +1,103 @@ -import { Extendable, Nested, packed, repeated, bytes, string, long, fixed, enumField, group, Enum } from './test'; -import * as Long from 'long'; +import { Extendable, Nested, packed, repeated, bytes, string, long, fixed, enumField, group, Enum } from "./test"; +import Long = require("long"); -describe('extensions-test', () => { - it('works with namespaced extensions', () => { - const test: Extendable = { - field: 'hello' - }; +describe("extensions-test", () => { + it("works with namespaced extensions", () => { + const test: Extendable = { + field: "hello", + }; - const extensionData = [ - { - field: 'a' - }, - { - field: 'b' - } - ]; + const extensionData = [ + { + field: "a", + }, + { + field: "b", + }, + ]; - Extendable.setExtension(test, Nested.message, extensionData); + Extendable.setExtension(test, Nested.message, extensionData); - const encoded = Extendable.encode(test).finish(); - const result = Extendable.decode(encoded); + const encoded = Extendable.encode(test).finish(); + const result = Extendable.decode(encoded); - expect(result).toEqual(test); + expect(result).toEqual(test); - const extension = Extendable.getExtension(result, Nested.message); + const extension = Extendable.getExtension(result, Nested.message); - expect(extension).toEqual(extensionData); + expect(extension).toEqual(extensionData); - const unsetExtension = Extendable.getExtension(result, packed); + const unsetExtension = Extendable.getExtension(result, packed); - expect(unsetExtension).toEqual(undefined); - }); + expect(unsetExtension).toEqual(undefined); + }); - it('works with repeated fields', () => { - const test: Extendable = { - field: 'repeated', + it("works with repeated fields", () => { + const test: Extendable = { + field: "repeated", - _unknownFields: { - [(6 << 3) | 2]: [Buffer.from([1, 1]), Buffer.from([1, 1])], - [(6 << 3) | 0]: [Buffer.from([2]), Buffer.from([3]), Buffer.from([5])] - } - }; + _unknownFields: { + [(6 << 3) | 2]: [Buffer.from([1, 1]), Buffer.from([1, 1])], + [(6 << 3) | 0]: [Buffer.from([2]), Buffer.from([3]), Buffer.from([5])], + }, + }; - const extensionData = [1, 2, 3, 4, 5]; + const extensionData = [1, 2, 3, 4, 5]; - Extendable.setExtension(test, packed, extensionData); + Extendable.setExtension(test, packed, extensionData); - const encoded = Extendable.encode(test).finish(); - const result = Extendable.decode(encoded); + const encoded = Extendable.encode(test).finish(); + const result = Extendable.decode(encoded); - expect(result).toEqual(test); + expect(result).toEqual(test); - const extension = Extendable.getExtension(result, packed); + const extension = Extendable.getExtension(result, packed); - expect(extension).toEqual(extensionData); + expect(extension).toEqual(extensionData); - expect(Extendable.getExtension(result, repeated)).toEqual([1, 1, 2, 3, 5]); + expect(Extendable.getExtension(result, repeated)).toEqual([1, 1, 2, 3, 5]); - const unsetExtension = Extendable.getExtension(result, Nested.message); + const unsetExtension = Extendable.getExtension(result, Nested.message); - expect(unsetExtension).toEqual(undefined); - }); + expect(unsetExtension).toEqual(undefined); + }); - it('works with various field types', () => { - const test: Extendable = { - field: 'various' - }; + it("works with various field types", () => { + const test: Extendable = { + field: "various", + }; - const bytesExtensionData = Buffer.from([2, 3, 5, 7, 11]); - const stringExtensionData = "this is a string"; - const longExtensionData = new Long(0x89ABCDEF, 0x01234567, false); - const fixedExtensionData = new Long(0x01234567, 0x89ABCDEF, true); - const enumExtensionData = Enum.ENUM_ONE; - const groupExtensionData = { - name: 'this is', - value: 'a group' - }; + const bytesExtensionData = Buffer.from([2, 3, 5, 7, 11]); + const stringExtensionData = "this is a string"; + const longExtensionData = new Long(0x89abcdef, 0x01234567, false); + const fixedExtensionData = new Long(0x01234567, 0x89abcdef, true); + const enumExtensionData = Enum.ENUM_ONE; + const groupExtensionData = { + name: "this is", + value: "a group", + }; - Extendable.setExtension(test, bytes, bytesExtensionData); - Extendable.setExtension(test, string, stringExtensionData); - Extendable.setExtension(test, long, longExtensionData); - Extendable.setExtension(test, fixed, fixedExtensionData); - Extendable.setExtension(test, enumField, enumExtensionData); - Extendable.setExtension(test, group, groupExtensionData); + Extendable.setExtension(test, bytes, bytesExtensionData); + Extendable.setExtension(test, string, stringExtensionData); + Extendable.setExtension(test, long, longExtensionData); + Extendable.setExtension(test, fixed, fixedExtensionData); + Extendable.setExtension(test, enumField, enumExtensionData); + Extendable.setExtension(test, group, groupExtensionData); - const encoded = Extendable.encode(test).finish(); - const result = Extendable.decode(encoded); + const encoded = Extendable.encode(test).finish(); + const result = Extendable.decode(encoded); - expect(result).toEqual(test); + expect(result).toEqual(test); - expect( Extendable.getExtension(result, bytes) ).toEqual(bytesExtensionData); - expect( Extendable.getExtension(result, string) ).toEqual(stringExtensionData); - expect( Extendable.getExtension(result, long) ).toEqual(longExtensionData); - expect( Extendable.getExtension(result, fixed) ).toEqual(fixedExtensionData); - expect( Extendable.getExtension(result, enumField) ).toEqual(enumExtensionData); - expect( Extendable.getExtension(result, group) ).toEqual(groupExtensionData); + expect(Extendable.getExtension(result, bytes)).toEqual(bytesExtensionData); + expect(Extendable.getExtension(result, string)).toEqual(stringExtensionData); + expect(Extendable.getExtension(result, long)).toEqual(longExtensionData); + expect(Extendable.getExtension(result, fixed)).toEqual(fixedExtensionData); + expect(Extendable.getExtension(result, enumField)).toEqual(enumExtensionData); + expect(Extendable.getExtension(result, group)).toEqual(groupExtensionData); - const unsetExtension = Extendable.getExtension(result, Nested.message); + const unsetExtension = Extendable.getExtension(result, Nested.message); - expect(unsetExtension).toEqual(undefined); - }); + expect(unsetExtension).toEqual(undefined); + }); }); diff --git a/integration/extensions/test.ts b/integration/extensions/test.ts index 02c3edceb..e843bccac 100644 --- a/integration/extensions/test.ts +++ b/integration/extensions/test.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import * as Long from "long"; +import Long = require("long"); import * as _m0 from "protobufjs/minimal"; export const protobufPackage = ""; @@ -608,8 +608,6 @@ type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P : P & { [K in keyof P]: Exact } & { [K in Exclude>]: never }; -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/file-suffix/google/protobuf/timestamp.pb.ts b/integration/file-suffix/google/protobuf/timestamp.pb.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/file-suffix/google/protobuf/timestamp.pb.ts +++ b/integration/file-suffix/google/protobuf/timestamp.pb.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts +++ b/integration/grpc-js-use-date-false/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts +++ b/integration/grpc-js-use-date-string/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts b/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts +++ b/integration/grpc-js-use-date-true/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/grpc-js/google/protobuf/timestamp.ts b/integration/grpc-js/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/grpc-js/google/protobuf/timestamp.ts +++ b/integration/grpc-js/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/grpc-js/google/protobuf/wrappers.ts b/integration/grpc-js/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/grpc-js/google/protobuf/wrappers.ts +++ b/integration/grpc-js/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/import-mapping/google/protobuf/timestamp.ts b/integration/import-mapping/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/import-mapping/google/protobuf/timestamp.ts +++ b/integration/import-mapping/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/import-suffix/google/protobuf/timestamp.pb.ts b/integration/import-suffix/google/protobuf/timestamp.pb.ts index cd985f737..de977dc2b 100644 --- a/integration/import-suffix/google/protobuf/timestamp.pb.ts +++ b/integration/import-suffix/google/protobuf/timestamp.pb.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal.js"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/map-bigint-optional/test.ts b/integration/map-bigint-optional/test.ts index 32a7d585b..e2edeac10 100644 --- a/integration/map-bigint-optional/test.ts +++ b/integration/map-bigint-optional/test.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = ""; @@ -241,8 +241,6 @@ function longToBigint(long: Long) { return BigInt(long.toString()); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/map-long-optional/test.ts b/integration/map-long-optional/test.ts index 3742b7a0c..ac947f4af 100644 --- a/integration/map-long-optional/test.ts +++ b/integration/map-long-optional/test.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import * as Long from "long"; +import Long = require("long"); import * as _m0 from "protobufjs/minimal"; export const protobufPackage = ""; @@ -264,8 +264,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/map-longstring-optional/test.ts b/integration/map-longstring-optional/test.ts index 894e5f240..e5fccb66c 100644 --- a/integration/map-longstring-optional/test.ts +++ b/integration/map-longstring-optional/test.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = ""; @@ -241,8 +241,6 @@ function longToString(long: Long) { return long.toString(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/meta-typings/google/protobuf/timestamp.ts b/integration/meta-typings/google/protobuf/timestamp.ts index 476e3768e..b8fa3c667 100644 --- a/integration/meta-typings/google/protobuf/timestamp.ts +++ b/integration/meta-typings/google/protobuf/timestamp.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { FileDescriptorProto } from "ts-proto-descriptors"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -304,8 +304,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/meta-typings/google/protobuf/wrappers.ts b/integration/meta-typings/google/protobuf/wrappers.ts index 21c5791a7..2101658f6 100644 --- a/integration/meta-typings/google/protobuf/wrappers.ts +++ b/integration/meta-typings/google/protobuf/wrappers.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { FileDescriptorProto } from "ts-proto-descriptors"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -843,8 +843,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/meta-typings/simple.ts b/integration/meta-typings/simple.ts index 8531912cd..04f69cd5e 100644 --- a/integration/meta-typings/simple.ts +++ b/integration/meta-typings/simple.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { FileDescriptorProto } from "ts-proto-descriptors"; import { protoMetadata as protoMetadata3, Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, Int32Value, protoMetadata as protoMetadata2, StringValue } from "./google/protobuf/wrappers"; import { DateMessage, protoMetadata as protoMetadata1 } from "./google/type/date"; import { ImportedThing, protoMetadata as protoMetadata4 } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -2988,8 +2988,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/nice-grpc/google/protobuf/timestamp.ts b/integration/nice-grpc/google/protobuf/timestamp.ts index 16d31e94d..a4b4415ac 100644 --- a/integration/nice-grpc/google/protobuf/timestamp.ts +++ b/integration/nice-grpc/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -219,8 +219,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/nice-grpc/google/protobuf/wrappers.ts b/integration/nice-grpc/google/protobuf/wrappers.ts index 54591476f..aabe92a94 100644 --- a/integration/nice-grpc/google/protobuf/wrappers.ts +++ b/integration/nice-grpc/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -674,8 +674,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/options/google/protobuf/descriptor.ts b/integration/options/google/protobuf/descriptor.ts index 112bb593f..bc0a27d29 100644 --- a/integration/options/google/protobuf/descriptor.ts +++ b/integration/options/google/protobuf/descriptor.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { FileDescriptorProto as FileDescriptorProto1 } from "ts-proto-descriptors"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -5808,8 +5808,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/output-decode-only/google/protobuf/wrappers.ts b/integration/output-decode-only/google/protobuf/wrappers.ts index d05f90e86..0674c218b 100644 --- a/integration/output-decode-only/google/protobuf/wrappers.ts +++ b/integration/output-decode-only/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -381,8 +381,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-json-name/google/protobuf/timestamp.ts b/integration/simple-json-name/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/simple-json-name/google/protobuf/timestamp.ts +++ b/integration/simple-json-name/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-bigint/google/protobuf/timestamp.ts b/integration/simple-long-bigint/google/protobuf/timestamp.ts index d97dfed07..dbc000c51 100644 --- a/integration/simple-long-bigint/google/protobuf/timestamp.ts +++ b/integration/simple-long-bigint/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -201,8 +201,6 @@ function longToBigint(long: Long) { return BigInt(long.toString()); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-bigint/google/protobuf/wrappers.ts b/integration/simple-long-bigint/google/protobuf/wrappers.ts index 4dac2c482..6f5ad2a6a 100644 --- a/integration/simple-long-bigint/google/protobuf/wrappers.ts +++ b/integration/simple-long-bigint/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -675,8 +675,6 @@ function longToBigint(long: Long) { return BigInt(long.toString()); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-bigint/numbers-long-string-test.ts b/integration/simple-long-bigint/numbers-long-string-test.ts index 4d158c810..35bff0889 100644 --- a/integration/simple-long-bigint/numbers-long-string-test.ts +++ b/integration/simple-long-bigint/numbers-long-string-test.ts @@ -1,5 +1,5 @@ import { Reader } from "protobufjs"; -import * as Long from "long"; +import Long = require("long"); import { Numbers } from "./simple"; import { simple as pbjs, google } from "./pbjs"; import INumbers = pbjs.INumbers; diff --git a/integration/simple-long-bigint/simple.ts b/integration/simple-long-bigint/simple.ts index d0ae5489a..d773deb76 100644 --- a/integration/simple-long-bigint/simple.ts +++ b/integration/simple-long-bigint/simple.ts @@ -1,8 +1,8 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { UInt64Value } from "./google/protobuf/wrappers"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -359,8 +359,6 @@ function longToBigint(long: Long) { return BigInt(long.toString()); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-string/google/protobuf/timestamp.ts b/integration/simple-long-string/google/protobuf/timestamp.ts index a6b604c17..7785db1cd 100644 --- a/integration/simple-long-string/google/protobuf/timestamp.ts +++ b/integration/simple-long-string/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -201,8 +201,6 @@ function longToString(long: Long) { return long.toString(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-string/google/protobuf/wrappers.ts b/integration/simple-long-string/google/protobuf/wrappers.ts index 5ade52622..aa0588050 100644 --- a/integration/simple-long-string/google/protobuf/wrappers.ts +++ b/integration/simple-long-string/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -675,8 +675,6 @@ function longToString(long: Long) { return long.toString(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long-string/numbers-long-string-test.ts b/integration/simple-long-string/numbers-long-string-test.ts index 30eec980c..e6dc926f2 100644 --- a/integration/simple-long-string/numbers-long-string-test.ts +++ b/integration/simple-long-string/numbers-long-string-test.ts @@ -1,5 +1,5 @@ import { Reader } from "protobufjs"; -import * as Long from "long"; +import Long = require("long"); import { Numbers } from "./simple"; import { simple as pbjs, google } from "./pbjs"; import INumbers = pbjs.INumbers; diff --git a/integration/simple-long-string/simple.ts b/integration/simple-long-string/simple.ts index 265b88cdd..1c9f48f3f 100644 --- a/integration/simple-long-string/simple.ts +++ b/integration/simple-long-string/simple.ts @@ -1,8 +1,8 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { UInt64Value } from "./google/protobuf/wrappers"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -330,8 +330,6 @@ function longToString(long: Long) { return long.toString(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long/google/protobuf/wrappers.ts b/integration/simple-long/google/protobuf/wrappers.ts index 65076b2d5..f0fe7c61c 100644 --- a/integration/simple-long/google/protobuf/wrappers.ts +++ b/integration/simple-long/google/protobuf/wrappers.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import * as Long from "long"; +import Long = require("long"); import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.protobuf"; @@ -672,8 +672,6 @@ type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P : P & { [K in keyof P]: Exact } & { [K in Exclude>]: never }; -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-long/numbers-long-test.ts b/integration/simple-long/numbers-long-test.ts index 988b49259..3dad1fc6d 100644 --- a/integration/simple-long/numbers-long-test.ts +++ b/integration/simple-long/numbers-long-test.ts @@ -1,5 +1,5 @@ import { Reader } from "protobufjs"; -import * as Long from "long"; +import Long = require("long"); import { Numbers } from "./simple"; import { simple as pbjs } from "./pbjs"; import INumbers = pbjs.INumbers; diff --git a/integration/simple-long/simple.ts b/integration/simple-long/simple.ts index 6f1efbb31..73815f744 100644 --- a/integration/simple-long/simple.ts +++ b/integration/simple-long/simple.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import * as Long from "long"; +import Long = require("long"); import * as _m0 from "protobufjs/minimal"; import { BoolValue, Int32Value, Int64Value, StringValue } from "./google/protobuf/wrappers"; @@ -855,8 +855,6 @@ type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P : P & { [K in keyof P]: Exact } & { [K in Exclude>]: never }; -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-optionals/google/protobuf/timestamp.ts b/integration/simple-optionals/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/simple-optionals/google/protobuf/timestamp.ts +++ b/integration/simple-optionals/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-optionals/google/protobuf/wrappers.ts b/integration/simple-optionals/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/simple-optionals/google/protobuf/wrappers.ts +++ b/integration/simple-optionals/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-optionals/simple.ts b/integration/simple-optionals/simple.ts index 001ce7369..dbc6a1ee4 100644 --- a/integration/simple-optionals/simple.ts +++ b/integration/simple-optionals/simple.ts @@ -1,9 +1,9 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, Int32Value, StringValue } from "./google/protobuf/wrappers"; import { ImportedThing } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -2010,8 +2010,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-prototype-defaults/google/protobuf/timestamp.ts b/integration/simple-prototype-defaults/google/protobuf/timestamp.ts index 7e4a4c789..c1279f5f9 100644 --- a/integration/simple-prototype-defaults/google/protobuf/timestamp.ts +++ b/integration/simple-prototype-defaults/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-prototype-defaults/google/protobuf/wrappers.ts b/integration/simple-prototype-defaults/google/protobuf/wrappers.ts index 4c0fea75a..b8a1a2f92 100644 --- a/integration/simple-prototype-defaults/google/protobuf/wrappers.ts +++ b/integration/simple-prototype-defaults/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-prototype-defaults/simple.ts b/integration/simple-prototype-defaults/simple.ts index 31f2e5dd6..fe9580023 100644 --- a/integration/simple-prototype-defaults/simple.ts +++ b/integration/simple-prototype-defaults/simple.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, BytesValue, Int32Value, StringValue } from "./google/protobuf/wrappers"; import { DateMessage } from "./google/type/date"; import { ImportedThing } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -3010,8 +3010,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-snake/google/protobuf/timestamp.ts b/integration/simple-snake/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/simple-snake/google/protobuf/timestamp.ts +++ b/integration/simple-snake/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-snake/google/protobuf/wrappers.ts b/integration/simple-snake/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/simple-snake/google/protobuf/wrappers.ts +++ b/integration/simple-snake/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-snake/simple.ts b/integration/simple-snake/simple.ts index 5730934bc..6c2d143ee 100644 --- a/integration/simple-snake/simple.ts +++ b/integration/simple-snake/simple.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Struct } from "./google/protobuf/struct"; import { Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, Int32Value, StringValue } from "./google/protobuf/wrappers"; import { ImportedThing } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -2073,8 +2073,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts b/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts +++ b/integration/simple-unrecognized-enum/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts b/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts +++ b/integration/simple-unrecognized-enum/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple-unrecognized-enum/simple.ts b/integration/simple-unrecognized-enum/simple.ts index 6a3370f9d..e4b7063ff 100644 --- a/integration/simple-unrecognized-enum/simple.ts +++ b/integration/simple-unrecognized-enum/simple.ts @@ -1,9 +1,9 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, Int32Value, StringValue } from "./google/protobuf/wrappers"; import { ImportedThing } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -1998,8 +1998,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple/google/protobuf/timestamp.ts b/integration/simple/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/simple/google/protobuf/timestamp.ts +++ b/integration/simple/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple/google/protobuf/wrappers.ts b/integration/simple/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/simple/google/protobuf/wrappers.ts +++ b/integration/simple/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/simple/simple.ts b/integration/simple/simple.ts index 5a21a294f..4e07b22b8 100644 --- a/integration/simple/simple.ts +++ b/integration/simple/simple.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; import { BoolValue, BytesValue, Int32Value, StringValue } from "./google/protobuf/wrappers"; import { DateMessage } from "./google/type/date"; import { ImportedThing } from "./import_dir/thing"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -3015,8 +3015,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/static-only-type-registry/google/protobuf/timestamp.ts b/integration/static-only-type-registry/google/protobuf/timestamp.ts index feebb2f59..6412e7c48 100644 --- a/integration/static-only-type-registry/google/protobuf/timestamp.ts +++ b/integration/static-only-type-registry/google/protobuf/timestamp.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { messageTypeRegistry } from "../../typeRegistry"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -228,8 +228,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/static-only/google/protobuf/timestamp.ts b/integration/static-only/google/protobuf/timestamp.ts index 12496051e..0fb7abe8f 100644 --- a/integration/static-only/google/protobuf/timestamp.ts +++ b/integration/static-only/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -225,8 +225,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/tsconfig.proto.json b/integration/tsconfig.proto.json index 842413ac7..7c2385c47 100644 --- a/integration/tsconfig.proto.json +++ b/integration/tsconfig.proto.json @@ -17,4 +17,4 @@ "import-mapping/mapping.ts", "simple-esmodule-interop" ] -} \ No newline at end of file +} diff --git a/integration/type-annotations/google/protobuf/timestamp.ts b/integration/type-annotations/google/protobuf/timestamp.ts index c54fc2e7e..d3a2b6743 100644 --- a/integration/type-annotations/google/protobuf/timestamp.ts +++ b/integration/type-annotations/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -227,8 +227,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/type-registry/google/protobuf/timestamp.ts b/integration/type-registry/google/protobuf/timestamp.ts index c90f9a59e..cd8375327 100644 --- a/integration/type-registry/google/protobuf/timestamp.ts +++ b/integration/type-registry/google/protobuf/timestamp.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { messageTypeRegistry } from "../../typeRegistry"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -230,8 +230,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/unknown-fields/google/protobuf/compiler/plugin.ts b/integration/unknown-fields/google/protobuf/compiler/plugin.ts index 38071a47c..0a8e6d1c7 100644 --- a/integration/unknown-fields/google/protobuf/compiler/plugin.ts +++ b/integration/unknown-fields/google/protobuf/compiler/plugin.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { FileDescriptorProto, GeneratedCodeInfo } from "../descriptor"; +import Long = require("long"); export const protobufPackage = "google.protobuf.compiler"; @@ -518,8 +518,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/unknown-fields/google/protobuf/descriptor.ts b/integration/unknown-fields/google/protobuf/descriptor.ts index 835ca15ec..0dc72596a 100644 --- a/integration/unknown-fields/google/protobuf/descriptor.ts +++ b/integration/unknown-fields/google/protobuf/descriptor.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -3648,8 +3648,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-date-false/google/protobuf/timestamp.ts b/integration/use-date-false/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/use-date-false/google/protobuf/timestamp.ts +++ b/integration/use-date-false/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-date-string/google/protobuf/timestamp.ts b/integration/use-date-string/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/use-date-string/google/protobuf/timestamp.ts +++ b/integration/use-date-string/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-date-true/google/protobuf/timestamp.ts b/integration/use-date-true/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/use-date-true/google/protobuf/timestamp.ts +++ b/integration/use-date-true/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-map-type/google/protobuf/timestamp.ts b/integration/use-map-type/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/use-map-type/google/protobuf/timestamp.ts +++ b/integration/use-map-type/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-map-type/use-map-type.ts b/integration/use-map-type/use-map-type.ts index 43061dabd..ddb7d7b3a 100644 --- a/integration/use-map-type/use-map-type.ts +++ b/integration/use-map-type/use-map-type.ts @@ -1,8 +1,8 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Struct } from "./google/protobuf/struct"; import { Timestamp } from "./google/protobuf/timestamp"; +import Long = require("long"); export const protobufPackage = "simple"; @@ -794,8 +794,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-optionals-all/google/protobuf/timestamp.ts b/integration/use-optionals-all/google/protobuf/timestamp.ts index ff65580b5..6b1f71f5e 100644 --- a/integration/use-optionals-all/google/protobuf/timestamp.ts +++ b/integration/use-optionals-all/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -225,8 +225,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-optionals-all/test.ts b/integration/use-optionals-all/test.ts index 8151ab3c6..25ca5aa67 100644 --- a/integration/use-optionals-all/test.ts +++ b/integration/use-optionals-all/test.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; import { Timestamp } from "./google/protobuf/timestamp"; +import Long = require("long"); export const protobufPackage = "optionalstest"; @@ -780,8 +780,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/use-optionals-no-undefined/test.ts b/integration/use-optionals-no-undefined/test.ts index b7b01ae67..a0ae92741 100644 --- a/integration/use-optionals-no-undefined/test.ts +++ b/integration/use-optionals-no-undefined/test.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "optionalstest"; @@ -754,8 +754,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/value/google/protobuf/wrappers.ts b/integration/value/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/value/google/protobuf/wrappers.ts +++ b/integration/value/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/vector-tile/vector_tile.ts b/integration/vector-tile/vector_tile.ts index 2083c6576..7dfda0699 100644 --- a/integration/vector-tile/vector_tile.ts +++ b/integration/vector-tile/vector_tile.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "vector_tile"; @@ -588,8 +588,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/wrappers-regression/google/protobuf/timestamp.ts b/integration/wrappers-regression/google/protobuf/timestamp.ts index ea8e77c4a..032f4ab29 100644 --- a/integration/wrappers-regression/google/protobuf/timestamp.ts +++ b/integration/wrappers-regression/google/protobuf/timestamp.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -223,8 +223,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/integration/wrappers-regression/google/protobuf/wrappers.ts b/integration/wrappers-regression/google/protobuf/wrappers.ts index 0b584fccb..6637762f8 100644 --- a/integration/wrappers-regression/google/protobuf/wrappers.ts +++ b/integration/wrappers-regression/google/protobuf/wrappers.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; import * as _m0 from "protobufjs/minimal"; +import Long = require("long"); export const protobufPackage = "google.protobuf"; @@ -678,8 +678,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/package.json b/package.json index b0f056bd7..3505953cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-proto", - "version": "1.154.0", + "version": "1.155.0", "description": "", "main": "build/plugin.js", "repository": "github:stephenh/ts-proto", @@ -67,8 +67,8 @@ "dependencies": { "case-anything": "^2.1.13", "protobufjs": "^7.2.4", - "ts-poet": "^6.4.1", - "ts-proto-descriptors": "1.12.0" + "ts-poet": "^6.5.0", + "ts-proto-descriptors": "1.13.0" }, "packageManager": "yarn@3.6.0" } diff --git a/protos/build.sh b/protos/build.sh index 4bb028506..a88bcd176 100755 --- a/protos/build.sh +++ b/protos/build.sh @@ -6,7 +6,7 @@ protoc \ --plugin=./node_modules/ts-proto/protoc-gen-ts_proto \ --ts_proto_out=. \ - --ts_proto_opt=useExactTypes=false,initializeFieldsAsUndefined=false,exportCommonSymbols=false,unknownFields=true,usePrototypeForDefaults=true,outputExtensions=true \ + --ts_proto_opt=esModuleInterop=true,useExactTypes=false,initializeFieldsAsUndefined=false,exportCommonSymbols=false,unknownFields=true,usePrototypeForDefaults=true,outputExtensions=true \ ./google/protobuf/descriptor.proto \ ./google/protobuf/compiler/plugin.proto diff --git a/protos/google/protobuf/compiler/plugin.ts b/protos/google/protobuf/compiler/plugin.ts index ce75a3cda..3b9b09d3c 100644 --- a/protos/google/protobuf/compiler/plugin.ts +++ b/protos/google/protobuf/compiler/plugin.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; -import * as _m0 from "protobufjs/minimal"; +import Long from "long"; +import _m0 from "protobufjs/minimal"; import { FileDescriptorProto, GeneratedCodeInfo } from "../descriptor"; /** The version number of protocol compiler. */ @@ -710,8 +710,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/protos/google/protobuf/descriptor.ts b/protos/google/protobuf/descriptor.ts index d883a6573..8300917bf 100644 --- a/protos/google/protobuf/descriptor.ts +++ b/protos/google/protobuf/descriptor.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import * as Long from "long"; -import * as _m0 from "protobufjs/minimal"; +import Long from "long"; +import _m0 from "protobufjs/minimal"; /** * The protocol compiler can output a FileDescriptorSet containing the .proto @@ -5607,8 +5607,6 @@ function longToNumber(long: Long): number { return long.toNumber(); } -// If you get a compile-error about 'Constructor and ... have no overlap', -// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/protos/package.json b/protos/package.json index 7ab92d395..eba44c2cf 100644 --- a/protos/package.json +++ b/protos/package.json @@ -1,6 +1,6 @@ { "name": "ts-proto-descriptors", - "version": "1.12.0", + "version": "1.13.0", "description": "", "repository": "github:stephenh/ts-proto", "keywords": [], @@ -12,7 +12,7 @@ "dist/" ], "dependencies": { - "long": "^4.0.0", + "long": "^5.0.0", "protobufjs": "^7.2.4" }, "devDependencies": { diff --git a/protos/tsconfig.json b/protos/tsconfig.json index 18baad8c0..190c5b8a3 100644 --- a/protos/tsconfig.json +++ b/protos/tsconfig.json @@ -3,6 +3,7 @@ "target": "es2018", "lib": ["es2018"], "module": "commonjs", + "esModuleInterop": true, "strict": true, "outDir": "dist", "declaration": true, diff --git a/protos/yarn.lock b/protos/yarn.lock index 037b7cb20..eff8e154c 100644 --- a/protos/yarn.lock +++ b/protos/yarn.lock @@ -219,7 +219,7 @@ __metadata: version: 0.0.0-use.local resolution: "ts-proto-descriptors@workspace:." dependencies: - long: ^4.0.0 + long: ^5.0.0 protobufjs: ^7.2.4 ts-proto: ^1.153.0 typescript: ^5.1.3 diff --git a/src/main.ts b/src/main.ts index 0a47f82e5..ec26bff5e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -451,26 +451,9 @@ function makeProtobufStructWrapper(options: Options) { function makeLongUtils(options: Options, bytes: ReturnType) { // Regardless of which `forceLong` config option we're using, we always use // the `long` library to either represent or at least sanity-check 64-bit values - const util = impFile(options, "util@protobufjs/minimal"); - const configure = impFile(options, "configure@protobufjs/minimal"); - - // Before esModuleInterop, we had to use 'import * as Long from long` b/c long is - // an `export =` module and exports only the Long constructor (which is callable). - // See https://www.typescriptlang.org/docs/handbook/modules.html#export--and-import--require. - // - // With esModuleInterop on, `* as Long` is no longer the constructor, it's the module, - // so we want to go back to `import { Long } from long`, which is specifically forbidden - // due to `export =` w/o esModuleInterop. - // - // I.e there is not an import for long that "just works" in both esModuleInterop and - // not esModuleInterop. - const LongImp = options.esModuleInterop ? imp("Long=long") : imp("Long*long"); - - const disclaimer = options.esModuleInterop - ? "" - : ` - // If you get a compile-error about 'Constructor and ... have no overlap', - // add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.`; + const util = impFile(options, `util@protobufjs/minimal`); + const configure = impFile(options, `configure@protobufjs/minimal`); + const LongImp = imp("Long=long"); // Instead of exposing `LongImp` directly, let callers think that they are getting the // `imp(Long)` but really it is that + our long initialization snippet. This means the @@ -478,7 +461,6 @@ function makeLongUtils(options: Options, bytes: ReturnType const Long = conditionalOutput( "Long", code` - ${disclaimer} if (${util}.Long !== ${LongImp}) { ${util}.Long = ${LongImp} as any; ${configure}(); diff --git a/src/options.ts b/src/options.ts index bab73fba0..4bd4d74e6 100644 --- a/src/options.ts +++ b/src/options.ts @@ -261,12 +261,15 @@ function parseParamValue(value: string): string | boolean { return value === "true" ? true : value === "false" ? false : value; } -export function getTsPoetOpts(_options: Options): ToStringOpts { - const imports = ["protobufjs/minimal" + _options.importSuffix]; +export function getTsPoetOpts(options: Options): ToStringOpts { + const { importSuffix, esModuleInterop } = options; + const pbjs = "protobufjs/minimal" + importSuffix; return { prefix: `/* eslint-disable */`, dprintOptions: { preferSingleLine: true, lineWidth: 120 }, - ...(_options.esModuleInterop ? { forceDefaultImport: imports } : { forceModuleImport: imports }), + forceRequireImport: esModuleInterop ? [] : ["long"], + forceDefaultImport: esModuleInterop ? [pbjs] : [], + forceModuleImport: esModuleInterop ? [] : [pbjs], }; } diff --git a/yarn.lock b/yarn.lock index c8871cc61..11310949d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -606,17 +606,7 @@ __metadata: languageName: node linkType: hard -"@grpc/grpc-js@npm:^1.7.3": - version: 1.8.14 - resolution: "@grpc/grpc-js@npm:1.8.14" - dependencies: - "@grpc/proto-loader": ^0.7.0 - "@types/node": ">=12.12.47" - checksum: 7b889ae67cde5eb9b4feb92d54e73945d881309b9b879a2dde478fa7850b99835efa7592a8154a0f923851d7a18a177c106f5f52b45061180bb04aef7783c1c9 - languageName: node - linkType: hard - -"@grpc/grpc-js@npm:^1.8.17": +"@grpc/grpc-js@npm:^1.7.3, @grpc/grpc-js@npm:^1.8.17": version: 1.8.17 resolution: "@grpc/grpc-js@npm:1.8.17" dependencies: @@ -626,22 +616,7 @@ __metadata: languageName: node linkType: hard -"@grpc/proto-loader@npm:^0.7.0": - version: 0.7.7 - resolution: "@grpc/proto-loader@npm:0.7.7" - dependencies: - "@types/long": ^4.0.1 - lodash.camelcase: ^4.3.0 - long: ^4.0.0 - protobufjs: ^7.0.0 - yargs: ^17.7.2 - bin: - proto-loader-gen-types: build/bin/proto-loader-gen-types.js - checksum: 6015d99d36d0451075a53e5c5842e8912235973a515677afca038269969ad84f22a4c9fbc9badf52f034736b3f1bf864739f7c4238ba8a7e6fd3bba75cfce0ee - languageName: node - linkType: hard - -"@grpc/proto-loader@npm:^0.7.8": +"@grpc/proto-loader@npm:^0.7.0, @grpc/proto-loader@npm:^0.7.8": version: 0.7.8 resolution: "@grpc/proto-loader@npm:0.7.8" dependencies: @@ -784,15 +759,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/expect-utils@npm:29.5.0" - dependencies: - jest-get-type: ^29.4.3 - checksum: c46fb677c88535cf83cf29f0a5b1f376c6a1109ddda266ad7da1a9cbc53cb441fa402dd61fc7b111ffc99603c11a9b3357ee41a1c0e035a58830bcb360871476 - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.6.1": version: 29.6.1 resolution: "@jest/expect-utils@npm:29.6.1" @@ -875,15 +841,6 @@ __metadata: languageName: node linkType: hard -"@jest/schemas@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/schemas@npm:29.4.3" - dependencies: - "@sinclair/typebox": ^0.25.16 - checksum: ac754e245c19dc39e10ebd41dce09040214c96a4cd8efa143b82148e383e45128f24599195ab4f01433adae4ccfbe2db6574c90db2862ccd8551a86704b5bebd - languageName: node - linkType: hard - "@jest/schemas@npm:^29.6.0": version: 29.6.0 resolution: "@jest/schemas@npm:29.6.0" @@ -951,20 +908,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/types@npm:29.5.0" - dependencies: - "@jest/schemas": ^29.4.3 - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^17.0.8 - chalk: ^4.0.0 - checksum: 1811f94b19cf8a9460a289c4f056796cfc373480e0492692a6125a553cd1a63824bd846d7bb78820b7b6f758f6dd3c2d4558293bb676d541b2fa59c70fdf9d39 - languageName: node - linkType: hard - "@jest/types@npm:^29.6.1": version: 29.6.1 resolution: "@jest/types@npm:29.6.1" @@ -1638,24 +1581,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/commit-analyzer@npm:^10.0.0": - version: 10.0.0 - resolution: "@semantic-release/commit-analyzer@npm:10.0.0" - dependencies: - conventional-changelog-angular: ^5.0.0 - conventional-commits-filter: ^2.0.0 - conventional-commits-parser: ^3.2.3 - debug: ^4.0.0 - import-from: ^4.0.0 - lodash-es: ^4.17.21 - micromatch: ^4.0.2 - peerDependencies: - semantic-release: ">=20.1.0" - checksum: aaab0ce58eefb06f5dbbfad040467620cff4f533d77c92784149bd121c5bf9098562cdc7b37088ae4d3dfb42765cf3343c8653ced049cdf635de88c5eb470f78 - languageName: node - linkType: hard - -"@semantic-release/commit-analyzer@npm:^10.0.1": +"@semantic-release/commit-analyzer@npm:^10.0.0, @semantic-release/commit-analyzer@npm:^10.0.1": version: 10.0.1 resolution: "@semantic-release/commit-analyzer@npm:10.0.1" dependencies: @@ -1720,33 +1646,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/github@npm:^9.0.0": - version: 9.0.2 - resolution: "@semantic-release/github@npm:9.0.2" - dependencies: - "@octokit/core": ^4.2.1 - "@octokit/plugin-paginate-rest": ^7.0.0 - "@octokit/plugin-retry": ^5.0.0 - "@octokit/plugin-throttling": ^6.0.0 - "@semantic-release/error": ^3.0.0 - aggregate-error: ^4.0.1 - debug: ^4.3.4 - dir-glob: ^3.0.1 - globby: ^13.1.4 - http-proxy-agent: ^7.0.0 - https-proxy-agent: ^7.0.0 - issue-parser: ^6.0.0 - lodash-es: ^4.17.21 - mime: ^3.0.0 - p-filter: ^3.0.0 - url-join: ^5.0.0 - peerDependencies: - semantic-release: ">=20.1.0" - checksum: e92c4e580de4603c30fae88c2d4563bb0e280f3bdb632c7513a740227a087666de52762c89d5d57fd242e41bee7567733d76383af2b0f7238001759df4ec80b5 - languageName: node - linkType: hard - -"@semantic-release/github@npm:^9.0.3": +"@semantic-release/github@npm:^9.0.0, @semantic-release/github@npm:^9.0.3": version: 9.0.3 resolution: "@semantic-release/github@npm:9.0.3" dependencies: @@ -1772,30 +1672,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/npm@npm:^10.0.2": - version: 10.0.3 - resolution: "@semantic-release/npm@npm:10.0.3" - dependencies: - "@semantic-release/error": ^3.0.0 - aggregate-error: ^4.0.1 - execa: ^7.0.0 - fs-extra: ^11.0.0 - lodash-es: ^4.17.21 - nerf-dart: ^1.0.0 - normalize-url: ^8.0.0 - npm: ^9.5.0 - rc: ^1.2.8 - read-pkg: ^8.0.0 - registry-auth-token: ^5.0.0 - semver: ^7.1.2 - tempy: ^3.0.0 - peerDependencies: - semantic-release: ">=20.1.0" - checksum: b7bb691c35b59fd574122f421241dd5266f14e9f0a9d5513a15d978ffd979e0c6721018c1c47c23a0bfa5e217ce04ae698bd4f83e11bc17382f08c1b5127c6e0 - languageName: node - linkType: hard - -"@semantic-release/npm@npm:^10.0.4": +"@semantic-release/npm@npm:^10.0.2, @semantic-release/npm@npm:^10.0.4": version: 10.0.4 resolution: "@semantic-release/npm@npm:10.0.4" dependencies: @@ -1818,27 +1695,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/release-notes-generator@npm:^11.0.0": - version: 11.0.2 - resolution: "@semantic-release/release-notes-generator@npm:11.0.2" - dependencies: - conventional-changelog-angular: ^5.0.0 - conventional-changelog-writer: ^5.0.0 - conventional-commits-filter: ^2.0.0 - conventional-commits-parser: ^3.2.3 - debug: ^4.0.0 - get-stream: ^7.0.0 - import-from: ^4.0.0 - into-stream: ^7.0.0 - lodash-es: ^4.17.21 - read-pkg-up: ^9.0.0 - peerDependencies: - semantic-release: ">=20.1.0" - checksum: bbecdafeea9a140f4a9ba615f871a69179801802145debc35588987c833fdcd16008b5a8b6c8c8604625c0074cd28ced014e5fee35bf0a0dce7ee916912c0224 - languageName: node - linkType: hard - -"@semantic-release/release-notes-generator@npm:^11.0.4": +"@semantic-release/release-notes-generator@npm:^11.0.0, @semantic-release/release-notes-generator@npm:^11.0.4": version: 11.0.4 resolution: "@semantic-release/release-notes-generator@npm:11.0.4" dependencies: @@ -1865,13 +1722,6 @@ __metadata: languageName: node linkType: hard -"@sinclair/typebox@npm:^0.25.16": - version: 0.25.24 - resolution: "@sinclair/typebox@npm:0.25.24" - checksum: 10219c58f40b8414c50b483b0550445e9710d4fe7b2c4dccb9b66533dd90ba8e024acc776026cebe81e87f06fa24b07fdd7bc30dd277eb9cc386ec50151a3026 - languageName: node - linkType: hard - "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -2126,7 +1976,7 @@ __metadata: languageName: node linkType: hard -"JSONStream@npm:^1.0.4, JSONStream@npm:^1.3.5": +"JSONStream@npm:^1.3.5": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" dependencies: @@ -2991,16 +2841,6 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-angular@npm:^5.0.0": - version: 5.0.12 - resolution: "conventional-changelog-angular@npm:5.0.12" - dependencies: - compare-func: ^2.0.0 - q: ^1.5.1 - checksum: 552db8762d210a5172b1ad8cd95312e2e2a0483ba43f8d30b075a56ccf05231fdca1d4d5843028d43bec6bc7f903f480005efc5386587321a15a1fc4d2b73016 - languageName: node - linkType: hard - "conventional-changelog-angular@npm:^6.0.0": version: 6.0.0 resolution: "conventional-changelog-angular@npm:6.0.0" @@ -3010,25 +2850,6 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-writer@npm:^5.0.0": - version: 5.0.1 - resolution: "conventional-changelog-writer@npm:5.0.1" - dependencies: - conventional-commits-filter: ^2.0.7 - dateformat: ^3.0.0 - handlebars: ^4.7.7 - json-stringify-safe: ^5.0.1 - lodash: ^4.17.15 - meow: ^8.0.0 - semver: ^6.0.0 - split: ^1.0.0 - through2: ^4.0.0 - bin: - conventional-changelog-writer: cli.js - checksum: 5c0129db44577f14b1f8de225b62a392a9927ba7fe3422cb21ad71a771b8472bd03badb7c87cb47419913abc3f2ce3759b69f59550cdc6f7a7b0459015b3b44c - languageName: node - linkType: hard - "conventional-changelog-writer@npm:^6.0.0": version: 6.0.1 resolution: "conventional-changelog-writer@npm:6.0.1" @@ -3046,16 +2867,6 @@ __metadata: languageName: node linkType: hard -"conventional-commits-filter@npm:^2.0.0, conventional-commits-filter@npm:^2.0.7": - version: 2.0.7 - resolution: "conventional-commits-filter@npm:2.0.7" - dependencies: - lodash.ismatch: ^4.4.0 - modify-values: ^1.0.0 - checksum: feb567f680a6da1baaa1ef3cff393b3c56a5828f77ab9df5e70626475425d109a6fee0289b4979223c62bbd63bf9c98ef532baa6fcb1b66ee8b5f49077f5d46c - languageName: node - linkType: hard - "conventional-commits-filter@npm:^3.0.0": version: 3.0.0 resolution: "conventional-commits-filter@npm:3.0.0" @@ -3066,22 +2877,6 @@ __metadata: languageName: node linkType: hard -"conventional-commits-parser@npm:^3.2.3": - version: 3.2.4 - resolution: "conventional-commits-parser@npm:3.2.4" - dependencies: - JSONStream: ^1.0.4 - is-text-path: ^1.0.1 - lodash: ^4.17.15 - meow: ^8.0.0 - split2: ^3.0.0 - through2: ^4.0.0 - bin: - conventional-commits-parser: cli.js - checksum: 1627ff203bc9586d89e47a7fe63acecf339aba74903b9114e23d28094f79d4e2d6389bf146ae561461dcba8fc42e7bc228165d2b173f15756c43f1d32bc50bfd - languageName: node - linkType: hard - "conventional-commits-parser@npm:^4.0.0": version: 4.0.0 resolution: "conventional-commits-parser@npm:4.0.0" @@ -3167,7 +2962,7 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^3.0.0, dateformat@npm:^3.0.3": +"dateformat@npm:^3.0.3": version: 3.0.3 resolution: "dateformat@npm:3.0.3" checksum: ca4911148abb09887bd9bdcd632c399b06f3ecad709a18eb594d289a1031982f441e08e281db77ffebcb2cbcbfa1ac578a7cbfbf8743f41009aa5adc1846ed34 @@ -3639,20 +3434,7 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0": - version: 29.5.0 - resolution: "expect@npm:29.5.0" - dependencies: - "@jest/expect-utils": ^29.5.0 - jest-get-type: ^29.4.3 - jest-matcher-utils: ^29.5.0 - jest-message-util: ^29.5.0 - jest-util: ^29.5.0 - checksum: 58f70b38693df6e5c6892db1bcd050f0e518d6f785175dc53917d4fa6a7359a048e5690e19ddcb96b65c4493881dd89a3dabdab1a84dfa55c10cdbdabf37b2d7 - languageName: node - linkType: hard - -"expect@npm:^29.6.1": +"expect@npm:^29.0.0, expect@npm:^29.6.1": version: 29.6.1 resolution: "expect@npm:29.6.1" dependencies: @@ -4365,13 +4147,6 @@ __metadata: languageName: node linkType: hard -"ip@npm:^1.1.5": - version: 1.1.5 - resolution: "ip@npm:1.1.5" - checksum: 30133981f082a060a32644f6a7746e9ba7ac9e2bc07ecc8bbdda3ee8ca9bec1190724c390e45a1ee7695e7edfd2a8f7dda2c104ec5f7ac5068c00648504c7e5a - languageName: node - linkType: hard - "ip@npm:^2.0.0": version: 2.0.0 resolution: "ip@npm:2.0.0" @@ -4717,18 +4492,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-diff@npm:29.5.0" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^29.4.3 - jest-get-type: ^29.4.3 - pretty-format: ^29.5.0 - checksum: dfd0f4a299b5d127779c76b40106c37854c89c3e0785098c717d52822d6620d227f6234c3a9291df204d619e799e3654159213bf93220f79c8e92a55475a3d39 - languageName: node - linkType: hard - "jest-diff@npm:^29.6.1": version: 29.6.1 resolution: "jest-diff@npm:29.6.1" @@ -4817,18 +4580,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-matcher-utils@npm:29.5.0" - dependencies: - chalk: ^4.0.0 - jest-diff: ^29.5.0 - jest-get-type: ^29.4.3 - pretty-format: ^29.5.0 - checksum: 1d3e8c746e484a58ce194e3aad152eff21fd0896e8b8bf3d4ab1a4e2cbfed95fb143646f4ad9fdf6e42212b9e8fc033268b58e011b044a9929df45485deb5ac9 - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.6.1": version: 29.6.1 resolution: "jest-matcher-utils@npm:29.6.1" @@ -4841,23 +4592,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-message-util@npm:29.5.0" - dependencies: - "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.5.0 - "@types/stack-utils": ^2.0.0 - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - micromatch: ^4.0.4 - pretty-format: ^29.5.0 - slash: ^3.0.0 - stack-utils: ^2.0.3 - checksum: daddece6bbf846eb6a2ab9be9f2446e54085bef4e5cecd13d2a538fa9c01cb89d38e564c6b74fd8e12d37ed9eface8a362240ae9f21d68b214590631e7a0d8bf - languageName: node - linkType: hard - "jest-message-util@npm:^29.6.1": version: 29.6.1 resolution: "jest-message-util@npm:29.6.1" @@ -5029,21 +4763,7 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.0.0, jest-util@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-util@npm:29.5.0" - dependencies: - "@jest/types": ^29.5.0 - "@types/node": "*" - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - checksum: fd9212950d34d2ecad8c990dda0d8ea59a8a554b0c188b53ea5d6c4a0829a64f2e1d49e6e85e812014933d17426d7136da4785f9cf76fff1799de51b88bc85d3 - languageName: node - linkType: hard - -"jest-util@npm:^29.6.1": +"jest-util@npm:^29.0.0, jest-util@npm:^29.6.1": version: 29.6.1 resolution: "jest-util@npm:29.6.1" dependencies: @@ -5774,7 +5494,7 @@ __metadata: languageName: node linkType: hard -"meow@npm:^8.0.0, meow@npm:^8.1.2": +"meow@npm:^8.1.2": version: 8.1.2 resolution: "meow@npm:8.1.2" dependencies: @@ -6010,7 +5730,7 @@ __metadata: languageName: node linkType: hard -"modify-values@npm:^1.0.0, modify-values@npm:^1.0.1": +"modify-values@npm:^1.0.1": version: 1.0.1 resolution: "modify-values@npm:1.0.1" checksum: 8296610c608bc97b03c2cf889c6cdf4517e32fa2d836440096374c2209f6b7b3e256c209493a0b32584b9cb32d528e99d0dd19dcd9a14d2d915a312d391cc7e9 @@ -6239,7 +5959,7 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2": +"normalize-package-data@npm:^3.0.0": version: 3.0.3 resolution: "normalize-package-data@npm:3.0.3" dependencies: @@ -6904,18 +6624,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.5.0": - version: 29.5.0 - resolution: "pretty-format@npm:29.5.0" - dependencies: - "@jest/schemas": ^29.4.3 - ansi-styles: ^5.0.0 - react-is: ^18.0.0 - checksum: 4065356b558e6db25b4d41a01efb386935a6c06a0c9c104ef5ce59f2f476b8210edb8b3949b386e60ada0a6dc5ebcb2e6ccddc8c64dfd1a9943c3c3a9e7eaf89 - languageName: node - linkType: hard - -"pretty-format@npm:^29.6.1": +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.6.1": version: 29.6.1 resolution: "pretty-format@npm:29.6.1" dependencies: @@ -7027,7 +6736,7 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:^7.0.0, protobufjs@npm:^7.2.4": +"protobufjs@npm:^7.2.4": version: 7.2.4 resolution: "protobufjs@npm:7.2.4" dependencies: @@ -7061,13 +6770,6 @@ __metadata: languageName: node linkType: hard -"q@npm:^1.5.1": - version: 1.5.1 - resolution: "q@npm:1.5.1" - checksum: 147baa93c805bc1200ed698bdf9c72e9e42c05f96d007e33a558b5fdfd63e5ea130e99313f28efc1783e90e6bdb4e48b67a36fcc026b7b09202437ae88a1fb12 - languageName: node - linkType: hard - "qrcode-terminal@npm:^0.12.0": version: 0.12.0 resolution: "qrcode-terminal@npm:0.12.0" @@ -7163,17 +6865,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^9.0.0": - version: 9.1.0 - resolution: "read-pkg-up@npm:9.1.0" - dependencies: - find-up: ^6.3.0 - read-pkg: ^7.1.0 - type-fest: ^2.5.0 - checksum: 41b8ba4bdb7c1e914aa6ce2d36a7c1651e9086938977fa12f058f6fca51ee15315634af648ca4ef70dd074e575e854616b39032ad0b376e9e97d61a9d0867afe - languageName: node - linkType: hard - "read-pkg@npm:^5.2.0": version: 5.2.0 resolution: "read-pkg@npm:5.2.0" @@ -7186,18 +6877,6 @@ __metadata: languageName: node linkType: hard -"read-pkg@npm:^7.1.0": - version: 7.1.0 - resolution: "read-pkg@npm:7.1.0" - dependencies: - "@types/normalize-package-data": ^2.4.1 - normalize-package-data: ^3.0.2 - parse-json: ^5.2.0 - type-fest: ^2.0.0 - checksum: 20d11c59be3ae1fc79d4b9c8594dabeaec58105f9dfd710570ef9690ec2ac929247006e79ca114257683228663199735d60f149948dbc5f34fcd2d28883ab5f7 - languageName: node - linkType: hard - "read-pkg@npm:^8.0.0": version: 8.0.0 resolution: "read-pkg@npm:8.0.0" @@ -7219,17 +6898,6 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.6.0": - version: 3.6.0 - resolution: "readable-stream@npm:3.6.0" - dependencies: - inherits: ^2.0.3 - string_decoder: ^1.1.1 - util-deprecate: ^1.0.1 - checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8 - languageName: node - linkType: hard - "readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.2, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" @@ -7245,6 +6913,17 @@ __metadata: languageName: node linkType: hard +"readable-stream@npm:^3.0.0, readable-stream@npm:^3.6.0": + version: 3.6.0 + resolution: "readable-stream@npm:3.6.0" + dependencies: + inherits: ^2.0.3 + string_decoder: ^1.1.1 + util-deprecate: ^1.0.1 + checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8 + languageName: node + linkType: hard + "readable-stream@npm:^4.1.0": version: 4.4.0 resolution: "readable-stream@npm:4.4.0" @@ -7512,18 +7191,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.1": - version: 7.5.1 - resolution: "semver@npm:7.5.1" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: d16dbedad53c65b086f79524b9ef766bf38670b2395bdad5c957f824dcc566b624988013564f4812bcace3f9d405355c3635e2007396a39d1bffc71cfec4a2fc - languageName: node - linkType: hard - -"semver@npm:^7.5.3": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.1, semver@npm:^7.5.3": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -7634,17 +7302,7 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2": - version: 2.6.2 - resolution: "socks@npm:2.6.2" - dependencies: - ip: ^1.1.5 - smart-buffer: ^4.2.0 - checksum: dd9194293059d737759d5c69273850ad4149f448426249325c4bea0e340d1cf3d266c3b022694b0dcf5d31f759de23657244c481fc1e8322add80b7985c36b5e - languageName: node - linkType: hard - -"socks@npm:^2.7.1": +"socks@npm:^2.6.2, socks@npm:^2.7.1": version: 2.7.1 resolution: "socks@npm:2.7.1" dependencies: @@ -7731,7 +7389,7 @@ __metadata: languageName: node linkType: hard -"split2@npm:^3.0.0, split2@npm:^3.2.2": +"split2@npm:^3.2.2": version: 3.2.2 resolution: "split2@npm:3.2.2" dependencies: @@ -7749,7 +7407,7 @@ __metadata: languageName: node linkType: hard -"split@npm:^1.0.0, split@npm:^1.0.1": +"split@npm:^1.0.1": version: 1.0.1 resolution: "split@npm:1.0.1" dependencies: @@ -8007,15 +7665,6 @@ __metadata: languageName: node linkType: hard -"through2@npm:^4.0.0": - version: 4.0.2 - resolution: "through2@npm:4.0.2" - dependencies: - readable-stream: 3 - checksum: ac7430bd54ccb7920fd094b1c7ff3e1ad6edd94202e5528331253e5fde0cc56ceaa690e8df9895de2e073148c52dfbe6c4db74cacae812477a35660090960cc0 - languageName: node - linkType: hard - "through2@npm:~2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" @@ -8149,22 +7798,22 @@ __metadata: languageName: node linkType: hard -"ts-poet@npm:^6.4.1": - version: 6.4.1 - resolution: "ts-poet@npm:6.4.1" +"ts-poet@npm:^6.5.0": + version: 6.5.0 + resolution: "ts-poet@npm:6.5.0" dependencies: dprint-node: ^1.0.7 - checksum: 2595caa15fe374b4dd5e1c09fd26b3d5e2fa24ef6153c25a41a4c01ed999682daed9e5753ead72862a099d197dc2bf8827b083632abc78754d9f0d55462f3e55 + checksum: 1a3705c7864cb0dc6f9305884a91a6582fdd93257977324cda8ea7e3e5dbd7525cbc3fb4d5753a088356a4b8b3fb9245d83c244740f52881725a79ab36d0d168 languageName: node linkType: hard -"ts-proto-descriptors@npm:1.12.0": - version: 1.12.0 - resolution: "ts-proto-descriptors@npm:1.12.0" +"ts-proto-descriptors@npm:1.13.0": + version: 1.13.0 + resolution: "ts-proto-descriptors@npm:1.13.0" dependencies: - long: ^4.0.0 + long: ^5.0.0 protobufjs: ^7.2.4 - checksum: 3b00d7837b616f780c191580885e8c3d6e34d6fb84490b0c179966074becdffaa99a469e6f83152d3f47f2fddca4654f8496d754a94ae4785173eade45b27818 + checksum: 5979d706d91cf3868a6a41ad182c679adc4ec79094d5f679a98c7e710c905f602cfe1d5d225140b98f70deaa4e920dfa3a7b259c1849e8fa1f2fde2b2ce2eb10 languageName: node linkType: hard @@ -8205,8 +7854,8 @@ __metadata: rxjs: ^7.8.1 semantic-release: ^21.0.7 ts-jest: ^29.1.1 - ts-poet: ^6.4.1 - ts-proto-descriptors: 1.12.0 + ts-poet: ^6.5.0 + ts-proto-descriptors: 1.13.0 tsx: ^3.12.7 typescript: ^5.1.6 uglify-js: ^3.17.4 @@ -8308,21 +7957,14 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^2.0.0, type-fest@npm:^2.12.2, type-fest@npm:^2.5.0": +"type-fest@npm:^2.12.2": version: 2.19.0 resolution: "type-fest@npm:2.19.0" checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278 languageName: node linkType: hard -"type-fest@npm:^3.0.0, type-fest@npm:^3.8.0": - version: 3.11.1 - resolution: "type-fest@npm:3.11.1" - checksum: 33be49e3b671c2ff3b5e320ef8c160c488205b08ab7631369116909a1baf2aebfcf45234c045e6902b8aa35730ac2bfd0655ea9e0fe3f8d26af9d99a16b07abd - languageName: node - linkType: hard - -"type-fest@npm:^3.12.0": +"type-fest@npm:^3.0.0, type-fest@npm:^3.12.0, type-fest@npm:^3.8.0": version: 3.13.0 resolution: "type-fest@npm:3.13.0" checksum: f7be142ae1ad0582eafd52d085350799c8cd918c15455896a06c82c147b61f8cea58892bedf1348943478e37740562219375b3b59fd855db99cd2b2766510f98