@jscad/web 2.5.2 → 2.5.5

package/src/ui/flow/flowOut.js

@@ -2,24 +2,6 @@ const makeReactions = (inputs) => {
   const { sinks, outputs$ } = inputs
   const { store, fs, http, https, i18n, dom, solidWorker, state, dat } = sinks
 
-  /* outputs$
-    .filter(x => 'sink' in x && x.sink === 'dom')
-    .forEach(x => console.log(' out to dom', x))
-  outputs$
-    .filter(x => 'sink' in x && x.sink === 'state')
-    .forEach(x => console.log(' out to state', x))
-
-  outputs$
-    .filter(x => 'sink' in x && x.sink === 'i18n')
-    .forEach(x => console.log(' out to i18n', x))
-
-  outputs$
-    .filter(x => 'sink' in x && x.sink === 'store')
-    .forEach(x => console.log(' out to store', x))
-  outputs$
-    .filter(x => 'sink' in x && x.sink === 'fs')
-    .forEach(x => console.log(' out to fs', x)) */
-
   // output to dom
   dom(require('./dom')(inputs))
   // output to i18n
@@ -40,12 +22,6 @@ const makeReactions = (inputs) => {
   state(outputs$.filter((x) => 'sink' in x && x.sink === 'state'))
 
   dat(outputs$.filter((x) => 'sink' in x && x.sink === 'dat'))
-
-  // titlebar & store side effects
-  // FIXME/ not compatible with multiple instances !!
-  /* titleBar.sink(
-    state.map(state => state.appTitle).skipRepeats()
-  ) */
 }
 
 module.exports = makeReactions

package/src/ui/flow/languages.js

@@ -15,7 +15,6 @@ const reducers = {
     return { languages }
   },
   setAvailableLanguages: (state, available) => {
-    // console.log('setAvailableLanguages', available)
     const languages = Object.assign({}, state.languages, { available })
     return { languages }
   },

package/src/ui/flow/shortcuts.js

@@ -155,7 +155,6 @@ const actions = ({ sources }) => {
   const triggerFromShortcut$ = keyCombos$
     .thru(withLatestFrom(reducers.triggerShortcut, sources.state))
     .filter((x) => x !== undefined)
-    // .tap(x => console.log('triggerFromShortcut', x))
 
   // this means we wait until the data here has been initialized before saving
   const requestLoadSettings$ = initialize$

package/src/ui/flow/themes.js

@@ -14,7 +14,7 @@ const reducers = {
   },
   setTheme: (state, active) => {
     const available = require('../../../data/themes')
-    const themeData = available[active] ? available[active] : available['light']
+    const themeData = available[active] ? available[active] : available.light
     const viewer = state.viewer ? merge({}, state.viewer, themeData.viewer) : themeData.viewer
     const themes = Object.assign({}, state.themes, { available, active, themeSettings: themeData })
     return { viewer, themes }

package/src/ui/flow/tools.js

@@ -8,12 +8,6 @@ const actions = ({ sources }) => {
     sources.dom.select('#toggleEditor').events('click').map((event) => 'editor'),
     sources.dom.select('#toggleHelp').events('click').map((event) => 'help'),
     sources.dom.select('.example').events('mouseup').map((event) => undefined)
-    /* sources.state // we changed designs
-      .filter(state => state.design)
-      .map(state => state.design.mainPath)
-      .skipRepeatsWith((mainPath, previousMainPath) => mainPath !== previousMainPath)
-      // .map(_ => undefined)
-      .tap(x => console.log('changed design')) */
   ])
     .thru(withLatestFrom((state, tool) => {
       const activeTool = state.activeTool === tool ? undefined : tool

package/src/ui/views/designParameters.js

@@ -4,10 +4,11 @@ const { createParamControls } = require('./parameterControls')
 
 const designParameters = (state, paramsCallbacktoStream, i18n) => {
   const { parameterValues, parameterDefinitions, parameterDefaults } = state.design
-  const { controls } = createParamControls(
-    Object.assign({}, parameterDefaults, parameterValues), parameterDefinitions, paramsCallbacktoStream.callback
-  )
-  return html`
+  try {
+    const { controls } = createParamControls(
+      Object.assign({}, parameterDefaults, parameterValues), parameterDefinitions, paramsCallbacktoStream.callback
+    )
+    return html`
   <section id='params' style='visibility:${state.design.parameterDefinitions.length === 0 ? 'hidden' : 'visible'};color:${state.themes.themeSettings.secondaryTextColor}'>
     <span id='paramsTable'>
       <table>
@@ -22,6 +23,10 @@ const designParameters = (state, paramsCallbacktoStream, i18n) => {
     </span>
   </section>
 `
+  } catch (e) {
+    e.stack = undefined // remove unhelpful stacktrace
+    state.status.error = e
+  }
 }
 
 module.exports = designParameters

package/src/ui/views/editor.js

@@ -26,10 +26,8 @@ const openscadOpenJscadParser = require('@jscad/openscad-openjscad-translator')
 const setUpEditor = (element, gProcessor) => {
   const langTools = ace.acequire('ace/ext/language_tools')
 
-  console.log('langTools', langTools)
   const flowCompleter = {
     getCompletions: (editor, session, pos, prefix, callback) => {
-      console.log('getCompletions')
       // your code
     }
   }
@@ -93,7 +91,6 @@ const setUpEditor = (element, gProcessor) => {
   document.body.addEventListener('keydown', (evt) => {
     if (evt.key === 'F5') {
       evt.preventDefault()
-      // console.log('no accidental reloading!')
       runExec(gEditor)
     }
   })
@@ -184,12 +181,9 @@ const editorWrapper = (state, editorCallbackToStream) => {
   // editor.resize(true)
   // editor.renderer.updateFull()
   /* ace.config.loadModule('ace/snippets/javascript', function (ba) {
-    console.log('boo', ba)
   })
   ace.config.loadModule('ace/ext/language_tools', function () {
-    console.log('gna')
     const bla = require('brace/snippets/javascript')
-    console.log('foo', bla)
     editor.insertSnippet(bli);
   }) */
   editor.setOptions({

package/src/ui/views/parameterControls.js

@@ -245,7 +245,6 @@ const createRadioControl = (definition, prevValue) => {
  * @returns {[*]}
  */
 const createInputControl = (definition, prevValue) => {
-  // console.log('parameterControls.createInputControl')
   const controlList = [
     { type: 'text', control: 'text', required: ['type', 'name'], initial: '' },
     { type: 'int', control: 'number', required: ['type', 'name'], initial: 0 },

package/src/ui/views/status.js

@@ -7,7 +7,8 @@ const status = (state, paramsCallbacktoStream) => {
   const errorLine = status.error !== undefined && status.error.lineno ? `Line: ${status.error.lineno}` : ''
   const errorStack = status.error !== undefined && status.error.stack ? `Stack: ${status.error.stack}` : ''
 
-  const statusMessage = status.error !== undefined ? html`<span>
+  const statusMessage = status.error !== undefined
+    ? html`<span>
     <div>
       ERROR: 
     </div>
@@ -20,7 +21,8 @@ const status = (state, paramsCallbacktoStream) => {
     <div>
       ${errorStack}
     </div>
-  </span>` : ''
+  </span>`
+    : ''
 
   // ? `Error: ${status.error.message} line: ${status.error.lineno}, filename:${status.error.filename} stack:  ${status.error.stack}` : ''
   // ${statusMessage}

package/src/ui/views/viewer.js

@@ -143,7 +143,7 @@ const viewer = (state, i18n) => {
   } else {
     // only generate entities when the solids change
     // themes, options, etc also change the viewer state
-    const solids = state.design.solids
+    const solids = state.design.solids.filter((solid) => solid && (solid instanceof Object))
     if (prevSolids) {
       const theme = state.themes.themeSettings.viewer
       const color = theme.rendering.meshColor

package/src/utils/keys.js

@@ -50,7 +50,6 @@ const getKeyCombos = (options, keyUps$, keyDown$) => {
     }, [])
     .filter((x) => x !== undefined)
     .filter((x) => x.event !== undefined)
-    // .tap(x => console.log('key stuff', x))
     .multicast()
 
   return keyCombos$

package/src/utils/logger.js

@@ -18,7 +18,7 @@ const makeLogger = (params) => {
 
   const warning = (...params) => {
     if (enabled) {
-      console.warning(...params)
+      console.warn(...params)
     }
   }
   const error = (...params) => {

package/src/ui/umd.js

@@ -1,168 +0,0 @@
-/**
- * @prettier
- */
-// == OpenJSCAD.org, Copyright (c) 2017, Licensed under MIT License
-const AlertUserOfUncaughtExceptions = require('./errorDispatcher')
-
-const version = require('../../package.json').version
-const Processor = require('../jscad/processor-bare')
-
-let gProcessor = null
-
-/**
- * Initialize a jscad viewer.  You can prevent the processor from creating
- * a new `canvas` element by passing a canvas element on `glOptions`.
- *
- * If the viewer element has a `design-url` attribute, that url will be loaded
- * with a `XMLHttpRequest`.  Otherwise load the design using `setJsCad`.
- *
- * @param {Object} viewer - A DOM element to use as the base element.
- * @param {JscadViewerOptions} options - options passed to the viewer processor
- */
-const init = (viewer, options) => {
-  const versionText = 'UMD OpenJSCAD.org Version ' + version
-  console.log('umd init', versionText, options)
-
-  // Show all exceptions to the user: // WARNING !! this is not practical at dev time
-  AlertUserOfUncaughtExceptions()
-
-  const design = viewer.getAttribute('design-url')
-
-  gProcessor = new Processor(viewer, options)
-
-  // load the given design
-  if (design) {
-    const xhr = new XMLHttpRequest()
-    xhr.open('GET', design, true)
-    gProcessor.setStatus('Loading ' + design)
-
-    xhr.onload = function () {
-      const source = this.responseText
-
-      if (design.match(/\.jscad$/i) || design.match(/\.js$/i)) {
-        gProcessor.setStatus('Processing ' + design)
-        gProcessor.setJsCad(source, design)
-      }
-    }
-    xhr.send()
-  }
-
-  return {
-    /**
-     * Start the processor on generating an output file. Once
-     * the file has been created, the `
-     * @param {FormatInfo} format
-     */
-    generateOutputFile: function (format) {
-      return gProcessor.generateOutputFile(format)
-    },
-
-    clearOutputFile: function () {
-      return gProcessor.clearOutputFile()
-    },
-
-    resetCamera () {
-      return gProcessor.viewer.resetCamera()
-    },
-
-    abort () {
-      return gProcessor.abort()
-    },
-
-    setJsCad (source, design) {
-      gProcessor.setJsCad(source, design)
-    },
-
-    rebuildSolids () {
-      gProcessor.rebuildSolids()
-    }
-  }
-}
-
-module.exports = init
-
-/**
- * @typedef {Object} XYZCoord
- * @property {number} x
- * @property {number} y
- * @property {number} z
- */
-
-/**
- * @typedef {Object} MinMax
- * @property {number} min
- * @property {number} max
- */
-
-/**
- * Camera settings
- * @typedef {Object} CameraSettings
- * @property {number} fov - field of view.
- * @property {XYZCoord} angle - view angle about XYZ axis.
- * @property {XYZCoord} position - initial position at XYZ.
- * @property {MinMax} clip - rendering outside this range is clipped.
- */
-
-/**
- * @typedef {Object} RgbaColor
- * @property {number} r - red (values 0.0 - 1.0).
- * @property {number} g - green (values 0.0 - 1.0).
- * @property {number} b - blue (values 0.0 - 1.0).
- * @property {number} a - alpha (values 0.0 - 1.0).
- */
-
-/**
- * Grid settings
- * @typedef {Object} GridSettings
- * @property {number} i - number of units between grid lines.
- * @property {RgbaColor} color - color.
- */
-
-/**
- * @typedef {Object} PlateSettings
- * @property {boolean} draw draw or not (default: true).
- * @property {number} size plate size (X and Y) (default: 200).
- * @property {GridSettings} m minor grid settings.
- * @property {GridSettings} M major grid settings.
- */
-
-/**
- *
- * @typedef {Object} PosNegColor
- * @property {RgbaColor} neg color in negative direction.
- * @property {RgbaColor} pos color in positive direction.
- */
-
-/**
- * @typedef {Object} AxisSettings
- * @property {boolean} draw - draw or not (default: false).
- * @property {PosNegColor} x
- * @property {PosNegColor} y
- * @property {PosNegColor} z
- */
-
-/**
- * @typedef {Object} LightGLOptions
- * @property {Object} canvas - Uses the HTML canvas given in 'options' or creates a new one if necessary.
- * @property {number} width - width applied to the canvas created when `options.canvas` is not set. (default: 800).
- * @property {number} height - height applied to the canvas created when `options.canvas` is not set. (default: 600).
- * @property {number} alpha - The alpha channel is disabled by default because it usually causes unintended transparencies in the canvas.
- *
- */
-
-/**
- * @typedef {Object} JscadViewerOptions
- * @property {PlateSettings} plate - The grid show in the viewer.
- * @property {CameraSettings} camera
- * @property {AxisSettings} axis
- * @property {LightGLOptions} glOptions - Options sent to `GL.create()`.
- * @property {Object} processor - options used by the viewer processor.
- */
-
-/**
- * @typedef {Object} ProcessorOptions
- * @property {Element} viewerContext - The main element that jscad uses.  If no canvas element is set, jscad creates one.
- * @property {Element} viewerdiv - Jscad moves the canvas tag here, or creates one and places it here.
- * @property {Element} parameterstable - A Table element reference.  The design parameters will be added here.
- * @property {Element} viewerCanvas - A Canvas element reference that will be used to draw the GL canvas.
- */