windmill-components 1.383.8 → 1.383.9

package/package/components/DiffEditor.svelte

@@ -42,8 +42,12 @@ async function loadDiffEditor() {
     if (defaultOriginal !== undefined &&
         defaultModified !== undefined &&
         defaultLang !== undefined) {
+        console.log('SETUP');
         setupModel(defaultLang, defaultOriginal, defaultModified, defaultModifiedLang);
     }
+    else {
+        console.log('NO SETUP', defaultOriginal, defaultModified, defaultLang);
+    }
 }
 export function setupModel(lang, original, modified, modifiedLang) {
     diffEditor?.setModel({
@@ -58,18 +62,22 @@ export function setupModel(lang, original, modified, modifiedLang) {
     }
 }
 export function setOriginal(code) {
+    console.log('setOriginal', code);
     diffEditor?.getModel()?.original?.setValue(code);
+    defaultOriginal = code;
 }
 export function getOriginal() {
     return diffEditor?.getModel()?.original.getValue() ?? '';
 }
 export function setModified(code) {
     diffEditor?.getModel()?.modified?.setValue(code);
+    defaultModified = code;
 }
 export function getModified() {
     return diffEditor?.getModel()?.modified.getValue() ?? '';
 }
 export function show() {
+    console.log('show');
     open = true;
 }
 export function hide() {

package/package/components/Editor.svelte

@@ -1,20 +1,117 @@
 <!-- <script lang="ts"></script> -->
 
+<script context="module">
+	import '@codingame/monaco-vscode-standalone-languages'
+	import '@codingame/monaco-vscode-standalone-typescript-language-features'
+
+	import processStdContent from '../process.d.ts.txt?raw'
+	import windmillFetchContent from '../windmill_fetch.d.ts.txt?raw'
+
+	languages.typescript.typescriptDefaults.addExtraLib(processStdContent, 'process.d.ts')
+
+	// languages.typescript.javascriptDefaults.setModeConfiguration({
+	// 	completionItems: true,
+	// 	hovers: true,
+	// 	documentSymbols: true,
+	// 	definitions: true,
+	// 	references: true,
+	// 	documentHighlights: true,
+	// 	rename: true,
+	// 	diagnostics: true,
+	// 	documentRangeFormattingEdits: true,
+	// 	signatureHelp: true,
+	// 	onTypeFormattingEdits: true,
+	// 	codeActions: true,
+	// 	inlayHints: true
+	// })
+
+	languages.typescript.typescriptDefaults.setModeConfiguration({
+		completionItems: true,
+		hovers: true,
+		documentSymbols: true,
+		definitions: true,
+		references: true,
+		documentHighlights: true,
+		rename: true,
+		diagnostics: true,
+		documentRangeFormattingEdits: true,
+		signatureHelp: true,
+		onTypeFormattingEdits: true,
+		codeActions: true,
+		inlayHints: true
+	})
+
+	// languages.typescript.javascriptDefaults.setEagerModelSync(true)
+	languages.typescript.typescriptDefaults.setEagerModelSync(true)
+
+	// languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+	// 	noSemanticValidation: false,
+	// 	noSyntaxValidation: false,
+	// 	noSuggestionDiagnostics: false,
+	// 	diagnosticCodesToIgnore: [1108]
+	// })
+
+	languages.typescript.typescriptDefaults.setDiagnosticsOptions({
+		noSemanticValidation: false,
+		noSyntaxValidation: false,
+		noSuggestionDiagnostics: false,
+		diagnosticCodesToIgnore: [1108]
+	})
+
+	languages.typescript.typescriptDefaults.setCompilerOptions({
+		target: languages.typescript.ScriptTarget.Latest,
+		allowNonTsExtensions: true,
+		noSemanticValidation: false,
+		noSyntaxValidation: false,
+		completionItems: true,
+		hovers: true,
+		documentSymbols: true,
+		definitions: true,
+		references: true,
+		documentHighlights: true,
+		rename: true,
+		diagnostics: true,
+		documentRangeFormattingEdits: true,
+		signatureHelp: true,
+		onTypeFormattingEdits: true,
+		codeActions: true,
+		inlayHints: true,
+		checkJs: true,
+		allowJs: true,
+		noUnusedLocals: true,
+		strict: true,
+		noLib: false,
+		allowImportingTsExtensions: true,
+		moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
+	})
+
+	// languages.typescript.javascriptDefaults.setCompilerOptions({
+	// 	target: languages.typescript.ScriptTarget.Latest,
+	// 	allowNonTsExtensions: true,
+	// 	noSemanticValidation: false,
+	// 	noSyntaxValidation: false,
+	// 	allowImportingTsExtensions: true,
+	// 	checkJs: true,
+	// 	allowJs: true,
+	// 	noUnusedParameters: true,
+	// 	noUnusedLocals: true,
+	// 	strict: true,
+	// 	noLib: true,
+	// 	moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
+	// })
+</script>
+
 <script>import { BROWSER } from 'esm-env';
 import { sendUserToast } from '../toast';
 import { createEventDispatcher, onDestroy, onMount } from 'svelte';
-import libStdContent from '../es6.d.ts.txt?raw';
-import domContent from '../dom.d.ts.txt?raw';
-import denoFetchContent from '../deno_fetch.d.ts.txt?raw';
-import '@codingame/monaco-vscode-standalone-languages';
-import '@codingame/monaco-vscode-standalone-typescript-language-features';
+// import libStdContent from '../es6.d.ts.txt?raw'
+// import domContent from '../dom.d.ts.txt?raw'
+// import denoFetchContent from '../deno_fetch.d.ts.txt?raw'
 import * as vscode from 'vscode';
 // import '@codingame/monaco-vscode-typescript-basics-default-extension'
 // import '@codingame/monaco-vscode-typescript-language-features-default-extension'
 // import 'vscode/localExtensionHost'
-import processStdContent from '../process.d.ts.txt?raw';
-import windmillFetchContent from '../windmill_fetch.d.ts.txt?raw';
-import { MonacoLanguageClient } from '@windmill-labs/monaco-languageclient';
+import { MonacoLanguageClient } from 'monaco-languageclient';
 import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
 import { CloseAction, ErrorAction, RequestType } from 'vscode-languageclient';
 import { MonacoBinding } from 'y-monaco';
@@ -24,7 +121,7 @@ import { buildWorkerDefinition } from './build_workers';
 import { workspaceStore } from '../stores';
 import { UserService } from '../gen';
 import { initializeVscode } from './vscode';
-// import { initializeMode } from 'monaco-graphql/esm/initializeMode.js'
+import { initializeMode } from 'monaco-graphql/esm/initializeMode.js';
 import { sleep } from '../utils';
 import { editorCodeCompletion } from './copilot/completion';
 import { editor as meditor, languages, KeyCode, KeyMod, Uri as mUri } from 'monaco-editor';
@@ -88,7 +185,6 @@ const uri = lang != 'go' && lang != 'typescript' && lang != 'python'
     : `file:///tmp/monaco/${randomHash()}.${langToExt(lang)}`;
 console.log('uri', uri);
 buildWorkerDefinition('../../../workers', import.meta.url, false);
-// buildWorkerDefinition()
 export function getCode() {
     return editor?.getValue() ?? '';
 }
@@ -281,13 +377,13 @@ function addDBSchemaCompletions() {
         return;
     }
     if (schemaLang === 'graphql') {
-        // graphqlService ||= initializeMode()
-        // graphqlService?.setSchemaConfig([
-        // 	{
-        // 		uri: 'my-schema.graphql',
-        // 		introspectionJSON: schema
-        // 	}
-        // ])
+        graphqlService ||= initializeMode();
+        graphqlService?.setSchemaConfig([
+            {
+                uri: 'my-schema.graphql',
+                introspectionJSON: schema
+            }
+        ]);
     }
     else {
         if (sqlSchemaCompletor) {
@@ -772,93 +868,6 @@ async function loadMonaco() {
     // console.log('bef ready')
     // console.log('af ready')
     initialized = true;
-    await import('@codingame/monaco-vscode-standalone-languages');
-    await import('@codingame/monaco-vscode-standalone-typescript-language-features');
-    languages.typescript.typescriptDefaults.addExtraLib(processStdContent, 'process.d.ts');
-    languages.typescript.javascriptDefaults.setModeConfiguration({
-        completionItems: true,
-        hovers: true,
-        documentSymbols: true,
-        definitions: true,
-        references: true,
-        documentHighlights: true,
-        rename: true,
-        diagnostics: true,
-        documentRangeFormattingEdits: true,
-        signatureHelp: true,
-        onTypeFormattingEdits: true,
-        codeActions: true,
-        inlayHints: true
-    });
-    languages.typescript.typescriptDefaults.setModeConfiguration({
-        completionItems: true,
-        hovers: true,
-        documentSymbols: true,
-        definitions: true,
-        references: true,
-        documentHighlights: true,
-        rename: true,
-        diagnostics: true,
-        documentRangeFormattingEdits: true,
-        signatureHelp: true,
-        onTypeFormattingEdits: true,
-        codeActions: true,
-        inlayHints: true
-    });
-    languages.typescript.javascriptDefaults.setEagerModelSync(true);
-    languages.typescript.typescriptDefaults.setEagerModelSync(true);
-    languages.typescript.javascriptDefaults.setDiagnosticsOptions({
-        noSemanticValidation: false,
-        noSyntaxValidation: false,
-        noSuggestionDiagnostics: false,
-        diagnosticCodesToIgnore: [1108]
-    });
-    languages.typescript.typescriptDefaults.setDiagnosticsOptions({
-        noSemanticValidation: false,
-        noSyntaxValidation: false,
-        noSuggestionDiagnostics: false,
-        diagnosticCodesToIgnore: [1108]
-    });
-    languages.typescript.typescriptDefaults.setCompilerOptions({
-        target: languages.typescript.ScriptTarget.Latest,
-        allowNonTsExtensions: true,
-        noSemanticValidation: false,
-        noSyntaxValidation: false,
-        completionItems: true,
-        hovers: true,
-        documentSymbols: true,
-        definitions: true,
-        references: true,
-        documentHighlights: true,
-        rename: true,
-        diagnostics: true,
-        documentRangeFormattingEdits: true,
-        signatureHelp: true,
-        onTypeFormattingEdits: true,
-        codeActions: true,
-        inlayHints: true,
-        checkJs: true,
-        allowJs: true,
-        noUnusedLocals: true,
-        strict: true,
-        noLib: false,
-        allowImportingTsExtensions: true,
-        moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
-    });
-    languages.typescript.javascriptDefaults.setCompilerOptions({
-        target: languages.typescript.ScriptTarget.Latest,
-        allowNonTsExtensions: true,
-        noSemanticValidation: false,
-        noSyntaxValidation: false,
-        allowImportingTsExtensions: true,
-        checkJs: true,
-        allowJs: true,
-        noUnusedParameters: true,
-        noUnusedLocals: true,
-        strict: true,
-        noLib: true,
-        moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
-    });
     try {
         model = meditor.createModel(code, lang, mUri.parse(uri));
     }
@@ -879,21 +888,6 @@ async function loadMonaco() {
         tabSize: lang == 'python' ? 4 : 2,
         folding
     });
-    // const wrapper = new MonacoEditorLanguageClientWrapper()
-    // const userConfig: UserConfig = {
-    // 	wrapperConfig: {
-    // 		editorAppConfig: {
-    // 			$type: 'classic',
-    // 			codeResources: {
-    // 				main: {
-    // 					text: 'console.log("FOO")")',
-    // 					uri: '/workspace/hello.ts'
-    // 				}
-    // 			}
-    // 		}
-    // 	}
-    // }
-    // await wrapper.initAndStart(userConfig, divEl)
     let timeoutModel = undefined;
     let ataModel = undefined;
     editor?.onDidChangeModelContent((event) => {
@@ -957,15 +951,15 @@ async function loadMonaco() {
 async function setTypescriptExtraLibs() {
     if (lang === 'typescript' && scriptLang != 'deno') {
         const hostname = getHostname();
-        const stdLib = { content: libStdContent, filePath: 'es6.d.ts' };
+        // const stdLib = { content: libStdContent, filePath: 'es6.d.ts' }
         if (scriptLang == 'bun' || scriptLang == 'bunnative') {
-            const processLib = { content: processStdContent, filePath: 'process.d.ts' };
-            const domLib = { content: domContent, filePath: 'dom.d.ts' };
-            languages.typescript.typescriptDefaults.setExtraLibs([stdLib, domLib, processLib]);
+            // const processLib = { content: processStdContent, filePath: 'process.d.ts' }
+            // const domLib = { content: domContent, filePath: 'dom.d.ts' }
+            // languages.typescript.typescriptDefaults.setExtraLibs([stdLib, domLib, processLib])
         }
         else {
-            const denoFetch = { content: denoFetchContent, filePath: 'deno_fetch.d.ts' };
-            languages.typescript.typescriptDefaults.setExtraLibs([stdLib, denoFetch]);
+            // const denoFetch = { content: denoFetchContent, filePath: 'deno_fetch.d.ts' }
+            // languages.typescript.typescriptDefaults.setExtraLibs([stdLib, denoFetch])
             let localContent = windmillFetchContent;
             let p = '/tmp/monaco/windmill.d.ts';
             let nuri = mUri.parse(p);

package/package/components/ScriptEditor.svelte

@@ -281,6 +281,7 @@ function collabUrl() {
 						class="h-full"
 						bind:this={diffEditor}
 						automaticLayout
+						defaultLang={scriptLangToEditorLang(lang)}
 						{fixedOverflowWidgets}
 					/>
 				{/key}

package/package/components/SimpleEditor.svelte

@@ -1,23 +1,39 @@
 <script context="module">
 	let cssClassesLoaded = writable(false)
 	let tailwindClassesLoaded = writable(false)
+
+	import '@codingame/monaco-vscode-standalone-languages'
+	import '@codingame/monaco-vscode-standalone-json-language-features'
+	import '@codingame/monaco-vscode-standalone-css-language-features'
+	import '@codingame/monaco-vscode-standalone-typescript-language-features'
+
+	languages.typescript.javascriptDefaults.setCompilerOptions({
+		target: languages.typescript.ScriptTarget.Latest,
+		allowNonTsExtensions: true,
+		noSemanticValidation: false,
+		noLib: true,
+		moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
+	})
+	languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+		noSemanticValidation: false,
+		noSyntaxValidation: false,
+		noSuggestionDiagnostics: false,
+		diagnosticCodesToIgnore: [1108]
+	})
+	languages.json.jsonDefaults.setDiagnosticsOptions({
+		validate: true,
+		allowComments: false,
+		schemas: [],
+		enableSchemaRequest: true
+	})
 </script>
 
 <script>import { BROWSER } from 'esm-env';
 import { createHash, editorConfig, langToExt, updateOptions } from '../editorUtils';
 import { editor as meditor, KeyCode, KeyMod, Uri as mUri, languages } from 'monaco-editor';
-// import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution'
-// import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution'
-// import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'
-// import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'
-// import 'monaco-editor/esm/vs/language/typescript/monaco.contribution'
-// import 'monaco-editor/esm/vs/language/json/monaco.contribution'
-// import 'monaco-editor/esm/vs/basic-languages/css/css.contribution'
-// import 'monaco-editor/esm/vs/language/css/monaco.contribution'
 import '@codingame/monaco-vscode-standalone-languages';
 import '@codingame/monaco-vscode-standalone-json-language-features';
 import '@codingame/monaco-vscode-standalone-css-language-features';
-// import '@codingame/monaco-vscode-standalone-yaml-language-features'
 import '@codingame/monaco-vscode-standalone-typescript-language-features';
 import { allClasses } from './apps/editor/componentsPanel/cssUtils';
 import { createEventDispatcher, onDestroy, onMount } from 'svelte';
@@ -48,13 +64,7 @@ export let domLib = false;
 export let autofocus = false;
 const dispatch = createEventDispatcher();
 const uri = `file:///${hash}.${langToExt(lang)}`;
-buildWorkerDefinition();
-// monaco.languages.register({
-// 	id: 'json',
-// 	extensions: ['.json', '.jsonc'],
-// 	aliases: ['JSON', 'json'],
-// 	mimetypes: ['application/json']
-// })
+buildWorkerDefinition('../../../workers', import.meta.url);
 export function getCode() {
     return editor?.getValue() ?? '';
 }
@@ -118,25 +128,28 @@ $: disableTabCond?.set(!code && !!suggestion);
 async function loadMonaco() {
     await initializeVscode();
     initialized = true;
-    // languages.typescript.javascriptDefaults.setCompilerOptions({
-    // 	target: languages.typescript.ScriptTarget.Latest,
-    // 	allowNonTsExtensions: true,
-    // 	noSemanticValidation: false,
-    // 	noLib: true,
-    // 	moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
-    // })
-    // languages.typescript.javascriptDefaults.setDiagnosticsOptions({
-    // 	noSemanticValidation: false,
-    // 	noSyntaxValidation: false,
-    // 	noSuggestionDiagnostics: false,
-    // 	diagnosticCodesToIgnore: [1108]
-    // })
-    // languages.json.jsonDefaults.setDiagnosticsOptions({
-    // 	validate: true,
-    // 	allowComments: false,
-    // 	schemas: [],
-    // 	enableSchemaRequest: true
-    // })
+    // if (lang === 'javascript') {
+    // 	languages.typescript.javascriptDefaults.setCompilerOptions({
+    // 		target: languages.typescript.ScriptTarget.Latest,
+    // 		allowNonTsExtensions: true,
+    // 		noSemanticValidation: false,
+    // 		noLib: true,
+    // 		moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
+    // 	})
+    // 	languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+    // 		noSemanticValidation: false,
+    // 		noSyntaxValidation: false,
+    // 		noSuggestionDiagnostics: false,
+    // 		diagnosticCodesToIgnore: [1108]
+    // 	})
+    // } else if (lang === 'json') {
+    // 	languages.json.jsonDefaults.setDiagnosticsOptions({
+    // 		validate: true,
+    // 		allowComments: false,
+    // 		schemas: [],
+    // 		enableSchemaRequest: true
+    // 	})
+    // }
     try {
         model = meditor.createModel(code, lang, mUri.parse(uri));
     }

package/package/components/SimpleEditor.svelte.d.ts

@@ -1,4 +1,8 @@
 import { SvelteComponent } from "svelte";
+import '@codingame/monaco-vscode-standalone-languages';
+import '@codingame/monaco-vscode-standalone-json-language-features';
+import '@codingame/monaco-vscode-standalone-css-language-features';
+import '@codingame/monaco-vscode-standalone-typescript-language-features';
 import { editor as meditor } from 'monaco-editor';
 import '@codingame/monaco-vscode-standalone-languages';
 import '@codingame/monaco-vscode-standalone-json-language-features';

package/package/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte

@@ -332,6 +332,7 @@ async function inferSuggestions(code) {
 					class="h-full"
 					automaticLayout
 					fixedOverflowWidgets
+					defaultLang={scriptLangToEditorLang(inlineScript?.language)}
 				/>
 			{/if}
 		</div>

package/package/components/apps/editor/settingsPanel/inputEditor/JsonEditor.svelte

@@ -1,4 +1,5 @@
-<script>import SimpleEditor from '../../../../SimpleEditor.svelte';
+<script>import '@codingame/monaco-vscode-standalone-json-language-features';
+import SimpleEditor from '../../../../SimpleEditor.svelte';
 export let code;
 export let value = undefined;
 export let error = '';

package/package/components/apps/editor/settingsPanel/inputEditor/JsonEditor.svelte.d.ts

@@ -1,4 +1,5 @@
 import { SvelteComponent } from "svelte";
+import '@codingame/monaco-vscode-standalone-json-language-features';
 import SimpleEditor from '../../../../SimpleEditor.svelte';
 declare const __propDef: {
     props: {

package/package/components/build_workers.d.ts

@@ -1 +1 @@
-export declare function buildWorkerDefinition(...args: any[]): void;
+export declare function buildWorkerDefinition(workerPath: string, basePath: string, ...args: any[]): void;

package/package/components/build_workers.js

@@ -1,125 +1,10 @@
-// inline to make it a library component easy to be imported until this if fixed: https://github.com/vitejs/vite/pull/16418
-// import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker&inline'
-// import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker&inline'
-// import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker&inline'
-// import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker&inline'
-// import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker&inline'
-// import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'
-// import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
-// import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
-// import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
-// import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
-// import type { Environment } from 'monaco-editor/esm/vs/editor/editor.api.js'
-// interface MonacoEnvironmentEnhanced extends Environment {
-// 	workerOverrideGlobals: WorkerOverrideGlobals
-// }
-// type WorkerOverrideGlobals = {
-// 	basePath: string
-// 	workerPath: string
-// 	workerOptions: WorkerOptions
-// }
-// export function buildWorkerDefinition(
-// 	workerPath: string,
-// 	basePath: string,
-// 	useModuleWorker: boolean
-// ) {
-// 	const monWin = self as Window
-// 	const workerOverrideGlobals: WorkerOverrideGlobals = {
-// 		basePath: basePath,
-// 		workerPath: workerPath,
-// 		workerOptions: {
-// 			type: useModuleWorker ? 'module' : 'classic'
-// 		}
-// 	}
-// 	if (!monWin.MonacoEnvironment) {
-// 		monWin.MonacoEnvironment = {
-// 			workerOverrideGlobals: workerOverrideGlobals,
-// 			createTrustedTypesPolicy: (_policyName: string) => {
-// 				return undefined
-// 			}
-// 		} as MonacoEnvironmentEnhanced
-// 	}
-// 	const monEnv = monWin.MonacoEnvironment as MonacoEnvironmentEnhanced
-// 	monEnv.workerOverrideGlobals = workerOverrideGlobals
-// 	const getWorker = (_: string, label: string) => {
-// 		console.log('getWorker: workerId: ' + _ + ' label: ' + label)
-// 		switch (label) {
-// 			case 'template':
-// 			case 'typescript':
-// 			case 'javascript':
-// 				return new tsWorker()
-// 			case 'html':
-// 			case 'handlebars':
-// 			case 'razor':
-// 				return new htmlWorker()
-// 			case 'css':
-// 			case 'scss':
-// 			case 'less':
-// 				return new cssWorker()
-// 			case 'json':
-// 				return new jsonWorker()
-// 			case 'graphql':
-// 				const workerFilename = `graphql.worker.bundle.js`
-// 				const workerPathLocal = `${workerOverrideGlobals.workerPath}/${workerFilename}`
-// 				const workerUrl = new URL(workerPathLocal, workerOverrideGlobals.basePath)
-// 				return new Worker(workerUrl.href, {
-// 					name: label
-// 				})
-// 			default:
-// 				return new editorWorker()
-// 		}
-// 	}
-// 	monWin.MonacoEnvironment.getWorker = getWorker
-// }
-// //
-// export type WorkerLoader = () => Worker
-// const workerLoaders: Partial<Record<string, WorkerLoader>> = {
-// 	editorWorkerService: () =>
-// 		new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url), {
-// 			type: 'module'
-// 		}),
-// 	textMateWorker: () =>
-// 		new Worker(
-// 			new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url),
-// 			{ type: 'module' }
-// 		),
-// 	languageDetectionWorkerService: () =>
-// 		new Worker(
-// 			new URL(
-// 				'@codingame/monaco-vscode-language-detection-worker-service-override/worker',
-// 				import.meta.url
-// 			),
-// 			{ type: 'module' }
-// 		)
-// }
-// export function registerWorkerLoader(label: string, workerLoader: WorkerLoader): void {
-// 	workerLoaders[label] = workerLoader
-// }
-// export function buildWorkerDefinition() {
-// 	// Do not use monaco-editor-webpack-plugin because it doesn't handle properly cross origin workers
-// 	window.MonacoEnvironment = {
-// 		getWorker: function (moduleId, label) {
-// 			console.log('LOAD')
-// 			const workerFactory = workerLoaders[label]
-// 			if (workerFactory != null) {
-// 				return workerFactory()
-// 			}
-// 			throw new Error(`Unimplemented worker ${label} (${moduleId})`)
-// 		}
-// 	}
-// }
-// import { graphql } from 'graphql'
-import { useWorkerFactory } from '@windmill-labs/monaco-editor-wrapper/workerFactory';
-import cssWorker from '@windmill-labs/monaco-editor-wrapper/workers/module/css?worker';
-import htmlWorker from '@windmill-labs/monaco-editor-wrapper/workers/module/html?worker';
-import tsWorker from '@windmill-labs/monaco-editor-wrapper/workers/module/ts?worker';
-import jsonWorker from '@windmill-labs/monaco-editor-wrapper/workers/module/json?worker';
-import editorWorker from '@windmill-labs/monaco-editor-wrapper/workers/module/editor?worker';
-// import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
-// import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
-// import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
-// import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
-export function buildWorkerDefinition(...args) {
+import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
+import cssWorker from 'monaco-editor-wrapper/workers/module/css?worker';
+import htmlWorker from 'monaco-editor-wrapper/workers/module/html?worker';
+import tsWorker from 'monaco-editor-wrapper/workers/module/ts?worker';
+import jsonWorker from 'monaco-editor-wrapper/workers/module/json?worker';
+import editorWorker from 'monaco-editor-wrapper/workers/module/editor?worker';
+export function buildWorkerDefinition(workerPath, basePath, ...args) {
     useWorkerFactory({
         ignoreMapping: true,
         workerLoaders: {
@@ -146,6 +31,15 @@ export function buildWorkerDefinition(...args) {
             css: () => {
                 console.log('html');
                 return new cssWorker();
+            },
+            graphql: () => {
+                console.log('graphql');
+                const workerFilename = `graphql.worker.bundle.js`;
+                const workerPathLocal = `${workerPath}/${workerFilename}`;
+                const workerUrl = new URL(workerPathLocal, basePath);
+                return new Worker(workerUrl.href, {
+                    name: 'graphql'
+                });
             }
         }
     });

package/package/components/flows/content/FlowModuleComponent.svelte

@@ -288,6 +288,7 @@ function setFlowInput(argName) {
 										bind:this={diffEditor}
 										automaticLayout
 										fixedOverflowWidgets
+										defaultLang={scriptLangToEditorLang(flowModule.value.language)}
 										class="h-full"
 									/>
 								{/key}

package/package/components/vscode.js

@@ -1,4 +1,4 @@
-import { initServices } from '@windmill-labs/monaco-languageclient/vscode/services';
+import { initServices } from 'monaco-languageclient/vscode/services';
 // import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override'
 // import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override'
 import getMonarchServiceOverride from '@codingame/monaco-vscode-monarch-service-override';

package/package/scripts.d.ts

@@ -1,6 +1,6 @@
 import type { Schema, SupportedLanguage } from './common';
 import { type Script } from './gen';
-export declare function scriptLangToEditorLang(lang: Script['language'] | 'bunnative' | undefined): "go" | "powershell" | "graphql" | "php" | "sql" | "typescript" | "python" | "shell";
+export declare function scriptLangToEditorLang(lang: Script['language'] | 'bunnative' | 'frontend' | undefined): "go" | "powershell" | "graphql" | "php" | "sql" | "typescript" | "python" | "shell";
 export type ScriptSchedule = {
     summary: string | undefined;
     args: Record<string, any>;

package/package/scripts.js

@@ -6,7 +6,7 @@ export function scriptLangToEditorLang(lang) {
     if (lang == 'deno') {
         return 'typescript';
     }
-    else if (lang == 'bun' || lang == 'bunnative') {
+    else if (lang == 'bun' || lang == 'bunnative' || lang == 'frontend') {
         return 'typescript';
     }
     else if (lang == 'nativets') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.383.8",
+	"version": "1.383.9",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -73,6 +73,9 @@
 		"@rgossiaux/svelte-headlessui": {
 			"svelte": "$svelte"
 		},
+		"monaco-graphql": {
+			"monaco-editor": "$monaco-editor"
+		},
 		"svelte-chartjs": {
 			"svelte": "$svelte"
 		}
@@ -116,9 +119,9 @@
 		"lucide-svelte": "^0.293.0",
 		"minimatch": "^10.0.1",
 		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.2",
-		"@windmill-labs/monaco-editor-wrapper": "^5.5.2",
+		"monaco-editor-wrapper": "^5.5.2",
 		"monaco-graphql": "^1.6.0",
-		"@windmill-labs/monaco-languageclient": "~8.8.2",
+		"monaco-languageclient": "~8.8.2",
 		"ol": "^7.4.0",
 		"openai": "^4.47.1",
 		"p-limit": "^6.1.0",