@jscad/web 2.5.9 → 2.5.12

package/examples/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.1](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/examples@2.4.0...@jscad/examples@2.4.1) (2022-06-12)
+
+
+### Bug Fixes
+
+* **examples:** create uniform segments for involute gear example ([#1093](https://github.com/jscad/OpenJSCAD.org/issues/1093)) ([0b234f3](https://github.com/jscad/OpenJSCAD.org/commit/0b234f3f8ff6b39a967900089e2d939295163b68))
+
+
+
+
+
+# [2.4.0](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/examples@2.3.4...@jscad/examples@2.4.0) (2022-05-15)
+
+
+### Features
+
+* **examples:** new Nuts and Bolts example ([#1081](https://github.com/jscad/OpenJSCAD.org/issues/1081)) ([cd78003](https://github.com/jscad/OpenJSCAD.org/commit/cd7800351e56f7cd75f0add07cf068df328b7839))
+
+
+
+
+
+## [2.3.4](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/examples@2.3.3...@jscad/examples@2.3.4) (2022-04-24)
+
+**Note:** Version bump only for package @jscad/examples
+
+
+
+
+
 ## [2.3.3](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/examples@2.3.2...@jscad/examples@2.3.3) (2022-04-03)
 
 **Note:** Version bump only for package @jscad/examples

package/examples/README.md

@@ -63,9 +63,5 @@ See for more details
 (unless specified otherwise)
 
 Some content released under different licence:
-- thing_7-Zomboe.stl: CC-BY-NC-SA
 - 3d_sculpture-VernonBussler.stl: CC-BY-SA
 - frog-OwenCollins.stl: CC-BY-NC-SA
-- organic_flower-Bogoboy23.stl: CC-BY
-- treefrog-Jerrill.stl: CC-BY-NC-SA
-- yoda-RichRap.stl: CC-BY-SA

package/examples/core/extrusions/nutsAndBolts.js

@@ -0,0 +1,94 @@
+/**
+ * Nuts and Bolts
+ * @category Creating Shapes
+ * @skillLevel 8
+ * @description Demonstrating the advanced extrusion using slices to generate screw threads.
+ * @tags extrude, slice, slices, extrudefromslices, callback
+ * @authors platypii
+ * @licence MIT License
+ */
+
+const jscad = require('@jscad/modeling')
+const { cylinder } = jscad.primitives
+const { subtract, union } = jscad.booleans
+const { colorize } = jscad.colors
+const { extrudeFromSlices, slice } = jscad.extrusions
+const { translate } = jscad.transforms
+
+const options = {
+  hexWidth: 10,
+  hexHeight: 8,
+  threadLength: 32,
+  threadSize: 4,
+  innerRadius: 4,
+  outerRadius: 5.6,
+  slicesPerRevolution: 12,
+  segments: 32
+}
+
+const main = () => {
+  return [
+    colorize([0.9, 0.6, 0.2], bolt(options)),
+    colorize([0.4, 0.4, 0.4], translate([30, 0, 0], nut(options)))
+  ]
+}
+
+// generate bolt by attaching threads to a hex head
+const bolt = (options) => {
+  return union(
+    translate([0, 0, options.threadLength], hex(options)),
+    threads(options)
+  )
+}
+
+// generate nut by subtracting threads from a hex block
+const nut = (options) => {
+  return subtract(
+    hex(options),
+    threads({ ...options, threadLength: options.hexHeight })
+  )
+}
+
+// generate hexagonal block
+const hex = (options) => {
+  const radius = options.hexWidth * 1.1547005 // hexagon outer radius
+  const height = options.hexHeight
+  return cylinder({ center: [0, 0, height / 2], height, radius, segments: 6 })
+}
+
+// generate a threaded shaft using extrudeFromSlices
+const threads = (options) => {
+  const { innerRadius, outerRadius, segments, threadLength } = options
+  const revolutions = threadLength / options.threadSize
+  const numberOfSlices = options.slicesPerRevolution * revolutions
+  return extrudeFromSlices({
+    numberOfSlices,
+    callback: (progress, index, base) => {
+      // generate each slice manually
+      const points = []
+      for (let i = 0; i < segments; i++) {
+        const pointAngle = Math.PI * 2 * i / segments
+        const threadAngle = (2 * Math.PI * revolutions * progress) % (Math.PI * 2)
+
+        // define the shape of the threads
+        const phase = angleDiff(threadAngle, pointAngle) / Math.PI
+        const radius = lerp(innerRadius, outerRadius, 1.4 * phase - 0.2)
+
+        const x = radius * Math.cos(pointAngle)
+        const y = radius * Math.sin(pointAngle)
+        points.push([x, y, threadLength * progress])
+      }
+      return slice.fromPoints(points)
+    }
+  }, {})
+}
+
+// linear interpolation with bounding
+const lerp = (a, b, t) => Math.max(a, Math.min(b, a + (b - a) * t))
+
+const angleDiff = (angle1, angle2) => {
+  const diff = Math.abs((angle1 - angle2) % (Math.PI * 2))
+  return diff > Math.PI ? Math.PI * 2 - diff : diff
+}
+
+module.exports = { main }

package/examples/examples.json

@@ -1 +1 @@
-{"Creating Shapes":[{"title":"2D Primitives Demonstration","filePath":"examples/core/primitives/primitives2D.js","sort":1,"description":"Demonstrating the basics of a variety of 2D primitives"},{"title":"3D Primitives Demonstration","filePath":"examples/core/primitives/primitives3D.js","sort":1,"description":"Demonstrating the basics of a variety of 3D primitives"},{"title":"Rounded Cuboid","filePath":"examples/core/primitives/roundedCuboid.js","sort":1,"description":"Demonstrating the roundedCuboid() functiom"},{"title":"Spheres of all sorts","filePath":"examples/core/primitives/sphere.js","sort":1,"description":"Demonstrating the sphere() and geodesicSphere() functions"},{"title":"Building a Dodecahedron","filePath":"examples/core/primitives/dodecahedron.js","sort":2,"description":"building dodecahedron() from cuboids"},{"title":"Torus Variety","filePath":"examples/core/primitives/torus.js","sort":2,"description":"Demonstrating the capabilities and variations of the torus() primitive"},{"title":"Building a Polyhedron from scratch","filePath":"examples/core/primitives/polyhedron.js","sort":4,"description":"Demonstrating the polyhedron() function"},{"title":"Basic Extrude Functions","filePath":"examples/core/extrusions/basicExtrusions.js","sort":5,"description":"Demonstrating the basic types of extrusions, and the variety of objects they can create."},{"title":"Extrude Along a Bezier Path","filePath":"examples/core/curves/bezier/extrudeAlongPath.js","sort":5,"description":"Using a 3D bezier path to create a solid tube"},{"title":"Extrude From Slices","filePath":"examples/core/extrusions/extrudeFromSlices.js","sort":5,"description":"Demonstrating the advanced extrusion using slices with varying numbers of points."},{"title":"Simple Bezier Extrude","filePath":"examples/core/curves/bezier/simpleExtrude.js","sort":5,"description":"Using a 1D bezier function to create a non-uniform extrusion"},{"title":"Hull and HullChain 2D example","filePath":"examples/core/hulls/hull2D.js","sort":8,"description":"Demonstrating the basics of Hulls in two dimensions"},{"title":"Hull and HullChain 3D example","filePath":"examples/core/hulls/hull3D.js","sort":8,"description":"Demonstrating the basics of Hulls in three dimensions"},{"title":"Basic Text Creation","filePath":"examples/core/text/text.js","sort":10,"description":"Demonstrating methods of building 3D text"}],"Manipulating Shapes":[{"title":"Basic Booleans Demonstration","filePath":"examples/core/booleans/basicBooleans.js","sort":2,"description":"Demonstrating the basics of boolean shape combinations"},{"title":"Align function demonstration","filePath":"examples/core/transforms/align.js","sort":3,"description":"Demonstrating aligning shapes using the align function"},{"title":"Expanding 2D and 3D Shapes","filePath":"examples/core/expansions/expand.js","sort":5,"description":"Exploring the expand() function on 2D and 3D geometries"},{"title":"Offsetting 2D Shapes","filePath":"examples/core/expansions/offset.js","sort":5,"description":"Demonstrating the offset() function. Moves all points in a 2d path or 2D geometry perpendicular to the line's tangent."},{"title":"Center function demonstration","filePath":"examples/core/transforms/center.js","sort":10,"description":"Using center() to translate objects"},{"title":"Measure Aggregate Bounding Box","filePath":"examples/core/measurements/measureAggregateBounds.js","sort":10,"description":"Examples of measureAggregateBoundingBox function"},{"title":"Measure Area and Volume","filePath":"examples/core/measurements/measureAreaAndVolume.js","sort":10,"description":"Examples of measureArea() and measureVolume() function"},{"title":"Measure Bounding Box","filePath":"examples/core/measurements/measureBounds.js","sort":10,"description":"Examples of measureBoundingBox function"}],"Colors":[{"title":"Basic Colors","filePath":"examples/core/colors/basicColors.js","sort":1,"description":"showing various color functions"},{"title":"Color Cube","filePath":"examples/core/colors/colorCube.js","sort":2,"description":"looking at the different ways to specify a color"},{"title":"Transparency","filePath":"examples/core/colors/transparency.js","sort":2,"description":"showing transparent objects"}],"Parameters":[{"title":"All Parameter Types Demo","filePath":"examples/parameters/allParamTypes.js","sort":1,"description":"Example of interactive parameters"},{"title":"Birthday Balloons","filePath":"examples/parameters/balloons.js","sort":1,"description":"Example of building models from interactive parameters"},{"title":"Parametric Involute Gear","filePath":"examples/parameters/gear.js","sort":1,"description":"Build a proper involute gear, demonstrating parameters, and how they can be used in complex math."}],"Other":[{"title":"Coordinate system and Rotation demonstration","filePath":"examples/core/other/orientation.js","sort":1,"description":"Demonstrating rotation about the three axes."}]}
+{"Creating Shapes":[{"title":"2D Primitives Demonstration","filePath":"examples/core/primitives/primitives2D.js","sort":1,"description":"Demonstrating the basics of a variety of 2D primitives"},{"title":"3D Primitives Demonstration","filePath":"examples/core/primitives/primitives3D.js","sort":1,"description":"Demonstrating the basics of a variety of 3D primitives"},{"title":"Rounded Cuboid","filePath":"examples/core/primitives/roundedCuboid.js","sort":1,"description":"Demonstrating the roundedCuboid() functiom"},{"title":"Spheres of all sorts","filePath":"examples/core/primitives/sphere.js","sort":1,"description":"Demonstrating the sphere() and geodesicSphere() functions"},{"title":"Building a Dodecahedron","filePath":"examples/core/primitives/dodecahedron.js","sort":2,"description":"building dodecahedron() from cuboids"},{"title":"Torus Variety","filePath":"examples/core/primitives/torus.js","sort":2,"description":"Demonstrating the capabilities and variations of the torus() primitive"},{"title":"Building a Polyhedron from scratch","filePath":"examples/core/primitives/polyhedron.js","sort":4,"description":"Demonstrating the polyhedron() function"},{"title":"Basic Extrude Functions","filePath":"examples/core/extrusions/basicExtrusions.js","sort":5,"description":"Demonstrating the basic types of extrusions, and the variety of objects they can create."},{"title":"Extrude Along a Bezier Path","filePath":"examples/core/curves/bezier/extrudeAlongPath.js","sort":5,"description":"Using a 3D bezier path to create a solid tube"},{"title":"Extrude From Slices","filePath":"examples/core/extrusions/extrudeFromSlices.js","sort":5,"description":"Demonstrating the advanced extrusion using slices with varying numbers of points."},{"title":"Simple Bezier Extrude","filePath":"examples/core/curves/bezier/simpleExtrude.js","sort":5,"description":"Using a 1D bezier function to create a non-uniform extrusion"},{"title":"Hull and HullChain 2D example","filePath":"examples/core/hulls/hull2D.js","sort":8,"description":"Demonstrating the basics of Hulls in two dimensions"},{"title":"Hull and HullChain 3D example","filePath":"examples/core/hulls/hull3D.js","sort":8,"description":"Demonstrating the basics of Hulls in three dimensions"},{"title":"Nuts and Bolts","filePath":"examples/core/extrusions/nutsAndBolts.js","sort":8,"description":"Demonstrating the advanced extrusion using slices to generate screw threads."},{"title":"Basic Text Creation","filePath":"examples/core/text/text.js","sort":10,"description":"Demonstrating methods of building 3D text"}],"Manipulating Shapes":[{"title":"Basic Booleans Demonstration","filePath":"examples/core/booleans/basicBooleans.js","sort":2,"description":"Demonstrating the basics of boolean shape combinations"},{"title":"Align function demonstration","filePath":"examples/core/transforms/align.js","sort":3,"description":"Demonstrating aligning shapes using the align function"},{"title":"Expanding 2D and 3D Shapes","filePath":"examples/core/expansions/expand.js","sort":5,"description":"Exploring the expand() function on 2D and 3D geometries"},{"title":"Offsetting 2D Shapes","filePath":"examples/core/expansions/offset.js","sort":5,"description":"Demonstrating the offset() function. Moves all points in a 2d path or 2D geometry perpendicular to the line's tangent."},{"title":"Center function demonstration","filePath":"examples/core/transforms/center.js","sort":10,"description":"Using center() to translate objects"},{"title":"Measure Aggregate Bounding Box","filePath":"examples/core/measurements/measureAggregateBounds.js","sort":10,"description":"Examples of measureAggregateBoundingBox function"},{"title":"Measure Area and Volume","filePath":"examples/core/measurements/measureAreaAndVolume.js","sort":10,"description":"Examples of measureArea() and measureVolume() function"},{"title":"Measure Bounding Box","filePath":"examples/core/measurements/measureBounds.js","sort":10,"description":"Examples of measureBoundingBox function"}],"Colors":[{"title":"Basic Colors","filePath":"examples/core/colors/basicColors.js","sort":1,"description":"showing various color functions"},{"title":"Color Cube","filePath":"examples/core/colors/colorCube.js","sort":2,"description":"looking at the different ways to specify a color"},{"title":"Transparency","filePath":"examples/core/colors/transparency.js","sort":2,"description":"showing transparent objects"}],"Parameters":[{"title":"All Parameter Types Demo","filePath":"examples/parameters/allParamTypes.js","sort":1,"description":"Example of interactive parameters"},{"title":"Birthday Balloons","filePath":"examples/parameters/balloons.js","sort":1,"description":"Example of building models from interactive parameters"},{"title":"Parametric Involute Gear","filePath":"examples/parameters/gear.js","sort":1,"description":"Build a proper involute gear, demonstrating parameters, and how they can be used in complex math."}],"Other":[{"title":"Coordinate system and Rotation demonstration","filePath":"examples/core/other/orientation.js","sort":1,"description":"Demonstrating rotation about the three axes."}]}

package/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/examples",
-  "version": "2.3.3",
+  "version": "2.4.1",
   "description": "Example Files for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",

package/examples/parameters/gear.js

@@ -50,7 +50,7 @@ const createSingleToothPolygon = (maxAngle, baseRadius, angularToothWidthAtBase)
   const points = [[0, 0]]
   for (let i = 0; i <= toothCurveResolution; i++) {
     // first side of the tooth:
-    const angle = maxAngle * i / toothCurveResolution
+    const angle = maxAngle * Math.pow(i / toothCurveResolution, 2 / 3)
     const tanLength = angle * baseRadius
     let radiantVector = vec2.fromAngleRadians(vec2.create(), angle)
     let tangentVector = vec2.scale(vec2.create(), vec2.normal(vec2.create(), radiantVector), -tanLength)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/web",
-  "version": "2.5.9",
+  "version": "2.5.12",
   "description": "Web Application for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -36,11 +36,11 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.4",
-    "@jscad/core": "2.5.9",
-    "@jscad/examples": "2.3.4",
-    "@jscad/io": "2.3.2",
-    "@jscad/modeling": "2.9.3",
-    "@jscad/regl-renderer": "2.5.9",
+    "@jscad/core": "2.6.2",
+    "@jscad/examples": "2.4.2",
+    "@jscad/io": "2.4.1",
+    "@jscad/modeling": "2.9.6",
+    "@jscad/regl-renderer": "2.6.2",
     "@most/create": "2.0.1",
     "brace": "0.11.1",
     "codemirror": "5.65.2",
@@ -67,5 +67,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "85fa1fcdfb2d516a201ecf31da242e64b5b3274e"
+  "gitHead": "9768af96e5da00cd113c00ddeb0f6046707819b1"
 }

package/postInstall.js

@@ -29,7 +29,6 @@ const processExamplesInDirectory = (dir, examples) => {
   files.forEach((fileName) => {
     const filePath = path.join(dir, fileName)
     if (fs.lstatSync(filePath).isDirectory()) {
-      if (fileName === 'old') return
       processExamplesInDirectory(filePath, examples)
     } else if (filePath.endsWith('.js')) {
       processExamplesFile(filePath, examples)

package/src/sideEffects/worker/index.js

@@ -3,24 +3,27 @@ const WebWorkify = require('webworkify')
 const callBackToStream = require('../../most-utils/callbackToObservable')
 
 const makeWorkerEffect = (workerPath) => {
-  let _worker = WebWorkify(workerPath)
+  const workerEventsCb = callBackToStream()
+
+  let _worker = WebWorkify(workerPath, {})
   _worker.onerror = (error) => workerEventsCb.callback({ error })
   _worker.onmessage = (message) => workerEventsCb.callback(message)
-  const workerEventsCb = callBackToStream()
 
   const workerSink = (outToWorker$) => {
     // cancel whatever is going on in the worker by terminating it
     outToWorker$.filter(({ cmd }) => cmd === 'cancel')
-      .forEach((_) => _worker.terminate())
+      .forEach((task) => {
+        _worker.terminate()
+        _worker = WebWorkify(workerPath)
+        _worker.onerror = (error) => workerEventsCb.callback({ error })
+        _worker.onmessage = (message) => workerEventsCb.callback(message)
+      })
+
     // send other messages to the worker
     outToWorker$
       .filter(({ cmd }) => cmd !== 'cancel')
-      .forEach((message) => {
-        _worker.terminate()// FIXME: sub optimal ! worker recreation is SLOW and should not be systematic
-        _worker = WebWorkify(workerPath)// new Worker(workerPath)
-        _worker.onerror = (error) => workerEventsCb.callback({ error })
-        _worker.onmessage = (message) => workerEventsCb.callback(message)
-        _worker.postMessage(message)
+      .forEach((task) => {
+        _worker.postMessage(task)
       })
   }
 

package/src/ui/flow/design.js

@@ -1,309 +1,14 @@
-const path = require('path')
 const most = require('most')
 
 const { delayFromObservable, holdUntil, withLatestFrom } = require('../../most-utils')
 
-const { applyParameterDefinitions, getParameterValuesFromUIControls } = require('@jscad/core').parameters
-const { getDesignEntryPoint, getDesignName } = require('@jscad/core').loading.requireDesignUtilsFs
-const { makeFakeFs } = require('@jscad/core').loading
+const { getParameterValuesFromUIControls } = require('@jscad/core').parameters
 
-const { keep } = require('../../utils/object')
 const { fetchUriParams, getAllUriParams } = require('../../utils/urlUtils')
-const { availableExportFormatsFromSolids, exportFilePathFromFormatAndDesign } = require('../../core/io/exportUtils')
-const packageMetadata = require('../../../package.json')
 
-const jsonCompare = (first, second) => JSON.stringify(first) === JSON.stringify(second)
-
-// what fields should we check to determine if two designs are the same
-const designEqualityFields = [
-  'parameterDefinitions',
-  'parameterValues',
-  'mainPath',
-  'filesAndFolders',
-  'vtreeMode' // also trigger a recompute when vtree mode is enabled/ disabled
-]
-
-// what fields we want to de/serialize
-const serializableFields = [
-  'name',
-  'mainPath',
-  'origin',
-  'parameterValues',
-  'vtreeMode',
-  'autoReload',
-  'instantUpdate',
-  'solidsTimeOut'
-]
-
-const reducers = {
-  /** initialise the design's state
-   * @returns {Object} the default state for designs
-   */
-  initialize: (state) => {
-    const design = {
-      // metadata
-      name: '',
-      path: '',
-      mainPath: '',
-      origin: undefined, // where the design came from : http, local etc
-      filesAndFolders: [], // file tree, of sorts
-      // code
-      instantUpdate: false,
-      autoReload: false,
-      // parameters
-      parameterDefinitions: [],
-      parameterValues: {},
-      parameterDefaults: {},
-      // solids
-      solidsTimeOut: 80000,
-      solids: [],
-      // geometry caching
-      vtreeMode: false,
-      lookup: {},
-      lookupCounts: {},
-      debug: {
-        startTime: 0,
-        endTime: 0,
-        totalTime: 0
-      }
-    }
-    return { design }
-  },
-
-  /** reset the content of the design
-   * @param  {Object} state
-   * @param  {String} payload
-   * @returns {Object} the updated state
-   */
-  resetDesign: (state, origin) => {
-    // we reset only the given fields: mostly all except design specific things
-    const fieldsToReset = [
-      'name', 'path', 'mainPath', 'origin', 'filesAndFolders',
-      'parameterDefinitions', 'parameterValues', 'parameterDefaults',
-      'lookup', 'lookupCounts', 'debug', 'solids'
-    ]
-    const design = Object.assign({},
-      state.design, keep(fieldsToReset, reducers.initialize().design)
-    )
-    // ugh
-    design.origin = origin
-    return { design }
-  },
-
-  /** set the content of the design usually after a reset
-   * bulk of the data is set here
-   * @param  {Object} state
-   * @param  {String} payload
-   * @returns {Object} the updated state
-   */
-  setDesignContent: (state, payload) => {
-    // all our available data (specific to web)
-    const { filesAndFolders } = payload
-    const fakeFs = makeFakeFs(filesAndFolders)
-    const rootPath = filesAndFolders[0].fullPath
-    const mainPath = getDesignEntryPoint(fakeFs, rootPath)
-    const designName = getDesignName(fakeFs, rootPath)
-    const designPath = path.dirname(rootPath)
-
-    let design = state.design
-    // to track computation time
-    const debug = Object.assign({ }, state.design.debug, { startTime: new Date() })
-
-    design = Object.assign({}, design, {
-      name: designName,
-      path: designPath,
-      mainPath,
-      filesAndFolders,
-      debug
-    })
-
-    const appTitle = `jscad v ${packageMetadata.version}: ${state.design.name}`
-
-    // FIXME: this is the same as clear errors ?
-    const status = Object.assign({}, state.status, { busy: true, error: undefined })
-    return {
-      design,
-      appTitle,
-      status
-    }
-  },
-
-  /** set the solids (2d/ 3D /csg/cag data), and the geometry cache if applicable
-   * @param  {} state
-   * @param  {} {solids
-   * @param  {} lookup
-   * @param  {} lookupCounts}
-   * @returns {Object} the updated state
-   */
-  setDesignSolids: (state, { solids, lookup, lookupCounts }) => {
-    solids = solids || []
-    lookup = lookup || {}
-    lookupCounts = lookupCounts || {}
-
-    // should debug be part of status ?
-    const endTime = new Date()
-    const totalTime = endTime - state.design.debug.startTime
-    const debug = Object.assign({ }, state.design.debug, {
-      endTime,
-      totalTime
-    })
-    console.warn('total time for design regeneration', totalTime, new Date().getSeconds())
-
-    const design = Object.assign({}, state.design, {
-      solids,
-      lookup,
-      lookupCounts,
-      debug
-    })
-
-    // TODO: move this to IO ??
-    const { exportFormat, availableExportFormats } = availableExportFormatsFromSolids(solids)
-    const exportInfos = exportFilePathFromFormatAndDesign(design, exportFormat)
-    const io = {
-      exportFormat,
-      exportFilePath: exportInfos.exportFilePath, // default export file path
-      availableExportFormats
-    }
-
-    const status = Object.assign({}, state.status, { busy: false })
-
-    return {
-      design,
-      status,
-      io
-    }
-  },
-
-  setDesignParameterDefinitions: (state, data) => {
-    const parameterDefaults = data.parameterDefaults || state.design.parameterDefaults
-    const parameterDefinitions = data.parameterDefinitions || state.design.parameterDefinitions
-    const design = Object.assign({}, state.design, {
-      parameterDefaults,
-      parameterDefinitions,
-      parametersOrigin: data.origin
-    })
-    return { design }
-  },
-
-  /** set the parameters of this design
-   * @param  {Object} state
-   * @param  {} {parameterDefaults
-   * @param  {} parameterValues
-   * @param  {} parameterDefinitions}
-   * @returns {Object} the updated state
-   */
-  setDesignParameterValues: (state, data) => {
-    let parameterValues = data.parameterValues
-    // one of many ways of filtering out data from instantUpdates
-    if (data.origin === 'instantUpdate' && !state.design.instantUpdate) {
-      parameterValues = state.design.parameterValues
-    }
-    parameterValues = parameterValues ? applyParameterDefinitions(parameterValues, state.design.parameterDefinitions) : parameterValues
-    parameterValues = Object.assign({}, state.design.parameterValues, parameterValues)
-
-    let design = Object.assign({}, state.design, {
-      parameterValues,
-      parametersOrigin: data.origin
-    })
-    // to track computation time
-    const debug = Object.assign({ }, state.design.debug, { startTime: new Date() })
-    design = Object.assign({}, design, { debug })
-
-    const status = Object.assign({}, state.status, { busy: true, error: undefined })
-
-    return {
-      design,
-      status
-    }
-  },
-
-  setSettings: (state, { data }) => {
-    const {
-      vtreeMode,
-      autoReload,
-      instantUpdate,
-      solidsTimeOut
-    } = data
-    // FIXME : clunky but needed to make sure we have no invalid settings
-    if (vtreeMode === undefined) {
-      return { design: state.design }
-    }
-    const design = Object.assign({}, state.design, { vtreeMode, autoReload, instantUpdate, solidsTimeOut })
-    return {
-      design
-    }
-  },
-
-  requestGeometryRecompute: ({ design }, _) => keep(['mainPath', 'parameterValues', 'filesAndFolders', 'vtreeMode', 'lookup', 'lookupCounts'], design),
-
-  timeoutGeometryRecompute: ({ status }, _) => {
-    if (status.isBusy) { // still computing... we can kill it
-      return Object.assign({}, status, {
-        busy: false,
-        error: new Error('Failed to generate design within an acceptable time, bailing out')
-      })
-    }
-    // no problem, just act as a no-op
-    return { status }
-  },
-
-  requestWriteCachedGeometry: ({ design }, cache) => {
-    const data = {}
-    Object.keys(cache).forEach((key) => {
-      data[key] = cache[key]
-    })
-    // we want to save the geometry cache under '.solidsCache'
-    return { path: '.solidsCache', options: { isRawData: true }, origin: design.origin }
-  },
-
-  // what do we want to save , return an object containing only that data?
-  requestSaveSettings: ({ design }) => keep(serializableFields, design),
-
-  // helpers
-  isDesignValid: (state) => (state.design && state.design.name && state.design.path !== ''),
-
-  // determine if a design has remained the same : does NOT include solids, as they are a result of all the other parameters
-  isDesignTheSame: (previousState, state) => {
-    if (!previousState.design) {
-      return false
-    }
-    const current = JSON.stringify(keep(designEqualityFields, state.design))
-    const previous = JSON.stringify(keep(designEqualityFields, previousState.design))
-    return previous === current
-  },
-
-  // same as above but with added fields for settings
-  isDesignTheSameForSerialization: (previousState, state) => {
-    if (!previousState.design) {
-      return false
-    }
-    // do a JSON compare of the previous & current fields to save if needed
-    const current = JSON.stringify(keep(serializableFields, state.design))
-    const previous = JSON.stringify(keep(serializableFields, previousState.design))
-    return previous === current
-  },
+const reducers = require('./reducers')
 
-  // ui/toggles
-  toggleAutoReload: (state, autoReload) => {
-    const design = Object.assign({}, state.design, { autoReload })
-    return { design }
-  },
-
-  toggleInstantUpdate: (state, instantUpdate) => {
-    const design = Object.assign({}, state.design, { instantUpdate })
-    return { design }
-  },
-
-  toggleVtreeMode: (state, vtreeMode) => {
-    const design = Object.assign({}, state.design, { vtreeMode })
-    return { design }
-  },
-
-  setSolidsTimeout: (state, solidsTimeOut) => {
-    const design = Object.assign({}, state.design, { solidsTimeOut })
-    return { design }
-  }
-} // end of reducers
+const jsonCompare = (first, second) => JSON.stringify(first) === JSON.stringify(second)
 
 const actions = ({ sources }) => {
   const initialize$ = most.just({})
@@ -315,11 +20,11 @@ const actions = ({ sources }) => {
   const requestLoadSettings$ = initialize$
     .map((_) => ({ sink: 'store', key: 'design', type: 'read' }))
 
-  // starts emmiting to storage only AFTER initial settings have been loaded
+  // starts emitting to storage only AFTER initial settings have been loaded
   const requestSaveSettings$ = sources.state
     .filter(reducers.isDesignValid)
     .skipRepeatsWith(reducers.isDesignTheSameForSerialization)
-    // wait until we actualy have design data
+    // wait until we actually have design data
     .thru(holdUntil(sources.store.filter((reply) => reply.key === 'design' && reply.type === 'read')))
     .map(reducers.requestSaveSettings)
     .map((data) => Object.assign({}, { data }, { sink: 'store', key: 'design', type: 'write' }))
@@ -446,7 +151,7 @@ const actions = ({ sources }) => {
   const resetDesign$ = most.mergeArray([
     requestLoadDesignContent$.map(({ sink }) => sink)
   ])
-    // .thru(holdUntil(setDesignSettings$))// only after FIXME : this does not seem to work
+    // .thru(holdUntil(setDesignSettings$)) // only after FIXME : this does not seem to work
     .thru(withLatestFrom(reducers.resetDesign, sources.state))
     .map((data) => ({ type: 'resetDesign', state: data, sink: 'state' }))
     .multicast()
@@ -491,7 +196,7 @@ const actions = ({ sources }) => {
 
   // we also re-use the timeout to send a signal to the worker to terminate the current geometry generation
   const cancelGeometryRecompute$ = timeoutGeometryRecompute$
-    .filter(({ state }) => state.status.error !== undefined)// if there was no error , the timeout is irrelevant
+    .filter(({ state }) => state.status.error !== undefined) // if there was no error, the timeout is irrelevant
     .map((_) => Object.assign({}, { sink: 'geometryWorker', cmd: 'cancel' }))
     .multicast()
 
@@ -539,13 +244,13 @@ const actions = ({ sources }) => {
     .multicast()
     .debounce(10)
 
-  // parameter values etc retrived from local storage
+  // parameter values etc retrieved from local storage
   const parametersFromStore$ = sources.store
     .filter((reply) => reply.key === 'design' && reply.type === 'read' && reply.data.parameterValues !== undefined)
     .map(({ data }) => ({ parameterValues: data.parameterValues, origin: 'store' }))
     .multicast()
 
-  // parameter values retrived from titleBar
+  // parameter values retrieved from titleBar
   const parametersFromTitleBar$ = sources.titleBar
     .map((uri) => getAllUriParams(uri))
     .filter((params) => Object.keys(params).length > 0)
@@ -573,7 +278,18 @@ const actions = ({ sources }) => {
     .thru(withLatestFrom(reducers.setDesignParameterValues, sources.state))
     .map((data) => ({ type: 'setDesignParameterValues', state: data, sink: 'state' }))
     .multicast()
-    .delay(10) // needed , why ?
+    .delay(10) // needed, why?
+
+  // errors retrieved from worker
+  const errorsFromWorker$ = sources.solidWorker
+    .filter((event) => event.data instanceof Object && event.data.type === 'errors')
+    .map(({ data }) => ({ error: data, origin: 'worker' }))
+
+  const reportErrorsFromWorker$ = most.mergeArray([
+    errorsFromWorker$
+  ])
+    .skipRepeatsWith(jsonCompare)
+    .tap((x) => console.log('errors', x))
 
   // ui/toggles
   const toggleAutoReload$ = most.mergeArray([
@@ -615,6 +331,8 @@ const actions = ({ sources }) => {
     setDesignParameterDefinitions$,
     setDesignParameterValues$,
 
+    reportErrorsFromWorker$,
+
     requestGeometryRecompute$,
     timeoutGeometryRecompute$,
     cancelGeometryRecompute$,