ar_sync 1.0.1 → 1.0.2

data/lib/ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ArSync
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

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

@@ -1,46 +1,47 @@
 module ArSync
   class InstallGenerator < ::Rails::Generators::Base
-    class_option :mode, enum: %w[tree graph], desc: 'sync mode', default: 'graph'
+    def create_schema_class
+      create_file 'app/models/sync_schema.rb', <<~CODE
+        class SyncSchema < ArSync::SyncSchemaBase
+          # serializer_field :profile, type: User do |current_user|
+          #   current_user
+          # end
 
-    def create_api_controller
-      base_code = <<~CODE
-        include ArSync::ApiControllerConcern
+          # serializer_field :post, type: Post do |current_user, id:|
+          #   Post.where(current_user_can_access).find_by id: id
+          # end
 
-        # serializer_field :profile, type: User do |_user|
-        #   current_user
-        # end
+          # Reload API for all types should be defined here.
 
-        # serializer_field :post, type: Post do |_user, id:|
-        #   Post.where(current_user_can_access).find id
-        # end
-      CODE
-      graph_additional_code = <<~CODE
-        # Reload API for all types should be defined here.
+          # serializer_field :User do |current_user, ids:|
+          #   User.where(current_user_can_access).where id: ids
+          # end
 
-        # serializer_field :User do |_user, ids:|
-        #   User.where(current_user_can_access).where id: ids
-        # end
+          # serializer_field :Post do |current_user, ids:|
+          #   Post.where(current_user_can_access).where id: ids
+          # end
 
-        # serializer_field :Post do |_user, ids:|
-        #   Post.where(current_user_can_access).where id: ids
-        # end
+          # serializer_field :Comment do |current_user, ids:|
+          #   Comment.where(current_user_can_access).where id: ids
+          # end
+        end
+      CODE
+    end
 
-        # serializer_field :Comment do |_user, ids:|
-        #   Comment.where(current_user_can_access).where id: ids
-        # end
+    def create_api_controller
+      create_file 'app/controllers/sync_api_controller.rb', <<~CODE
+        class SyncApiController < ApplicationController
+          include ArSync::ApiControllerConcern
+          def schema
+            SyncSchema.new
+          end
+        end
       CODE
-      controller_body = options['mode'] == 'tree' ? base_code : base_code + "\n" + graph_additional_code
-      code = [
-        "class SyncApiController < ApplicationController\n",
-        controller_body.lines.map { |l| l.blank? ? l : '  ' + l },
-        "end\n"
-      ].join
-      create_file 'app/controllers/sync_api_controller.rb', code
     end
 
     def create_config
       create_file 'config/initializers/ar_sync.rb', <<~CODE
-        ArSync.use :#{options['mode']}
+        ActiveRecord::Base.include ArSync::ModelBase
         ArSync.configure do |config|
           config.current_user_method = :current_user
           config.key_prefix = 'ar_sync_'
@@ -75,10 +76,10 @@ module ArSync
       inject_into_file(
         'app/assets/javascripts/application.js',
         [
-          "//= require ar_sync_#{options['mode']}",
+          '//= require ar_sync',
           '//= require action_cable',
           '//= require ar_sync_actioncable_adapter',
-          'ArSyncModel.setConnectionAdapter(new ArSyncActionCableAdapter())'
+          'ArSyncModel.setConnectionAdapter(new ArSyncActionCableAdapter(ActionCable))'
         ].join("\n") + "\n",
         before: '//= require_tree .'
       )

data/lib/generators/ar_sync/types/types_generator.rb

@@ -1,11 +1,14 @@
 require 'shellwords'
 module ArSync
   class TypesGenerator < ::Rails::Generators::Base
-    argument :output_dir, type: :string, desc: "output directory"
+    argument :output_dir, type: :string, required: true
+    argument :schema_class_name, type: :string, required: false
     def generate_typescript_files
       dir = ::Rails.root.join output_dir
