Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions frontend/src/lib/components/EditorBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import type { Schema, SchemaProperty, SupportedLanguage } from '$lib/common'
import ScriptVersionHistory from './ScriptVersionHistory.svelte'
import type DiffEditor from './DiffEditor.svelte'
import { getResetCode } from '$lib/script_helpers'
import { getResetCode, TS_PREPROCESSOR_MODULE_CODE, PYTHON_PREPROCESSOR_MODULE_CODE, TS_PREPROCESSOR_SCRIPT_INTRO, PYTHON_PREPROCESSOR_SCRIPT_INTRO } from '$lib/script_helpers'
import Popover from './Popover.svelte'
import ResourceEditorDrawer from './ResourceEditorDrawer.svelte'
import type { EditorBarUi } from './custom_ui'
Expand All @@ -66,7 +66,7 @@
}
iconOnly?: boolean
validCode?: boolean
kind?: 'script' | 'trigger' | 'approval'
kind?: 'script' | 'trigger' | 'approval' | 'preprocessor'
template?: 'pgsql' | 'mysql' | 'script' | 'docker' | 'powershell' | 'bunnative'
collabMode?: boolean
collabLive?: boolean
Expand All @@ -83,6 +83,7 @@
right?: import('svelte').Snippet
openAiChat?: boolean
moduleId?: string
selectedTab?: 'main' | 'preprocessor'
}

let {
Expand All @@ -107,7 +108,8 @@
showHistoryDrawer = $bindable(false),
right,
openAiChat = false,
moduleId = undefined
moduleId = undefined,
selectedTab = 'main'
}: Props = $props()

let contextualVariablePicker: ItemPicker | undefined = $state()
Expand Down Expand Up @@ -351,9 +353,32 @@

function clearContent() {
if (editor) {
const resetCode = getResetCode(lang, kind as Script['kind'], template)
editor.setCode(resetCode)
// If we're on the preprocessor tab or the kind is preprocessor, use preprocessor signature
if (selectedTab === 'preprocessor' || kind === 'preprocessor') {
const preprocessorCode = getPreprocessorCode(lang)
if (preprocessorCode) {
editor.setCode(preprocessorCode)
} else {
// Fallback to regular reset code if no preprocessor code is available
const resetCode = getResetCode(lang, 'script', template)
editor.setCode(resetCode)
}
} else {
const resetCode = getResetCode(lang, kind as Script['kind'], template)
editor.setCode(resetCode)
}
}
}

function getPreprocessorCode(language: SupportedLanguage | 'bunnative' | undefined): string | undefined {
if (language === 'deno' || language === 'bun') {
return `${TS_PREPROCESSOR_SCRIPT_INTRO}${TS_PREPROCESSOR_MODULE_CODE}`
} else if (language === 'python3') {
return `${PYTHON_PREPROCESSOR_SCRIPT_INTRO}${PYTHON_PREPROCESSOR_MODULE_CODE}`
} else if (language === 'nativets' || language === 'bunnative') {
return `${TS_PREPROCESSOR_SCRIPT_INTRO}${TS_PREPROCESSOR_MODULE_CODE}`
}
return undefined
}

function windmillPathToCamelCaseName(path: string): string {
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/ScriptEditor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@
: undefined}
{diffMode}
bind:showHistoryDrawer
{selectedTab}
>
{#snippet right()}
{@render editor_bar_right?.()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { Loader2 } from 'lucide-svelte'

interface Props {
kind?: HubScriptKind & string
kind?: (HubScriptKind | 'preprocessor') & string
filter?: string
syncQuery?: boolean
children?: import('svelte').Snippet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import Toggle from '$lib/components/Toggle.svelte'
import NoItemFound from '$lib/components/home/NoItemFound.svelte'

export let kind: 'script' | 'trigger' | 'approval' | 'failure' = 'script'
export let kind: 'script' | 'trigger' | 'approval' | 'failure' | 'preprocessor' = 'script'
export let isTemplate: boolean | undefined = undefined
export let displayLock = false

Expand Down