@webda/core 1.6.0-beta.1 → 2.0.0-beta.0

package/lib/stores/store.js

@@ -13,6 +13,7 @@ exports.Store = exports.StoreParameters = exports.UpdateConditionFailError = exp
 const core_1 = require("../core");
 const coremodel_1 = require("../models/coremodel");
 const service_1 = require("../services/service");
+const query_1 = require("./webdaql/query");
 class StoreNotFoundError extends core_1.WebdaError {
     constructor(uuid, storeName) {
         super("STORE_NOTFOUND", `Item not found ${uuid} Store(${storeName})`);
@@ -30,7 +31,8 @@ exports.UpdateConditionFailError = UpdateConditionFailError;
  */
 class StoreParameters extends service_1.ServiceParameters {
     constructor(params, service) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        var _e;
         super(params);
         (_a = this.model) !== null && _a !== void 0 ? _a : (this.model = "Webda/CoreModel");
         let expose = params.expose;
@@ -49,6 +51,7 @@ class StoreParameters extends service_1.ServiceParameters {
         if (expose) {
             expose.restrict = expose.restrict || {};
             this.expose = expose;
+            (_b = (_e = this.expose).queryMethod) !== null && _b !== void 0 ? _b : (_e.queryMethod = "GET");
         }
         if (params.map) {
             throw new Error("Deprecated map usage, use a MapperService");
@@ -56,7 +59,8 @@ class StoreParameters extends service_1.ServiceParameters {
         if (params.index) {
             throw new Error("Deprecated index usage, use an AggregatorService");
         }
-        (_b = this.strict) !== null && _b !== void 0 ? _b : (this.strict = true);
+        (_c = this.strict) !== null && _c !== void 0 ? _c : (this.strict = true);
+        (_d = this.slowQueryThreshold) !== null && _d !== void 0 ? _d : (this.slowQueryThreshold = 30000);
     }
 }
 exports.StoreParameters = StoreParameters;
@@ -105,6 +109,23 @@ class Store extends service_1.Service {
          * Contain the model uuid field
          */
         this._uuidField = "uuid";
+        /**
+         * Add metrics counter
+         */
+        this.metrics = {
+            save: 0,
+            update: 0,
+            partialUpdate: 0,
+            get: 0,
+            increment: 0,
+            delete: 0,
+            collectionUpsert: 0,
+            collectionDelete: 0,
+            attributeDelete: 0,
+            query: 0,
+            queryDuration: 0,
+            slowQueries: 0
+        };
     }
     /**
      * Load the parameters for a service
@@ -118,13 +139,16 @@ class Store extends service_1.Service {
      * @throws Error if model is not found
      */
     computeParameters() {
+        var _a;
         super.computeParameters();
         const p = this.parameters;
         this._model = this._webda.getModel(p.model);
         this._uuidField = this._model.getUuidField();
         this._lastUpdateField = this._model.getLastUpdateField();
         this._creationDateField = this._model.getCreationField();
+        (_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a.computeParameters();
     }
+    logSlowQuery(query, reason, time) { }
     /**
      * Return Store current model
      * @returns
@@ -135,8 +159,35 @@ class Store extends service_1.Service {
     getLastUpdateField() {
         return this._model.getLastUpdateField();
     }
+    /**
+     * Get From Cache or main
+     * @param uid
+     * @param raiseIfNotFound
+     * @returns
+     */
+    _getFromCache(uid, raiseIfNotFound = false) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._get(uid));
+            if (!res) {
+                res = yield this._get(uid, raiseIfNotFound);
+            }
+            else {
+                res.__store = this;
+            }
+            return res;
+        });
+    }
+    /**
+     * Get object from store
+     * @param uid
+     * @returns
+     */
     getObject(uid) {
-        return this._get(uid);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.metrics.get++;
+            return this._getFromCache(uid);
+        });
     }
     /**
      * @inheritdoc
@@ -153,15 +204,25 @@ class Store extends service_1.Service {
                 post: {
                     description: `The way to create a new ${this._model.name} model`,
                     summary: "Create a new " + this._model.name,
-                    model: this._model.name,
                     operationId: `create${this._model.name}`,
                     responses: {
                         "200": {
-                            model: this._model.name
+                            description: "Retrieve model",
+                            content: {
+                                "application/json": {
+                                // schema: this._model.name
+                                }
+                            }
+                        },
+                        "400": {
+                            description: "Object is invalid"
                         },
-                        "400": "Object is invalid",
-                        "403": "You don't have permissions",
-                        "409": "Object already exists"
+                        "403": {
+                            description: "You don't have permissions"
+                        },
+                        "409": {
+                            description: "Object already exists"
+                        }
                     }
                 }
             });
@@ -175,6 +236,33 @@ class Store extends service_1.Service {
         if (!expose.restrict.get) {
             methods.push("GET");
         }
+        // Query endpoint
+        if (!expose.restrict.query) {
+            this.addRoute(expose.queryMethod === "GET" ? `${expose.url}{?q}` : expose.url, [expose.queryMethod], this.httpQuery, {
+                model: this._model.name,
+                [expose.queryMethod.toLowerCase()]: {
+                    description: `Query on ${this._model.name} model with WebdaQL`,
+                    summary: "Query " + this._model.name,
+                    operationId: `create${this._model.name}`,
+                    responses: {
+                        "200": {
+                            description: "Retrieve models",
+                            content: {
+                                "application/json": {
+                                // schema: this._model.name
+                                }
+                            }
+                        },
+                        "400": {
+                            description: "Query is invalid"
+                        },
+                        "403": {
+                            description: "You don't have permissions"
+                        }
+                    }
+                }
+            });
+        }
         if (!expose.restrict.delete) {
             methods.push("DELETE");
         }
@@ -187,48 +275,71 @@ class Store extends service_1.Service {
                     operationId: `get${this._model.name}`,
                     responses: {
                         "200": {
-                            model: this._model.name
+                        //model: this._model.name
+                        },
+                        "400": {
+                            description: "Object is invalid"
                         },
-                        "400": "Object is invalid",
-                        "403": "You don't have permissions",
-                        "404": "Unknown object"
+                        "403": {
+                            description: "You don't have permissions"
+                        },
+                        "404": {
+                            description: "Unknown object"
+                        }
                     }
                 },
                 put: {
                     description: `Update a ${this._model.name} if the permissions allow`,
                     summary: "Update a " + this._model.name,
-                    model: this._model.name,
                     operationId: `updatet${this._model.name}`,
                     responses: {
                         "200": {
-                            model: this._model.name
+                        // model: this._model.name
+                        },
+                        "400": {
+                            description: "Object is invalid"
+                        },
+                        "403": {
+                            description: "You don't have permissions"
                         },
-                        "400": "Object is invalid",
-                        "403": "You don't have permissions",
-                        "404": "Unknown object"
+                        "404": {
+                            description: "Unknown object"
+                        }
                     }
                 },
                 patch: {
                     description: `Patch a ${this._model.name} if the permissions allow`,
                     summary: "Patch a " + this._model.name,
-                    model: this._model.name,
                     operationId: `updatet${this._model.name}`,
                     responses: {
-                        "204": "",
-                        "400": "Object is invalid",
-                        "403": "You don't have permissions",
-                        "404": "Unknown object"
+                        "204": {
+                            description: ""
+                        },
+                        "400": {
+                            description: "Object is invalid"
+                        },
+                        "403": {
+                            description: "You don't have permissions"
+                        },
+                        "404": {
+                            description: "Unknown object"
+                        }
                     }
                 },
                 delete: {
                     operationId: `delete${this._model.name}`,
                     description: `Delete ${this._model.name} if the permissions allow`,
                     summary: "Delete a " + this._model.name,
-                    model: this._model.name,
                     responses: {
-                        "204": "",
-                        "403": "You don't have permissions",
-                        "404": "Unknown object"
+                        "204": {
+                            description: ""
+                        },
+                        "403": {
+                            description: "You don't have permissions"
+                        },
+                        "404": {
+                            description: "Unknown object"
+                        }
                     }
                 }
             });
@@ -260,6 +371,16 @@ class Store extends service_1.Service {
             });
         }
     }
+    /**
+     * OVerwrite the model
+     * Used mainly in test
+     */
+    setModel(model) {
+        var _a;
+        this._model = model;
+        (_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a.setModel(model);
+        this.parameters.strict = false;
+    }
     /**
      * Get the url where the store is exposed
      */
@@ -311,13 +432,16 @@ class Store extends service_1.Service {
         });
     }
     incrementAttribute(uid, prop, value) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // If value === 0 no need to update anything
             if (value === 0) {
                 return Promise.resolve();
             }
             let updateDate = new Date();
