@ember-data/store 4.0.0-beta.2 → 4.0.1

package/addon/-private/identifiers/cache.ts

@@ -2,7 +2,6 @@
   @module @ember-data/store
 */
 import { assert, warn } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 
 import coerceId from '../system/coerce-id';
@@ -23,7 +22,6 @@ import type {
 import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '../ts-interfaces/identifier';
 import type { ConfidentDict } from '../ts-interfaces/utils';
 import isNonEmptyString from '../utils/is-non-empty-string';
-import { addSymbol } from '../utils/symbol';
 import isStableIdentifier, { markStableIdentifier, unmarkStableIdentifier } from './is-stable-identifier';
 import uuidv4 from './utils/uuid-v4';
 
@@ -372,7 +370,7 @@ export class IdentifierCache {
       // If the incoming type does not match the identifier type, we need to create an identifier for the incoming
       // data so we can merge the incoming data with the existing identifier, see #7325 and #7363
       if ('type' in data && data.type && identifier.type !== normalizeModelName(data.type)) {
-        let incomingDataResource = assign({}, data);
+        let incomingDataResource = { ...data };
         // Need to strip the lid from the incomingData in order force a new identifier creation
         delete incomingDataResource.lid;
         existingIdentifier = this.getOrCreateRecordIdentifier(incomingDataResource);
@@ -511,8 +509,8 @@ function makeStableRecordIdentifier(
         return `${clientOriginated ? '[CLIENT_ORIGINATED] ' : ''}${type}:${id} (${lid})`;
       },
     };
-    addSymbol(wrapper, DEBUG_CLIENT_ORIGINATED, clientOriginated);
-    addSymbol(wrapper, DEBUG_IDENTIFIER_BUCKET, bucket);
+    wrapper[DEBUG_CLIENT_ORIGINATED] = clientOriginated;
+    wrapper[DEBUG_IDENTIFIER_BUCKET] = bucket;
     wrapper = freeze(wrapper);
     markStableIdentifier(wrapper);
     DEBUG_MAP.set(wrapper, recordIdentifier);

package/addon/-private/identifiers/utils/uuid-v4.ts

@@ -2,13 +2,6 @@
   @module @ember-data/store
 */
 
-// support IE11
-declare global {
-  interface Window {
-    msCrypto: Crypto;
-  }
-}
-
 const CRYPTO = (() => {
   const hasWindow = typeof window !== 'undefined';
   const isFastBoot = typeof FastBoot !== 'undefined';
@@ -27,12 +20,6 @@ const CRYPTO = (() => {
     };
   } else if (hasWindow && typeof window.crypto !== 'undefined') {
     return window.crypto;
-  } else if (
-    hasWindow &&
-    typeof window.msCrypto !== 'undefined' &&
-    typeof window.msCrypto.getRandomValues === 'function'
-  ) {
-    return window.msCrypto;
   } else {
     throw new Error('ember-data: Cannot find a valid way to generate local identifiers');
   }

package/addon/-private/index.ts

@@ -25,7 +25,6 @@ export { default as RootState } from './system/model/states';
 export { default as InternalModel } from './system/model/internal-model';
 
 export { PromiseArray, PromiseObject } from './system/promise-proxies';
-export { addSymbol, symbol } from './utils/symbol';
 
 export { RecordArray, AdapterPopulatedRecordArray } from './system/record-arrays';
 

package/addon/-private/system/core-store.ts

@@ -5,7 +5,6 @@ import { getOwner } from '@ember/application';
 import { A } from '@ember/array';
 import { assert, deprecate, inspect, warn } from '@ember/debug';
 import { computed, defineProperty, get, set } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { _backburner as emberBackburner } from '@ember/runloop';
 import type { Backburner } from '@ember/runloop/-private/backburner';
 import Service from '@ember/service';
@@ -68,7 +67,6 @@ import type { FindOptions } from '../ts-interfaces/store';
 import type { Dict } from '../ts-interfaces/utils';
 import constructResource from '../utils/construct-resource';
 import promiseRecord from '../utils/promise-record';
-import { addSymbol } from '../utils/symbol';
 import edBackburner from './backburner';
 import coerceId, { ensureStringId } from './coerce-id';
 import { errorsArrayToHash } from './errors-utils';
@@ -646,7 +644,7 @@ abstract class CoreStore extends Service {
     return emberBackburner.join(() => {
       return this._backburner.join(() => {
         let normalizedModelName = normalizeModelName(modelName);
-        let properties = assign({}, inputProperties);
+        let properties = { ...inputProperties };
 
         // If the passed properties do not include a primary key,
         // give the adapter an opportunity to generate one. Typically,
@@ -1280,7 +1278,7 @@ abstract class CoreStore extends Service {
     return Promise.resolve(internalModel);
   }
 
-  _findByInternalModel(internalModel, options: { preload?: any } = {}) {
+  _findByInternalModel(internalModel: InternalModel, options: FindOptions = {}) {
     if (options.preload) {
       this._backburner.join(() => {
         internalModel.preloadData(options.preload);
@@ -1295,7 +1293,7 @@ abstract class CoreStore extends Service {
     );
   }
 
-  _findEmptyInternalModel(internalModel, options) {
+  _findEmptyInternalModel(internalModel: InternalModel, options: FindOptions) {
     if (internalModel.currentState.isEmpty) {
       return this._scheduleFetch(internalModel, options);
     }
@@ -1307,9 +1305,9 @@ abstract class CoreStore extends Service {
       }
     } else {
       if (internalModel.currentState.isLoading) {
-        let pending = this._fetchManager.getPendingFetch(internalModel.identifier);
-        if (pending) {
-          return pending.then(() => Promise.resolve(internalModel));
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier, options);
+        if (pendingRequest) {
+          return pendingRequest.then(() => Promise.resolve(internalModel));
         }
         return this._scheduleFetch(internalModel, options);
       }
@@ -1601,18 +1599,14 @@ abstract class CoreStore extends Service {
         groups = [snapshots];
       }
 
-      // we use var here because babel transpiles let
-      // in a manner that causes a mega-bad perf scenario here
-      // when targets no longer include IE11 we can drop this.
-      /* eslint-disable no-var */
-      for (var i = 0, l = groups.length; i < l; i++) {
-        var group = groups[i];
-        var totalInGroup = groups[i].length;
-        var ids = new Array(totalInGroup);
-        var groupedInternalModels = new Array(totalInGroup);
+      for (let i = 0, l = groups.length; i < l; i++) {
+        let group = groups[i];
+        let totalInGroup = groups[i].length;
+        let ids = new Array(totalInGroup);
+        let groupedInternalModels = new Array(totalInGroup);
 
-        for (var j = 0; j < totalInGroup; j++) {
-          var internalModel = group[j]._internalModel;
+        for (let j = 0; j < totalInGroup; j++) {
+          let internalModel = group[j]._internalModel;
 
           groupedInternalModels[j] = internalModel;
           ids[j] = internalModel.id;
@@ -1629,7 +1623,7 @@ abstract class CoreStore extends Service {
               });
           })(groupedInternalModels);
         } else if (ids.length === 1) {
-          var pair = seeking[groupedInternalModels[0].id];
+          let pair = seeking[groupedInternalModels[0].id];
           _fetchRecord(pair);
         } else {
           assert("You cannot return an empty array from adapter's method groupRecordsForFindMany");
@@ -2055,7 +2049,7 @@ abstract class CoreStore extends Service {
     if (internalModel) {
       // short circuit if we are already loading
       if (REQUEST_SERVICE) {
-        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier);
+        let pendingRequest = this._fetchManager.getPendingFetch(internalModel.identifier, options);
         if (pendingRequest) {
           return pendingRequest.then(() => internalModel.getRecord());
         }
@@ -2087,6 +2081,10 @@ abstract class CoreStore extends Service {
         return resolve(null);
       }
 
+      if (!internalModel) {
+        assert(`No InternalModel found for ${resource.lid}`, internalModel);
+      }
+
       return this._findByInternalModel(internalModel, options);
     }
 
@@ -2714,7 +2712,7 @@ abstract class CoreStore extends Service {
         operation = 'deleteRecord';
       }
 
-      addSymbol(options, SaveOp, operation);
+      options[SaveOp] = operation;
 
       let fetchManagerPromise = this._fetchManager.scheduleSave(internalModel.identifier, options);
       let promise = fetchManagerPromise.then(

package/addon/-private/system/ds-model-store.ts

@@ -2,7 +2,6 @@ import { getOwner, setOwner } from '@ember/application';
 import { assert, deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
 import { get } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { isPresent } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
@@ -40,7 +39,7 @@ class Store extends CoreStore {
       _internalModel: internalModel,
       container: null,
     };
-    assign(createOptions, createRecordArgs);
+    Object.assign(createOptions, createRecordArgs);
 
     // ensure that `getOwner(this)` works inside a model instance
     setOwner(createOptions, getOwner(this));

package/addon/-private/system/fetch-manager.ts

@@ -12,7 +12,6 @@ import type { CollectionResourceDocument, SingleResourceDocument } from '../ts-i
 import type { FindRecordQuery, Request, SaveRecordMutation } from '../ts-interfaces/fetch-manager';
 import type { ExistingRecordIdentifier, RecordIdentifier, StableRecordIdentifier } from '../ts-interfaces/identifier';
 import type { Dict } from '../ts-interfaces/utils';
-import { symbol } from '../utils/symbol';
 import coerceId from './coerce-id';
 import type CoreStore from './core-store';
 import { errorsArrayToHash } from './errors-utils';
@@ -30,7 +29,7 @@ function payloadIsNotBlank(adapterPayload): boolean {
   }
 }
 
-export const SaveOp: unique symbol = symbol('SaveOp');
+export const SaveOp: unique symbol = Symbol('SaveOp');
 
 interface PendingFetchItem {
   identifier: ExistingRecordIdentifier;
@@ -502,10 +501,10 @@ export default class FetchManager {
     }
   }
 
-  getPendingFetch(identifier: StableRecordIdentifier) {
-    let pendingRequests = this.requestCache
-      .getPendingRequestsForRecord(identifier)
-      .filter((req) => req.type === 'query');
+  getPendingFetch(identifier: StableRecordIdentifier, options) {
+    let pendingRequests = this.requestCache.getPendingRequestsForRecord(identifier).filter((req) => {
+      return req.type === 'query' && isSameRequest(options, req.request.data[0].options);
+    });
 
     if (pendingRequests.length > 0) {
       return pendingRequests[0][RequestPromise];
@@ -533,3 +532,8 @@ function assertIsString(id: string | null): asserts id is string {
     }
   }
 }
+
+// this function helps resolve whether we have a pending request that we should use instead
+function isSameRequest(options: Dict<unknown> = {}, reqOptions: Dict<unknown> = {}) {
+  return options.include === reqOptions.include;
+}

package/addon/-private/system/model/internal-model.ts

@@ -3,7 +3,6 @@ import { A, default as EmberArray } from '@ember/array';
 import { assert, inspect } from '@ember/debug';
 import EmberError from '@ember/error';
 import { get, set } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { _backburner as emberBackburner, cancel, run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 
@@ -354,7 +353,7 @@ export default class InternalModel {
           }
 
           let additionalCreateOptions = this._recordData._initRecordCreateOptions(properties);
-          assign(createOptions, additionalCreateOptions);
+          Object.assign(createOptions, additionalCreateOptions);
 
           // ensure that `getOwner(this)` works inside a model instance
           setOwner(createOptions, getOwner(store));
@@ -1456,15 +1455,11 @@ export function extractRecordDataFromRecord(recordOrPromiseRecord) {
 }
 
 function anyUnloaded(store: CoreStore, relationship: ManyRelationship) {
-  // Can't use `find` because of IE11 and these arrays are potentially massive
   let state = relationship.currentState;
-  let unloaded = false;
-  for (let i = 0; i < state.length; i++) {
-    let im = store._internalModelForResource(state[i]);
-    if (im._isDematerializing || !im.currentState.isLoaded) {
-      unloaded = true;
-      break;
-    }
-  }
-  return unloaded;
+  const unloaded = state.find((s) => {
+    let im = store._internalModelForResource(s);
+    return im._isDematerializing || !im.currentState.isLoaded;
+  });
+
+  return unloaded || false;
 }

package/addon/-private/system/record-array-manager.js

@@ -5,7 +5,6 @@
 import { A } from '@ember/array';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { _backburner as emberBackburner } from '@ember/runloop';
 
 import { REMOVE_RECORD_ARRAY_MANAGER_LEGACY_COMPAT } from '@ember-data/canary-features';
@@ -281,8 +280,8 @@ class RecordArrayManager {
         manager: this,
         isLoaded: true,
         isUpdating: false,
-        meta: assign({}, payload.meta),
-        links: assign({}, payload.links),
+        meta: { ...payload.meta },
+        links: { ...payload.links },
       });
 
       this._associateWithRecordArray(identifiers, array);

package/addon/-private/system/record-arrays/adapter-populated-record-array.js

@@ -1,6 +1,5 @@
 import { A } from '@ember/array';
 import { get } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { once } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 
@@ -86,8 +85,8 @@ let AdapterPopulatedRecordArray = RecordArray.extend({
     this.setProperties({
       isLoaded: true,
       isUpdating: false,
-      meta: assign({}, payload.meta),
-      links: assign({}, payload.links),
+      meta: { ...payload.meta },
+      links: { ...payload.links },
     });
 
     this.manager._associateWithRecordArray(identifiersOrInternalModels, this);

package/addon/-private/system/request-cache.ts

@@ -7,10 +7,9 @@ import type {
 } from '../ts-interfaces/fetch-manager';
 import { RequestStateEnum } from '../ts-interfaces/fetch-manager';
 import type { RecordIdentifier } from '../ts-interfaces/identifier';
-import { addSymbol, symbol } from '../utils/symbol';
 
-const Touching: unique symbol = symbol('touching');
-export const RequestPromise: unique symbol = symbol('promise');
+const Touching: unique symbol = Symbol('touching');
+export const RequestPromise: unique symbol = Symbol('promise');
 
 interface InternalRequest extends RequestState {
   [Touching]: RecordIdentifier[];
@@ -41,8 +40,8 @@ export default class RequestCache {
         request: queryRequest,
         type,
       } as InternalRequest;
-      addSymbol(request, Touching, [query.recordIdentifier]);
-      addSymbol(request, RequestPromise, promise);
+      request[Touching] = [query.recordIdentifier];
+      request[RequestPromise] = promise;
       this._pending[lid].push(request);
       this._triggerSubscriptions(request);
       promise.then(
@@ -54,7 +53,7 @@ export default class RequestCache {
             type,
             response: { data: result },
           } as InternalRequest;
-          addSymbol(finalizedRequest, Touching, request[Touching]);
+          finalizedRequest[Touching] = request[Touching];
           this._addDone(finalizedRequest);
           this._triggerSubscriptions(finalizedRequest);
         },
@@ -66,7 +65,7 @@ export default class RequestCache {
             type,
             response: { data: error && error.error },
           } as InternalRequest;
-          addSymbol(finalizedRequest, Touching, request[Touching]);
+          finalizedRequest[Touching] = request[Touching];
           this._addDone(finalizedRequest);
           this._triggerSubscriptions(finalizedRequest);
         }

package/addon/-private/system/snapshot.ts

@@ -3,7 +3,6 @@
 */
 import { assert } from '@ember/debug';
 import { get } from '@ember/object';
-import { assign } from '@ember/polyfills';
 
 import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
@@ -234,7 +233,7 @@ export default class Snapshot implements Snapshot {
    @public
    */
   attributes(): Dict<unknown> {
-    return assign({}, this._attributes);
+    return { ...this._attributes };
   }
 
   /**

package/addon/-private/system/store/finders.js

@@ -1,5 +1,4 @@
 import { assert, deprecate, warn } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 
 import { Promise } from 'rsvp';
@@ -274,18 +273,12 @@ function fixRelationshipData(relationshipData, relationshipKind, { id, modelName
   if (relationshipKind === 'hasMany') {
     payload = relationshipData || [];
     if (relationshipData) {
-      // IE11 does not support array.find
       // these arrays could be massive so this is better than filter
       // Note: this is potentially problematic if type/id are not in the
       // same state of normalization.
-      let found = false;
-      for (let i = 0; i < relationshipData.length; i++) {
-        let v = relationshipData[i];
-        if (v.type === parentRelationshipData.type && v.id === parentRelationshipData.id) {
-          found = true;
-          break;
-        }
-      }
+      let found = relationshipData.find((v) => {
+        return v.type === parentRelationshipData.type && v.id === parentRelationshipData.id;
+      });
       if (!found) {
         payload.push(parentRelationshipData);
       }
@@ -294,7 +287,7 @@ function fixRelationshipData(relationshipData, relationshipKind, { id, modelName
     }
   } else {
     payload = relationshipData || {};
-    assign(payload, parentRelationshipData);
+    Object.assign(payload, parentRelationshipData);
   }
 
   return payload;

package/addon/-private/ts-interfaces/fetch-manager.ts

@@ -1,7 +1,11 @@
+import type { Dict } from '@ember-data/store/-private/ts-interfaces/utils';
+
 import type { RecordIdentifier } from './identifier';
 
 export interface Operation {
   op: string;
+  options: Dict<unknown> | undefined;
+  recordIdentifier: RecordIdentifier;
 }
 
 export interface FindRecordQuery extends Operation {

package/addon/-private/ts-interfaces/identifier.ts

@@ -1,15 +1,14 @@
 /**
   @module @ember-data/store
 */
-import { symbol } from '../utils/symbol';
 import type { ExistingResourceObject, ResourceIdentifierObject } from './ember-data-json-api';
 
 export type ResourceData = ResourceIdentifierObject | ExistingResourceObject;
 export type IdentifierBucket = 'record';
 
 // provided for additional debuggability
-export const DEBUG_CLIENT_ORIGINATED: unique symbol = symbol('record-originated-on-client');
-export const DEBUG_IDENTIFIER_BUCKET: unique symbol = symbol('identifier-bucket');
+export const DEBUG_CLIENT_ORIGINATED: unique symbol = Symbol('record-originated-on-client');
+export const DEBUG_IDENTIFIER_BUCKET: unique symbol = Symbol('identifier-bucket');
 
 export interface Identifier {
   lid: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.1",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,22 +17,22 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.0.0-beta.2",
-    "@ember-data/private-build-infra": "4.0.0-beta.2",
+    "@ember-data/canary-features": "4.0.1",
+    "@ember-data/private-build-infra": "4.0.1",
     "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
+    "ember-auto-import": "^2.2.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.0.0-beta.2",
+    "@ember-data/unpublished-test-infra": "4.0.1",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.5",
+    "@ember/test-helpers": "^2.6.0",
     "@types/ember": "^3.16.5",
     "@types/rsvp": "^4.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^2.0.0",
     "ember-cli": "~3.26.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
@@ -43,9 +43,9 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^5.1.4",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.0",
-    "ember-source": "~3.27.1",
+    "ember-source": "~4.0.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
     "loader.js": "^4.7.0",

package/addon/-private/utils/symbol.ts

@@ -1,33 +0,0 @@
-/**
-  @module @ember-data/store
-*/
-
-/**
- * This symbol provides a Symbol replacement for browsers that do not have it
- * (eg. IE 11).
- *
- * The replacement is different from the native Symbol in some ways. It is a
- * function that produces an output:
- * - iterable;
- * - that is a string, not a symbol.
- *
- * @internal
- */
-export const symbol =
-  typeof Symbol !== 'undefined'
-    ? Symbol
-    : (key: string) => `__${key}${Math.floor(Math.random() * Date.now())}__` as any;
-
-export function addSymbol(obj: object, symbol: Symbol | string, value: any): void {
-  if (typeof symbol === 'string') {
-    Object.defineProperty(obj, symbol, {
-      value,
-      configurable: false,
-      enumerable: false,
-      writable: false,
-    });
-  } else {
-    // Typescript doesn't allow Symbol as an index type
-    obj[symbol as unknown as string] = value;
-  }
-}