ar_sync 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949fc166a975785ab522fe3a2714bf334a56c1f2d4e32931aced7b3ee1de65ac
-  data.tar.gz: f9428cc4dbf7e2e7cea7c2f958198e628f7ad92241d71c351e8328b856a315de
+  metadata.gz: 1998952425317eff3faa4eb8511f2ad0e40a5f5025dbdc3fae6b5ca7916c454f
+  data.tar.gz: 2b5819d226d4f05892e6fda8a639d758d5579414e6e0ce7eb0fe2cddae978da4
 SHA512:
-  metadata.gz: dff083ce7735e475c3104b7581da185e8bd872e76afd8addeecfd5ebc9d292cb299358edeb9d445c5aac268813d4bd358a886bd89dff761eab8dbbac2fa75593
-  data.tar.gz: 54ce2594a8749284200924456188fc7b7a3836f8719cbaea4b2626823e9bbe1879cc6a8d7dad327e82f83d7f48d488620eef18f94bda6297aecf1c87d3893b85
+  metadata.gz: d8c730609dedb72287c26ae09b39dfbe75aeb2b9e9c41b029e2c90212bb4253383a08e96fa975d00f56eb24154ba34dbe4fc13620654314e7fe061b227465a5b
+  data.tar.gz: 5c5bed249fbc71e1c620aa1d0ef476efbb34492ee28554b86a158181d1f572e6449959b0e2fabd60af16f9b75e33b043e8d7d58dc8b50934949d88784cdc320a

data/Gemfile.lock

@@ -1,46 +1,46 @@
 PATH
   remote: .
   specs:
-    ar_sync (1.0.3)
+    ar_sync (1.0.4)
       activerecord
-      ar_serializer (= 1.0.0)
+      ar_serializer
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
     activerecord-import (1.0.2)
       activerecord (>= 3.2)
-    activesupport (5.2.3)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    ar_serializer (1.0.0)
+      zeitwerk (~> 2.2)
+    ar_serializer (1.1.0)
       activerecord
       top_n_loader
