@ember-data/store 4.2.0-alpha.0 → 4.2.0-alpha.4

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

@@ -4,7 +4,6 @@
 import { assert } from '@ember/debug';
 import { get } from '@ember/object';
 
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
 import type { DSModel, DSModelSchema, ModelSchema } from '../ts-interfaces/ds-model';
@@ -65,10 +64,9 @@ export default class Snapshot implements Snapshot {
     let internalModel = (this._internalModel = _store._internalModelForResource(identifier));
     this.modelName = identifier.type;
 
-    if (CUSTOM_MODEL_CLASS) {
-      // TODO add public docs once this FF is on
-      this.identifier = identifier;
-    }
+    // TODO add public docs once this FF is on
+    this.identifier = identifier;
+
     /*
       If the internalModel does not yet have a record, then we are
       likely a snapshot being provided to a find request, so we
@@ -151,26 +149,15 @@ export default class Snapshot implements Snapshot {
     }
     let record = this.record;
     let attributes = (this.__attributes = Object.create(null));
-    let attrs: string[];
-
-    if (CUSTOM_MODEL_CLASS) {
-      attrs = Object.keys(this._store._attributesDefinitionFor(this.modelName, this.identifier));
-    } else {
-      attrs = Object.keys(this._store._attributesDefinitionFor(this.modelName));
-    }
-    if (CUSTOM_MODEL_CLASS) {
-      attrs.forEach((keyName) => {
-        if (schemaIsDSModel(this.type)) {
-          // if the schema is for a DSModel then the instance is too
-          attributes[keyName] = get(record as DSModel, keyName);
-        } else {
-          attributes[keyName] = recordDataFor(this._internalModel).getAttr(keyName);
-        }
-      });
-    } else {
-      // When CUSTOM_MODEL_CLASS is false `record` must be DSModel
-      (record as DSModel).eachAttribute((keyName) => (attributes[keyName] = get(record as DSModel, keyName)));
-    }
+    let attrs = Object.keys(this._store._attributesDefinitionFor(this.modelName, this.identifier));
+    attrs.forEach((keyName) => {
+      if (schemaIsDSModel(this.type)) {
+        // if the schema is for a DSModel then the instance is too
+        attributes[keyName] = get(record as DSModel, keyName);
+      } else {
+        attributes[keyName] = recordDataFor(this._internalModel).getAttr(keyName);
+      }
+    });
 
     return attributes;
   }
@@ -187,9 +174,6 @@ export default class Snapshot implements Snapshot {
   }
 
   get isNew(): boolean {
-    if (!CUSTOM_MODEL_CLASS) {
-      throw new Error('isNew is only available when custom model class ff is on');
-    }
     return this._internalModel.isNew();
   }
 
@@ -333,7 +317,7 @@ export default class Snapshot implements Snapshot {
     }
 
     const graphFor = require('@ember-data/record-data/-private').graphFor;
-    const { identifier } = CUSTOM_MODEL_CLASS ? this : this._internalModel;
+    const { identifier } = this;
     const relationship = graphFor(this._store._storeWrapper).get(identifier, keyName);
 
     assert(
@@ -432,7 +416,7 @@ export default class Snapshot implements Snapshot {
     }
 
     const graphFor = require('@ember-data/record-data/-private').graphFor;
-    const { identifier } = CUSTOM_MODEL_CLASS ? this : this._internalModel;
+    const { identifier } = this;
     const relationship = graphFor(this._store._storeWrapper).get(identifier, keyName);
     assert(
       `You looked up the ${keyName} hasMany relationship for { type: ${identifier.type}, id: ${identifier.id}, lid: ${identifier.lid} but no such relationship was found.`,
@@ -488,15 +472,10 @@ export default class Snapshot implements Snapshot {
     @public
   */
   eachAttribute(callback: (key: string, meta: AttributeSchema) => void, binding?: unknown): void {
-    if (CUSTOM_MODEL_CLASS) {
-      let attrDefs = this._store._attributesDefinitionFor(this.modelName, this.identifier);
-      Object.keys(attrDefs).forEach((key) => {
-        callback.call(binding, key, attrDefs[key] as AttributeSchema);
-      });
-    } else {
-      // in the non CUSTOM_MODEL_CLASS world we only have DSModel instances
-      (this.record as DSModel).eachAttribute(callback, binding);
-    }
+    let attrDefs = this._store._attributesDefinitionFor(this.modelName, this.identifier);
+    Object.keys(attrDefs).forEach((key) => {
+      callback.call(binding, key, attrDefs[key] as AttributeSchema);
+    });
   }
 
   /**
@@ -517,15 +496,10 @@ export default class Snapshot implements Snapshot {
     @public
   */
   eachRelationship(callback: (key: string, meta: RelationshipSchema) => void, binding?: unknown): void {
-    if (CUSTOM_MODEL_CLASS) {
-      let relationshipDefs = this._store._relationshipsDefinitionFor(this.modelName, this.identifier);
-      Object.keys(relationshipDefs).forEach((key) => {
-        callback.call(binding, key, relationshipDefs[key] as RelationshipSchema);
-      });
-    } else {
-      // in the non CUSTOM_MODEL_CLASS world we only have DSModel instances
-      (this.record as DSModel).eachRelationship(callback, binding);
-    }
+    let relationshipDefs = this._store._relationshipsDefinitionFor(this.modelName, this.identifier);
+    Object.keys(relationshipDefs).forEach((key) => {
+      callback.call(binding, key, relationshipDefs[key] as RelationshipSchema);
+    });
   }
 
   /**

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

@@ -1,11 +1,8 @@
-import { assert, deprecate, warn } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 import { Promise } from 'rsvp';
 
-import { REQUEST_SERVICE } from '@ember-data/canary-features';
-
-import coerceId from '../coerce-id';
 import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './common';
 import { normalizeResponseHelper } from './serializer-response';
 
@@ -21,60 +18,7 @@ function payloadIsNotBlank(adapterPayload) {
   }
 }
 
-export function _find(adapter, store, modelClass, id, internalModel, options) {
-  if (REQUEST_SERVICE) {
-    assert(`Requests made when REQUEST_SERVICE=true should not use the legacy finders`);
-  }
-  let snapshot = internalModel.createSnapshot(options);
-  let { modelName } = internalModel;
-  let promise = Promise.resolve().then(() => {
-    return adapter.findRecord(store, modelClass, id, snapshot);
-  });
-  let label = `DS: Handle Adapter#findRecord of '${modelName}' with id: '${id}'`;
-  const { identifier } = internalModel;
-
-  promise = guardDestroyedStore(promise, store, label);
-
-  return promise.then(
-    (adapterPayload) => {
-      assert(
-        `You made a 'findRecord' request for a '${modelName}' with id '${id}', but the adapter's response did not have any data`,
-        payloadIsNotBlank(adapterPayload)
-      );
-      let serializer = store.serializerFor(modelName);
-      let payload = normalizeResponseHelper(serializer, store, modelClass, adapterPayload, id, 'findRecord');
-      assert(
-        `Ember Data expected the primary data returned from a 'findRecord' response to be an object but instead it found an array.`,
-        !Array.isArray(payload.data)
-      );
-      assert(
-        `The 'findRecord' request for ${modelName}:${id} resolved indicating success but contained no primary data. To indicate a 404 not found you should either reject the promise returned by the adapter's findRecord method or throw a NotFoundError.`,
-        'data' in payload && payload.data !== null && typeof payload.data === 'object'
-      );
-      warn(
-        `You requested a record of type '${modelName}' with id '${id}' but the adapter returned a payload with primary data having an id of '${payload.data.id}'. Use 'store.findRecord()' when the requested id is the same as the one returned by the adapter. In other cases use 'store.queryRecord()' instead.`,
-        coerceId(payload.data.id) === coerceId(id),
-        {
-          id: 'ds.store.findRecord.id-mismatch',
-        }
-      );
-
-      // ensure that regardless of id returned we assign to the correct record
-      payload.data.lid = identifier.lid;
-
-      return store._push(payload);
-    },
-    (error) => {
-      internalModel.send('notFound');
-      if (internalModel.currentState.isEmpty) {
-        internalModel.unloadRecord();
-      }
-
-      throw error;
-    },
-    `DS: Extract payload of '${modelName}'`
-  );
-}
+export function _find() {}
 
 export function _findMany(adapter, store, modelName, ids, internalModels, optionsMap) {
   let snapshots = internalModels.map((internalModel) => internalModel.createSnapshot(optionsMap.get(internalModel)));

package/addon/-private/system/store/record-data-store-wrapper.ts

@@ -1,4 +1,3 @@
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import type { RelationshipDefinition } from '@ember-data/model/-private/system/relationships/relationship-meta';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
@@ -118,16 +117,13 @@ export default class RecordDataStoreWrapper implements StoreWrapper {
     if (!definition) {
       return null;
     }
-    if (CUSTOM_MODEL_CLASS) {
-      if (metaIsRelationshipDefinition(definition)) {
-        return definition._inverseKey(this._store, modelClass);
-      } else if (definition.options && definition.options.inverse !== undefined) {
-        return definition.options.inverse;
-      } else {
-        return null;
-      }
+
+    if (metaIsRelationshipDefinition(definition)) {
+      return definition._inverseKey(this._store, modelClass);
+    } else if (definition.options && definition.options.inverse !== undefined) {
+      return definition.options.inverse;
     } else {
-      return (definition as RelationshipDefinition)._inverseKey(this._store, modelClass);
+      return null;
     }
   }
 
@@ -137,21 +133,18 @@ export default class RecordDataStoreWrapper implements StoreWrapper {
     if (!definition) {
       return false;
     }
-    if (CUSTOM_MODEL_CLASS) {
-      if (definition.options && definition.options.inverse === null) {
-        return false;
-      }
-      if ((definition as unknown as { inverseIsAsync?: boolean }).inverseIsAsync !== undefined) {
-        // TODO do we need to amend the RFC for this prop?
-        // else we should add it to the TS interface and document.
-        return !!(definition as unknown as { inverseIsAsync: boolean }).inverseIsAsync;
-      } else if (metaIsRelationshipDefinition(definition)) {
-        return definition._inverseIsAsync(this._store, modelClass);
-      } else {
-        return false;
-      }
+
+    if (definition.options && definition.options.inverse === null) {
+      return false;
+    }
+    if ((definition as unknown as { inverseIsAsync?: boolean }).inverseIsAsync !== undefined) {
+      // TODO do we need to amend the RFC for this prop?
+      // else we should add it to the TS interface and document.
+      return !!(definition as unknown as { inverseIsAsync: boolean }).inverseIsAsync;
+    } else if (metaIsRelationshipDefinition(definition)) {
+      return definition._inverseIsAsync(this._store, modelClass);
     } else {
-      return (definition as RelationshipDefinition)._inverseIsAsync(this._store, modelClass);
+      return false;
     }
   }
 

package/addon/-private/ts-interfaces/ds-model.ts

@@ -17,6 +17,7 @@ export interface DSModel extends RecordInstance, EmberObject {
   isDeleted: boolean;
   deleteRecord(): void;
   unloadRecord(): void;
+  errors: any;
 }
 
 // Implemented by both ShimModelClass and DSModel

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/index.js

@@ -10,6 +10,8 @@ module.exports = Object.assign({}, addonBaseConfig, {
   shouldRollupPrivate: true,
   externalDependenciesForPrivateModule() {
     return [
+      'ember-cached-decorator-polyfill',
+
       '@ember-data/canary-features',
       '@ember-data/store/-debug',
 
@@ -23,6 +25,7 @@ module.exports = Object.assign({}, addonBaseConfig, {
       '@ember/object/evented',
       '@ember/object/internals',
       '@ember/object/mixin',
+      '@ember/object/compat',
       '@ember/object/promise-proxy-mixin',
       '@ember/object/proxy',
       '@ember/polyfills',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.2.0-alpha.0",
+  "version": "4.2.0-alpha.4",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,35 +17,36 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.2.0-alpha.0",
-    "@ember-data/private-build-infra": "4.2.0-alpha.0",
+    "@ember-data/canary-features": "4.2.0-alpha.4",
+    "@ember-data/private-build-infra": "4.2.0-alpha.4",
     "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
     "ember-auto-import": "^2.2.4",
+    "ember-cached-decorator-polyfill": "^0.1.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.2.0-alpha.0",
+    "@ember-data/unpublished-test-infra": "4.2.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "@types/ember": "^3.16.5",
     "@types/rsvp": "^4.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.26.1",
+    "ember-cli": "~4.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^5.1.2",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "~4.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.0",
-    "ember-source": "~3.28.6",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.0.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
     "loader.js": "^4.7.0",