ar_sync 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096573e72fb5d4dc465e79c9bf8b39617fb423d7d779534f4ce30768dda2b5b1'
-  data.tar.gz: c590f23a76420db7e056733ca895e56991cdcca8cfbd9908a503dc5ce57ab2f7
+  metadata.gz: 2b01fdd94726978d9866a7a59e843ae0de35069511cdd1d3750b2d9e8ee34ef8
+  data.tar.gz: 983647b65a02802a66db74deb67efd236df83db3c9bcc5240db24446d7e8d3ef
 SHA512:
-  metadata.gz: 47d42249688cfef025fd2b9ea927d81962a786eded059a694ac5d069e7a0b0a48ca9bcc0d59a8d198bc4bb701cd86d4b98acc5c2c3de5b3018ac78f4b9487566
-  data.tar.gz: 88e61169ef8968905d8e9f341108f2c926ac23436ce30ad5e8f2ca7872a6e4e2644f24ff44769c5561589ba1954367325001675c2014b838053ccb6b1848ace9
+  metadata.gz: 255e20be32f56d9ada9127e5af2f1b5df7058daf4cb122e2c899fa36d1c1e3efc1d2b685bb731cbf136f76d6cba86f9d251051843510daaf1aaf7163359e8349
+  data.tar.gz: cdae634af22bb443c4696922964bb675886ef4b4d44040fd74ab4b93205b0196f148328647f6c3a22af7f16de541ef607f223df1b5d1716730c327251ca7c593

data/.github/workflows/test.yml

@@ -5,11 +5,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.2', '3.3' ]
+        ruby: [ '3.2', '3.3', '3.4' ]
         gemfiles:
           - gemfiles/Gemfile-rails-6
-          - gemfiles/Gemfile-rails-7-0
-          - gemfiles/Gemfile-rails-7-1
+          - gemfiles/Gemfile-rails-7
+          - gemfiles/Gemfile-rails-8
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

data/Gemfile

@@ -4,5 +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 'sqlite3'
 gem 'ar_serializer'

data/core/ArSyncModel.d.ts

@@ -8,8 +8,13 @@ interface Change {
 declare type ChangeCallback = (change: Change) => void;
 declare type LoadCallback = () => void;
 declare type ConnectionCallback = (status: boolean) => void;
-declare type SubscriptionType = 'load' | 'change' | 'connection' | 'destroy';
-declare type SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback;
+declare type SubscriptionCallbackMap = {
+    load: LoadCallback;
+    change: ChangeCallback;
+    connection: ConnectionCallback;
+    destroy: LoadCallback;
+};
+declare type SubscriptionType = keyof SubscriptionCallbackMap;
 declare type ArSyncModelRef = {
     key: string;
     count: number;
@@ -44,12 +49,12 @@ export default class ArSyncModel<T> {
         immutable: boolean;
     });
     onload(callback: LoadCallback): void;
-    subscribeOnce(event: SubscriptionType, callback: SubscriptionCallback): {
+    subscribeOnce<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]): {
         unsubscribe: () => void;
     };
     dig<P extends Path>(path: P): DigResult<T, P> | null;
     static digData<Data, P extends Path>(data: Data, path: P): DigResult<Data, P>;
-    subscribe(event: SubscriptionType, callback: SubscriptionCallback): {
+    subscribe<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]): {
         unsubscribe: () => void;
     };
     release(): void;

data/core/ArSyncModel.js

@@ -29,8 +29,8 @@ var ArSyncModel = /** @class */ (function () {
         this.subscribeOnce('load', callback);
     };
     ArSyncModel.prototype.subscribeOnce = function (event, callback) {
-        var subscription = this.subscribe(event, function (arg) {
-            callback(arg);
+        var subscription = this.subscribe(event, function (e) {
+            callback(e);
             subscription.unsubscribe();
         });
         return subscription;

data/core/ArSyncStore.d.ts

@@ -2,8 +2,9 @@ export declare type Request = {
     api: string;
     query: any;
     params?: any;
-    id?: any;
+    id?: IDType;
 };
+declare type IDType = number | string;
 export declare class ArSyncStore {
     immutable: boolean;
     markedForFreezeObjects: any[];
@@ -34,3 +35,4 @@ export declare class ArSyncStore {
     freezeMarked(): void;
     release(): void;
 }
+export {};

data/gemfiles/Gemfile-rails-6

@@ -5,6 +5,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in ar_sync.gemspec
 gemspec path: '..'
 
+gem 'bigdecimal'
+gem 'base64'
+gem 'mutex_m'
+gem 'logger'
+gem 'concurrent-ruby', '1.3.4'
 gem 'sqlite3', '~> 1.4'
 gem 'activerecord', '~> 6.0'
 gem 'ar_serializer', github: 'tompng/ar_serializer'

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

@@ -6,5 +6,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec path: '..'
 
 gem 'sqlite3', '~> 1.4'
-gem 'activerecord', '~> 7.0.0'
+gem 'activerecord', '~> 7.0'
 gem 'ar_serializer', github: 'tompng/ar_serializer'

data/gemfiles/{Gemfile-rails-7-1 → Gemfile-rails-8}

@@ -5,6 +5,6 @@ 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 'sqlite3'
+gem 'activerecord', '~> 8.0'
 gem 'ar_serializer', github: 'tompng/ar_serializer'

data/lib/ar_sync/config.rb

@@ -1,4 +1,3 @@
-require 'ostruct'
 module ArSync
   config_keys = %i[
     current_user_method

data/lib/ar_sync/rails.rb

@@ -116,7 +116,8 @@ module ArSync
     end
 
     def log_internal_exception(exception)
-      ActiveSupport::Deprecation.silence do
+      deprecator = ::Rails.version >= Gem::Version.new('7.1.0') ? ::Rails.application.deprecators : ActiveSupport::Deprecation
+      deprecator.silence do
         logger.fatal '  '
         logger.fatal "#{exception.class} (#{exception.message}):"
         log_internal_exception_trace exception.annoted_source_code if exception.respond_to?(:annoted_source_code)

data/lib/ar_sync/type_script.rb

@@ -53,10 +53,14 @@ module ArSync::TypeScript
       import { TypeRequest } from './types'
       import DataTypeFromRequest from './DataTypeFromRequest'
       import { default as ArSyncModelBase } from 'ar_sync/core/ArSyncModel'
-      declare class ArSyncModel<R extends TypeRequest> extends ArSyncModelBase<DataTypeFromRequest<R>> {
-        constructor(r: R, option?: { immutable: boolean })
+      import ConnectionAdapter from 'ar_sync/core/ConnectionAdapter'
+
+      type ArSyncModel<R extends TypeRequest> = ArSyncModelBase<DataTypeFromRequest<R>>
+      const ArSyncModel = ArSyncModelBase as unknown as {
+        new <R extends TypeRequest>(r: R, option?: { immutable: boolean }): ArSyncModel<R>
+        setConnectionAdapter(adapter: ConnectionAdapter): void
       }
-      export default ArSyncModelBase as typeof ArSyncModel
+      export default ArSyncModel
     CODE
   end
 

data/lib/ar_sync/version.rb

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