ar_sync 1.0.5 → 1.1.1

data/core/ArSyncStore.js

@@ -32,51 +32,55 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var ArSyncApi_1 = require("./ArSyncApi");
-var ModelBatchRequest = {
-    timer: null,
-    apiRequests: {},
-    fetch: function (api, query, id) {
+var ModelBatchRequest = /** @class */ (function () {
+    function ModelBatchRequest() {
+        this.timer = null;
+        this.apiRequests = new Map();
+    }
+    ModelBatchRequest.prototype.fetch = function (api, query, id) {
         var _this = this;
         this.setTimer();
-        return new Promise(function (resolve) {
+        return new Promise(function (resolve, reject) {
             var queryJSON = JSON.stringify(query);
-            var apiRequest = _this.apiRequests[api] = _this.apiRequests[api] || {};
-            var queryRequests = apiRequest[queryJSON] = apiRequest[queryJSON] || { query: query, requests: {} };
-            var request = queryRequests.requests[id] = queryRequests.requests[id] || { id: id, callbacks: [] };
-            request.callbacks.push(resolve);
+            var apiRequest = _this.apiRequests.get(api);
+            if (!apiRequest)
+                _this.apiRequests.set(api, apiRequest = new Map());
+            var queryRequests = apiRequest.get(queryJSON);
+            if (!queryRequests)
+                apiRequest.set(queryJSON, queryRequests = { query: query, requests: new Map() });
+            var request = queryRequests.requests.get(id);
+            if (!request)
+                queryRequests.requests.set(id, request = { id: id, callbacks: [] });
+            request.callbacks.push({ resolve: resolve, reject: reject });
         });
-    },
-    batchFetch: function () {
-        var apiRequests = this.apiRequests;
-        for (var api in apiRequests) {
-            var apiRequest = apiRequests[api];
-            var _loop_1 = function (query, requests) {
-                var ids = Object.values(requests).map(function (_a) {
-                    var id = _a.id;
-                    return id;
-                });
+    };
+    ModelBatchRequest.prototype.batchFetch = function () {
+        this.apiRequests.forEach(function (apiRequest, api) {
+            apiRequest.forEach(function (_a) {
+                var query = _a.query, requests = _a.requests;
+                var ids = Array.from(requests.keys());
                 ArSyncApi_1.default.syncFetch({ api: api, query: query, params: { ids: ids } }).then(function (models) {
                     for (var _i = 0, models_1 = models; _i < models_1.length; _i++) {
                         var model = models_1[_i];
-                        requests[model.id].model = model;
-                    }
-                    for (var _a = 0, _b = Object.values(requests); _a < _b.length; _a++) {
-                        var _c = _b[_a], model = _c.model, callbacks = _c.callbacks;
-                        for (var _d = 0, callbacks_1 = callbacks; _d < callbacks_1.length; _d++) {
-                            var callback = callbacks_1[_d];
-                            callback(model);
-                        }
+                        var req = requests.get(model.id);
+                        if (req)
+                            req.model = model;
                     }
+                    requests.forEach(function (_a) {
+                        var model = _a.model, callbacks = _a.callbacks;
+                        callbacks.forEach(function (cb) { return cb.resolve(model); });
+                    });
+                }).catch(function (e) {
+                    requests.forEach(function (_a) {
+                        var callbacks = _a.callbacks;
+                        callbacks.forEach(function (cb) { return cb.reject(e); });
+                    });
                 });
-            };
-            for (var _i = 0, _a = Object.values(apiRequest); _i < _a.length; _i++) {
-                var _b = _a[_i], query = _b.query, requests = _b.requests;
-                _loop_1(query, requests);
-            }
-        }
-        this.apiRequests = {};
-    },
-    setTimer: function () {
+            });
+        });
+        this.apiRequests.clear();
+    };
+    ModelBatchRequest.prototype.setTimer = function () {
         var _this = this;
         if (this.timer)
             return;
@@ -84,8 +88,10 @@ var ModelBatchRequest = {
             _this.timer = null;
             _this.batchFetch();
         }, 20);
-    }
-};
+    };
+    return ModelBatchRequest;
+}());
+var modelBatchRequest = new ModelBatchRequest;
 var ArSyncContainerBase = /** @class */ (function () {
     function ArSyncContainerBase() {
         this.listeners = [];
@@ -94,9 +100,14 @@ var ArSyncContainerBase = /** @class */ (function () {
     ArSyncContainerBase.prototype.initForReload = function (request) {
         var _this = this;
         this.networkSubscriber = ArSyncStore.connectionManager.subscribeNetwork(function (state) {
-            if (state) {
-                ArSyncApi_1.default.syncFetch(request).then(function (data) {
-                    if (_this.data) {
+            if (!state) {
+                if (_this.onConnectionChange)
+                    _this.onConnectionChange(false);
+                return;
+            }
+            if (request.id != null) {
+                modelBatchRequest.fetch(request.api, request.query, request.id).then(function (data) {
+                    if (_this.data && data) {
                         _this.replaceData(data);
                         if (_this.onConnectionChange)
                             _this.onConnectionChange(true);
@@ -106,8 +117,17 @@ var ArSyncContainerBase = /** @class */ (function () {
                 });
             }
             else {
-                if (_this.onConnectionChange)
-                    _this.onConnectionChange(false);
+                ArSyncApi_1.default.syncFetch(request).then(function (data) {
+                    if (_this.data && data) {
+                        _this.replaceData(data);
+                        if (_this.onConnectionChange)
+                            _this.onConnectionChange(true);
+                        if (_this.onChange)
+                            _this.onChange([], _this.data);
+                    }
+                }).catch(function (e) {
+                    console.error("failed to reload. " + e);
+                });
             }
         });
     };
@@ -136,7 +156,7 @@ var ArSyncContainerBase = /** @class */ (function () {
         }
         this.listeners = [];
     };
-    ArSyncContainerBase.compactQuery = function (query) {
+    ArSyncContainerBase.compactQueryAttributes = function (query) {
         function compactAttributes(attributes) {
             var attrs = {};
             var keys = [];
@@ -154,7 +174,7 @@ var ArSyncContainerBase = /** @class */ (function () {
                     return [true, false];
                 if (keys.length === 1)
                     return [keys[0], false];
-                return [keys];
+                return [keys, false];
             }
             var needsEscape = attrs['attributes'] || attrs['params'] || attrs['as'];
             if (keys.length === 0)
@@ -180,13 +200,10 @@ var ArSyncContainerBase = /** @class */ (function () {
                 result.attributes = attributes;
             return result;
         }
-        try {
-            var result = compactQuery(query);
-            return result === true ? {} : result;
-        }
-        catch (e) {
-            throw JSON.stringify(query) + e.stack;
-        }
+        var result = compactQuery(query);
+        if (typeof result === 'object' && 'attributes' in result)
+            return result.attributes;
+        return result === true ? {} : result;
     };
     ArSyncContainerBase.parseQuery = function (query, attrsonly) {
         var attributes = {};
@@ -232,14 +249,22 @@ var ArSyncContainerBase = /** @class */ (function () {
     ArSyncContainerBase._load = function (_a, root) {
         var api = _a.api, id = _a.id, params = _a.params, query = _a.query;
         var parsedQuery = ArSyncRecord.parseQuery(query);
-        var compactQuery = ArSyncRecord.compactQuery(parsedQuery);
-        if (id) {
-            return ModelBatchRequest.fetch(api, compactQuery, id).then(function (data) { return new ArSyncRecord(parsedQuery, data, null, root); });
+        var compactQueryAttributes = ArSyncRecord.compactQueryAttributes(parsedQuery);
+        if (id != null) {
+            return modelBatchRequest.fetch(api, compactQueryAttributes, id).then(function (data) {
+                if (!data)
+                    throw { retry: false };
+                var request = { api: api, id: id, query: compactQueryAttributes };
+                return new ArSyncRecord(parsedQuery, data, request, root);
+            });
         }
         else {
-            var request_1 = { api: api, query: compactQuery, params: params };
+            var request_1 = { api: api, query: compactQueryAttributes, params: params };
             return ArSyncApi_1.default.syncFetch(request_1).then(function (response) {
-                if (response.collection && response.order) {
+                if (!response) {
+                    throw { retry: false };
+                }
+                else if (response.collection && response.order) {
                     return new ArSyncCollection(response.sync_keys, 'collection', parsedQuery, response, request_1, root);
                 }
                 else if (response instanceof Array) {
@@ -278,16 +303,14 @@ var ArSyncRecord = /** @class */ (function (_super) {
         if (request)
             _this.initForReload(request);
         _this.query = query;
+        _this.queryAttributes = query.attributes || {};
         _this.data = {};
         _this.children = {};
         _this.replaceData(data);
         return _this;
     }
     ArSyncRecord.prototype.setSyncKeys = function (sync_keys) {
-        this.sync_keys = sync_keys;
-        if (!this.sync_keys) {
-            this.sync_keys = [];
-        }
+        this.sync_keys = sync_keys !== null && sync_keys !== void 0 ? sync_keys : [];
     };
     ArSyncRecord.prototype.replaceData = function (data) {
         this.setSyncKeys(data.sync_keys);
@@ -297,8 +320,8 @@ var ArSyncRecord = /** @class */ (function (_super) {
             this.data.id = data.id;
         }
         this.paths = [];
-        for (var key in this.query.attributes) {
-            var subQuery = this.query.attributes[key];
+        for (var key in this.queryAttributes) {
+            var subQuery = this.queryAttributes[key];
             var aliasName = subQuery.as || key;
             var subData = data[aliasName];
             var child = this.children[aliasName];
@@ -345,9 +368,9 @@ var ArSyncRecord = /** @class */ (function (_super) {
                 }
             }
         }
-        if (this.query.attributes['*']) {
+        if (this.queryAttributes['*']) {
             for (var key in data) {
-                if (!this.query.attributes[key] && this.data[key] !== data[key]) {
+                if (!this.queryAttributes[key] && this.data[key] !== data[key]) {
                     this.mark();
                     this.data[key] = data[key];
                 }
@@ -357,8 +380,8 @@ var ArSyncRecord = /** @class */ (function (_super) {
     };
     ArSyncRecord.prototype.onNotify = function (notifyData, path) {
         var _this = this;
-        var action = notifyData.action, class_name = notifyData.class_name, id = notifyData.id;
-        var query = path && this.query.attributes[path];
+        var action = notifyData.action, className = notifyData.class_name, id = notifyData.id;
+        var query = path && this.queryAttributes[path];
         var aliasName = (query && query.as) || path;
         if (action === 'remove') {
             var child = this.children[aliasName];
@@ -372,7 +395,7 @@ var ArSyncRecord = /** @class */ (function (_super) {
         else if (action === 'add') {
             if (this.data[aliasName] && this.data[aliasName].id === id)
                 return;
-            ModelBatchRequest.fetch(class_name, ArSyncRecord.compactQuery(query), id).then(function (data) {
+            modelBatchRequest.fetch(className, ArSyncRecord.compactQueryAttributes(query), id).then(function (data) {
                 if (!data || !_this.data)
                     return;
                 var model = new ArSyncRecord(query, data, null, _this.root);
@@ -385,16 +408,21 @@ var ArSyncRecord = /** @class */ (function (_super) {
                 model.parentModel = _this;
                 model.parentKey = aliasName;
                 _this.onChange([aliasName], model.data);
+            }).catch(function (e) {
+                console.error("failed to load " + className + ":" + id + " " + e);
             });
         }
         else {
             var field = notifyData.field;
             var query_2 = field ? this.patchQuery(field) : this.reloadQuery();
-            if (query_2)
-                ModelBatchRequest.fetch(class_name, query_2, id).then(function (data) {
-                    if (_this.data)
-                        _this.update(data);
-                });
+            if (!query_2)
+                return;
+            modelBatchRequest.fetch(className, query_2, id).then(function (data) {
+                if (_this.data)
+                    _this.update(data);
+            }).catch(function (e) {
+                console.error("failed to load patch " + className + ":" + id + " " + e);
+            });
         }
     };
     ArSyncRecord.prototype.subscribeAll = function () {
@@ -404,7 +432,7 @@ var ArSyncRecord = /** @class */ (function (_super) {
             var key = _a[_i];
             this.subscribe(key, callback);
         }
-        var _loop_2 = function (path) {
+        var _loop_1 = function (path) {
             var pathCallback = function (data) { return _this.onNotify(data, path); };
             for (var _i = 0, _a = this_1.sync_keys; _i < _a.length; _i++) {
                 var key = _a[_i];
@@ -414,48 +442,38 @@ var ArSyncRecord = /** @class */ (function (_super) {
         var this_1 = this;
         for (var _b = 0, _c = this.paths; _b < _c.length; _b++) {
             var path = _c[_b];
-            _loop_2(path);
+            _loop_1(path);
         }
     };
     ArSyncRecord.prototype.patchQuery = function (key) {
-        var val = this.query.attributes[key];
-        if (!val)
-            return;
-        var attributes = val.attributes, as = val.as, params = val.params;
-        if (attributes && Object.keys(val.attributes).length === 0)
-            attributes = null;
-        if (!attributes && !as && !params)
-            return key;
-        var result = {};
-        if (attributes)
-            result.attributes = attributes;
-        if (as)
-            result.as = as;
-        if (params)
-            result.params = params;
-        return result;
+        var _a;
+        var subQuery = this.queryAttributes[key];
+        if (subQuery)
+            return _a = {}, _a[key] = subQuery, _a;
     };
     ArSyncRecord.prototype.reloadQuery = function () {
-        var _a;
         if (this.reloadQueryCache)
             return this.reloadQueryCache;
-        var reloadQuery = this.reloadQueryCache = { attributes: [] };
-        for (var key in this.query.attributes) {
+        var arrayQuery = [];
+        var hashQuery = {};
+        for (var key in this.queryAttributes) {
             if (key === 'sync_keys')
                 continue;
-            var val = this.query.attributes[key];
+            var val = this.queryAttributes[key];
             if (!val || !val.attributes) {
-                reloadQuery.attributes.push(key);
+                arrayQuery === null || arrayQuery === void 0 ? void 0 : arrayQuery.push(key);
+                hashQuery[key] = true;
             }
             else if (!val.params && Object.keys(val.attributes).length === 0) {
-                reloadQuery.attributes.push((_a = {}, _a[key] = val, _a));
+                arrayQuery = null;
+                hashQuery[key] = val;
             }
         }
-        return reloadQuery;
+        return this.reloadQueryCache = arrayQuery || hashQuery;
     };
     ArSyncRecord.prototype.update = function (data) {
         for (var key in data) {
-            var subQuery = this.query.attributes[key];
+            var subQuery = this.queryAttributes[key];
             if (subQuery && subQuery.attributes && Object.keys(subQuery.attributes).length > 0)
                 continue;
             if (this.data[key] === data[key])
@@ -483,42 +501,39 @@ var ArSyncCollection = /** @class */ (function (_super) {
     __extends(ArSyncCollection, _super);
     function ArSyncCollection(sync_keys, path, query, data, request, root) {
         var _this = _super.call(this) || this;
-        _this.order = { limit: null, mode: 'asc', key: 'id' };
+        _this.ordering = { orderBy: 'id', direction: 'asc' };
         _this.aliasOrderKey = 'id';
         _this.root = root;
         _this.path = path;
         _this.query = query;
-        _this.compactQuery = ArSyncRecord.compactQuery(query);
+        _this.queryAttributes = query.attributes || {};
+        _this.compactQueryAttributes = ArSyncRecord.compactQueryAttributes(query);
         if (request)
             _this.initForReload(request);
-        if (query.params && (query.params.order || query.params.limit)) {
-            _this.setOrdering(query.params.limit, query.params.order);
+        if (query.params) {
+            _this.setOrdering(query.params);
         }
         _this.data = [];
         _this.children = [];
         _this.replaceData(data, sync_keys);
         return _this;
     }
-    ArSyncCollection.prototype.setOrdering = function (limit, order) {
-        var mode = 'asc';
-        var key = 'id';
-        if (order === 'asc' || order === 'desc') {
-            mode = order;
-        }
-        else if (typeof order === 'object' && order) {
-            var keys = Object.keys(order);
-            if (keys.length > 1)
-                throw 'multiple order keys are not supported';
-            if (keys.length === 1)
-                key = keys[0];
-            mode = order[key] === 'asc' ? 'asc' : 'desc';
-        }
-        var limitNumber = (typeof limit === 'number') ? limit : null;
-        if (limitNumber !== null && key !== 'id')
-            throw 'limit with custom order key is not supported';
-        var subQuery = this.query.attributes[key];
-        this.aliasOrderKey = (subQuery && subQuery.as) || key;
-        this.order = { limit: limitNumber, mode: mode, key: key };
+    ArSyncCollection.prototype.setOrdering = function (ordering) {
+        var direction = 'asc';
+        var orderBy = 'id';
+        var first = undefined;
+        var last = undefined;
+        if (ordering.direction === 'desc')
+            direction = ordering.direction;
+        if (typeof ordering.orderBy === 'string')
+            orderBy = ordering.orderBy;
+        if (typeof ordering.first === 'number')
+            first = ordering.first;
+        if (typeof ordering.last === 'number')
+            last = ordering.last;
+        var subQuery = this.queryAttributes[orderBy];
+        this.aliasOrderKey = (subQuery && subQuery.as) || orderBy;
+        this.ordering = { first: first, last: last, direction: direction, orderBy: orderBy };
     };
     ArSyncCollection.prototype.setSyncKeys = function (sync_keys) {
         var _this = this;
@@ -531,31 +546,31 @@ var ArSyncCollection = /** @class */ (function (_super) {
     };
     ArSyncCollection.prototype.replaceData = function (data, sync_keys) {
         this.setSyncKeys(sync_keys);
-        var existings = {};
+        var existings = new Map();
         for (var _i = 0, _a = this.children; _i < _a.length; _i++) {
             var child = _a[_i];
-            existings[child.data.id] = child;
+            existings.set(child.data.id, child);
         }
         var collection;
-        if ('collection' in data && 'order' in data) {
-            collection = data.collection;
-            this.setOrdering(data.order.limit, data.order.mode);
+        if (Array.isArray(data)) {
+            collection = data;
         }
         else {
-            collection = data;
+            collection = data.collection;
+            this.setOrdering(data.ordering);
         }
         var newChildren = [];
         var newData = [];
         for (var _b = 0, collection_1 = collection; _b < collection_1.length; _b++) {
             var subData = collection_1[_b];
-            var model = null;
-            if (typeof (subData) === 'object' && subData && 'id' in subData)
-                model = existings[subData.id];
+            var model = undefined;
+            if (typeof (subData) === 'object' && subData && 'sync_keys' in subData)
+                model = existings.get(subData.id);
             var data_1 = subData;
             if (model) {
                 model.replaceData(subData);
             }
-            else if (subData.id) {
+            else if (subData.sync_keys) {
                 model = new ArSyncRecord(this.query, subData, null, this.root);
                 model.parentModel = this;
                 model.parentKey = subData.id;
@@ -568,7 +583,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
         }
         while (this.children.length) {
             var child = this.children.pop();
-            if (!existings[child.data.id])
+            if (!existings.has(child.data.id))
                 child.release();
         }
         if (this.data.length || newChildren.length)
@@ -587,63 +602,94 @@ var ArSyncCollection = /** @class */ (function (_super) {
     };
     ArSyncCollection.prototype.consumeAdd = function (className, id) {
         var _this = this;
+        var _a = this.ordering, first = _a.first, last = _a.last, direction = _a.direction;
+        var limit = first || last;
         if (this.data.findIndex(function (a) { return a.id === id; }) >= 0)
             return;
-        if (this.order.limit === this.data.length) {
-            if (this.order.mode === 'asc') {
-                var last = this.data[this.data.length - 1];
-                if (last && last.id < id)
-                    return;
+        if (limit && limit <= this.data.length) {
+            var lastItem = this.data[this.data.length - 1];
+            var firstItem = this.data[0];
+            if (direction === 'asc') {
+                if (first) {
+                    if (lastItem && lastItem.id < id)
+                        return;
+                }
+                else {
+                    if (firstItem && id < firstItem.id)
+                        return;
+                }
             }
             else {
-                var last = this.data[this.data.length - 1];
-                if (last && last.id > id)
-                    return;
+                if (first) {
+                    if (lastItem && id < lastItem.id)
+                        return;
+                }
+                else {
+                    if (firstItem && firstItem.id < id)
+                        return;
+                }
             }
         }
-        ModelBatchRequest.fetch(className, this.compactQuery, id).then(function (data) {
+        modelBatchRequest.fetch(className, this.compactQueryAttributes, id).then(function (data) {
             if (!data || !_this.data)
                 return;
             var model = new ArSyncRecord(_this.query, data, null, _this.root);
             model.parentModel = _this;
             model.parentKey = id;
-            var overflow = _this.order.limit && _this.order.limit === _this.data.length;
+            var overflow = limit && limit <= _this.data.length;
             var rmodel;
             _this.mark();
             var orderKey = _this.aliasOrderKey;
-            if (_this.order.mode === 'asc') {
-                var last = _this.data[_this.data.length - 1];
-                _this.children.push(model);
-                _this.data.push(model.data);
-                if (last && last[orderKey] > data[orderKey])
-                    _this.markAndSort();
-                if (overflow) {
-                    rmodel = _this.children.shift();
-                    rmodel.release();
-                    _this.data.shift();
+            var firstItem = _this.data[0];
+            var lastItem = _this.data[_this.data.length - 1];
+            if (direction === 'asc') {
+                if (firstItem && data[orderKey] < firstItem[orderKey]) {
+                    _this.children.unshift(model);
+                    _this.data.unshift(model.data);
+                }
+                else {
+                    var skipSort = lastItem && lastItem[orderKey] < data[orderKey];
+                    _this.children.push(model);
+                    _this.data.push(model.data);
+                    if (!skipSort)
+                        _this.markAndSort();
                 }
             }
             else {
-                var first = _this.data[0];
-                _this.children.unshift(model);
-                _this.data.unshift(model.data);
-                if (first && first[orderKey] > data[orderKey])
-                    _this.markAndSort();
-                if (overflow) {
+                if (firstItem && data[orderKey] > firstItem[orderKey]) {
+                    _this.children.unshift(model);
+                    _this.data.unshift(model.data);
+                }
+                else {
+                    var skipSort = lastItem && lastItem[orderKey] > data[orderKey];
+                    _this.children.push(model);
+                    _this.data.push(model.data);
+                    if (!skipSort)
+                        _this.markAndSort();
+                }
+            }
+            if (overflow) {
+                if (first) {
                     rmodel = _this.children.pop();
-                    rmodel.release();
                     _this.data.pop();
                 }
+                else {
+                    rmodel = _this.children.shift();
+                    _this.data.shift();
+                }
+                rmodel.release();
             }
             _this.onChange([model.id], model.data);
             if (rmodel)
                 _this.onChange([rmodel.id], null);
+        }).catch(function (e) {
+            console.error("failed to load " + className + ":" + id + " " + e);
         });
     };
     ArSyncCollection.prototype.markAndSort = function () {
         this.mark();
         var orderKey = this.aliasOrderKey;
-        if (this.order.mode === 'asc') {
+        if (this.ordering.direction === 'asc') {
             this.children.sort(function (a, b) { return a.data[orderKey] < b.data[orderKey] ? -1 : +1; });
             this.data.sort(function (a, b) { return a[orderKey] < b[orderKey] ? -1 : +1; });
         }

data/core/ConnectionManager.d.ts

@@ -11,7 +11,7 @@ export default class ConnectionManager {
         unsubscribe: () => void;
     };
     subscribe(key: any, func: any): {
-        unsubscribe: () => void;
+        unsubscribe(): void;
     };
     connect(key: any): any;
     disconnect(key: any): void;

data/core/ConnectionManager.js

@@ -40,6 +40,8 @@ var ConnectionManager = /** @class */ (function () {
     };
     ConnectionManager.prototype.subscribe = function (key, func) {
         var _this = this;
+        if (!this.networkStatus)
+            return { unsubscribe: function () { } };
         var subscription = this.connect(key);
         var id = subscription.serial++;
         subscription.ref++;