windmill-components 1.60.4 → 1.75.0

package/components/flows/previousResults.js

@@ -1,23 +1,30 @@
 import { schemaToObject } from '../../utils';
+function getSubModules(flowModule) {
+    if (flowModule.value.type === 'forloopflow') {
+        return [flowModule.value.modules];
+    }
+    else if (flowModule.value.type === 'branchall') {
+        return flowModule.value.branches.map((branch) => branch.modules);
+    }
+    else if (flowModule.value.type == 'branchone') {
+        return [
+            ...flowModule.value.branches.map((branch) => branch.modules),
+            flowModule.value.default
+        ];
+    }
+    return [];
+}
+function getAllSubmodules(flowModule) {
+    return getSubModules(flowModule).map((modules) => {
+        return modules.map((module) => {
+            return [module, ...getAllSubmodules(module).flat()];
+        }).flat();
+    });
+}
 function dfs(id, flow, getParents = true) {
     if (id === undefined) {
         return [];
     }
-    function getSubModules(flowModule) {
-        if (flowModule.value.type === 'forloopflow') {
-            return [flowModule.value.modules];
-        }
-        else if (flowModule.value.type === 'branchall') {
-            return flowModule.value.branches.map((branch) => branch.modules);
-        }
-        else if (flowModule.value.type == 'branchone') {
-            return [
-                ...flowModule.value.branches.map((branch) => branch.modules),
-                flowModule.value.default
-            ];
-        }
-        return [];
-    }
     function rec(id, moduleBranches) {
         for (let modules of moduleBranches) {
             for (const [i, module] of modules.entries()) {
@@ -66,9 +73,17 @@ function getFlowInput(parentModules, flowState, args, schema) {
         return schemaToObject(schema, args);
     }
 }
-export function getStepPropPicker(flowState, parentModule, previousModule, id, flow, args, include_node, approvers = false) {
+export function getStepPropPicker(flowState, parentModule, previousModule, id, flow, args, include_node) {
     const flowInput = getFlowInput(dfs(parentModule?.id, flow), flowState, args, flow.schema);
-    const previousIds = dfs(id, flow, false).map((x) => x.id);
+    const previousIds = dfs(id, flow, false).map((x) => {
+        let submodules = getAllSubmodules(x).flat().map((x) => x.id);
+        if (submodules.includes(id)) {
+            return [x.id];
+        }
+        else {
+            return [x.id, ...submodules];
+        }
+    }).flat();
     if (!include_node) {
         previousIds.shift();
     }

package/components/flows/types.d.ts

@@ -1,8 +1,20 @@
+import type { Flow, FlowModule } from '../../gen';
+import type { History } from '../../history';
 import type { Writable } from 'svelte/store';
+import type ScriptEditorDrawer from './content/ScriptEditorDrawer.svelte';
+import type { FlowState } from './flowState';
 import type { Schedule } from './scheduleUtils';
 export type FlowEditorContext = {
     selectedId: Writable<string>;
-    select: (id: string) => void;
+    moving: Writable<{
+        module: FlowModule;
+        modules: FlowModule[];
+    } | undefined>;
     schedule: Writable<Schedule>;
     previewArgs: Writable<Record<string, any>>;
+    scriptEditorDrawer: Writable<ScriptEditorDrawer | undefined>;
+    history: History<Flow>;
+    flowStore: Writable<Flow>;
+    flowStateStore: Writable<FlowState>;
+    testStepStore: Writable<Record<string, any>>;
 };

package/components/flows/utils.js

@@ -53,7 +53,7 @@ export async function loadSchemaFromModule(module) {
             await inferArgs(mod.language, mod.content ?? '', schema);
         }
         else if (mod.type == 'script' && mod.path && mod.path != '') {
-            schema = await loadSchema(mod.path);
+            schema = await loadSchema(mod.path, mod.hash);
         }
         else if (mod.type == 'flow' && mod.path && mod.path != '') {
             schema = await loadSchemaFlow(mod.path);
@@ -71,10 +71,10 @@ export async function loadSchemaFromModule(module) {
         let input_transforms = mod.input_transforms ?? module.input_transforms ?? {};
         if (JSON.stringify(keys.sort()) !== JSON.stringify(Object.keys(input_transforms).sort())) {
             input_transforms = keys.reduce((accu, key) => {
-                let nv = input_transforms[key] ?? (module.id == 'failure' && ['message', 'name'].includes(key)) ? { type: 'javascript', expr: `error.${key}` } : {
+                let nv = input_transforms[key] ?? ((module.id == 'failure' && ['message', 'name'].includes(key)) ? { type: 'javascript', expr: `error.${key}` } : {
                     type: 'static',
                     value: undefined
-                };
+                });
                 accu[key] = nv;
                 return accu;
             }, {});
@@ -128,7 +128,7 @@ export function codeToStaticTemplate(code) {
     if (lines.length == 1) {
         const line = lines[0].trim();
         if (line[0] == '`' && line.charAt(line.length - 1) == '`') {
-            return line.slice(1, line.length - 1);
+            return line.slice(1, line.length - 1).replaceAll('\\`', '`');
         }
     }
     return undefined;
@@ -142,30 +142,36 @@ export function emptyFlowModuleState() {
 }
 const aCharCode = 'a'.charCodeAt(0);
 export function numberToChars(n) {
+    if (n < 0) {
+        return "-" + numberToChars(-n);
+    }
     var b = [n], sp, out, i, div;
     sp = 0;
     while (sp < b.length) {
-        if (b[sp] > 25) {
-            div = Math.floor(b[sp] / 27);
+        if (b[sp] > (25)) {
+            div = Math.floor(b[sp] / (26));
             b[sp + 1] = div - 1;
-            b[sp] %= 27;
+            b[sp] %= (26);
         }
         sp += 1;
     }
     out = '';
     for (i = 0; i < b.length; i += 1) {
         let charCode = aCharCode + b[i];
-        out = (charCode == 26 ? '-' : String.fromCharCode(charCode)) + out;
+        out = String.fromCharCode(charCode) + out;
     }
     return out;
 }
 export function charsToNumber(n) {
-    let b = Math.pow(27, n.length - 1);
+    if (n.charAt(0) == '-') {
+        return charsToNumber(n.slice(1)) * -1;
+    }
+    let b = Math.pow(26, n.length - 1);
     let res = 0;
     for (let c of n) {
-        let charCode = c == '-' ? aCharCode + 26 : c.charCodeAt(0);
+        let charCode = (c == '-' || c == '_') ? aCharCode + 25 : c.charCodeAt(0);
         res += (charCode - aCharCode + 1) * b;
-        b = b / 27;
+        b = b / 26;
     }
     return res - 1;
 }