queryablejs - npm Package Compare versions

Comparing version 0.0.5 to 0.0.6

dist/index.js

@@ -73,3 +73,3 @@ (function webpackUniversalModuleDefinition(root, factory) {
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 3);
+/******/ 	return __webpack_require__(__webpack_require__.s = 6);
 /******/ })
@@ -130,3 +130,3 @@ /************************************************************************/
 
-var _OperationExpressionBuilder = __webpack_require__(5);
+var _OperationExpressionBuilder = __webpack_require__(4);
 
@@ -220,2 +220,3 @@ var _OperationExpressionBuilder2 = _interopRequireDefault(_OperationExpressionBuilder);
         _this.nodeName = nodeName;
+        _this.children = [];
         return _this;
@@ -313,8 +314,5 @@ }
 });
-exports.ExpressionVisitor = exports.ExpressionBuilder = exports.Expression = exports.Queryable = undefined;
 
-var _Queryable = __webpack_require__(4);
+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 _Queryable2 = _interopRequireDefault(_Queryable);
-
 var _Expression = __webpack_require__(0);
@@ -328,148 +326,123 @@
 
-var _ExpressionVisitor = __webpack_require__(7);
+var _OperationExpression = __webpack_require__(2);
 
-var _ExpressionVisitor2 = _interopRequireDefault(_ExpressionVisitor);
+var _OperationExpression2 = _interopRequireDefault(_OperationExpression);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _OperationExpressionBuilder = __webpack_require__(4);
 
-exports.Queryable = _Queryable2.default;
-exports.Expression = _Expression2.default;
-exports.ExpressionBuilder = _ExpressionBuilder2.default;
-exports.ExpressionVisitor = _ExpressionVisitor2.default;
-//# sourceMappingURL=index.js.map
+var _OperationExpressionBuilder2 = _interopRequireDefault(_OperationExpressionBuilder);
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
+var _ValueExpression = __webpack_require__(5);
 
