ar_sync 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab145d5094c25600e95e01ab625c0128782b2a0592be95d8c9333539a5128bd1
-  data.tar.gz: 062fcf8cb8996e145dfa35eb25b31f2ecc2b4a486183bc70678d055db2bf2bc8
+  metadata.gz: '096573e72fb5d4dc465e79c9bf8b39617fb423d7d779534f4ce30768dda2b5b1'
+  data.tar.gz: c590f23a76420db7e056733ca895e56991cdcca8cfbd9908a503dc5ce57ab2f7
 SHA512:
-  metadata.gz: 556a1c954088cea90d44bb61cec1fc250804f1fc5ec4e1c4101ff642343af49bc4ce8870be152de4627802931409d3c5f25707fa34b59ba8e53e9873a99e9b54
-  data.tar.gz: 28846608f3314be4a117d1ffbf265702f2170755f027696300f991b01a9228302d7e218fce757826c7528c8643d98f66e1073741305c1d851f1fe6602c9f185b
+  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): {