@jscad/core 2.5.2 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/core",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Core functionality for JSCAD Applications",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "main": "src/index.js",
@@ -35,7 +35,7 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.1",
-    "@jscad/io": "2.2.2",
+    "@jscad/io": "2.2.3",
     "@jscad/io-utils": "2.0.12",
     "@jscad/modeling": "2.7.1",
     "json5": "2.2.0",
@@ -52,5 +52,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "c8ac21281a7acf5a5575b940c18353c598ffa1a4"
+  "gitHead": "95f05c5f11a53bff469a305d69b99f674dc7d6d3"
 }

package/src/code-loading/normalizeDesignModule.js

@@ -3,17 +3,17 @@
  */
 const normalizeDesignModule = (rootModule) => {
   if (!rootModule) {
-    throw new Error('no root module found')
+    throw new Error('no root module found, please check the project structure')
   }
   if (typeof (rootModule) === 'function') {
-    console.warn('please use named exports for the main() function')
+    console.warn('please refactor the exports, assigning main() as a property, i.e. module.exports = { main }')
     rootModule = { main: rootModule }
   }
   if (!rootModule.main) {
-    throw new Error('no main() function, check the exports')
+    throw new Error('no main() function found, please check the module.exports')
   }
-  if (!(typeof (rootModule.main) === 'function')) {
-    throw new Error('main is not a function, check the exports')
+  if (typeof (rootModule.main) !== 'function') {
+    throw new Error('main is not a function, please check the module.exports')
   }
   return rootModule
 }

package/src/code-loading/transformSources.js

@@ -1,18 +1,10 @@
 const { deserializers } = require('@jscad/io')
 
-const isCommonJsModule = require('./isCommonJsModule')
-const modulifySource = require('./modulifySource')
-
-const passThroughTransform = (options, entry) => entry
-
-/* function to turn old style jscad code with implicit imports
-into code with explicit exports/imports */
-// FIXME wouldn't a javascript error be better then 'hacking' the users code?
+/*
+ * Transform the entry into a ready-to-use module.
+ */
 const modulifyTransform = (options, entry) => {
-  const { apiMainPath } = options
-  const isFileCommonJs = isCommonJsModule(entry.source)
-  const source = !isFileCommonJs ? modulifySource(entry.source, apiMainPath) : entry.source
-  return Object.assign({}, entry, { source })
+  return Object.assign({}, entry, { source: entry.source })
 }
 
 /*

package/src/code-loading/webRequire.js

@@ -72,6 +72,7 @@ const makeWebRequire = (filesAndFolders, options) => {
   // console.log('*****\n',filesAndFolders,'\n*****')
 
   const extensions = {}
+  const moduleCache = {}
 
   /* Require (obtain) the exports for the given require path, relative to the given current path.
    * The logic is based on the original NODE require() function.
@@ -105,6 +106,7 @@ const makeWebRequire = (filesAndFolders, options) => {
       if (entry.children) return null // directory
 
       if (extensions[baseExt]) {
+        if(moduleCache[requirePath]) return moduleCache[requirePath]
         // evaluate the content
         const matchingModule = {
           exports: {},
@@ -121,7 +123,7 @@ const makeWebRequire = (filesAndFolders, options) => {
           }
         }
         extensions[baseExt](matchingModule, entry.fullPath)
-        return matchingModule.exports
+        return moduleCache[requirePath] = matchingModule.exports
       }
       return null
     }

package/src/code-loading/webRequire.test.js

@@ -13,10 +13,14 @@ test('webRequire: should support require, from a single file', (t) => {
 
   let requireFn = makeWebRequire(singleFileJs, { apiMainPath })
   let designRootModule = requireFn(singleFileJs[0].fullPath)
+  const designRootModule2 = requireFn(singleFileJs[0].fullPath)
 
   t.true('main' in designRootModule)
   t.true(designRootModule.main instanceof Function)
 
+  t.is(designRootModule, designRootModule2)
+  t.deepEqual(designRootModule, designRootModule2)
+
   // NOTE: 'jscad' must be registered as an extension
   const fakeFs = makeFakeFs(singleFileJscad)
   requireFn = makeWebRequire(singleFileJscad, { apiMainPath })
@@ -32,7 +36,6 @@ test('webRequire: should support require, from a directory with index.js', (t) =
 
   const requireFn = makeWebRequire(directoryWithIndexJs, { apiMainPath })
   const designRootModule = requireFn('/project')
-
   t.true('main' in designRootModule)
   t.true(designRootModule.main instanceof Function)
 })