ar_sync 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab145d5094c25600e95e01ab625c0128782b2a0592be95d8c9333539a5128bd1
-  data.tar.gz: 062fcf8cb8996e145dfa35eb25b31f2ecc2b4a486183bc70678d055db2bf2bc8
+  metadata.gz: 8c13bb4ca3915637f310817c9b5c689c12c05f0140cfe2d982da653bc251bf7e
+  data.tar.gz: 447f9877703f3ba4cee8d590b6f63d91bc09486a86d2a709169ac245bcd592be
 SHA512:
-  metadata.gz: 556a1c954088cea90d44bb61cec1fc250804f1fc5ec4e1c4101ff642343af49bc4ce8870be152de4627802931409d3c5f25707fa34b59ba8e53e9873a99e9b54
-  data.tar.gz: 28846608f3314be4a117d1ffbf265702f2170755f027696300f991b01a9228302d7e218fce757826c7528c8643d98f66e1073741305c1d851f1fe6602c9f185b
+  metadata.gz: dd149d8f9b3ee83ba0e72cc0924bffdcaa9fc144c29a25b544ed9959f270ab65514fb7f18d0410ed1afc88d9db59b2b3f1c964b1005b6eae3057c2d4416d7174
+  data.tar.gz: c54c4e3b427c7f4bfec039bc4cacab491a413cc8e29a47307a4078e56266e7473c1171ed99bd5f3281b9afd509db298f293c9625250e040a7ef53f93c6d2f5ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_sync (1.1.0)
+    ar_sync (1.1.1)
       activerecord
       ar_serializer
 

data/core/ArSyncStore.js

@@ -156,7 +156,7 @@ var ArSyncContainerBase = /** @class */ (function () {
         }
         this.listeners = [];
     };
