From 9438874922a289ae3eb78e0792f0dc80d020cb51 Mon Sep 17 00:00:00 2001
From: Davor Hrg <hrgdavor@gmail.com>
Date: Mon, 16 Oct 2023 09:18:24 +0200
Subject: [PATCH] move some srcs, separate extractDefaults func

---
 packages/worker/{ => src}/exportStlText.js    |  0
 packages/worker/src/extractDefaults.js        | 19 +++++++++++++++
 .../getParameterDefinitionsFromSource.js      |  0
 packages/worker/worker.js                     | 23 ++++---------------
 4 files changed, 23 insertions(+), 19 deletions(-)
 rename packages/worker/{ => src}/exportStlText.js (100%)
 create mode 100644 packages/worker/src/extractDefaults.js
 rename packages/worker/{ => src}/getParameterDefinitionsFromSource.js (100%)

diff --git a/packages/worker/exportStlText.js b/packages/worker/src/exportStlText.js
similarity index 100%
rename from packages/worker/exportStlText.js
rename to packages/worker/src/exportStlText.js
diff --git a/packages/worker/src/extractDefaults.js b/packages/worker/src/extractDefaults.js
new file mode 100644
index 0000000..bb6ed91
--- /dev/null
+++ 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
+}
\ No newline at end of file
diff --git a/packages/worker/getParameterDefinitionsFromSource.js b/packages/worker/src/getParameterDefinitionsFromSource.js
similarity index 100%
rename from packages/worker/getParameterDefinitionsFromSource.js
rename to packages/worker/src/getParameterDefinitionsFromSource.js
diff --git a/packages/worker/worker.js b/packages/worker/worker.js
index c06802a..108679e 100644
--- 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}
 }