🎨 Make use of object shorthand

lib/api_formats/siren/device.siren.js

@@ -10,8 +10,8 @@ module.exports = context => {
   const properties = model.properties();
   const entity = {
     class: ['device', properties.type],
-    properties: properties,
-    actions: actions,
+    properties,
+    actions,
     links: [{ rel: ['self', 'edit'], href: env.helpers.url.path(`${loader.path}/devices/${model.id}`) },
             { title: context.serverName, rel: ['up', rel.server], href: env.helpers.url.path(loader.path) },
             { rel: [rel.type, 'describedby'], href: `${env.helpers.url.path(loader.path)}/meta/${properties.type}` }]
@@ -33,7 +33,7 @@ var buildActions = module.exports.buildActions = (deviceId, env, loader, transit
       name: type,
       method: 'POST',
       href: env.helpers.url.path(`${loader.path}/devices/${deviceId}`),
-      fields: fields
+      fields
     };
     if (!actions) {
       actions = [];

lib/api_formats/siren/devices.siren.js

@@ -27,7 +27,7 @@ var buildEntity = function(model, loader, env) {
   const entity = {
     class: ['device', properties.type],
     rel: [rel.device],
-    properties: properties,
+    properties,
     links: [{ rel: ['self', 'edit'], href: env.helpers.url.path(`${loader.path}/devices/${model.id}`) },
             { rel: [rel.type, 'describedby'], href: `${env.helpers.url.path(loader.path)}/meta/${encodeURIComponent(properties.type)}` },
             { rel: ['up', rel.server], href: env.helpers.url.path(loader.path) }]

lib/api_formats/siren/server.siren.js

@@ -59,7 +59,7 @@ var buildEntity = function(model, server, loader, env) {
   const entity = {
     class: ['device', properties.type],
     rel: [rel.device],
-    properties: properties,
+    properties,
     links: [{ rel: ['self', 'edit'], href: env.helpers.url.path(`${loader.path}/devices/${model.id}`) },
             { rel: [rel.type, 'describedby'], href: `${env.helpers.url.path(loader.path)}/meta/${encodeURIComponent(properties.type)}` },
             { title: server._name, rel: ['up', rel.server], href: env.helpers.url.path(loader.path) }]

lib/api_resources/devices.js

@@ -22,7 +22,7 @@ DevicesResource.prototype.list = function(env, next) {
   const serverId = match && match[1] ? match[1] : this.server.id;
 
   const localServer = { path: `/servers/${encodeURI(serverId)}` };
-  const context = { devices: this.server.runtime._jsDevices, loader: localServer, env: env };
+  const context = { devices: this.server.runtime._jsDevices, loader: localServer, env };
   env.format.render('devices', context);
   next(env);
 };

lib/api_resources/peer_management.js

@@ -198,7 +198,7 @@ PeerManagementResource.prototype._proxyToPeer = (peer, env, callback) => {
   const req = env.request;
   const res = env.response;
   const agent = env.zettaAgent || peer.agent;
-  const opts = { method: req.method, headers: req.headers, path: req.url, agent: agent };
+  const opts = { method: req.method, headers: req.headers, path: req.url, agent };
   const request = http.request(opts, res => {
     res.on('data', () => {});
     res.on('end', () => {

lib/api_resources/root.js

@@ -104,7 +104,7 @@ RootResource.prototype.list = function(env, next) {
               const entity = {
                 class: ['device', properties.type],
                 rel: [rel.device],
-                properties: properties,
+                properties,
                 links: [{ rel: ['self'], href: env.helpers.url.path(`${loader.path}/devices/${model.id}`) },
                         { title: server._name, rel: ['up', rel.server], href: env.helpers.url.path(loader.path) }]
               };
@@ -233,9 +233,9 @@ RootResource.prototype._queryDevices = function(env, next) {
 
       const context = {
         server: self.server,
-        devices: devices,
+        devices,
         loader: {path: `/servers/${encodeURI(self.server.id)}`},
-        env: env,
+        env,
         classes:['search-results'],
         query: params.ql 
       };

lib/api_resources/servers.js

@@ -178,7 +178,7 @@ ServerResource.prototype.showMetadata = function(env, next) {
     server: this.server,
     types: this.deviceTypes,
     loader: this.getServer(env),
-    env: env
+    env
   };
 
   env.format.render('metadata', context);
@@ -202,9 +202,9 @@ ServerResource.prototype.showMetadataType = function(env, next) {
 
   const context = {
     server: this.server,
-    type: type,
+    type,
     loader: this.getServer(env),
-    env: env
+    env
   };
 
   env.format.render('type', context);
@@ -221,7 +221,7 @@ ServerResource.prototype.showServer = function(env, next) {
   }
 
   //TODO: argo-formatter may want to take multiple arguments for a format. This context obj is a hack.
-  const context = { server: this.server, devices: this.server.runtime._jsDevices, loader: this.getServer(env), env: env };
+  const context = { server: this.server, devices: this.server.runtime._jsDevices, loader: this.getServer(env), env };
   env.format.render('server', context);
   next(env);
 };
@@ -290,9 +290,9 @@ ServerResource.prototype._queryDevices = function(env, next) {
 
       const context = {
         server: self.server,
-        devices: devices,
+        devices,
         loader: self.getServer(env),
-        env: env,
+        env,
         classes:['search-results'],
         query: params.ql
       };
@@ -361,7 +361,7 @@ ServerResource.prototype.showDevice = function(env, next) {
     model: device,
     loader: this.getServer(env),
     serverName: this.server._name,
-    env: env
+    env
   };
 
   env.format.render('device', model);
@@ -420,7 +420,7 @@ ServerResource.prototype.updateDevice = function(env, next) {
         model: device,
         loader: self.getServer(env),
         serverName: self.server._name,
-        env: env
+        env
       };
 
       env.format.render('device', model);
@@ -535,7 +535,7 @@ ServerResource.prototype.deviceAction = function(env, next) {
         env.response.statusCode = statusCode;
         env.response.body = {
           class: ['action-error'],
-          properties: properties,
+          properties,
           links: [
             { rel: ['self'], href: env.helpers.url.current() }
           ]
@@ -545,7 +545,7 @@ ServerResource.prototype.deviceAction = function(env, next) {
           model: device,
           loader: self.getServer(env),
           serverName: self.server._name,
-          env: env
+          env
         };
         env.format.render('device', model);
       }

lib/event_broker.js

@@ -371,7 +371,7 @@ EventBroker.prototype.subscribeToDeviceQuery = function(topic) {
   const q = self.zetta.runtime.query().ql(qt.ql);
   this._deviceQueries[topic] = this.zetta.runtime.observe(q, device => {
     setImmediate(() => {
-      self.zetta.pubsub.publish(topic, { query: topic, device: device });
+      self.zetta.pubsub.publish(topic, { query: topic, device });
     });
   });
 };

lib/event_socket.js

@@ -118,7 +118,7 @@ const EventSocket = module.exports = function(ws, query, options) {
         }
       }
 
-      const subscription = { subscriptionId: ++self._subscriptionIndex, topic: topic, limit: msg.limit };
+      const subscription = { subscriptionId: ++self._subscriptionIndex, topic, limit: msg.limit };
       self._subscriptions.push(subscription);
 
       var msg = {

lib/http_scout.js

@@ -13,7 +13,7 @@ HTTPScout.prototype.init = next => {
 
 HTTPScout.prototype.createHTTPDevice = function(type, id, name) {
   const constructor = this.driverFunctions[type];
-  const deviceObject = { id: id, name: name};
+  const deviceObject = { id, name};
   if(constructor) {
     if(id) {
       this.provision(deviceObject, constructor);

lib/http_server.js

@@ -306,17 +306,17 @@ ZettaHttpServer.prototype.setupPeerSocket = function(ws) {
     peer.on('connected', () => {
       self.eventBroker.peer(peer);
       self.zetta.log.emit('log', 'http_server', `Peer connection established "${name}".`);
-      self.zetta.pubsub.publish('_peer/connect', { peer: peer });
+      self.zetta.pubsub.publish('_peer/connect', { peer });
     });
 
     peer.on('error', err => {
       self.zetta.log.emit('log', 'http_server', `Peer connection failed for "${name}": ${err.message}.`);
-      self.zetta.pubsub.publish('_peer/disconnect', { peer: peer, err: err });
+      self.zetta.pubsub.publish('_peer/disconnect', { peer, err });
     });
 
     peer.on('end', () => {
       self.zetta.log.emit('log', 'http_server', `Peer connection closed for "${name}".`);
-      self.zetta.pubsub.publish('_peer/disconnect', { peer: peer });
+      self.zetta.pubsub.publish('_peer/disconnect', { peer });
     });
   }
 };
@@ -460,12 +460,12 @@ ZettaHttpServer.prototype.proxyToPeers = function(peers, env, cb) {
 
       const agent = env.zettaAgent || peer.agent;
 
-      const opts = { method: req.method, headers: headers, path: reqUrl, agent: agent };
+      const opts = { method: req.method, headers, path: reqUrl, agent };
       const request = http.request(opts, response => {
         response.getBody((err, body) => {
-          callback(null, { res: response, err: err, body: body });
+          callback(null, { res: response, err, body });
         });
-      }).on('error', err => callback(null, { err: err }));
+      }).on('error', err => callback(null, { err }));
 
       if (req.body) {
         request.end(req.body);
@@ -505,7 +505,7 @@ ZettaHttpServer.prototype.proxyToPeer = function(env, next) {
     method: req.method,
     headers: req.headers,
     path: req.url,
-    agent: agent,
+    agent,
     pipe: true
   };
   if (typeof env.proxyOpts === 'object') {

lib/peer_socket.js

@@ -394,7 +394,7 @@ PeerSocket.prototype.transition = function(action, args, cb) {
 
   const opts = {
     agent: this.agent,
-    path: path,
+    path,
     method: action.method,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',

lib/pubsub_service.js

@@ -129,7 +129,7 @@ PubSub.prototype._onResponse = function(topic, sourceTopic, data, fromRemote, en
   } else if (data.query && data.device) {
     var serverId = env.route.params.serverId;
     const loader = { path: `/servers/${encodeURIComponent(serverId)}` };
-    data = deviceFormatter({ loader: loader, env: env, model: data.device });      
+    data = deviceFormatter({ loader, env, model: data.device });      
     encoding = 'application/json';
     data = new Buffer(JSON.stringify(data));
   } else if (typeof data == 'object') {

lib/registry.js

@@ -31,7 +31,7 @@ Registry.prototype._init = function(cb) {
     });
 
     const engine = calypso.configure({
-      driver: driver
+      driver
     });
 
     engine.build((err, connection) => {

lib/runtime.js

@@ -266,7 +266,7 @@ Runtime.prototype._initRemoteQueryListener = function(ql, peer) {
     this._remoteSubscriptions[peer.name] = {};
   }
 
-  const topic = querytopic.format({ql: ql});
+  const topic = querytopic.format({ql});
 
   // already subscribed to the query topic
   if(this._remoteSubscriptions[peer.name][topic]) {

test/fixture/mem_peer_registry.js

@@ -5,7 +5,7 @@ const PeerRegistry = require('../../lib/peer_registry');
 
 const MemPeerRegistry = module.exports = function() {
   const db = levelup({ db: memdown });
-  PeerRegistry.call(this, { db: db, collection: 'peers' });
+  PeerRegistry.call(this, { db, collection: 'peers' });
 };
 util.inherits(MemPeerRegistry, PeerRegistry);
 

test/fixture/mem_registry.js

@@ -5,7 +5,7 @@ const DeviceRegistry = require('../../lib/device_registry');
 
 const MemRegistry = module.exports = function() {
   const db = levelup({ db: memdown });
-  DeviceRegistry.call(this, { db: db, collection: 'devices' });
+  DeviceRegistry.call(this, { db, collection: 'devices' });
 };
 util.inherits(MemRegistry, DeviceRegistry);