windmill-components 1.309.7 → 1.352.0

package/package/script_helpers.d.ts

@@ -5,8 +5,8 @@ import PYTHON_INIT_CODE_TRIGGER from './init_scripts/python_init_code_trigger';
 import PYTHON_FAILURE_MODULE_CODE from './init_scripts/python_failure_module';
 import type { SupportedLanguage } from './common';
 export { PYTHON_INIT_CODE, PYTHON_INIT_CODE_CLEAR, PYTHON_INIT_CODE_TRIGGER, PYTHON_FAILURE_MODULE_CODE };
-export declare const NATIVETS_INIT_CODE = "// Fetch-only script, no imports allowed but benefits from a dedicated highly efficient runtime\n\nexport async function main(example_input: number = 3) {\n  // \"3\" is the default value of example_input, it can be overriden with code or using the UI\n  const res = await fetch(`https://jsonplaceholder.typicode.com/todos/${example_input}`, {\n    headers: { \"Content-Type\": \"application/json\" },\n  });\n  return res.json();\n}\n";
-export declare const NATIVETS_INIT_CODE_CLEAR = "// Fetch-only script, no imports allowed but benefits from a dedicated highly efficient runtime\n\nexport async function main() {\n  const res = await fetch(\"https://jsonplaceholder.typicode.com/todos/1\", {\n    headers: { \"Content-Type\": \"application/json\" },\n  });\n  return res.json();\n}\n";
+export declare const NATIVETS_INIT_CODE = "// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime\n//import * as wmill from './windmill.ts'\n\nexport async function main(example_input: number = 3) {\n  // \"3\" is the default value of example_input, it can be overriden with code or using the UI\n  const res = await fetch(`https://jsonplaceholder.typicode.com/todos/${example_input}`, {\n    headers: { \"Content-Type\": \"application/json\" },\n  });\n  return res.json();\n}\n";
+export declare const NATIVETS_INIT_CODE_CLEAR = "// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime\n//import * as wmill from './windmill.ts'\n\nexport async function main() {\n  const res = await fetch(\"https://jsonplaceholder.typicode.com/todos/1\", {\n    headers: { \"Content-Type\": \"application/json\" },\n  });\n  return res.json();\n}\n";
 export declare const DENO_INIT_CODE: string;
 export declare const BUN_INIT_CODE = "// import { toWords } from \"number-to-words@1\"\nimport * as wmill from \"windmill-client\"\n\n// fill the type, or use the +Resource type to get a type-safe reference to a resource\n// type Postgresql = object\n\nexport async function main(\n  a: number,\n  b: \"my\" | \"enum\",\n  //c: Postgresql,\n  //d: wmill.S3Object, // for large files backed by S3 (https://www.windmill.dev/docs/core_concepts/persistent_storage/large_data_files)\n  e = \"inferred type string from default arg\",\n  f = { nested: \"object\" },\n) {\n  // let x = await wmill.getVariable('u/user/foo')\n  return { foo: a };\n}\n";
 export declare const GO_INIT_CODE = "package inner\n\nimport (\n\t\"fmt\"\n\t\"rsc.io/quote\"\n\t// wmill \"github.com/windmill-labs/windmill-go-client\"\n)\n\n// Pin dependencies partially in go.mod with a comment starting with \"//require\":\n//require rsc.io/quote v1.5.1\n\n// the main must return (interface{}, error)\n\nfunc main(x string, nested struct {\n\tFoo string `json:\"foo\"`\n}) (interface{}, error) {\n\tfmt.Println(\"Hello, World\")\n\tfmt.Println(nested.Foo)\n\tfmt.Println(quote.Opt())\n\t// v, _ := wmill.GetVariable(\"f/examples/secret\")\n\treturn x, nil\n}\n";
@@ -21,6 +21,7 @@ export declare const BIGQUERY_INIT_CODE = "-- to pin the database use '-- databa
 export declare const SNOWFLAKE_INIT_CODE = "-- to pin the database use '-- database f/your/path'\n-- ? name1 (varchar) = default arg\n-- ? name2 (int)\nINSERT INTO demo VALUES (?, ?)\n";
 export declare const MSSQL_INIT_CODE = "-- to pin the database use '-- database f/your/path'\n-- @p1 name1 (varchar) = default arg\n-- @p2 name2 (int)\nINSERT INTO demo VALUES (@p1, @p2)\n";
 export declare const GRAPHQL_INIT_CODE = "query($name4: String, $name2: Int, $name3: [String]) {\n\tdemo(name1: $name1, name2: $name2, name3: $name3) {\n\t\tname1,\n\t\tname2,\n\t\tname3\n\t}\n}\n";
