windmill-cli 1.516.0 → 1.518.1

package/esm/sync.js

@@ -13,6 +13,7 @@ import { removePathPrefix } from "./types.js";
 import { listSyncCodebases } from "./codebase.js";
 import { generateFlowLockInternal, generateScriptMetadataInternal, readLockfile, } from "./metadata.js";
 import { pushResource } from "./resource.js";
+import { extractInlineScripts as extractInlineScriptsForFlows } from "./windmill-utils-internal/src/inline-scripts/extractor.js";
 // Merge CLI options with effective settings, preserving CLI flags as overrides
 function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
     // overlay CLI options on top (undefined cliOpts won't override effectiveOpts)
@@ -31,7 +32,7 @@ async function resolveEffectiveSyncOptions(workspace, repositoryPath) {
         const applicableRepos = [];
         // Find all repository-specific overrides for this workspace
         for (const key of Object.keys(localConfig.overrides)) {
-            if (key.startsWith(prefix) && !key.endsWith(':*')) {
+            if (key.startsWith(prefix) && !key.endsWith(":*")) {
                 const repo = key.substring(prefix.length);
                 if (repo) {
                     applicableRepos.push(repo);
@@ -48,12 +49,15 @@ async function resolveEffectiveSyncOptions(workspace, repositoryPath) {
             const isInteractive = dntShim.Deno.stdin.isTerminal() && dntShim.Deno.stdout.isTerminal();
             if (isInteractive) {
                 const choices = [
-                    { name: "Use top-level settings (no repository-specific override)", value: "" },
-                    ...applicableRepos.map(repo => ({ name: repo, value: repo }))
+                    {
+                        name: "Use top-level settings (no repository-specific override)",
+                        value: "",
+                    },
+                    ...applicableRepos.map((repo) => ({ name: repo, value: repo })),
                 ];
                 const selectedRepo = await Select.prompt({
                     message: "Multiple repository overrides found. Select which to use:",
-                    options: choices
+                    options: choices,
                 });
                 if (selectedRepo) {
                     log.info(`Selected repository: ${selectedRepo}`);
@@ -62,7 +66,7 @@ async function resolveEffectiveSyncOptions(workspace, repositoryPath) {
             }
             else {
                 // Non-interactive mode - list options and use top-level
-                log.warn(`Multiple repository overrides found: ${applicableRepos.join(', ')}`);
+                log.warn(`Multiple repository overrides found: ${applicableRepos.join(", ")}`);
                 log.warn(`Running in non-interactive mode. Use --repository flag to specify which one to use.`);
                 log.info(`Falling back to top-level settings (no repository-specific overrides applied)`);
             }
@@ -174,6 +178,8 @@ export async function FSFSElement(p, codebases, ignoreCodebaseChanges) {
     return _internal_element(p, (await dntShim.Deno.stat(p)).isDirectory, codebases);
 }
 function prioritizeName(name) {
+    if (name == "version")
+        return "aaa";
     if (name == "id")
         return "aa";
     if (name == "type")
@@ -198,6 +204,8 @@ function prioritizeName(name) {
         return "al";
     if (name == "lock")
         return "az";
+    if (name == "locks")
+        return "azz";
     return name;
 }
 export const yamlOptions = {
@@ -208,43 +216,6 @@ export const yamlOptions = {
     noRefs: true,
     skipInvalid: true,
 };
-export function extractInlineScriptsForFlows(modules, pathAssigner) {
-    return modules.flatMap((m) => {
-        if (m.value.type == "rawscript") {
-            const [basePath, ext] = pathAssigner.assignPath(m.summary, m.value.language);
-            const path = basePath + ext;
-            const content = m.value.content;
-            const r = [{ path: path, content: content }];
-            m.value.content = "!inline " + path.replaceAll(SEP, "/");
-            const lock = m.value.lock;
-            if (lock && lock != "") {
-                const lockPath = basePath + "lock";
-                m.value.lock = "!inline " + lockPath.replaceAll(SEP, "/");
-                r.push({ path: lockPath, content: lock });
-            }
-            return r;
-        }
-        else if (m.value.type == "forloopflow") {
-            return extractInlineScriptsForFlows(m.value.modules, pathAssigner);
-        }
-        else if (m.value.type == "branchall") {
-            return m.value.branches.flatMap((b) => extractInlineScriptsForFlows(b.modules, pathAssigner));
-        }
-        else if (m.value.type == "whileloopflow") {
-            return extractInlineScriptsForFlows(m.value.modules, pathAssigner);
-        }
-        else if (m.value.type == "branchone") {
-            return [
-                ...m.value.branches.flatMap((b) => extractInlineScriptsForFlows(b.modules, pathAssigner)),
-                ...extractInlineScriptsForFlows(m.value.default, pathAssigner),
-            ];
-        }
-        else {
-            return [];
-        }
-    });
-}
-const INLINE_SCRIPT = "inline_script";
 export function extractInlineScriptsForApps(rec, pathAssigner) {
     if (!rec) {
         return [];
@@ -281,76 +252,6 @@ export function extractInlineScriptsForApps(rec, pathAssigner) {
     }
     return [];
 }
-export function newPathAssigner(defaultTs) {
-    let counter = 0;
-    const seen_names = new Set();
-    function assignPath(summary, language) {
-        let name;
-        name = summary?.toLowerCase()?.replaceAll(" ", "_") ?? "";
-        let original_name = name;
-        if (name == "") {
-            original_name = INLINE_SCRIPT;
-            name = `${INLINE_SCRIPT}_0`;
-        }
-        while (seen_names.has(name)) {
-            counter++;
-            name = `${original_name}_${counter}`;
-        }
-        seen_names.add(name);
-        let ext;
-        if (language == "python3")
-            ext = "py";
-        else if (language == defaultTs || language == "bunnative")
-            ext = "ts";
-        else if (language == "bun")
-            ext = "bun.ts";
-        else if (language == "deno")
-            ext = "deno.ts";
-        else if (language == "go")
-            ext = "go";
-        else if (language == "bash")
-            ext = "sh";
-        else if (language == "powershell")
-            ext = "ps1";
-        else if (language == "postgresql")
-            ext = "pg.sql";
-        else if (language == "mysql")
-            ext = "my.sql";
-        else if (language == "bigquery")
-            ext = "bq.sql";
-        else if (language == "oracledb")
-            ext = "odb.sql";
-        else if (language == "snowflake")
-            ext = "sf.sql";
-        else if (language == "mssql")
-            ext = "ms.sql";
-        else if (language == "graphql")
-            ext = "gql";
-        else if (language == "nativets")
-            ext = "native.ts";
-        else if (language == "frontend")
-            ext = "frontend.js";
-        else if (language == "php")
-            ext = "php";
-        else if (language == "rust")
-            ext = "rs";
-        else if (language == "csharp")
-            ext = "cs";
-        else if (language == "nu")
-            ext = "nu";
-        else if (language == "ansible")
-            ext = "playbook.yml";
-        else if (language == "java")
-            ext = "java";
-        else if (language == "duckdb")
-            ext = "duckdb.sql";
-        // for related places search: ADD_NEW_LANG
-        else
-            ext = "no_ext";
-        return [`${name}.inline_script.`, ext];
-    }
-    return { assignPath };
-}
 function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ignoreCodebaseChanges) {
     async function _internal_file(p, f) {
         const kind = p.endsWith("flow.json")
@@ -382,7 +283,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                 async *getChildren() {
                     if (kind == "flow") {
                         const flow = JSON.parse(await f.async("text"));
-                        const inlineScripts = extractInlineScriptsForFlows(flow.value.modules, newPathAssigner(defaultTs));
+                        const inlineScripts = extractInlineScriptsForFlows(flow.value.modules, {}, SEP, defaultTs, newPathAssigner(defaultTs));
                         for (const s of inlineScripts) {
                             yield {
                                 isDirectory: false,
@@ -921,7 +822,8 @@ export async function ignoreF(wmillconf) {
                     wmillconf.includes?.some((i) => minimatch(file, i))) &&
                     (!wmillconf?.excludes ||
                         wmillconf.excludes.every((i) => !minimatch(file, i))) &&
-                    (!wmillconf.extraIncludes || wmillconf.extraIncludes.length === 0 ||
+                    (!wmillconf.extraIncludes ||
+                        wmillconf.extraIncludes.length === 0 ||
                         wmillconf.extraIncludes.some((i) => minimatch(file, i))));
             },
         };
@@ -1045,12 +947,14 @@ export async function pull(opts) {
     if (opts.dryRun && opts.jsonOutput) {
         const result = {
             success: true,
-            changes: changes.map(change => ({
+            changes: changes.map((change) => ({
                 type: change.name,
                 path: change.path,
-                ...(change.name === "edited" && change.codebase ? { codebase_changed: true } : {})
+                ...(change.name === "edited" && change.codebase
+                    ? { codebase_changed: true }
+                    : {}),
             })),
-            total: changes.length
+            total: changes.length,
         };
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -1177,12 +1081,14 @@ export async function pull(opts) {
             const result = {
                 success: true,
                 message: `All ${changes.length} changes applied locally and wmill-lock.yaml updated`,
-                changes: changes.map(change => ({
+                changes: changes.map((change) => ({
                     type: change.name,
                     path: change.path,
-                    ...(change.name === "edited" && change.codebase ? { codebase_changed: true } : {})
+                    ...(change.name === "edited" && change.codebase
+                        ? { codebase_changed: true }
+                        : {}),
                 })),
-                total: changes.length
+                total: changes.length,
             };
             console.log(JSON.stringify(result, null, 2));
         }
@@ -1306,12 +1212,14 @@ export async function push(opts) {
     if (opts.dryRun && opts.jsonOutput) {
         const result = {
             success: true,
-            changes: changes.map(change => ({
+            changes: changes.map((change) => ({
                 type: change.name,
                 path: change.path,
-                ...(change.name === "edited" && change.codebase ? { codebase_changed: true } : {})
+                ...(change.name === "edited" && change.codebase
+                    ? { codebase_changed: true }
+                    : {}),
             })),
-            total: changes.length
+            total: changes.length,
         };
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -1599,13 +1507,15 @@ export async function push(opts) {
             const result = {
                 success: true,
                 message: `All ${changes.length} changes pushed to the remote workspace ${workspace.workspaceId} named ${workspace.name}`,
-                changes: changes.map(change => ({
+                changes: changes.map((change) => ({
                     type: change.name,
                     path: change.path,
-                    ...(change.name === "edited" && change.codebase ? { codebase_changed: true } : {})
+                    ...(change.name === "edited" && change.codebase
+                        ? { codebase_changed: true }
+                        : {}),
                 })),
                 total: changes.length,
-                duration_ms: Math.round(performance.now() - start)
+                duration_ms: Math.round(performance.now() - start),
             };
             console.log(JSON.stringify(result, null, 2));
         }
@@ -1678,4 +1588,75 @@ const command = new Command()
     .option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist")
     // deno-lint-ignore no-explicit-any
     .action(push);
+const INLINE_SCRIPT = "inline_script";
+export function newPathAssigner(defaultTs) {
+    let counter = 0;
+    const seen_names = new Set();
+    function assignPath(summary, language) {
+        let name;
+        name = summary?.toLowerCase()?.replaceAll(" ", "_") ?? "";
+        let original_name = name;
+        if (name == "") {
+            original_name = INLINE_SCRIPT;
+            name = `${INLINE_SCRIPT}_0`;
+        }
+        while (seen_names.has(name)) {
+            counter++;
+            name = `${original_name}_${counter}`;
+        }
+        seen_names.add(name);
+        let ext;
+        if (language == "python3")
+            ext = "py";
+        else if (language == defaultTs || language == "bunnative")
+            ext = "ts";
+        else if (language == "bun")
+            ext = "bun.ts";
+        else if (language == "deno")
+            ext = "deno.ts";
+        else if (language == "go")
+            ext = "go";
+        else if (language == "bash")
+            ext = "sh";
+        else if (language == "powershell")
+            ext = "ps1";
+        else if (language == "postgresql")
+            ext = "pg.sql";
+        else if (language == "mysql")
+            ext = "my.sql";
+        else if (language == "bigquery")
+            ext = "bq.sql";
+        else if (language == "oracledb")
+            ext = "odb.sql";
+        else if (language == "snowflake")
+            ext = "sf.sql";
+        else if (language == "mssql")
+            ext = "ms.sql";
+        else if (language == "graphql")
+            ext = "gql";
+        else if (language == "nativets")
+            ext = "native.ts";
+        else if (language == "frontend")
+            ext = "frontend.js";
+        else if (language == "php")
+            ext = "php";
+        else if (language == "rust")
+            ext = "rs";
+        else if (language == "csharp")
+            ext = "cs";
+        else if (language == "nu")
+            ext = "nu";
+        else if (language == "ansible")
+            ext = "playbook.yml";
+        else if (language == "java")
+            ext = "java";
+        else if (language == "duckdb")
+            ext = "duckdb.sql";
+        // for related places search: ADD_NEW_LANG
+        else
+            ext = "no_ext";
+        return [`${name}.inline_script.`, ext];
+    }
+    return { assignPath };
+}
 export default command;

package/esm/windmill-utils-internal/src/gen/types.gen.js

@@ -0,0 +1,2 @@
+// This file is auto-generated by @hey-api/openapi-ts
+export {};

package/esm/windmill-utils-internal/src/inline-scripts/extractor.js

@@ -0,0 +1,79 @@
+import { assignPath } from "../path-utils/path-assigner.js";
+const INLINE_SCRIPT = "inline_script";
+export function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs, pathAssigner) {
+    return modules.flatMap((m) => {
+        if (m.value.type == "rawscript") {
+            let basePath, ext;
+            if (pathAssigner) {
+                [basePath, ext] = pathAssigner.assignPath(m.summary, m.value.language);
+            }
+            else {
+                [basePath, ext] = assignPath(m.id, m.value.language, defaultTs);
+            }
+            const path = mapping[m.id] ?? basePath + ext;
+            const content = m.value.content;
+            const r = [{ path: path, content: content }];
+            m.value.content = "!inline " + path.replaceAll(separator, "/");
+            const lock = m.value.lock;
+            if (lock && lock != "") {
+                const lockPath = basePath + "lock";
+                m.value.lock = "!inline " + lockPath.replaceAll(separator, "/");
+                r.push({ path: lockPath, content: lock });
+            }
+            return r;
+        }
+        else if (m.value.type == "forloopflow") {
+            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs);
+        }
+        else if (m.value.type == "branchall") {
+            return m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs));
+        }
+        else if (m.value.type == "whileloopflow") {
+            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs);
+        }
+        else if (m.value.type == "branchone") {
+            return [
+                ...m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs)),
+                ...extractInlineScripts(m.value.default, mapping, separator, defaultTs),
+            ];
+        }
+        else {
+            return [];
+        }
+    });
+}
+/**
+ * Extracts the current mapping of module IDs to file paths from flow modules
+ * by analyzing existing inline script references.
+ *
+ * @param modules - Array of flow modules to analyze (can be undefined)
+ * @param mapping - Existing mapping to extend (defaults to empty object)
+ * @returns Record mapping module IDs to their corresponding file paths
+ */
+export function extractCurrentMapping(modules, mapping = {}) {
+    if (!modules || !Array.isArray(modules)) {
+        return mapping;
+    }
+    modules.forEach((m) => {
+        if (!m?.value?.type) {
+            return;
+        }
+        if (m.value.type === "rawscript") {
+            if (m.value.content && m.value.content.startsWith("!inline ")) {
+                mapping[m.id] = m.value.content.trim().split(" ")[1];
+            }
+        }
+        else if (m.value.type === "forloopflow" ||
+            m.value.type === "whileloopflow") {
+            extractCurrentMapping(m.value.modules, mapping);
+        }
+        else if (m.value.type === "branchall") {
+            m.value.branches.forEach((b) => extractCurrentMapping(b.modules, mapping));
+        }
+        else if (m.value.type === "branchone") {
+            m.value.branches.forEach((b) => extractCurrentMapping(b.modules, mapping));
+            extractCurrentMapping(m.value.default, mapping);
+        }
+    });
+    return mapping;
+}

package/esm/windmill-utils-internal/src/inline-scripts/replacer.js

@@ -0,0 +1,92 @@
+/**
+ * Replaces inline script references with actual file content from the filesystem.
+ * This function recursively processes all flow modules and their nested structures.
+ *
+ * @param modules - Array of flow modules to process
+ * @param fileReader - Function to read file content (typically fs.readFile or similar)
+ * @param logger - Optional logger object with info and error methods
+ * @param localPath - Base path for resolving relative file paths
+ * @param removeLocks - Optional array of paths for which to remove lock files
+ * @returns Promise that resolves when all inline scripts have been replaced
+ */
+export async function replaceInlineScripts(modules, fileReader, logger = {
+    info: () => { },
+    error: () => { },
+}, localPath, separator = "/", removeLocks, renamer, deleter) {
+    await Promise.all(modules.map(async (module) => {
+        if (!module.value) {
+            throw new Error(`Module value is undefined for module ${module.id}`);
+        }
+        if (module.value.type === "rawscript" && module.value.content && module.value.content.startsWith("!inline")) {
+            const path = module.value.content.split(" ")[1];
+            const pathPrefix = path.split(".")[0];
+            const pathSuffix = path.split(".").slice(1).join(".");
+            // new path is the module id with the same suffix
+            const newPath = module.id + "." + pathSuffix;
+            try {
+                module.value.content = await fileReader(path);
+            }
+            catch {
+                logger.error(`Script file ${path} not found`);
+                // try new path
+                try {
+                    module.value.content = await fileReader(newPath);
+                }
+                catch {
+                    logger.error(`Script file ${newPath} not found`);
+                }
+            }
+            // rename the file if the prefix is different from the module id (fix old naming)
+            // if (pathPrefix != module.id && renamer) {
+            //   logger.info(`Renaming ${path} to ${module.id}.${pathSuffix}`);
+            //   try {
+            //     renamer(localPath + path, localPath + module.id + "." + pathSuffix);
+            //   } catch {
+            //     logger.info(`Failed to rename ${path} to ${module.id}.${pathSuffix}`);
+            //   }
+            // }
+            const lock = module.value.lock;
+            if (removeLocks && removeLocks.includes(path)) {
+                module.value.lock = undefined;
+                // delete the file if the prefix is different from the module id (fix old naming)
+                // if (lock && lock != "") {
+                //   const path = lock.split(" ")[1];
+                //   const pathPrefix = path.split(".")[0];
+                //   if (pathPrefix != module.id && deleter) {
+                //     logger.info(`Deleting ${path}`);
+                //     try {
+                //       deleter(localPath + path);
+                //     } catch {
+                //       logger.error(`Failed to delete ${path}`);
+                //     } 
+                //   }
+                // }
+            }
+            else if (lock &&
+                typeof lock == "string" &&
+                lock.trimStart().startsWith("!inline ")) {
+                const path = lock.split(" ")[1];
+                try {
+                    module.value.lock = await fileReader(path.replaceAll("/", separator));
+                }
+                catch {
+                    logger.error(`Lock file ${path} not found`);
+                }
+            }
+        }
+        else if (module.value.type === "forloopflow" || module.value.type === "whileloopflow") {
+            await replaceInlineScripts(module.value.modules, fileReader, logger, localPath, separator, removeLocks);
+        }
+        else if (module.value.type === "branchall") {
+            await Promise.all(module.value.branches.map(async (branch) => {
+                await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks);
+            }));
+        }
+        else if (module.value.type === "branchone") {
+            await Promise.all(module.value.branches.map(async (branch) => {
+                await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks);
+            }));
+            await replaceInlineScripts(module.value.default, fileReader, logger, localPath, separator, removeLocks);
+        }
+    }));
+}