Update style

Author: Face Kapow

.eslintrc

@@ -29,6 +29,14 @@ rules:
   no-return-assign: 1
   new-cap: 1
   no-console: 0
+  wrap-iife:
+    - 2
+    - 'inside'
+  no-use-before-define:
+    - 2
+    -
+      functions: false
+      classes: true
 
 parserOptions:
   ecmaVersion: 6

docs/code-style-exceptions.md

@@ -37,7 +37,7 @@ You can (and should) use ES6 `get` and `set` in new APIs, it's already used in v
 
 ## Assigning to functions parameters
 
-You cannot *reassign* functions parameters, but you can assign to *properties of* function parameters.
+You cannot reassign *functions parameters*, but you can assign to *properties of* function parameters.
 ```js
 // yes
 const demo = (myObject) => {
@@ -46,8 +46,8 @@ const demo = (myObject) => {
 }
 
 // no
-const demo = (myUint8Array) => {
-  myUint8Array = {
+const demo = (myObject) => {
+  myObject = {
     someProperty: 'my value'
   };
   // ...
@@ -61,3 +61,19 @@ If you get this warning, it's ok:
 But this is not:
 
 > Assignment to function parameter 'parameter-name'
+
+## Wrapping an IIFE
+
+The invocation should be *outside* the parentheses, not inside.
+
+```js
+// yes
+(function() {
+  // ...
+})();
+
+// no
+(function() {
+
+}());
+```

js/__loader.js

@@ -21,18 +21,27 @@
       const cache = {};
       const builtinsResolveFromComponents = builtinsResolveFrom.split('/');
 
-      const throwError = (err) => { throw err; };
-      const endsWith = (str, suffix) => str.indexOf(suffix, str.length - suffix.length) !== -1;
+      function throwError(err) {
+        throw err;
+      }
+
+      function endsWith(str, suffix) {
+        return str.indexOf(suffix, str.length - suffix.length) !== -1;
+      }
 
-      const normalizePath = (components) => {
+      function normalizePath(components) {
         const r = [];
         for (const p of components) {
           if (p === '') {
-            if (r.length === 0) r.push(p);
+            if (r.length === 0) {
+              r.push(p);
+            }
             continue;
           }
 
-          if (p === '.') continue;
+          if (p === '.') {
+            continue;
+          }
 
           if (p === '..') {
             if (r.length > 0) {
@@ -46,18 +55,18 @@
         }
 
         return r;
-      };
+      }
 
-      const loadAsFile = (path) => {
+      function loadAsFile(path) {
         if (existsFileFn(path)) return path;
         if (existsFileFn(`${path}.js`)) return `${path}.js`;
         if (existsFileFn(`${path}.json`)) return `${path}.json`;
         if (existsFileFn(`${path}.node`)) return `${path}.node`;
 
         return null;
-      };
+      }
 
-      const getPackageMain = (packageJsonFile) => {
+      function getPackageMain(packageJsonFile) {
         const json = readFileFn(packageJsonFile);
         let parsed = null;
         try {
@@ -74,9 +83,9 @@
         }
 
         return parsed.main || 'index.js';
-      };
+      }
 
-      const loadAsDirectory = (path, ignoreJson) => {
+      function loadAsDirectory(path, ignoreJson) {
         let mainFile = 'index';
         let dir = false;
         if (!ignoreJson && existsFileFn(`${path}/package.json`)) {
@@ -85,41 +94,55 @@
         }
 
         const normalizedPath = normalizePath(path.split('/').concat(mainFile.split('/')));
-        if (!normalizedPath) return null;
+        if (!normalizedPath) {
+          return null;
+        }
 
         const s = normalizedPath.join('/');
         const res = loadAsFile(s);
-        if (res) return res;
+        if (res) {
+          return res;
+        }
 
-        if (dir) return loadAsDirectory(s, true);
+        if (dir) {
+          return loadAsDirectory(s, true);
+        }
 
         return null;
-      };
+      }
 
-      const loadNodeModules = (dirComponents, parts) => {
+      function loadNodeModules(dirComponents, parts) {
         let count = dirComponents.length;
 
         while (count-- > 0) {
           let p = dirComponents.slice(0, count + 1);
-          if (p.length === 0) continue;
+          if (p.length === 0) {
+            continue;
+          }
 
-          if (p[p.length - 1] === 'node_modules') continue;
+          if (p[p.length - 1] === 'node_modules') {
+            continue;
+          }
 
           p.push('node_modules');
           p = p.concat(parts);
 
           const normalizedPath = normalizePath(p);
-          if (!normalizedPath) continue;
+          if (!normalizedPath) {
+            continue;
+          }
 
           const s = normalizedPath.join('/');
           const loadedPath = loadAsFile(s) || loadAsDirectory(s, false) || null;
-          if (loadedPath) return loadedPath;
+          if (loadedPath) {
+            return loadedPath;
+          }
         }
 
         return null;
-      };
+      }
 
-      const resolve = (module, pathOpt = '') => {
+      function resolve(module, pathOpt = '') {
         let path = String(pathOpt);
 
         let resolveFrom = module.dirComponents;
@@ -134,22 +157,24 @@
 
         // starts with ./ ../  or /
         if (firstPathComponent === '.' ||
-            firstPathComponent === '..' ||
-            firstPathComponent === '') {
-          const combinedPathComponents = (firstPathComponent === '')
-            ? pathComponents
-            : resolveFrom.concat(pathComponents);
+          firstPathComponent === '..' ||
+          firstPathComponent === '') {
+          const combinedPathComponents = (firstPathComponent === '') ?
+            pathComponents :
+            resolveFrom.concat(pathComponents);
 
           const normalizedPath = normalizePath(combinedPathComponents);
-          if (!normalizedPath) return null;
+          if (!normalizedPath) {
+            return null;
+          }
 
           const pathStr = normalizedPath.join('/');
           const loadedPath = loadAsFile(pathStr) || loadAsDirectory(pathStr, false) || null;
           return loadedPath;
         }
 
         return loadNodeModules(resolveFrom, pathComponents);
-      };
+      }
 
       class Module {
         constructor(pathComponents) {
@@ -170,7 +195,9 @@
           const pathComponents = resolvedPath.split('/');
           const displayPath = resolvedPath;
           const cacheKey = pathComponents.join('/');
-          if (cache[cacheKey]) return cache[cacheKey].exports;
+          if (cache[cacheKey]) {
+            return cache[cacheKey].exports;
+          }
 
           const currentModule = global.module;
           module = new Module(pathComponents);
@@ -189,10 +216,8 @@
           } else {
             /* eslint-disable max-len */
             evalScriptFn(
-              `(function(require,exports,module,__filename,__dirname){
-${content}
-})((function(m){return function(path){return m.require(path)}})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
-            displayPath);
+              `(function(require,exports,module,__filename,__dirname){${content}})((function(m){return function(path){return m.require(path)}})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
+              displayPath);
             /* eslint-enable max-len */
           }
 
@@ -211,9 +236,13 @@ ${content}
   // end
 
   const files = {};
-  for (const file of __SYSCALL.initrdListFiles()) files[file] = true;
+  for (const file of __SYSCALL.initrdListFiles()) {
+    files[file] = true;
+  }
 
-  const fileExists = path => !!files[path];
+  function fileExists(path) {
+    return !!files[path];
+  }
 
   const runtimePackagePath = __SYSCALL.initrdGetKernelIndex().split('/').slice(0, -1).join('/');
   const loader = new Loader(fileExists, __SYSCALL.initrdReadFile, __SYSCALL.eval, {

js/component/dns-client/dns-packet.js

@@ -36,7 +36,9 @@ exports.getQuery = (domain, query) => {
   let bufferLength = 17;
 
   const labels = domain.split('.');
-  for (const label of labels) bufferLength += label.length + 1;
+  for (const label of labels) {
+    bufferLength += label.length + 1;
+  }
 
   const u8 = new Uint8Array(bufferLength);
   const view = new DataView(u8.buffer);
@@ -54,7 +56,9 @@ exports.getQuery = (domain, query) => {
 
   for (const label of labels) {
     view.setUint8(offset++, label.length);
-    for (let j = 0; j < label.length; ++j) view.setUint8(offset++, label.charCodeAt(j));
+    for (let j = 0; j < label.length; ++j) {
+      view.setUint8(offset++, label.charCodeAt(j));
+    }
   }
   view.setUint8(offset++, 0); // null terminator
 
@@ -64,14 +68,19 @@ exports.getQuery = (domain, query) => {
 };
 
 const POINTER_VALUE = 0xc0;
-const isPointer = value => (value & POINTER_VALUE) === POINTER_VALUE;
 
-const readHostname = (reader) => {
+function isPointer(value) {
+  return (value & POINTER_VALUE) === POINTER_VALUE;
+}
+
+function readHostname(reader) {
   let labels = [];
 
   for (let z = reader.getOffset(); z < reader.len; ++z) {
     const len = reader.readUint8();
-    if (len === 0) break;
+    if (len === 0) {
+      break;
+    }
 
     if (isPointer(len)) {
       const ptrOffset = ((len - POINTER_VALUE) << 8) + reader.readUint8();
@@ -82,20 +91,24 @@ const readHostname = (reader) => {
       break;
     } else {
       let label = '';
-      for (let i = 0; i < len; ++i) label += String.fromCharCode(reader.readUint8());
+      for (let i = 0; i < len; ++i) {
+        label += String.fromCharCode(reader.readUint8());
+      }
 
       labels.push(label);
     }
   }
 
   return labels;
-};
+}
 
 exports.parseResponse = (u8) => {
   const reader = new PacketReader(u8.buffer, u8.byteLength, u8.byteOffset);
   const responseRandomId = reader.readUint16();
 
-  if (responseRandomId !== randomId) return null;
+  if (responseRandomId !== randomId) {
+    return null;
+  }
 
   /* eslint-disable no-unused-vars */
   const flags = reader.readUint16();
@@ -105,7 +118,9 @@ exports.parseResponse = (u8) => {
   const additionalCount = reader.readUint16();
   /* eslint-enable no-unused-vars */
 
-  if (questionsCount !== 1) return null;
+  if (questionsCount !== 1) {
+    return null;
+  }
 
   // Read question
   const hostname = readHostname(reader).join('.');
@@ -127,7 +142,9 @@ exports.parseResponse = (u8) => {
 
     switch (recordType) {
       case queries.A: // A record
-        if (rdLen !== 4) return null;
+        if (rdLen !== 4) {
+          return null;
+        }
 
         results.push({
           hostname: host,
@@ -149,7 +166,9 @@ exports.parseResponse = (u8) => {
         });
         break;
       default:
-        for (let b = 0; b < rdLen; ++b) reader.readUint8();
+        for (let b = 0; b < rdLen; ++b) {
+          reader.readUint8();
+        }
         break;
     }
   }