move some srcs, separate extractDefaults func

hrgdavor · Oct 16, 2023 · 9438874 · 9438874
1 parent 83a3a28
commit 9438874
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/packages/worker/exportStlText.js → packages/worker/src/exportStlText.js b/packages/worker/exportStlText.js → packages/worker/src/exportStlText.js
diff --git a/packages/worker/src/extractDefaults.js b/packages/worker/src/extractDefaults.js
@@ -0,0 +1,19 @@
+export function extractDefaults(def){
+  const params = {}
+  def.forEach(({ name, initial, default: def, type, values, captions }) =>{
+    let val = def === undefined ? initial : def
+    if(type === 'choice' && values.indexOf(v=>v === val) === -1){
+      // it is supported for choice to use default value from captions also
+      // but script will need the matching value
+      for(let i=0; i<captions.length; i++){
+        if(captions[i] === val){
+          val = values[i]
+          break;
+        }
+      }
+      if(val === undefined) val = values[0]
+    }
+    params[name] = val
+  })
+  return params
+}
diff --git a/...rker/getParameterDefinitionsFromSource.js → .../src/getParameterDefinitionsFromSource.js b/...rker/getParameterDefinitionsFromSource.js → .../src/getParameterDefinitionsFromSource.js
diff --git a/packages/worker/worker.js b/packages/worker/worker.js
@@ -2,8 +2,9 @@ import { JscadToCommon } from '@jscadui/format-jscad'
 import { initMessaging, withTransferable } from '@jscadui/postmessage'
 import { clearFileCache, clearTempCache, readFileWeb, require, requireCache, resolveUrl } from '@jscadui/require'
 
-import { exportStlText } from './exportStlText.js'
-import { combineParameterDefinitions, getParameterDefinitionsFromSource } from './getParameterDefinitionsFromSource.js'
+import { exportStlText } from './src/exportStlText.js'
+import { combineParameterDefinitions, getParameterDefinitionsFromSource } from './src/getParameterDefinitionsFromSource.js'
+import { extractDefaults } from './src/extractDefaults.js'
 
 let main
 self.JSCAD_WORKER_ENV = {}
@@ -78,23 +79,7 @@ const runScript = async ({ script, url, base=globalBase, root=base }) => {
   const fromSource = getParameterDefinitionsFromSource(script)
   def = combineParameterDefinitions(fromSource, await scriptModule.getParameterDefinitions?.())
   main = scriptModule.main
-  const params = {}
-  def.forEach(({ name, initial, default: def, type, values, captions }) =>{
-    let val = def === undefined ? initial : def
-    if(type === 'choice' && values.indexOf(v=>v === val) === -1){
-      // it is supported for choice to use default value from captions also
-      // but script will need the matching value
-      for(let i=0; i<captions.length; i++){
-        if(captions[i] === val){
-          val = values[i]
-          break;
-        }
-      }
-      if(val === undefined) val = values[0]
-    }
-    params[name] = val
-  })
-  await runMain({ params })
+  await runMain({ params: extractDefaults(def) })
   return {def}
 }