ar_sync 1.1.0 → 1.1.2

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) {
@@ -156,7 +158,7 @@ var ArSyncContainerBase = /** @class */ (function () {
         }
         this.listeners = [];
     };
-    ArSyncContainerBase.compactQuery = function (query) {
+    ArSyncContainerBase.compactQueryAttributes = function (query) {
         function compactAttributes(attributes) {
             var attrs = {};
             var keys = [];
@@ -201,6 +203,8 @@ var ArSyncContainerBase = /** @class */ (function () {
             return result;
         }
         var result = compactQuery(query);
+        if (typeof result === 'object' && 'attributes' in result)
+            return result.attributes;
         return result === true ? {} : result;
     };
     ArSyncContainerBase.parseQuery = function (query, attrsonly) {
@@ -244,59 +248,43 @@ 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 compactQuery = ArSyncRecord.compactQuery(parsedQuery);
+        var compactQueryAttributes = ArSyncRecord.compactQueryAttributes(parsedQuery);
         if (id != null) {
-            return modelBatchRequest.fetch(api, compactQuery, id).then(function (data) {
+            return modelBatchRequest.fetch(api, compactQueryAttributes, id).then(function (data) {
                 if (!data)
                     throw { retry: false };
-                var request = { api: api, id: id, query: compactQuery };
-                return new ArSyncRecord(parsedQuery, data, request, root);
+                var request = { api: api, id: id, query: compactQueryAttributes };
+                return new ArSyncRecord(parsedQuery, data, request, root, null, null);
             });
         }
         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) {
                     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);
@@ -304,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 {
@@ -368,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];
@@ -378,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;
@@ -391,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;
-            modelBatchRequest.fetch(className, ArSyncRecord.compactQuery(query), id).then(function (data) {
+            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);
@@ -426,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);
             }
@@ -442,45 +433,42 @@ 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 val = this.queryAttributes[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: [] };
+        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) {
-                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) {
+            if (key === '_sync')
+                continue;
             var subQuery = this.queryAttributes[key];
             if (subQuery && subQuery.attributes && Object.keys(subQuery.attributes).length > 0)
                 continue;
@@ -500,22 +488,23 @@ 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;
         _this.queryAttributes = query.attributes || {};
-        _this.compactQuery = ArSyncRecord.compactQuery(query);
+        _this.compactQueryAttributes = ArSyncRecord.compactQueryAttributes(query);
         if (request)
             _this.initForReload(request);
         if (query.params) {
@@ -523,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) {
@@ -543,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)) {
@@ -572,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);
@@ -591,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)
@@ -612,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)
@@ -638,12 +627,15 @@ var ArSyncCollection = /** @class */ (function (_super) {
                 }
             }
         }
-        modelBatchRequest.fetch(className, this.compactQuery, id).then(function (data) {
+        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();
@@ -707,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();
@@ -718,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);
@@ -727,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);
         }
@@ -739,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;
     };
@@ -748,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;
@@ -756,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) {
@@ -862,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 {

data/core/hooks.js

@@ -18,7 +18,7 @@ function checkHooks() {
     if (!useState)
         throw 'uninitialized. needs `initializeHooks({ useState, useEffect, useMemo, useRef })`';
 }
-var initialResult = [null, { complete: false, notfound: undefined, connected: true }];
+var initialResult = [null, { complete: false, notfound: undefined, connected: true, destroyed: false }];
 function useArSyncModel(request) {
     var _a;
     checkHooks();
@@ -33,13 +33,13 @@ function useArSyncModel(request) {
         }
         var model = new ArSyncModel_1.default(request, { immutable: true });
         function update() {
-            var complete = model.complete, notfound = model.notfound, connected = model.connected, data = model.data;
+            var complete = model.complete, notfound = model.notfound, connected = model.connected, destroyed = model.destroyed, data = model.data;
             setResult(function (resultWas) {
                 var dataWas = resultWas[0], statusWas = resultWas[1];
-                var statusPersisted = statusWas.complete === complete && statusWas.notfound === notfound && statusWas.connected === connected;
+                var statusPersisted = statusWas.complete === complete && statusWas.notfound === notfound && statusWas.connected === connected && statusWas.destroyed === destroyed;
                 if (dataWas === data && statusPersisted)
                     return resultWas;
-                var status = statusPersisted ? statusWas : { complete: complete, notfound: notfound, connected: connected };
+                var status = statusPersisted ? statusWas : { complete: complete, notfound: notfound, connected: connected, destroyed: destroyed };
                 return [data, status];
             });
         }
@@ -51,6 +51,7 @@ function useArSyncModel(request) {
         }
         model.subscribe('load', update);
         model.subscribe('change', update);
+        model.subscribe('destroy', update);
         model.subscribe('connection', update);
         return function () { return model.release(); };
     }, [requestString]);

data/gemfiles/Gemfile-rails-6

@@ -1,9 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ar_sync.gemspec
-gemspec path: ".."
+gemspec path: '..'
 
-gem "activerecord", "~> 6.0.0"
+gem 'sqlite3', '~> 1.4'
+gem 'activerecord', '~> 6.0'
 gem 'ar_serializer', github: 'tompng/ar_serializer'

data/gemfiles/{Gemfile-rails-7 → Gemfile-rails-7-0}

@@ -1,9 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ar_sync.gemspec
-gemspec path: ".."
+gemspec path: '..'
 
-gem "activerecord", "~> 7.0.0"
+gem 'sqlite3', '~> 1.4'
+gem 'activerecord', '~> 7.0.0'
 gem 'ar_serializer', github: 'tompng/ar_serializer'

data/gemfiles/Gemfile-rails-7-1

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in ar_sync.gemspec
+gemspec path: '..'
+
+gem 'sqlite3', '~> 1.4'
+gem 'activerecord', '~> 7.1.0'
+gem 'ar_serializer', github: 'tompng/ar_serializer'

data/lib/ar_sync/class_methods.rb

@@ -173,12 +173,8 @@ module ArSync::ModelBase::ClassMethods
 
     _sync_define :id
 
-    _sync_define :sync_keys, type: [:string] do |current_user|
-      ArSync.sync_keys self, current_user
-    end
-
     serializer_defaults namespace: :sync do |current_user|
-      { id: id, sync_keys: ArSync.sync_keys(self, current_user) }
+      { _sync: _sync_field(current_user) }
     end
 
     after_initialize do

data/lib/ar_sync/core.rb

@@ -41,7 +41,7 @@ module ArSync
     e = { action: action }
     e[:field] = field if field
     if model
-      e[:class_name] = model.class.base_class.name
+      e[:class] = model.class.base_class.name
       e[:id] = model.id
     end
     event = ["#{key}#{path}", e]
@@ -53,10 +53,6 @@ module ArSync
     end
   end
 
-  def self.sync_keys(model, user)
-    [sync_key(model), sync_key(model, user)]
-  end
-
   def self.sync_key(model, to_user = nil, signature: true)
     if model.is_a? ArSync::Collection
       key = [to_user&.id, model.klass.name, model.name].join '/'
@@ -91,7 +87,7 @@ module ArSync
       serialized = ArSerializer.serialize target, query, context: user, use: :sync
       return serialized if target.is_a? ArSync::ModelBase
       {
-        sync_keys: ArSync.sync_keys(target, user),
+        _sync: { keys: [ArSync.sync_key(target), ArSync.sync_key(target, user)] },
         ordering: target.ordering,
         collection: serialized
       }