windmill-components 1.35.42 → 1.36.0

package/script_helpers.js

@@ -46,16 +46,60 @@ export async function main(
   return { foo: a };
 }
 `;
+export const GO_INIT_CODE = `import (
+	"fmt"
+	"rsc.io/quote"
+)
+
+func main(x string) (interface{}, error) {
+	fmt.Println("Hello, World")
+	fmt.Println(quote.Opt())
+  return x, nil
+}
+`;
+export const GO_FAILURE_MODULE_CODE = `import (
+	"fmt"
+  "os"
+)
+
+// connect the error parameter to 'previous_result.error'
+
+func main(error string) (interface{}, error) {
+	fmt.Println(error)
+	fmt.Println("job", os.Getenv("WM_JOB_ID"))
+  return x, nil
+}
+`;
 export const DENO_INIT_CODE_CLEAR = `// import * as wmill from "https://deno.land/x/windmill@v${__pkg__.version}/mod.ts"
 
-export async function main() {
-  return
+export async function main(x: string) {
+  return x
+}
+`;
+export const DENO_FAILURE_MODULE_CODE = `
+// connect the error parameter to 'previous_result.error'
+
+export async function main(error: string) {
+  const job = Deno.env.get("WM_JOB_ID")
+  console.log("error", error)
+  console.log("job", job)
+  return { error, job }
 }
 `;
 export const PYTHON_INIT_CODE_CLEAR = `#import wmill
 
-def main():
-  return
+def main(x: str):
+  return x
+`;
+export const PYTHON_FAILURE_MODULE_CODE = `import os
+
+# connect the error parameter to 'previous_result.error'
+
+def main(error: str):
+  job = os.environ.get("WM_JOB_ID")
+  print("error", error)
+  print("job", job)
+  return error, job
 `;
 export const POSTGRES_INIT_CODE = `import {
   pgSql,
@@ -79,41 +123,69 @@ export async function main() {
 
     // A common trigger script would follow this pattern:
     // 1. Get the last saved state
-    // const state = wmill.getInternalState()
+    // const state = await wmill.getInternalState()
     // 2. Get the actual state from the external service
     // const newState = await (await fetch('https://hacker-news.firebaseio.com/v0/topstories.json')).json()
     // 3. Compare the two states and update the internal state
-    // wmill.setInternalState(newState)
+    // await wmill.setInternalState(newState)
     // 4. Return the new rows
     // return range from (state to newState)
 
-	return [1,2,3]
+    return [1,2,3]
 
     // In subsequent scripts, you may refer to each row/value returned by the trigger script using
     // 'flow_input._value'
 }
 `;
-export function initialCode(language, type) {
+const ALL_INITIAL_CODE = [PYTHON_INIT_CODE, DENO_INIT_CODE, POSTGRES_INIT_CODE, DENO_INIT_CODE_TRIGGER, DENO_INIT_CODE_CLEAR, PYTHON_INIT_CODE_CLEAR];
+export function isInitialCode(content) {
+    for (const code of ALL_INITIAL_CODE) {
+        if (content === code) {
+            return true;
+        }
+    }
+    return false;
+}
+export function initialCode(language, kind, subkind) {
     if (language === 'deno') {
-        if (type === 'trigger') {
+        if (kind === 'trigger') {
             return DENO_INIT_CODE_TRIGGER;
         }
-        else if (type === 'flow') {
-            return DENO_INIT_CODE_CLEAR;
-        }
-        else if (type === 'pgsql') {
-            return POSTGRES_INIT_CODE;
+        else if (kind === 'script') {
+            if (subkind === 'flow') {
+                return DENO_INIT_CODE_CLEAR;
+            }
+            else if (subkind === 'failure') {
+                return DENO_FAILURE_MODULE_CODE;
+            }
+            else if (subkind === 'pgsql') {
+                return POSTGRES_INIT_CODE;
+            }
+            else {
+                return DENO_INIT_CODE;
+            }
         }
         else {
             return DENO_INIT_CODE;
         }
     }
-    else {
-        if (type === 'flow') {
+    else if (language === 'python3') {
+        if (subkind === 'flow') {
             return PYTHON_INIT_CODE_CLEAR;
         }
+        else if (subkind === 'failure') {
+            return PYTHON_FAILURE_MODULE_CODE;
+        }
         else {
             return PYTHON_INIT_CODE;
         }
     }
+    else {
+        if (subkind === 'failure') {
+            return GO_FAILURE_MODULE_CODE;
+        }
+        else {
+            return GO_INIT_CODE;
+        }
+    }
 }

package/stores.d.ts

@@ -17,7 +17,7 @@ export declare const hubScripts: import("svelte/store").Writable<{
     path: string;
     summary: string;
     approved: boolean;
-    is_trigger: boolean;
+    kind: string;
     app: string;
 }[] | undefined>;
 export declare function clearStores(): void;

package/utils.d.ts

@@ -1,4 +1,4 @@
-import { type Flow, type FlowModule, type User } from './gen';
+import { Script, type Flow, type FlowModule, type User } from './gen';
 import type { Schema } from './common';
 import { type UserExt } from './stores';
 export declare function validateUsername(username: string): string;
@@ -18,7 +18,7 @@ export declare type DropdownType = 'action' | 'delete';
 export interface DropdownItem {
     displayName: string;
     eventName?: string;
-    action?: (() => Promise<void>) | (() => void);
+    action?: ((event?: MouseEvent) => Promise<void>) | ((event?: MouseEvent) => void);
     href?: string;
     separatorTop?: boolean;
     separatorBottom?: boolean;
@@ -73,7 +73,7 @@ export declare function setInputCat(type: string | undefined, format: string | u
 export declare function scriptPathToHref(path: string): string;
 export declare function getScriptByPath(path: string): Promise<{
     content: string;
-    language: 'deno' | 'python3';
+    language: 'deno' | 'python3' | 'go';
 }>;
 export declare function loadHubScripts(): Promise<void>;
 export declare function loadHubFlows(): Promise<{
@@ -83,8 +83,10 @@ export declare function loadHubFlows(): Promise<{
     apps: string[];
     approved: boolean;
     votes: number;
-}[]>;
+}[] | undefined>;
 export declare function formatCron(inp: string): string;
 export declare function flowToHubUrl(flow: Flow): URL;
-export declare function scriptToHubUrl(content: string, summary: string, description: string, trigger: boolean): URL;
-export declare function classNames(...classes: string[]): string;
+export declare function scriptToHubUrl(content: string, summary: string, description: string, kind: Script.kind): URL;
+export declare function classNames(...classes: Array<string | undefined>): string;
+export declare function scriptLangToEditorLang(lang: Script.language): 'typescript' | 'python' | 'go';
+export declare function copyToClipboard(value: string, sendToast?: boolean): Promise<boolean>;

package/utils.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { goto } from '$app/navigation';
-import { FlowService, ScriptService } from './gen';
+import { FlowService, Script, ScriptService } from './gen';
 import { toast } from '@zerodevx/svelte-toast';
 import { get } from 'svelte/store';
 import { hubScripts, workspaceStore } from './stores';
@@ -39,8 +39,11 @@ export function displayDaysAgo(dateString) {
         if (dAgo == 0) {
             return `yday at ${date.toLocaleTimeString()}`;
         }
+        else if (dAgo > 7) {
+            return `${dAgo + 1} days ago at ${date.toLocaleTimeString()}`;
+        }
         else {
-            return `${dAgo + 1} days ago`;
+            return displayDate(dateString);
         }
     }
 }
@@ -422,25 +425,35 @@ export async function getScriptByPath(path) {
     }
 }
 export async function loadHubScripts() {
-    const scripts = (await ScriptService.listHubScripts()).asks ?? [];
-    const processed = scripts
-        .map((x) => ({
-        path: `hub/${x.id}/${x.app}/${x.summary.toLowerCase().replaceAll(/\s+/g, '_')}`,
-        summary: `${x.summary} (${x.app}) ${x.views} uses`,
-        approved: x.approved,
-        is_trigger: x.is_trigger,
-        app: x.app,
-        views: x.views,
-        votes: x.votes,
-        ask_id: x.ask_id
-    }))
-        .sort((a, b) => b.views - a.views);
-    hubScripts.set(processed);
+    try {
+        const scripts = (await ScriptService.listHubScripts()).asks ?? [];
+        const processed = scripts
+            .map((x) => ({
+            path: `hub/${x.id}/${x.app}/${x.summary.toLowerCase().replaceAll(/\s+/g, '_')}`,
+            summary: `${x.summary} (${x.app}) ${x.views} uses`,
+            approved: x.approved,
+            kind: x.kind,
+            app: x.app,
+            views: x.views,
+            votes: x.votes,
+            ask_id: x.ask_id
+        }))
+            .sort((a, b) => b.views - a.views);
+        hubScripts.set(processed);
+    }
+    catch {
+        console.error('Hub is not available');
+    }
 }
 export async function loadHubFlows() {
-    const flows = (await FlowService.listHubFlows()).flows ?? [];
-    const processed = flows.sort((a, b) => b.votes - a.votes);
-    return processed;
+    try {
+        const flows = (await FlowService.listHubFlows()).flows ?? [];
+        const processed = flows.sort((a, b) => b.votes - a.votes);
+        return processed;
+    }
+    catch {
+        console.error('Hub is not available');
+    }
 }
 export function formatCron(inp) {
     // Allow for cron expressions inputted by the user to omit month and year
@@ -464,14 +477,37 @@ export function flowToHubUrl(flow) {
     url.searchParams.append('flow', encodeState(openFlow));
     return url;
 }
-export function scriptToHubUrl(content, summary, description, trigger) {
+export function scriptToHubUrl(content, summary, description, kind) {
     const url = new URL('https://hub.windmill.dev/scripts/add');
     url.searchParams.append('content', content);
     url.searchParams.append('summary', summary);
     url.searchParams.append('description', description);
-    url.searchParams.append('trigger', trigger.toString());
+    url.searchParams.append('kind', kind);
     return url;
 }
 export function classNames(...classes) {
     return classes.filter(Boolean).join(' ');
 }
+export function scriptLangToEditorLang(lang) {
+    if (lang == 'deno') {
+        return 'typescript';
+    }
+    else if (lang == 'python3') {
+        return 'python';
+    }
+    else {
+        return lang;
+    }
+}
+export async function copyToClipboard(value, sendToast = true) {
+    let success = false;
+    if (navigator?.clipboard) {
+        success = await navigator.clipboard
+            .writeText(value)
+            .then(() => true)
+            .catch(() => false);
+    }
+    sendToast &&
+        sendUserToast(success ? 'Copied to clipboard!' : "Couldn't copy to clipboard", !success);
+    return success;
+}

package/components/FlowEditor.svelte

@@ -1,55 +0,0 @@
-<script>import { ScheduleService } from '../gen';
-import { workspaceStore } from '../stores';
-import FlowSettings from './flows/FlowSettings.svelte';
-import { flowStateStore } from './flows/flowState';
-import { flowStore } from './flows/flowStore';
-import FlowTimeline from './flows/FlowTimeline.svelte';
-export let pathError = '';
-export let initialPath = '';
-export let scheduleArgs = {};
-export let scheduleEnabled = false;
-export let scheduleCron = '0 */5 * * *';
-export let previewArgs = {};
-let scheduleLoaded = false;
-async function loadSchedule() {
-    if (!scheduleLoaded) {
-        scheduleLoaded = true;
-        const existsSchedule = await ScheduleService.existsSchedule({
-            workspace: $workspaceStore ?? '',
-            path: initialPath
-        });
-        if (existsSchedule) {
-            const schedule = await ScheduleService.getSchedule({
-                workspace: $workspaceStore ?? '',
-                path: initialPath
-            });
-            scheduleEnabled = schedule.enabled;
-            scheduleCron = schedule.schedule;
-            scheduleArgs = schedule.args ?? {};
-            previewArgs = JSON.parse(JSON.stringify(scheduleArgs));
-        }
-    }
-}
-$: if ($flowStore && $workspaceStore && initialPath != '') {
-    loadSchedule();
-}
-</script>
-
-{#if $flowStateStore}
-	<div class="flex space-y-8 flex-col items-center">
-		<FlowTimeline bind:args={previewArgs} bind:flowModuleSchemas={$flowStateStore}>
-			<div slot="settings">
-				<FlowSettings
-					bind:pathError
-					bind:initialPath
-					bind:scheduleArgs
-					{previewArgs}
-					bind:scheduleCron
-					bind:scheduleEnabled
-				/>
-			</div>
-		</FlowTimeline>
-	</div>
-{:else}
-	<h3>Loading flow</h3>
-{/if}

package/components/FlowPreview.svelte

@@ -1,107 +0,0 @@
-<script>import { sendUserToast, truncateRev } from '../utils';
-import { faChevronDown, faChevronUp } from '@fortawesome/free-solid-svg-icons';
-import Icon from 'svelte-awesome';
-import { flowStateStore, flowStateToFlow } from './flows/flowState';
-import { mapJobResultsToFlowState } from './flows/flowStateUtils';
-import { runFlowPreview } from './flows/utils';
-import FlowStatusViewer from './FlowStatusViewer.svelte';
-import RunForm from './RunForm.svelte';
-import Tab from './common/tabs/Tab.svelte';
-import TabContent from './common/tabs/TabContent.svelte';
-import Tabs from './common/tabs/Tabs.svelte';
-export let i;
-export let flow;
-export let schema;
-export let args = {};
-let stepArgs = {};
-let tab = 'upto';
-let viewPreview = false;
-let uptoText = i >= flow.value.modules.length - 1 ? 'Preview whole flow' : 'Preview up to this step';
-let jobId;
-export async function runPreview(args) {
-    viewPreview = true;
-    flow = flowStateToFlow($flowStateStore, flow);
-    let newFlow = tab == 'upto' ? truncateFlow(flow) : setInputTransformFromArgs(extractStep(flow), args);
-    jobId = await runFlowPreview(args, newFlow);
-    sendUserToast(`started preview ${truncateRev(jobId, 10)}`);
-}
-function truncateFlow(flow) {
-    const localFlow = JSON.parse(JSON.stringify(flow));
-    localFlow.value.modules = flow.value.modules.slice(0, i + 1);
-    return localFlow;
-}
-function extractStep(flow) {
-    const localFlow = JSON.parse(JSON.stringify(flow));
-    localFlow.value.modules = flow.value.modules.slice(i, i + 1);
-    localFlow.schema = schema;
-    return localFlow;
-}
-function setInputTransformFromArgs(flow, args) {
-    let input_transforms = {};
-    Object.entries(args).forEach(([key, value]) => {
-        input_transforms[key] = {
-            type: 'static',
-            value: value
-        };
-    });
-    flow.value.modules[0].input_transforms = input_transforms;
-    return flow;
-}
-</script>
-
-<button
-	class="w-full rounded border-1 border border-gray-200"
-	on:click={() => {
-		viewPreview = !viewPreview
-	}}
->
-	<h2 class="flex justify-center text-gray-600">
-		<div>
-			Preview
-			<Icon class="ml-1" data={viewPreview ? faChevronUp : faChevronDown} scale={1} />
-		</div>
-	</h2>
-</button>
-
-{#if viewPreview}
-	{#if i != flow.value.modules.length}
-		<div class="mt-2">
-			<Tabs bind:selected={tab}>
-				<Tab value="upto">{uptoText}</Tab>
-				<Tab value="justthis">Preview just this step</Tab>
-				<svelte:fragment slot="content">
-					<TabContent value="upto">
-						<RunForm
-							runnable={truncateFlow(flow)}
-							runAction={(_, args) => runPreview(args)}
-							schedulable={false}
-							buttonText={uptoText}
-							detailed={false}
-							bind:args
-						/>
-					</TabContent>
-					<TabContent value="justthis">
-						<RunForm
-							runnable={extractStep(flow)}
-							runAction={(_, args) => runPreview(args)}
-							schedulable={false}
-							buttonText="Preview just this step"
-							detailed={false}
-							args={stepArgs}
-						/>
-					</TabContent>
-				</svelte:fragment>
-			</Tabs>
-		</div>
-	{/if}
-
-	{#if jobId}
-		<div class="w-full flex justify-center">
-			<FlowStatusViewer
-				{jobId}
-				on:jobsLoaded={(e) => mapJobResultsToFlowState(e.detail, tab, i)}
-				root={true}
-			/>
-		</div>
-	{/if}
-{/if}

package/components/FlowPreview.svelte.d.ts

@@ -1,23 +0,0 @@
-import { SvelteComponentTyped } from "svelte";
-import type { Schema } from '../common';
-import type { Flow } from '../gen';
-declare const __propDef: {
-    props: {
-        i: number;
-        flow: Flow;
-        schema: Schema;
-        args?: Record<string, any> | undefined;
-        runPreview?: ((args: any) => Promise<void>) | undefined;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-};
-export declare type FlowPreviewProps = typeof __propDef.props;
-export declare type FlowPreviewEvents = typeof __propDef.events;
-export declare type FlowPreviewSlots = typeof __propDef.slots;
-export default class FlowPreview extends SvelteComponentTyped<FlowPreviewProps, FlowPreviewEvents, FlowPreviewSlots> {
-    get runPreview(): (args: any) => Promise<void>;
-}
-export {};

package/components/ModuleStep.svelte

@@ -1,131 +0,0 @@
-<script>import { RawScript } from '../gen';
-import { faChevronDown, faChevronUp } from '@fortawesome/free-solid-svg-icons';
-import Icon from 'svelte-awesome';
-import Editor from './Editor.svelte';
-import EditorBar from './EditorBar.svelte';
-import FlowPreview from './FlowPreview.svelte';
-import FlowBox from './flows/FlowBox.svelte';
-import FlowInputs from './flows/FlowInputs.svelte';
-import FlowModuleHeader from './flows/FlowModuleHeader.svelte';
-import { flowStore } from './flows/flowStore';
-import { createInlineScriptModule, createLoop, fork, loadFlowModuleSchema, pickScript, createScriptFromInlineScript, isEmptyFlowModule, getStepPropPicker } from './flows/flowStateUtils';
-import SchemaForm from './SchemaForm.svelte';
-import { flowStateStore } from './flows/flowState';
-import { stepOpened } from './flows/stepOpenedStore';
-export let indexes;
-export let mod;
-export let args = {};
-export let schema;
-export let childFlowModules = undefined;
-let editor;
-let websocketAlive = { pyright: false, black: false, deno: false };
-let bigEditor = false;
-const i = indexes[0];
-$: shouldPick = isEmptyFlowModule(mod);
-$: stepPropPicker = getStepPropPicker(indexes, $flowStore.schema, $flowStateStore, args);
-async function apply(fn, arg) {
-    const flowModuleSchema = await fn(arg);
-    mod = flowModuleSchema.flowModule;
-    schema = flowModuleSchema.schema;
-    if (flowModuleSchema.childFlowModules) {
-        childFlowModules = flowModuleSchema.childFlowModules;
-    }
-}
-async function reload(flowModule) {
-    apply(loadFlowModuleSchema, flowModule);
-}
-async function applyCreateLoop() {
-    await apply(createLoop, null);
-    stepOpened.update(() => `${indexes[0]}-0`);
-}
-$: opened = $stepOpened === String(indexes.join('-'));
-</script>
-
-<FlowBox
-	headerClickable={true}
-	on:clickheader={() => ($stepOpened = !opened ? String(indexes.join('-')) : undefined)}
->
-	<svelte:fragment slot="header">
-		<FlowModuleHeader
-			bind:mod
-			bind:indexes
-			on:delete
-			on:fork={() => apply(fork, mod)}
-			on:createScriptFromInlineScript={() => {
-				apply(createScriptFromInlineScript, {
-					flowModule: mod,
-					suffix: indexes.join('-'),
-					schema
-				})
-			}}
-		/>
-	</svelte:fragment>
-
-	<div slot="content">
-		{#if opened}
-			<div class="p-6 border-t border-gray-300">
-				{#if shouldPick}
-					<FlowInputs
-						shouldDisableTriggerScripts={i != 0}
-						shouldDisableLoopCreation={indexes.length > 1 || i == 0}
-						on:pick={(e) => apply(pickScript, e.detail.path)}
-						on:new={(e) =>
-							apply(createInlineScriptModule, {
-								language: e.detail.language,
-								type: e.detail.type
-							})}
-						on:loop={() => applyCreateLoop()}
-					/>
-				{/if}
-				{#if mod.value.type === 'rawscript'}
-					<div class="mb-2 overflow-hidden">
-						<EditorBar {editor} {websocketAlive} lang={mod.value.language ?? 'deno'} />
-					</div>
-					<div on:mouseleave={() => reload(mod)}>
-						<Editor
-							bind:websocketAlive
-							bind:this={editor}
-							class="{bigEditor ? 'h-2/3' : 'h-80'} border p-2 rounded"
-							bind:code={mod.value.content}
-							deno={mod.value.language === RawScript.language.DENO}
-							automaticLayout={true}
-							formatAction={() => reload(mod)}
-						/>
-						<button
-							class="w-full text-center"
-							on:click={() => {
-								bigEditor = !bigEditor
-							}}
-						>
-							<Icon data={bigEditor ? faChevronUp : faChevronDown} scale={1.0} />
-						</button>
-					</div>
-					<div class="mt-2 mb-8">
-						<p class="text-gray-500 italic">
-							Move the focus outside of the text editor to recompute the input schema or press
-							Ctrl/Cmd+S
-						</p>
-					</div>
-				{/if}
-				{#if !shouldPick}
-					<p class="text-lg font-bold text-gray-900 mb-2">Step inputs</p>
-					<SchemaForm
-						{schema}
-						inputTransform={true}
-						importPath={String(indexes.join('-'))}
-						bind:pickableProperties={stepPropPicker.pickableProperties}
-						bind:args={mod.input_transforms}
-						bind:extraLib={stepPropPicker.extraLib}
-					/>
-				{/if}
-
-				{#if !shouldPick}
-					<div class="border-b border-gray-200" />
-					<div class="pt-2">
-						<FlowPreview bind:args flow={$flowStore} {i} {schema} />
-					</div>
-				{/if}
-			</div>
-		{/if}
-	</div>
-</FlowBox>

package/components/ModuleStep.svelte.d.ts

@@ -1,25 +0,0 @@
-import { SvelteComponentTyped } from "svelte";
-import { type FlowModule } from '../gen';
-import type { Schema } from '../common';
-import { type FlowModuleSchema } from './flows/flowState';
-declare const __propDef: {
-    props: {
-        indexes: number[];
-        mod: FlowModule;
-        args?: Record<string, any> | undefined;
-        schema: Schema;
-        childFlowModules?: FlowModuleSchema[] | undefined;
-    };
-    events: {
-        delete: CustomEvent<any>;
-    } & {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-};
-export declare type ModuleStepProps = typeof __propDef.props;
-export declare type ModuleStepEvents = typeof __propDef.events;
-export declare type ModuleStepSlots = typeof __propDef.slots;
-export default class ModuleStep extends SvelteComponentTyped<ModuleStepProps, ModuleStepEvents, ModuleStepSlots> {
-}
-export {};

package/components/flows/CopyFirstStepSchema.svelte

@@ -1,13 +0,0 @@
-<script>import { Button } from 'flowbite-svelte';
-import { isCopyFirstStepSchemaDisabled } from './flowState';
-import { copyFirstStepSchema } from './flowStore';
-</script>
-
-<Button
-	color="light"
-	size="xs"
-	disabled={$isCopyFirstStepSchemaDisabled}
-	on:click={copyFirstStepSchema}
->
-	Copy from first step schema
-</Button>

package/components/flows/FlowBox.svelte

@@ -1,16 +0,0 @@
-<script>import { createEventDispatcher } from 'svelte';
-import FlowBoxHeader from './FlowBoxHeader.svelte';
-export let title = undefined;
-export let headerClickable = false;
-const dispatch = createEventDispatcher();
-let slots = $$props.$$slots;
-</script>
-
-<div class="bg-white border border-gray-300 rounded-md shadow-md">
-	<FlowBoxHeader clickable={headerClickable} on:click={() => dispatch('clickheader')} {title}>
-		<slot name="header" />
-	</FlowBoxHeader>
-	{#if slots.content}
-		<slot name="content" />
-	{/if}
-</div>