@jscad/core 2.5.9 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/core",
-  "version": "2.5.9",
+  "version": "2.6.2",
   "description": "Core functionality for JSCAD Applications",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -36,9 +36,9 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.4",
-    "@jscad/io": "2.3.2",
-    "@jscad/io-utils": "2.0.18",
-    "@jscad/modeling": "2.9.3",
+    "@jscad/io": "2.4.1",
+    "@jscad/io-utils": "2.0.21",
+    "@jscad/modeling": "2.9.6",
     "json5": "2.2.0",
     "strip-bom": "4.0.0"
   },
@@ -53,5 +53,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "85fa1fcdfb2d516a201ecf31da242e64b5b3274e"
+  "gitHead": "9768af96e5da00cd113c00ddeb0f6046707819b1"
 }

package/src/code-evaluation/rebuildGeometry.js

@@ -17,9 +17,12 @@ const applyParameterDefinitions = require('../parameters/applyParameterDefinitio
  * @param {Object} [data.parameterValues] - over-rides of parameter values (optional)
  * @param {Function} callback - function to process parameters and solids
  * @return NONE
+ *
  * This function extracts the parameters first, and then generates the solids.
  * The parsed parameters (definitions and values) are passed back to the given callback function.
  * The generated solids are also passed back to the given callback function.
+ * Also, all errors are caught and passed back to the given callback function.
+ *
  * Everything is together in a single function, because this is usually run in the context of a web worker
  * And transfering data back & forth is both complex (see transferables) and costly (time)
  **/
@@ -34,37 +37,51 @@ const rebuildSolids = (data, callback) => {
   }
   let { mainPath, apiMainPath, serialize, lookup, lookupCounts, parameterValues } = Object.assign({}, defaults, data)
 
-  const filesAndFolders = data.filesAndFolders
+  try {
+    const filesAndFolders = data.filesAndFolders
 
-  // let start = new Date()
-  const designData = loadDesign(mainPath, apiMainPath, filesAndFolders, parameterValues)
-  // send back parameter definitions & values
-  // in a worker this would be a postmessage, this is sent back early so that uis can update
-  // the parameters editor before the solids are displayed (which takes longer)
-  callback(null, {
-    type: 'params',
-    parameterDefaults: designData.parameterValues,
-    parameterDefinitions: designData.parameterDefinitions
-  })
-  // make sure parameters are correct by applying parameter definitions
-  // this might be redundant with ui-side logic, but it makes sure this core piece works regardless of ui
-  parameterValues = applyParameterDefinitions(parameterValues, designData.parameterDefinitions)
-  parameterValues = Object.assign({}, designData.parameterValues, parameterValues)
-  // start = new Date()
-  const options = {
-    lookup,
-    lookupCounts,
-    serialize
-  }
-  const solidsData = instanciateDesign(designData.rootModule, parameterValues, options)
+    // let start = new Date()
+    const designData = loadDesign(mainPath, apiMainPath, filesAndFolders, parameterValues)
+    // send back parameter definitions & values
+    // in a worker this would be a postmessage, this is sent back early so that uis can update
+    // the parameters editor before the solids are displayed (which takes longer)
+    callback(null, {
+      type: 'params',
+      parameterDefaults: designData.parameterValues,
+      parameterDefinitions: designData.parameterDefinitions
+    })
+    // make sure parameters are correct by applying parameter definitions
+    // this might be redundant with ui-side logic, but it makes sure this core piece works regardless of ui
+    parameterValues = applyParameterDefinitions(parameterValues, designData.parameterDefinitions)
+    parameterValues = Object.assign({}, designData.parameterValues, parameterValues)
+    // start = new Date()
+    const options = {
+      lookup,
+      lookupCounts,
+      serialize
+    }
+    const solidsData = instanciateDesign(designData.rootModule, parameterValues, options)
 
-  // send back solids & any other metadata
-  callback(null, {
-    type: 'solids',
-    solids: solidsData.solids,
-    lookup: solidsData.lookup,
-    lookupCounts: solidsData.lookupCounts
-  })
+    // send back solids & any other metadata
+    callback(null, {
+      type: 'solids',
+      solids: solidsData.solids,
+      lookup: solidsData.lookup,
+      lookupCounts: solidsData.lookupCounts
+    })
+  } catch (error) {
+    callback({
+      type: 'errors',
+      name: error.name ? error.name : 'Error',
+      message: error.message ? error.message : error.toString(),
+      description: error.description ? error.description : '',
+      number: error.number ? error.number : '',
+      fileName: error.fileName ? error.fileName : '',
+      lineNumber: error.lineNumber ? error.lineNumber : '',
+      columnNumber: error.columnNumber ? error.columnNumber : '',
+      stack: error.stack ? error.stack : ''
+    }, null)
+  }
 }
 
 module.exports = rebuildSolids

package/src/code-evaluation/rebuildGeometryWorker.js

@@ -13,7 +13,10 @@ const rebuildGeometryWorker = (self) => {
     if (event.data instanceof Object) {
       const { data } = event
       if (data.cmd === 'generate') {
-        rebuildGeometry(data, (err, message) => self.postMessage(message))
+        rebuildGeometry(data, (error, message) => {
+          if (message) self.postMessage(message)
+          if (error) self.postMessage(error)
+        })
       }
     }
   }

package/src/code-loading/webRequire.js

@@ -111,15 +111,31 @@ const makeWebRequire = (filesAndFolders, options) => {
         const matchingModule = {
           exports: {},
           _compile: (content, fileName) => {
-            const moduleMakerFunction = new Function('require', 'module', content) // eslint-disable-line no-new-func
-            moduleMakerFunction(_require.bind(null, entry.fullPath), matchingModule)
+            try {
+              const moduleMakerFunction = new Function('require', 'module', content) // eslint-disable-line no-new-func
+              moduleMakerFunction(_require.bind(null, entry.fullPath), matchingModule)
+            } catch (e) {
+              // catch errors and build a context specific error, with file name and stack trace
+              // the stack trace mimics the style of nodejs
+              const message = e.message
+              fileName = fileName.replace('/', '')
+              // NOTE: only firefox provides line and column numbers
+              const lineNumber = e.lineNumber ? e.lineNumber - 2 : 0 // the call to Function (above) adds two lines
+              const columnNumber = e.columnNumber ? e.columnNumber : 0
+              if (e.stack.startsWith('Object')) {
+                e.stack = `${e.stack}\nObject.<anonymous> (${fileName}:${lineNumber}:${columnNumber})`
+              } else {
+                e = new SyntaxError(message, fileName, lineNumber)
+                e.columnNumber = columnNumber
+                e.stack = `Object.<anonymous> (${fileName}:${lineNumber}:${columnNumber})`
+              }
+              throw e
+            }
 
             const paramDefFromSource = content.includes('@jscad-params') ? getParameterDefinitionsFromSource(content, fileName) : []
             const originalFunc = matchingModule.exports.getParameterDefinitions
             // replace getParameterDefinitions in the module, with version taht adds parsed definitions
             matchingModule.exports.getParameterDefinitions = () => combineParameterDefinitions(paramDefFromSource, originalFunc ? originalFunc() || [] : [])
-            // add to core to resolve later references
-            // FIXME coreModules[entry.fullPath] = matchingModule.exports
           }
         }
         extensions[baseExt](matchingModule, entry.fullPath)