From 549c2217f14c0cfb140cc848aee0b2cf2691a484 Mon Sep 17 00:00:00 2001
From: lajohnston <lajohnston@live.co.uk>
Date: Sat, 3 Mar 2018 17:10:19 +0000
Subject: [PATCH] Add a self-reference to entity so it can be accessed when
 destructuring

---
 dist/eco.min.js                  | 4 ++--
 spec/e2e/iterators.spec.js       | 5 ++++-
 spec/unit/abstractEntity.spec.js | 5 +++++
 src/abstractEntity.js            | 9 +++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dist/eco.min.js b/dist/eco.min.js
index 5e48348..73bc893 100644
--- a/dist/eco.min.js
+++ b/dist/eco.min.js
@@ -1,10 +1,10 @@
 /*!
  * eco.js - v0.4.0-alpha
- * Built Fri, 2nd Mar 2018 21:03:56 UTC
+ * Built Sat, 3rd Mar 2018 17:05:23 UTC
  *
  * https://github.com/lajohnston/eco
  *
  * eco.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
- !function(){"use strict";function t(t,e){this.entity=t,this.component=e,this.next=void 0}function e(t,e){for(var n=0;n<e.length;n++)if(!t.has(e[n]))return!1;return!0}function n(){var t={Entity:a,Iterator:f,EntityCollection:h,Eco:Eco,create:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=function(t){function e(){return o(this,e),c(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return s(e,t),e}(t.Entity);return e.forEach(function(t){return n.defineComponent(t)}),new t.Eco(function(t){return new n(t)},t.entityCollection(),t.createIterator)},entityCollection:function(){return new t.EntityCollection},createIterator:function(e,n,i){return new t.Iterator(e,n,i)}};return t}function i(t){return n().create(t)}var o=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")},r=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}(),s=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)},c=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e},u=Object.create(null),a=function(){function t(e){o(this,t),this.eco=e,this.components=Object.create(u),this._enabled=!0}return r(t,[{key:"has",value:function(t){return void 0!==this.components[t]}},{key:"removeAll",value:function(){var t=this;return Object.keys(this.components).forEach(function(e){t[e]=void 0}),this}},{key:"getComponents",value:function(){var t=this,e={};return Object.keys(this.components).forEach(function(n){e[n]=t.components[n]}),e}},{key:"enabled",get:function(){return this._enabled},set:function(t){var e=this._enabled,n=!!t;e!==n&&(this._enabled=n,this.eco.onEntityStatusChanged(this,this._enabled))}}],[{key:"defineComponent",value:function(t){Object.defineProperty(this.prototype,t,{enumerable:!0,configurable:!0,get:function(){return this.components[t]},set:function(e){var n=this.components[t];this.components[t]=e,this._enabled&&this.eco.onComponentChanged(this,t,e,n)}})}}]),t}(),Eco=function(){function Eco(t,e,n){o(this,Eco),this._createEntity=t,this.entities=e,this.createIterator=n,this.onChange=function(){}}return r(Eco,[{key:"onEntityStatusChanged",value:function(t,e){e?this.entities.add(t):this.entities.remove(t)}},{key:"onComponentChanged",value:function(t,e,n,i){void 0!==n&&void 0!==i||n===i||this.entities.incVersion(t,e),this.onChange(t,e,n,i)}},{key:"entity",value:function(){var t=this._createEntity(this);return this.entities.add(t),t}},{key:"iterator",value:function(t,e){return this.createIterator(this.entities,t,e)}},{key:"all",get:function(){return this.entities.entities}}]),Eco}(),h=function(){function e(){o(this,e),this.entities=[],this.version=new t}return r(e,[{key:"add",value:function(t){this.entities.push(t),this.incVersion(t)}},{key:"remove",value:function(t){this.entities=this.entities.filter(function(e){return e!==t}),this.incVersion(t)}},{key:"incVersion",value:function(t,e){this.version=this.version.supersede(t,e)}},{key:"filter",get:function(){return this.entities.filter.bind(this.entities)}}]),e}();t.prototype.supersede=function(e,n){var i=new t(e,n);return this.next=i,i};var f=function(){function t(n,i,r){var s=this;o(this,t),this.entities=n,this.componentMap=Object.create(null),i.forEach(function(t){s.componentMap[t]=!0}),this.criteria=r||function(t){return e(t,i)},this.cacheVersion={},this.cached=[]}return r(t,[{key:"forEach",value:function(t){this.filtered.forEach(t)}},{key:"filtered",get:function(){for(;this.cacheVersion.next;){var t=this.cacheVersion.next;if(!t.component)break;if(this.componentMap[t.component])break;this.cacheVersion=t}return this.cacheVersion!==this.entities.version&&(this.cached=this.entities.filter(this.criteria),this.cacheVersion=this.entities.version),this.cached}}]),t}();window.Eco={container:n,create:i}}();
\ No newline at end of file
+ !function(){"use strict";function t(t,e){this.entity=t,this.component=e,this.next=void 0}function e(t,e){for(var n=0;n<e.length;n++)if(!t.has(e[n]))return!1;return!0}function n(){var t={Entity:a,Iterator:f,EntityCollection:h,Eco:Eco,create:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=function(t){function e(){return o(this,e),c(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return s(e,t),e}(t.Entity);return e.forEach(function(t){return n.defineComponent(t)}),new t.Eco(function(t){return new n(t)},t.entityCollection(),t.createIterator)},entityCollection:function(){return new t.EntityCollection},createIterator:function(e,n,i){return new t.Iterator(e,n,i)}};return t}function i(t){return n().create(t)}var o=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")},r=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}(),s=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)},c=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e},u=Object.create(null),a=function(){function t(e){o(this,t),this.eco=e,this.components=Object.create(u),this._enabled=!0}return r(t,[{key:"has",value:function(t){return void 0!==this.components[t]}},{key:"removeAll",value:function(){var t=this;return Object.keys(this.components).forEach(function(e){t[e]=void 0}),this}},{key:"getComponents",value:function(){var t=this,e={};return Object.keys(this.components).forEach(function(n){e[n]=t.components[n]}),e}},{key:"entity",get:function(){return this}},{key:"enabled",get:function(){return this._enabled},set:function(t){var e=this._enabled,n=!!t;e!==n&&(this._enabled=n,this.eco.onEntityStatusChanged(this,this._enabled))}}],[{key:"defineComponent",value:function(t){Object.defineProperty(this.prototype,t,{enumerable:!0,configurable:!0,get:function(){return this.components[t]},set:function(e){var n=this.components[t];this.components[t]=e,this._enabled&&this.eco.onComponentChanged(this,t,e,n)}})}}]),t}(),Eco=function(){function Eco(t,e,n){o(this,Eco),this._createEntity=t,this.entities=e,this.createIterator=n,this.onChange=function(){}}return r(Eco,[{key:"onEntityStatusChanged",value:function(t,e){e?this.entities.add(t):this.entities.remove(t)}},{key:"onComponentChanged",value:function(t,e,n,i){void 0!==n&&void 0!==i||n===i||this.entities.incVersion(t,e),this.onChange(t,e,n,i)}},{key:"entity",value:function(){var t=this._createEntity(this);return this.entities.add(t),t}},{key:"iterator",value:function(t,e){return this.createIterator(this.entities,t,e)}},{key:"all",get:function(){return this.entities.entities}}]),Eco}(),h=function(){function e(){o(this,e),this.entities=[],this.version=new t}return r(e,[{key:"add",value:function(t){this.entities.push(t),this.incVersion(t)}},{key:"remove",value:function(t){this.entities=this.entities.filter(function(e){return e!==t}),this.incVersion(t)}},{key:"incVersion",value:function(t,e){this.version=this.version.supersede(t,e)}},{key:"filter",get:function(){return this.entities.filter.bind(this.entities)}}]),e}();t.prototype.supersede=function(e,n){var i=new t(e,n);return this.next=i,i};var f=function(){function t(n,i,r){var s=this;o(this,t),this.entities=n,this.componentMap=Object.create(null),i.forEach(function(t){s.componentMap[t]=!0}),this.criteria=r||function(t){return e(t,i)},this.cacheVersion={},this.cached=[]}return r(t,[{key:"forEach",value:function(t){this.filtered.forEach(t)}},{key:"filtered",get:function(){for(;this.cacheVersion.next;){var t=this.cacheVersion.next;if(!t.component)break;if(this.componentMap[t.component])break;this.cacheVersion=t}return this.cacheVersion!==this.entities.version&&(this.cached=this.entities.filter(this.criteria),this.cacheVersion=this.entities.version),this.cached}}]),t}();window.Eco={container:n,create:i}}();
\ No newline at end of file
diff --git a/spec/e2e/iterators.spec.js b/spec/e2e/iterators.spec.js
index 290f31b..c4346fa 100644
--- a/spec/e2e/iterators.spec.js
+++ b/spec/e2e/iterators.spec.js
@@ -17,8 +17,11 @@ describe("Iterators", () => {
     matching.foo = "foo";
     matching.bar = "bar";
 
-    filter.forEach((entity, index, array) => {
+    filter.forEach(({ entity, foo, bar }, index, array) => {
       expect(entity).toBe(matching);
+      expect(foo).toBe(matching.foo);
+      expect(bar).toBe(matching.bar);
+
       expect(array).toEqual([matching]);
       done();
     });
diff --git a/spec/unit/abstractEntity.spec.js b/spec/unit/abstractEntity.spec.js
index c74bd0b..5889beb 100644
--- a/spec/unit/abstractEntity.spec.js
+++ b/spec/unit/abstractEntity.spec.js
@@ -171,4 +171,9 @@ describe("Entity", () => {
     entity.enabled = false;
     expect(entity.enabled).toBe(false);
   });
+
+  it("should hold a property that references itself, for use when destructuring", () => {
+    const entity = new AbstractEntity();
+    expect(entity.entity).toBe(entity);
+  });
 });
diff --git a/src/abstractEntity.js b/src/abstractEntity.js
index 313afdc..21a7ad2 100644
--- a/src/abstractEntity.js
+++ b/src/abstractEntity.js
@@ -15,6 +15,15 @@ export default class AbstractEntity {
     this._enabled = true;
   }
 
+  /**
+   * Returns a reference to this entity to allow it to be accessed with destructuring
+   *
+   * @type {Entity} the entity
+   */
+  get entity() {
+    return this;
+  }
+
   /**
    * @type {boolean} true if the entity is enabled, otherwise false
    */