+            this.metrics.increment++;
             yield this._incrementAttribute(uid, prop, value, updateDate);
+            yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._incrementAttribute(uid, prop, value, updateDate));
             return this.emitSync("Store.PartialUpdated", {
                 object_id: uid,
                 store: this,
@@ -332,12 +456,15 @@ class Store extends service_1.Service {
         });
     }
     upsertItemToCollection(uid, prop, item, index = undefined, itemWriteCondition = undefined, itemWriteConditionField = undefined) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (itemWriteConditionField === undefined) {
                 itemWriteConditionField = this._uuidField;
             }
             let updateDate = new Date();
+            this.metrics.collectionUpsert++;
             yield this._upsertItemToCollection(uid, prop, item, index, itemWriteCondition, itemWriteConditionField, updateDate);
+            yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._upsertItemToCollection(uid, prop, item, index, itemWriteCondition, itemWriteConditionField, updateDate));
             yield this.emitSync("Store.PartialUpdated", {
                 object_id: uid,
                 store: this,
@@ -353,9 +480,12 @@ class Store extends service_1.Service {
         });
     }
     deleteItemFromCollection(uid, prop, index, itemWriteCondition, itemWriteConditionField = this._uuidField) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let updateDate = new Date();
+            this.metrics.collectionDelete++;
             yield this._deleteItemFromCollection(uid, prop, index, itemWriteCondition, itemWriteConditionField, updateDate);
