Fix packet.tag declaration

openpgpjs · Apr 20, 2021 · 9c41bb9 · 9c41bb9
1 parent 570e0b7
commit 9c41bb9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/openpgp.d.ts b/openpgp.d.ts
@@ -294,7 +294,7 @@ interface PartialConfig extends Partial<Config> {}
 /* ############## v5 PACKET #################### */
 
 declare abstract class BasePacket {
-  public tag: enums.packet;
+  static tag: enums.packet;
   public read(bytes: Uint8Array): void;
   public write(): Uint8Array;
 }
@@ -319,11 +319,11 @@ declare abstract class BasePublicKeyPacket extends BasePacket {
 }
 
 export class PublicKeyPacket extends BasePublicKeyPacket {
-  public tag: enums.packet.publicKey;
+  static tag: enums.packet.publicKey;
 }
 
 export class PublicSubkeyPacket extends BasePublicKeyPacket {
-  public tag: enums.packet.publicSubkey;
+  static tag: enums.packet.publicSubkey;
 }
 
 declare abstract class BaseSecretKeyPacket extends BasePublicKeyPacket {
@@ -336,51 +336,51 @@ declare abstract class BaseSecretKeyPacket extends BasePublicKeyPacket {
 }
 
 export class SecretKeyPacket extends BaseSecretKeyPacket {
-  public tag: enums.packet.secretKey;
+  static tag: enums.packet.secretKey;
 }
 
 export class SecretSubkeyPacket extends BaseSecretKeyPacket {
-  public tag: enums.packet.secretSubkey;
+  static tag: enums.packet.secretSubkey;
 }
 
 export class CompressedDataPacket extends BasePacket {
-  public tag: enums.packet.compressedData;
+  static tag: enums.packet.compressedData;
 }
 
 export class SymEncryptedIntegrityProtectedDataPacket extends BasePacket {
-  public tag: enums.packet.symEncryptedIntegrityProtectedData;
+  static tag: enums.packet.symEncryptedIntegrityProtectedData;
 }
 
 export class AEADEncryptedDataPacket extends BasePacket {
-  public tag: enums.packet.aeadEncryptedData;
+  static tag: enums.packet.aeadEncryptedData;
 }
 
 export class PublicKeyEncryptedSessionKeyPaclet extends BasePacket {
-  public tag: enums.packet.publicKeyEncryptedSessionKey;
+  static tag: enums.packet.publicKeyEncryptedSessionKey;
 }
 
 export class SymEncryptedSessionKey extends BasePacket {
-  public tag: enums.packet.symEncryptedSessionKey;
+  static tag: enums.packet.symEncryptedSessionKey;
 }
 
 export class LiteralDataPacket extends BasePacket {
-  public tag: enums.packet.literalData;
+  static tag: enums.packet.literalData;
 }
 
 export class SymmetricallyEncryptedDataPacket extends BasePacket {
-  public tag: enums.packet.symmetricallyEncryptedData;
+  static tag: enums.packet.symmetricallyEncryptedData;
 }
 
 export class MarkerPacket extends BasePacket {
-  public tag: enums.packet.marker;
+  static tag: enums.packet.marker;
 }
 
 export class UserAttributePacket extends BasePacket {
-  public tag: enums.packet.userAttribute;
+  static tag: enums.packet.userAttribute;
 }
 
 export class OnePassSignaturePacket extends BasePacket {
-  public tag: enums.packet.onePassSignature;
+  static tag: enums.packet.onePassSignature;
   public correspondingSig?: Promise<SignaturePacket>;
 }
 
@@ -394,7 +394,7 @@ export class UserIDPacket extends BasePacket {
 }
 
 export class SignaturePacket extends BasePacket {
-  public tag: enums.packet.signature;
+  static tag: enums.packet.signature;
   public version: number;
   public signatureType: enums.signature | null;
   public hashAlgorithm: enums.hash | null;
@@ -445,7 +445,7 @@ export class SignaturePacket extends BasePacket {
 }
 
 export class TrustPacket extends BasePacket {
-  public tag: enums.packet.trust;
+  static tag: enums.packet.trust;
 }
 
 export type AnyPacket = BasePacket;

diff --git a/test/typescript/definitions.ts b/test/typescript/definitions.ts
@@ -81,7 +81,9 @@ import { generateKey, readKey, readKeys, Key, readMessage, createMessage, Messag
   const packets = new PacketList();
   expect(packets.push()).to.equal(0);
   expect(packets.push(new LiteralDataPacket())).to.equal(1);
-  expect(packets[0].tag).to.equal(enums.packet.literalData);
+  packets[0].write();
+
+  expect(LiteralDataPacket.tag).to.equal(enums.packet.literalData)
 
   // // Detached - sign cleartext message (armored)
   // import { Message, sign } from 'openpgp';