Refactor src/packet/*.js to use import & export

src/packet/all_packets.js

@@ -1,74 +1,70 @@
-'use strict';
-
 /**
  * @requires enums
  * @module packet
  */
-var enums = require('../enums.js');
+import enums from '../enums.js';
 
-// This is pretty ugly, but browserify needs to have the requires explicitly written.
+/** @see module:packet/compressed */
+export { default as Compressed } from './compressed.js';
+/** @see module:packet/sym_encrypted_integrity_protected */
+export { default as SymEncryptedIntegrityProtected } from './sym_encrypted_integrity_protected.js';
+/** @see module:packet/public_key_encrypted_session_key */
+export { default as PublicKeyEncryptedSessionKey } from './public_key_encrypted_session_key.js';
+/** @see module:packet/sym_encrypted_session_key */
+export { default as SymEncryptedSessionKey } from './sym_encrypted_session_key.js';
+/** @see module:packet/literal */
+export { default as Literal } from './literal.js';
+/** @see module:packet/public_key */
+export { default as PublicKey } from './public_key.js';
+/** @see module:packet/symmetrically_encrypted */
+export { default as SymmetricallyEncrypted } from './symmetrically_encrypted.js';
+/** @see module:packet/marker */
+export { default as Marker } from './marker.js';
+/** @see module:packet/public_subkey */
+export { default as PublicSubkey } from './public_subkey.js';
+/** @see module:packet/user_attribute */
+export { default as UserAttribute } from './user_attribute.js';
+/** @see module:packet/one_pass_signature */
+export { default as OnePassSignature } from './one_pass_signature.js';
+/** @see module:packet/secret_key */
+export { default as SecretKey } from './secret_key.js';
+/** @see module:packet/userid */
+export { default as Userid } from './userid.js';
+/** @see module:packet/secret_subkey */
+export { default as SecretSubkey } from './secret_subkey.js';
+/** @see module:packet/signature */
+export { default as Signature } from './signature.js';
+/** @see module:packet/trust */
+export { default as Trust } from './trust.js';
 
