fix(ConnectorsList): add back missing ConnectorsList

csg.js

@@ -133,7 +133,8 @@ CSG.Matrix4x4 = require('./src/math/Matrix4')
 
 CAG.Side = require('./src/math/Side')
 
-CSG.Connector = require('./src/connectors')
+CSG.Connector = require('./src/connectors').Connector
+CSG.ConnectorList = require('./src/connectors').ConnectorList
 CSG.Properties = require('./src/Properties')
 
 const {circle, ellipse, rectangle, roundedRectangle} = require('./src/primitives2d')

src/CAG.js

@@ -1,5 +1,5 @@
 const {EPS, angleEPS, areaEPS, defaultResolution3D} = require('./constants')
-const Connector = require('./connectors')
+const {Connector} = require('./connectors')
 const OrthoNormalBasis = require('./math/OrthoNormalBasis')
 const Vertex2D = require('./math/Vertex2')
 const Vertex3D = require('./math/Vertex3')

src/CSG.js

@@ -14,8 +14,8 @@ const OrthoNormalBasis = require('./math/OrthoNormalBasis')
 const CAG = require('./CAG') // FIXME: circular dependency !
 
 const Properties = require('./Properties')
-const Connector = require('./connectors')
-//let {fromPolygons} = require('./CSGMakers') // FIXME: circular dependency !
+const {Connector} = require('./connectors')
+// let {fromPolygons} = require('./CSGMakers') // FIXME: circular dependency !
 
 /** Class CSG
  * Holds a binary space partition tree representing a 3D solid. Two solids can

src/connectors.js

@@ -148,7 +148,7 @@ ConnectorList._fromPath2DExplicit = function (path2D, angleIsh) {
 }
 
 ConnectorList.prototype = {
-  setClosed: function (bool) {
+  setClosed: function (closed) {
     this.closed = !!closed // FIXME: what the hell ?
   },
   appendConnector: function (conn) {
@@ -202,17 +202,19 @@ ConnectorList.prototype = {
      * TODO: add a check that 2 follow-on CAGs are not intersecting
      */
   verify: function () {
-    let connI, connI1, dPosToAxis, axisToNextAxis
+    let connI
+    let connI1
     for (let i = 0; i < this.connectors_.length - 1; i++) {
-      connI = this.connectors_[i], connI1 = this.connectors_[i + 1]
+      connI = this.connectors_[i]
+      connI1 = this.connectors_[i + 1]
       if (connI1.point.minus(connI.point).dot(connI.axisvector) <= 0) {
-        throw ('Invalid ConnectorList. Each connectors position needs to be within a <90deg range of previous connectors axisvector')
+        throw new Error('Invalid ConnectorList. Each connectors position needs to be within a <90deg range of previous connectors axisvector')
       }
       if (connI.axisvector.dot(connI1.axisvector) <= 0) {
-        throw ('invalid ConnectorList. No neighboring connectors axisvectors may span a >=90deg angle')
+        throw new Error('invalid ConnectorList. No neighboring connectors axisvectors may span a >=90deg angle')
       }
     }
   }
 }
 
-module.exports = Connector
+module.exports = {Connector, ConnectorList}

src/primitives3d.js

@@ -4,7 +4,7 @@ const {defaultResolution3D, defaultResolution2D, EPS} = require('./constants')
 const Vector3D = require('./math/Vector3')
 const Vertex = require('./math/Vertex3')
 const Polygon = require('./math/Polygon3')
-const Connector = require('./connectors')
+const {Connector} = require('./connectors')
 const Properties = require('./Properties')
 
 /** Construct an axis-aligned solid cuboid.

test/connectors.js

@@ -1,7 +1,12 @@
 import test from 'ava'
 import {CSG} from '../csg'
 
-
 test('CSG.Connector exists', t => {
   t.is('Connector' in CSG, true)
 })
+
+test('CSG.connectorslist can be instanciated', t => {
+  const observed = new CSG.ConnectorList()
+
+  t.deepEqual(observed, {connectors_: []})
+})