@ember-data/store 4.1.0 → 4.2.0-alpha.3

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

@@ -1,11 +1,9 @@
 import { getOwner, setOwner } from '@ember/application';
 import { assert, deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
-import { get } from '@ember/object';
 import { isPresent } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import type DSModelClass from '@ember-data/model';
 
 import type { DSModel } from '../ts-interfaces/ds-model';
@@ -69,7 +67,7 @@ class Store extends CoreStore {
     // for factorFor factory/class split
     let klass = maybeFactory && maybeFactory.class ? maybeFactory.class : maybeFactory;
     if (!klass || !klass.isModel) {
-      if (!CUSTOM_MODEL_CLASS || !this.getSchemaDefinitionService().doesTypeExist(modelName)) {
+      if (!this.getSchemaDefinitionService().doesTypeExist(modelName)) {
         throw new EmberError(`No model was found for '${modelName}' and no schema handles the type`);
       }
       return getShimClass(this, modelName);
@@ -103,83 +101,34 @@ class Store extends CoreStore {
       typeof modelName === 'string'
     );
 
-    if (CUSTOM_MODEL_CLASS) {
-      return this.getSchemaDefinitionService().doesTypeExist(modelName);
-    } else {
-      assert(`You need to pass a model name to the store's hasModelFor method`, isPresent(modelName));
-      assert(
-        `Passing classes to store methods has been removed. Please pass a dasherized string instead of ${modelName}`,
-        typeof modelName === 'string'
-      );
-      let normalizedModelName = normalizeModelName(modelName);
-      let factory = getModelFactory(this, this._modelFactoryCache, normalizedModelName);
-
-      return factory !== null;
-    }
+    return this.getSchemaDefinitionService().doesTypeExist(modelName);
   }
 
   _relationshipMetaFor(modelName: string, id: string | null, key: string) {
-    if (CUSTOM_MODEL_CLASS) {
-      return this._relationshipsDefinitionFor(modelName)[key];
-    } else {
-      let modelClass = this.modelFor(modelName);
-      let relationshipsByName = get(modelClass, 'relationshipsByName');
-      return relationshipsByName.get(key);
-    }
+    return this._relationshipsDefinitionFor(modelName)[key];
   }
 
   _attributesDefinitionFor(modelName: string, identifier?: StableRecordIdentifier) {
-    if (CUSTOM_MODEL_CLASS) {
-      if (identifier) {
-        return this.getSchemaDefinitionService().attributesDefinitionFor(identifier);
-      } else {
-        return this.getSchemaDefinitionService().attributesDefinitionFor(modelName);
-      }
+    if (identifier) {
+      return this.getSchemaDefinitionService().attributesDefinitionFor(identifier);
     } else {
-      let attributes = this._attributesDefCache[modelName];
-
-      if (attributes === undefined) {
-        let modelClass = this.modelFor(modelName);
-        let attributeMap = get(modelClass, 'attributes');
-
-        attributes = Object.create(null);
-        attributeMap.forEach((meta, name) => (attributes[name] = meta));
-        this._attributesDefCache[modelName] = attributes;
-      }
-
-      return attributes;
+      return this.getSchemaDefinitionService().attributesDefinitionFor(modelName);
     }
   }
 
   _relationshipsDefinitionFor(modelName: string, identifier?: StableRecordIdentifier): RelationshipsSchema {
-    if (CUSTOM_MODEL_CLASS) {
-      if (identifier) {
-        return this.getSchemaDefinitionService().relationshipsDefinitionFor(identifier);
-      } else {
-        return this.getSchemaDefinitionService().relationshipsDefinitionFor(modelName);
-      }
+    if (identifier) {
+      return this.getSchemaDefinitionService().relationshipsDefinitionFor(identifier);
     } else {
-      let relationships = this._relationshipsDefCache[modelName];
-
-      if (relationships === undefined) {
-        let modelClass = this.modelFor(modelName);
-        relationships = get(modelClass, 'relationshipsObject') || null;
-        this._relationshipsDefCache[modelName] = relationships;
-      }
-
-      return relationships;
+      return this.getSchemaDefinitionService().relationshipsDefinitionFor(modelName);
     }
   }
 
   getSchemaDefinitionService(): SchemaDefinitionService {
-    if (CUSTOM_MODEL_CLASS) {
-      if (!this._schemaDefinitionService) {
-        this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
-      }
-      return this._schemaDefinitionService;
-    } else {
-      throw 'schema service is only available when custom model class feature flag is on';
+    if (!this._schemaDefinitionService) {
+      this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
     }
+    return this._schemaDefinitionService;
   }
 }