Update index.js

.gitignore

@@ -2,7 +2,6 @@
 logs
 *.log
 node_modules
-dist
 tmp
 coverage
 .nyc_output

dist/index.js

@@ -0,0 +1,130 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handlers = exports.Schema = exports.Param = undefined;
+exports.handler = handler;
+exports.parser = parser;
+exports.formatter = formatter;
+exports.validator = validator;
+exports.middleware = middleware;
+exports.errorHandler = errorHandler;
+
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
+var _querymenParam = require('./querymen-param');
+
+var _querymenParam2 = _interopRequireDefault(_querymenParam);
+
+var _querymenSchema = require('./querymen-schema');
+
+var _querymenSchema2 = _interopRequireDefault(_querymenSchema);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.Param = _querymenParam2.default;
+exports.Schema = _querymenSchema2.default; /** @module querymen */
+
+var handlers = exports.handlers = {
+  parsers: {},
+  formatters: {},
+  validators: {}
+
+  /**
+   * Get or set a handler.
+   * @memberof querymen
+   * @param {string} type - Handler type.
+   * @param {string} name - Handler name.
+   * @param {Function} [fn] - Set the handler method.
+   */
+};function handler(type, name, fn) {
+  if (arguments.length > 2) {
+    handlers[type][name] = fn;
+  }
+
+  return handlers[type][name];
+}
+
+/**
+ * Get or set a parser.
+ * @memberof querymen
+ * @param {string} name - Parser name.
+ * @param {parserFn} [fn] - Set the parser method.
+ * @return {parserFn} The parser method.
+ */
+function parser(name, fn) {
+  return handler.apply(undefined, ['parsers'].concat(Array.prototype.slice.call(arguments)));
+}
+
+/**
+ * Get or set a formatter.
+ * @memberof querymen
+ * @param {string} name - Formatter name.
+ * @param {formatterFn} [fn] - Set the formatter method.
+ * @return {formatterFn} The formatter method.
+ */
+function formatter(name, fn) {
+  return handler.apply(undefined, ['formatters'].concat(Array.prototype.slice.call(arguments)));
+}
+
+/**
+ * Get or set a validator.
+ * @memberof querymen
+ * @param {string} name - Validator name.
+ * @param {validatorFn} [fn] - Set the validator method.
+ * @return {validatorFn} The validator method.
+ */
+function validator(name, fn) {
+  return handler.apply(undefined, ['validators'].concat(Array.prototype.slice.call(arguments)));
+}
+
+/**
+ * Create a middleware.
+ * @memberof querymen
+ * @param {QuerymenSchema|Object} [schema] - Schema object.
+ * @param {Object} [options] - Options to be passed to schema.
+ * @return {Function} The middleware.
+ */
+function middleware(schema, options) {
+  return function (req, res, next) {
+    var _schema = void 0;
+    if (schema && schema.options && schema.options.near) {
+      _schema = schema instanceof _querymenSchema2.default ? _lodash2.default.clone(schema) : new _querymenSchema2.default(schema, options);
+    } else {
+      _schema = schema instanceof _querymenSchema2.default ? _lodash2.default.cloneDeep(schema) : new _querymenSchema2.default(schema, options);
+    }
+
+    _schema.validate(req.query, function (err) {
+      if (err) {
+        req.querymen = { error: err };
+        res.status(400);
+        return next(err.message);
+      }
+      // console.log('1. request Query : ', req.query)
+
+      req.querymen = _schema.parse(req.query);
+      req.querymen.schema = _schema;
+      next();
+    });
+  };
+}
+
+/**
+ * Error handler middleware.
+ * @memberof querymen
+ * @return {Function} The middleware.
+ */
+function errorHandler() {
+  return function (err, req, res, next) {
+    if (req.querymen && req.querymen.error) {
+      res.status(400).json(req.querymen.error);
+    } else {
+      next(err);
+    }
+  };
+}
+
+exports.default = { Schema: _querymenSchema2.default, Param: _querymenParam2.default, handlers: handlers, handler: handler, parser: parser, formatter: formatter, validator: validator, middleware: middleware, errorHandler: errorHandler };

dist/querymen-param.js

@@ -0,0 +1,137 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
+var _richParam = require('rich-param');
+
+var _richParam2 = _interopRequireDefault(_richParam);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+/** QuerymenParam class. */
+var QuerymenParam = function (_Param) {
+  _inherits(QuerymenParam, _Param);
+
+  /**
+   * Create a param.
+   * @param {string} name - Param name.
+   * @param {*} [value] - The value of the param.
+   * @param {Object} [options] - Options of the param.
+   * @param {Object} [schema] - Schema of the param.
+   */
+  function QuerymenParam(name, value) {
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+    _classCallCheck(this, QuerymenParam);
+
+    var _this = _possibleConstructorReturn(this, (QuerymenParam.__proto__ || Object.getPrototypeOf(QuerymenParam)).call(this, name, value, options));
+
+    _this.parse = _this.parse.bind(_this);
+    _this.parser = _this.parser.bind(_this);
+
+    _this.handlers.parsers = {};
+    _this.options = _lodash2.default.assign({
+      paths: [name],
+      operator: '$eq',
+      parse: function parse(value, path, operator, param) {
+        if (operator === '$eq') {
+          return _defineProperty({}, path, value);
+        } else if (_lodash2.default.isRegExp(value)) {
+          return operator === '$ne' ? _defineProperty({}, path, { $not: value }) : _defineProperty({}, path, value);
+        } else {
+          return _defineProperty({}, path, _defineProperty({}, operator, value));
+        }
+      }
+    }, _this.options);
+    return _this;
+  }
+
+  /**
+   * Get or set a parser.
+   * @param {string} name - Parser name.
+   * @param {parserFn} [fn] - Set the parser method.
+   * @return {parserFn} The parser method.
+   */
+
+
+  _createClass(QuerymenParam, [{
+    key: 'parser',
+    value: function parser(name, fn) {
+      return this.handler.apply(this, ['parsers'].concat(Array.prototype.slice.call(arguments)));
+    }
+
+    /**
+     * Parse the param.
+     * @param {*} [value] - Set the param value.
+     * @param {string|string[]} path - Set the param path/paths.
+     * @return {Object} The parsed value.
+     */
+
+  }, {
+    key: 'parse',
+    value: function parse() {
+      var _this2 = this;
+
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this._value;
+      var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.options.paths;
+
+      var operator = this.options.operator;
+      var query = {};
+
+      if (_lodash2.default.isNil(value)) {
+        return query;
+      } else if (value !== this._value) {
+        value = this.value(value);
+      }
+
+      if (_lodash2.default.isArray(path)) {
+        var paths = path;
+        if (paths.length > 1) {
+          query.$or = paths.map(function (path) {
+            return _this2.parse(value, path);
+          });
+          return query;
+        }
+        path = paths[0];
+      }
+
+      if (_lodash2.default.isArray(value)) {
+        operator = operator === '$ne' ? '$nin' : '$in';
+      }
+
+      _lodash2.default.forIn(this.options, function (optionValue, option) {
+        var parser = void 0;
+        if (option === 'parse' && _lodash2.default.isFunction(optionValue)) {
+          parser = optionValue;
+        } else if (_lodash2.default.isFunction(_this2.handlers.parsers[option])) {
+          parser = _this2.handlers.parsers[option].bind(_this2, optionValue);
+        } else {
+          return;
+        }
+        query = parser(value, path, operator, _this2);
+      });
+
+      return query;
+    }
+  }]);
+
+  return QuerymenParam;
+}(_richParam2.default);
+
+exports.default = QuerymenParam;