windmill-components 1.13.25 → 1.22.0

package/components/Editor.svelte

@@ -1,120 +1,97 @@
-<script>"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.reloadWebsocket = exports.setCode = exports.insertAtBeginning = exports.insertAtCursor = exports.getCode = exports.websocketAlive = exports.automaticLayout = exports.formatAction = exports.cmdEnterAction = exports.hash = exports.code = exports.lang = exports.deno = void 0;
-const stores_1 = require("$app/stores");
-const env_1 = require("$app/env");
-const svelte_1 = require("svelte");
-const editor_worker_worker_1 = __importDefault(require("monaco-editor/esm/vs/editor/editor.worker?worker"));
-const json_worker_worker_1 = __importDefault(require("monaco-editor/esm/vs/language/json/json.worker?worker"));
-const ts_worker_worker_1 = __importDefault(require("monaco-editor/esm/vs/language/typescript/ts.worker?worker"));
-const svelte_2 = require("svelte");
-const dispatch = (0, svelte_2.createEventDispatcher)();
+<script>import { browser, dev } from '$app/env';
+import { page } from '$app/stores';
+import { buildExtraLib } from '../utils';
+import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
+import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
+import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
+import { createEventDispatcher, onDestroy, onMount } from 'svelte';
+import { buildWorkerDefinition } from 'monaco-editor-workers';
 let divEl = null;
 let editor;
-exports.deno = false;
-exports.lang = exports.deno ? 'typescript' : 'python';
-exports.hash = (Math.random() + 1).toString(36).substring(2);
-exports.cmdEnterAction = undefined;
-exports.formatAction = undefined;
-exports.automaticLayout = true;
-exports.websocketAlive = { pyright: false, black: false, deno: false };
+export let deno = false;
+export let lang = deno ? 'typescript' : 'python';
+export let code = '';
+export let hash = (Math.random() + 1).toString(36).substring(2);
+export let cmdEnterAction = undefined;
+export let formatAction = undefined;
+export let automaticLayout = true;
+export let websocketAlive = { pyright: false, black: false, deno: false };
+export let extraLib = lang == 'typescript' && !deno ? buildExtraLib() : '';
+export let extraLibPath = 'file:///node_modules/@types/windmill/index.d.ts';
 let websockets = [];
 let uri = '';
 let disposeMethod;
