Style fixes and new style rules for eslint (#919)

.eslintrc.js

@@ -244,7 +244,7 @@ module.exports = {
     "no-with": "error",
     "nonblock-statement-body-position": "error",
     "object-curly-newline": "off",
-    "object-curly-spacing": "off",
+    "object-curly-spacing": "error",
     "object-property-newline": [
       "error",
       {
@@ -314,6 +314,7 @@ module.exports = {
       "error",
       "never"
     ],
+    "indent": [ "error", 2, { "SwitchCase": 1 } ],
 
     // Custom silencers:
     "camelcase": 0,
@@ -335,7 +336,6 @@ module.exports = {
     "no-unused-vars": 1,
 
     // TODO Consider fixing these:
-    "indent": [ 0, 2, { "SwitchCase": 1 } ],
     "valid-jsdoc": 0,
     "new-cap": [ 0, { "properties": false, "capIsNewExceptionPattern": "^type_.*" }],
     "no-lonely-if": 0,

src/crypto/public_key/dsa.js

@@ -84,8 +84,10 @@ export default {
       }
       break;
     }
-    return { r: r.toArrayLike(Uint8Array),
-             s: s.toArrayLike(Uint8Array) };
+    return {
+      r: r.toArrayLike(Uint8Array),
+      s: s.toArrayLike(Uint8Array)
+    };
   },
 
   /**

src/crypto/public_key/elliptic/ecdsa.js

@@ -38,8 +38,10 @@ async function sign(oid, hash_algo, m, d, hashed) {
   const curve = new Curve(oid);
   const key = curve.keyFromPrivate(d);
   const signature = await key.sign(m, hash_algo, hashed);
-  return { r: signature.r.toArrayLike(Uint8Array),
-           s: signature.s.toArrayLike(Uint8Array) };
+  return {
+    r: signature.r.toArrayLike(Uint8Array),
+    s: signature.s.toArrayLike(Uint8Array)
+  };
 }
 
 /**

src/crypto/public_key/elliptic/key.js

@@ -240,35 +240,35 @@ async function nodeVerify(curve, hash_algo, { r, s }, message, publicKey) {
 const asn1 = nodeCrypto ? require('asn1.js') : undefined;
 
 const ECDSASignature = nodeCrypto ?
-      asn1.define('ECDSASignature', function() {
-        this.seq().obj(
-          this.key('r').int(),
-          this.key('s').int()
-        );
-      }) : undefined;
+  asn1.define('ECDSASignature', function() {
+    this.seq().obj(
+      this.key('r').int(),
+      this.key('s').int()
+    );
+  }) : undefined;
 
 const ECPrivateKey = nodeCrypto ?
-      asn1.define('ECPrivateKey', function() {
-        this.seq().obj(
-          this.key('version').int(),
-          this.key('privateKey').octstr(),
-          this.key('parameters').explicit(0).optional().any(),
-          this.key('publicKey').explicit(1).optional().bitstr()
-        );
-      }) : undefined;
+  asn1.define('ECPrivateKey', function() {
+    this.seq().obj(
+      this.key('version').int(),
+      this.key('privateKey').octstr(),
+      this.key('parameters').explicit(0).optional().any(),
+      this.key('publicKey').explicit(1).optional().bitstr()
+    );
+  }) : undefined;
 
 const AlgorithmIdentifier = nodeCrypto ?
-      asn1.define('AlgorithmIdentifier', function() {
-        this.seq().obj(
-          this.key('algorithm').objid(),
-          this.key('parameters').optional().any()
-        );
-      }) : undefined;
+  asn1.define('AlgorithmIdentifier', function() {
+    this.seq().obj(
+      this.key('algorithm').objid(),
+      this.key('parameters').optional().any()
+    );
+  }) : undefined;
 
 const SubjectPublicKeyInfo = nodeCrypto ?
-      asn1.define('SubjectPublicKeyInfo', function() {
-        this.seq().obj(
-          this.key('algorithm').use(AlgorithmIdentifier),
-          this.key('subjectPublicKey').bitstr()
-        );
-      }) : undefined;
+  asn1.define('SubjectPublicKeyInfo', function() {
+    this.seq().obj(
+      this.key('algorithm').use(AlgorithmIdentifier),
+      this.key('subjectPublicKey').bitstr()
+    );
+  }) : undefined;

src/crypto/public_key/prime.js

@@ -52,13 +52,13 @@ async function randomProbablePrime(bits, e, k) {
   let i = n.mod(thirty).toNumber();
 
   do {
-      n.iaddn(adds[i]);
-      i = (i + adds[i]) % adds.length;
-      // If reached the maximum, go back to the minimum.
-      if (n.bitLength() > bits) {
-          n = n.mod(min.shln(1)).iadd(min);
-          i = n.mod(thirty).toNumber();
-      }
+    n.iaddn(adds[i]);
+    i = (i + adds[i]) % adds.length;
+    // If reached the maximum, go back to the minimum.
+    if (n.bitLength() > bits) {
+      n = n.mod(min.shln(1)).iadd(min);
+      i = n.mod(thirty).toNumber();
+    }
   } while (!await isProbablePrime(n, e, k));
   return n;
 }

src/crypto/signature.js

@@ -65,8 +65,10 @@ export default {
       case enums.publicKey.eddsa: {
         const oid = pub_MPIs[0];
         // EdDSA signature params are expected in little-endian format
-        const signature = { R: msg_MPIs[0].toUint8Array('le', 32),
-                            S: msg_MPIs[1].toUint8Array('le', 32) };
+        const signature = {
+          R: msg_MPIs[0].toUint8Array('le', 32),
+          S: msg_MPIs[1].toUint8Array('le', 32)
+        };
         const Q = pub_MPIs[1].toUint8Array('be', 33);
         return publicKey.elliptic.eddsa.verify(oid, hash_algo, signature, data, Q, hashed);
       }

src/key.js

@@ -1564,7 +1564,7 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options) {
     }
     await subkeySignaturePacket.sign(secretKeyPacket, dataToSign);
 
-    return { secretSubkeyPacket, subkeySignaturePacket};
+    return { secretSubkeyPacket, subkeySignaturePacket };
   })).then(packets => {
     packets.forEach(({ secretSubkeyPacket, subkeySignaturePacket }) => {
       packetlist.push(secretSubkeyPacket);

src/message.js

@@ -541,9 +541,9 @@ export async function createSignaturePackets(literalDataPacket, privateKeys, sig
     const signingKey = await privateKey.getSigningKey(undefined, date, userId);
     if (!signingKey) {
       throw new Error(`Could not find valid signing key packet in key ${
-          privateKey.getKeyId().toHex()}`);
+        privateKey.getKeyId().toHex()}`);
     }
-    return createSignaturePacket(literalDataPacket, privateKey, signingKey.keyPacket, {signatureType}, date, userId);
+    return createSignaturePacket(literalDataPacket, privateKey, signingKey.keyPacket, { signatureType }, date, userId);
   })).then(signatureList => {
     signatureList.forEach(signaturePacket => packetlist.push(signaturePacket));
   });

src/openpgp.js

@@ -157,7 +157,7 @@ export function generateKey({ userIds=[], passphrase="", numBits=2048, keyExpira
  * @async
  * @static
  */
-export function reformatKey({privateKey, userIds=[], passphrase="", keyExpirationTime=0, date, revocationCertificate=true}) {
+export function reformatKey({ privateKey, userIds=[], passphrase="", keyExpirationTime=0, date, revocationCertificate=true }) {
   userIds = toArray(userIds);
   const options = { privateKey, userIds, passphrase, keyExpirationTime, date, revocationCertificate };
   if (asyncProxy) {

src/packet/one_pass_signature.js

@@ -65,11 +65,11 @@ function OnePassSignature() {
   this.publicKeyAlgorithm = null;
   /** An eight-octet number holding the Key ID of the signing key. */
   this.issuerKeyId = null;
-   /**
-    * A one-octet number holding a flag showing whether the signature is nested.
-    * A zero value indicates that the next packet is another One-Pass Signature packet
-    * that describes another signature to be applied to the same message data.
-    */
+  /**
+   * A one-octet number holding a flag showing whether the signature is nested.
+   * A zero value indicates that the next packet is another One-Pass Signature packet
+   * that describes another signature to be applied to the same message data.
+   */
   this.flags = null;
 }
 

src/util.js

@@ -140,7 +140,7 @@ export default {
                 value.postMessage({ action: 'cancel' });
               });
             }
-          }, {highWaterMark: 0});
+          }, { highWaterMark: 0 });
           return;
         }
         util.restoreStreams(value);

src/wkd.js

@@ -51,7 +51,7 @@ WKD.prototype.lookup = async function(options) {
   }
 
   if (!util.isEmailAddress(options.email)) {
-      throw new Error('Invalid e-mail address.');
+    throw new Error('Invalid e-mail address.');
   }
 
   const [, localPart, domain] = /(.*)@(.*)/.exec(options.email);
@@ -65,11 +65,11 @@ WKD.prototype.lookup = async function(options) {
     }
   }).then(function(publicKey) {
     if (publicKey) {
-        const rawBytes = new Uint8Array(publicKey);
-        if (options.rawBytes) {
-          return rawBytes;
-        }
-        return keyMod.read(rawBytes);
+      const rawBytes = new Uint8Array(publicKey);
+      if (options.rawBytes) {
+        return rawBytes;
+      }
+      return keyMod.read(rawBytes);
     }
   });
 };