component now accepts argument names, previous version is now named c…

…omplexComponent

examples/basic/index.html

@@ -25,21 +25,9 @@
 
       const engine = new Engine()
 
-      const PositionComponent = component(function(x, y) {
-        this.x = x
-        this.y = y
-      })
-
-      const VelocityComponent = component(function(x, y) {
-        this.x = x
-        this.y = y
-      })
-
-      const RectangleComponent = component(function(width, height, color) {
-        this.width = width
-        this.height = height
-        this.color = color
-      })
+      const PositionComponent = component('x', 'y')
+      const VelocityComponent = component('x', 'y')
+      const RectangleComponent = component('width', 'height', 'color')
 
       const MovementSystem = {
         query: Query.all(PositionComponent, VelocityComponent),

package.json

@@ -9,7 +9,7 @@
     "system"
   ],
   "license": "MIT",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "main": "lib/ouyo.js",
   "repository": {
     "type": "git",

src/component.js

@@ -1,6 +1,21 @@
 let index = 0
 
-export function component(objectConstructor, objectDestructor) {
+export function component() {
+  let functionArguments = []
+  let body = ''
+  for(let i = 0; i < arguments.length; i++) {
+    if(/^[_a-zA-Z]\w*$/.exec(arguments[i])) {
+      let arg = arguments[i]
+      functionArguments[i] = arg
+      body += `this.${arg}=${arg};`
+    } else {
+      throw new Error('Invalid identifier: ' + arguments[i])
+    }
+  }
+  return complexComponent(new Function(functionArguments, body))
+}
+
+export function complexComponent(objectConstructor, objectDestructor) {
   const id = index++
   objectConstructor.id = id
   objectConstructor.prototype._id = id

src/component.test.js

@@ -1,12 +1,39 @@
-import { component } from './component'
+import { component, complexComponent } from './component'
 
 describe('component', () => {
+  test('the result should be a constructor', () => {
+    const TestComponent = component('a', 'b')
+    expect(new TestComponent(1, 2)).toEqual({ a: 1, b: 2 })
+  })
+
+  test('the result have and id property', () => {
+    const TestComponent = component('a', 'b')
+    const instance = new TestComponent(1, 2)
+
+    expect(TestComponent.id).not.toBe(undefined)
+    expect(TestComponent.id).toEqual(instance._id)
+  })
+
+  test('must work along complexComponent', () => {
+    const SimpleComponent = component('a', 'b')
+    const ComplexComponent = complexComponent(
+      function(a, b) {
+        this.a = a
+        this.b = b
+      }
+    )
+    expect(ComplexComponent.id).toEqual(SimpleComponent.id + 1)
+    expect(SimpleComponent.destroy).toBeInstanceOf(Function)
+  })
+})
+
+describe('complexComponent', () => {
   test('should modify the prototype of the argument', () => {
     function Undecorated(a, b) {
       this.a = a
       this.b = b
     }
-    const Decorated = component(Undecorated)
+    const Decorated = complexComponent(Undecorated)
 
     expect(new Decorated(1, 2)._id).toBe(Decorated.id)
   })
@@ -16,7 +43,7 @@ describe('component', () => {
       this.a = a
       this.b = b
     }
-    const Decorated = component(Undecorated)
+    const Decorated = complexComponent(Undecorated)
 
     expect(new Decorated(1, 2)).toEqual({ a: 1, b: 2 })
   })
@@ -26,23 +53,23 @@ describe('component', () => {
       this.a = a
       this.b = b
     }
-    const DecoratedA = component(Undecorated)
-    const DecoratedB = component(Undecorated)
+    const DecoratedA = complexComponent(Undecorated)
+    const DecoratedB = complexComponent(Undecorated)
 
     expect(DecoratedA).toBe(DecoratedB)
   })
 
   test('consecutive calls increment the id', () => {
-    const DecoratedA = component(function() {})
-    const DecoratedB = component(function() {})
-    const DecoratedC = component(function() {})
+    const DecoratedA = complexComponent(function() {})
+    const DecoratedB = complexComponent(function() {})
+    const DecoratedC = complexComponent(function() {})
 
     expect(DecoratedB.id).toEqual(DecoratedA.id + 1)
     expect(DecoratedC.id).toBe(DecoratedB.id + 1)
   })
 
   test('should allow object destruction', () => {
-    const Component = component(function (a, b) {
+    const Component = complexComponent(function (a, b) {
       this.a = a
       this.b = b
     })
@@ -52,7 +79,7 @@ describe('component', () => {
 
   test('upon destruction calls the second parameter', () => {
     let innerInstance
-    const Component = component(function (a, b) {
+    const Component = complexComponent(function (a, b) {
       this.a = a
       this.b = b
     }, function() {

src/entity.test.js

@@ -3,8 +3,8 @@ import { Key } from './key'
 import { component } from './component'
 
 const noop = () => {}
-const ComponentA = component(function() {})
-const ComponentB = component(function() {})
+const ComponentA = component()
+const ComponentB = component()
 const idMap = {}
 idMap[ComponentA.id] = 0
 idMap[ComponentB.id] = 1
@@ -104,7 +104,7 @@ describe('Entity', () => {
   })
 
   test('using unknown component results in exception', () => {
-    const ComponentC = component(function() {})
+    const ComponentC = component()
     const entity = new Entity(count, idMap, noop)
 
     expect(() => entity.add(new ComponentC())).toThrow()

src/index.js

@@ -1,3 +1,3 @@
 export { Engine } from './engine'
-export { component } from './component'
+export { component, complexComponent } from './component'
 export { Query } from './query'

src/query.test.js

@@ -3,9 +3,9 @@ import { component } from './component'
 import { Engine } from './engine'
 import { Key } from './key'
 
-const ComponentA = component(function() {})
-const ComponentB = component(function() {})
-const ComponentC = component(function() {})
+const ComponentA = component()
+const ComponentB = component()
+const ComponentC = component()
 
 describe('Query', () => {
   test('all should create an object with bake method', () => {