+export declare const PHP_INIT_CODE = "<?php\n\n// remove the first // of the following lines to specify packages to install using composer\n// // require:\n// // monolog/monolog@3.6.0\n// // stripe/stripe-php\n\nfunction main(\n  // Postgresql $a,\n  // array $b,\n  // object $c,\n  int $d = 123,\n  string $e = \"default value\",\n  float $f = 3.5,\n  bool $g = true,\n) {\n  return $d;\n}\n";
 export declare const FETCH_INIT_CODE = "export async function main(\n\turl: string | undefined,\n\tmethod: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' = 'GET',\n\tbody: Object = {},\n\theaders: Record<string, string> = {}\n): Promise<Response | null> {\n\tif (!url) {\n\t\tconsole.error('Error: URL is undefined')\n\t\treturn null\n\t}\n\n\tconst requestOptions: RequestInit = {\n\t\tmethod: method || 'GET',\n\t\theaders: headers || {}\n\t}\n\n\tif (requestOptions.method !== 'GET' && requestOptions.method !== 'HEAD' && body !== undefined) {\n\t\trequestOptions.body = JSON.stringify(body)\n\t\trequestOptions.headers = {\n\t\t\t'Content-Type': 'application/json',\n\t\t\t...requestOptions.headers\n\t\t}\n\t}\n\n\treturn await fetch(url, requestOptions)\n\t\t.then((res) => res.json())\n\t\t.catch(() => {\n\t\t\tthrow new Error('An error occured')\n\t\t})\n}";
 export declare const BASH_INIT_CODE = "# shellcheck shell=bash\n# arguments of the form X=\"$I\" are parsed as parameters X of type string\nmsg=\"$1\"\ndflt=\"${2:-default value}\"\n\n# the last line of the stdout is the return value\n# unless you write json to './result.json' or a string to './result.out'\necho \"Hello $msg\"\n";
 export declare const DENO_INIT_CODE_TRIGGER: string;

package/package/script_helpers.js

@@ -4,7 +4,8 @@ import PYTHON_INIT_CODE_CLEAR from './init_scripts/python_init_code_clear';
 import PYTHON_INIT_CODE_TRIGGER from './init_scripts/python_init_code_trigger';
 import PYTHON_FAILURE_MODULE_CODE from './init_scripts/python_failure_module';
 export { PYTHON_INIT_CODE, PYTHON_INIT_CODE_CLEAR, PYTHON_INIT_CODE_TRIGGER, PYTHON_FAILURE_MODULE_CODE };
-export const NATIVETS_INIT_CODE = `// Fetch-only script, no imports allowed but benefits from a dedicated highly efficient runtime
+export const NATIVETS_INIT_CODE = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
+//import * as wmill from './windmill.ts'
 
 export async function main(example_input: number = 3) {
   // "3" is the default value of example_input, it can be overriden with code or using the UI
@@ -14,7 +15,8 @@ export async function main(example_input: number = 3) {
   return res.json();
 }
 `;
