windmill-cli 1.573.5 → 1.574.0

package/esm/gen/core/OpenAPI.js

@@ -32,7 +32,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: getEnv("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: '1.573.5',
+    VERSION: '1.574.0',
     WITH_CREDENTIALS: true,
     interceptors: {
         request: new Interceptors(),

package/esm/src/commands/script/script.js

@@ -93,7 +93,9 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
         const language = inferContentTypeFromFilePath(path, opts?.defaultTs);
         const codebase = language == "bun" ? findCodebase(path, codebases) : undefined;
         let bundleContent = undefined;
+        let forceTar = false;
         if (codebase) {
+            let outputFiles = [];
             if (codebase.customBundler) {
                 log.info(`Using custom bundler ${codebase.customBundler} for ${path}`);
                 bundleContent = execSync(codebase.customBundler + " " + path, { maxBuffer: 1024 * 1024 * 50 }).toString();
@@ -112,30 +114,57 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
                     external: codebase.external,
                     inject: codebase.inject,
                     define: codebase.define,
+                    loader: codebase.loader ?? { ".node": "file" },
+                    outdir: '/',
                     platform: "node",
                     packages: "bundle",
                     target: format == "cjs" ? "node20.15.1" : "esnext",
                 });
                 const endTime = performance.now();
                 bundleContent = out.outputFiles[0].text;
+                outputFiles = out.outputFiles;
                 log.info(`Finished bundling ${path}: ${(bundleContent.length / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
             }
-            if (Array.isArray(codebase.assets) && codebase.assets.length > 0) {
+            if (outputFiles.length > 1) {
                 const archiveNpm = await import("@ayonli/jsext/archive");
-                log.info(`Using the following asset configuration for ${path}: ${JSON.stringify(codebase.assets)}`);
+                log.info(`Found multiple output files for ${path}, creating a tarball... ${outputFiles.map((file) => file.path).join(", ")}`);
+                forceTar = true;
                 const startTime = performance.now();
                 const tarball = new archiveNpm.Tarball();
-                tarball.append(new File([bundleContent], "main.js", { type: "text/plain" }));
-                for (const asset of codebase.assets) {
-                    const data = fs.readFileSync(asset.from);
-                    const blob = new Blob([data], { type: "text/plain" });
-                    const file = new File([blob], asset.to);
-                    tarball.append(file);
+                const mainPath = path.split(SEP).pop()?.split(".")[0] + ".js";
+                const content = outputFiles.find((file) => file.path == "/" + mainPath)?.text ?? '';
+                log.info(`Main content: ${content.length}chars`);
+                tarball.append(new File([content], "main.js", { type: "text/plain" }));
+                for (const file of outputFiles) {
+                    if (file.path == "/" + mainPath) {
+                        continue;
+                    }
+                    log.info(`Adding file: ${file.path.substring(1)}`);
+                    const fil = new File([file.contents], file.path.substring(1));
+                    tarball.append(fil);
                 }
                 const endTime = performance.now();
                 log.info(`Finished creating tarball for ${path}: ${(tarball.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
                 bundleContent = tarball;
             }
+            else {
+                if (Array.isArray(codebase.assets) && codebase.assets.length > 0) {
+                    const archiveNpm = await import("@ayonli/jsext/archive");
+                    log.info(`Using the following asset configuration for ${path}: ${JSON.stringify(codebase.assets)}`);
+                    const startTime = performance.now();
+                    const tarball = new archiveNpm.Tarball();
+                    tarball.append(new File([bundleContent], "main.js", { type: "text/plain" }));
+                    for (const asset of codebase.assets) {
+                        const data = fs.readFileSync(asset.from);
+                        const blob = new Blob([data], { type: "text/plain" });
+                        const file = new File([blob], asset.to);
+                        tarball.append(file);
+                    }
+                    const endTime = performance.now();
+                    log.info(`Finished creating tarball for ${path}: ${(tarball.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
+                    bundleContent = tarball;
+                }
+            }
         }
         let typed = opts?.skipScriptsMetadata
             ? undefined
@@ -183,7 +212,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             // }
         }
         if (typed && codebase) {
-            typed.codebase = await codebase.getDigest();
+            typed.codebase = await codebase.getDigest(forceTar);
         }
         const requestBodyCommon = {
             content,
@@ -209,7 +238,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             concurrency_key: typed?.concurrency_key,
             debounce_key: typed?.debounce_key,
             debounce_delay_s: typed?.debounce_delay_s,
-            codebase: await codebase?.getDigest(),
+            codebase: await codebase?.getDigest(forceTar),
             timeout: typed?.timeout,
             on_behalf_of_email: typed?.on_behalf_of_email,
         };

package/esm/src/main.js

@@ -38,7 +38,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.573.5";
+export const VERSION = "1.574.0";
 export const WM_FORK_PREFIX = "wm-fork";
 const command = new Command()
     .name("wmill")

package/esm/src/utils/codebase.js

@@ -8,13 +8,18 @@ export function listSyncCodebases(options) {
     }
     for (const codebase of options?.codebases ?? []) {
         let _digest = undefined;
-        const getDigest = async () => {
-            if (_digest == undefined) {
+        let alreadyPrinted = false;
+        const getDigest = async (forceTar) => {
+            if (_digest == undefined || forceTar) {
                 _digest = await digestDir(codebase.relative_path, JSON.stringify(codebase));
-                if (Array.isArray(codebase.assets) && codebase.assets.length > 0) {
+                if (forceTar || (Array.isArray(codebase.assets) && codebase.assets.length > 0)) {
                     _digest += ".tar";
                 }
-                log.info(`Codebase ${codebase.relative_path}, digest: ${_digest}`);
+                if (!alreadyPrinted) {
+                    alreadyPrinted = true;
+                    log.info(`Codebase ${codebase.relative_path}, digest: ${_digest}`);
+                }
+                return _digest;
             }
             return _digest;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.573.5",
+  "version": "1.574.0",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/gen/types.gen.d.ts

@@ -18,6 +18,9 @@ export type FlowValue = {
     debounce_key?: string;
     skip_expr?: string;
     cache_ttl?: number;
+    flow_env?: {
+        [key: string]: (string);
+    };
     priority?: number;
     early_return?: string;
     /**