@ember-data/model 3.29.0-alpha.9 → 4.0.0-beta.3

package/addon/-private/attr.js

@@ -89,19 +89,19 @@ function getDefaultValue(record, options, key) {
   ```app/transforms/text.js
   import Transform from '@ember-data/serializer/transform';
 
-  export default Transform.extend({
+  export default class TextTransform extends Transform {
     serialize(value, options) {
       if (options.uppercase) {
         return value.toUpperCase();
       }
 
       return value;
-    },
+    }
 
     deserialize(value) {
       return value;
     }
-  })
+  }
   ```
 
   @method attr
@@ -130,7 +130,7 @@ function attr(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`
           );
@@ -145,7 +145,7 @@ function attr(type, options) {
     },
     set(key, value) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`
           );

package/addon/-private/belongs-to.js

@@ -143,7 +143,7 @@ function belongsTo(modelName, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`
           );
@@ -173,7 +173,7 @@ function belongsTo(modelName, options) {
     },
     set(key, value) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`
           );

package/addon/-private/has-many.js

@@ -183,7 +183,7 @@ function hasMany(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`
           );
@@ -193,7 +193,7 @@ function hasMany(type, options) {
     },
     set(key, records) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`
           );

package/addon/-private/model.js

@@ -2279,12 +2279,6 @@ if (DEBUG) {
         );
       }
 
-      if (!isDefaultEmptyDescriptor(this, 'content') || this.content !== undefined) {
-        throw new Error(
-          `'content' is a reserved property name on instances of classes extending Model. Please choose a different property name for ${this.constructor.toString()}`
-        );
-      }
-
       let ourDescriptor = lookupDescriptor(Model.prototype, 'currentState');
       let theirDescriptor = lookupDescriptor(this, 'currentState');
       let realState = this.___recordState || this._internalModel.currentState;

package/addon/-private/notify-changes.ts

@@ -1,9 +1,10 @@
 import { cacheFor } from '@ember/object/internals';
 
-type CoreStore = import('@ember-data/store/-private/system/core-store').default;
-type NotificationType = import('@ember-data/store/-private/system/record-notification-manager').NotificationType;
+import type CoreStore from '@ember-data/store/-private/system/core-store';
+import type { NotificationType } from '@ember-data/store/-private/system/record-notification-manager';
+import type { StableRecordIdentifier } from '@ember-data/store/-private/ts-interfaces/identifier';
+
 type Model = InstanceType<typeof import('@ember-data/model').default>;
-type StableRecordIdentifier = import('@ember-data/store/-private/ts-interfaces/identifier').StableRecordIdentifier;
 
 export default function notifyChanges(
   identifier: StableRecordIdentifier,

package/addon/-private/record-state.ts

@@ -2,16 +2,16 @@ import { assert } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { cached, tracked } from '@glimmer/tracking';
 
+import type { RecordData } from '@ember-data/record-data/-private';
 import { errorsArrayToHash } from '@ember-data/store/-private';
+import type CoreStore from '@ember-data/store/-private/system/core-store';
+import type { NotificationType } from '@ember-data/store/-private/system/record-notification-manager';
+import type RequestCache from '@ember-data/store/-private/system/request-cache';
+import type { StableRecordIdentifier } from '@ember-data/store/-private/ts-interfaces/identifier';
 
 import notifyChanges from './notify-changes';
 
-type RecordData = import('@ember-data/record-data/-private').RecordData;
-type RequestCache = import('@ember-data/store/-private/system/request-cache').default;
 type Model = InstanceType<typeof import('./model')>;
-type StableRecordIdentifier = import('@ember-data/store/-private/ts-interfaces/identifier').StableRecordIdentifier;
-type CoreStore = import('@ember-data/store/-private/system/core-store').default;
-type NotificationType = import('@ember-data/store/-private/system/record-notification-manager').NotificationType;
 
 function isInvalidError(error) {
   return error && error.isAdapterError === true && error.code === 'InvalidError';

package/addon/-private/system/model-for-mixin.ts

@@ -1,8 +1,9 @@
 import { getOwner } from '@ember/application';
 
+import type Store from '@ember-data/store';
+
 import Model from '../model';
 
-type Store = import('@ember-data/store').default;
 /* 
     In case someone defined a relationship to a mixin, for example:
     ```

package/addon/-private/system/relationships/relationship-meta.ts

@@ -3,9 +3,8 @@ import { DEBUG } from '@glimmer/env';
 import { singularize } from 'ember-inflector';
 
 import { normalizeModelName } from '@ember-data/store/-private';
-
-type RelationshipSchema = import('@ember-data/store/-private/ts-interfaces/record-data-schemas').RelationshipSchema;
-type CoreStore = import('@ember-data/store/-private/system/core-store').default;
+import type CoreStore from '@ember-data/store/-private/system/core-store';
+import type { RelationshipSchema } from '@ember-data/store/-private/ts-interfaces/record-data-schemas';
 
 /**
   @module @ember-data/store

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "3.29.0-alpha.9",
+  "version": "4.0.0-beta.3",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,12 +18,12 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "3.29.0-alpha.9",
-    "@ember-data/private-build-infra": "3.29.0-alpha.9",
-    "@ember-data/store": "3.29.0-alpha.9",
+    "@ember-data/canary-features": "4.0.0-beta.3",
+    "@ember-data/private-build-infra": "4.0.0-beta.3",
+    "@ember-data/store": "4.0.0-beta.3",
     "@ember/edition-utils": "^1.2.0",
-    "@ember/string": "^1.0.0",
-    "ember-cached-decorator-polyfill": "^0.1.3",
+    "@ember/string": "^3.0.0",
+    "ember-cached-decorator-polyfill": "^0.1.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
@@ -32,7 +32,7 @@
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "3.29.0-alpha.9",
+    "@ember-data/unpublished-test-infra": "4.0.0-beta.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",