-      comment = "// generated by: rails generate ar_sync:types #{Shellwords.escape output_dir}\n\n"
-      ArSync::TypeScript.generate_typed_files SyncApiController, dir: dir, comment: comment
+      schema_class = (schema_class_name || 'SyncSchema').constantize
+      args = [output_dir, *schema_class_name].map { |a| Shellwords.escape a }
+      comment = "// generated by: rails generate ar_sync:types #{args.join(' ')}\n\n"
+      ArSync::TypeScript.generate_typed_files schema_class, dir: dir, comment: comment
     end
   end
 end

data/package-lock.json

@@ -338,10 +338,21 @@
       }
     },
     "eslint-utils": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
-      "dev": true
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+          "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+          "dev": true
+        }
+      }
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
@@ -640,9 +651,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lodash.unescape": {
@@ -1067,9 +1078,9 @@
       }
     },
     "typescript": {
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
-      "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz",
+      "integrity": "sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==",
       "dev": true
     },
     "uri-js": {

data/package.json

@@ -12,7 +12,7 @@
     "actioncable": "^5.2.0",
     "@types/actioncable": "^5.2.0",
     "eslint": "^5.16.0",
-    "typescript": "^3.4.5",
+    "typescript": "3.7.2",
     "@typescript-eslint/eslint-plugin": "^1.6.0",
     "@typescript-eslint/parser": "^1.6.0"
   }

data/src/core/ActioncableAdapter.ts

@@ -1,11 +1,36 @@
-import * as ActionCable from 'actioncable'
 import ConnectionAdapter from './ConnectionAdapter'
 
+declare module ActionCable {
+  function createConsumer(): Cable
+  interface Cable {
+    subscriptions: Subscriptions
+  }
+  interface CreateMixin {
+    connected: () => void
+    disconnected: () => void
+    received: (obj: any) => void
+  }
+  interface ChannelNameWithParams {
+    channel: string
+    [key: string]: any
+  }
+  interface Subscriptions {
+    create(channel: ChannelNameWithParams, obj: CreateMixin): Channel
+  }
+  interface Channel {
+    unsubscribe(): void;
+    perform(action: string, data: {}): void;
+    send(data: any): boolean;
+  }
+}
+
 export default class ActionCableAdapter implements ConnectionAdapter {
   connected: boolean
   _cable: ActionCable.Cable
-  constructor() {
+  actionCableClass: typeof ActionCable
+  constructor(actionCableClass: typeof ActionCable) {
     this.connected = true
+    this.actionCableClass = actionCableClass
     this.subscribe(Math.random().toString(), () => {})
   }
   subscribe(key: string, received: (data: any) => void) {
@@ -19,7 +44,7 @@ export default class ActionCableAdapter implements ConnectionAdapter {
       this.connected = true
       this.onreconnect()
     }
-    if (!this._cable) this._cable = ActionCable.createConsumer()
+    if (!this._cable) this._cable = this.actionCableClass.createConsumer()
     return this._cable.subscriptions.create(
       { channel: 'SyncChannel', key },
       { received, disconnected, connected }

data/src/core/ArSyncApi.ts

@@ -5,6 +5,7 @@ async function apiBatchFetch(endpoint: string, requests: object[]) {
   }
   const body = JSON.stringify({ requests })
   const option = { credentials: 'include', method: 'POST', headers, body } as const
+  if (ArSyncApi.domain) endpoint = ArSyncApi.domain + endpoint
   const res = await fetch(endpoint, option)
   if (res.status === 200) return res.json()
   throw new Error(res.statusText)
@@ -43,7 +44,7 @@ class ApiFetcher {
           }
         }
         this.batches = []
-        apiBatchFetch(this.endpoint, requests).then((results) => {
+        ArSyncApi._batchFetch(this.endpoint, requests).then((results) => {
           for (const i in callbacksList) {
             const result = results[i]
             const callbacks = callbacksList[i]
@@ -52,11 +53,11 @@ class ApiFetcher {
                 callback.resolve(result.data)
               } else {
                 const error = result.error || { type: 'Unknown Error' }
-                callback.reject(error)
+                callback.reject({ ...error, retry: false })
               }
             }
           }
-        }).catch((e) => {
+        }).catch(e => {
           const error = { type: e.name, message: e.message, retry: true }
           for (const callbacks of callbacksList) {
             for (const callback of callbacks) callback.reject(error)
@@ -69,7 +70,10 @@ class ApiFetcher {
 
 const staticFetcher = new ApiFetcher('/static_api')
 const syncFetcher = new ApiFetcher('/sync_api')
-export default {
+const ArSyncApi = {
+  domain: null as string | null,
+  _batchFetch: apiBatchFetch,
   fetch: (request: object) => staticFetcher.fetch(request),
   syncFetch: (request: object) => syncFetcher.fetch(request),
 }
+export default ArSyncApi

data/src/core/{ArSyncModelBase.ts → ArSyncModel.ts}

@@ -1,18 +1,35 @@
+import ArSyncStore from './ArSyncStore'
+import ArSyncConnectionManager from './ConnectionManager'
+import ConnectionAdapter from './ConnectionAdapter'
+
 interface Request { api: string; query: any; params?: any }
-type Path = (string | number)[]
+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 SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback
-interface Adapter {
-  subscribe: (key: string, received: (data: any) => void) => { unsubscribe: () => void }
-  ondisconnect: () => void
-  onreconnect: () => void
-}
 
-export default abstract class ArSyncModelBase<T> {
+type PathFirst<P extends Readonly<any[]>> = ((...args: P) => void) extends (first: infer First, ...other: any) => void ? First : never
+
+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;
+
+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) | {
+    0: Data[PathFirst<P>];
+    1: DigResult<Data[PathFirst<P>], PathRest<P>>
+  }[PathRest<P> extends never ? 0 : 1]
+  : undefined
+
+export default class ArSyncModel<T> {
   private _ref
   private _listenerSerial: number
   private _listeners
@@ -20,16 +37,14 @@ export default abstract class ArSyncModelBase<T> {
   notfound?: boolean
   connected: boolean
   data: T | null
-  static _cache: { [key: string]: { key: string; count: number; timer: number | null; model } }
-  static cacheTimeout: number
-  abstract refManagerClass(): any
-  abstract connectionManager(): { networkStatus: boolean }
+  static _cache: { [key: string]: { key: string; count: number; timer: number | null; model } } = {}
+  static cacheTimeout: number = 10 * 1000
   constructor(request: Request, option?: { immutable: boolean }) {
-    this._ref = this.refManagerClass().retrieveRef(request, option)
+    this._ref = ArSyncModel.retrieveRef(request, option)
     this._listenerSerial = 0
     this._listeners = {}
     this.complete = false
-    this.connected = this.connectionManager().networkStatus
+    this.connected = ArSyncStore.connectionManager.networkStatus
     const setData = () => {
       this.data = this._ref.model.data
       this.complete = this._ref.model.complete
@@ -52,6 +67,23 @@ export default abstract class ArSyncModelBase<T> {
     })
     return subscription
   }
+  dig<P extends Path>(path: P) {
+    return ArSyncModel.digData(this.data, path)
+  }
+  static digData<Data, P extends Path>(data: Data, path: P): DigResult<Data, P> {
+    function dig(data: Data, path: Path) {
+      if (path.length === 0) return data as any
+      if (data == null) return data
+      const key = path[0]
+      const other = path.slice(1)
+      if (Array.isArray(data)) {
+        return this.digData(data.find(el => el.id === key), other)
+      } else {
+        return this.digData(data[key], other)
+      }
+    }
+    return dig(data, path)
+  }
   subscribe(event: SubscriptionType, callback: SubscriptionCallback): { unsubscribe: () => void } {
     const id = this._listenerSerial++
     const subscription = this._ref.model.subscribe(event, callback)
@@ -74,7 +106,7 @@ export default abstract class ArSyncModelBase<T> {
   release() {
     for (const id in this._listeners) this._listeners[id].unsubscribe()
     this._listeners = {}
-    this.refManagerClass()._detach(this._ref)
+    ArSyncModel._detach(this._ref)
     this._ref = null
   }
   static retrieveRef(
@@ -84,15 +116,12 @@ export default abstract class ArSyncModelBase<T> {
     const key = JSON.stringify([request, option])
     let ref = this._cache[key]
     if (!ref) {
-      const model = this.createRefModel(request, option)
+      const model = new ArSyncStore(request, option)
       ref = this._cache[key] = { key, count: 0, timer: null, model }
     }
     this._attach(ref)
     return ref
   }
-  static createRefModel(_request: Request, _option?: { immutable: boolean }) {
-    throw 'abstract method'
-  }
   static _detach(ref) {
     ref.count--
     const timeout = this.cacheTimeout
@@ -111,8 +140,10 @@ export default abstract class ArSyncModelBase<T> {
     ref.count++
     if (ref.timer) clearTimeout(ref.timer)
   }
-  static setConnectionAdapter(_adapter: Adapter) {}
-  static waitForLoad(...models: ArSyncModelBase<{}>[]) {
+  static setConnectionAdapter(adapter: ConnectionAdapter) {
+    ArSyncStore.connectionManager = new ArSyncConnectionManager(adapter)
+  }
+  static waitForLoad(...models: ArSyncModel<{}>[]) {
     return new Promise((resolve) => {
       let count = 0
       for (const model of models) {

data/src/{graph → core}/ArSyncStore.ts

@@ -1,4 +1,4 @@
-import ArSyncAPI from '../core/ArSyncApi'
+import ArSyncAPI from './ArSyncApi'
 
 const ModelBatchRequest = {
   timer: null,
@@ -16,7 +16,7 @@ const ModelBatchRequest = {
       }
     }
   },
-  fetch(api, query, id) {
+  fetch(api: string, query, id: number) {
     this.setTimer()
     return new Promise(resolve => {
       const queryJSON = JSON.stringify(query)
@@ -51,13 +51,20 @@ const ModelBatchRequest = {
   }
 }
 
+type ParsedQuery = {
+  attributes: Record<string, ParsedQuery>
+  as?: string
+  params: any
+} | {}
+
 class ArSyncContainerBase {
   data
   listeners
   networkSubscriber
   parentModel
   parentKey
-  children: ArSyncContainerBase[]
+  children: ArSyncContainerBase[] | { [key: string]: ArSyncContainerBase | null }
+  sync_keys: string[]
   onConnectionChange
   constructor() {
     this.listeners = []
@@ -89,15 +96,57 @@ class ArSyncContainerBase {
   onChange(path, data) {
     if (this.parentModel) this.parentModel.onChange([this.parentKey, ...path], data)
   }
-  subscribe(key, listener) {
+  subscribe(key: string, listener) {
     this.listeners.push(ArSyncStore.connectionManager.subscribe(key, listener))
   }
   unsubscribeAll() {
     for (const l of this.listeners) l.unsubscribe()
     this.listeners = []
   }
-  static parseQuery(query, attrsonly = false){
-    const attributes = {}
+  static compactQuery(query: ParsedQuery) {
+    function compactAttributes(attributes: Record<string, ParsedQuery>) {
+      const attrs = {}
+      const keys: string[] = []
+      for (const key in attributes) {
+        const c = compactQuery(attributes[key])
+        if (c === true) {
+          keys.push(key)
+        } else {
+          attrs[key] = c
+        }
+      }
+      if (Object.keys(attrs).length === 0) {
+        if (keys.length === 0) return [true, false]
+        if (keys.length === 1) return [keys[0], false]
+        return [keys]
+      }
+      const needsEscape = attrs['attributes'] || attrs['params'] || attrs['as']
+      if (keys.length === 0) return [attrs, needsEscape]
+      return [[...keys, attrs], needsEscape]
+    }
+    function compactQuery(query: ParsedQuery) {
+      if (!('attributes' in query)) return true
+      const { as, params } = query
+      const [attributes, needsEscape] = compactAttributes(query.attributes)
+      if (as == null && params == null){
+        if (needsEscape) return { attributes }
+        return attributes
+      }
+      const result: { as?: string; params?: any; attributes?: any } = {}
+      if (as) result.as = as
+      if (params) result.params = params
+      if (attributes !== true) result.attributes = attributes
+      return result
+    }
+    try{
+    const result = compactQuery(query)
+    return result === true ? {} : result
+  }catch(e){throw JSON.stringify(query)+e.stack}
+  }
+  static parseQuery(query, attrsonly: true): Record<string, ParsedQuery>
+  static parseQuery(query): ParsedQuery
+  static parseQuery(query, attrsonly?: true) {
+    const attributes: Record<string, ParsedQuery> = {}
     let column = null
     let params = null
     if (!query) query = []
@@ -130,13 +179,16 @@ class ArSyncContainerBase {
   }
   static _load({ api, id, params, query }, root) {
     const parsedQuery = ArSyncRecord.parseQuery(query)
+    const compactQuery = ArSyncRecord.compactQuery(parsedQuery)
     if (id) {
-      return ModelBatchRequest.fetch(api, query, id).then(data => new ArSyncRecord(parsedQuery, data[0], null, root))
+      return ModelBatchRequest.fetch(api, compactQuery, id).then(data => new ArSyncRecord(parsedQuery, data, null, root))
     } else {
-      const request = { api, query, params }
+      const request = { api, query: compactQuery, params }
       return ArSyncAPI.syncFetch(request).then((response: any) => {
         if (response.collection && response.order) {
           return new ArSyncCollection(response.sync_keys, 'collection', parsedQuery, response, request, root)
+        } else if (response instanceof Array) {
+          return new ArSyncCollection([], '', parsedQuery, response, request, root)
         } else {
           return new ArSyncRecord(parsedQuery, response, request, root)
         }
@@ -159,14 +211,20 @@ class ArSyncContainerBase {
   }
 }
 
+type NotifyData = {
+  action: 'add' | 'remove' | 'update'
+  class_name: string
+  id: number
+  field?: string
+}
+
 class ArSyncRecord extends ArSyncContainerBase {
-  id
+  id: number
   root
   query
   data
-  children
-  sync_keys
-  paths
+  children: { [key: string]: ArSyncContainerBase | null }
+  paths: string[]
   reloadQueryCache
   constructor(query, data, request, root) {
     super()
@@ -177,11 +235,10 @@ class ArSyncRecord extends ArSyncContainerBase {
     this.children = {}
     this.replaceData(data)
   }
-  setSyncKeys(sync_keys) {
+  setSyncKeys(sync_keys: string[]) {
     this.sync_keys = sync_keys
     if (!this.sync_keys) {
       this.sync_keys = []
-      console.error('warning: no sync_keys')
     }
   }
   replaceData(data) {
@@ -196,10 +253,11 @@ class ArSyncRecord extends ArSyncContainerBase {
       const subQuery = this.query.attributes[key]
       const aliasName = subQuery.as || key
       const subData = data[aliasName]
+      const child = this.children[aliasName]
       if (key === 'sync_keys') continue
-      if (subQuery.attributes && (subData instanceof Array || (subData && subData.collection && subData.order))) {
-        if (this.children[aliasName]) {
-          this.children[aliasName].replaceData(subData, this.sync_keys)
+      if (subData instanceof Array || (subData && subData.collection && subData.order)) {
+        if (child) {
+          child.replaceData(subData, this.sync_keys)
         } else {
           const collection = new ArSyncCollection(this.sync_keys, key, subQuery, subData, null, this.root)
           this.mark()
@@ -209,10 +267,10 @@ class ArSyncRecord extends ArSyncContainerBase {
           collection.parentKey = aliasName
         }
       } else {
-        if (subQuery.attributes && Object.keys(subQuery.attributes).length > 0) this.paths.push(key);
+        if (subQuery.attributes && Object.keys(subQuery.attributes).length > 0) this.paths.push(key)
         if (subData && subData.sync_keys) {
-          if (this.children[aliasName]) {
-            this.children[aliasName].replaceData(subData)
+          if (child) {
+            child.replaceData(subData)
           } else {
             const model = new ArSyncRecord(subQuery, subData, null, this.root)
             this.mark()
@@ -222,8 +280,8 @@ class ArSyncRecord extends ArSyncContainerBase {
             model.parentKey = aliasName
           }
         } else {
-          if(this.children[aliasName]) {
-            this.children[aliasName].release()
+          if(child) {
+            child.release()
             delete this.children[aliasName]
           }
           if (this.data[aliasName] !== subData) {
@@ -233,33 +291,46 @@ class ArSyncRecord extends ArSyncContainerBase {
         }
       }
     }
+    if (this.query.attributes['*']) {
+      for (const key in data) {
+        if (!this.query.attributes[key] && this.data[key] !== data[key]) {
+          this.mark()
+          this.data[key] = data[key]
+        }
+      }
+    }
     this.subscribeAll()
   }
-  onNotify(notifyData, path?) {
+  onNotify(notifyData: NotifyData, path?: string) {
     const { action, class_name, id } = notifyData
+    const query = path && this.query.attributes[path]
+    const aliasName = (query && query.as) || path;
     if (action === 'remove') {
-      this.children[path].release()
-      this.children[path] = null
+      const child = this.children[aliasName]
+      if (child) child.release()
+      this.children[aliasName] = null
       this.mark()
-      this.data[path] = null
-      this.onChange([path], null)
+      this.data[aliasName] = null
+      this.onChange([aliasName], null)
     } else if (action === 'add') {
-      if (this.data.id === id) return
-      const query = this.query.attributes[path]
-      ModelBatchRequest.fetch(class_name, query, id).then(data => {
-        if (!data) return
+      if (this.data[aliasName] && this.data[aliasName].id === id) return
+      ModelBatchRequest.fetch(class_name, ArSyncRecord.compactQuery(query), id).then(data => {
+        if (!data || !this.data) return
         const model = new ArSyncRecord(query, data, null, this.root)
-        if (this.children[path]) this.children[path].release()
-        this.children[path] = model
+        const child = this.children[aliasName]
+        if (child) child.release()
+        this.children[aliasName] = model
         this.mark()
-        this.data[path] = model.data
+        this.data[aliasName] = model.data
         model.parentModel = this
-        model.parentKey = path
-        this.onChange([path], model.data)
+        model.parentKey = aliasName
+        this.onChange([aliasName], model.data)
       })
     } else {
-      ModelBatchRequest.fetch(class_name, this.reloadQuery(), id).then(data => {
-        this.update(data)
+      const { field } = notifyData
+      const query = field ? this.patchQuery(field) : this.reloadQuery()
+      if (query) ModelBatchRequest.fetch(class_name, query, id).then(data => {
+        if (this.data) this.update(data)
       })
     }
   }
@@ -273,6 +344,18 @@ class ArSyncRecord extends ArSyncContainerBase {
       for (const key of this.sync_keys) this.subscribe(key + path, pathCallback)
     }
   }
+  patchQuery(key: string) {
+    const val = this.query.attributes[key]
+    if (!val) return
+    let { attributes, as, params } = val
+    if (attributes && Object.keys(val.attributes).length === 0) attributes = null
+    if (!attributes && !as && !params) return key
+    const result: { attributes?; as?; params? } = {}
+    if (attributes) result.attributes = attributes
+    if (as) result.as = as
+    if (params) result.params = params
+    return result
+  }
   reloadQuery() {
     if (this.reloadQueryCache) return this.reloadQueryCache
     const reloadQuery = this.reloadQueryCache = { attributes: [] as any[] }
@@ -289,13 +372,15 @@ class ArSyncRecord extends ArSyncContainerBase {
   }
   update(data) {
     for (const key in data) {
+      const subQuery = this.query.attributes[key]
+      if (subQuery && subQuery.attributes && Object.keys(subQuery.attributes).length > 0) continue
       if (this.data[key] === data[key]) continue
       this.mark()
       this.data[key] = data[key]
       this.onChange([key], data[key])
     }
   }
-  markAndSet(key, data) {
+  markAndSet(key: string, data: any) {
     this.mark()
     this.data[key] = data
   }
@@ -305,68 +390,87 @@ class ArSyncRecord extends ArSyncContainerBase {
     this.root.mark(this.data)
     if (this.parentModel) this.parentModel.markAndSet(this.parentKey, this.data)
   }
-  onChange(path, data) {
-    if (this.parentModel) this.parentModel.onChange([this.parentKey, ...path], data)
-  }
 }
+
 class ArSyncCollection extends ArSyncContainerBase {
   root
-  path
-  order
+  path: string
+  order: { limit: number | null; key: string; mode: 'asc' | 'desc' } = { limit: null, mode: 'asc', key: 'id' }
   query
-  data
-  children
-  sync_keys
-  constructor(sync_keys, path, query, data, request, root){
+  compactQuery
+  data: any[]
+  children: ArSyncRecord[]
+  aliasOrderKey = 'id'
+  constructor(sync_keys: string[], path: string, query, data: any[], request, root){
     super()
     this.root = root
     this.path = path
+    this.query = query
+    this.compactQuery = ArSyncRecord.compactQuery(query)
     if (request) this.initForReload(request)
     if (query.params && (query.params.order || query.params.limit)) {
-      this.order = { limit: query.params.limit, mode: query.params.order || 'asc' }
-    } else {
-      this.order = { limit: null, mode: 'asc' }
+      this.setOrdering(query.params.limit, query.params.order)
     }
-    this.query = query
     this.data = []
     this.children = []
     this.replaceData(data, sync_keys)
   }
-  setSyncKeys(sync_keys) {
+  setOrdering(limit: unknown, order: unknown) {
+    let mode: 'asc' | 'desc' = 'asc'
+    let key: string = 'id'
+    if (order === 'asc' || order === 'desc') {
+      mode = order
+    } else if (typeof order === 'object' && order) {
+      const keys = Object.keys(order)
+      if (keys.length > 1) throw 'multiple order keys are not supported'
+      if (keys.length === 1) key = keys[0]
+      mode = order[key] === 'asc' ? 'asc' : 'desc'
+    }
+    const limitNumber = (typeof limit === 'number') ? limit : null
+    if (limitNumber !== null && key !== 'id') throw 'limit with custom order key is not supported'
+    const subQuery = this.query.attributes[key]
+    this.aliasOrderKey = (subQuery && subQuery.as) || key
+    this.order = { limit: limitNumber, mode, key }
+  }
+  setSyncKeys(sync_keys: string[]) {
     if (sync_keys) {
       this.sync_keys = sync_keys.map(key => key + this.path)
     } else {
-      console.error('warning: no sync_keys')
       this.sync_keys = []
     }
   }
-  replaceData(data, sync_keys) {
+  replaceData(data: any[] | { collection: any[]; order: any }, sync_keys: string[]) {
     this.setSyncKeys(sync_keys)
-    const existings = {}
+    const existings: { [key: string]: ArSyncRecord } = {}
     for (const child of this.children) existings[child.data.id] = child
-    let collection
-    if (data.collection && data.order) {
+    let collection: any[]
+    if ('collection' in data && 'order' in data) {
       collection = data.collection
-      this.order = data.order
+      this.setOrdering(data.order.limit, data.order.mode)
     } else {
       collection = data
     }
     const newChildren: any[] = []
     const newData: any[] = []
     for (const subData of collection) {
-      let model = existings[subData.id]
+      let model: ArSyncRecord | null = null
+      if (typeof(subData) === 'object' && subData && 'id' in subData) model = existings[subData.id]
+      let data = subData
       if (model) {
         model.replaceData(subData)
-      } else {
+      } else if (subData.id) {
         model = new ArSyncRecord(this.query, subData, null, this.root)
         model.parentModel = this
         model.parentKey = subData.id
       }
-      newChildren.push(model)
-      newData.push(model.data)
+      if (model) {
+        newChildren.push(model)
+        data = model.data
+      }
+      newData.push(data)
     }
     while (this.children.length) {
-      const child = this.children.pop()
+      const child = this.children.pop()!
       if (!existings[child.data.id]) child.release()
     }
     if (this.data.length || newChildren.length) this.mark()
@@ -375,7 +479,7 @@ class ArSyncCollection extends ArSyncContainerBase {
     for (const el of newData) this.data.push(el)
     this.subscribeAll()
   }
-  consumeAdd(className, id) {
+  consumeAdd(className: string, id: number) {
     if (this.data.findIndex(a => a.id === id) >= 0) return
     if (this.order.limit === this.data.length) {
       if (this.order.mode === 'asc') {
@@ -386,24 +490,22 @@ class ArSyncCollection extends ArSyncContainerBase {
         if (last && last.id > id) return
       }
     }
-    ModelBatchRequest.fetch(className, this.query, id).then((data) => {
-      if (!data) return
+    ModelBatchRequest.fetch(className, this.compactQuery, id).then((data: any) => {
+      if (!data || !this.data) return
       const model = new ArSyncRecord(this.query, data, null, this.root)
       model.parentModel = this
       model.parentKey = id
       const overflow = this.order.limit && this.order.limit === this.data.length
-      let rmodel
+      let rmodel: ArSyncRecord | undefined
       this.mark()
+      const orderKey = this.aliasOrderKey
       if (this.order.mode === 'asc') {
         const last = this.data[this.data.length - 1]
         this.children.push(model)
         this.data.push(model.data)
-        if (last && last.id > id) {
-          this.children.sort((a, b) => a.data.id < b.data.id ? -1 : +1)
-          this.data.sort((a, b) => a.id < b.id ? -1 : +1)
-        }
+        if (last && last[orderKey] > data[orderKey]) this.markAndSort()
         if (overflow) {
-          rmodel = this.children.shift()
+          rmodel = this.children.shift()!
           rmodel.release()
           this.data.shift()
         }
@@ -411,12 +513,9 @@ class ArSyncCollection extends ArSyncContainerBase {
         const first = this.data[0]
         this.children.unshift(model)
         this.data.unshift(model.data)
-        if (first && first.id > id) {
-          this.children.sort((a, b) => a.data.id > b.data.id ? -1 : +1)
-          this.data.sort((a, b) => a.id > b.id ? -1 : +1)
-        }
+        if (first && first[orderKey] > data[orderKey]) this.markAndSort()
         if (overflow) {
-          rmodel = this.children.pop()
+          rmodel = this.children.pop()!
           rmodel.release()
           this.data.pop()
         }
@@ -425,7 +524,18 @@ class ArSyncCollection extends ArSyncContainerBase {
       if (rmodel) this.onChange([rmodel.id], null)
     })
   }
-  consumeRemove(id) {
+  markAndSort() {
+    this.mark()
+    const orderKey = this.aliasOrderKey
+    if (this.order.mode === 'asc') {
+      this.children.sort((a, b) => a.data[orderKey] < b.data[orderKey] ? -1 : +1)
+      this.data.sort((a, b) => a[orderKey] < b[orderKey] ? -1 : +1)
+    } else {
+      this.children.sort((a, b) => a.data[orderKey] > b.data[orderKey] ? -1 : +1)
+      this.data.sort((a, b) => a[orderKey] > b[orderKey] ? -1 : +1)
+    }
+  }
+  consumeRemove(id: number) {
     const idx = this.data.findIndex(a => a.id === id)
     if (idx < 0) return
     this.mark()
@@ -445,7 +555,11 @@ class ArSyncCollection extends ArSyncContainerBase {
     const callback = data => this.onNotify(data)
     for (const key of this.sync_keys) this.subscribe(key, callback)
   }
-  markAndSet(id, data) {
+  onChange(path: (string | number)[], data) {
+    super.onChange(path, data)
+    if (path[1] === this.aliasOrderKey) this.markAndSort()
+  }
+  markAndSet(id: number, data) {
     this.mark()
     const idx = this.data.findIndex(a => a.id === id)
     if (idx >= 0) this.data[idx] = data
@@ -459,11 +573,11 @@ class ArSyncCollection extends ArSyncContainerBase {
 }
 
 export default class ArSyncStore {
-  immutable
-  markedForFreezeObjects
+  immutable: boolean
+  markedForFreezeObjects: any[]
   changes
   eventListeners
-  markForRelease
+  markForRelease: true | undefined
   container
   request
   complete: boolean
@@ -473,7 +587,7 @@ export default class ArSyncStore {
   retryLoadTimer: number | undefined | null
   static connectionManager
   constructor(request, { immutable } = {} as { immutable?: boolean }) {
-    this.immutable = immutable
+    this.immutable = !!immutable
     this.markedForFreezeObjects = []
     this.changes = []
     this.eventListeners = { events: {}, serial: 0 }
@@ -503,6 +617,7 @@ export default class ArSyncStore {
         this.trigger('connection', state)
       }
     }).catch(e => {
+      if (!e || e.retry === undefined) throw e
       if (this.markForRelease) return
       if (!e.retry) {
         this.complete = true