@ember-data/model 4.0.0-beta.0 → 4.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/addon/-private/attr.js
CHANGED
|
@@ -130,7 +130,7 @@ function attr(type, options) {
|
|
|
130
130
|
return computed({
|
|
131
131
|
get(key) {
|
|
132
132
|
if (DEBUG) {
|
|
133
|
-
if (['_internalModel', '
|
|
133
|
+
if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
|
|
134
134
|
throw new Error(
|
|
135
135
|
`'${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()}`
|
|
136
136
|
);
|
|
@@ -145,7 +145,7 @@ function attr(type, options) {
|
|
|
145
145
|
},
|
|
146
146
|
set(key, value) {
|
|
147
147
|
if (DEBUG) {
|
|
148
|
-
if (['_internalModel', '
|
|
148
|
+
if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
|
|
149
149
|
throw new Error(
|
|
150
150
|
`'${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()}`
|
|
151
151
|
);
|
|
@@ -143,7 +143,7 @@ function belongsTo(modelName, options) {
|
|
|
143
143
|
return computed({
|
|
144
144
|
get(key) {
|
|
145
145
|
if (DEBUG) {
|
|
146
|
-
if (['_internalModel', '
|
|
146
|
+
if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
|
|
147
147
|
throw new Error(
|
|
148
148
|
`'${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()}`
|
|
149
149
|
);
|
|
@@ -173,7 +173,7 @@ function belongsTo(modelName, options) {
|
|
|
173
173
|
},
|
|
174
174
|
set(key, value) {
|
|
175
175
|
if (DEBUG) {
|
|
176
|
-
if (['_internalModel', '
|
|
176
|
+
if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
|
|
177
177
|
throw new Error(
|
|
178
178
|
`'${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()}`
|
|
179
179
|
);
|
|
@@ -183,7 +183,7 @@ function hasMany(type, options) {
|
|
|
183
183
|
return computed({
|
|
184
184
|
get(key) {
|
|
185
185
|
if (DEBUG) {
|
|
186
|
-
if (['_internalModel', '
|
|
186
|
+
if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
|
|
187
187
|
throw new Error(
|
|
188
188
|
`'${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()}`
|
|
189
189
|
);
|
|
@@ -193,7 +193,7 @@ function hasMany(type, options) {
|
|
|
193
193
|
},
|
|
194
194
|
set(key, records) {
|
|
195
195
|
if (DEBUG) {
|
|
196
|
-
if (['_internalModel', '
|
|
196
|
+
if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
|
|
197
197
|
throw new Error(
|
|
198
198
|
`'${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()}`
|
|
199
199
|
);
|
package/addon/-private/model.js
CHANGED
|
@@ -2279,12 +2279,6 @@ if (DEBUG) {
|
|
|
2279
2279
|
);
|
|
2280
2280
|
}
|
|
2281
2281
|
|
|
2282
|
-
if (!isDefaultEmptyDescriptor(this, 'content') || this.content !== undefined) {
|
|
2283
|
-
throw new Error(
|
|
2284
|
-
`'content' is a reserved property name on instances of classes extending Model. Please choose a different property name for ${this.constructor.toString()}`
|
|
2285
|
-
);
|
|
2286
|
-
}
|
|
2287
|
-
|
|
2288
2282
|
let ourDescriptor = lookupDescriptor(Model.prototype, 'currentState');
|
|
2289
2283
|
let theirDescriptor = lookupDescriptor(this, 'currentState');
|
|
2290
2284
|
let realState = this.___recordState || this._internalModel.currentState;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-data/model",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.4",
|
|
4
4
|
"description": "The default blueprint for ember-cli addons.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ember-addon"
|
|
@@ -18,11 +18,11 @@
|
|
|
18
18
|
"test:node": "mocha"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@ember-data/canary-features": "4.0.0-beta.
|
|
22
|
-
"@ember-data/private-build-infra": "4.0.0-beta.
|
|
23
|
-
"@ember-data/store": "4.0.0-beta.
|
|
21
|
+
"@ember-data/canary-features": "4.0.0-beta.4",
|
|
22
|
+
"@ember-data/private-build-infra": "4.0.0-beta.4",
|
|
23
|
+
"@ember-data/store": "4.0.0-beta.4",
|
|
24
24
|
"@ember/edition-utils": "^1.2.0",
|
|
25
|
-
"@ember/string": "^
|
|
25
|
+
"@ember/string": "^3.0.0",
|
|
26
26
|
"ember-cached-decorator-polyfill": "^0.1.4",
|
|
27
27
|
"ember-cli-babel": "^7.26.6",
|
|
28
28
|
"ember-cli-string-utils": "^1.1.0",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"inflection": "~1.13.1"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@ember-data/unpublished-test-infra": "4.0.0-beta.
|
|
35
|
+
"@ember-data/unpublished-test-infra": "4.0.0-beta.4",
|
|
36
36
|
"@ember/optional-features": "^2.0.0",
|
|
37
37
|
"@ember/test-helpers": "^2.2.5",
|
|
38
38
|
"broccoli-asset-rev": "^3.0.0",
|