From 1be335f042727bbb33b5f515433b65c54bf841fe Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 13 Feb 2025 13:40:40 +0100 Subject: [PATCH] fix(bun): remove unecessary buntar in a bun bundle world --- .../lib/components/InputTransformForm.svelte | 24 +++++++++++++++---- .../flows/propPicker/PropPickerWrapper.svelte | 1 + .../propertyPicker/PropPicker.svelte | 1 - 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte index aa0c31057b..50ad1e8922 100644 --- a/frontend/src/lib/components/InputTransformForm.svelte +++ b/frontend/src/lib/components/InputTransformForm.svelte @@ -196,10 +196,26 @@ } function connectProperty(rawValue: string) { - arg.expr = getDefaultExpr(undefined, previousModuleId, rawValue) - arg.type = 'javascript' - propertyType = 'javascript' - monaco?.setCode(arg.expr) + // Extract path from variable('x') or resource('x') format + const varMatch = rawValue.match(/^variable\('([^']+)'\)$/) + const resourceMatch = rawValue.match(/^resource\('([^']+)'\)$/) + + if (varMatch) { + arg.type = 'static' + propertyType = 'static' + arg.value = '$var:' + varMatch[1] + monacoTemplate?.setCode(arg.value) + } else if (resourceMatch) { + arg.type = 'static' + propertyType = 'static' + arg.value = '$res:' + resourceMatch[1] + monacoTemplate?.setCode(arg.value) + } else { + arg.expr = getDefaultExpr(undefined, previousModuleId, rawValue) + arg.type = 'javascript' + propertyType = 'javascript' + monaco?.setCode(arg.expr) + } } function onFocus() { diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte index 41f05c1fb5..57df089a62 100644 --- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte +++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte @@ -146,6 +146,7 @@ {pickableProperties} allowCopy={!notSelectable && !$propPickerConfig} on:select={({ detail }) => { + // console.log('selecting', detail) dispatch('select', detail) if ($propPickerConfig?.onSelect(detail)) { $propPickerConfig?.clearFocus() diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte index 7e62990eb6..982b95f892 100644 --- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte +++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte @@ -343,7 +343,6 @@ wrapperClasses="inline-flex whitespace-nowrap w-fit" btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">- -