getWithDefault

emberjs · Sep 25, 2020 · cf641c2 · cf641c2
1 parent 06ea10d
commit cf641c2
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/model/addon/-private/model.js b/packages/model/addon/-private/model.js
@@ -41,6 +41,13 @@ function getRecordMeta(record) {
   return meta;
 }
 
+function getWithDefault(meta, prop, value) {
+  if (meta[prop] === undefined) {
+    meta[prop] = value;
+  }
+  return get(meta, prop);
+}
+
 const retrieveFromCurrentState = computedMacroWithOptionalParams(function retrieveState() {
   return computed('currentState', function(key) {
     return this._internalModel.currentState[key];
@@ -404,7 +411,7 @@ class Model extends EmberObject.extend(DeprecatedEvented) {
       }
     }
     let meta = getRecordMeta(this);
-    return get(meta, 'isError') || false;
+    return getWithDefault(meta, 'isError', false);
   }
   set isError(v) {
     if (REQUEST_SERVICE && DEBUG) {
@@ -608,7 +615,7 @@ class Model extends EmberObject.extend(DeprecatedEvented) {
       return request.state === 'rejected' && request.response.data;
     }
     let meta = getRecordMeta(this);
-    return get(meta, 'adapterError') || null;
+    return getWithDefault(meta, 'adapterError', null);
   }
   set adapterError(v) {
     if (REQUEST_SERVICE && DEBUG) {