-if (env_1.browser) {
-    // @ts-ignore
-    self.MonacoEnvironment = {
-        getWorker: function (_moduleId, label) {
-            if (label === 'json') {
-                return new json_worker_worker_1.default();
-            }
-            else if (label === 'typescript' || label === 'javascript') {
-                return new ts_worker_worker_1.default();
-            }
-            else {
-                return new editor_worker_worker_1.default();
+const dispatch = createEventDispatcher();
+if (browser) {
+    if (dev) {
+        buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers', import.meta.url, false);
+    }
+    else {
+        // @ts-ignore
+        self.MonacoEnvironment = {
+            getWorker: function (_moduleId, label) {
+                if (label === 'json') {
+                    return new jsonWorker();
+                }
+                else if (label === 'typescript' || label === 'javascript') {
+                    return new tsWorker();
+                }
+                else {
+                    return new editorWorker();
+                }
             }
-        }
-    };
+        };
+    }
 }
-function getCode() {
+export function getCode() {
     return editor?.getValue();
 }
-exports.getCode = getCode;
-function insertAtCursor(code) {
+export function insertAtCursor(code) {
     if (editor) {
         editor.trigger('keyboard', 'type', { text: code });
     }
 }
-exports.insertAtCursor = insertAtCursor;
-function insertAtBeginning(code) {
+export function insertAtBeginning(code) {
     if (editor) {
         const range = { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 };
         const op = { range: range, text: code, forceMoveMarkers: true };
         editor.executeEdits('external', [op]);
     }
 }
-exports.insertAtBeginning = insertAtBeginning;
-function setCode(ncode) {
+export function setCode(ncode) {
     if (editor) {
         return editor.setValue(ncode);
     }
     else {
-        exports.code = ncode;
+        code = ncode;
     }
 }
-exports.setCode = setCode;
 function format() {
     if (editor) {
         editor.getAction('editor.action.formatDocument').run();
-        if (exports.formatAction) {
-            (0, exports.formatAction)();
+        if (formatAction) {
+            formatAction();
         }
     }
 }
-async function reloadWebsocket() {
+export async function reloadWebsocket() {
     closeWebsockets();
-    if (exports.lang == 'python' || exports.deno) {
+    if (lang == 'python' || deno) {
         // install Monaco language client services
-        const { MonacoLanguageClient } = await Promise.resolve().then(() => __importStar(require('monaco-languageclient')));
-        const { CloseAction, ErrorAction } = await Promise.resolve().then(() => __importStar(require('vscode-languageclient')));
-        const vscode = await Promise.resolve().then(() => __importStar(require('vscode')));
-        const { RequestType, toSocket, WebSocketMessageReader, WebSocketMessageWriter } = await Promise.resolve().then(() => __importStar(require('@codingame/monaco-jsonrpc')));
+        const { MonacoLanguageClient } = await import('monaco-languageclient');
+        const { CloseAction, ErrorAction } = await import('vscode-languageclient');
+        const vscode = await import('vscode');
+        const { toSocket, WebSocketMessageReader, WebSocketMessageWriter } = await import('vscode-ws-jsonrpc');
+        const { RequestType } = await import('vscode-jsonrpc');
         function createLanguageClient(transports, name, initializationOptions) {
             const client = new MonacoLanguageClient({
                 name: name,
                 clientOptions: {
-                    documentSelector: exports.deno ? ['typescript'] : ['python'],
+                    documentSelector: deno ? ['typescript'] : ['python'],
                     errorHandler: {
-                        error: () => ({ action: ErrorAction.Shutdown }),
+                        error: () => ({ action: ErrorAction.Continue }),
                         closed: () => ({
-                            action: CloseAction.Restart
+                            action: CloseAction.DoNotRestart
                         })
                     },
                     markdown: {
@@ -153,22 +130,34 @@ async function reloadWebsocket() {
                     const languageClient = createLanguageClient({ reader, writer }, name, options);
                     languageClient.start();
                     socket.onClose((_code, _reason) => {
-                        exports.websocketAlive[name] = false;
+                        websocketAlive[name] = false;
+                        try {
+                            languageClient.stop();
+                        }
+                        catch (err) {
+                            console.error(err);
+                        }
                     });
-                    vscode.commands.registerCommand('deno.cache', (uris = []) => {
-                        languageClient.sendRequest(new RequestType('deno/cache'), {
-                            referrer: { uri },
-                            uris: uris.map((uri) => ({ uri }))
+                    if (name == 'deno') {
+                        vscode.commands.getCommands().then((v) => {
+                            if (!v.includes('deno.cache')) {
+                                vscode.commands.registerCommand('deno.cache', (uris = []) => {
+                                    languageClient.sendRequest(new RequestType('deno/cache'), {
+                                        referrer: { uri },
+                                        uris: uris.map((uri) => ({ uri }))
+                                    });
+                                });
+                            }
                         });
-                    });
-                    exports.websocketAlive[name] = true;
+                    }
+                    websocketAlive[name] = true;
                 };
             }
             catch (err) {
                 console.error(`connection to ${name} language server failed`);
             }
         }
-        if (exports.deno) {
+        if (deno) {
             await connectToLanguageServer(`wss://${$page.url.host}/ws/deno`, 'deno', {
                 certificateStores: null,
                 enablePaths: [],
@@ -225,7 +214,6 @@ async function reloadWebsocket() {
         }
     }
 }
-exports.reloadWebsocket = reloadWebsocket;
 function closeWebsockets() {
     for (const x of websockets) {
         try {
@@ -238,8 +226,8 @@ function closeWebsockets() {
     websockets = [];
 }
 async function loadMonaco() {
-    const monaco = await Promise.resolve().then(() => __importStar(require('monaco-editor')));
-    if (exports.lang == 'python') {
+    const monaco = await import('monaco-editor');
+    if (lang == 'python') {
         monaco.languages.register({
             id: 'python',
             extensions: ['.py'],
@@ -248,26 +236,26 @@ async function loadMonaco() {
         });
     }
     let path = 'unknown';
-    if (exports.lang == 'python') {
-        path = `${exports.hash}.py`;
+    if (lang == 'python') {
+        path = `${hash}.py`;
     }
-    else if (exports.lang == 'json') {
-        path = `${exports.hash}.json`;
+    else if (lang == 'json') {
+        path = `${hash}.json`;
     }
-    else if (exports.lang == 'javascript') {
-        path = `${exports.hash}.js`;
+    else if (lang == 'javascript') {
+        path = `${hash}.js`;
     }
-    else if (exports.lang == 'typescript') {
-        path = `${exports.hash}.ts`;
+    else if (lang == 'typescript') {
+        path = `${hash}.ts`;
     }
     uri = `file:///${path}`;
-    const model = monaco.editor.createModel(exports.code, exports.lang, monaco.Uri.parse(uri));
+    const model = monaco.editor.createModel(code, lang, monaco.Uri.parse(uri));
     model.updateOptions({ tabSize: 4, insertSpaces: true });
     editor = monaco.editor.create(divEl, {
         model: model,
-        value: exports.code,
-        language: exports.lang,
-        automaticLayout: exports.automaticLayout,
+        value: code,
+        language: lang,
+        automaticLayout,
         readOnly: false,
         autoDetectHighContrast: true,
         //lineNumbers: 'off',
@@ -278,21 +266,27 @@ async function loadMonaco() {
         scrollBeyondLastLine: false,
         minimap: {
             enabled: false
+        },
+        scrollbar: {
+            alwaysConsumeMouseWheel: false
+        },
+        lightbulb: {
+            enabled: true
         }
     });
     editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, function () {
         format();
     });
     editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter, function () {
-        if (exports.cmdEnterAction) {
-            (0, exports.cmdEnterAction)();
+        if (cmdEnterAction) {
+            cmdEnterAction();
         }
     });
     editor.onDidChangeModelContent((event) => {
-        exports.code = getCode();
+        code = getCode();
         dispatch('change');
     });
-    if (exports.lang == 'json') {
+    if (lang == 'json') {
         monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
             validate: true,
             allowComments: false,
@@ -300,13 +294,13 @@ async function loadMonaco() {
             enableSchemaRequest: true
         });
     }
-    if (exports.lang == 'typescript') {
+    if (lang == 'typescript') {
         monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
             target: monaco.languages.typescript.ScriptTarget.Latest,
             allowNonTsExtensions: true,
             noLib: true
         });
-        if (exports.deno) {
+        if (deno) {
             monaco.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
                 noSemanticValidation: true,
                 noSuggestionDiagnostics: true,
@@ -314,47 +308,12 @@ async function loadMonaco() {
             });
         }
         else {
-            monaco.languages.typescript.typescriptDefaults.addExtraLib(`
-/**
- * get variable (including secret) at path
- * @param {string} path - path of the variable (e.g: g/all/pretty_secret)
- */
-export function variable(path: string): string;
-
-/**
- * get resource at path
- * @param {string} path - path of the resource (e.g: g/all/my_resource)
- */
-export function resource(path: string): any;
-
-/**
- * get result of step n.
- * If n is negative, for instance -1, it is the step just before this one.
- * Step 0 is flow input.
- * @param {number} n - step number.
- */
-export function step(n: number): any;
-
-/**
- * flow input as an object
- */
-export const flow_input: any;
-
-/**
- * previous result as an object
- */
-export const previous_result: any;
-
-/**
- * static params of this same step
- */
-export const params: any;
-				`, 'file:///node_modules/@types/windmill/index.d.ts');
+            monaco.languages.typescript.typescriptDefaults.addExtraLib(extraLib, extraLibPath);
         }
     }
-    if (exports.lang == 'python' || exports.deno) {
-        const { MonacoServices } = await Promise.resolve().then(() => __importStar(require('monaco-languageclient')));
-        MonacoServices.install(monaco);
+    if (lang == 'python' || deno) {
+        const { MonacoServices } = await import('monaco-languageclient');
+        MonacoServices.install();
     }
     reloadWebsocket();
     return () => {
@@ -369,12 +328,12 @@ export const params: any;
         }
     };
 }
-(0, svelte_1.onMount)(() => {
-    if (env_1.browser) {
+onMount(() => {
+    if (browser) {
         loadMonaco().then((x) => (disposeMethod = x));
     }
 });
-(0, svelte_1.onDestroy)(() => {
+onDestroy(() => {
     if (disposeMethod) {
         disposeMethod();
     }

package/components/Editor.svelte.d.ts

@@ -4,7 +4,7 @@ declare const __propDef: {
         [x: string]: any;
         deno?: boolean | undefined;
         lang?: string | undefined;
-        code: string;
+        code?: string | undefined;
         hash?: string | undefined;
         cmdEnterAction?: (() => void) | undefined;
         formatAction?: (() => void) | undefined;
@@ -14,6 +14,8 @@ declare const __propDef: {
             black: boolean;
             deno: boolean;
         } | undefined;
+        extraLib?: string | undefined;
+        extraLibPath?: string | undefined;
         getCode?: (() => string) | undefined;
         insertAtCursor?: ((code: string) => void) | undefined;
         insertAtBeginning?: ((code: string) => void) | undefined;

package/components/FieldHeader.svelte

@@ -1,15 +1,10 @@
-<script>"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.itemsType = exports.required = exports.type = exports.contentEncoding = exports.format = exports.label = void 0;
-const Required_svelte_1 = __importDefault(require("./Required.svelte"));
-exports.format = '';
-exports.contentEncoding = '';
-exports.type = undefined;
-exports.required = false;
-exports.itemsType = undefined;
+<script>import Required from './Required.svelte';
+export let label;
+export let format = '';
+export let contentEncoding = '';
+export let type = undefined;
+export let required = false;
+export let itemsType = undefined;
 </script>
 
 <h3>