@jscad/web 2.5.3 → 2.5.4

package/examples/parameters/allParamTypes.js

@@ -13,29 +13,27 @@ const { primitives } = require('@jscad/modeling')
 const values = [3, 4, 5, 6]
 const captions = ['three', 'four', 'five', 'six']
 
-const getParameterDefinitions = () => {
-  return [
-    { name: 'group1', type: 'group', caption: 'Group 1: Text Entry' },
-    { name: 'text', type: 'text', initial: '', size: 20, maxLength: 20, caption: 'Plain Text:', placeholder: '20 characters' },
-    { name: 'int', type: 'int', initial: 20, min: 1, max: 100, step: 1, caption: 'Integer:' },
-    { name: 'number', type: 'number', initial: 2.0, min: 1.0, max: 10.0, step: 0.1, caption: 'Number:' },
-    { name: 'date', type: 'date', initial: '2020-01-01', min: '2020-01-01', max: '2030-12-31', caption: 'Date:', placeholder: 'YYYY-MM-DD' },
-    { name: 'email', type: 'email', initial: 'me@example.com', caption: 'Email:' },
-    { name: 'url', type: 'url', initial: 'www.example.com', size: 40, maxLength: 40, caption: 'Url:', placeholder: '40 characters' },
-    { name: 'password', type: 'password', initial: '', caption: 'Password:' },
+const getParameterDefinitions = () => [
+  { name: 'group1', type: 'group', caption: 'Group 1: Text Entry' },
+  { name: 'text', type: 'text', initial: '', size: 20, maxLength: 20, caption: 'Plain Text:', placeholder: '20 characters' },
+  { name: 'int', type: 'int', initial: 20, min: 1, max: 100, step: 1, caption: 'Integer:' },
+  { name: 'number', type: 'number', initial: 2.0, min: 1.0, max: 10.0, step: 0.1, caption: 'Number:' },
+  { name: 'date', type: 'date', initial: '2020-01-01', min: '2020-01-01', max: '2030-12-31', caption: 'Date:', placeholder: 'YYYY-MM-DD' },
+  { name: 'email', type: 'email', initial: 'me@example.com', caption: 'Email:' },
+  { name: 'url', type: 'url', initial: 'www.example.com', size: 40, maxLength: 40, caption: 'Url:', placeholder: '40 characters' },
+  { name: 'password', type: 'password', initial: '', caption: 'Password:' },
 
-    { name: 'group2', type: 'group', caption: 'Group 2: Interactive Controls' },
-    { name: 'checkbox', type: 'checkbox', checked: true, initial: '20', caption: 'Checkbox:' },
-    { name: 'color', type: 'color', initial: '#FFB431', caption: 'Color:' },
-    { name: 'slider', type: 'slider', initial: 3, min: 1, max: 10, step: 1, caption: 'Slider:' },
-    { name: 'choice1', type: 'choice', caption: 'Dropdown Menu:', values: [0, 1, 2, 3], captions: ['No', 'Yes', 'Maybe', 'So so'], initial: 2 },
-    { name: 'choice3', type: 'choice', caption: 'Dropdown Menu:', values: ['No', 'Yes', 'Maybe', 'So so'], initial: 'No' },
-    { name: 'choice2', type: 'radio', caption: 'Radio Buttons:', values, captions, initial: 5 },
+  { name: 'group2', type: 'group', caption: 'Group 2: Interactive Controls' },
+  { name: 'checkbox', type: 'checkbox', checked: true, initial: '20', caption: 'Checkbox:' },
+  { name: 'color', type: 'color', initial: '#FFB431', caption: 'Color:' },
+  { name: 'slider', type: 'slider', initial: 3, min: 1, max: 10, step: 1, caption: 'Slider:' },
+  { name: 'choice1', type: 'choice', caption: 'Dropdown Menu:', values: [0, 1, 2, 3], captions: ['No', 'Yes', 'Maybe', 'So so'], initial: 2 },
+  { name: 'choice3', type: 'choice', caption: 'Dropdown Menu:', values: ['No', 'Yes', 'Maybe', 'So so'], initial: 'No' },
+  { name: 'choice2', type: 'radio', caption: 'Radio Buttons:', values, captions, initial: 5 },
 
-    { name: 'group3', type: 'group', initial: 'closed', caption: 'Group 3: Initially Closed Group' },
-    { name: 'checkbox2', type: 'checkbox', checked: true, initial: '20', caption: 'Optional Checkbox:' }
-  ]
-}
+  { name: 'group3', type: 'group', initial: 'closed', caption: 'Group 3: Initially Closed Group' },
+  { name: 'checkbox2', type: 'checkbox', checked: true, initial: '20', caption: 'Optional Checkbox:' }
+]
 
 const main = (params) => {
   console.log(params)

package/examples/parameters/balloons.js

@@ -12,30 +12,27 @@ const jscad = require('@jscad/modeling')
 
 const { subtract, union } = jscad.booleans
 const { colorize, hexToRgb } = jscad.colors
-const { expand } = jscad.expansions
 const { extrudeFromSlices, extrudeLinear, slice } = jscad.extrusions
 const { geom2 } = jscad.geometries
 const { hullChain } = jscad.hulls
 const { mat4 } = jscad.maths
 const { measureBoundingBox } = jscad.measurements
-const { circle, ellipsoid, line } = jscad.primitives
+const { circle, ellipsoid } = jscad.primitives
 const { vectorText } = jscad.text
 const { translate, scale, rotateX, center } = jscad.transforms
 
 const options = { segments: 32 }
 
-const getParameterDefinitions = () => {
-  return [
-    { name: 'balloon', type: 'group', caption: 'Balloons' },
-    { name: 'isBig', type: 'checkbox', checked: true, initial: '20', caption: 'Big?' },
-    { name: 'color', type: 'color', initial: '#FFB431', caption: 'Color?' },
-    { name: 'count', type: 'slider', initial: 4, min: 2, max: 10, step: 1, caption: 'How many?' },
-    { name: 'friend', type: 'group', caption: 'Friend' },
-    { name: 'name', type: 'text', initial: '', size: 20, maxLength: 20, caption: 'Name?', placeholder: '20 characters' },
-    { name: 'birthdate', type: 'date', initial: '', min: '1915-01-01', max: '2030-12-31', caption: 'Birthday?', placeholder: 'YYYY-MM-DD' },
-    { name: 'age', type: 'int', initial: 20, min: 1, max: 100, step: 1, caption: 'Age?' }
-  ]
-}
+const getParameterDefinitions = () => [
+  { name: 'balloon', type: 'group', caption: 'Balloons' },
+  { name: 'isBig', type: 'checkbox', checked: true, initial: '20', caption: 'Big?' },
+  { name: 'color', type: 'color', initial: '#FFB431', caption: 'Color?' },
+  { name: 'count', type: 'slider', initial: 4, min: 2, max: 10, step: 1, caption: 'How many?' },
+  { name: 'friend', type: 'group', caption: 'Friend' },
+  { name: 'name', type: 'text', initial: '', size: 20, maxLength: 20, caption: 'Name?', placeholder: '20 characters' },
+  { name: 'birthdate', type: 'date', initial: '', min: '1915-01-01', max: '2030-12-31', caption: 'Birthday?', placeholder: 'YYYY-MM-DD' },
+  { name: 'age', type: 'int', initial: 20, min: 1, max: 100, step: 1, caption: 'Age?' }
+]
 
 const initializeOptions = (params) => {
   // use the checkbox to determine the size of the sphere
@@ -64,10 +61,10 @@ const text = (message, extrusionHeight, characterLineWidth) => {
 
 const createSingleBalloon = (params) => {
   let t = rotateX(Math.PI / 2, text(params.age.toString(), 2, 2))
-  let m = measureBoundingBox(t)
-  let x = (options.b_radius * 0.70) / Math.max(m[1][0], m[1][2])
-  let y = options.b_radius * 3
-  let z = x
+  const m = measureBoundingBox(t)
+  const x = (options.b_radius * 0.70) / Math.max(m[1][0], m[1][2])
+  const y = options.b_radius * 3
+  const z = x
   t = translate([0, y / 2, 0], scale([x, y, z], t))
 
   const b = ellipsoid({
@@ -118,14 +115,6 @@ const createSalutation = (name) => {
   return translate([0, -10, 0], scale([0.5, 0.5, 0.5], text(salutation, 2, 2)))
 }
 
-const createAge = (age) => {
-  let age3D = text(age.toString(), 10, 3)
-  age3D = scale([2, 2, 2], age3D)
-  age3D = rotateX(Math.PI / 2, age3D)
-  age3D = translate([0, 30, 30], age3D)
-  return age3D
-}
-
 const createBirthDate = (birthDate) => {
   const birthDateStr = birthDate.toString()
   if (birthDateStr.length === 0) {

package/examples/parameters/gear.js

@@ -17,16 +17,14 @@ const { vec2 } = jscad.maths
 const { degToRad } = jscad.utils
 
 // Here we define the user editable parameters:
-const getParameterDefinitions = () => {
-  return [
-    { name: 'numTeeth', caption: 'Number of teeth:', type: 'int', initial: 10, min: 5, max: 20, step: 1 },
-    { name: 'circularPitch', caption: 'Circular pitch:', type: 'float', initial: 5 },
-    { name: 'pressureAngle', caption: 'Pressure angle:', type: 'float', initial: 20 },
-    { name: 'clearance', caption: 'Clearance:', type: 'float', initial: 0.0, step: 0.1 },
-    { name: 'thickness', caption: 'Thickness:', type: 'float', initial: 5 },
-    { name: 'centerholeradius', caption: 'Radius of center hole (0 for no hole):', type: 'float', initial: 2 }
-  ]
-}
+const getParameterDefinitions = () => [
+  { name: 'numTeeth', caption: 'Number of teeth:', type: 'int', initial: 10, min: 5, max: 20, step: 1 },
+  { name: 'circularPitch', caption: 'Circular pitch:', type: 'float', initial: 5 },
+  { name: 'pressureAngle', caption: 'Pressure angle:', type: 'float', initial: 20 },
+  { name: 'clearance', caption: 'Clearance:', type: 'float', initial: 0.0, step: 0.1 },
+  { name: 'thickness', caption: 'Thickness:', type: 'float', initial: 5 },
+  { name: 'centerholeradius', caption: 'Radius of center hole (0 for no hole):', type: 'float', initial: 2 }
+]
 
 // Main entry point; here we construct our solid:
 const main = (params) => {
@@ -74,7 +72,7 @@ const createBaseCirclePolygon = (numTeeth, angularToothWidthAtBase, rootRadius)
   const toothCenterAngle = 0.5 * angularToothWidthAtBase
   for (let k = 0; k < numTeeth; k++) {
     const currentAngle = toothCenterAngle + k * toothAngle
-    var p1 = vec2.scale(vec2.create(), vec2.fromAngleRadians(vec2.create(), currentAngle), rootRadius)
+    const p1 = vec2.scale(vec2.create(), vec2.fromAngleRadians(vec2.create(), currentAngle), rootRadius)
     points.push([p1[0], p1[1]])
   }
   return polygon({ points, closed: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/web",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "Web Application for JSCAD",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "main": "src/index.js",
@@ -35,11 +35,11 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.1",
-    "@jscad/core": "2.5.3",
-    "@jscad/examples": "2.3.1",
-    "@jscad/io": "2.2.3",
-    "@jscad/modeling": "2.7.1",
-    "@jscad/regl-renderer": "2.5.3",
+    "@jscad/core": "2.5.4",
+    "@jscad/examples": "2.3.2",
+    "@jscad/io": "2.2.4",
+    "@jscad/modeling": "2.7.2",
+    "@jscad/regl-renderer": "2.5.4",
     "@most/create": "2.0.1",
     "brace": "0.11.1",
     "codemirror": "5.57.0",
@@ -66,5 +66,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "95f05c5f11a53bff469a305d69b99f674dc7d6d3"
+  "gitHead": "b6c5675d2d9a292e0ba24896bf22d0e9dc5d4270"
 }

package/postInstall.js

@@ -6,7 +6,7 @@ const fs = require('fs')
 const DocBlock = require('docblock')
 const docBlock = new DocBlock()
 
-const ignoreExamples = {Imports:1, Projects:1}
+const ignoreExamples = { Imports: 1, Projects: 1 }
 
 const copyAndProcessExamples = (examplesSrc) => {
   const examples = { 'Creating Shapes': [], 'Manipulating Shapes': [], Colors: [], Parameters: [], Other: [] }
@@ -42,8 +42,8 @@ const processExamplesFile = (filePath, examples) => {
   if (result.length) {
     const category = result[0].tags.category
 
-    if(category in ignoreExamples){
-      console.log(`Ignoring example ${filePath}`);
+    if (category in ignoreExamples) {
+      console.log(`Ignoring example ${filePath}`)
       return
     }
 

package/src/index.js

@@ -114,7 +114,6 @@ const makeJscad = async (targetElement, options) => {
 
   // we return a function to allow setting/modifying params
   const mainParams = callbackToObservable()
-  // mainParams.stream.forEach(x => console.log('setting params', x))
   return (params) => {
     mainParams.callback(params)
   }

package/src/most-gestures/drags.js

@@ -1,5 +1,19 @@
 const { merge } = require('most')
 
+let isPinching = false
+
+if (typeof window !== 'undefined') {
+  window.addEventListener('pinchStarted', (e) => {
+    // console.log("received pinch started");
+    isPinching = true
+  })
+
+  window.addEventListener('pinchEnded', (e) => {
+    // console.log("received pinch ended");
+    isPinching = false
+  })
+}
+
 // based on http://jsfiddle.net/mattpodwysocki/pfCqq/
 const mouseDrags = (mouseDowns$, mouseUps, mouseMoves, settings) => {
   const { pixelRatio } = settings
@@ -47,6 +61,7 @@ const touchDrags = (touchStarts$, touchEnds$, touchMoves$, settings) => {
       let prevY = startY
 
       return touchMoves$
+        .takeWhile((e) => isPinching === false)
         .map((e) => {
           const curX = e.touches[0].pageX * pixelRatio
           const curY = e.touches[0].pageY * pixelRatio

package/src/most-gestures/zooms.js

@@ -18,6 +18,16 @@ const pinchZooms = ({ touchStarts$, touchMoves$, touchEnds$ }, settings) => {
       return touchMoves$
         .tap((e) => e.preventDefault())
         .filter((t) => t.touches.length === 2)
+        .tap((e) => {
+          // console.log("pinch started");
+          if (typeof CustomEvent !== 'undefined') {
+            const pinchStarted = new CustomEvent('pinchStarted', {
+              detail: true
+            })
+
+            window.dispatchEvent(pinchStarted)
+          }
+        })
         .map((e) => {
           const curX1 = e.touches[0].pageX * pixelRatio
           const curY1 = e.touches[0].pageY * pixelRatio
@@ -43,7 +53,16 @@ const pinchZooms = ({ touchStarts$, touchMoves$, touchEnds$ }, settings) => {
           const scale = e > 0 ? Math.sqrt(e) : -Math.sqrt(Math.abs(e))
           return scale
         }) */
-        .takeUntil(touchEnds$)
+        .takeUntil(touchEnds$.tap((e) => {
+          // console.log("pinch ended");
+          if (typeof CustomEvent !== 'undefined') {
+            const pinchEnded = new CustomEvent('pinchEnded', {
+              detail: true
+            })
+
+            window.dispatchEvent(pinchEnded)
+          }
+        }))
     })
 }
 

package/src/sideEffects/dat/index.js

@@ -26,7 +26,6 @@ const makeDatSideEffect = async (params) => {
     // every time a new command is recieved (observable)
     commands$.forEach((command) => {
       const { type, id, urls, path } = command
-      // console.log('command', command)
       if (!enabled) {
         commandResponses.callback({ type, id, error: new Error('Dat archives not supported in this environment!') })
         return
@@ -44,7 +43,6 @@ const makeDatSideEffect = async (params) => {
 
           archive = new DatArchive(url, {})
           const filesAndFolders = await archive.readdir(path, { recursive: true, stat: true })
-          // console.log('filesAndFolders', filesAndFolders)
           const fileContents = await Promise.all(filesAndFolders.map(async (f) => {
             const fullPath = `${path}/${f.name}`
             if (f.stat.isFile() && f.name.includes('js')) {
@@ -67,7 +65,6 @@ const makeDatSideEffect = async (params) => {
           }]
           commandResponses.callback({ type, id, url, data: hiearchyRoot })
           const history = await archive.history()
-          console.log('history', history)
         })
       }
 
@@ -77,7 +74,6 @@ const makeDatSideEffect = async (params) => {
       }
 
       const watch = () => {
-        console.log('starting watch')
         const evts = archive.watch()
         // TODO: deal with additions & deletions
         // ex /holder.stl has been updated!
@@ -86,11 +82,9 @@ const makeDatSideEffect = async (params) => {
         evts.addEventListener('changed', async ({ path }) => {
           // const fullPath = `${path}/${f.name}`
           // TODO: how about folders ?
-          console.log(path, 'has been updated!')
           const content = await archive.readFile(path)
           const name = require('path').basename(path)
           const entry = { name, ext: 'js', source: content, fullPath: `/${rootFolder}` + path }
-          // console.log('content', content)
           // FIXME: cannot work
           // hiearchyRoot.children = [...hiearchyRoot.children]
           const index = hiearchyRoot[0].children.findIndex((el) => el.fullPath === entry.fullPath)

package/src/sideEffects/dom/index.js

@@ -41,7 +41,6 @@ const makeDomSideEffect = ({ targetEl }) => {
     } */
 
     const select = (query) => {
-      // console.log('selecting', query)
       const items = getElements(query)
 
       let outputStream
@@ -61,7 +60,6 @@ const makeDomSideEffect = ({ targetEl }) => {
     }
 
     out$.forEach(() => {
-    // console.log('dom source watching dom change')
       Object.keys(storedListeners).forEach((queryAndEventName) => {
         const [query] = queryAndEventName.split('@@')
         const items = getElements(query)

package/src/sideEffects/fileDialog/index.js

@@ -21,7 +21,6 @@ const makeFileDialog = (params) => {
       const blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
       saveAs(blob, filePath) */
 
-      console.log('here')
       const input = document.createElement('input')
       input.id = 'foo'
       input.name = 'gna'
@@ -31,7 +30,6 @@ const makeFileDialog = (params) => {
       // input.trigger('click')// opening dialog
       // return false; // avoiding navigation
       input.addEventListener('change', () => {
-        console.log('foo')
       })
     })
   }

package/src/sideEffects/i18n/index.js

@@ -12,7 +12,6 @@ const longNames = {
 
 const getDefaultLocale = () => {
   let localeBase
-  // console.log('is electron', isElectron())
   if (isElectron()) {
     // localeBase = require('electron').remote.app.getLocale().split('-')[0]
   } else {

package/src/sideEffects/localFs/index.js

@@ -17,7 +17,6 @@ const makeLocalFsSideEffect = async (params) => {
     webSocket = new WebSocket(localFsOptions.livereloadUrl)
 
     webSocket.onopen = function (event) {
-      console.log('websocket open', event)
       sendWs({ command: 'hello', protocols: ['http://livereload.com/protocols/official-6', 'http://livereload.com/protocols/official-7'], ver: '2.0.8', ext: 'Chrome', extver: '2.1.0' })
     }
 
@@ -28,11 +27,10 @@ const makeLocalFsSideEffect = async (params) => {
     }
 
     webSocket.onerror = function (event) {
-      console.log('websocket error', event)
+      console.warn('websocket error', event)
     }
 
     webSocket.onclose = function (event) {
-      console.log('websocket closed', event)
       webSocket = null
     }
   }
@@ -111,7 +109,6 @@ const makeLocalFsSideEffect = async (params) => {
       }
 
       const write = () => {
-        // console.error('writing to local file system is not implemented yet')
       }
 
       const commandHandlers = {

package/src/sideEffects/localFs/walkFileTree.js

@@ -30,8 +30,6 @@ const binaryMimetypes = {
  * @returns {Promise} new promise to read and convert the file
  */
 const readFileAsync = (file, fileMeta) => {
-  //console.log('readFileAsync',file,fileMeta)
-
   const fullPath = fileMeta && fileMeta.fullPath ? fileMeta.fullPath : ''
   const ext = getFileExtensionFromString(file.name)
   const mimetype = file.mimetype
@@ -43,7 +41,7 @@ const readFileAsync = (file, fileMeta) => {
       const result = event.target.result
       if (result.byteLength) {
         resolve({ name: file.name, ext, fullPath, mimetype, source: result })
-      } else if (typeof(result) === 'string') {
+      } else if (typeof result === 'string') {
         resolve({ name: file.name, ext, fullPath, mimetype, source: result })
       }
     }
@@ -87,7 +85,6 @@ const isEmpty = (x) => x !== null && x !== undefined // skip empty items
  * @returns {Promise} one promise to resolve them all
  */
 const processEntries = (items) => {
-  // console.log('processEntries',items)
   const results = pseudoArraytoArray(items.filter(isEmpty))
     .filter(isEmpty) // skip empty items
     .reduce((result, item) => {
@@ -109,7 +106,6 @@ const processEntries = (items) => {
 
   return Promise.all(results)
     .then((x) => x.filter((x) => x !== null && x !== undefined))
-    // BAD .catch((error) => console.error(error.message))
 }
 
 /*
@@ -118,7 +114,6 @@ const processEntries = (items) => {
  * @returns {Promise} new promise to read and process the file
  */
 const processFile = (fileItem) => {
-  // console.log('processFile',fileItem)
   const promiseFile = new Promise((resolve, reject) => {
     fileItem.file(
       (fileData) => {
@@ -139,7 +134,6 @@ const processFile = (fileItem) => {
  * @returns {Promise} new promise to read and process the directory
  */
 const processDirectory = (directory) => {
-  // console.log('processDirectory',directory)
   const promiseDirectory = new Promise((resolve, reject) => {
     if (directory.entries) {
       directory.entries.length ? processEntries(directory.entries).then(resolve) : resolve([])

package/src/sideEffects/localStorage/index.js

@@ -20,7 +20,6 @@ const makeStorageSideEffect = ({ name }) => {
           const { type, key, data } = command
           // const storage = target === `local` ? localStorage : sessionStorage
           if (type === 'write') {
-            // console.log('writing settings', data)
             localStorage.setItem(`jscad:${name}-${key}`, JSON.stringify(data))
           } else if (type === 'read') {
             const settings = localStorage.getItem(`jscad:${name}-${key}`)

package/src/sideEffects/state/index.js

@@ -33,11 +33,8 @@ const makeState = (params) => {
   const source = () => {
     const commandResponses$ = commandResponses.stream.multicast()
     // return commandResponses$
-    // commandResponses$.forEach(x=>console.log('commandResponses', x))
     return most.scan((state, input) => {
-      // console.log('updating state', state.design, input.type, input.state.design)
       const foo = Object.assign({}, state, input.state)
-      // console.log('output state', foo.design)
       return foo
     }, initialState, commandResponses$)
       .startWith(initialState)
@@ -47,14 +44,6 @@ const makeState = (params) => {
 
   const sink = (out$) => {
     out$.forEach((command) => {
-      // const { state } = command
-      /* try {
-        const newState = state
-      } catch (error) {
-        console.error('caught error', error)
-        const status = Object.assign({}, state.status, {error})
-        state = Object.assign({}, state, {status})
-      } */
       commandResponses.callback(command)
     })
   }

package/src/ui/flow/design.js

@@ -79,7 +79,6 @@ const reducers = {
    * @returns {Object} the updated state
    */
   resetDesign: (state, origin) => {
-    // console.log('design: reset', origin)
     // we reset only the given fields: mostly all except design specific things
     const fieldsToReset = [
       'name', 'path', 'mainPath', 'origin', 'filesAndFolders',
@@ -101,7 +100,6 @@ const reducers = {
    * @returns {Object} the updated state
    */
   setDesignContent: (state, payload) => {
-    // console.log('design: set content', state, state.design, payload)
     // all our available data (specific to web)
     const { filesAndFolders } = payload
     const fakeFs = makeFakeFs(filesAndFolders)
@@ -109,7 +107,6 @@ const reducers = {
     const mainPath = getDesignEntryPoint(fakeFs, rootPath)
     const designName = getDesignName(fakeFs, rootPath)
     const designPath = path.dirname(rootPath)
-    // console.log('BLAA', rootPath, designName, designPath)
 
     let design = state.design
     // to track computation time
@@ -142,7 +139,6 @@ const reducers = {
    * @returns {Object} the updated state
    */
   setDesignSolids: (state, { solids, lookup, lookupCounts }) => {
-    // console.log('design: set solids', lookup, lookupCounts)
     solids = solids || []
     lookup = lookup || {}
     lookupCounts = lookupCounts || {}
@@ -182,7 +178,6 @@ const reducers = {
   },
 
   setDesignParameterDefinitions: (state, data) => {
-    // console.log('design: set parameter definitions & defaults', data)
     const parameterDefaults = data.parameterDefaults || state.design.parameterDefaults
     const parameterDefinitions = data.parameterDefinitions || state.design.parameterDefinitions
     const design = Object.assign({}, state.design, {
@@ -201,7 +196,6 @@ const reducers = {
    * @returns {Object} the updated state
    */
   setDesignParameterValues: (state, data) => {
-    // console.log('setDesignParameterValues',state,data)
     let parameterValues = data.parameterValues
     // one of many ways of filtering out data from instantUpdates
     if (data.origin === 'instantUpdate' && !state.design.instantUpdate) {
@@ -227,7 +221,6 @@ const reducers = {
   },
 
   setSettings: (state, { data }) => {
-    // console.log('design: set settings', state.design, data)
     const {
       vtreeMode,
       autoReload,
@@ -258,7 +251,6 @@ const reducers = {
   },
 
   requestWriteCachedGeometry: ({ design }, cache) => {
-    // console.log('requestWriteCachedGeometry', cache)
     const data = {}
     Object.keys(cache).forEach((key) => {
       data[key] = cache[key]
@@ -278,7 +270,6 @@ const reducers = {
     if (!previousState.design) {
       return false
     }
-    // console.log('isDesignTheSame', previousState.design, state.design)
     const current = JSON.stringify(keep(designEqualityFields, state.design))
     const previous = JSON.stringify(keep(designEqualityFields, previousState.design))
     return previous === current
@@ -344,16 +335,10 @@ const actions = ({ sources }) => {
     .multicast()
 
   const requestLoadDesignContent$ = most.mergeArray([
-    // load previously loaded remote file (or example)
-    /* sources.store
-      .filter(reply => reply.key === 'design' && reply.type === 'read' && reply.data !== undefined && reply.data.origin === 'http')
-      .map(({ data }) => data.mainPath), */
-
     // load files from drag & drop (file or folder)
     sources.drops
       .filter((d) => d.type === 'fileOrFolder')
       .tap((x) => console.log('dropped file', x))
-      // url, text, "fileOrFolder"
       .map(({ data }) => ({ sink: 'fs', data, path: 'realFs', urls: [] })),
 
     // load remote file from drag & drop (url)
@@ -367,8 +352,7 @@ const actions = ({ sources }) => {
         const urls = url ? [url] : []
         const { protocol, pathname } = urlData
         return { sink: protocol.replace(':', ''), urls, origin, path: pathname, proxy: true }
-      })
-      .tap((x) => console.log('load url', x)),
+      }),
 
     // load example from click
     sources.dom.select('.example').events('click')
@@ -416,9 +400,8 @@ const actions = ({ sources }) => {
       })
   ])
     .filter((x) => x !== undefined)
-    .thru(holdUntil(setDesignSettings$))// only after FIXME : this does not seem to work
+    .thru(holdUntil(setDesignSettings$)) // only after FIXME : this does not seem to work
     .map((data) => ({ type: 'read', id: 'loadRemote', urls: data.urls, sink: data.sink, origin: data.origin, path: data.path, data: data.data, proxy: data.proxy }))
-    .tap((x) => console.log('load remote', x))
     .multicast()
     .skipRepeats()
 
@@ -431,7 +414,6 @@ const actions = ({ sources }) => {
     .map(({ data }) => ({ filesAndFolders: data }))
     .thru(withLatestFrom(reducers.setDesignContent, sources.state))
     .map((data) => ({ type: 'setDesignContent', state: data, sink: 'state' }))
-    // .tap((x) => console.log(x))
     .multicast()
 
   const requestWatchDesign$ = most.mergeArray([
@@ -450,7 +432,6 @@ const actions = ({ sources }) => {
       .skipRepeatsWith(jsonCompare)
   ])
     .map((payload) => Object.assign({}, { type: 'watch', sink: payload.origin }, payload))
-    .tap((x) => console.log('watch', x))
     .multicast()
 
   const requestWriteCachedGeometry$ = most.mergeArray([
@@ -471,21 +452,19 @@ const actions = ({ sources }) => {
     // .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' }))
-    // .tap((x) => console.log('design reset', x))
     .multicast()
 
   const setDesignSolids$ = most.mergeArray([
     sources.solidWorker
       .filter((event) => !('error' in event) && event.data instanceof Object && event.data.type === 'solids')
       .map((event) => {
-          const { lookupCounts, lookup, solids } = event.data
-          return { solids, lookup, lookupCounts }
+        const { lookupCounts, lookup, solids } = event.data
+        return { solids, lookup, lookupCounts }
       })
-    .multicast(),
+      .multicast(),
     sources.fs
       .filter((res) => res.type === 'read' && res.id === 'loadCachedGeometry' && res.data)
       .map((raw) => {
-        console.log('loading cached ')
         const deserialize = () => {}
         const lookup = deserialize(raw.data)
         return { solids: undefined, lookupCounts: undefined, lookup }

package/src/ui/flow/dom.js

@@ -2,7 +2,6 @@ const makeOutput = ({ sources, extras }) => sources.state
   .filter((state) => state.design && state.languages && state.viewer)
   // TODO: add omiting of a few complex fields like the cache , the filetree, the solids
   .skipRepeatsWith((state, previousState) => JSON.stringify(state) === JSON.stringify(previousState))
-  // .tap(state => console.log('state', state))
   .combine((state, i18n) => require('../views/main')(state, i18n, extras.paramsCallbacktoStream, extras.editorCallbackToStream),
     sources.i18n.filter((x) => x.type === 'changeSettings').map((x) => x.data))