Use short form for object properties

nodules · Jun 19, 2018 · 2e413eb · 2e413eb
1 parent 953fac1
commit 2e413eb
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 23 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,7 @@
     "no-console": 0,
     "no-mixed-requires": 0,
     "no-multiple-empty-lines": [2, {"max": 1}],
+    "object-shorthand": "error",
     "no-var": "error",
     "global-require": 0,
     "prefer-arrow-callback": "error"

diff --git a/examples/simple_extension/node_modules/luster-async/extension.js b/examples/simple_extension/node_modules/luster-async/extension.js
diff --git a/examples/simple_extension/node_modules/luster-simple/extension.js b/examples/simple_extension/node_modules/luster-simple/extension.js
diff --git a/lib/cluster_process.js b/lib/cluster_process.js
@@ -207,7 +207,7 @@ class ClusterProcess extends EventEmitterEx {
             const timeouted = extensions.filter(name => !loadedExtensions.has(name)),
                 error = LusterClusterProcessError.createError(
                     LusterClusterProcessError.CODES.EXTENSIONS_LOAD_TIMEOUT,
-                    {timeouted: timeouted, timeout: loadTimeout});
+                    {timeouted, timeout: loadTimeout});
 
             self.emit('error', error);
         }, loadTimeout);
@@ -242,7 +242,7 @@ class ClusterProcess extends EventEmitterEx {
         if (has(this._remoteCommands, name)) {
             throw LusterClusterProcessError.createError(
                 LusterClusterProcessError.CODES.REMOTE_COMMAND_ALREADY_REGISTERED,
-                {name: name});
+                {name});
         }
 
         this._remoteCommands[name] = fn;

diff --git a/lib/configuration/check.js b/lib/configuration/check.js
@@ -70,7 +70,7 @@ function checkProperty(path, value, check) {
             LusterConfigurationError.CODES.PROP_TYPE_CHECK_FAILED,
             {
                 property: path,
-                type: type,
+                type,
                 expected: allowedTypes.join(' or ')
             });
     }

diff --git a/lib/configuration/helpers.js b/lib/configuration/helpers.js
@@ -110,8 +110,8 @@ function has(context, path) {
 }
 
 module.exports = {
-    typeOf: typeOf,
-    has: has,
-    get: get,
-    set: set,
+    typeOf,
+    has,
+    get,
+    set,
 };
diff --git a/lib/master.js b/lib/master.js
@@ -222,10 +222,10 @@ class Master extends ClusterProcess {
         // create pool of workers
         while (count > i++) {
             this.add(new WorkerWrapper(this, {
-                forkTimeout: forkTimeout,
-                stopTimeout: stopTimeout,
-                exitThreshold: exitThreshold,
-                allowedSequentialDeaths: allowedSequentialDeaths,
+                forkTimeout,
+                stopTimeout,
+                exitThreshold,
+                allowedSequentialDeaths,
                 port: isServerPortSet ? port.next(group) : 0,
                 maxListeners: this.getMaxListeners(),
             }));

diff --git a/lib/port.js b/lib/port.js
@@ -82,7 +82,7 @@ class Port {
         if (this.family !== Port.UNIX) {
             cb(LusterPortError
                 .createError(LusterPortError.CODES.NOT_UNIX_SOCKET)
-                .bind({value: value}));
+                .bind({value}));
             return;
         }
 

diff --git a/lib/rpc-callback.js b/lib/rpc-callback.js
@@ -12,7 +12,7 @@ const RPCCallback = {
      * @param {Number} [timeout=10000] in milliseconds
      * @returns {String} callbackId
      */
-    setCallback: function(proc, command, callback, timeout) {
+    setCallback(proc, command, callback, timeout) {
         const storage = this._storage;
 
         if ( ! timeout) {
@@ -22,14 +22,14 @@ const RPCCallback = {
         const callbackId = proc.wid + '_' + this._counter++;
 
         storage[callbackId] = {
-            callback: callback,
+            callback,
             timeout:
                 setTimeout(() => {
                     storage[callbackId].callback(
                         proc,
                         LusterRPCCallbackError.createError(
                             LusterRPCCallbackError.CODES.REMOTE_CALL_WITH_CALLBACK_TIMEOUT,
-                            { command: command }));
+                            { command }));
                     this.removeCallback(callbackId);
                 }, timeout)
         };
@@ -42,7 +42,7 @@ const RPCCallback = {
      * @param {String} callbackId
      * @param {*} [data] provided in callback
      */
-    processCallback: function(proc, callbackId, data) {
+    processCallback(proc, callbackId, data) {
         const stored = this._storage[callbackId];
 
         if ( ! stored) {
@@ -56,7 +56,7 @@ const RPCCallback = {
     /**
      * @param {String} callbackId
      */
-    removeCallback: function(callbackId) {
+    removeCallback(callbackId) {
         const timeout = this._storage[callbackId].timeout;
 
         clearTimeout(timeout);

diff --git a/lib/rpc.js b/lib/rpc.js
@@ -6,7 +6,7 @@ const RPC = {
      * @param {Object} target must have `send` method
      * @returns {Function} (String name, ...args)
      */
-    createCaller: function(target) {
+    createCaller(target) {
         return function(name, ...args) {
             const message = { cmd: 'luster_' + name };
 
@@ -28,7 +28,7 @@ const RPC = {
      * @param {*} message
      * @returns IPCMessage|null IPCMessage if `message` is valid luster IPC message, null – while not
      */
-    parseMessage: function(message) {
+    parseMessage(message) {
         if (message &&
             typeof message.cmd === 'string' &&
             message.cmd.indexOf('luster_') === 0) {

diff --git a/test/func/fixtures/simple_extension/node_modules/luster-simple/index.js b/test/func/fixtures/simple_extension/node_modules/luster-simple/index.js
diff --git a/test/func/helpers/luster_instance.js b/test/func/helpers/luster_instance.js
@@ -98,7 +98,7 @@ class LusterInstance {
         if (typeof(env) === 'boolean') {
             pipeStderr = env;
         }
-        const instance = fork(path.resolve(__dirname, name), {env: env, silent: true});
+        const instance = fork(path.resolve(__dirname, name), {env, silent: true});
         const res = new LusterInstance(instance, pipeStderr);
 
         // Promise is resolved when master process replies to ping