ar_sync 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c13bb4ca3915637f310817c9b5c689c12c05f0140cfe2d982da653bc251bf7e
-  data.tar.gz: 447f9877703f3ba4cee8d590b6f63d91bc09486a86d2a709169ac245bcd592be
+  metadata.gz: '096573e72fb5d4dc465e79c9bf8b39617fb423d7d779534f4ce30768dda2b5b1'
+  data.tar.gz: c590f23a76420db7e056733ca895e56991cdcca8cfbd9908a503dc5ce57ab2f7
 SHA512:
-  metadata.gz: dd149d8f9b3ee83ba0e72cc0924bffdcaa9fc144c29a25b544ed9959f270ab65514fb7f18d0410ed1afc88d9db59b2b3f1c964b1005b6eae3057c2d4416d7174
-  data.tar.gz: c54c4e3b427c7f4bfec039bc4cacab491a413cc8e29a47307a4078e56266e7473c1171ed99bd5f3281b9afd509db298f293c9625250e040a7ef53f93c6d2f5ed
+  metadata.gz: 47d42249688cfef025fd2b9ea927d81962a786eded059a694ac5d069e7a0b0a48ca9bcc0d59a8d198bc4bb701cd86d4b98acc5c2c3de5b3018ac78f4b9487566
+  data.tar.gz: 88e61169ef8968905d8e9f341108f2c926ac23436ce30ad5e8f2ca7872a6e4e2644f24ff44769c5561589ba1954367325001675c2014b838053ccb6b1848ace9

data/.github/workflows/test.yml

@@ -5,13 +5,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
+        ruby: [ '3.1', '3.2', '3.3' ]
         gemfiles:
           - gemfiles/Gemfile-rails-6
