cleanup node inheritance

brianc · brianc · commit aeaf00996c2f · 2013-03-23T16:06:25.000-05:00
diff --git a/lib/node/binary.js b/lib/node/binary.js
@@ -1,8 +1,9 @@
 'use strict';
-
-var BinaryNode = module.exports = require(__dirname).define({
+var Node = require(__dirname);
+var BinaryNode = module.exports = Node.define({
   type: 'BINARY',
   constructor: function(config) {
+    Node.call(this);
     this.left = config.left;
     this.operator = config.operator;
     this.right = config.right;
diff --git a/lib/node/column.js b/lib/node/column.js
@@ -5,6 +5,7 @@ var Node = require(__dirname);
 module.exports = Node.define({
   type: 'COLUMN',
   constructor: function(config) {
+    Node.call(this);
     this.name = config.name;
     this.alias = config.alias;
     this.star = config.star;
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var util = require('util');
 var assert = require('assert');
 
 var Node = function(type) {
@@ -25,20 +26,14 @@ Node.prototype.addAll = function(nodes) {
 
 Node.define = function(def) {
   var c = function() {
-    Node.apply(this, arguments);
+    Node.call(this);
   };
   //allow custom sub-class constructor
-  if(def.constructor) {
-    c = function() {
-      Node.apply(this, arguments);
-      def.constructor.apply(this, arguments);
-    };
+  if(def.constructor && def.constructor != {}.constructor) {
+    c = def.constructor;
   }
-  var key;
-  for(key in Node.prototype) {
-    c.prototype[key] = Node.prototype[key];
-  }
-  for(key in def) {
+  util.inherits(c, Node);
+  for(var key in def) {
     c.prototype[key] = def[key];
   }
   return c;
diff --git a/lib/node/insert.js b/lib/node/insert.js
@@ -7,6 +7,7 @@ var DefaultNode = require('./default');
 var Insert = Node.define({
   type: 'INSERT',
   constructor: function () {
+    Node.call(this);
     this.names = [];
     this.columns = [];
     this.valueSets = [];
diff --git a/lib/node/join.js b/lib/node/join.js
@@ -1,8 +1,10 @@
 'use strict';
 
-var JoinNode = module.exports = require(__dirname).define({
+var Node = require(__dirname);
+var JoinNode = module.exports = Node.define({
   type: 'JOIN',
   constructor: function(subType, from, to) {
+    Node.call(this);
     this.subType = subType;
     this.from = from.toNode();
     this.to = to.toNode();
diff --git a/lib/node/orderByColumn.js b/lib/node/orderByColumn.js
@@ -1,8 +1,10 @@
 'use strict';
 
-var OrderByColumn = module.exports = require(__dirname).define({
+var Node = require(__dirname);
+var OrderByColumn = module.exports = Node.define({
   type: 'ORDER BY COLUMN',
   constructor: function(config) {
+    Node.call(this);
     this.column = config.column;
     this.direction = config.direction;
   }
diff --git a/lib/node/parameter.js b/lib/node/parameter.js
@@ -1,8 +1,10 @@
 'use strict';
 
-module.exports = require(__dirname).define({
+var Node = require(__dirname);
+module.exports = Node.define({
   type: 'PARAMETER',
   constructor: function(val) {
+    Node.call(this);
     this._val = val;
   },
   value: function() {
diff --git a/lib/node/query.js b/lib/node/query.js
@@ -35,6 +35,7 @@ var Modifier = Node.define({
 var Query = Node.define({
   type: 'QUERY',
   constructor: function(table) {
+    Node.call(this);
     this.table = table;
   },
   select: function() {
diff --git a/lib/node/table.js b/lib/node/table.js
@@ -1,8 +1,10 @@
 'use strict';
 
-module.exports = require(__dirname).define({
+var Node = require(__dirname);
+module.exports = Node.define({
   type: 'TABLE',
   constructor: function(table) {
+    Node.call(this);
     this.table = table;
   }
 });
diff --git a/lib/node/text.js b/lib/node/text.js
@@ -5,6 +5,7 @@ var Node = require(__dirname);
 module.exports = Node.define({
   type: 'TEXT',
   constructor: function(text) {
+    Node.call(this);
     this.text = text;
   }
 });
diff --git a/lib/node/unary.js b/lib/node/unary.js
@@ -1,8 +1,10 @@
 'use strict';
 
-module.exports = require(__dirname).define({
+var Node = require(__dirname);
+module.exports = Node.define({
   type: 'UNARY',
   constructor: function(config) {
+    Node.call(this);
     this.left = config.left,
     this.operator = config.operator;
   }
diff --git a/lib/node/where.js b/lib/node/where.js
@@ -27,6 +27,7 @@ var normalizeNode = function(table, node) {
 
 module.exports = Node.define({
   constructor: function(table) {
+    Node.call(this);
     this.table = table;
   },
   type: 'WHERE',
diff --git a/test/clause-definition.js b/test/clause-definition.js
@@ -10,6 +10,7 @@ var Bang = Node.define({
 
 var Boom = Node.define({
   constructor: function(n) {
+    Node.call(this);
     this.name = n;
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ var Node = require(__dirname);`
`5`	`5`	`module.exports = Node.define({`
`6`	`6`	`type: 'TEXT',`
`7`	`7`	`constructor: function(text) {`
	`8`	`+ Node.call(this);`
`8`	`9`	`this.text = text;`
`9`	`10`	`}`
`10`	`11`	`});`