windmill-components 1.532.0 → 1.537.1

package/package/components/schema/EditableSchemaSdkWrapper.svelte

@@ -1,6 +1,19 @@
-<script lang="ts">import EditableSchemaWrapper from './EditableSchemaWrapper.svelte';
-let { schema: oldSchema, ...props } = $props();
+<script lang="ts">import { readFieldsRecursively } from '../../utils';
+import { deepEqual } from 'fast-equals';
+import EditableSchemaWrapper from './EditableSchemaWrapper.svelte';
+let { schema: oldSchema, onSchemaChange, ...props } = $props();
 let schema = $state(oldSchema);
+let lastSchema = $state.snapshot(schema);
+$effect(() => {
+    if (onSchemaChange) {
+        readFieldsRecursively(schema);
+        let newSchema = $state.snapshot(schema);
+        if (!deepEqual(lastSchema, newSchema)) {
+            lastSchema = newSchema;
+            onSchemaChange(newSchema);
+        }
+    }
+});
 </script>
 
-<EditableSchemaWrapper {schema} {...props} />
+<EditableSchemaWrapper bind:schema {...props} />

package/package/components/schema/EditableSchemaSdkWrapper.svelte.d.ts

@@ -1,4 +1,7 @@
 import type { EditableSchemaWrapperProps } from './editable_schema_wrapper';
-declare const EditableSchemaSdkWrapper: import("svelte").Component<EditableSchemaWrapperProps, {}, "">;
+type $$ComponentProps = EditableSchemaWrapperProps & {
+    onSchemaChange?: (schema: any) => void;
+};
+declare const EditableSchemaSdkWrapper: import("svelte").Component<$$ComponentProps, {}, "">;
 type EditableSchemaSdkWrapper = ReturnType<typeof EditableSchemaSdkWrapper>;
 export default EditableSchemaSdkWrapper;

package/package/components/schema/EditableSchemaWrapper.svelte

@@ -7,7 +7,7 @@ import AddPropertyV2 from './AddPropertyV2.svelte';
 import { Plus } from 'lucide-svelte';
 import Select from '../select/Select.svelte';
 import { safeSelectItems } from '../select/utils.svelte';
-let { schema = $bindable(), uiOnly = false, noPreview = false, fullHeight = true, formatExtension = $bindable(undefined), onSchemaChange, customUi } = $props();
+let { schema = $bindable(), uiOnly = false, noPreview = false, fullHeight = true, formatExtension = $bindable(undefined), customUi } = $props();
 let resourceIsTextFile = $state(false);
 let addPropertyComponent = $state(undefined);
 let editableSchemaForm = $state(undefined);
@@ -35,7 +35,6 @@ function switchResourceIsFile() {
             }
         };
     }