+            yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._deleteItemFromCollection(uid, prop, index, itemWriteCondition, itemWriteConditionField, updateDate));
             yield this.emitSync("Store.PartialUpdated", {
                 object_id: uid,
                 store: this,
@@ -369,6 +499,125 @@ class Store extends service_1.Service {
             });
         });
     }
+    /**
+     * Query store with WebdaQL
+     * @param query
+     * @param context to apply permission
+     */
+    query(query, context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let queryValidator = new query_1.WebdaQL.QueryValidator(query);
+            let offset = queryValidator.getOffset();
+            const limit = queryValidator.getLimit();
+            const parsedQuery = queryValidator.getQuery();
+            // Emit the default event
+            yield this.emitSync("Store.Query", {
+                query,
+                parsedQuery,
+                store: this
+            });
+            const result = {
+                results: [],
+                continuationToken: undefined
+            };
+            /*
+              Offset are split in two with _
+        
+              MainOffset is the database offset, retrieving a page from the database
+              SubOffset is the offset within the page
+        
+              As we filter through the page, for additional filters or permissions, the page cut
+              by database does not endup being our final page cut, so we need a page offset to
+              abstract this completely
+             */
+            let [mainOffset, subOffset] = offset.split("_");
+            let secondOffset = parseInt(subOffset || "0");
+            let duration = Date.now();
+            this.metrics.query++;
+            while (result.results.length < limit) {
+                let tmpResults = yield this.find(Object.assign(Object.assign({}, parsedQuery), { continuationToken: mainOffset }));
+                // If no filter is returned assume it is by mistake and apply filtering
+                if (tmpResults.filter === undefined) {
+                    tmpResults.filter = queryValidator.getExpression();
+                    this.log("WARN", `Store '${this.getName()}' postquery full filtering`);
+                }
+                let subOffsetCount = 0;
+                for (let item of tmpResults.results) {
+                    // Because of dynamic filter and permission we need to suboffset the pagination
+                    subOffsetCount++;
+                    if (subOffsetCount <= secondOffset) {
+                        continue;
+                    }
+                    if (tmpResults.filter !== true && !tmpResults.filter.eval(item)) {
+                        continue;
+                    }
+                    if (context) {
+                        try {
+                            yield item.canAct(context, "get");
+                        }
+                        catch (err) {
+                            continue;
+                        }
+                    }
+                    result.results.push(item);
+                    if (result.results.length >= limit) {
+                        if (subOffsetCount === tmpResults.results.length) {
+                            result.continuationToken = tmpResults.continuationToken;
+                        }
+                        else {
+                            result.continuationToken = `${mainOffset}_${subOffsetCount}`;
+                        }
+                        break;
+                    }
+                }
+                // Update both offset
+                mainOffset = tmpResults.continuationToken;
+                // Fresh new query so we do not need to skip
+                secondOffset = 0;
+                if (mainOffset === undefined || result.results.length >= limit) {
+                    break;
+                }
+            }
+            duration = Date.now() - duration;
+            this.metrics.queryDuration =
+                (this.metrics.queryDuration * (this.metrics.query - 1) + duration) / this.metrics.query;
+            if (duration > this.parameters.slowQueryThreshold) {
+                this.logSlowQuery(query, "", duration);
+            }
+            yield this.emitSync("Store.Queried", {
+                query,
+                parsedQuery: parsedQuery,
+                store: this,
+                continuationToken: result.continuationToken,
+                results: result.results
+            });
+            return result;
+        });
+    }
+    /**
+     * Expose query to http
+     */
+    httpQuery(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let query;
+            if (ctx.getHttpContext().getMethod() === "GET") {
+                query = ctx.getParameters().q;
+            }
+            else {
+                query = ctx.getRequestBody().q;
+            }
+            try {
+                ctx.write(yield this.query(query, ctx));
+            }
+            catch (err) {
+                if (err instanceof SyntaxError) {
+                    this.log("INFO", "Query syntax error");
+                    throw 400;
+                }
+                throw err;
+            }
+        });
+    }
     /**
      * Save an object
      *
@@ -379,12 +628,12 @@ class Store extends service_1.Service {
      * Might want to rename to create
      */
     save(object, ctx = undefined) {
-        var _a;
-        var _b;
+        var _a, _b;
+        var _c;
         return __awaiter(this, void 0, void 0, function* () {
             object = this.initModel(object);
             // Dates should be store by the Store
-            (_a = object[_b = this._creationDateField]) !== null && _a !== void 0 ? _a : (object[_b] = new Date());
+            (_a = object[_c = this._creationDateField]) !== null && _a !== void 0 ? _a : (object[_c] = new Date());
             object[this._lastUpdateField] = new Date();
             if (ctx) {
                 object.setContext(ctx);
@@ -395,7 +644,9 @@ class Store extends service_1.Service {
             });
             // Handle object auto listener
             yield object._onSave();
+            this.metrics.save++;
             let res = yield this._save(object);
+            yield ((_b = this._cacheStore) === null || _b === void 0 ? void 0 : _b._save(object));
             object = this.initModel(res);
             yield this.emitSync("Store.Saved", {
                 object: object,
@@ -462,6 +713,9 @@ class Store extends service_1.Service {
      */
     simulateUpsertItemToCollection(model, prop, item, updateDate, index, itemWriteCondition, itemWriteConditionField) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (prop === "__proto__") {
+                throw new Error("Cannot update __proto__: js/prototype-polluting-assignment");
+            }
             this.checkCollectionUpdateCondition(model, prop, itemWriteConditionField, itemWriteCondition, index);
             if (index === undefined) {
                 if (model[prop] === undefined) {
@@ -486,6 +740,7 @@ class Store extends service_1.Service {
      * @return {Promise} with saved object
      */
     update(object, reverseMap = true, partial = false) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             /** @ignore */
             var saved;
@@ -498,12 +753,12 @@ class Store extends service_1.Service {
                     }
                 }
             }
-            let partialEvent = partial ? "Patch" : "";
             if (Object.keys(object).length < 2) {
                 return {};
             }
             object[this._lastUpdateField] = new Date();
-            let load = yield this._get(object[this._uuidField], true);
+            this.metrics.get++;
+            let load = yield this._getFromCache(object[this._uuidField], true);
             if (load.__type !== this._model.name && this.parameters.strict) {
                 this.log("WARN", `Object '${object[this._uuidField]}' was not created by this store`);
                 throw new StoreNotFoundError(object[this._uuidField], this.getName());
@@ -512,15 +767,26 @@ class Store extends service_1.Service {
             if (object instanceof coremodel_1.CoreModel) {
                 loaded.setContext(object.getContext());
             }
-            yield this.emitSync(`Store.${partialEvent}Update`, {
-                object: loaded,
-                store: this,
-                update: object
-            });
+            if (partial) {
+                yield this.emitSync(`Store.PatchUpdate`, {
+                    object: loaded,
+                    store: this,
+                    update: object
+                });
+            }
+            else {
+                yield this.emitSync(`Store.Update`, {
+                    object: loaded,
+                    store: this,
+                    update: object
+                });
+            }
             yield loaded._onUpdate(object);
             let res;
             if (partial) {
+                this.metrics.partialUpdate++;
                 yield this._patch(object, object[this._uuidField], load[this._lastUpdateField], this._lastUpdateField);
+                yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._patch(object, object[this._uuidField], load[this._lastUpdateField], this._lastUpdateField));
                 res = object;
             }
             else {
@@ -528,7 +794,9 @@ class Store extends service_1.Service {
                 for (let i in this._reverseMap) {
                     object[this._reverseMap[i].property] = loaded[this._reverseMap[i].property];
                 }
+                this.metrics.update++;
                 res = yield this._update(object, object[this._uuidField], load[this._lastUpdateField], this._lastUpdateField);
+                yield ((_b = this._cacheStore) === null || _b === void 0 ? void 0 : _b._update(object, object[this._uuidField], load[this._lastUpdateField], this._lastUpdateField));
             }
             // Return updated
             for (let i in res) {
@@ -538,10 +806,18 @@ class Store extends service_1.Service {
                 loaded[i] = object[i];
             }
             saved = this.initModel(loaded);
-            yield this.emitSync(`Store.${partialEvent}Updated`, {
-                object: saved,
-                store: this
-            });
+            if (partial) {
+                yield this.emitSync(`Store.PatchUpdated`, {
+                    object: saved,
+                    store: this
+                });
+            }
+            else {
+                yield this.emitSync(`Store.Updated`, {
+                    object: saved,
+                    store: this
+                });
+            }
             yield saved._onUpdated();
             return saved;
         });
@@ -554,8 +830,11 @@ class Store extends service_1.Service {
      * @returns
      */
     removeAttribute(uuid, attribute, itemWriteCondition, itemWriteConditionField) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            this.metrics.attributeDelete++;
             yield this._removeAttribute(uuid, attribute, itemWriteCondition, itemWriteConditionField);
+            yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._removeAttribute(uuid, attribute, itemWriteCondition, itemWriteConditionField));
             yield this.emitSync("Store.PartialUpdated", {
                 object_id: uuid,
                 partial_update: {
@@ -571,7 +850,7 @@ class Store extends service_1.Service {
      * @param uuid
      * @returns
      */
-    cascadeDelete(obj, uuid) {
+    cascadeDelete(obj, _uuid) {
         return __awaiter(this, void 0, void 0, function* () {
             // We dont need uuid but Binary store will need it
             return this.delete(obj.getUuid());
@@ -595,6 +874,7 @@ class Store extends service_1.Service {
      * @return {Promise} the deletion promise
      */
     delete(uid, writeCondition, writeConditionField, sync = false) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             /** @ignore */
             let to_delete;
@@ -603,7 +883,8 @@ class Store extends service_1.Service {
                 to_delete = uid;
             }
             else {
-                to_delete = yield this._get(uid);
+                this.metrics.get++;
+                to_delete = yield this._getFromCache(uid);
                 if (to_delete === undefined) {
                     return;
                 }
@@ -627,13 +908,19 @@ class Store extends service_1.Service {
             yield to_delete._onDelete();
             // If async we just tag the object as deleted
             if (this.parameters.asyncDelete && !sync) {
+                this.metrics.partialUpdate++;
                 yield this._patch({
                     __deleted: true
                 }, to_delete.getUuid());
+                yield ((_a = this._cacheStore) === null || _a === void 0 ? void 0 : _a._patch({
+                    __deleted: true
+                }, to_delete.getUuid()));
             }
             else {
+                this.metrics.delete++;
                 // Delete from the DB for real
                 yield this._delete(to_delete.getUuid(), writeCondition, writeConditionField);
+                yield ((_b = this._cacheStore) === null || _b === void 0 ? void 0 : _b._delete(to_delete.getUuid(), writeCondition, writeConditionField));
             }
             // Send post event
             yield this.emitSync("Store.Deleted", {
@@ -649,7 +936,7 @@ class Store extends service_1.Service {
      * @param id
      * @param callback
      */
-    canTriggerConfiguration(id, callback) {
+    canTriggerConfiguration(_id, _callback) {
         return false;
     }
     /**
@@ -659,7 +946,8 @@ class Store extends service_1.Service {
      */
     getConfiguration(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            let object = yield this._get(id);
+            this.metrics.get++;
+            let object = yield this._getFromCache(id);
             if (!object) {
                 return undefined;
             }
@@ -685,7 +973,8 @@ class Store extends service_1.Service {
             if (!uid) {
                 return undefined;
             }
-            let object = yield this._get(uid);
+            this.metrics.get++;
+            let object = yield this._getFromCache(uid);
             if (!object) {
                 return undefined;
             }
@@ -722,31 +1011,62 @@ class Store extends service_1.Service {
         });
     }
     /**
-     * Search inside the store
-     *
-     * Still need to define a good abstraction for it
-     *
-     * @param request
-     * @param offset
-     * @param limit
-     * @returns
+     * @override
      */
-    find(request = undefined, offset = 0, limit = undefined) {
+    simulateFind(query, uuids) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.emitSync("Store.Find", {
-                request: request,
-                store: this,
-                offset: offset,
-                limit: limit
-            });
-            let result = yield this._find(request, offset, limit);
-            yield this.emitSync("Store.Found", {
-                request: request,
-                store: this,
-                offset: offset,
-                limit: limit,
-                results: result
-            });
+            let result = {
+                results: [],
+                continuationToken: undefined,
+                filter: true
+            };
+            let count = 0;
+            let limit = query.limit;
+            let offset = parseInt(query.continuationToken || "0");
+            let originalOffset = offset;
+            if (query.orderBy && query.orderBy.length) {
+                offset = 0;
+                limit = Number.MAX_SAFE_INTEGER;
+            }
+            // Need to transfert to Array
+            for (let uuid of uuids) {
+                count++;
+                // Offset start
+                if (offset >= count) {
+                    continue;
+                }
+                let obj = yield this._getFromCache(uuid);
+                if (obj && query.filter.eval(obj)) {
+                    result.results.push(obj);
+                    if (result.results.length >= limit) {
+                        result.continuationToken = count.toString();
+                        return result;
+                    }
+                }
+            }
+            if (query.orderBy && query.orderBy.length) {
+                result.results = result.results
+                    .sort((a, b) => {
+                    let valA, valB;
+                    for (let orderBy of query.orderBy) {
+                        let invert = orderBy.direction === "ASC" ? 1 : -1;
+                        valA = query_1.WebdaQL.ComparisonExpression.getAttributeValue(a, orderBy.field.split("."));
+                        valB = query_1.WebdaQL.ComparisonExpression.getAttributeValue(b, orderBy.field.split("."));
+                        if (valA === valB) {
+                            continue;
+                        }
+                        if (typeof valA === "string") {
+                            return valA.localeCompare(valB) * invert;
+                        }
+                        return (valA < valB ? -1 : 1) * invert;
+                    }
+                    return -1;
+                })
+                    .slice(originalOffset, query.limit + originalOffset);
+                if (result.results.length >= query.limit) {
+                    result.continuationToken = (query.limit + originalOffset).toString();
+                }
+            }
             return result;
         });
     }
@@ -763,7 +1083,7 @@ class Store extends service_1.Service {
             object[this._creationDateField] = new Date();
             yield object.canAct(ctx, "create");
             try {
-                yield object.validate(ctx);
+                yield object.validate(ctx, body);
             }
             catch (err) {
                 this.log("INFO", "Object is not valid", err);
@@ -861,12 +1181,11 @@ class Store extends service_1.Service {
                 }
                 let updateObject = new this._model();
                 // Clean any default attributes from the model
-                for (let i in updateObject) {
-                    if (i.startsWith("__")) {
-                        continue;
-                    }
+                Object.keys(updateObject)
+                    .filter(i => i !== "__class")
+                    .forEach(i => {
                     delete updateObject[i];
-                }
+                });
                 updateObject.setContext(ctx);
                 updateObject.load(body);
                 yield this.patch(updateObject);
@@ -876,13 +1195,13 @@ class Store extends service_1.Service {
                 let updateObject = new this._model();
                 updateObject.load(body);
                 // Copy back the _ attributes
-                for (let i in object) {
-                    if (i.startsWith("_")) {
-                        updateObject[i] = object[i];
-                    }
-                }
+                Object.keys(object)
+                    .filter(i => i.startsWith("_"))
+                    .forEach(i => {
+                    updateObject[i] = object[i];
+                });
                 try {
-                    yield updateObject.validate(ctx);
+                    yield updateObject.validate(ctx, body);
                 }
                 catch (err) {
                     this.log("INFO", "Object invalid", err);