-    arel (9.0.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.13.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (12.3.2)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    top_n_loader (1.0.0)
+    top_n_loader (1.0.1)
       activerecord
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -53,4 +53,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   2.1.2

data/ar_sync.gemspec

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

data/lib/ar_sync/class_methods.rb

@@ -21,7 +21,7 @@ module ArSync::ModelBase::ClassMethods
   end
 
   def _each_sync_parent(&block)
-    _sync_parents_info.each(&block)
+    _sync_parents_info.each { |parent, options| block.call(parent, **options) }
     superclass._each_sync_parent(&block) if superclass < ActiveRecord::Base
   end
 
@@ -46,32 +46,32 @@ module ArSync::ModelBase::ClassMethods
     @_sync_self = true
     names.each do |name|
       _sync_children_info[name] = nil
-      _sync_define name, option, &data_block
+      _sync_define name, **option, &data_block
     end
   end
 
   def sync_has_many(name, **option, &data_block)
     _sync_children_info[name] = [:many, option, data_block]
-    _sync_has_many name, option, &data_block
+    _sync_has_many name, **option, &data_block
   end
 
   def sync_has_one(name, **option, &data_block)
     _sync_children_info[name] = [:one, option, data_block]
-    _sync_define name, option, &data_block
+    _sync_define name, **option, &data_block
   end
 
   def _sync_has_many(name, order: :asc, limit: nil, preload: nil, association: nil, **option, &data_block)
     raise "order not in [:asc, :desc] : #{order}" unless %i[asc desc].include? order
     if data_block.nil? && preload.nil?
       underscore_name = name.to_s.underscore.to_sym
-      preload = lambda do |records, _context, params|
+      preload = lambda do |records, _context, **params|
         ArSerializer::Field.preload_association(
           self, records, association || underscore_name,
           order: (!limit && params && params[:order]) || order,
           limit: [params && params[:limit]&.to_i, limit].compact.min
         )
       end
-      data_block = lambda do |preloaded, _context, params|
+      data_block = lambda do |preloaded, _context, **params|
         records = preloaded ? preloaded[id] || [] : send(name)
         next records unless limit || order == :asc
         ArSync::CollectionWithOrder.new(
@@ -80,7 +80,7 @@ module ArSync::ModelBase::ClassMethods
           limit: [params && params[:limit]&.to_i, limit].compact.min
         )
       end
-      serializer_data_block = lambda do |preloaded, _context, _params|
+      serializer_data_block = lambda do |preloaded, _context, **_params|
         preloaded ? preloaded[id] || [] : send(name)
       end
       params_type = { limit?: :int, order?: [{ :* => %w[asc desc] }, 'asc', 'desc'] }
@@ -150,12 +150,6 @@ module ArSync::ModelBase::ClassMethods
       @_sync_belongs_to_info_before_mutation ||= _sync_current_belongs_to_info
     end
 
-    before_save on: :create do
-      @_sync_parents_info_before_mutation ||= {}
-      @_sync_watch_values_before_mutation ||= {}
-      @_sync_belongs_to_info_before_mutation ||= {}
-    end
-
     %i[create update destroy].each do |action|
       after_commit on: action do
         next if ArSync.skip_notification?

data/lib/ar_sync/instance_methods.rb

@@ -33,10 +33,10 @@ module ArSync::ModelBase::InstanceMethods
   def _serializer_field_value(name)
     field = self.class._serializer_field_info name
     preloadeds = field.preloaders.map do |preloader|
-      args = [[self], nil, {}]
+      args = [[self], nil]
       preloader.call(*(preloader.arity < 0 ? args : args.take(preloader.arity)))
     end
-    instance_exec(*preloadeds, nil, {}, &field.data_block)
+    instance_exec(*preloadeds, nil, &field.data_block)
   end
 
   def _sync_current_belongs_to_info
@@ -65,11 +65,13 @@ module ArSync::ModelBase::InstanceMethods
       parents_was = parents.map { nil }
     elsif action == :destroy
       parents_was = _sync_parents_info_before_mutation
+      return unless parents_was
       parents = parents_was.map { nil }
     else
       parents_was = _sync_parents_info_before_mutation
+      return unless parents_was
       parents = _sync_current_parents_info
-      column_values_was = _sync_watch_values_before_mutation
+      column_values_was = _sync_watch_values_before_mutation || {}
       column_values = _sync_current_watch_values
     end
     parents_was.zip(parents).each do |(parent_was, info_was), (parent, info)|
@@ -109,6 +111,7 @@ module ArSync::ModelBase::InstanceMethods
 
   def _sync_notify_self
     belongs_was = _sync_belongs_to_info_before_mutation
+    return unless belongs_was
     belongs = _sync_current_belongs_to_info
     belongs.each do |name, info|
       next if belongs_was[name] == info

data/lib/ar_sync/type_script.rb

@@ -10,17 +10,14 @@ module ArSync::TypeScript
   end
 
   def self.generate_type_definition(api_class)
+    types = ArSerializer::TypeScript.related_serializer_types([api_class]).reject { |t| t.type == api_class }
     [
-      ArSerializer::TypeScript.generate_type_definition(api_related_classes(api_class)),
+      types.map { |t| data_type_definition t },
+      types.map { |t| query_type_definition t },
       request_type_definition(api_class)
     ].join "\n"
   end
 
-  def self.api_related_classes(api_class)
-    classes = ArSerializer::TypeScript.related_serializer_types([api_class]).map(&:type)
-    classes - [api_class]
-  end
-
   def self.request_type_definition(api_class)
     type = ArSerializer::GraphQL::TypeClass.from api_class
     definitions = []
@@ -98,4 +95,42 @@ module ArSync::TypeScript
       }
     CODE
   end
