ar_sync 1.0.5 → 1.1.0

data/src/core/hooks.ts

@@ -23,13 +23,13 @@ function checkHooks() {
 
 interface ModelStatus { complete: boolean; notfound?: boolean; connected: boolean }
 export type DataAndStatus<T> = [T | null, ModelStatus]
-export interface Request { api: string; params?: any; query: any }
+export interface Request { api: string; params?: any; id?: number; query: any }
 
 const initialResult: DataAndStatus<any> = [null, { complete: false, notfound: undefined, connected: true }]
 export function useArSyncModel<T>(request: Request | null): DataAndStatus<T> {
   checkHooks()
   const [result, setResult] = useState<DataAndStatus<T>>(initialResult)
-  const requestString = JSON.stringify(request && request.params)
+  const requestString = JSON.stringify(request?.id ?? request?.params)
   const prevRequestStringRef = useRef(requestString)
   useEffect(() => {
     prevRequestStringRef.current = requestString
@@ -79,10 +79,10 @@ export function useArSyncFetch<T>(request: Request | null): DataStatusUpdate<T>
   checkHooks()
   const [state, setState] = useState<FetchState<T>>(initialFetchState)
   const query = request && request.query
-  const params = request && request.params
+  const resourceIdentifier = request?.id ?? request?.params
   const requestString = useMemo(() => {
-    return JSON.stringify(extractParams(query, [params]))
-  }, [query, params])
+    return JSON.stringify(extractParams(query, [resourceIdentifier]))
+  }, [query, resourceIdentifier])
   const prevRequestStringRef = useRef(requestString)
   const loader = useMemo(() => {
     let lastLoadId = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - tompng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -127,6 +128,8 @@ files:
 - core/DataType.js
 - core/hooks.d.ts
 - core/hooks.js
+- gemfiles/Gemfile-rails-6
+- gemfiles/Gemfile-rails-7
 - index.d.ts
 - index.js
 - lib/ar_sync.rb
@@ -134,7 +137,6 @@ files:
 - lib/ar_sync/collection.rb
 - lib/ar_sync/config.rb
 - lib/ar_sync/core.rb
-- lib/ar_sync/field.rb
 - lib/ar_sync/instance_methods.rb
 - lib/ar_sync/rails.rb
 - lib/ar_sync/type_script.rb
@@ -159,7 +161,7 @@ homepage: https://github.com/tompng/ar_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: ActiveRecord - JavaScript Sync
 test_files: []

data/lib/ar_sync/field.rb

@@ -1,96 +0,0 @@
-class ArSync::Field
-  attr_reader :name
-  def initialize(name)
-    @name = name
-  end
-
-  def skip_propagation?(_parent, _child, _path)
-    false
-  end
-
-  def action_convert(action)
-    action
-  end
-
-  def order_param; end
-end
-
-class ArSync::DataField < ArSync::Field
-  def type
-    :data
-  end
-
-  def data(parent, _child, to_user:, **)
-    ArSync.serialize parent, name, user: to_user
-  end
-
-  def path(_child)
-    []
-  end
-
-  def action_convert(_action)
-    :update
-  end
-
-  def skip_propagation?(_parent, _child, path)
-    !path.nil?
-  end
-end
-
-class ArSync::HasOneField < ArSync::Field
-  def type
-    :one
-  end
-
-  def data(_parent, child, action:, **)
-    child._sync_data new_record: action == :create
-  end
-
-  def path(_child)
-    [name]
-  end
-end
-
-class ArSync::HasManyField < ArSync::Field
-  attr_reader :limit, :order, :association, :propagate_when
-  def type
-    :many
-  end
-
-  def initialize(name, association: nil, limit: nil, order: nil, propagate_when: nil)
-    super name
-    @limit = limit
-    @order = order
-    @association = association || name
-    @propagate_when = propagate_when
-  end
-
-  def skip_propagation?(parent, child, _path)
-    return false unless limit
-    return !propagate_when.call(child) if propagate_when
-    ids = parent.send(association).order(id: order).limit(limit).ids
-    if child.destroyed?
-      ids.size == limit && (order == :asc ? ids.max < child.id : child.id < ids.min)
-    else
-      !ids.include? child.id
-    end
-  end
-
-  def data(_parent, child, action:, **)
-    child._sync_data new_record: action == :create
-  end
-
-  def order_param
-    { limit: limit, order: order } if order
-  end
-
-  def path(child)
-    [name, child.id]
-  end
-end
-
-class ArSync::CollectionField < ArSync::HasManyField
-  def path(child)
-    [child.id]
-  end
-end