-"use strict";
+var _ValueExpression2 = _interopRequireDefault(_ValueExpression);
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _Expression = __webpack_require__(0);
-
-var _ExpressionBuilder = __webpack_require__(1);
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var assertHasProvider = function assertHasProvider(queryable) {
-    if (!queryable.provider) {
-        throw new Error("No provider found.");
-    }
-};
+var Queryable = function () {
+    function Queryable(type) {
+        var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-var copyQuery = function copyQuery(query) {
-    var copy = {};
-
-    copy.where = query.where.copy();
-    copy.orderBy = query.orderBy.copy();
-    copy.include = query.include.copy();
-    copy.parameters = JSON.parse(JSON.stringify(query.parameters));
-    copy.take = query.take;
-    copy.skip = query.skip;
-
-    return copy;
-};
-
-var Queryable = function () {
-    function Queryable(type, query) {
         _classCallCheck(this, Queryable);
 
-        query = query || {};
-
         this.type = type || "Object";
         this.provider = null;
-        this.query = {};
+        this.query = query;
         this.query.parameters = query && query.parameters || {};
+        this._applyQuery(query);
+    }
 
-        if (query.where != null && query.where.nodeName === "where") {
-            this.query.where = query.where;
-        } else {
-            this.query.where = _Expression.Expression.where();
-        }
+    _createClass(Queryable, [{
+        key: "_applyQuery",
+        value: function _applyQuery(query) {
+            if (query.where != null && query.where.nodeName === "where") {
+                this.query.where = query.where;
+            } else {
+                this.query.where = new _OperationExpression2.default("where");
+            }
 
-        if (query.skip != null && query.skip.nodeName === "skip") {
-            this.query.skip = query.skip;
-        } else {
-            this.query.skip = _Expression.Expression.skip(0);
-        }
+            if (query.skip != null && query.skip.nodeName === "skip") {
+                this.query.skip = query.skip;
+            } else {
+                this.query.skip = new _ValueExpression2.default("skip", 0);
+            }
 
-        if (query.take != null && query.take.nodeName === "take") {
-            this.query.take = query.take;
-        } else {
-            this.query.take = _Expression.Expression.take(Infinity);
-        }
+            if (query.take != null && query.take.nodeName === "take") {
+                this.query.take = query.take;
+            } else {
+                this.query.take = new _ValueExpression2.default("take", Infinity);
+            }
 
-        if (query.include != null && query.include.nodeName === "include") {
-            this.query.include = query.include;
-        } else {
-            this.query.include = _Expression.Expression.include();
-        }
+            if (query.include != null && query.include.nodeName === "include") {
+                this.query.include = query.include;
+            } else {
+                this.query.include = new _OperationExpression2.default("include");
+            }
 
-        if (query.orderBy != null && query.orderBy.nodeName === "orderBy") {
-            this.query.orderBy = query.orderBy;
-        } else {
-            this.query.orderBy = _Expression.Expression.orderBy();
-        }
-    }
+            if (query.orderBy != null && query.orderBy.nodeName === "orderBy") {
+                this.query.orderBy = query.orderBy;
+            } else {
+                this.query.orderBy = new _OperationExpression2.default("orderBy");
+            }
 
-    _createClass(Queryable, [{
-        key: "getExpression",
-        value: function getExpression() {
-            return this.query;
+            if (query.select != null && query.select.nodeName === "select") {
+                this.query.select = query.select;
+            } else {
+                this.query.select = new _OperationExpression2.default("select");
+            }
         }
     }, {
-        key: "getQuery",
-        value: function getQuery() {
-            return this.query;
+        key: "_assertHasProvider",
+        value: function _assertHasProvider() {
+            if (!this.provider) {
+                throw new Error("No provider found.");
+            }
         }
     }, {
-        key: "or",
-        value: function or(lambda) {
-            var rightExpression;
-            var query = copyQuery(this.getQuery());
+        key: "_copyQuery",
+        value: function _copyQuery(query) {
+            var copy = {};
 
-            if (typeof lambda === "function") {
-                lambda = lambda || function () {};
-                rightExpression = lambda.call(_ExpressionBuilder.ExpressionBuilder, new _ExpressionBuilder.ExpressionBuilder(this.type));
-            } else if (lambda instanceof _Expression.Expression) {
-                rightExpression = lambda;
-            } else {
-                throw new Error("Expected an expression to be supplied.");
-            }
+            copy.where = query.where.copy();
+            copy.orderBy = query.orderBy.copy();
+            copy.include = query.include.copy();
+            copy.select = query.select.copy();
+            copy.parameters = JSON.parse(JSON.stringify(query.parameters));
+            copy.take = query.take.copy();
+            copy.skip = query.skip.copy();
 
-            if (query.where.children.length === 0) {
-                query.where.children.push(rightExpression);
-            } else {
-                var leftExpression = query.where.children.pop();
-                query.where.children.push(_Expression.Expression.or(leftExpression, rightExpression));
-            }
-
-            return this.copy(query);
+            return copy;
         }
     }, {
-        key: "where",
-        value: function where(lambda) {
-            var rightExpression;
-            var query = copyQuery(this.getQuery());
+        key: "_createQueryableFromLambda",
+        value: function _createQueryableFromLambda(type) {
+            var lambda = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
 
+            var query = this._copyQuery(this.getQuery());
+            var whereExpression = void 0;
+
             if (typeof lambda === "function") {
-                lambda = lambda || function () {};
-                rightExpression = lambda.call(_ExpressionBuilder.ExpressionBuilder, new _ExpressionBuilder.ExpressionBuilder(this.type));
-            } else if (lambda instanceof _Expression.Expression) {
-                rightExpression = lambda;
+                whereExpression = lambda(new _ExpressionBuilder2.default(this.type));
+            } else if (lambda instanceof _Expression2.default) {
+                whereExpression = lambda;
             } else {
-                throw new Error("Expected an expression to be supplied.");
+                throw new Error("Invalid Argument: Expected an expression, or function.");
             }
 
+            if (!(whereExpression instanceof _Expression2.default)) {
+                throw new Error("Invalid expression: You may be missing a return.");
+            }
+
             if (query.where.children.length === 0) {
-                query.where.children.push(rightExpression);
+                query.where = whereExpression;
             } else {
+
+                var rightExpression = whereExpression.children[0];
                 var leftExpression = query.where.children.pop();
-                query.where.children.push(_Expression.Expression.and(leftExpression, rightExpression));
+                var expression = new _OperationExpression2.default(type);
+
+                expression.children.push(leftExpression, rightExpression);
+
+                query.where.children.push(expression);
             }
@@ -480,15 +453,10 @@
     }, {
-        key: "and",
-        value: function and(lambda) {
-            return this.where(lambda);
-        }
-    }, {
-        key: "take",
-        value: function take(value) {
+        key: "_createQueryableFromNumber",
+        value: function _createQueryableFromNumber(type, value) {
             if (typeof value !== "number") {
-                throw new Error("Illegal Argument Exception: value needs to be a number.");
+                throw new Error("Invalid Argument: Expected a number.");
             }
 
-            var query = copyQuery(this.getQuery());
-            query.take = _Expression.Expression.take(value);
+            var query = this._copyQuery(this.getQuery());
+            query[type] = new _ValueExpression2.default(type, value);
 
@@ -498,56 +466,28 @@ return this.copy(query);
     }, {
-        key: "skip",
-        value: function skip(value) {
-            if (typeof value !== "number") {
-                throw new Error("Illegal Argument Exception: value needs to be a number.");
-            }
+        key: "_createQueryableFromOrderBy",
+        value: function _createQueryableFromOrderBy(type) {
+            var lambda = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
 
-            var query = copyQuery(this.getQuery());
-            query.skip = _Expression.Expression.skip(value);
+            var whereExpression = void 0;
+            var propertyExpression = void 0;
+            var query = this._copyQuery(this.getQuery());
 
-            return this.copy(query);
-        }
-    }, {
-        key: "orderByDesc",
-        value: function orderByDesc(lambda) {
-            var propertyExpression;
-            var query = copyQuery(this.getQuery());
-
             if (typeof lambda === "function") {
-                lambda = lambda || function () {};
-                propertyExpression = lambda.call(_ExpressionBuilder.ExpressionBuilder, new _ExpressionBuilder.ExpressionBuilder(this.type)).getExpression();
-            } else if (lambda instanceof _ExpressionBuilder.OperationExpressionBuilder) {
-                propertyExpression = lambda.getExpression();
+                whereExpression = lambda(new _ExpressionBuilder2.default(this.type)).getExpression();
+            } else if (lambda instanceof _OperationExpressionBuilder2.default) {
+                whereExpression = lambda.getExpression();
             } else {
-                throw new Error("Expected a property to orderByDesc.");
+                throw new Error("Invalid Argument: Expected a OperationExpressionBuilder, or a function.");
             }
 
-            var descendingExpression = _Expression.Expression.descending(propertyExpression);
-
-            if (!query.orderBy.contains(propertyExpression)) {
-                query.orderBy.children.push(descendingExpression);
-                return this.copy(query);
-            } else {
-                return this;
+            if (!(whereExpression instanceof _Expression2.default)) {
+                throw new Error("Invalid expression: You may be missing a return.");
             }
-        }
-    }, {
-        key: "orderBy",
-        value: function orderBy(lambda) {
-            var propertyExpression;
-            var query = copyQuery(this.getQuery());
 
-            if (typeof lambda === "function") {
-                lambda = lambda || function () {};
-                propertyExpression = lambda.call(_ExpressionBuilder.ExpressionBuilder, new _ExpressionBuilder.ExpressionBuilder(this.type)).getExpression();
-            } else if (lambda instanceof _ExpressionBuilder.OperationExpressionBuilder) {
-                propertyExpression = lambda.getExpression();
-            } else {
-                throw new Error("Expected a property to orderBy.");
-            }
+            var expression = new _OperationExpression2.default(type);
+            propertyExpression = whereExpression.children[0];
+            expression.children.push(propertyExpression);
 
-            var ascendingExpression = _Expression.Expression.ascending(propertyExpression);
-
             if (!query.orderBy.contains(propertyExpression)) {
-                query.orderBy.children.push(ascendingExpression);
+                query.orderBy.children.push(expression);
                 return this.copy(query);
@@ -559,48 +499,47 @@ } else {
     }, {
-        key: "setParameters",
-        value: function setParameters(params) {
-            if (!params) {
-                throw new Error("Expected parameters to be passed in.");
-            }
-            var parameters = this.query.parameters;
-
-            Object.keys(params).forEach(function (key) {
-                parameters[key] = params[key];
-            });
-            return this;
+        key: "and",
+        value: function and(lambda) {
+            return this._createQueryableFromLambda("and", lambda);
         }
     }, {
-        key: "withParameters",
-        value: function withParameters(params) {
-            if (!params) {
-                throw new Error("Expected parameters to be passed in.");
-            }
-
-            var parameters = this.query.parameters = {};
-            Object.keys(params).forEach(function (key) {
-                parameters[key] = params[key];
-            });
-            return this;
+        key: "copy",
+        value: function copy(query) {
+            var queryable = new Queryable(this.type, query || this._copyQuery(this.query));
+            queryable.provider = this.provider;
+            return queryable;
         }
     }, {
+        key: "countAsync",
+        value: function countAsync() {
+            this._assertHasProvider(this);
+            return this.provider.countAsync(this);
+        }
+    }, {
+        key: "getExpression",
+        value: function getExpression() {
+            return this.query;
+        }
+    }, {
+        key: "getQuery",
+        value: function getQuery() {
+            return this.query;
+        }
+    }, {
         key: "include",
-        value: function include(lambda) {
-            var propertyExpression;
-            var query = copyQuery(this.getQuery());
+        value: function include(propertyName) {
+            if (typeof propertyName !== "string") {
+                throw new Error("Illegal Argument: Expected a string.");
+            }
 
-            if (typeof lambda === "function") {
-                lambda = lambda || function () {};
-                propertyExpression = lambda.call(_ExpressionBuilder.ExpressionBuilder, new _ExpressionBuilder.ExpressionBuilder(this.type)).getExpression();
-            } else if (lambda instanceof _ExpressionBuilder.OperationExpressionBuilder) {
-                propertyExpression = lambda.getExpression();
+            var query = this._copyQuery(this.getQuery());
+            var propertyAccess = new _OperationExpression2.default("propertyAccess");
+
+            propertyAccess.children.push(new _ValueExpression2.default("type", "Object"), new _ValueExpression2.default("property", propertyName));
+
+            if (!query.include.contains(propertyAccess)) {
+                query.include.children.push(propertyAccess);
+                return this.copy(query);
             } else {
-                throw new Error("Expected a property to include.");
+                return this;
             }
-
-            if (propertyExpression.nodeName !== "queryable") {
-                propertyExpression = _Expression.Expression.queryable(propertyExpression, _Expression.Expression.expression(_Expression.Expression.where()));
-            }
-
-            query.include.children.push(propertyExpression);
-            return this.copy(query);
         }
@@ -627,3 +566,7 @@ }, {
                     var leftExpression = cloneQuery.where.children.pop();
-                    cloneQuery.where.children.push(_Expression.Expression.and(leftExpression, rightExpression.copy()));
+                    var andExpression = new _OperationExpression2.default("and");
+
+                    andExpression.children.push(leftExpression, rightExpression.copy());
+
+                    cloneQuery.where.children.push(andExpression);
                 }
@@ -645,33 +588,108 @@ }
     }, {
+        key: "ofType",
+        value: function ofType(type) {
+            var queryable = new Queryable(type);
+            queryable.provider = this.provider;
+            return queryable;
+        }
+    }, {
+        key: "or",
+        value: function or(lambda) {
+            return this._createQueryableFromLambda("or", lambda);
+        }
+    }, {
+        key: "orderBy",
+        value: function orderBy(lambda) {
+            return this._createQueryableFromOrderBy("ascending", lambda);
+        }
+    }, {
+        key: "orderBy",
+        value: function orderBy(lambda) {
+            return this._createQueryableFromOrderBy("ascending", lambda);
+        }
+    }, {
+        key: "orderByDesc",
+        value: function orderByDesc(lambda) {
+            return this._createQueryableFromOrderBy("descending", lambda);
+        }
+    }, {
+        key: "take",
+        value: function take(value) {
+            return this._createQueryableFromNumber("take", value);
+        }
+    }, {
         key: "toArrayAsync",
         value: function toArrayAsync() {
-            assertHasProvider(this);
+            this._assertHasProvider(this);
             return this.provider.toArrayAsync(this);
         }
     }, {
-        key: "countAsync",
-        value: function countAsync() {
-            assertHasProvider(this);
-            return this.provider.countAsync(this);
-        }
-    }, {
         key: "toArrayWithCountAsync",
         value: function toArrayWithCountAsync() {
-            assertHasProvider(this);
+            this._assertHasProvider(this);
             return this.provider.toArrayWithCountAsync(this);
         }
     }, {
-        key: "ofType",
-        value: function ofType(type) {
-            var queryable = new Queryable(type);
-            queryable.provider = this.provider;
-            return queryable;
+        key: "setParameters",
+        value: function setParameters(params) {
+            if (params == null) {
+                throw new Error("Null Argument Exception.");
+            }
+            var parameters = this.query.parameters;
+
+            Object.keys(params).forEach(function (key) {
+                parameters[key] = params[key];
+            });
+            return this;
         }
     }, {
-        key: "copy",
-        value: function copy(query) {
-            var queryable = new Queryable(this.type, query || copyQuery(this.query));
-            queryable.provider = this.provider;
-            return queryable;
+        key: "select",
+        value: function select(properties) {
+            var _this = this;
+
+            if (!Array.isArray(properties)) {
+                throw new Error("Illegal Argument: Expected an array of strings.");
+            }
+
+            var query = this._copyQuery(this.getQuery());
+
+            properties.forEach(function (propertyName) {
+                if (typeof propertyName !== "string") {
+                    throw new Error("Illegal Argument: Expected a string.");
+                }
+
+                var propertyAccess = new _OperationExpression2.default("propertyAccess");
+
+                propertyAccess.children.push(new _ValueExpression2.default("type", _this.type), new _ValueExpression2.default("property", propertyName));
+
+                if (!query.select.contains(propertyAccess)) {
+                    query.select.children.push(propertyAccess);
+                }
+            });
+
+            return this.copy(query);
         }
+    }, {
+        key: "skip",
+        value: function skip(value) {
+            return this._createQueryableFromNumber("skip", value);
+        }
+    }, {
+        key: "where",
+        value: function where(lambda) {
+            return this._createQueryableFromLambda("and", lambda);
+        }
+    }, {
+        key: "withParameters",
+        value: function withParameters(params) {
+            if (params == null) {
+                throw new Error("Null ArgumentException");
+            }
+
+            var parameters = this.query.parameters = {};
+            Object.keys(params).forEach(function (key) {
+                parameters[key] = params[key];
+            });
+            return this;
+        }
     }]);
@@ -686,3 +704,3 @@
 /***/ }),
-/* 5 */
+/* 4 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -699,3 +717,3 @@
 
-var _ValueExpression = __webpack_require__(6);
+var _ValueExpression = __webpack_require__(5);
 
@@ -708,2 +726,14 @@ var _ValueExpression2 = _interopRequireDefault(_ValueExpression);
 
+var _Expression = __webpack_require__(0);
+
+var _Expression2 = _interopRequireDefault(_Expression);
+
+var _ExpressionBuilder = __webpack_require__(1);
+
+var _ExpressionBuilder2 = _interopRequireDefault(_ExpressionBuilder);
+
+var _Queryable = __webpack_require__(3);
+
+var _Queryable2 = _interopRequireDefault(_Queryable);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -721,19 +751,34 @@
         this.currentExpression = currentExpression || rootExpression;
+
+        if (type == null) {
+            throw new Error("Null Argument Exception: type cannot be null.");
+        }
+
+        if (rootExpression == null) {
+            throw new Error("Null Argement Exception: rootExpression cannot be null.");
+        }
     }
 
     _createClass(OperationExpressionBuilder, [{
-        key: "_createArrayOperationExpression",
-        value: function _createArrayOperationExpression(type, array) {
-            var propertyAccessExpression = new _OperationExpression2.default("propertyAccess");
-            propertyAccessExpression.children.push(new _ValueExpression2.default("type", this.type), new _ValueExpression2.default("property", this.propertyName));
+        key: "_createResultsOperationExpression",
+        value: function _createResultsOperationExpression(type, results) {
+            var propertyAccessExpression = this._createPropertyAccessExpression();
 
-            if (Array.isArray(array)) {
-                var constant = this._getConstant(array);
-                var arrayExpression = new _OperationExpression2.default(type);
-                arrayExpression.children.push(propertyAccessExpression, constant);
+            if (Array.isArray(results)) {
+                var constant = this._getConstant(results);
+                var operationExpression = new _OperationExpression2.default(type);
+                operationExpression.children.push(propertyAccessExpression, constant);
 
-                this.currentExpression.children.push(arrayExpression);
+                this.currentExpression.children.push(operationExpression);
                 return this.rootExpression;
+            } else if (results instanceof _Queryable2.default) {
+                var _operationExpression = new _OperationExpression2.default(type);
+                var queryableExpression = new _ValueExpression2.default("queryable", results);
+
+                _operationExpression.children.push(propertyAccessExpression, queryableExpression);
+
+                this.currentExpression.children.push(_operationExpression);
+                return this.rootExpression;
             } else {
-                throw new Error("Invalid Argument: Expected an array.");
+                throw new Error("Invalid Argument: Expected an array or a queryable.");
             }
@@ -748,10 +793,12 @@ }
 
-            var propertyAccessExpression = new _OperationExpression2.default("propertyAccess");
-            propertyAccessExpression.children.push(new _ValueExpression2.default("type", this.type), new _ValueExpression2.default("property", this.propertyName));
+            var propertyNavigationExpression = this._createPropertyNavigationExpression();
 
-            var expressionBuilder = new ExpressionBuilder();
+            var expressionBuilder = new _ExpressionBuilder2.default();
             var expression = lambda(expressionBuilder);
+            var expressionExpression = new _OperationExpression2.default("expression");
 
+            expressionExpression.children.push(expression);
+
             var lambdaExpression = new _OperationExpression2.default(type);
-            lambdaExpression.children.push(propertyAccessExpression, expression);
+            lambdaExpression.children.push(propertyNavigationExpression, expressionExpression);
 
@@ -765,4 +812,3 @@ this.currentExpression.children.push(lambdaExpression);
         value: function _createOperationExpression(type, value) {
-            var propertyAccessExpression = new _OperationExpression2.default("propertyAccess");
-            propertyAccessExpression.children.push(new _ValueExpression2.default("type", this.type), new _ValueExpression2.default("property", this.propertyName));
+            var propertyAccessExpression = this._createPropertyAccessExpression();
 
@@ -778,5 +824,21 @@ var constant = this._getConstant(value);
     }, {
+        key: "_createPropertyAccessExpression",
+        value: function _createPropertyAccessExpression() {
+            var propertyAccessExpression = new _OperationExpression2.default("propertyAccess");
+            propertyAccessExpression.children.push(new _ValueExpression2.default("type", this.type), new _ValueExpression2.default("property", this.propertyName));
+
+            return propertyAccessExpression;
+        }
+    }, {
+        key: "_createPropertyNavigationExpression",
+        value: function _createPropertyNavigationExpression() {
+            var propertyNavigationExpression = new _OperationExpression2.default("propertyNavigation");
+            propertyNavigationExpression.children.push(new _ValueExpression2.default("type", this.type), new _ValueExpression2.default("property", this.propertyName));
+
+            return propertyNavigationExpression;
+        }
+    }, {
         key: "_getConstant",
         value: function _getConstant(value) {
-            if (value instanceof Expression) {
+            if (value instanceof _Expression2.default) {
                 return value;
@@ -814,2 +876,7 @@ }
     }, {
+        key: "contains",
+        value: function contains(value) {
+            return this._createOperationExpression("contains", value);
+        }
+    }, {
         key: "isEqualTo",
@@ -827,3 +894,3 @@ value: function isEqualTo(value) {
         value: function isIn(array) {
-            return this._createArrayOperationExpression("isIn", array);
+            return this._createResultsOperationExpression("isIn", array);
         }
@@ -833,3 +900,3 @@ }, {
         value: function isNotIn(array) {
-            return this._createArrayOperationExpression("isNotIn", array);
+            return this._createResultsOperationExpression("isNotIn", array);
         }
@@ -868,22 +935,12 @@ }, {
         key: "property",
-        value: function (_property) {
-            function property(_x) {
-                return _property.apply(this, arguments);
-            }
-
-            property.toString = function () {
-                return _property.toString();
-            };
-
-            return property;
-        }(function (value) {
-            var propertyNavigation = Expression.propertyNavigation(this.type, this.propertyName);
-            this.currentExpression.push(propertyNavigation);
-            return new PropertyNavigationExpressionBuilder(this.type, property, this.rootExpression, propertyNavigation);
-        })
+        value: function property(value) {
+            var propertyNavigation = this._createPropertyNavigationExpression();
+            this.currentExpression.children.push(propertyNavigation);
+            return new OperationExpressionBuilder("Object", value, this.rootExpression, propertyNavigation);
+        }
     }, {
         key: "getExpression",
         value: function getExpression() {
-            var propertyAccess = Expression.propertyAccess(Expression.type(this.type), this.propertyName);
-            this.currentExpression.children.push(propertyAccess);
+            var propertyAccessExpression = this._createPropertyAccessExpression();
+            this.currentExpression.children.push(propertyAccessExpression);
 
@@ -901,3 +958,3 @@ return this.rootExpression;
 /***/ }),
-/* 6 */
+/* 5 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -966,2 +1023,38 @@
 /***/ }),
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.ExpressionVisitor = exports.ExpressionBuilder = exports.Expression = exports.Queryable = undefined;
+
+var _Queryable = __webpack_require__(3);
+
+var _Queryable2 = _interopRequireDefault(_Queryable);
+
+var _Expression = __webpack_require__(0);
+
+var _Expression2 = _interopRequireDefault(_Expression);
+
+var _ExpressionBuilder = __webpack_require__(1);
+
+var _ExpressionBuilder2 = _interopRequireDefault(_ExpressionBuilder);
+
+var _ExpressionVisitor = __webpack_require__(7);
+
+var _ExpressionVisitor2 = _interopRequireDefault(_ExpressionVisitor);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.Queryable = _Queryable2.default;
+exports.Expression = _Expression2.default;
+exports.ExpressionBuilder = _ExpressionBuilder2.default;
+exports.ExpressionVisitor = _ExpressionVisitor2.default;
+//# sourceMappingURL=index.js.map
+
+/***/ }),
 /* 7 */
@@ -968,0 +1061,0 @@ /***/ (function(module, exports, __webpack_require__) {

package.json

 {
   "name": "queryablejs",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
@@ -5,0 +5,0 @@ "main": "./dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

1512600

increased by0.05%

Lines of code

4583

increased by1.48%

No dependency changes