+
+  def self.query_type_definition(type)
+    field_definitions = type.fields.map do |field|
+      association_type = field.type.association_type
+      if association_type
+        qname = "Type#{association_type.name}Query"
+        if field.args.empty?
+          "#{field.name}?: true | #{qname} | { attributes?: #{qname} }"
+        else
+          "#{field.name}?: true | #{qname} | { params: #{field.args_ts_type}; attributes?: #{qname} }"
+        end
+      else
+        "#{field.name}?: true"
+      end
+    end
+    field_definitions << "'*'?: true"
+    query_type_name = "Type#{type.name}Query"
+    base_query_type_name = "Type#{type.name}QueryBase"
+    <<~TYPE
+      export type #{query_type_name} = keyof (#{base_query_type_name}) | Readonly<(keyof (#{base_query_type_name}))[]> | #{base_query_type_name}
+      export interface #{base_query_type_name} {
+      #{field_definitions.map { |line| "  #{line}" }.join("\n")}
+      }
+    TYPE
+  end
+
+  def self.data_type_definition(type)
+    field_definitions = []
+    type.fields.each do |field|
+      field_definitions << "#{field.name}: #{field.type.ts_type}"
+    end
+    field_definitions << "_meta?: { name: '#{type.name}'; query: Type#{type.name}QueryBase }"
+    <<~TYPE
+      export interface Type#{type.name} {
+      #{field_definitions.map { |line| "  #{line}" }.join("\n")}
+      }
+    TYPE
+  end
 end

data/lib/ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ArSync
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/generators/ar_sync/install/install_generator.rb

@@ -78,7 +78,7 @@ module ArSync
         [
           '//= require ar_sync',
           '//= require action_cable',
-          '//= require ar_sync_actioncable_adapter',
+          '//= require ar_sync_action_cable_adapter',
           'ArSyncModel.setConnectionAdapter(new ArSyncActionCableAdapter(ActionCable))'
         ].join("\n") + "\n",
         before: '//= require_tree .'

data/vendor/assets/javascripts/{ar_sync_actioncable_adapter.js.erb → ar_sync_action_cable_adapter.js.erb}

@@ -2,6 +2,6 @@
   var modules = { actioncable: window.ActionCable }
   var exports = {}
   function require(name) { return modules[name] }
-  <%= File.read File.dirname(__FILE__) + '/../../../core/ActioncableAdapter.js' %>
+  <%= File.read File.dirname(__FILE__) + '/../../../core/ActionCableAdapter.js' %>
   window.ArSyncActionCableAdapter = ActionCableAdapter
 }())

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - tompng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,16 @@ dependencies:
   name: ar_serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +111,8 @@ files:
 - ar_sync.gemspec
 - bin/console
 - bin/setup
-- core/ActioncableAdapter.d.ts
-- core/ActioncableAdapter.js
+- core/ActionCableAdapter.d.ts
+- core/ActionCableAdapter.js
 - core/ArSyncApi.d.ts
 - core/ArSyncApi.js
 - core/ArSyncModel.d.ts
@@ -143,7 +143,7 @@ files:
 - lib/generators/ar_sync/types/types_generator.rb
 - package-lock.json
 - package.json
-- src/core/ActioncableAdapter.ts
+- src/core/ActionCableAdapter.ts
 - src/core/ArSyncApi.ts
 - src/core/ArSyncModel.ts
 - src/core/ArSyncStore.ts
@@ -154,7 +154,7 @@ files:
 - src/index.ts
 - tsconfig.json
 - vendor/assets/javascripts/ar_sync.js.erb
-- vendor/assets/javascripts/ar_sync_actioncable_adapter.js.erb
+- vendor/assets/javascripts/ar_sync_action_cable_adapter.js.erb
 homepage: https://github.com/tompng/ar_sync
 licenses:
 - MIT
@@ -174,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord - JavaScript Sync