windmill-components 1.309.7 → 1.352.0

package/package/infer.d.ts

@@ -1,7 +1,7 @@
 import type { Schema, SupportedLanguage } from './common.js';
 export declare function initWasm(): Promise<void>;
 export declare function parseDeps(code: string): string[];
-export declare function inferArgs(language: SupportedLanguage | undefined, code: string, schema: Schema): Promise<void>;
+export declare function inferArgs(language: SupportedLanguage | undefined, code: string, schema: Schema): Promise<boolean | null>;
 export declare function loadSchemaFromPath(path: string, hash?: string): Promise<Schema>;
 export declare function loadSchema(workspace: string, path: string, runType: 'script' | 'flow' | 'hubscript'): Promise<{
     schema: Schema;

package/package/infer.js

@@ -2,7 +2,7 @@ import { ScriptService, FlowService } from './gen';
 import { get, writable } from 'svelte/store';
 import { emptySchema, sortObject } from './utils.js';
 import { tick } from 'svelte';
-import init, { parse_deno, parse_bash, parse_go, parse_python, parse_sql, parse_mysql, parse_bigquery, parse_snowflake, parse_graphql, parse_powershell, parse_outputs, parse_mssql, parse_ts_imports, parse_db_resource } from 'windmill-parser-wasm';
+import init, { parse_deno, parse_bash, parse_go, parse_python, parse_sql, parse_mysql, parse_bigquery, parse_snowflake, parse_graphql, parse_powershell, parse_outputs, parse_mssql, parse_ts_imports, parse_db_resource, parse_php } from 'windmill-parser-wasm';
 import wasmUrl from 'windmill-parser-wasm/windmill_parser_wasm_bg.wasm?url';
 import { workspaceStore } from './stores.js';
 import { argSigToJsonSchemaType } from './inferArgSig.js';
@@ -109,8 +109,11 @@ export async function inferArgs(language, code, schema) {
         else if (language == 'powershell') {
             inferedSchema = JSON.parse(parse_powershell(code));
         }
+        else if (language == 'php') {
+            inferedSchema = JSON.parse(parse_php(code));
+        }
         else {
-            return;
+            return null;
         }
         if (inferedSchema.type == 'Invalid') {
             throw new Error(inferedSchema.error);
@@ -135,6 +138,7 @@ export async function inferArgs(language, code, schema) {
         }
     }
     await tick();
+    return inferedSchema.no_main_func;
 }
 export async function loadSchemaFromPath(path, hash) {
     if (path.startsWith('hub/')) {

package/package/inferArgSig.d.ts

@@ -17,4 +17,14 @@ export declare function argSigToJsonSchemaType(t: string | {
         key: string;
         typ: any;
     }[];
+} | {
+    oneof: [
+        {
+            label: string;
+            properties: {
+                key: string;
+                typ: any;
+            }[];
+        }
+    ];
 }, oldS: SchemaProperty): void;

package/package/inferArgSig.js

@@ -1,5 +1,5 @@
 export function argSigToJsonSchemaType(t, oldS) {
-    const newS = { type: '' };
+    let newS = { type: '' };
     if (t === 'int') {
         newS.type = 'integer';
     }
@@ -24,17 +24,47 @@ export function argSigToJsonSchemaType(t, oldS) {
     else if (t === 'bytes') {
         newS.type = 'string';
         newS.contentEncoding = 'base64';
+        newS.originalType = 'bytes';
     }
     else if (t === 'datetime') {
         newS.type = 'string';
         newS.format = 'date-time';
     }
+    else if (typeof t !== 'string' && 'oneof' in t) {
+        newS.type = 'object';
+        if (t.oneof) {
+            newS.oneOf = t.oneof.map((obj) => {
+                const oldObjS = oldS.oneOf?.find((o) => o?.title === obj.label) ?? undefined;
+                const properties = {};
+                for (const prop of obj.properties) {
+                    if (oldObjS?.properties && prop.key in oldObjS?.properties) {
+                        properties[prop.key] = oldObjS?.properties[prop.key];
+                    }
+                    else {
+                        properties[prop.key] = { description: '', type: '' };
+                    }
+                    argSigToJsonSchemaType(prop.typ, properties[prop.key]);
+                }
+                return {
+                    type: 'object',
+                    title: obj.label,
+                    properties,
+                    order: oldObjS?.order ?? undefined
+                };
+            });
+        }
+    }
     else if (typeof t !== 'string' && `object` in t) {
         newS.type = 'object';
         if (t.object) {
             const properties = {};
             for (const prop of t.object) {
-                properties[prop.key] = {};
+                if (oldS.properties && prop.key in oldS.properties) {
+                    properties[prop.key] = oldS.properties[prop.key];
+                }
+                else {
+                    properties[prop.key] = { description: '', type: '' };
+                }
                 argSigToJsonSchemaType(prop.typ, properties[prop.key]);
             }
             newS.properties = properties;
@@ -43,8 +73,13 @@ export function argSigToJsonSchemaType(t, oldS) {
     else if (typeof t !== 'string' && `str` in t) {
         newS.type = 'string';
         if (t.str) {
+            newS.originalType = 'enum';
             newS.enum = t.str;
         }
+        else {
+            newS.originalType = 'string';
+            newS.enum = undefined;
+        }
     }
     else if (typeof t !== 'string' && `resource` in t) {
         newS.type = 'object';
@@ -71,6 +106,28 @@ export function argSigToJsonSchemaType(t, oldS) {
     else {
         newS.type = 'object';
     }
+    const preservedFields = [
+        'description',
+        'pattern',
+        'min',
+        'max',
+        'currency',
+        'currencyLocale',
+        'multiselect',
+        'customErrorMessage',
+        'required',
+        'showExpr',
+        'password',
+        'order',
+        'dateFormat',
+        'title',
+        'placeholder'
+    ];
+    preservedFields.forEach((field) => {
+        if (oldS[field] !== undefined) {
+            newS[field] = oldS[field];
+        }
+    });
     if (oldS.type != newS.type) {
         for (const prop of Object.getOwnPropertyNames(newS)) {
             if (prop != 'description') {
@@ -78,8 +135,11 @@ export function argSigToJsonSchemaType(t, oldS) {
             }
         }
     }
-    else if (oldS.format == 'date-time' && newS.format != 'date-time') {
-        delete oldS.format;
+    else if ((oldS.format == 'date' || oldS.format === 'date-time') && newS.format == 'string') {
+        newS.format = oldS.format;
+    }
+    else if (newS.format == 'date-time' && oldS.format == 'date') {
+        newS.format = 'date';
     }
     else if (oldS.items?.type != newS.items?.type) {
         delete oldS.items;

package/package/init_scripts/python_init_code.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "import os\nimport wmill\n\n# You can import any PyPi package. \n# See here for more info: https://www.windmill.dev/docs/advanced/imports#imports-in-python\n\n# you can use typed resources by doing a type alias to dict\n#postgresql = dict\n\ndef main(\n    no_default: str,\n    #db: postgresql,\n    name=\"Nicolas Bourbaki\",\n    age=42,\n    obj: dict = {\"even\": \"dicts\"},\n    l: list = [\"or\", \"lists!\"],\n    file_: bytes = bytes(0),\n):\n\n    print(f\"Hello World and a warm welcome especially to {name}\")\n    print(\"and its acolytes..\", age, obj, l, len(file_))\n\n    # retrieve variables, resources, states using the wmill client\n    try:\n        secret = wmill.get_variable(\"f/examples/secret\")\n    except:\n        secret = \"No secret yet at f/examples/secret !\"\n    print(f\"The variable at `f/examples/secret`: {secret}\")\n\n    # Get last state of this script execution by the same trigger/user\n    last_state = wmill.get_state()\n    new_state = {\"foo\": 42} if last_state is None else last_state\n    new_state[\"foo\"] += 1\n    wmill.set_state(new_state)\n\n    # fetch context variables\n    user = os.environ.get(\"WM_USERNAME\")\n\n    # return value is converted to JSON\n    return {\"splitted\": name.split(), \"user\": user, \"state\": new_state}";
+declare const _default: "import os\nimport wmill\n\n# You can import any PyPi package. \n# See here for more info: https://www.windmill.dev/docs/advanced/dependencies_in_python\n\n# you can use typed resources by doing a type alias to dict\n#postgresql = dict\n\ndef main(\n    no_default: str,\n    #db: postgresql,\n    name=\"Nicolas Bourbaki\",\n    age=42,\n    obj: dict = {\"even\": \"dicts\"},\n    l: list = [\"or\", \"lists!\"],\n    file_: bytes = bytes(0),\n):\n\n    print(f\"Hello World and a warm welcome especially to {name}\")\n    print(\"and its acolytes..\", age, obj, l, len(file_))\n\n    # retrieve variables, resources, states using the wmill client\n    try:\n        secret = wmill.get_variable(\"f/examples/secret\")\n    except:\n        secret = \"No secret yet at f/examples/secret !\"\n    print(f\"The variable at `f/examples/secret`: {secret}\")\n\n    # Get last state of this script execution by the same trigger/user\n    last_state = wmill.get_state()\n    new_state = {\"foo\": 42} if last_state is None else last_state\n    new_state[\"foo\"] += 1\n    wmill.set_state(new_state)\n\n    # fetch context variables\n    user = os.environ.get(\"WM_USERNAME\")\n\n    # return value is converted to JSON\n    return {\"splitted\": name.split(), \"user\": user, \"state\": new_state}";
 export default _default;

package/package/init_scripts/python_init_code.js

@@ -2,7 +2,7 @@ export default `import os
 import wmill
 
 # You can import any PyPi package. 
-# See here for more info: https://www.windmill.dev/docs/advanced/imports#imports-in-python
+# See here for more info: https://www.windmill.dev/docs/advanced/dependencies_in_python
 
 # you can use typed resources by doing a type alias to dict
 #postgresql = dict