-    ArSyncContainerBase.compactQuery = function (query) {
+    ArSyncContainerBase.compactQueryAttributes = function (query) {
         function compactAttributes(attributes) {
             var attrs = {};
             var keys = [];
@@ -201,6 +201,8 @@ var ArSyncContainerBase = /** @class */ (function () {
             return result;
         }
         var result = compactQuery(query);
+        if (typeof result === 'object' && 'attributes' in result)
+            return result.attributes;
         return result === true ? {} : result;
     };
     ArSyncContainerBase.parseQuery = function (query, attrsonly) {
@@ -247,17 +249,17 @@ var ArSyncContainerBase = /** @class */ (function () {
     ArSyncContainerBase._load = function (_a, root) {
         var api = _a.api, id = _a.id, params = _a.params, query = _a.query;
         var parsedQuery = ArSyncRecord.parseQuery(query);
-        var compactQuery = ArSyncRecord.compactQuery(parsedQuery);
+        var compactQueryAttributes = ArSyncRecord.compactQueryAttributes(parsedQuery);
         if (id != null) {
-            return modelBatchRequest.fetch(api, compactQuery, id).then(function (data) {
+            return modelBatchRequest.fetch(api, compactQueryAttributes, id).then(function (data) {
                 if (!data)
                     throw { retry: false };
-                var request = { api: api, id: id, query: compactQuery };
+                var request = { api: api, id: id, query: compactQueryAttributes };
                 return new ArSyncRecord(parsedQuery, data, request, root);
             });
         }
         else {
-            var request_1 = { api: api, query: compactQuery, params: params };
+            var request_1 = { api: api, query: compactQueryAttributes, params: params };
             return ArSyncApi_1.default.syncFetch(request_1).then(function (response) {
                 if (!response) {
                     throw { retry: false };
@@ -393,7 +395,7 @@ var ArSyncRecord = /** @class */ (function (_super) {
         else if (action === 'add') {
             if (this.data[aliasName] && this.data[aliasName].id === id)
                 return;
-            modelBatchRequest.fetch(className, ArSyncRecord.compactQuery(query), id).then(function (data) {
+            modelBatchRequest.fetch(className, ArSyncRecord.compactQueryAttributes(query), id).then(function (data) {
                 if (!data || !_this.data)
                     return;
                 var model = new ArSyncRecord(query, data, null, _this.root);
@@ -444,40 +446,30 @@ var ArSyncRecord = /** @class */ (function (_super) {
         }
     };
     ArSyncRecord.prototype.patchQuery = function (key) {
-        var val = this.queryAttributes[key];
-        if (!val)
-            return;
-        var attributes = val.attributes, as = val.as, params = val.params;
-        if (attributes && Object.keys(val.attributes).length === 0)
-            attributes = null;
-        if (!attributes && !as && !params)
-            return key;
-        var result = {};
-        if (attributes)
-            result.attributes = attributes;
-        if (as)
-            result.as = as;
-        if (params)
-            result.params = params;
-        return result;
+        var _a;
+        var subQuery = this.queryAttributes[key];
+        if (subQuery)
+            return _a = {}, _a[key] = subQuery, _a;
     };
     ArSyncRecord.prototype.reloadQuery = function () {
-        var _a;
         if (this.reloadQueryCache)
             return this.reloadQueryCache;
-        var reloadQuery = this.reloadQueryCache = { attributes: [] };
+        var arrayQuery = [];
+        var hashQuery = {};
         for (var key in this.queryAttributes) {
             if (key === 'sync_keys')
                 continue;
             var val = this.queryAttributes[key];
             if (!val || !val.attributes) {
-                reloadQuery.attributes.push(key);
+                arrayQuery === null || arrayQuery === void 0 ? void 0 : arrayQuery.push(key);
+                hashQuery[key] = true;
             }
             else if (!val.params && Object.keys(val.attributes).length === 0) {
-                reloadQuery.attributes.push((_a = {}, _a[key] = val, _a));
+                arrayQuery = null;
+                hashQuery[key] = val;
             }
         }
-        return reloadQuery;
+        return this.reloadQueryCache = arrayQuery || hashQuery;
     };
     ArSyncRecord.prototype.update = function (data) {
         for (var key in data) {
@@ -515,7 +507,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
         _this.path = path;
         _this.query = query;
         _this.queryAttributes = query.attributes || {};
-        _this.compactQuery = ArSyncRecord.compactQuery(query);
+        _this.compactQueryAttributes = ArSyncRecord.compactQueryAttributes(query);
         if (request)
             _this.initForReload(request);
         if (query.params) {
@@ -638,7 +630,7 @@ var ArSyncCollection = /** @class */ (function (_super) {
                 }
             }
         }
-        modelBatchRequest.fetch(className, this.compactQuery, id).then(function (data) {
+        modelBatchRequest.fetch(className, this.compactQueryAttributes, id).then(function (data) {
             if (!data || !_this.data)
                 return;
             var model = new ArSyncRecord(_this.query, data, null, _this.root);

data/lib/ar_sync/rails.rb

@@ -47,8 +47,8 @@ module ArSync
     end
 
     def sync_call
-      _api_call :sync do |model, current_user, query|
-        ArSync.sync_serialize model, current_user, query
+      _api_call :sync do |schema, current_user, query|
+        ArSync.sync_serialize schema, current_user, query
       end
     end
 
@@ -69,15 +69,8 @@ module ArSync
     end
 
     def static_call
-      _api_call :static do |model, current_user, query|
-        case model
-        when ArSync::Collection, ActiveRecord::Relation, Array
-          ArSerializer.serialize model.to_a, query, context: current_user
-        when ArSerializer::Serializable
-          ArSerializer.serialize model, query, context: current_user
-        else
-          model
-        end
+      _api_call :static do |schema, current_user, query|
+        ArSerializer.serialize schema, query, context: current_user
       end
     end
 
@@ -87,15 +80,19 @@ module ArSync
       if respond_to?(ArSync.config.current_user_method)
         current_user = send ArSync.config.current_user_method
       end
+      sch = schema
       responses = params[:requests].map do |request|
         begin
           api_name = request[:api]
-          sch = schema
-          info = sch.class._serializer_field_info api_name
-          raise ArSync::ApiNotFound, "#{type.to_s.capitalize} API named `#{api_name}` not configured" unless info
-          api_params = (request[:params].as_json || {}).transform_keys(&:to_sym)
-          model = sch.instance_exec(current_user, **api_params, &info.data_block)
-          { data: yield(model, current_user, request[:query].as_json) }
+          raise ArSync::ApiNotFound, "#{type.to_s.capitalize} API named `#{api_name}` not configured" unless sch.class._serializer_field_info api_name
+          query = {
+            api_name => {
+              as: :data,
+              params: request[:params].as_json,
+              attributes: request[:query].as_json
+            }
+          }
+          yield schema, current_user, query
         rescue StandardError => e
           { error: handle_exception(e) }
         end

data/lib/ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ArSync
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/src/core/ArSyncStore.ts

@@ -124,7 +124,7 @@ class ArSyncContainerBase {
     for (const l of this.listeners) l.unsubscribe()
     this.listeners = []
   }
-  static compactQuery(query: ParsedQuery) {
+  static compactQueryAttributes(query: ParsedQuery) {
     function compactAttributes(attributes: Record<string, ParsedQuery>): [ParsedQuery, boolean] {
       const attrs = {}
       const keys: string[] = []
@@ -160,6 +160,7 @@ class ArSyncContainerBase {
       return result
     }
     const result = compactQuery(query)
+    if (typeof result === 'object' && 'attributes' in result) return result.attributes
     return result === true ? {} : result
   }
   static parseQuery(query, attrsonly: true): Record<string, ParsedQuery>
@@ -198,15 +199,15 @@ class ArSyncContainerBase {
   }
   static _load({ api, id, params, query }, root) {
     const parsedQuery = ArSyncRecord.parseQuery(query)
-    const compactQuery = ArSyncRecord.compactQuery(parsedQuery)
+    const compactQueryAttributes = ArSyncRecord.compactQueryAttributes(parsedQuery)
     if (id != null) {
-      return modelBatchRequest.fetch(api, compactQuery, id).then(data => {
+      return modelBatchRequest.fetch(api, compactQueryAttributes, id).then(data => {
         if (!data) throw { retry: false }
-        const request = { api, id, query: compactQuery }
+        const request = { api, id, query: compactQueryAttributes }
         return new ArSyncRecord(parsedQuery, data, request, root)
       })
     } else {
-      const request = { api, query: compactQuery, params }
+      const request = { api, query: compactQueryAttributes, params }
       return ArSyncApi.syncFetch(request).then((response: any) => {
         if (!response) {
           throw { retry: false }
@@ -338,7 +339,7 @@ class ArSyncRecord extends ArSyncContainerBase {
       this.onChange([aliasName], null)
     } else if (action === 'add') {
       if (this.data[aliasName] && this.data[aliasName].id === id) return
-      modelBatchRequest.fetch(className, ArSyncRecord.compactQuery(query), id).then(data => {
+      modelBatchRequest.fetch(className, ArSyncRecord.compactQueryAttributes(query), id).then(data => {
         if (!data || !this.data) return
         const model = new ArSyncRecord(query, data, null, this.root)
         const child = this.children[aliasName]
@@ -374,30 +375,25 @@ class ArSyncRecord extends ArSyncContainerBase {
     }
   }
   patchQuery(key: string) {
-    const val = this.queryAttributes[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
+    const subQuery = this.queryAttributes[key]
+    if (subQuery) return { [key]: subQuery }
   }
   reloadQuery() {
     if (this.reloadQueryCache) return this.reloadQueryCache
-    const reloadQuery = this.reloadQueryCache = { attributes: [] as any[] }
+    let arrayQuery = [] as string[] | null
+    const hashQuery = {}
     for (const key in this.queryAttributes) {
       if (key === 'sync_keys') continue
       const val = this.queryAttributes[key]
       if (!val || !val.attributes) {
-        reloadQuery.attributes.push(key)
+        arrayQuery?.push(key)
+        hashQuery[key] = true
       } else if (!val.params && Object.keys(val.attributes).length === 0) {
-        reloadQuery.attributes.push({ [key]: val })
+        arrayQuery = null
+        hashQuery[key] = val
       }
     }
-    return reloadQuery
+    return this.reloadQueryCache = arrayQuery || hashQuery
   }
   update(data) {
     for (const key in data) {
@@ -428,7 +424,7 @@ class ArSyncCollection extends ArSyncContainerBase {
   ordering: Ordering = { orderBy: 'id', direction: 'asc' }
   query
   queryAttributes
-  compactQuery
+  compactQueryAttributes
   data: any[]
   children: ArSyncRecord[]
   aliasOrderKey = 'id'
@@ -438,7 +434,7 @@ class ArSyncCollection extends ArSyncContainerBase {
     this.path = path
     this.query = query
     this.queryAttributes = query.attributes || {}
-    this.compactQuery = ArSyncRecord.compactQuery(query)
+    this.compactQueryAttributes = ArSyncRecord.compactQueryAttributes(query)
     if (request) this.initForReload(request)
     if (query.params) {
       this.setOrdering(query.params)
@@ -528,7 +524,7 @@ class ArSyncCollection extends ArSyncContainerBase {
         }
       }
     }
-    modelBatchRequest.fetch(className, this.compactQuery, id).then((data: any) => {
+    modelBatchRequest.fetch(className, this.compactQueryAttributes, id).then((data: any) => {
       if (!data || !this.data) return
       const model = new ArSyncRecord(this.query, data, null, this.root)
       model.parentModel = this

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord