Merge pull request #4 from JaapRood/bug/serialize-meta-data

Fix bug where not all meta data is omitted during serialisation

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vry",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Define `Model` and `Collection` like types to manage your `Immutable` data structures in a functional way",
   "main": "lib/index.js",
   "scripts": {

src/model.js

@@ -173,7 +173,7 @@ internals.serialize = function(model, options) {
 	if (!omitMeta) {
 		return partial.toJS();
 	} else {
-		return partial.filter((value, key) => key !== Props.cid).toJS();
+		return partial.filter((value, key) => key !== Props.cid && key !== Props.name).toJS();
 	}
 }
 

src/state.js

@@ -79,7 +79,7 @@ internals.serialize = (state, optionsOrOmit) => {
 	if (!omitMeta) {
 		return state.toJS();
 	} else {
-		return state.filter((value, key) => key !== internals.props.cid).toJS();
+		return state.filter((value, key) => key !== internals.props.cid && key !== internals.props.name).toJS();
 	}
 }
 

test/model.js

@@ -221,7 +221,7 @@ Test('model.schema', function(t) {
 })
 
 Test('model.serialize', function(t) {
-	t.plan(15 + 3 + 2 + 2)
+	t.plan(16 + 3 + 2 + 2)
 
 	const OtherModel = Model.create({
 		typeName: 'woo'
@@ -326,6 +326,7 @@ Test('model.serialize', function(t) {
 		t.ok(_.isArray(serialized.nestedSet), 'nested Sets are serialized as arrays')
 		t.ok(_.isArray(serialized.nestedOrderedSet), 'nested OrderedSets are serialized as arrays')
 		t.ok(_.isUndefined(serialized.__cid), 'the client side identifier is omitted by default')
+		t.ok(_.isUndefined(serialized.__typeName), 'the model type name is omitted by default')
 	}, 'accepts a model instance')
 
 	t.doesNotThrow(() => {		

test/state.js

@@ -218,7 +218,7 @@ Test('state.collectionOf', function(t) {
 });
 
 Test('state.serialize', function(t) {
-	t.plan(7 + 3 + 2 + 2);
+	t.plan(7 + 5 + 2 + 2);
 
 	var state = State.create('test-model', {});
 
@@ -257,7 +257,9 @@ Test('state.serialize', function(t) {
 		var serializedIncluded = state.serialize(instance, { omitMeta: false });
 
 		t.ok(_.isUndefined(serialized.__cid), 'serialized object does not contain cid by default');
+		t.ok(_.isUndefined(serialized.__typeName), 'serialized object does not contain typename by default');
 		t.equal(instance.get('__cid'), serializedIncluded.__cid, 'serialized object contains the client identifier of the instance when passing true for the `omitMeta` option');
+		t.equal(instance.get('__typeName'), serializedIncluded.__typeName, 'serialized object contains the state type name of the instance when passing true for the `omitMeta` option')
 	}, 'accepts a State instance and options with a flag to omit meta data');
 
 	t.doesNotThrow(function() {