bug fixes and improvements

project validation
add migrate file script
remove logs

package.json

@@ -34,7 +34,8 @@
     "make": "electron-forge make",
     "publish": "electron-forge publish",
     "make-dev-prerelease": "pnpm version prerelease --preid=dev",
-    "supa:types": "supabase gen types typescript --project-id $VITE_SUPABASE_PROJECT_ID > src/shared/database.types.ts"
+    "supa:types": "supabase gen types typescript --project-id $VITE_SUPABASE_PROJECT_ID > src/shared/database.types.ts",
+    "migrate-file": "pnpm tsx scripts/migrate-file.mts"
   },
   "dependencies": {
     "@changesets/cli": "2.27.9",

scripts/migrate-file.mts

@@ -0,0 +1,40 @@
+import { savedFileMigrator } from '@@/model'
+import * as fs from 'fs/promises'
+import { join } from 'path'
+import { tmpdir } from 'os'
+import { nanoid } from 'nanoid'
+import { execa } from 'execa'
+
+const args = process.argv.slice(2)
+if (args.length !== 1) {
+  console.error('Usage: node script.ts <filepath>')
+  process.exit(1)
+}
+
+const filePath = args[0]
+
+async function migrateFile() {
+  try {
+    // const tmpFile = join(tmpdir(), nanoid() + '.json')
+
+    const data = await fs.readFile(filePath, 'utf8')
+    const json = JSON.parse(data)
+    const migratedData = await savedFileMigrator.migrate(json)
+    const str = JSON.stringify(migratedData, null, 2)
+    console.log('data', data)
+    console.log('str', str)
+    await fs.writeFile(filePath, str, 'utf8')
+    console.log('File successfully migrated to the latest version of the model.')
+
+    // await execa('delta', [filePath, tmpFile], {
+    //   env: {
+    //     DELTA_FEATURES: '+side-by-side'
+    //   }
+    // })
+  } catch (error) {
+    console.error(`Error migrating the file: ${error}`)
+    process.exit(1)
+  }
+}
+
+await migrateFile()

src/renderer/components/nodes/EditorNodeAction.vue

@@ -207,8 +207,6 @@ watchDebounced(
     // const variables = await variableToFormattedVariable(vm, data.variables)
     // console.log('variables', variables)
 
-    console.log('variablesDisplay', variablesDisplay)
-
     resolvedParams.value = await makeResolvedParams(
       {
         params: value.value.params,

src/renderer/components/nodes/ParamEditor.vue

@@ -28,11 +28,11 @@
             </Chip>
           </label>
 
-          <div class="debug">
+          <!-- <div class="debug">
             <pre>editorTextValue: {{ editorTextValue }}</pre>
             <pre>simpleInputValue: {{ simpleInputValue }}</pre>
             <pre>param.value.value: {{ param.value }}</pre>
-          </div>
+          </div> -->
 
           <div class="infos">
             <!-- Is valid button -->
@@ -51,6 +51,10 @@
           </div>
         </div>
 
+        <div v-if="param === undefined">
+          Oops
+        </div>
+
         <!-- Code editor -->
         <div class="code-editor-wrapper">
           <div class="code-editor-wrapper-inner">
@@ -188,7 +192,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, computed, ref, toRefs, watch } from 'vue'
+import { computed, ref, toRefs, watch } from 'vue'
 import type { ValueOf } from 'type-fest'
 import { Action, Condition, Event } from '@pipelab/plugin-core'
 import { createCodeEditor } from '@renderer/utils/code-editor'
@@ -216,35 +220,47 @@ const vm = await createQuickJs()
 type Params = (Action | Condition | Event)['params']
 type Param = ValueOf<BlockAction['params']>
 
-const props = defineProps({
-  param: {
-    type: Object as PropType<Param>,
-    required: false
-  },
-  paramDefinition: {
-    type: Object as PropType<ValueOf<Params>>,
-    required: true
-  },
-  paramKey: {
-    type: [String, Number],
-    required: true
-  },
+const props = defineProps<{
+  param: Param | undefined;
+  paramDefinition: ValueOf<Params>,
+  paramKey: string | number
 
-  value: {
-    type: Object as PropType<BlockAction | BlockEvent | BlockCondition | BlockLoop>,
-    required: true
-  },
-  steps: {
-    type: Object as PropType<Steps>,
-    required: true
-  },
-  variables: {
-    type: Object as PropType<Variable[]>,
-    required: true
-  }
-})
+  value: BlockAction | BlockEvent | BlockCondition | BlockLoop
+  steps: Steps
+  variables: Variable[]
+}>()
+
+// const props = defineProps({
+//   param: {
+//     type: Object as PropType<Param>,
+//     required: false,
+//     default: undefined,
+//   },
+//   paramDefinition: {
+//     type: Object as PropType<ValueOf<Params>>,
+//     required: true
+//   },
+//   paramKey: {
+//     type: [String, Number],
+//     required: true
+//   },
+
+//   value: {
+//     type: Object as PropType<BlockAction | BlockEvent | BlockCondition | BlockLoop>,
+//     required: true
+//   },
+//   steps: {
+//     type: Object as PropType<Steps>,
+//     required: true
+//   },
+//   variables: {
+//     type: Object as PropType<Variable[]>,
+//     required: true
+//   }
+// })
 
-const { param, paramKey, paramDefinition, steps, variables } = toRefs(props)
+const { paramKey, paramDefinition, steps, variables } = toRefs(props)
+const { param } = toRefs(props)
 
 const confirm = useConfirm()
 
@@ -278,9 +294,9 @@ const confirmSwitchMode = (event: MouseEvent) => {
 }
 
 const toggleMode = async (event: MouseEvent) => {
-  const target = param.value.editor === 'simple' ? 'editor' : 'simple'
+  const target = param.value?.editor === 'simple' ? 'editor' : 'simple'
   let answer = true
-  let targetValue = klona(param.value.value)
+  let targetValue = klona(param.value?.value)
   if (target === 'simple') {
     event.preventDefault()
 
@@ -381,7 +397,7 @@ const doCodeEditorUpdate = throttle(async (newValue) => {
 
     // update on code editor text change
     emit('update:modelValue', {
-      editor: param.value.editor,
+      editor: param.value?.editor,
       value: newValue
     })
   } catch (e) {
@@ -473,7 +489,7 @@ const onParamEditorUpdate = (value: unknown) => {
 
 const isModalDisplayed = ref(false)
 const onClickInside = () => {
-  if (param.value.editor === 'editor') {
+  if (param.value?.editor === 'editor') {
     isModalDisplayed.value = true
   }
 }
@@ -482,7 +498,7 @@ const onClickOutside = () => {
 }
 
 watch(
-  () => param.value.editor,
+  () => param.value?.editor,
   (newValue) => {
     if (newValue === 'editor') {
       isModalDisplayed.value = true

src/renderer/store/editor.ts

@@ -7,6 +7,7 @@ import {
   BlockLoop,
   SavedFile,
   savedFileMigrator,
+  SavedFileValidator,
   Steps
 } from '@@/model'
 import {
@@ -32,6 +33,7 @@ import { processGraph } from '@@/graph'
 import { useLogger } from '@@/logger'
 import { klona } from 'klona'
 import { create } from 'mutative'
+import { parse } from 'valibot'
 
 export type Context = Record<string, unknown>
 
@@ -226,6 +228,7 @@ export const useEditor = defineStore('editor', () => {
           })
         }
       }
+
       // } else if (block.type === 'condition') {
       //   const definition = getNodeDefinition(block.origin.nodeId, block.origin.pluginId)
       //   const requiredParams = Object.keys(definition?.params ?? {})
@@ -265,21 +268,40 @@ export const useEditor = defineStore('editor', () => {
       debug: true
     })
 
-    console.log('data', data)
+    // ensure all params are there
+    const finalData = create(data, (draft) => {
+      for (const block of draft.canvas.blocks) {
+        const definition = getNodeDefinition(block.origin.nodeId, block.origin.pluginId)
+        if (definition) {
+          const params = definition.node.params
+          for (const param of Object.keys(params)) {
+            if (!(param in block.params)) {
+              console.warn("adding mising param", param)
+              block.params[param] = {
+                editor: 'editor',
+                value: params[param].value
+              }
+            }
+          }
+        }
+      }
+    })
+
+    await parse(SavedFileValidator, finalData)
 
-    name.value = data.name
-    description.value = data.description
+    name.value = finalData.name
+    description.value = finalData.description
 
-    for (const variable of data.variables) {
+    for (const variable of finalData.variables) {
       addVariable(variable)
     }
 
-    for (const block of data.canvas.blocks) {
+    for (const block of finalData.canvas.blocks) {
       blocks.value.push(block)
       validate(block)
     }
 
-    for (const trigger of data.canvas.triggers) {
+    for (const trigger of finalData.canvas.triggers) {
       triggers.value.push(trigger)
       validate(trigger)
     }

src/renderer/utils/evaluator.ts

@@ -1,8 +1,6 @@
 import { BlockAction, Steps } from '@@/model'
 import { createQuickJs, CreateQuickJSFn } from './quickjs'
-import { Variable } from '@pipelab/core-app'
 import { useLogger } from '@@/logger'
-import { variableToFormattedVariable } from '@renderer/composables/variables'
 
 export const makeResolvedParams = async (
   data: {
@@ -23,7 +21,6 @@ export const makeResolvedParams = async (
     try {
       const parameterCodeValue = (param.value ?? '').toString()
 
-      console.log('parameterCodeValue', parameterCodeValue)
       const output = await vm.run(parameterCodeValue, {
         steps: data.steps,
         params: {},
@@ -37,6 +34,5 @@ export const makeResolvedParams = async (
       logger().error('error', e)
     }
   }
-  console.log('result', result)
   return result
 }

src/renderer/utils/quickjs.ts

@@ -62,6 +62,7 @@ export const createQuickJs = async () => {
       return result
     } catch (e) {
       logger().error('error', e)
+      logger().error("Final code was", finalCode)
       throw new EvaluationError(e.name, e.message)
     } finally {
       arena.dispose()

src/shared/model.ts

@@ -185,6 +185,7 @@ export type SavedFileV1 = InferOutput<typeof SavedFileValidatorV1>
 export type SavedFileV2 = InferOutput<typeof SavedFileValidatorV2>
 export type SavedFileV3 = InferOutput<typeof SavedFileValidatorV3>
 export type SavedFile = SavedFileV3
+export const SavedFileValidator = SavedFileValidatorV3
 
 export const savedFileMigrator = createMigrator<SavedFile>({
   migrations: [

tests/e2e/fixtures/c3-export.json

@@ -1,10 +1,9 @@
 {
-  "version": "1.0.0",
-  "name": "From Construct to Steam",
   "description": "Export from Construct, package with Electron, then upload to Steam",
+  "name": "From Construct to Steam",
   "variables": [],
   "canvas": {
-    "blocks": [
+    "triggers": [
       {
         "type": "event",
         "origin": {
@@ -13,7 +12,9 @@
         },
         "uid": "manual-start",
         "params": {}
-      },
+      }
+    ],
+    "blocks": [
       {
         "uid": "export-construct-project",
         "type": "action",
@@ -22,13 +23,29 @@
           "pluginId": "construct"
         },
         "params": {
-          "file": "\"./tests/e2e/fixtures/c3-export/test.c3p\"",
-          "username": "",
-          "password": "",
-          "version": "",
-          "headless": true
+          "file": {
+            "editor": "editor",
+            "value": "\"./tests/e2e/fixtures/c3-export/test.c3p\""
+          },
+          "username": {
+            "editor": "editor",
+            "value": ""
+          },
+          "password": {
+            "editor": "editor",
+            "value": ""
+          },
+          "version": {
+            "editor": "editor",
+            "value": ""
+          },
+          "headless": {
+            "editor": "editor",
+            "value": true
+          }
         }
       }
     ]
-  }
-}
+  },
+  "version": "3.0.0"
+}