T32139 default negative ids for new models

dist/mobx-spine.cjs.js

@@ -873,8 +873,9 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
         }
 
         /**
-         * Gives the model the internal id. This is useful if you have a new model that you want to give an id so
-         * that it can be referred to in a relation.
+         * Gives the model the internal id, meaning that it will keep the set id of the model or it will receive a negative
+         * id if the id is null. This is useful if you have a new model that you want to give an id so that it can be
+         * referred to in a relation.
          */
 
     }, {
@@ -925,7 +926,7 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
 
         /**
          * A model is considered new if it does not have an id, or if the id is a negative integer.
-         * @returns {boolean}   True if the model id is not set or a negative integer
+         * @returns {boolean}   - True if the model id is not set or a negative integer
          */
 
     }, {
@@ -997,6 +998,16 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
         if (options.relations) {
             this.__parseRelations(options.relations);
         }
+
+        // The model will automatically be assigned a negative id, the id will still be overridden if it is supplied in the data
+        this.assignInternalId();
+
+        // We want our id to remain negative on a clear, only if it was not created with the id set to null
+        // which is usually the case when the object is a related model in which case we want the id to be reset to null
+        if (data && data[this.constructor.primaryKey] !== null || !data) {
+            this.__originalAttributes[this.constructor.primaryKey] = this[this.constructor.primaryKey];
+        }
+
         if (data) {
             this.parse(data);
         }
@@ -1045,7 +1056,10 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
                 if (RelModel.prototype instanceof Store) {
                     return new RelModel(options);
                 }
-                return new RelModel(null, options);
+                // If we have a related model, we want to force the related model to have id null as that means there is no model set
+                var newModelData = {};
+                newModelData[RelModel.primaryKey] = null;
+                return new RelModel(newModelData, options);
             }));
         }
 
@@ -1910,7 +1924,13 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
             var _this19 = this;
 
             lodash.forIn(this.__originalAttributes, function (value, key) {
-                _this19[key] = value;
+                // If it is our primary key, and the primary key is negative, we generate a new negative pk, else we set it
+                // to the value
+                if (key === _this19.constructor.primaryKey && value < 0) {
+                    _this19[key] = -1 * lodash.uniqueId();
+                } else {
+                    _this19[key] = value;
+                }
             });
 
             this.__activeCurrentRelations.forEach(function (currentRel) {

dist/mobx-spine.es.js

@@ -867,8 +867,9 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
         }
 
         /**
-         * Gives the model the internal id. This is useful if you have a new model that you want to give an id so
-         * that it can be referred to in a relation.
+         * Gives the model the internal id, meaning that it will keep the set id of the model or it will receive a negative
+         * id if the id is null. This is useful if you have a new model that you want to give an id so that it can be
+         * referred to in a relation.
          */
 
     }, {
@@ -919,7 +920,7 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
 
         /**
          * A model is considered new if it does not have an id, or if the id is a negative integer.
-         * @returns {boolean}   True if the model id is not set or a negative integer
+         * @returns {boolean}   - True if the model id is not set or a negative integer
          */
 
     }, {
@@ -991,6 +992,16 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
         if (options.relations) {
             this.__parseRelations(options.relations);
         }
+
+        // The model will automatically be assigned a negative id, the id will still be overridden if it is supplied in the data
+        this.assignInternalId();
+
+        // We want our id to remain negative on a clear, only if it was not created with the id set to null
+        // which is usually the case when the object is a related model in which case we want the id to be reset to null
+        if (data && data[this.constructor.primaryKey] !== null || !data) {
+            this.__originalAttributes[this.constructor.primaryKey] = this[this.constructor.primaryKey];
+        }
+
         if (data) {
             this.parse(data);
         }
@@ -1039,7 +1050,10 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
                 if (RelModel.prototype instanceof Store) {
                     return new RelModel(options);
                 }
-                return new RelModel(null, options);
+                // If we have a related model, we want to force the related model to have id null as that means there is no model set
+                var newModelData = {};
+                newModelData[RelModel.primaryKey] = null;
+                return new RelModel(newModelData, options);
             }));
         }
 
@@ -1904,7 +1918,13 @@ var Model = (_class$1 = (_temp$1 = _class2$1 = function () {
             var _this19 = this;
 
             forIn(this.__originalAttributes, function (value, key) {
-                _this19[key] = value;
+                // If it is our primary key, and the primary key is negative, we generate a new negative pk, else we set it
+                // to the value
+                if (key === _this19.constructor.primaryKey && value < 0) {
+                    _this19[key] = -1 * uniqueId();
+                } else {
+                    _this19[key] = value;
+                }
             });
 
             this.__activeCurrentRelations.forEach(function (currentRel) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-spine",
-  "version": "0.28.4",
+  "version": "0.29.1",
   "license": "ISC",
   "author": "Kees Kluskens <kees@webduck.nl>",
   "description": "MobX with support for models, relations and an API.",

src/Model.js

@@ -121,8 +121,9 @@ export default class Model {
     }
 
     /**
-     * Gives the model the internal id. This is useful if you have a new model that you want to give an id so
-     * that it can be referred to in a relation.
+     * Gives the model the internal id, meaning that it will keep the set id of the model or it will receive a negative
+     * id if the id is null. This is useful if you have a new model that you want to give an id so that it can be
+     * referred to in a relation.
      */
     assignInternalId() {
         this[this.constructor.primaryKey] = this.getInternalId()
@@ -142,7 +143,7 @@ export default class Model {
 
     /**
      * A model is considered new if it does not have an id, or if the id is a negative integer.
-     * @returns {boolean}   True if the model id is not set or a negative integer
+     * @returns {boolean}   - True if the model id is not set or a negative integer
      */
     @computed
     get isNew() {
@@ -212,6 +213,16 @@ export default class Model {
         if (options.relations) {
             this.__parseRelations(options.relations);
         }
+
+        // The model will automatically be assigned a negative id, the id will still be overridden if it is supplied in the data
+        this.assignInternalId()
+
+        // We want our id to remain negative on a clear, only if it was not created with the id set to null
+        // which is usually the case when the object is a related model in which case we want the id to be reset to null
+        if ((data && data[this.constructor.primaryKey] !== null) || !data){
+            this.__originalAttributes[this.constructor.primaryKey] = this[this.constructor.primaryKey]
+        }
+
         if (data) {
             this.parse(data);
         }
@@ -265,7 +276,10 @@ export default class Model {
                 if (RelModel.prototype instanceof Store) {
                     return new RelModel(options);
                 }
-                return new RelModel(null, options);
+                // If we have a related model, we want to force the related model to have id null as that means there is no model set
+                const newModelData = {}
+                newModelData[RelModel.primaryKey] = null;
+                return new RelModel(newModelData, options);
             })
         );
     }
@@ -1096,7 +1110,13 @@ export default class Model {
     @action
     clear() {
         forIn(this.__originalAttributes, (value, key) => {
-            this[key] = value;
+            // If it is our primary key, and the primary key is negative, we generate a new negative pk, else we set it
+            // to the value
+            if (key === this.constructor.primaryKey && value < 0){
+                this[key] = -1 * uniqueId();
+            } else {
+                this[key] = value;
+            }
         });
 
         this.__activeCurrentRelations.forEach(currentRel => {