Merge dev into master, 2.3.0 (#68)

* fixes newEntity, which suffered from the same problem as registerSystem

* update changelog and package.json

* update bundles

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## v2.1.0 (2018-05-31)
+## v2.3.0 (2018-05-31)
+
+`EntityManager.newEntity` now properly registers a system using only the `components` array passed in
+
+## v2.2.0 (2018-05-31)
 
 `EntityManager.registerSystem` now properly registers a system using only the `components` array passed in
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "gg-entities",
   "description": "easy-to-use Entity-Component System in JavaScript",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": {
     "name": "alansmithee",
     "email": "[email protected]"

src/core/entity-manager.js

@@ -22,6 +22,14 @@ class EntityManager {
 
         this.entities = Array.from({ length : this.capacity }, () => ({ components: 0 }))
     }
+
+    componentNamesToId(components) {
+        return Array
+            .from(this.componentLookup)
+            .filter(cl => components.some(c => c === cl[0]))
+            .map(cl => cl[1])
+            .reduce((curr, next) => curr | next, 0)
+    }
 
     increaseCapacity() {
         let oldCapacity = this.capacity
@@ -53,7 +61,7 @@ class EntityManager {
 
     newEntity(components) {
         if (Array.isArray(components)) {
-            components = Array.from(this.componentLookup).reduce((curr, next) => ['', curr[1] | next[1]], ['', 0])[1]
+            components = this.componentNamesToId(components)
         }
 
         if (!Number.isInteger(components) || components <= 0) {
@@ -180,11 +188,7 @@ class EntityManager {
 
     registerSystem(type, components, callback) {
         if (Array.isArray(components)) {
-            components = Array
-                .from(this.componentLookup)
-                .filter(cl => components.some(c => c === cl[0]))
-                .map(cl => cl[1])
-                .reduce((curr, next) => curr | next, 0)
+            components = this.componentNamesToId(components)
         }
 
         return this.systemManager.registerSystem(type, components, callback)

test/entity-manager/new-entity.test.js

@@ -49,7 +49,7 @@ describe('EntityManager', function() {
             expect(res.entity).to.deep.equal(this.entityManager.entities[res.id])
         })
 
-        test('correctly creates an entity given an array of component names (as define in the [componentLookup])', () => {
+        test('correctly creates an entity given an array of component names (as defined in the [componentLookup])', () => {
             let res = this.entityManager.newEntity(this.componentNames)
 
             expect(res.id).to.equal(0)
@@ -60,6 +60,21 @@ describe('EntityManager', function() {
             expect(res.id).to.equal(1)
             expect(res.entity).to.deep.equal(this.entityManager.entities[res.id])
         })
+
+        test('correctly creates an entity given an array of not all registered component names', () => {
+            const componentNames = [ this.positionName, this.statsName ]
+
+            let res = this.entityManager.newEntity(componentNames)
+
+            expect(res.id).to.equal(0)
+            expect(res.entity).to.deep.equal(this.entityManager.entities[res.id])
+
+            res = this.entityManager.newEntity(componentNames)
+
+            expect(res.id).to.equal(1)
+            expect(res.entity).to.deep.equal(this.entityManager.entities[res.id])
+            expect(res.entity.components).to.equal(this.position | this.stats)
+        })
 
         test('does not add an entity and returns [capacity], given wrong [components] input', () => {
             const capacity = this.entityManager.capacity