Remove array, object, and storage mixins and helpers/utils

addon/mixins/storage.js → addon/-private/legacy-mixins/storage.js

@@ -1,7 +1,7 @@
 import Mixin from '@ember/object/mixin';
 import { set, get } from '@ember/object';
 import { isArray, A } from '@ember/array';
-import { getStorage } from '../helpers/storage';
+import { getStorage } from 'ember-local-storage/helpers/storage';
 import { copy } from 'ember-copy';
 import { getOwner } from '@ember/application';
 import { associateDestroyableChild } from '@ember/destroyable';

addon/adapters/base.js

@@ -23,10 +23,6 @@ export default class BaseAdapter extends JSONAPIAdapter {
   _debug = false;
   coalesceFindRequests = false;
 
-  // TODO: v2.0 - What are the defaults now? What versions to support?
-  isNewSerializerAPI = true;
-
-  // TODO: v2.0 - Can we deprecate or remove that? What are the defaults now? What versions to support?
   // Reload behavior
   shouldReloadRecord() {
     return true;
@@ -96,49 +92,19 @@ export default class BaseAdapter extends JSONAPIAdapter {
     return super.deleteRecord(...arguments);
   }
 
-  // Polyfill queryRecord
-  queryRecord(store, type, query) {
+  queryRecord() {
     let records = super.queryRecord(...arguments);
 
-    if (!records) {
-      var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
-
-      // TODO: Document why this is needed or remove it!
-      if (this.sortQueryParams) {
-        query = this.sortQueryParams(query);
-      }
-
-      records = this.ajax(url, 'GET', { data: query });
-    }
-
     return records.then(function (result) {
       return { data: result.data[0] || null };
     });
   }
 
-  // TODO: v2.0 - What are the defaults now? What versions to support?
   // Delegate to _handleStorageRequest
   ajax() {
     return this._handleStorageRequest.apply(this, arguments);
   }
 
-  // Delegate to _handleStorageRequest
-  makeRequest(request) {
-    return this._handleStorageRequest(request.url, request.method, {
-      data: request.data,
-    });
-  }
-
-  // Work arround ds-improved-ajax Feature Flag
-  _makeRequest() {
-    return this.makeRequest.apply(this, arguments);
-  }
-
-  // Remove the ajax() deprecation warning
-  _hasCustomizedAjax() {
-    return false;
-  }
-
   // Delegate to _handle${type}Request
   _handleStorageRequest(url, type, options = {}) {
     if (this._debug) {

addon/adapters/local.js

@@ -1,7 +1,7 @@
 import { get } from '@ember/object';
 import BaseAdapter from './base';
-import { getStorage, _buildKey } from '../helpers/storage';
-import StorageArray from '../local/array';
+import { getStorage, _buildKey } from 'ember-local-storage/helpers/storage';
+import StorageArray from 'ember-local-storage/local/array';
 import { getOwner } from '@ember/application';
 
 export default class LocalStorageAdapter extends BaseAdapter {

addon/adapters/session.js

@@ -1,7 +1,7 @@
 import { get } from '@ember/object';
 import BaseAdapter from './base';
-import { getStorage, _buildKey } from '../helpers/storage';
-import StorageArray from '../session/array';
+import { getStorage, _buildKey } from 'ember-local-storage/helpers/storage';
+import StorageArray from 'ember-local-storage/session/array';
 import { getOwner } from '@ember/application';
 
 export default class SessionStorageAdapter extends BaseAdapter {

addon/local/array.js

@@ -1,6 +1,17 @@
+import { A } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
-import ArrayProxyMixin from '../mixins/array';
+import { set } from '@ember/object';
+import StorageProxyMixin from 'ember-local-storage/-private/legacy-mixins/storage';
+import { save } from 'ember-local-storage/-private/legacy-utils';
 
-export default ArrayProxy.extend(ArrayProxyMixin, {
+export default ArrayProxy.extend(StorageProxyMixin, {
+  _initialContent: A(),
   _storageType: 'local',
+
+  _clear() {
+    set(this, 'content', A());
+  },
+
+  replaceContent: save,
+  reset: save,
 });

addon/local/object.js

@@ -1,6 +1,17 @@
+import { set } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
-import ObjectProxyMixin from '../mixins/object';
+import StorageProxyMixin from 'ember-local-storage/-private/legacy-mixins/storage';
+import { save, saveIfChanged } from 'ember-local-storage/-private/legacy-utils';
 
-export default ObjectProxy.extend(ObjectProxyMixin, {
+export default ObjectProxy.extend(StorageProxyMixin, {
+  _initialContent: {},
   _storageType: 'local',
+
+  _clear() {
+    set(this, 'content', {});
+  },
+
+  setUnknownProperty: saveIfChanged,
+  set: saveIfChanged,
+  setProperties: save,
 });

addon/serializers/serializer.js

@@ -1,17 +1,13 @@
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 
-export default JSONAPISerializer.extend({
+export default class Serializer extends JSONAPISerializer {
   shouldSerializeHasMany() {
     return true;
-  },
+  }
 
   serializeBelongsTo() {
     this._fixSerializeBelongsTo(...arguments);
-  },
-
-  serializeHasMany() {
-    this._fixSerializeHasMany(...arguments);
-  },
+  }
 
   _fixSerializeBelongsTo(snapshot, json, relationship) {
     let key = relationship.key;
@@ -43,7 +39,11 @@ export default JSONAPISerializer.extend({
         json.relationships[payloadKey] = { data };
       }
     }
-  },
+  }
+
+  serializeHasMany() {
+    this._fixSerializeHasMany(...arguments);
+  }
 
   _fixSerializeHasMany(snapshot, json, relationship) {
     let key = relationship.key;
@@ -66,7 +66,7 @@ export default JSONAPISerializer.extend({
         let data = new Array(nonNewHasMany.length);
 
         for (let i = 0; i < nonNewHasMany.length; i++) {
-          let item = hasMany[i];
+          let item = nonNewHasMany[i];
           let payloadType = this.payloadKeyFromModelName(item.modelName);
 
           data[i] = {
@@ -78,5 +78,5 @@ export default JSONAPISerializer.extend({
         json.relationships[payloadKey] = { data };
       }
     }
-  },
-});
+  }
+}

addon/session/array.js

@@ -1,6 +1,17 @@
+import { A } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
-import ArrayProxyMixin from '../mixins/array';
+import { set } from '@ember/object';
+import StorageProxyMixin from 'ember-local-storage/-private/legacy-mixins/storage';
+import { save } from 'ember-local-storage/-private/legacy-utils';
 
-export default ArrayProxy.extend(ArrayProxyMixin, {
+export default ArrayProxy.extend(StorageProxyMixin, {
+  _initialContent: A(),
   _storageType: 'session',
+
+  _clear() {
+    set(this, 'content', A());
+  },
+
+  replaceContent: save,
+  reset: save,
 });

addon/session/object.js

@@ -1,6 +1,17 @@
+import { set } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
-import ObjectProxyMixin from '../mixins/object';
+import StorageProxyMixin from 'ember-local-storage/-private/legacy-mixins/storage';
+import { save, saveIfChanged } from 'ember-local-storage/-private/legacy-utils';
 
-export default ObjectProxy.extend(ObjectProxyMixin, {
+export default ObjectProxy.extend(StorageProxyMixin, {
+  _initialContent: {},
   _storageType: 'session',
+
+  _clear() {
+    set(this, 'content', {});
+  },
+
+  setUnknownProperty: saveIfChanged,
+  set: saveIfChanged,
+  setProperties: save,
 });

config/ember-try.js

@@ -100,6 +100,8 @@ module.exports = async function () {
             'ember-auto-import': '^2.2.0',
             'ember-data': 'latest',
             'ember-source': await getChannelURL('release'),
+            'ember-resolver': '10.0.0',
+            '@ember/string': '3.0.1',
           },
         },
       },