nroonga/nroonga at d2e532f [master] Follow JavaScript Standard Style (Groonga-commit) - Groonga - fulltext search engine.

abetomo	2017-09-07 13:43:28 +0900 (Thu, 07 Sep 2017)

  New Revision: d2e532f3ddc9985c49facc6e0a0a3c7600f348eb
  https://github.com/nroonga/nroonga/commit/d2e532f3ddc9985c49facc6e0a0a3c7600f348eb

  Merged a7bab8a: Merge pull request #16 from abetomo/use_standard

  Message:
    Follow JavaScript Standard Style

  Modified files:
    lib/nroonga.js

  Modified: lib/nroonga.js (+37 -44)
===================================================================

--- lib/nroonga.js    2017-09-07 13:36:20 +0900 (26627db)
+++ lib/nroonga.js    2017-09-07 13:43:28 +0900 (b46c105)
@@ -1,72 +1,65 @@
-var nroonga = module.exports = require('../build/Release/nroonga_bindings.node');
+const nroonga = module.exports = require('../build/Release/nroonga_bindings.node')
 
-function optionsToCommandString(command, options) {
-  var args, key;
-  args = [command];
+const optionsToCommandString = (command, options) => {
+  const args = [command]
 
   if (options) {
-    for (key in options) {
+    for (let key in options) {
       if (options[key] != null) {
-        args.push('--' + key);
-        args.push(JSON.stringify(options[key]));
+        args.push('--' + key)
+        args.push(JSON.stringify(options[key]))
       }
     }
   }
-  return args.join(' ');
+  return args.join(' ')
 }
 
-function overrideOutputType (optionsGiven, type) {
-  var key, options;
-  options = {};
-  for (key in optionsGiven) {
-    options[key] = optionsGiven[key];
+const overrideOutputType = (optionsGiven, type) => {
+  const options = {}
+  for (let key in optionsGiven) {
+    options[key] = optionsGiven[key]
   }
-  options.output_type = type;
-  return options;
+  options.output_type = type
+  return options
 }
 
-function formatResult(result, command) {
+const formatResult = (result, command) => {
   if (command === 'dump') {
-    return result.toString('UTF-8');
-  } else {
-    if (result.length > 0) {
-      return JSON.parse(result);
-    } else {
-      return null;
-    }
+    return result.toString('UTF-8')
+  }
+  if (result.length > 0) {
+    return JSON.parse(result)
   }
+  return null
 }
 
-nroonga.Database.prototype.commandSync = function(command, options) {
-  var overridedOptions = overrideOutputType(options || {}, 'json');
-  var commandString = optionsToCommandString(command, overridedOptions);
+nroonga.Database.prototype.commandSync = function (command, options) {
+  const overridedOptions = overrideOutputType(options || {}, 'json')
+  const commandString = optionsToCommandString(command, overridedOptions)
 
-  var result = this.commandSyncString(commandString);
-  return formatResult(result, command);
-};
+  const result = this.commandSyncString(commandString)
+  return formatResult(result, command)
+}
 
-nroonga.Database.prototype.command = function(command, options, callback) {
-  var wrappedCallback = null;
-  var overridedOptions;
-  var commandString;
+nroonga.Database.prototype.command = function (command, options, callback) {
+  let wrappedCallback = null
 
   if (arguments.length === 2) {
-    callback = options;
-    options = {};
+    callback = options
+    options = {}
   }
 
   if (callback) {
-    wrappedCallback = function(error, data) {
+    wrappedCallback = (error, data) => {
       if (error) {
-        return callback(error);
-      } else {
-        return callback(null, formatResult(data, command));
+        return callback(error)
       }
-    };
+      return callback(null, formatResult(data, command))
+    }
   }
 
-  overridedOptions = overrideOutputType(options, 'json');
-  commandString = optionsToCommandString(command, overridedOptions);
+  const overridedOptions = overrideOutputType(options, 'json')
+  const commandString = optionsToCommandString(command, overridedOptions)
 
-  return this.commandString(commandString, wrappedCallback);
-};
+  return this.commandString(commandString, wrappedCallback)
+}
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170907/d14ed322/attachment-0001.htm 


Groonga - fulltext search engine.

[Groonga-commit] nroonga/nroonga at d2e532f [master] Follow JavaScript Standard Style