es6(db): Query-related classes moved to ES2016

Author: bengotow

spec/models/mutable-query-result-set-spec.coffee

@@ -1,5 +1,5 @@
-MutableQueryResultSet = require '../../src/flux/models/mutable-query-result-set'
-QueryRange = require '../../src/flux/models/query-range'
+MutableQueryResultSet = require('../../src/flux/models/mutable-query-result-set').default
+QueryRange = require('../../src/flux/models/query-range').default
 _ = require 'underscore'
 
 describe "MutableQueryResultSet", ->

spec/models/query-range-spec.coffee

@@ -1,4 +1,4 @@
-QueryRange = require '../../src/flux/models/query-range'
+QueryRange = require('../../src/flux/models/query-range').default
 
 describe "QueryRange", ->
   describe "@infinite", ->

spec/models/query-subscription-pool-spec.coffee

@@ -1,4 +1,4 @@
-QuerySubscriptionPool = require '../../src/flux/models/query-subscription-pool'
+QuerySubscriptionPool = require('../../src/flux/models/query-subscription-pool').default
 DatabaseStore = require '../../src/flux/stores/database-store'
 Label = require '../../src/flux/models/label'
 

spec/models/query-subscription-spec.coffee

@@ -1,7 +1,7 @@
 DatabaseStore = require '../../src/flux/stores/database-store'
 
-QueryRange = require '../../src/flux/models/query-range'
-MutableQueryResultSet = require '../../src/flux/models/mutable-query-result-set'
+QueryRange = require('../../src/flux/models/query-range').default
+MutableQueryResultSet = require('../../src/flux/models/mutable-query-result-set').default
 QuerySubscription = require('../../src/flux/models/query-subscription').default
 Thread = require('../../src/flux/models/thread').default
 Label = require '../../src/flux/models/label'

src/flux/action-bridge.coffee

@@ -2,6 +2,7 @@ _ = require 'underscore'
 Actions = require './actions'
 Model = require './models/model'
 DatabaseStore = require './stores/database-store'
+DatabaseChangeRecord = require('./stores/database-change-record').default
 
 Utils = require './models/utils'
 
@@ -98,7 +99,7 @@ class ActionBridge
 
       if name == Message.DATABASE_STORE_TRIGGER
         DatabaseStore.triggeringFromActionBridge = true
-        DatabaseStore.trigger(new DatabaseStore.ChangeRecord(args...))
+        DatabaseStore.trigger(new DatabaseChangeRecord(args[0]))
         DatabaseStore.triggeringFromActionBridge = false
 
       else if Actions[name]

src/flux/models/mutable-query-result-set.coffee

@@ -0,0 +1,112 @@
+import QueryResultSet from './query-result-set';
+import AttributeJoinedData from '../attributes/attribute-joined-data';
+
+// TODO: Make mutator methods QueryResultSet.join(), QueryResultSet.clip...
+export default class MutableQueryResultSet extends QueryResultSet {
+
+  immutableClone() {
+    const set = new QueryResultSet({
+      _ids: [].concat(this._ids),
+      _modelsHash: Object.assign({}, this._modelsHash),
+      _query: this._query,
+      _offset: this._offset,
+    });
+    Object.freeze(set._ids);
+    Object.freeze(set._modelsHash);
+    return set;
+  }
+
+  clipToRange(range) {
+    if (range.isInfinite()) {
+      return;
+    }
+    if (range.offset > this._offset) {
+      this._ids = this._ids.slice(range.offset - this._offset);
+      this._offset = range.offset;
+    }
+
+    const rangeEnd = range.offset + range.limit;
+    const selfEnd = this._offset + this._ids.length;
+    if (rangeEnd < selfEnd) {
+      this._ids.length = Math.max(0, rangeEnd - this._offset);
+    }
+
+    const models = this.models();
+    this._modelsHash = {};
+    this._idToIndexHash = null;
+    models.forEach((m) => this.updateModel(m));
+  }
+
+  addModelsInRange(rangeModels, range) {
+    this.addIdsInRange(rangeModels.map(m => m.id), range);
+    rangeModels.forEach((m) => this.updateModel(m));
+  }
+
+  addIdsInRange(rangeIds, range) {
+    if ((this._offset === null) || range.isInfinite()) {
+      this._ids = rangeIds;
+      this._idToIndexHash = null;
+      this._offset = range.offset;
+    } else {
+      const currentEnd = this._offset + this._ids.length;
+      const rangeIdsEnd = range.offset + rangeIds.length;
+
+      if (rangeIdsEnd < this._offset) {
+        throw new Error(`addIdsInRange: You can only add adjacent values (${rangeIdsEnd} < ${this._offset})`)
+      }
+      if (range.offset > currentEnd) {
+        throw new Error(`addIdsInRange: You can only add adjacent values (${range.offset} > ${currentEnd})`);
+      }
+
+      let existingBefore = []
+      if (range.offset > this._offset) {
+        existingBefore = this._ids.slice(0, range.offset - this._offset);
+      }
+
+      let existingAfter = []
+      if ((rangeIds.length === range.limit) && (currentEnd > rangeIdsEnd)) {
+        existingAfter = this._ids.slice(rangeIdsEnd - this._offset);
+      }
+
+      this._ids = [].concat(existingBefore, rangeIds, existingAfter);
+      this._idToIndexHash = null;
+      this._offset = Math.min(this._offset, range.offset);
+    }
+  }
+
+  updateModel(item) {
+    if (!item) {
+      return;
+    }
+
+    // Sometimes the new copy of `item` doesn't contain the joined data present
+    // in the old one, since it's not provided by default and may not have changed.
+    // Make sure we never drop joined data by pulling it over.
+    const existing = this._modelsHash[item.clientId];
+    if (existing) {
+      const attrs = existing.constructor.attributes
+      for (const key of Object.keys(attrs)) {
+        const attr = attrs[key];
+        if ((attr instanceof AttributeJoinedData) && (item[attr.modelKey] === undefined)) {
+          item[attr.modelKey] = existing[attr.modelKey];
+        }
+      }
+    }
+    this._modelsHash[item.clientId] = item;
+    this._modelsHash[item.id] = item;
+    this._idToIndexHash = null;
+  }
+
+  removeModelAtOffset(item, offset) {
+    const idx = offset - this._offset;
+    delete this._modelsHash[item.clientId];
+    delete this._modelsHash[item.id];
+    this._ids.splice(idx, 1);
+    this._idToIndexHash = null;
+  }
+
+  setQuery(query) {
+    this._query = query.clone();
+    this._query.finalize();
+  }
+}