-    onSchemaChange?.({ schema: $state.snapshot(schema) });
 }
 let suggestedFileExtensions = $state([
     'json',
@@ -64,9 +63,8 @@ let suggestedFileExtensions = $state([
 				noPopover={customUi?.noAddPopover}
 				bind:schema
 				bind:this={addPropertyComponent}
-				on:change={() => onSchemaChange?.({ schema: $state.snapshot(schema) })}
-				on:addNew={(e) => {
-					editableSchemaForm?.openField(e.detail)
+				onAddNew={(argName) => {
+					editableSchemaForm?.openField(argName)
 				}}
 			>
 				{#snippet trigger()}
@@ -82,11 +80,7 @@ let suggestedFileExtensions = $state([
 			onlyMaskPassword
 			bind:this={editableSchemaForm}
 			bind:schema
-			on:change={() => onSchemaChange?.({ schema: $state.snapshot(schema) })}
 			isFlowInput
-			on:edit={(e) => {
-				addPropertyComponent?.openDrawer(e.detail)
-			}}
 			on:delete={(e) => {
 				addPropertyComponent?.handleDeleteArgument([e.detail])
 			}}
@@ -100,7 +94,6 @@ let suggestedFileExtensions = $state([
 						noPopover={customUi?.noAddPopover}
 						bind:schema
 						bind:this={addPropertyComponent}
-						on:change={() => onSchemaChange?.({ schema })}
 					>
 						{#snippet trigger()}
 							<div

package/package/components/schema/FlowPropertyEditor.svelte

@@ -15,8 +15,8 @@ import { Pen, Plus, Trash2 } from 'lucide-svelte';
 import Popover from '../meltComponents/Popover.svelte';
 import ResourcePicker from '../ResourcePicker.svelte';
 import Tooltip from '../Tooltip.svelte';
-let { format = $bindable(undefined), contentEncoding = undefined, type = undefined, oneOf = $bindable(undefined), required = false, pattern = undefined, password = undefined, variableEditor = undefined, itemPicker = undefined, nullable = $bindable(undefined), disabled = $bindable(undefined), defaultValue = $bindable(undefined), propsNames = [], showExpr = $bindable(undefined), extra = {}, customErrorMessage = undefined, itemsType = undefined, properties = $bindable(undefined), order = $bindable(undefined), requiredProperty = $bindable(undefined), displayWebhookWarning = true } = $props();
-let oneOfSelected = $state(undefined);
+let { format = $bindable(undefined), contentEncoding = undefined, type = undefined, oneOf = $bindable(undefined), required = false, pattern = undefined, password = undefined, variableEditor = undefined, itemPicker = undefined, nullable = $bindable(undefined), disabled = $bindable(undefined), defaultValue = $bindable(undefined), propsNames = [], showExpr = $bindable(undefined), extra = {}, customErrorMessage = undefined, itemsType = undefined, properties = $bindable(undefined), order = $bindable(undefined), requiredProperty = $bindable(undefined), displayWebhookWarning = true, onDrawerClose = undefined } = $props();
+let oneOfSelected = $state(oneOf?.[0]?.title);
 const dispatch = createEventDispatcher();
 function getResourceTypesFromFormat(format) {
     if (format?.startsWith('resource-')) {
@@ -189,44 +189,13 @@ let customObjectSelected = $state(format?.startsWith('jsonschema-') ? 'json-sche
 		{#if oneOfSelected && oneOf}
 			{@const idx = oneOf.findIndex((obj) => obj.title === oneOfSelected)}
 			<EditableSchemaDrawer
-				bind:schema={
-					() => {
-						if (oneOf?.[idx]) {
-							let properties = Object.fromEntries(
-								Object.entries(oneOf[idx].properties ?? {}).filter(
-									([k]) => k !== 'label' && k !== 'kind'
-								)
-							)
-							return {
-								...oneOf[idx],
-								properties: properties,
-								order: Object.keys(properties),
-								required: oneOf[idx].required ?? []
-							}
-						}
-					},
-					(v) => {
-						if (oneOf?.[idx]) {
-							const tagKey = oneOf?.find((o) => Object.keys(o.properties ?? {}).includes('kind'))
-								? 'kind'
-								: 'label'
-							oneOf[idx] = {
-								...(v ?? {}),
-								type: 'object',
-								properties: {
-									...(v?.properties ?? {}),
-									[tagKey]: {
-										type: 'string',
-										enum: [v?.title ?? '']
-									}
-								}
-							}
-						}
-					}
-				}
-				on:change={() => {
-					dispatch('schemaChange')
+				onClose={() => {
+					onDrawerClose?.()
 				}}
+				bind:schema={oneOf[idx]}
+				hiddenArgs={[
+					oneOf?.find((o) => Object.keys(o.properties ?? {}).includes('kind')) ? 'kind' : 'label'
+				]}
 			/>
 		{/if}
 	{:else if type === 'object' && format !== 'resource-s3_object' && !isDynSelect}
@@ -289,7 +258,6 @@ let customObjectSelected = $state(format?.startsWith('jsonschema-') ? 'json-sche
 										properties = v.properties
 										order = v.order
 										requiredProperty = v.required
-										dispatch('schemaChange')
 									}
 								}
 							/>
@@ -312,7 +280,7 @@ let customObjectSelected = $state(format?.startsWith('jsonschema-') ? 'json-sche
 					</TabContent>
 
 					<TabContent value="resource">
-						<ObjectTypeNarrowing on:change={() => dispatch('schemaChange')} bind:format />
+						<ObjectTypeNarrowing bind:format />
 					</TabContent>
 				</div>
 			{/snippet}

package/package/components/schema/FlowPropertyEditor.svelte.d.ts

@@ -28,6 +28,7 @@ interface Props {
     order?: string[] | undefined;
     requiredProperty?: string[] | undefined;
     displayWebhookWarning?: boolean;
+    onDrawerClose?: () => void;
 }
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
@@ -43,7 +44,6 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     z_$$bindings?: Bindings;
 }
 declare const FlowPropertyEditor: $$__sveltets_2_IsomorphicComponent<Props, {
-    schemaChange: CustomEvent<any>;
     requiredChange: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;

package/package/components/schema/SchemaFormDND.svelte

@@ -3,7 +3,8 @@ import { dragHandle } from '@windmill-labs/svelte-dnd-action';
 import SchemaForm from '../SchemaForm.svelte';
 import { GripVertical } from 'lucide-svelte';
 import { deepEqual } from 'fast-equals';
-let { dndType = undefined, schema = $bindable(), args = $bindable(undefined), prettifyHeader = false, onlyMaskPassword = false, disablePortal = false, disabled = false, hiddenArgs = [], nestedParent = undefined, disableDnd = false, shouldDispatchChanges = false, helperScript = undefined, diff = {}, nestedClasses = '', isValid = $bindable(true), noVariablePicker = false } = $props();
+import { generateRandomString } from '../../utils';
+let { schema = $bindable(), args = $bindable(undefined), prettifyHeader = false, onlyMaskPassword = false, disablePortal = false, disabled = false, hiddenArgs = [], nestedParent = undefined, disableDnd = false, shouldDispatchChanges = false, helperScript = undefined, diff = {}, nestedClasses = '', isValid = $bindable(true), noVariablePicker = false, className = '', dndType = generateRandomString() } = $props();
 $effect.pre(() => {
     if (args == undefined) {
         args = {};
@@ -12,9 +13,9 @@ $effect.pre(() => {
 const dispatch = createEventDispatcher();
 const flipDurationMs = 200;
 let items = $state(computeItems());
-let dragDisabled = $state(true);
+let dragDisabledState = $state(true);
 function computeItems() {
-    return ((schema?.order ?? Object.keys(schema?.properties ?? {}) ?? []).map((key) => ({
+    return (($state.snapshot(schema?.order) ?? Object.keys(schema?.properties ?? {}) ?? []).map((key) => ({
         id: key,
         value: key
     })) ?? []);
@@ -26,20 +27,19 @@ function updateItems() {
     }
 }
 function handleConsider(e) {
-    dragDisabled = false;
+    dragDisabledState = false;
     const { items: newItems } = e.detail;
-    items = newItems;
+    items = $state.snapshot(newItems);
 }
 function handleFinalize(e) {
     const { items: newItems } = e.detail;
-    dragDisabled = true;
-    items = newItems;
+    dragDisabledState = true;
+    items = $state.snapshot(newItems);
     const newOrder = items.map((item) => item.value);
-    // console.log('handleFinalize', newOrder, e.detail)
     dispatch('reorder', newOrder);
 }
 $effect(() => {
-    schema && dragDisabled && untrack(() => updateItems());
+    schema && dragDisabledState && untrack(() => updateItems());
 });
 </script>
 
@@ -67,6 +67,7 @@ $effect(() => {
 	{disablePortal}
 	{disabled}
 	{helperScript}
+	{className}
 	bind:schema
 	dndConfig={disableDnd
 		? undefined
@@ -74,7 +75,7 @@ $effect(() => {
 				items,
 				flipDurationMs,
 				dropTargetStyle: {},
-				type: dndType ?? 'top-level'
+				type: dndType
 			}}
 	{items}
 	{diff}

package/package/components/schema/SchemaFormDND.svelte.d.ts

@@ -1,8 +1,7 @@
 import type { Schema } from '../../common';
 import type { SchemaDiff } from './schemaUtils.svelte';
-import type { DynamicSelect } from '../../utils';
+import { type DynamicSelect } from '../../utils';
 interface Props {
-    dndType?: string | undefined;
     schema: Schema;
     args?: Record<string, any>;
     prettifyHeader?: boolean;
@@ -21,6 +20,8 @@ interface Props {
     isValid?: boolean;
     noVariablePicker?: boolean;
     helperScript?: DynamicSelect.HelperScript;
+    className?: string;
+    dndType?: string;
 }
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {

package/package/components/schema/editable_schema_wrapper.d.ts

@@ -8,7 +8,4 @@ export type EditableSchemaWrapperProps = {
     customUi?: {
         noAddPopover?: boolean;
     };
-    onSchemaChange?: ({ schema }: {
-        schema: Schema;
-    }) => void;
 };

package/package/components/settings/PremiumInfo.svelte

@@ -126,8 +126,13 @@ $: estimatedSeats && updateExecs();
 		</div>
 		{#if premiumInfo?.status === 'past_due'}
 			<p class="text-red-500 text-base">
-				Your last invoice is unpaid. Please update your payment method in the customer portal to
-				prevent account downgrade and the interruption of your job executions.
+				{#if premiumInfo.max_tolerated_executions === undefined || premiumInfo.usage > premiumInfo.max_tolerated_executions}
+					Your last invoice is unpaid, you cannot run any more jobs. Please update your payment
+					method in the customer portal to continue running jobs.
+				{:else}
+					Your last invoice is unpaid. Please update your payment method in the customer portal to
+					prevent the interruption of your job executions.
+				{/if}
 			</p>
 		{/if}
 	</div>

package/package/components/triggers/CaptureWrapper.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">import { workspaceStore } from '../../stores';
 import { CaptureService } from '../../gen';
 import { onDestroy, untrack } from 'svelte';
-import { isObject, sendUserToast, sleep } from '../../utils';
+import { sendUserToast, sleep } from '../../utils';
 import RouteCapture from './http/RouteCapture.svelte';
 import WebhooksCapture from './webhook/WebhooksCapture.svelte';
 import EmailTriggerCaptures from '../details/EmailTriggerCaptures.svelte';
@@ -12,7 +12,7 @@ import NatsCapture from './nats/NatsCapture.svelte';
 import MqttCapture from './mqtt/MqttCapture.svelte';
 import SqsCapture from './sqs/SqsCapture.svelte';
 import GcpCapture from './gcp/GcpCapture.svelte';
-let { isFlow, path, hasPreprocessor, canHavePreprocessor, captureType = 'webhook', data = {}, connectionInfo = $bindable(undefined), args = $bindable({}), isValid = false, triggerDeployed = false } = $props();
+let { isFlow, path, hasPreprocessor, canHavePreprocessor, captureType = 'webhook', data = {}, connectionInfo = $bindable(undefined), args = {}, isValid = false, triggerDeployed = false } = $props();
 let captureLoading = $state(false);
 let captureActive = $state(false);
 let captureConfigs = $state({});
@@ -64,7 +64,6 @@ async function getCaptureConfigs() {
     }
     return captureConfigs;
 }
-getCaptureConfigs().then((captureConfigs) => setDefaultArgs(captureConfigs));
 async function capture() {
     let i = 0;
     captureActive = true;
@@ -82,16 +81,6 @@ async function capture() {
         await sleep(1000);
     }
 }
-function setDefaultArgs(captureConfigs) {
-    if (captureType in captureConfigs) {
-        const triggerConfig = captureConfigs[captureType].trigger_config;
-        args = isObject(triggerConfig) ? triggerConfig : {};
-    }
-    else {
-        args = {};
-    }
-    ready = true;
-}
 onDestroy(() => {
     captureActive = false;
 });

package/package/components/triggers/CaptureWrapper.svelte.d.ts

@@ -37,6 +37,6 @@ declare const CaptureWrapper: $$__sveltets_2_IsomorphicComponent<Props, {
     handleCapture: (e: CustomEvent<{
         disableOnly?: boolean;
     }>) => Promise<void>;
-}, "args" | "connectionInfo">;
+}, "connectionInfo">;
 type CaptureWrapper = InstanceType<typeof CaptureWrapper>;
 export default CaptureWrapper;

package/package/components/triggers/TriggersWrapper.svelte

@@ -43,6 +43,7 @@ let { selectedTrigger, isFlow = false, initialPath, fakeInitialPath, currentPath
 		scopes={isFlow ? [`jobs:run:flows:${currentPath}`] : [`jobs:run:scripts:${currentPath}`]}
 		path={initialPath || fakeInitialPath}
 		{isFlow}
+		{hash}
 		on:email-domain
 	/>
 {:else if selectedTrigger.type === 'schedule'}

package/package/components/triggers/http/RouteEditorInner.svelte

@@ -527,7 +527,7 @@ $effect(() => {
 				{can_write}
 				bind:static_asset_config
 				showTestingBadge={isEditor}
-				isDraftOnly={trigger?.isDraft}
+				isDraftOnly={trigger ? trigger.isDraft : false}
 			/>
 
 			{#if !is_static_website}

package/package/components/triggers/nats/NatsTriggerEditorInner.svelte

@@ -36,11 +36,11 @@ let drawerLoading = $state(true);
 let showLoading = $state(false);
 let defaultValues = $state(undefined);
 let natsResourcePath = $state('');
-let subjects = $state(['']);
-let useJetstream = $state(false);
-let streamName = $state('');
-let consumerName = $state('');
 let initialConfig = undefined;
+let natsCfg = $state({
+    subjects: [],
+    use_jetstream: false
+});
 let deploymentLoading = $state(false);
 let isValid = $state(false);
 let optionTabSelected = $state('error_handler');
@@ -90,10 +90,13 @@ export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
         edit = false;
         itemKind = nis_flow ? 'flow' : 'script';
         natsResourcePath = nDefaultValues?.nats_resource_path ?? '';
-        subjects = nDefaultValues?.subjects ?? [''];
-        useJetstream = nDefaultValues?.use_jetstream ?? false;
-        streamName = useJetstream ? (nDefaultValues?.stream_name ?? '') : undefined;
-        consumerName = useJetstream ? (nDefaultValues?.consumer_name ?? '') : undefined;
+        const useJetstream = nDefaultValues?.use_jetstream ?? false;
+        natsCfg = {
+            subjects: nDefaultValues?.subjects ?? [''],
+            use_jetstream: useJetstream,
+            stream_name: useJetstream ? (nDefaultValues?.stream_name ?? '') : undefined,
+            consumer_name: useJetstream ? (nDefaultValues?.consumer_name ?? '') : undefined
+        };
         initialScriptPath = '';
         fixedScriptPath = fixedScriptPath_ ?? '';
         script_path = fixedScriptPath;
@@ -119,10 +122,13 @@ async function loadTriggerConfig(cfg) {
     is_flow = cfg?.is_flow;
     path = cfg?.path;
     natsResourcePath = cfg?.nats_resource_path;
-    streamName = cfg?.stream_name;
-    consumerName = cfg?.consumer_name;
-    subjects = cfg?.subjects || [''];
-    useJetstream = cfg?.use_jetstream || false;
+    const useJetstream = cfg?.use_jetstream || false;
+    natsCfg = {
+        subjects: cfg?.subjects || [''],
+        use_jetstream: useJetstream,
+        stream_name: useJetstream ? cfg?.stream_name || '' : undefined,
+        consumer_name: useJetstream ? cfg?.consumer_name || '' : undefined
+    };
     enabled = cfg?.enabled;
     can_write = canWrite(cfg?.path, cfg?.extra_perms, $userStore);
     error_handler_path = cfg?.error_handler_path;
@@ -150,10 +156,10 @@ function getSaveCfg() {
         is_flow,
         enabled,
         nats_resource_path: natsResourcePath,
-        stream_name: streamName,
-        consumer_name: consumerName,
-        subjects,
-        use_jetstream: useJetstream,
+        stream_name: natsCfg.stream_name,
+        consumer_name: natsCfg.consumer_name,
+        subjects: natsCfg.subjects,
+        use_jetstream: natsCfg.use_jetstream,
         error_handler_path,
         error_handler_args,
         retry
@@ -325,10 +331,7 @@ $effect(() => {
 			<NatsTriggersConfigSection
 				{path}
 				bind:natsResourcePath
-				bind:subjects
-				bind:useJetstream
-				bind:streamName
-				bind:consumerName
+				bind:natsCfg
 				on:valid-config={({ detail }) => {
 					isValid = detail
 				}}

package/package/components/triggers/nats/NatsTriggersConfigSection.svelte

@@ -5,11 +5,11 @@ import ResourcePicker from '../../ResourcePicker.svelte';
 import SchemaForm from '../../SchemaForm.svelte';
 import TestTriggerConnection from '../TestTriggerConnection.svelte';
 import TestingBadge from '../testingBadge.svelte';
-import { createEventDispatcher } from 'svelte';
+import { createEventDispatcher, untrack } from 'svelte';
 const dispatch = createEventDispatcher();
-let { defaultValues = undefined, headless = false, natsResourcePath = $bindable(), subjects = $bindable(), useJetstream = $bindable(), streamName = $bindable(), consumerName = $bindable(), path, can_write = true, showTestingBadge = false } = $props();
+let { defaultValues = undefined, headless = false, natsResourcePath = $bindable(), natsCfg = $bindable(), path, can_write = true, showTestingBadge = false } = $props();
 let otherArgsValid = $state(false);
-let globalError = $derived(!useJetstream && subjects && subjects.length > 1
+let globalError = $derived(!natsCfg.use_jetstream && natsCfg.subjects && natsCfg.subjects.length > 1
     ? 'Only one subject is supported if not using JetStream.'
     : '');
 let isConnectionValid = $derived(!!natsResourcePath);
@@ -55,37 +55,25 @@ const argsSchema = {
 $effect(() => {
     const valid = isConnectionValid &&
         otherArgsValid &&
-        !!subjects &&
-        subjects.length > 0 &&
-        subjects.every((b) => /^[a-zA-Z0-9-_.*>]+$/.test(b)) &&
+        !!natsCfg.subjects &&
+        natsCfg.subjects.length > 0 &&
+        natsCfg.subjects.every((b) => /^[a-zA-Z0-9-_.*>]+$/.test(b)) &&
         globalError === '';
     dispatch('valid-config', valid);
 });
 function setStreamAndConsumerNames() {
-    if (!streamName) {
-        streamName = `windmill_stream-${$workspaceStore}-${path.replaceAll('/', '__')}`;
+    if (!natsCfg.stream_name) {
+        natsCfg.stream_name = `windmill_stream-${$workspaceStore}-${path.replaceAll('/', '__')}`;
     }
-    if (!consumerName) {
-        consumerName = `windmill_consumer-${$workspaceStore}-${path.replaceAll('/', '__')}`;
+    if (!natsCfg.consumer_name) {
+        natsCfg.consumer_name = `windmill_consumer-${$workspaceStore}-${path.replaceAll('/', '__')}`;
     }
 }
-function setNewArgs(args) {
-    subjects = args.subjects;
-    useJetstream = args.use_jetstream;
-    streamName = args.stream_name;
-    consumerName = args.consumer_name;
-    if (args.use_jetstream) {
-        setStreamAndConsumerNames();
+$effect(() => {
+    if (natsCfg.use_jetstream) {
+        untrack(() => setStreamAndConsumerNames());
     }
-}
-function getNatsArgsCfg() {
-    return {
-        subjects,
-        use_jetstream: useJetstream,
-        stream_name: streamName,
-        consumer_name: consumerName
-    };
-}
+});
 </script>
 
 <div>
@@ -121,7 +109,7 @@ function getNatsArgsCfg() {
 				<Subsection headless={true}>
 					<SchemaForm
 						schema={argsSchema}
-						bind:args={getNatsArgsCfg, (args) => setNewArgs(args)}
+						bind:args={natsCfg}
 						bind:isValid={otherArgsValid}
 						lightHeader={true}
 						disabled={!can_write}

package/package/components/triggers/nats/NatsTriggersConfigSection.svelte.d.ts

@@ -2,10 +2,12 @@ interface Props {
     defaultValues?: Record<string, any> | undefined;
     headless?: boolean;
     natsResourcePath: string;
-    subjects: string[];
-    useJetstream: boolean;
-    streamName: string;
-    consumerName: string;
+    natsCfg: {
+        subjects: string[];
+        use_jetstream: boolean;
+        stream_name?: string;
+        consumer_name?: string;
+    };
     path: string;
     can_write?: boolean;
     showTestingBadge?: boolean;
@@ -27,6 +29,6 @@ declare const NatsTriggersConfigSection: $$__sveltets_2_IsomorphicComponent<Prop
     'valid-config': CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
-}, {}, {}, "subjects" | "natsResourcePath" | "useJetstream" | "streamName" | "consumerName">;
+}, {}, {}, "natsResourcePath" | "natsCfg">;
 type NatsTriggersConfigSection = InstanceType<typeof NatsTriggersConfigSection>;
 export default NatsTriggersConfigSection;

package/package/components/triggers/websocket/WebsocketTriggerEditorInner.svelte

@@ -331,8 +331,8 @@ $effect(() => {
 				</Label>
 			</div>
 
-			{#if !hideTarget}
-				<Section label="Runnable" class="flex flex-col gap-4">
+			<Section label={hideTarget ? 'Runnable options' : 'Runnable'} class="flex flex-col gap-4">
+				{#if !hideTarget}
 					<div>
 						<p class="text-xs mb-1 text-tertiary">
 							Pick a script or flow to be triggered<Required required={true} />
@@ -363,21 +363,21 @@ $effect(() => {
 							{/if}
 						</div>
 					</div>
+				{/if}
 
-					<Toggle
-						checked={can_return_message}
-						on:change={() => {
-							can_return_message = !can_return_message
-						}}
-						options={{
-							right: 'Send runnable result',
-							rightTooltip:
-								'Whether the runnable result should be sent as a message to the websocket server when not null.'
-						}}
-						disabled={!can_write}
-					/>
-				</Section>
-			{/if}
+				<Toggle
+					checked={can_return_message}
+					on:change={() => {
+						can_return_message = !can_return_message
+					}}
+					options={{
+						right: 'Send runnable result',
+						rightTooltip:
+							'Whether the runnable result should be sent as a message to the websocket server when not null.'
+					}}
+					disabled={!can_write}
+				/>
+			</Section>
 
 			<WebsocketEditorConfigSection
 				bind:url

package/package/hubPaths.json

@@ -11,7 +11,9 @@
 	"gitSync_9": "hub/19738/sync-script-to-git-repo-windmill",
 	"gitSync_10": "hub/19785/sync-script-to-git-repo-windmill",
 	"gitSync_11": "hub/19789/sync-script-to-git-repo-windmill",
-	"gitSync": "hub/19798/sync-script-to-git-repo-windmill",
+	"gitSync_12": "hub/19798/sync-script-to-git-repo-windmill",
+	"gitSync_13": "hub/19801/sync-script-to-git-repo-windmill",
+	"gitSync": "hub/19803/sync-script-to-git-repo-windmill",
 	"gitSyncTest_0": "hub/9073/git-repo-test-read-write-windmill",
 	"gitSyncTest_1": "hub/11499/git-repo-test-read-write-windmill",
 	"gitSyncTest_2": "hub/11667/git-repo-test-read-write-windmill",

package/package/script_helpers.d.ts

@@ -2,10 +2,10 @@ import { type Script } from './gen';
 import type { SupportedLanguage } from './common';
 export declare const TS_PREPROCESSOR_SCRIPT_INTRO = "/**\n * Trigger preprocessor\n *\n * \u26A0\uFE0F This function runs BEFORE the main function.\n *\n * It processes raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email)\n * before passing it to `main`. This separates the trigger logic from the main logic and keeps the auto-generated runnable UI clean.\n *\n * The returned object defines the parameter values passed to `main()`.\n * e.g., { b: 1, a: 2 } \u2192 Calls `main(2, 1)`, assuming `main` is defined as `main(a: number, b: number)`.\n * Ensure that the parameter names in `main` match the keys in the returned object.\n * \n * Learn more: https://www.windmill.dev/docs/core_concepts/preprocessors\n */\n";
 export declare const TS_PREPROCESSOR_FLOW_INTRO = "/**\n * Trigger preprocessor\n *\n * It processes raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email) \n * before passing it to the flow. This separates the trigger logic from the flow logic and keeps the auto-generated UI clean.\n * \n * The returned object determines the parameter values passed to the flow.\n * e.g., `{ b: 1, a: 2 }` \u2192 Calls the flow with `a = 2` and `b = 1`, assuming the flow has two inputs called `a` and `b`.\n * Ensure that the input names of the flow match the keys in the returned object.\n * \n * Learn more: https://www.windmill.dev/docs/core_concepts/preprocessors\n */\n";
-export declare const TS_PREPROCESSOR_MODULE_CODE = "export async function preprocessor(\n  event:\n    | {\n      kind: \"webhook\";\n      body: any;\n      raw_string: string | null;\n      query: Record<string, string>;\n      headers: Record<string, string>;\n    }\n    | {\n      kind: \"http\";\n      body: any;\n      raw_string: string | null;\n      route: string;\n      path: string;\n      method: string;\n      params: Record<string, string>;\n      query: Record<string, string>;\n      headers: Record<string, string>;\n    }\n    | {\n      kind: \"email\";\n      parsed_email: any;\n      raw_email: string;\n    }\n    | { kind: \"websocket\"; msg: string; url: string }\n    | {\n      kind: \"kafka\";\n      payload: string;\n      brokers: string[];\n      topic: string;\n      group_id: string;\n    }\n    | {\n      kind: \"nats\";\n      payload: string;\n      servers: string[];\n      subject: string;\n      headers?: Record<string, string[]>;\n      status?: number;\n      description?: string;\n      length: number;\n    }\n    | {\n      kind: \"sqs\";\n      msg: string;\n      queue_url: string;\n      message_id?: string;\n      receipt_handle?: string;\n      attributes: Record<string, string>;\n      message_attributes?: Record<\n        string,\n        { string_value?: string; data_type: string }\n      >;\n    }\n    | {\n      kind: \"mqtt\";\n      payload: string;\n      topic: string;\n      retain: boolean;\n      pkid: number;\n      qos: number;\n      v5?: {\n        payload_format_indicator?: number;\n        topic_alias?: number;\n        response_topic?: string;\n        correlation_data?: Array<number>;\n        user_properties?: Array<[string, string]>;\n        subscription_identifiers?: Array<number>;\n        content_type?: string;\n      };\n    }\n    | {\n      kind: \"gcp\";\n      payload: string;\n      message_id: string;\n      subscription: string;\n      ordering_key?: string;\n      attributes?: Record<string, string>;\n      delivery_type: \"push\" | \"pull\";\n      headers?: Record<string, string>;\n      publish_time?: string;\n      ack_id?: string;\n    }\n    | {\n      kind: \"postgres\";\n      transaction_type: \"insert\" | \"update\" | \"delete\",\n      schema_name: string,\n      table_name: string,\n      old_row?: Record<string, any>,\n      row: Record<string, any>\n    }\n) {\n  return {\n    // return the args to be passed to the runnable\n  };\n}\n";
+export declare const TS_PREPROCESSOR_MODULE_CODE = "export async function preprocessor(\n  event:\n    | {\n      kind: \"webhook\";\n      body: any;\n      raw_string: string | null;\n      query: Record<string, string>;\n      headers: Record<string, string>;\n    }\n    | {\n      kind: \"http\";\n      body: any;\n      raw_string: string | null;\n      route: string;\n      path: string;\n      method: string;\n      params: Record<string, string>;\n      query: Record<string, string>;\n      headers: Record<string, string>;\n    }\n    | {\n      kind: \"email\";\n      parsed_email: any;\n      raw_email: string;\n      email_extra_args?: Record<string, string>;\n    }\n    | { kind: \"websocket\"; msg: string; url: string }\n    | {\n      kind: \"kafka\";\n      payload: string;\n      brokers: string[];\n      topic: string;\n      group_id: string;\n    }\n    | {\n      kind: \"nats\";\n      payload: string;\n      servers: string[];\n      subject: string;\n      headers?: Record<string, string[]>;\n      status?: number;\n      description?: string;\n      length: number;\n    }\n    | {\n      kind: \"sqs\";\n      msg: string;\n      queue_url: string;\n      message_id?: string;\n      receipt_handle?: string;\n      attributes: Record<string, string>;\n      message_attributes?: Record<\n        string,\n        { string_value?: string; data_type: string }\n      >;\n    }\n    | {\n      kind: \"mqtt\";\n      payload: string;\n      topic: string;\n      retain: boolean;\n      pkid: number;\n      qos: number;\n      v5?: {\n        payload_format_indicator?: number;\n        topic_alias?: number;\n        response_topic?: string;\n        correlation_data?: Array<number>;\n        user_properties?: Array<[string, string]>;\n        subscription_identifiers?: Array<number>;\n        content_type?: string;\n      };\n    }\n    | {\n      kind: \"gcp\";\n      payload: string;\n      message_id: string;\n      subscription: string;\n      ordering_key?: string;\n      attributes?: Record<string, string>;\n      delivery_type: \"push\" | \"pull\";\n      headers?: Record<string, string>;\n      publish_time?: string;\n      ack_id?: string;\n    }\n    | {\n      kind: \"postgres\";\n      transaction_type: \"insert\" | \"update\" | \"delete\",\n      schema_name: string,\n      table_name: string,\n      old_row?: Record<string, any>,\n      row: Record<string, any>\n    }\n) {\n  return {\n    // return the args to be passed to the runnable\n  };\n}\n";
 export declare const PYTHON_PREPROCESSOR_SCRIPT_INTRO = "# Trigger preprocessor\n#\n# \u26A0\uFE0F This function runs BEFORE the main function.\n#\n# It processes raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email) \n# before passing it to `main`. This separates the trigger logic from the main logic and keeps the auto-generated UI clean.\n#\n# The returned object defines the parameter values passed to `main()`.\n# e.g., { b: 1, a: 2 } \u2192 Calls `main(2, 1)`, assuming `main` is defined as `main(a: int, b: int)`.\n# Ensure that the parameter names in `main` match the keys in the returned object.\n#\n# Learn more: https://www.windmill.dev/docs/core_concepts/preprocessors\n\n";
 export declare const PYTHON_PREPROCESSOR_FLOW_INTRO = "# Trigger preprocessor\n#\n# It processes raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email) \n# before passing it to the flow. This separates the trigger logic from the flow logic and keeps the auto-generated UI clean.\n# \n# The returned object determines the parameter values passed to the flow.\n# e.g., `{ b: 1, a: 2 }` \u2192 Calls the flow with `a = 2` and `b = 1`, assuming the flow has two inputs called `a` and `b`.\n# Ensure that the input names of the flow match the keys in the returned object.\n#\n# Learn more: https://www.windmill.dev/docs/core_concepts/preprocessors\n\n";
-export declare const PYTHON_PREPROCESSOR_MODULE_CODE = "from typing import TypedDict, Literal, Optional, Union\n\n\nclass WebhookEvent(TypedDict):\n    kind: Literal[\"webhook\"]\n    body: dict\n    raw_string: Optional[str]\n    query: dict[str, str]\n    headers: dict[str, str]\n\n\nclass HttpEvent(TypedDict):\n    kind: Literal[\"http\"]\n    body: dict\n    raw_string: Optional[str]\n    route: str\n    path: str\n    method: str\n    params: dict[str, str]\n    query: dict[str, str]\n    headers: dict[str, str]\n\n\nclass EmailEvent(TypedDict):\n    kind: Literal[\"email\"]\n    parsed_email: dict\n    raw_email: str\n\n\nclass WebsocketEvent(TypedDict):\n    kind: Literal[\"websocket\"]\n    msg: str\n    url: str\n\n\nclass KafkaEvent(TypedDict):\n    kind: Literal[\"kafka\"]\n    payload: str\n    brokers: list[str]\n    topic: str\n    group_id: str\n\n\nclass NatsEvent(TypedDict):\n    kind: Literal[\"nats\"]\n    payload: str\n    servers: list[str]\n    subject: str\n    headers: Optional[dict[str, list[str]]]\n    status: Optional[int]\n    description: Optional[str]\n    length: int\n\n\nclass MessageAttribute(TypedDict):\n    string_value: Optional[str]\n    data_type: str\n\n\nclass SqsEvent(TypedDict):\n    kind: Literal[\"sqs\"]\n    msg: str\n    queue_url: str\n    message_id: Optional[str]\n    receipt_handle: Optional[str]\n    attributes: dict[str, str]\n    message_attributes: Optional[dict[str, MessageAttribute]]\n\n\nclass MqttV5Properties(TypedDict, total=False):\n    payload_format_indicator: Optional[int]\n    topic_alias: Optional[int]\n    response_topic: Optional[str]\n    correlation_data: Optional[list[int]]\n    user_properties: Optional[list[tuple[str, str]]]\n    subscription_identifiers: Optional[list[int]]\n    content_type: Optional[str]\n\n\nclass MqttEvent(TypedDict):\n    kind: Literal[\"mqtt\"]\n    payload: str\n    topic: str\n    retain: bool\n    pkid: int\n    qos: int\n    v5: Optional[MqttV5Properties]\n\n\nclass GcpEvent(TypedDict):\n    kind: Literal[\"gcp\"]\n    payload: str\n    message_id: str\n    subscription: str\n    ordering_key: Optional[str]\n    attributes: Optional[dict[str, str]]\n    delivery_type: Literal[\"push\", \"pull\"]\n    headers: Optional[dict[str, str]]\n    publish_time: Optional[str]\n    ack_id: Optional[str]\n\n\nclass PostgresEvent(TypedDict):\n    kind: Literal[\"postgres\"]\n    transaction_type: Literal[\"insert\", \"update\", \"delete\"]\n    schema_name: str\n    table_name: str\n    old_row: Optional[dict[str, any]]\n    row: dict[str, any]\n\n\nEvent = Union[\n    WebhookEvent,\n    HttpEvent,\n    EmailEvent,\n    WebsocketEvent,\n    KafkaEvent,\n    NatsEvent,\n    SqsEvent,\n    MqttEvent,\n    GcpEvent,\n    PostgresEvent,\n]\n\n\ndef preprocessor(event: Event):\n    return {\n        # return the args to be passed to the runnable\n    }\n";
+export declare const PYTHON_PREPROCESSOR_MODULE_CODE = "from typing import TypedDict, Literal, Optional, Union\n\n\nclass WebhookEvent(TypedDict):\n    kind: Literal[\"webhook\"]\n    body: dict\n    raw_string: Optional[str]\n    query: dict[str, str]\n    headers: dict[str, str]\n\n\nclass HttpEvent(TypedDict):\n    kind: Literal[\"http\"]\n    body: dict\n    raw_string: Optional[str]\n    route: str\n    path: str\n    method: str\n    params: dict[str, str]\n    query: dict[str, str]\n    headers: dict[str, str]\n\n\nclass EmailEvent(TypedDict):\n    kind: Literal[\"email\"]\n    parsed_email: dict\n    raw_email: str\n    email_extra_args: Optional[dict[str, str]]\n\n\nclass WebsocketEvent(TypedDict):\n    kind: Literal[\"websocket\"]\n    msg: str\n    url: str\n\n\nclass KafkaEvent(TypedDict):\n    kind: Literal[\"kafka\"]\n    payload: str\n    brokers: list[str]\n    topic: str\n    group_id: str\n\n\nclass NatsEvent(TypedDict):\n    kind: Literal[\"nats\"]\n    payload: str\n    servers: list[str]\n    subject: str\n    headers: Optional[dict[str, list[str]]]\n    status: Optional[int]\n    description: Optional[str]\n    length: int\n\n\nclass MessageAttribute(TypedDict):\n    string_value: Optional[str]\n    data_type: str\n\n\nclass SqsEvent(TypedDict):\n    kind: Literal[\"sqs\"]\n    msg: str\n    queue_url: str\n    message_id: Optional[str]\n    receipt_handle: Optional[str]\n    attributes: dict[str, str]\n    message_attributes: Optional[dict[str, MessageAttribute]]\n\n\nclass MqttV5Properties(TypedDict, total=False):\n    payload_format_indicator: Optional[int]\n    topic_alias: Optional[int]\n    response_topic: Optional[str]\n    correlation_data: Optional[list[int]]\n    user_properties: Optional[list[tuple[str, str]]]\n    subscription_identifiers: Optional[list[int]]\n    content_type: Optional[str]\n\n\nclass MqttEvent(TypedDict):\n    kind: Literal[\"mqtt\"]\n    payload: str\n    topic: str\n    retain: bool\n    pkid: int\n    qos: int\n    v5: Optional[MqttV5Properties]\n\n\nclass GcpEvent(TypedDict):\n    kind: Literal[\"gcp\"]\n    payload: str\n    message_id: str\n    subscription: str\n    ordering_key: Optional[str]\n    attributes: Optional[dict[str, str]]\n    delivery_type: Literal[\"push\", \"pull\"]\n    headers: Optional[dict[str, str]]\n    publish_time: Optional[str]\n    ack_id: Optional[str]\n\n\nclass PostgresEvent(TypedDict):\n    kind: Literal[\"postgres\"]\n    transaction_type: Literal[\"insert\", \"update\", \"delete\"]\n    schema_name: str\n    table_name: str\n    old_row: Optional[dict[str, any]]\n    row: dict[str, any]\n\n\nEvent = Union[\n    WebhookEvent,\n    HttpEvent,\n    EmailEvent,\n    WebsocketEvent,\n    KafkaEvent,\n    NatsEvent,\n    SqsEvent,\n    MqttEvent,\n    GcpEvent,\n    PostgresEvent,\n]\n\n\ndef preprocessor(event: Event):\n    return {\n        # return the args to be passed to the runnable\n    }\n";
 export declare const INITIAL_CODE: {
     bun: {
         scriptInitCodeBlock: string;