ar_sync 1.1.1 → 1.1.2

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
       }

data/lib/ar_sync/instance_methods.rb

@@ -1,7 +1,18 @@
 module ArSync::ModelBase::InstanceMethods
+  def sync_keys(current_user)
+    [ArSync.sync_key(self), ArSync.sync_key(self, current_user)]
+  end
+
+  def _sync_field(current_user)
+    { id:, keys: sync_keys(current_user) }
+  end
+
   def _sync_notify(action)
     _sync_notify_parent action
-    _sync_notify_self if self.class._sync_self? && action == :update
+    if self.class._sync_self?
+      _sync_notify_self if action == :update
+      _sync_notify_self_destroy if action == :destroy
+    end
   end
 
   def _sync_current_watch_values
@@ -121,4 +132,8 @@ module ArSync::ModelBase::InstanceMethods
     end
     ArSync.sync_send to: self, action: :update, model: self
   end
+
+  def _sync_notify_self_destroy
+    ArSync.sync_send to: self, action: :destroy, path: :_destroy, model: nil
+  end
 end

data/lib/ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ArSync
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/src/core/ArSyncModel.ts

@@ -1,15 +1,15 @@
-import ArSyncStore from './ArSyncStore'
+import { ArSyncStore, Request } from './ArSyncStore'
 import ArSyncConnectionManager from './ConnectionManager'
 import ConnectionAdapter from './ConnectionAdapter'
 
-interface Request { api: string; query: any; params?: any }
 type Path = Readonly<(string | number)[]>
 interface Change { path: Path; value: any }
 type ChangeCallback = (change: Change) => void
 type LoadCallback = () => void
 type ConnectionCallback = (status: boolean) => void
-type SubscriptionType = 'load' | 'change' | 'connection'
+type SubscriptionType = 'load' | 'change' | 'connection' | 'destroy'
 type SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback
+type ArSyncModelRef = { key: string; count: number; timer: number | null; model: ArSyncStore }
 
 type PathFirst<P extends Readonly<any[]>> = ((...args: P) => void) extends (first: infer First, ...other: any) => void ? First : never
 
@@ -30,11 +30,12 @@ type DigResult<Data, P extends Readonly<any[]>> =
   : undefined
 
 export default class ArSyncModel<T> {
-  private _ref
+  private _ref: ArSyncModelRef
   private _listenerSerial: number
   private _listeners
-  complete: boolean
+  complete = false
   notfound?: boolean
+  destroyed = false
   connected: boolean
   data: T | null
   static _cache: { [key: string]: { key: string; count: number; timer: number | null; model } } = {}
@@ -43,16 +44,17 @@ export default class ArSyncModel<T> {
     this._ref = ArSyncModel.retrieveRef(request, option)
     this._listenerSerial = 0
     this._listeners = {}
-    this.complete = false
     this.connected = ArSyncStore.connectionManager.networkStatus
     const setData = () => {
       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', (status: boolean) => {
       this.connected = status
     })
@@ -107,12 +109,11 @@ export default class ArSyncModel<T> {
     for (const id in this._listeners) this._listeners[id].unsubscribe()
     this._listeners = {}
     ArSyncModel._detach(this._ref)
-    this._ref = null
   }
   static retrieveRef(
     request: Request,
     option?: { immutable: boolean }
-  ): { key: string; count: number; timer: number | null; model } {
+  ): ArSyncModelRef {
     const key = JSON.stringify([request, option])
     let ref = this._cache[key]
     if (!ref) {