-module.exports = {
+/**
-  /** @see module:packet/compressed */
+ * Allocate a new packet
-  Compressed: require('./compressed.js'),
+ * @param {String} tag property name from {@link module:enums.packet}
-  /** @see module:packet/sym_encrypted_integrity_protected */
+ * @returns {Object} new packet object with type based on tag
-  SymEncryptedIntegrityProtected: require('./sym_encrypted_integrity_protected.js'),
+ */
-  /** @see module:packet/public_key_encrypted_session_key */
+export function newPacketFromTag(tag) {
-  PublicKeyEncryptedSessionKey: require('./public_key_encrypted_session_key.js'),
+  return new this[packetClassFromTagName(tag)]();
-  /** @see module:packet/sym_encrypted_session_key */
+}
-  SymEncryptedSessionKey: require('./sym_encrypted_session_key.js'),
+
-  /** @see module:packet/literal */
+/**
-  Literal: require('./literal.js'),
+ * Allocate a new packet from structured packet clone
-  /** @see module:packet/public_key */
+ * See {@link http://www.w3.org/html/wg/drafts/html/master/infrastructure.html#safe-passing-of-structured-data}
-  PublicKey: require('./public_key.js'),
+ * @param {Object} packetClone packet clone
-  /** @see module:packet/symmetrically_encrypted */
+ * @returns {Object} new packet object with data from packet clone
-  SymmetricallyEncrypted: require('./symmetrically_encrypted.js'),
+ */
-  /** @see module:packet/marker */
+export function fromStructuredClone(packetClone) {
-  Marker: require('./marker.js'),
+  var tagName = enums.read(enums.packet, packetClone.tag);
-  /** @see module:packet/public_subkey */
+  var packet = newPacketFromTag(tagName);
-  PublicSubkey: require('./public_subkey.js'),
+  for (var attr in packetClone) {
-  /** @see module:packet/user_attribute */
+    if (packetClone.hasOwnProperty(attr)) {
-  UserAttribute: require('./user_attribute.js'),
+      packet[attr] = packetClone[attr];
-  /** @see module:packet/one_pass_signature */
-  OnePassSignature: require('./one_pass_signature.js'),
-  /** @see module:packet/secret_key */
-  SecretKey: require('./secret_key.js'),
-  /** @see module:packet/userid */
-  Userid: require('./userid.js'),
-  /** @see module:packet/secret_subkey */
-  SecretSubkey: require('./secret_subkey.js'),
-  /** @see module:packet/signature */
-  Signature: require('./signature.js'),
-  /** @see module:packet/trust */
-  Trust: require('./trust.js'),
-  /**
-   * Allocate a new packet
-   * @param {String} tag property name from {@link module:enums.packet}
-   * @returns {Object} new packet object with type based on tag
-   */
-  newPacketFromTag: function (tag) {
-    return new this[packetClassFromTagName(tag)]();
-  },
-  /**
-   * Allocate a new packet from structured packet clone
-   * See {@link http://www.w3.org/html/wg/drafts/html/master/infrastructure.html#safe-passing-of-structured-data}
-   * @param {Object} packetClone packet clone
-   * @returns {Object} new packet object with data from packet clone
-   */
-  fromStructuredClone: function(packetClone) {
-    var tagName = enums.read(enums.packet, packetClone.tag);
-    var packet = this.newPacketFromTag(tagName);
-    for (var attr in packetClone) {
-      if (packetClone.hasOwnProperty(attr)) {
-        packet[attr] = packetClone[attr];
-      }
     }
-    if (packet.postCloneTypeFix) {
-      packet.postCloneTypeFix();
-    }
-    return packet;
   }
-};
+  if (packet.postCloneTypeFix) {
+    packet.postCloneTypeFix();
+  }
+  return packet;
+}
 
 /**
  * Convert tag name to class name

src/packet/compressed.js

@@ -31,18 +31,16 @@
 
 'use strict';
 
-module.exports = Compressed;
+import enums from '../enums.js';
-
+import util from '../util.js';
-var enums = require('../enums.js'),
+import Zlib from '../compression/zlib.min.js';
-  util = require('../util.js'),
+import RawInflate from '../compression/rawinflate.min.js';
-  Zlib = require('../compression/zlib.min.js'),
+import RawDeflate from '../compression/rawdeflate.min.js';
-  RawInflate = require('../compression/rawinflate.min.js'),
-  RawDeflate = require('../compression/rawdeflate.min.js');
 
 /**
  * @constructor
  */
-function Compressed() {
+export default function Compressed() {
   /**
    * Packet type
    * @type {module:enums.packet}

src/packet/index.js

@@ -1,15 +1,18 @@
 'use strict';
 
-module.exports = {
+import * as packets from './all_packets.js';
+import List from './packetlist.js';
+
+const mod = {
   /**
    * @name module:packet.List
    * @see module:packet/packetlist
    */
-  List: require('./packetlist.js')
+  List: List
 };
 
-var packets = require('./all_packets.js');
+for (let i in packets) {
-
+  mod[i] = packets[i];
-for (var i in packets) {
-  module.exports[i] = packets[i];
 }
+
+export default mod;

src/packet/literal.js

@@ -27,15 +27,13 @@
 
 'use strict';
 
-module.exports = Literal;
+import util from '../util.js';
-
+import enums from '../enums.js';
-var util = require('../util.js'),
-  enums = require('../enums.js');
 
 /**
  * @constructor
  */
-function Literal() {
+export default function Literal() {
   this.tag = enums.packet.literal;
   this.format = 'utf8'; // default format for literal data packets
   this.date = new Date();

src/packet/marker.js

@@ -31,14 +31,12 @@
 
 'use strict';
 
-module.exports = Marker;
+import enums from '../enums.js';
-
-var enums = require('../enums.js');
 
 /**
  * @constructor
  */
-function Marker() {
+export default function Marker() {
   this.tag = enums.packet.marker;
 }
 

src/packet/one_pass_signature.js

@@ -31,16 +31,14 @@
 
 'use strict';
 
-module.exports = OnePassSignature;
+import util from '../util.js';
-
+import enums from '../enums.js';
-var util = require('../util.js'),
+import type_keyid from '../type/keyid.js';
-  enums = require('../enums.js'),
-  type_keyid = require('../type/keyid.js');
 
 /**
  * @constructor
  */
-function OnePassSignature() {
+export default function OnePassSignature() {
   this.tag = enums.packet.onePassSignature; // The packet type
   this.version = null; // A one-octet version number.  The current version is 3.
   this.type = null; // A one-octet signature type.  Signature types are described in {@link http://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.

src/packet/packet.js

@@ -23,9 +23,9 @@
 
 'use strict';
 
-var util = require('../util.js');
+import util from '../util.js';
 
-module.exports = {
+export default {
   readSimpleLength: function(bytes) {
     var len = 0,
       offset,

src/packet/packetlist.js

@@ -11,17 +11,15 @@
 
 'use strict';
 
-module.exports = Packetlist;
+import util from '../util';
-
+import packetParser from './packet.js';
-var util = require('../util'),
+import * as packets from './all_packets.js';
-  packetParser = require('./packet.js'),
+import enums from '../enums.js';
-  packets = require('./all_packets.js'),
-  enums = require('../enums.js');
 
 /**
  * @constructor
  */
-function Packetlist() {
+export default function Packetlist() {
   /** The number of packets contained within the list.
    * @readonly
    * @type {Integer} */
@@ -193,7 +191,7 @@ Packetlist.prototype.concat = function (packetlist) {
  * @param {Object} packetClone packetlist clone
  * @returns {Object} new packetlist object with data from packetlist clone
  */
-module.exports.fromStructuredClone = function(packetlistClone) {
+Packetlist.fromStructuredClone = function(packetlistClone) {
   var packetlist = new Packetlist();
   for (var i = 0; i < packetlistClone.length; i++) {
     packetlist.push(packets.fromStructuredClone(packetlistClone[i]));

src/packet/public_key.js

@@ -32,18 +32,16 @@
 
 'use strict';
 
-module.exports = PublicKey;
+import util from '../util.js';
-
+import type_mpi from '../type/mpi.js';
-var util = require('../util.js'),
+import type_keyid from '../type/keyid.js';
-  type_mpi = require('../type/mpi.js'),
+import enums from '../enums.js';
-  type_keyid = require('../type/keyid.js'),
+import crypto from '../crypto';
-  enums = require('../enums.js'),
-  crypto = require('../crypto');
 
 /**
  * @constructor
  */
-function PublicKey() {
+export default function PublicKey() {
   this.tag = enums.packet.publicKey;
   this.version = 4;
   /** Key creation date.

src/packet/public_key_encrypted_session_key.js

@@ -39,18 +39,16 @@
 
 'use strict';
 
-module.exports = PublicKeyEncryptedSessionKey;
+import type_keyid from '../type/keyid.js';
-
+import util from '../util.js';
-var type_keyid = require('../type/keyid.js'),
+import type_mpi from '../type/mpi.js';
-  util = require('../util.js'),
+import enums from '../enums.js';
-  type_mpi = require('../type/mpi.js'),
+import crypto from '../crypto';
-  enums = require('../enums.js'),
-  crypto = require('../crypto');
 
 /**
  * @constructor
  */
-function PublicKeyEncryptedSessionKey() {
+export default function PublicKeyEncryptedSessionKey() {
   this.tag = enums.packet.publicKeyEncryptedSessionKey;
   this.version = 3;
 

src/packet/public_subkey.js

@@ -23,16 +23,14 @@
 
 'use strict';
 
-module.exports = PublicSubkey;
+import publicKey from './public_key.js';
-
+import enums from '../enums.js';
-var publicKey = require('./public_key.js'),
-  enums = require('../enums.js');
 
 /**
  * @constructor
  * @extends module:packet/public_key
  */
-function PublicSubkey() {
+export default function PublicSubkey() {
   publicKey.call(this);
   this.tag = enums.packet.publicSubkey;
 }

src/packet/secret_key.js

@@ -33,20 +33,18 @@
 
 'use strict';
 
-module.exports = SecretKey;
+import publicKey from './public_key.js';
-
+import enums from '../enums.js';
-var publicKey = require('./public_key.js'),
+import util from '../util.js';
-  enums = require('../enums.js'),
+import crypto from '../crypto';
-  util = require('../util.js'),
+import type_mpi from '../type/mpi.js';
-  crypto = require('../crypto'),
+import type_s2k from '../type/s2k.js';
-  type_mpi = require('../type/mpi.js'),
-  type_s2k = require('../type/s2k.js');
 
 /**
  * @constructor
  * @extends module:packet/public_key
  */
-function SecretKey() {
+export default function SecretKey() {
   publicKey.call(this);
   this.tag = enums.packet.secretKey;
   // encrypted secret-key data

src/packet/secret_subkey.js

@@ -23,16 +23,14 @@
 
 'use strict';
 
-module.exports = SecretSubkey;
+import secretKey from './secret_key.js';
-
+import enums from '../enums.js';
-var secretKey = require('./secret_key.js'),
-  enums = require('../enums.js');
 
 /**
  * @constructor
  * @extends module:packet/secret_key
  */
-function SecretSubkey() {
+export default function SecretSubkey() {
   secretKey.call(this);
   this.tag = enums.packet.secretSubkey;
 }

src/packet/signature.js

@@ -31,19 +31,17 @@
  * @module packet/signature
  */
 
-module.exports = Signature;
+import util from '../util.js';
-
+import packet from './packet.js';
-var util = require('../util.js'),
+import enums from '../enums.js';
-  packet = require('./packet.js'),
+import crypto from '../crypto';
-  enums = require('../enums.js'),
+import type_mpi from '../type/mpi.js';
-  crypto = require('../crypto'),
+import type_keyid from '../type/keyid.js';
-  type_mpi = require('../type/mpi.js'),
-  type_keyid = require('../type/keyid.js');
 
 /**
  * @constructor
  */
-function Signature() {
+export default function Signature() {
   this.tag = enums.packet.signature;
   this.version = 4;
   this.signatureType = null;

src/packet/sym_encrypted_integrity_protected.js

@@ -34,19 +34,17 @@
 
 'use strict';
 
-module.exports = SymEncryptedIntegrityProtected;
+import util from '../util.js';
-
+import crypto from '../crypto';
-var util = require('../util.js'),
+import enums from '../enums.js';
-  crypto = require('../crypto'),
+import asmCrypto from 'asmcrypto-lite';
-  enums = require('../enums.js'),
+const nodeCrypto = util.getNodeCrypto();
-  asmCrypto = require('asmcrypto-lite'),
+const Buffer = util.getNodeBuffer();
-  nodeCrypto = util.getNodeCrypto(),
-  Buffer = util.getNodeBuffer();
 
 /**
  * @constructor
  */
-function SymEncryptedIntegrityProtected() {
+export default function SymEncryptedIntegrityProtected() {
   this.tag = enums.packet.symEncryptedIntegrityProtected;
   /** The encrypted payload. */
   this.encrypted = null; // string

src/packet/sym_encrypted_session_key.js

@@ -38,17 +38,15 @@
 
 'use strict';
 
-var util = require('../util.js'),
+import util from '../util.js';
-  type_s2k = require('../type/s2k.js'),
+import type_s2k from '../type/s2k.js';
-  enums = require('../enums.js'),
+import enums from '../enums.js';
-  crypto = require('../crypto');
+import crypto from '../crypto';
-
-module.exports = SymEncryptedSessionKey;
 
 /**
  * @constructor
  */
-function SymEncryptedSessionKey() {
+export default function SymEncryptedSessionKey() {
   this.tag = enums.packet.symEncryptedSessionKey;
   this.version = 4;
   this.sessionKey = null;

src/packet/symmetrically_encrypted.js

@@ -30,16 +30,14 @@
 
 'use strict';
 
-module.exports = SymmetricallyEncrypted;
+import crypto from '../crypto';
-
+import enums from '../enums.js';
-var crypto = require('../crypto'),
+import config from '../config';
-  enums = require('../enums.js'),
-  config = require('../config');
 
 /**
  * @constructor
  */
-function SymmetricallyEncrypted() {
+export default function SymmetricallyEncrypted() {
   this.tag = enums.packet.symmetricallyEncrypted;
   this.encrypted = null;
   /** Decrypted packets contained within.

src/packet/trust.js

@@ -5,14 +5,12 @@
 
 'use strict';
 
-module.exports = Trust;
+import enums from '../enums.js';
-
-var enums = require('../enums.js');
 
 /**
  * @constructor
  */
-function Trust() {
+export default function Trust() {
   this.tag = enums.packet.trust;
 }
 

src/packet/user_attribute.js

@@ -38,16 +38,14 @@
 
 'use strict';
 
-var util = require('../util.js'),
+import util from '../util.js';
-  packet = require('./packet.js'),
+import packet from './packet.js';
-  enums = require('../enums.js');
+import enums from '../enums.js';
-
-module.exports = UserAttribute;
 
 /**
  * @constructor
  */
-function UserAttribute() {
+export default function UserAttribute() {
   this.tag = enums.packet.userAttribute;
   this.attributes = [];
 }

src/packet/userid.js

@@ -30,15 +30,13 @@
 
 'use strict';
 
-module.exports = Userid;
+import util from '../util.js';
-
+import enums from '../enums.js';
-var util = require('../util.js'),
-  enums = require('../enums.js');
 
 /**
  * @constructor
  */
-function Userid() {
+export default function Userid() {
   this.tag = enums.packet.userid;
   /** A string containing the user id. Usually in the form
    * John Doe <john@example.com>