-export const NATIVETS_INIT_CODE_CLEAR = `// Fetch-only script, no imports allowed but benefits from a dedicated highly efficient runtime
+export const NATIVETS_INIT_CODE_CLEAR = `// Fetch-only script, no imports allowed (except windmill) but benefits from a dedicated highly efficient runtime
+//import * as wmill from './windmill.ts'
 
 export async function main() {
   const res = await fetch("https://jsonplaceholder.typicode.com/todos/1", {
@@ -163,6 +165,25 @@ export const GRAPHQL_INIT_CODE = `query($name4: String, $name2: Int, $name3: [St
 	}
 }
 `;
+export const PHP_INIT_CODE = `<?php
+
+// remove the first // of the following lines to specify packages to install using composer
+// // require:
+// // monolog/monolog@3.6.0
+// // stripe/stripe-php
+
+function main(
+  // Postgresql $a,
+  // array $b,
+  // object $c,
+  int $d = 123,
+  string $e = "default value",
+  float $f = 3.5,
+  bool $g = true,
+) {
+  return $d;
+}
+`;
 export const FETCH_INIT_CODE = `export async function main(
 	url: string | undefined,
 	method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' = 'GET',
@@ -342,7 +363,8 @@ const ALL_INITIAL_CODE = [
     BUN_INIT_CODE_CLEAR,
     BUN_INIT_CODE_APPROVAL,
     BASH_INIT_CODE,
-    POWERSHELL_INIT_CODE
+    POWERSHELL_INIT_CODE,
+    PHP_INIT_CODE
 ];
 export function isInitialCode(content) {
     for (const code of ALL_INITIAL_CODE) {
@@ -436,6 +458,9 @@ export function initialCode(language, kind, subkind) {
     else if (language == 'graphql') {
         return GRAPHQL_INIT_CODE;
     }
+    else if (language == 'php') {
+        return PHP_INIT_CODE;
+    }
     else if (language == 'bun') {
         if (kind === 'approval') {
             return BUN_INIT_CODE_APPROVAL;

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'] | undefined): "go" | "powershell" | "graphql" | "sql" | "typescript" | "python" | "shell";
+export declare function scriptLangToEditorLang(lang: Script['language'] | undefined): "go" | "powershell" | "graphql" | "php" | "sql" | "typescript" | "python" | "shell";
 export type ScriptSchedule = {
     summary: string | undefined;
     args: Record<string, any>;
@@ -22,5 +22,7 @@ export declare function getScriptByPath(path: string): Promise<{
     tag: string | undefined;
     concurrent_limit: number | undefined;
     concurrency_time_window_s: number | undefined;
+    lock?: string;
+    created_at?: string;
 }>;
 export declare function getLatestHashForScript(path: string): Promise<string>;

package/package/scripts.js

@@ -37,6 +37,9 @@ export function scriptLangToEditorLang(lang) {
     else if (lang == 'powershell') {
         return 'powershell';
     }
+    else if (lang == 'php') {
+        return 'php';
+    }
     else if (lang == 'graphql') {
         return 'graphql';
     }
@@ -97,12 +100,13 @@ const scriptLanguagesArray = [
     ['mssql', 'MS SQL Server'],
     ['graphql', 'GraphQL'],
     ['powershell', 'PowerShell'],
+    ['php', 'PHP'],
     ['docker', 'Docker']
 ];
 export const defaultScriptLanguages = Object.fromEntries(scriptLanguagesArray);
 export async function getScriptByPath(path) {
     if (path.startsWith('hub/')) {
-        const { content, language, schema } = await ScriptService.getHubScriptByPath({ path });
+        const { content, language, schema, lockfile } = await ScriptService.getHubScriptByPath({ path });
         return {
             content,
             language: language,
@@ -110,7 +114,8 @@ export async function getScriptByPath(path) {
             description: '',
             tag: undefined,
             concurrent_limit: undefined,
-            concurrency_time_window_s: undefined
+            concurrency_time_window_s: undefined,
+            lock: lockfile
         };
     }
     else {
@@ -125,7 +130,9 @@ export async function getScriptByPath(path) {
             description: script.description,
             tag: script.tag,
             concurrent_limit: script.concurrent_limit,
-            concurrency_time_window_s: script.concurrency_time_window_s
+            concurrency_time_window_s: script.concurrency_time_window_s,
+            lock: script.lock,
+            created_at: script.created_at
         };
     }
 }

package/package/utils.d.ts

@@ -1,9 +1,11 @@
 import type { UserExt } from './stores';
 import { sendUserToast } from './toast';
 import type { Script } from './gen';
+import type { EnumType } from './common';
 export { sendUserToast };
 export declare function validateUsername(username: string): string;
 export declare function parseQueryParams(url: string | undefined): Record<string, string>;
+export declare function displayDateOnly(dateString: string | Date | undefined): string;
 export declare function displayDate(dateString: string | Date | undefined, displaySecond?: boolean, displayDate?: boolean): string;
 export declare function displayTime(dateString: string | Date | undefined): string;
 export declare function displaySize(sizeInBytes: number | undefined): string | undefined;
@@ -67,7 +69,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): boolean;
-export type InputCat = 'string' | 'email' | 'number' | 'boolean' | 'list' | 'resource-object' | 'enum' | 'date' | 'base64' | 'resource-string' | 'object' | 'sql' | 'yaml' | 'currency';
+export type InputCat = 'string' | 'email' | 'number' | 'boolean' | 'list' | 'resource-object' | 'enum' | 'date' | 'base64' | 'resource-string' | 'object' | 'sql' | 'yaml' | 'currency' | 'oneOf';
 export declare function setInputCat(type: string | undefined, format: string | undefined, itemsType: string | undefined, enum_: any, contentEncoding: string | undefined): InputCat;
 export declare function formatCron(inp: string): string;
 export declare function classNames(...classes: Array<string | undefined>): string;
@@ -114,3 +116,5 @@ export declare function computeShow(argName: string, expr: string | undefined, a
 export declare function urlize(input: string, formatter: 'html' | 'md'): string;
 export declare function storeLocalSetting(name: string, value: string | undefined): void;
 export declare function getLocalSetting(name: string): string | null | undefined;
+export declare function computeKind(enum_: EnumType, contentEncoding: 'base64' | 'binary' | undefined, pattern: string | undefined, format: string | undefined): 'base64' | 'none' | 'pattern' | 'enum' | 'resource' | 'format';
+export declare function shouldDisplayPlaceholder(type: string | undefined, format: string | undefined, enum_: EnumType, contentEncoding: 'base64' | 'binary' | undefined, pattern: string | undefined, extra: Record<string, any> | undefined): boolean;

package/package/utils.js

@@ -9,7 +9,6 @@
 import { deepEqual } from 'fast-equals';
 import YAML from 'yaml';
 import { sendUserToast } from './toast';
-import { cloneDeep } from 'lodash';
 export { sendUserToast };
 export function validateUsername(username) {
     if (username != '' && !/^[a-zA-Z]\w+$/.test(username)) {
@@ -33,6 +32,19 @@ export function parseQueryParams(url) {
     });
     return params;
 }
+export function displayDateOnly(dateString) {
+    const date = new Date(dateString ?? '');
+    if (date.toString() === 'Invalid Date') {
+        return '';
+    }
+    else {
+        return date.toLocaleDateString([], {
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit'
+        });
+    }
+}
 export function displayDate(dateString, displaySecond = false, displayDate = true) {
     const date = new Date(dateString ?? '');
     if (date.toString() === 'Invalid Date') {
@@ -317,6 +329,9 @@ export function setInputCat(type, format, itemsType, enum_, contentEncoding) {
     else if (type == 'string' && format == 'date-time') {
         return 'date';
     }
+    else if (type == 'string' && format == 'date') {
+        return 'date';
+    }
     else if (type == 'string' && format == 'sql') {
         return 'sql';
     }
@@ -332,6 +347,9 @@ export function setInputCat(type, format, itemsType, enum_, contentEncoding) {
     else if (type == 'string' && format == 'currency') {
         return 'currency';
     }
+    else if (type == 'oneOf') {
+        return 'oneOf';
+    }
     else {
         return 'string';
     }
@@ -616,7 +634,7 @@ export function cleanValueProperties(obj) {
         let newObj = {};
         for (const key of Object.keys(obj)) {
             if (key !== 'parent_hash' && key !== 'draft' && key !== 'draft_only') {
-                newObj[key] = cloneDeep(obj[key]);
+                newObj[key] = structuredClone(obj[key]);
             }
         }
         return newObj;
@@ -662,9 +680,6 @@ export function computeShow(argName, expr, args) {
     if (expr) {
         try {
             let r = evalJs(expr)(args ?? {});
-            if (!r && args[argName] !== undefined) {
-                delete args[argName];
-            }
             return r;
         }
         catch (e) {
@@ -716,3 +731,36 @@ export function getLocalSetting(name) {
         return undefined;
     }
 }
+export function computeKind(enum_, contentEncoding, pattern, format) {
+    if (enum_ != undefined) {
+        return 'enum';
+    }
+    if (contentEncoding == 'base64') {
+        return 'base64';
+    }
+    if (pattern != undefined) {
+        return 'pattern';
+    }
+    if (format != undefined && format != '') {
+        if (format?.startsWith('resource')) {
+            return 'resource';
+        }
+        return 'format';
+    }
+    return 'none';
+}
+// Used to check whether a placeholder should be displayed in the input field, based on the schema
+export function shouldDisplayPlaceholder(type, format, enum_, contentEncoding, pattern, extra) {
+    if (type === 'string') {
+        const kind = computeKind(enum_, contentEncoding, pattern, format);
+        if (kind === 'format' && format) {
+            const whiteList = ['email', 'hostname', 'ipv4', 'uri', 'uuid'];
+            return whiteList.includes(format);
+        }
+        return kind === 'none' || kind === 'pattern';
+    }
+    if (type === 'number' || type === 'integer') {
+        return extra?.['min'] === undefined || extra?.['max'] === undefined;
+    }
+    return type === undefined;
+}