-          - gemfiles/Gemfile-rails-7
+          - gemfiles/Gemfile-rails-7-0
+          - gemfiles/Gemfile-rails-7-1
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -7,7 +7,9 @@
 /spec/reports/
 /tmp/
 /test/*.sqlite3
+/test/*.sqlite3-*
 /test/generated_*
 .ruby-version
 /node_modules/
 tsconfig.tsbuildinfo
+Gemfile.lock

data/Gemfile

@@ -4,4 +4,5 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ar_sync.gemspec
 gemspec
+gem 'sqlite3', '~> 1.4'
 gem 'ar_serializer'

data/ar_sync.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord'
   spec.add_dependency 'ar_serializer'
-  %w[rake pry sqlite3 activerecord-import].each do |gem_name|
+  %w[rake sqlite3 activerecord-import].each do |gem_name|
     spec.add_development_dependency gem_name
   end
 end

data/bin/console

@@ -2,10 +2,10 @@
 
 require 'bundler/setup'
 require 'ar_sync'
-require 'pry'
+require 'irb'
 require_relative '../test/model'
 ArSync.on_notification do |events|
   puts "\e[1m#{events.inspect}\e[m"
 end
 
-Pry.start
+IRB.start

data/core/ArSyncModel.d.ts

@@ -1,9 +1,5 @@
+import { ArSyncStore, Request } from './ArSyncStore';
 import ConnectionAdapter from './ConnectionAdapter';
-interface Request {
-    api: string;
-    query: any;
-    params?: any;
-}
 declare type Path = Readonly<(string | number)[]>;
 interface Change {
     path: Path;
@@ -12,8 +8,14 @@ interface Change {
 declare type ChangeCallback = (change: Change) => void;
 declare type LoadCallback = () => void;
 declare type ConnectionCallback = (status: boolean) => void;
-declare type SubscriptionType = 'load' | 'change' | 'connection';
+declare type SubscriptionType = 'load' | 'change' | 'connection' | 'destroy';
 declare type SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback;
+declare type ArSyncModelRef = {
+    key: string;
+    count: number;
+    timer: number | null;
+    model: ArSyncStore;
+};
 declare type PathFirst<P extends Readonly<any[]>> = ((...args: P) => void) extends (first: infer First, ...other: any) => void ? First : never;
 declare type PathRest<U> = U extends Readonly<any[]> ? ((...args: U) => any) extends (head: any, ...args: infer T) => any ? U extends Readonly<[any, any, ...any[]]> ? T : never : never : never;
 declare type DigResult<Data, P extends Readonly<any[]>> = Data extends null | undefined ? Data : PathFirst<P> extends never ? Data : PathFirst<P> extends keyof Data ? (Data extends Readonly<any[]> ? undefined : never) | {
@@ -26,6 +28,7 @@ export default class ArSyncModel<T> {
     private _listeners;
     complete: boolean;
     notfound?: boolean;
+    destroyed: boolean;
     connected: boolean;
     data: T | null;
     static _cache: {
@@ -52,12 +55,7 @@ export default class ArSyncModel<T> {
     release(): void;
     static retrieveRef(request: Request, option?: {
         immutable: boolean;
-    }): {
-        key: string;
-        count: number;
-        timer: number | null;
-        model: any;
-    };
+    }): ArSyncModelRef;
     static _detach(ref: any): void;
     private static _attach;
     static setConnectionAdapter(adapter: ConnectionAdapter): void;

data/core/ArSyncModel.js

@@ -5,19 +5,22 @@ var ConnectionManager_1 = require("./ConnectionManager");
 var ArSyncModel = /** @class */ (function () {
     function ArSyncModel(request, option) {
         var _this = this;
+        this.complete = false;
+        this.destroyed = false;
         this._ref = ArSyncModel.retrieveRef(request, option);
         this._listenerSerial = 0;
         this._listeners = {};
-        this.complete = false;
-        this.connected = ArSyncStore_1.default.connectionManager.networkStatus;
+        this.connected = ArSyncStore_1.ArSyncStore.connectionManager.networkStatus;
         var setData = function () {
             _this.data = _this._ref.model.data;
             _this.complete = _this._ref.model.complete;
             _this.notfound = _this._ref.model.notfound;
+            _this.destroyed = _this._ref.model.destroyed;
         };
         setData();
         this.subscribe('load', setData);
         this.subscribe('change', setData);
+        this.subscribe('destroy', setData);
         this.subscribe('connection', function (status) {
             _this.connected = status;
         });
@@ -81,13 +84,12 @@ var ArSyncModel = /** @class */ (function () {
             this._listeners[id].unsubscribe();
         this._listeners = {};
         ArSyncModel._detach(this._ref);
-        this._ref = null;
     };
     ArSyncModel.retrieveRef = function (request, option) {
         var key = JSON.stringify([request, option]);
         var ref = this._cache[key];
         if (!ref) {
-            var model = new ArSyncStore_1.default(request, option);
+            var model = new ArSyncStore_1.ArSyncStore(request, option);
             ref = this._cache[key] = { key: key, count: 0, timer: null, model: model };
         }
         this._attach(ref);
@@ -116,7 +118,7 @@ var ArSyncModel = /** @class */ (function () {
             clearTimeout(ref.timer);
     };
     ArSyncModel.setConnectionAdapter = function (adapter) {
-        ArSyncStore_1.default.connectionManager = new ConnectionManager_1.default(adapter);
+        ArSyncStore_1.ArSyncStore.connectionManager = new ConnectionManager_1.default(adapter);
     };
     ArSyncModel.waitForLoad = function () {
         var models = [];

data/core/ArSyncStore.d.ts

@@ -1,20 +1,28 @@
-export default class ArSyncStore {
+export declare type Request = {
+    api: string;
+    query: any;
+    params?: any;
+    id?: any;
+};
+export declare class ArSyncStore {
     immutable: boolean;
     markedForFreezeObjects: any[];
     changes: any;
     eventListeners: any;
     markForRelease: true | undefined;
     container: any;
-    request: any;
+    request: Request;
     complete: boolean;
     notfound?: boolean;
+    destroyed: boolean;
     data: any;
     changesBufferTimer: number | undefined | null;
     retryLoadTimer: number | undefined | null;
     static connectionManager: any;
-    constructor(request: any, { immutable }?: {
+    constructor(request: Request, { immutable }?: {
         immutable?: boolean | undefined;
     });
+    handleDestroy(): void;
     load(retryCount: number): void;
     setChangesBufferTimer(): void;
     subscribe(event: any, callback: any): {

data/core/ArSyncStore.js

@@ -31,6 +31,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArSyncStore = void 0;
 var ArSyncApi_1 = require("./ArSyncApi");
 var ModelBatchRequest = /** @class */ (function () {
     function ModelBatchRequest() {
@@ -62,7 +63,7 @@ var ModelBatchRequest = /** @class */ (function () {
                 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];
-                        var req = requests.get(model.id);
+                        var req = requests.get(model._sync.id);
                         if (req)
                             req.model = model;
                     }
@@ -95,8 +96,9 @@ var modelBatchRequest = new ModelBatchRequest;
 var ArSyncContainerBase = /** @class */ (function () {
     function ArSyncContainerBase() {
         this.listeners = [];
+        this.parentModel = null;
     }
-    ArSyncContainerBase.prototype.replaceData = function (_data, _sync_keys) { };
+    ArSyncContainerBase.prototype.replaceData = function (_data, _parentSyncKeys) { };
     ArSyncContainerBase.prototype.initForReload = function (request) {
         var _this = this;
         this.networkSubscriber = ArSyncStore.connectionManager.subscribeNetwork(function (state) {
@@ -246,7 +248,7 @@ var ArSyncContainerBase = /** @class */ (function () {
             return attributes;
         return { attributes: attributes, as: column, params: params };
     };
-    ArSyncContainerBase._load = function (_a, root) {
+    ArSyncContainerBase.load = function (_a, root) {
         var api = _a.api, id = _a.id, params = _a.params, query = _a.query;
         var parsedQuery = ArSyncRecord.parseQuery(query);
         var compactQueryAttributes = ArSyncRecord.compactQueryAttributes(parsedQuery);
@@ -255,7 +257,7 @@ var ArSyncContainerBase = /** @class */ (function () {
                 if (!data)
                     throw { retry: false };
                 var request = { api: api, id: id, query: compactQueryAttributes };
-                return new ArSyncRecord(parsedQuery, data, request, root);
+                return new ArSyncRecord(parsedQuery, data, request, root, null, null);
             });
         }
         else {
@@ -264,41 +266,25 @@ var ArSyncContainerBase = /** @class */ (function () {
                 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.collection && response.order && response._sync) {
+                    return new ArSyncCollection(response._sync.keys, 'collection', parsedQuery, response, request_1, root, null, null);
                 }
                 else if (response instanceof Array) {
-                    return new ArSyncCollection([], '', parsedQuery, response, request_1, root);
+                    return new ArSyncCollection([], '', parsedQuery, response, request_1, root, null, null);
                 }
                 else {
-                    return new ArSyncRecord(parsedQuery, response, request_1, root);
+                    return new ArSyncRecord(parsedQuery, response, request_1, root, null, null);
                 }
             });
         }
     };
-    ArSyncContainerBase.load = function (apiParams, root) {
-        var _this = this;
-        if (!(apiParams instanceof Array))
-            return this._load(apiParams, root);
-        return new Promise(function (resolve, _reject) {
-            var resultModels = [];
-            var countdown = apiParams.length;
-            apiParams.forEach(function (param, i) {
-                _this._load(param, root).then(function (model) {
-                    resultModels[i] = model;
-                    countdown--;
-                    if (countdown === 0)
-                        resolve(resultModels);
-                });
-            });
-        });
-    };
     return ArSyncContainerBase;
 }());
 var ArSyncRecord = /** @class */ (function (_super) {
     __extends(ArSyncRecord, _super);
-    function ArSyncRecord(query, data, request, root) {
+    function ArSyncRecord(query, data, request, root, parentModel, parentKey) {
         var _this = _super.call(this) || this;
+        _this.fetching = new Set();
         _this.root = root;
         if (request)
             _this.initForReload(request);
@@ -306,54 +292,49 @@ var ArSyncRecord = /** @class */ (function (_super) {
         _this.queryAttributes = query.attributes || {};
         _this.data = {};
         _this.children = {};
+        _this.rootRecord = !parentModel;
+        _this.id = data._sync.id;
+        _this.syncKeys = data._sync.keys;
         _this.replaceData(data);
+        _this.parentModel = parentModel;
+        _this.parentKey = parentKey;
         return _this;
     }
-    ArSyncRecord.prototype.setSyncKeys = function (sync_keys) {
-        this.sync_keys = sync_keys !== null && sync_keys !== void 0 ? sync_keys : [];
-    };
     ArSyncRecord.prototype.replaceData = function (data) {
-        this.setSyncKeys(data.sync_keys);
+        this.id = data._sync.id;
+        this.syncKeys = data._sync.keys;
         this.unsubscribeAll();
-        if (this.data.id !== data.id) {
-            this.mark();
-            this.data.id = data.id;
-        }
         this.paths = [];
         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];
-            if (key === 'sync_keys')
+            if (key === '_sync')
                 continue;
-            if (subData instanceof Array || (subData && subData.collection && subData.order)) {
+            if (subData instanceof Array || (subData && subData.collection && subData.order && subData._sync)) {
                 if (child) {
-                    child.replaceData(subData, this.sync_keys);
+                    child.replaceData(subData, this.syncKeys);
                 }
                 else {
-                    var collection = new ArSyncCollection(this.sync_keys, key, subQuery, subData, null, this.root);
+                    var collection = new ArSyncCollection(this.syncKeys, key, subQuery, subData, null, this.root, this, aliasName);
                     this.mark();
                     this.children[aliasName] = collection;
                     this.data[aliasName] = collection.data;
-                    collection.parentModel = this;
-                    collection.parentKey = aliasName;
                 }
             }
             else {
                 if (subQuery.attributes && Object.keys(subQuery.attributes).length > 0)
                     this.paths.push(key);
-                if (subData && subData.sync_keys) {
+                if (subData && subData._sync) {
                     if (child) {
                         child.replaceData(subData);
                     }
                     else {
-                        var model = new ArSyncRecord(subQuery, subData, null, this.root);
+                        var model = new ArSyncRecord(subQuery, subData, null, this.root, this, aliasName);
                         this.mark();
                         this.children[aliasName] = model;
                         this.data[aliasName] = model.data;
-                        model.parentModel = this;
-                        model.parentKey = aliasName;
                     }
                 }
                 else {
@@ -370,6 +351,8 @@ var ArSyncRecord = /** @class */ (function (_super) {
         }
         if (this.queryAttributes['*']) {
             for (var key in data) {
+                if (key === '_sync')
+                    continue;
                 if (!this.queryAttributes[key] && this.data[key] !== data[key]) {
                     this.mark();
                     this.data[key] = data[key];
@@ -380,11 +363,12 @@ var ArSyncRecord = /** @class */ (function (_super) {
     };
     ArSyncRecord.prototype.onNotify = function (notifyData, path) {
         var _this = this;
-        var action = notifyData.action, className = notifyData.class_name, id = notifyData.id;
+        var action = notifyData.action, className = notifyData.class, id = notifyData.id;
         var query = path && this.queryAttributes[path];
         var aliasName = (query && query.as) || path;
         if (action === 'remove') {
             var child = this.children[aliasName];
+            this.fetching.delete(aliasName + ":" + id); // To cancel consumeAdd
             if (child)
                 child.release();
             this.children[aliasName] = null;
@@ -393,20 +377,25 @@ var ArSyncRecord = /** @class */ (function (_super) {
             this.onChange([aliasName], null);
         }
         else if (action === 'add') {
-            if (this.data[aliasName] && this.data[aliasName].id === id)
+            var child = this.children[aliasName];
+            if (child instanceof ArSyncRecord && child.id === id)
                 return;
+            var fetchKey_1 = aliasName + ":" + id;
+            this.fetching.add(fetchKey_1);
             modelBatchRequest.fetch(className, ArSyncRecord.compactQueryAttributes(query), id).then(function (data) {
+                // Record already removed
+                if (!_this.fetching.has(fetchKey_1))
+                    return;
+                _this.fetching.delete(fetchKey_1);
                 if (!data || !_this.data)
                     return;
-                var model = new ArSyncRecord(query, data, null, _this.root);
+                var model = new ArSyncRecord(query, data, null, _this.root, _this, aliasName);
                 var child = _this.children[aliasName];
                 if (child)
                     child.release();
                 _this.children[aliasName] = model;
                 _this.mark();
                 _this.data[aliasName] = model.data;
-                model.parentModel = _this;
-                model.parentKey = aliasName;
                 _this.onChange([aliasName], model.data);
             }).catch(function (e) {
                 console.error("failed to load " + className + ":" + id + " " + e);
@@ -428,13 +417,13 @@ var ArSyncRecord = /** @class */ (function (_super) {
     ArSyncRecord.prototype.subscribeAll = function () {
         var _this = this;
         var callback = function (data) { return _this.onNotify(data); };
-        for (var _i = 0, _a = this.sync_keys; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.syncKeys; _i < _a.length; _i++) {
             var key = _a[_i];
             this.subscribe(key, callback);
         }
         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++) {
+            for (var _i = 0, _a = this_1.syncKeys; _i < _a.length; _i++) {
                 var key = _a[_i];
                 this_1.subscribe(key + path, pathCallback);
             }
@@ -444,6 +433,11 @@ var ArSyncRecord = /** @class */ (function (_super) {
             var path = _c[_b];
             _loop_1(path);
         }
+        if (this.rootRecord) {
+            var key = this.syncKeys[0];
+            if (key)
+                this.subscribe(key + '_destroy', function () { return _this.root.handleDestroy(); });
+        }
     };
     ArSyncRecord.prototype.patchQuery = function (key) {
         var _a;
@@ -457,7 +451,7 @@ var ArSyncRecord = /** @class */ (function (_super) {
         var arrayQuery = [];
         var hashQuery = {};
         for (var key in this.queryAttributes) {
-            if (key === 'sync_keys')
+            if (key === '_sync')
                 continue;
             var val = this.queryAttributes[key];
             if (!val || !val.attributes) {
@@ -473,6 +467,8 @@ var ArSyncRecord = /** @class */ (function (_super) {
     };
     ArSyncRecord.prototype.update = function (data) {
         for (var key in data) {
+            if (key === '_sync')
+                continue;
             var subQuery = this.queryAttributes[key];
             if (subQuery && subQuery.attributes && Object.keys(subQuery.attributes).length > 0)
                 continue;
@@ -492,17 +488,18 @@ var ArSyncRecord = /** @class */ (function (_super) {
             return;
         this.data = __assign({}, this.data);
         this.root.mark(this.data);
-        if (this.parentModel)
+        if (this.parentModel && this.parentKey)
             this.parentModel.markAndSet(this.parentKey, this.data);
     };
     return ArSyncRecord;
 }(ArSyncContainerBase));
 var ArSyncCollection = /** @class */ (function (_super) {
     __extends(ArSyncCollection, _super);
-    function ArSyncCollection(sync_keys, path, query, data, request, root) {
+    function ArSyncCollection(parentSyncKeys, path, query, data, request, root, parentModel, parentKey) {
         var _this = _super.call(this) || this;
         _this.ordering = { orderBy: 'id', direction: 'asc' };
         _this.aliasOrderKey = 'id';
+        _this.fetching = new Set();
         _this.root = root;
         _this.path = path;
         _this.query = query;
@@ -515,7 +512,9 @@ var ArSyncCollection = /** @class */ (function (_super) {
         }
         _this.data = [];
         _this.children = [];
-        _this.replaceData(data, sync_keys);
+        _this.replaceData(data, parentSyncKeys);
+        _this.parentModel = parentModel;
+        _this.parentKey = parentKey;
         return _this;
     }
     ArSyncCollection.prototype.setOrdering = function (ordering) {
@@ -535,21 +534,21 @@ var ArSyncCollection = /** @class */ (function (_super) {
         this.aliasOrderKey = (subQuery && subQuery.as) || orderBy;
         this.ordering = { first: first, last: last, direction: direction, orderBy: orderBy };
     };
-    ArSyncCollection.prototype.setSyncKeys = function (sync_keys) {
+    ArSyncCollection.prototype.setSyncKeys = function (parentSyncKeys) {
         var _this = this;
-        if (sync_keys) {
-            this.sync_keys = sync_keys.map(function (key) { return key + _this.path; });
+        if (parentSyncKeys) {
+            this.syncKeys = parentSyncKeys.map(function (key) { return key + _this.path; });
         }
         else {
-            this.sync_keys = [];
+            this.syncKeys = [];
         }
     };
-    ArSyncCollection.prototype.replaceData = function (data, sync_keys) {
-        this.setSyncKeys(sync_keys);
+    ArSyncCollection.prototype.replaceData = function (data, parentSyncKeys) {
+        this.setSyncKeys(parentSyncKeys);
         var existings = new Map();
         for (var _i = 0, _a = this.children; _i < _a.length; _i++) {
             var child = _a[_i];
-            existings.set(child.data.id, child);
+            existings.set(child.id, child);
         }
         var collection;
         if (Array.isArray(data)) {
@@ -564,16 +563,14 @@ var ArSyncCollection = /** @class */ (function (_super) {
         for (var _b = 0, collection_1 = collection; _b < collection_1.length; _b++) {
             var subData = collection_1[_b];
             var model = undefined;
-            if (typeof (subData) === 'object' && subData && 'sync_keys' in subData)
-                model = existings.get(subData.id);
+            if (typeof (subData) === 'object' && subData && '_sync' in subData)
+                model = existings.get(subData._sync.id);
             var data_1 = subData;
             if (model) {
                 model.replaceData(subData);
             }
-            else if (subData.sync_keys) {
-                model = new ArSyncRecord(this.query, subData, null, this.root);
-                model.parentModel = this;
-                model.parentKey = subData.id;
+            else if (subData._sync) {
+                model = new ArSyncRecord(this.query, subData, null, this.root, this, subData._sync.id);
             }
             if (model) {
                 newChildren.push(model);
@@ -583,7 +580,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
         }
         while (this.children.length) {
             var child = this.children.pop();
-            if (!existings.has(child.data.id))
+            if (!existings.has(child.id))
                 child.release();
         }
         if (this.data.length || newChildren.length)
@@ -604,11 +601,11 @@ var ArSyncCollection = /** @class */ (function (_super) {
         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)
+        if (this.children.find(function (a) { return a.id === id; }))
             return;
-        if (limit && limit <= this.data.length) {
-            var lastItem = this.data[this.data.length - 1];
-            var firstItem = this.data[0];
+        if (limit && limit <= this.children.length) {
+            var lastItem = this.children[this.children.length - 1];
+            var firstItem = this.children[0];
             if (direction === 'asc') {
                 if (first) {
                     if (lastItem && lastItem.id < id)
@@ -630,12 +627,15 @@ var ArSyncCollection = /** @class */ (function (_super) {
                 }
             }
         }
+        this.fetching.add(id);
         modelBatchRequest.fetch(className, this.compactQueryAttributes, id).then(function (data) {
+            // Record already removed
+            if (!_this.fetching.has(id))
+                return;
+            _this.fetching.delete(id);
             if (!data || !_this.data)
                 return;
-            var model = new ArSyncRecord(_this.query, data, null, _this.root);
-            model.parentModel = _this;
-            model.parentKey = id;
+            var model = new ArSyncRecord(_this.query, data, null, _this.root, _this, id);
             var overflow = limit && limit <= _this.data.length;
             var rmodel;
             _this.mark();
@@ -699,7 +699,8 @@ var ArSyncCollection = /** @class */ (function (_super) {
         }
     };
     ArSyncCollection.prototype.consumeRemove = function (id) {
-        var idx = this.data.findIndex(function (a) { return a.id === id; });
+        var idx = this.children.findIndex(function (a) { return a.id === id; });
+        this.fetching.delete(id); // To cancel consumeAdd
         if (idx < 0)
             return;
         this.mark();
@@ -710,7 +711,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
     };
     ArSyncCollection.prototype.onNotify = function (notifyData) {
         if (notifyData.action === 'add') {
-            this.consumeAdd(notifyData.class_name, notifyData.id);
+            this.consumeAdd(notifyData.class, notifyData.id);
         }
         else if (notifyData.action === 'remove') {
             this.consumeRemove(notifyData.id);
@@ -719,7 +720,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
     ArSyncCollection.prototype.subscribeAll = function () {
         var _this = this;
         var callback = function (data) { return _this.onNotify(data); };
-        for (var _i = 0, _a = this.sync_keys; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.syncKeys; _i < _a.length; _i++) {
             var key = _a[_i];
             this.subscribe(key, callback);
         }
@@ -731,7 +732,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
     };
     ArSyncCollection.prototype.markAndSet = function (id, data) {
         this.mark();
-        var idx = this.data.findIndex(function (a) { return a.id === id; });
+        var idx = this.children.findIndex(function (a) { return a.id === id; });
         if (idx >= 0)
             this.data[idx] = data;
     };
@@ -740,7 +741,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
             return;
         this.data = __spreadArrays(this.data);
         this.root.mark(this.data);
-        if (this.parentModel)
+        if (this.parentModel && this.parentKey)
             this.parentModel.markAndSet(this.parentKey, this.data);
     };
     return ArSyncCollection;
@@ -748,15 +749,22 @@ var ArSyncCollection = /** @class */ (function (_super) {
 var ArSyncStore = /** @class */ (function () {
     function ArSyncStore(request, _a) {
         var immutable = (_a === void 0 ? {} : _a).immutable;
+        this.complete = false;
+        this.destroyed = false;
         this.immutable = !!immutable;
         this.markedForFreezeObjects = [];
         this.changes = [];
         this.eventListeners = { events: {}, serial: 0 };
         this.request = request;
-        this.complete = false;
         this.data = null;
         this.load(0);
     }
+    ArSyncStore.prototype.handleDestroy = function () {
+        this.release();
+        this.data = null;
+        this.destroyed = true;
+        this.trigger('destroy');
+    };
     ArSyncStore.prototype.load = function (retryCount) {
         var _this = this;
         ArSyncContainerBase.load(this.request, this).then(function (container) {
@@ -854,4 +862,4 @@ var ArSyncStore = /** @class */ (function () {
     };
     return ArSyncStore;
 }());
-exports.default = ArSyncStore;
+exports.ArSyncStore = ArSyncStore;

data/core/hooks.d.ts

@@ -15,6 +15,7 @@ interface ModelStatus {
     complete: boolean;
     notfound?: boolean;
     connected: boolean;
+    destroyed: boolean;
 }
 export declare type DataAndStatus<T> = [T | null, ModelStatus];
 export interface Request {