windmill-components 1.531.0 → 1.532.0

package/package/components/schema/FlowPropertyEditor.svelte

@@ -13,6 +13,8 @@ import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte';
 import Button from '../common/button/Button.svelte';
 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);
 const dispatch = createEventDispatcher();
@@ -56,8 +58,15 @@ function renameVariant(name, selected) {
         variantName = '';
     }
 }
-let initialObjectSelected = $state(Object.keys(properties ?? {}).length == 0 ? 'resource' : 'custom-object');
+let initialObjectSelected = $state(format === 'json-schema'
+    ? 'json-schema'
+    : format?.startsWith('jsonschema-')
+        ? 'custom-object'
+        : Object.keys(properties ?? {}).length == 0
+            ? 'resource'
+            : 'custom-object');
 let isDynSelect = $derived(format?.startsWith('dynselect-') ?? false);
+let customObjectSelected = $state(format?.startsWith('jsonschema-') ? 'json-schema-resource' : 'editor');
 </script>
 
 <div class="flex flex-col gap-2">
@@ -224,33 +233,82 @@ let isDynSelect = $derived(format?.startsWith('dynselect-') ?? false);
 		<Tabs
 			bind:selected={initialObjectSelected}
 			on:selected={(e) => {
-				if (e.detail === 'custom-object') {
+				if (e.detail === 'json-schema') {
+					format = 'json-schema'
+				} else {
 					format = ''
 				}
 			}}
 		>
 			<Tab value="resource">Resource</Tab>
 			<Tab value="custom-object">Custom Object</Tab>
+			<Tab value="json-schema">
+				JSON Schema
+				<Tooltip>
+					This displays a JSON schema editor, useful when a JSON schema input is expected.
+				</Tooltip>
+			</Tab>
 			{#snippet content()}
 				<div class="pt-2">
 					<TabContent value="custom-object">
-						<EditableSchemaDrawer
-							bind:schema={
-								() => {
-									return {
-										properties: properties,
-										order: order,
-										required: requiredProperty
+						<ToggleButtonGroup
+							bind:selected={customObjectSelected}
+							class="mb-2"
+							on:selected={(e) => {
+								if (e.detail === 'editor') {
+									format = undefined
+								} else {
+									properties = undefined
+									order = undefined
+									requiredProperty = undefined
+								}
+							}}
+						>
+							{#snippet children({ item })}
+								<ToggleButton value="editor" label="Editor" {item} />
+								<ToggleButton
+									value="json-schema-resource"
+									label="JSON Schema Resource"
+									{item}
+									tooltip="Select a JSON schema resource to specify the object's properties"
+									showTooltipIcon
+								/>
+							{/snippet}
+						</ToggleButtonGroup>
+						{#if customObjectSelected === 'editor'}
+							<EditableSchemaDrawer
+								bind:schema={
+									() => {
+										return {
+											properties: properties,
+											order: order,
+											required: requiredProperty
+										}
+									},
+									(v) => {
+										properties = v.properties
+										order = v.order
+										requiredProperty = v.required
+										dispatch('schemaChange')
 									}
-								},
-								(v) => {
-									properties = v.properties
-									order = v.order
-									requiredProperty = v.required
-									dispatch('schemaChange')
 								}
-							}
-						/>
+							/>
+						{:else if customObjectSelected === 'json-schema-resource'}
+							<ResourcePicker
+								resourceType="json_schema"
+								bind:value={
+									() => {
+										if (format?.startsWith('jsonschema-')) {
+											return format.substring('jsonschema-'.length)
+										}
+										return undefined
+									},
+									(v) => {
+										format = 'jsonschema-' + v
+									}
+								}
+							/>
+						{/if}
 					</TabContent>
 
 					<TabContent value="resource">

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

@@ -46,6 +46,6 @@ declare const PropertyEditor: $$__sveltets_2_IsomorphicComponent<Props, {
     [evt: string]: CustomEvent<any>;
 }, {}, {
     focus: () => void;
-}, "description" | "title" | "properties" | "placeholder" | "pattern" | "extra" | "oneOf" | "format" | "order" | "enum_" | "contentEncoding" | "itemsType" | "customErrorMessage">;
+}, "description" | "title" | "properties" | "placeholder" | "pattern" | "extra" | "oneOf" | "format" | "order" | "enum_" | "contentEncoding" | "customErrorMessage" | "itemsType">;
 type PropertyEditor = InstanceType<typeof PropertyEditor>;
 export default PropertyEditor;

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

@@ -0,0 +1,2 @@
+export declare function getJsonSchemaFromResource(path: string, workspace: string): Promise<any>;
+export declare function clearJsonSchemaResourceCache(path: string, workspace: string): Promise<void>;

package/package/components/schema/jsonSchemaResource.svelte.js

@@ -0,0 +1,40 @@
+import { z } from 'zod';
+import { AppService } from '../../gen';
+import { sendUserToast } from '../../utils';
+let loadedJsonSchemaResources = $state({});
+const jsonSchemaResourceSchema = z.object({
+    schema: z.record(z.string(), z.any())
+});
+export async function getJsonSchemaFromResource(path, workspace) {
+    if (loadedJsonSchemaResources[workspace]?.[path]) {
+        return loadedJsonSchemaResources[workspace][path];
+    }
+    try {
+        const resourceValue = await AppService.getPublicResource({
+            path,
+            workspace
+        });
+        const parsedResource = jsonSchemaResourceSchema.safeParse(resourceValue);
+        if (parsedResource.success) {
+            const workspaceResources = loadedJsonSchemaResources[workspace];
+            if (!workspaceResources) {
+                loadedJsonSchemaResources[workspace] = {};
+            }
+            loadedJsonSchemaResources[workspace][path] = parsedResource.data.schema;
+            return parsedResource.data.schema;
+        }
+        else {
+            console.error('Invalid JSON schema resource:', parsedResource.error);
+            sendUserToast('Invalid JSON schema resource: ' + parsedResource.error, true);
+        }
+    }
+    catch (err) {
+        console.error(err);
+        sendUserToast('Could not load JSON schema resource: ' + err, true);
+    }
+}
+export async function clearJsonSchemaResourceCache(path, workspace) {
+    if (loadedJsonSchemaResources[workspace]?.[path]) {
+        delete loadedJsonSchemaResources[workspace][path];
+    }
+}

package/package/utils.d.ts

@@ -97,7 +97,7 @@ export declare function removeMarkdown(text: string): string;
 export declare function truncate(s: string, n: number, suffix?: string): string;
 export declare function truncateRev(s: string, n: number, prefix?: string): string;
 export declare function isString(value: any): value is string | String;
-export type InputCat = 'string' | 'email' | 'number' | 'boolean' | 'list' | 'resource-object' | 'enum' | 'date' | 'base64' | 'resource-string' | 'object' | 'sql' | 'yaml' | 'currency' | 'oneOf' | 'dynselect';
+export type InputCat = 'string' | 'email' | 'number' | 'boolean' | 'list' | 'resource-object' | 'enum' | 'date' | 'base64' | 'resource-string' | 'object' | 'sql' | 'yaml' | 'currency' | 'oneOf' | 'dynselect' | 'json-schema';
 export declare namespace DynamicSelect {
     type HelperScript = {
         type: 'inline';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.531.0",
+	"version": "1.532.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -78,13 +78,13 @@
 	"type": "module",
 	"dependencies": {
 		"@aws-crypto/sha256-js": "^4.0.0",
-		"@codingame/monaco-vscode-configuration-service-override": "~19.1.4",
-		"@codingame/monaco-vscode-editor-api": "~19.1.4",
-		"@codingame/monaco-vscode-standalone-css-language-features": "~19.1.4",
-		"@codingame/monaco-vscode-standalone-html-language-features": "~19.1.4",
-		"@codingame/monaco-vscode-standalone-json-language-features": "~19.1.4",
-		"@codingame/monaco-vscode-standalone-languages": "~19.1.4",
-		"@codingame/monaco-vscode-standalone-typescript-language-features": "~19.1.4",
+		"@codingame/monaco-vscode-configuration-service-override": "~20.2.1",
+		"@codingame/monaco-vscode-editor-api": "~20.2.1",
+		"@codingame/monaco-vscode-standalone-css-language-features": "~20.2.1",
+		"@codingame/monaco-vscode-standalone-html-language-features": "~20.2.1",
+		"@codingame/monaco-vscode-standalone-json-language-features": "~20.2.1",
+		"@codingame/monaco-vscode-standalone-languages": "~20.2.1",
+		"@codingame/monaco-vscode-standalone-typescript-language-features": "~20.2.1",
 		"@json2csv/plainjs": "^7.0.6",
 		"@leeoniya/ufuzzy": "^1.0.8",
 		"@popperjs/core": "^2.11.6",
@@ -117,10 +117,10 @@
 		"lru-cache": "^11.1.0",
 		"lucide-svelte": "^0.399.0",
 		"minimatch": "^10.0.1",
-		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~19.1.4",
-		"monaco-editor-wrapper": "6.10.0",
+		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~20.2.1",
+		"monaco-editor-wrapper": "6.12.0",
 		"monaco-graphql": "=1.6.0",
-		"monaco-languageclient": "9.9.0",
+		"monaco-languageclient": "9.11.0",
 		"monaco-vim": "^0.4.1",
 		"ol": "^7.4.0",
 		"openai": "^4.87.1",
@@ -137,10 +137,10 @@
 		"svelte-infinite-loading": "^1.4.0",
 		"svelte-tiny-virtual-list": "^2.0.5",
 		"tailwind-merge": "^1.13.2",
-		"vscode": "npm:@codingame/monaco-vscode-extension-api@~19.1.4",
+		"vscode": "npm:@codingame/monaco-vscode-extension-api@~20.2.1",
 		"vscode-languageclient": "~9.0.1",
 		"vscode-uri": "~3.1.0",
-		"vscode-ws-jsonrpc": "~3.4.0",
+		"vscode-ws-jsonrpc": "~3.5.0",
 		"windmill-parser-wasm-csharp": "1.510.1",
 		"windmill-parser-wasm-go": "1.510.1",
 		"windmill-parser-wasm-java": "1.510.1",