windmill-cli 1.585.1 → 1.586.1

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

@@ -8,9 +8,9 @@ import * as wmill from "../../../gen/services.gen.js";
 import * as specificItems from "../../core/specific_items.js";
 import { getCurrentGitBranch } from "../../utils/git.js";
 import { defaultScriptMetadata, scriptBootstrapCode, } from "../../../bootstrap/script_bootstrap.js";
-import { generateScriptMetadataInternal, parseMetadataFile, } from "../../utils/metadata.js";
-import { inferContentTypeFromFilePath, languagesWithRawReqsSupport, } from "../../utils/script_common.js";
-import { elementsToMap, findCodebase, readDirRecursiveWithIgnore, yamlOptions, } from "../sync/sync.js";
+import { generateScriptMetadataInternal, getRawWorkspaceDependencies, parseMetadataFile, } from "../../utils/metadata.js";
+import { inferContentTypeFromFilePath, } from "../../utils/script_common.js";
+import { elementsToMap, findCodebase, yamlOptions, } from "../sync/sync.js";
 import { ignoreF } from "../sync/sync.js";
 import { FSFSElement } from "../sync/sync.js";
 import { mergeConfigWithConfigFile, readConfigFile, } from "../../core/conf.js";
@@ -32,8 +32,7 @@ async function push(opts, filePath) {
     }
     await requireLogin(opts);
     const codebases = await listSyncCodebases(opts);
-    const globalDeps = await findGlobalDeps();
-    await handleFile(filePath, workspace, [], undefined, opts, globalDeps, codebases);
+    await handleFile(filePath, workspace, [], undefined, opts, await getRawWorkspaceDependencies(), codebases);
     log.info(colors.bold.underline.green(`Script ${filePath} pushed`));
 }
 export async function findResourceFile(path) {
@@ -68,18 +67,18 @@ export async function findResourceFile(path) {
     }
     return validCandidates[0];
 }
-export async function handleScriptMetadata(path, workspace, alreadySynced, message, globalDeps, codebases, opts) {
+export async function handleScriptMetadata(path, workspace, alreadySynced, message, rawWorkspaceDependencies, codebases, opts) {
     if (path.endsWith(".script.json") ||
         path.endsWith(".script.yaml") ||
         path.endsWith(".script.lock")) {
         const contentPath = await findContentFile(path);
-        return handleFile(contentPath, workspace, alreadySynced, message, opts, globalDeps, codebases);
+        return handleFile(contentPath, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases);
     }
     else {
         return false;
     }
 }
-export async function handleFile(path, workspace, alreadySynced, message, opts, globalDeps, codebases) {
+export async function handleFile(path, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases) {
     if (!path.includes(".inline_script.") &&
         exts.some((exts) => path.endsWith(exts))) {
         if (alreadySynced.includes(path)) {
@@ -98,7 +97,9 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             let outputFiles = [];
             if (codebase.customBundler) {
                 log.info(`Using custom bundler ${codebase.customBundler} for ${path}`);
-                bundleContent = execSync(codebase.customBundler + " " + path, { maxBuffer: 1024 * 1024 * 50 }).toString();
+                bundleContent = execSync(codebase.customBundler + " " + path, {
+                    maxBuffer: 1024 * 1024 * 50,
+                }).toString();
                 log.info("Custom bundler executed for " + path);
             }
             else {
@@ -115,24 +116,31 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
                     inject: codebase.inject,
                     define: codebase.define,
                     loader: codebase.loader ?? { ".node": "file" },
-                    outdir: '/',
+                    outdir: "/",
                     platform: "node",
                     packages: "bundle",
                     target: format == "cjs" ? "node20.15.1" : "esnext",
+                    banner: codebase.banner,
+                    // ...(codebase.banner != null && { banner: codebase.banner }),
                 });
                 const endTime = performance.now();
                 bundleContent = out.outputFiles[0].text;
-                outputFiles = out.outputFiles;
+                outputFiles = out.outputFiles ?? [];
+                if (outputFiles.length == 0) {
+                    throw new Error(`No output files found for ${path}`);
+                }
                 log.info(`Finished bundling ${path}: ${(bundleContent.length / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
             }
             if (outputFiles.length > 1) {
                 const archiveNpm = await import("@ayonli/jsext/archive");
-                log.info(`Found multiple output files for ${path}, creating a tarball... ${outputFiles.map((file) => file.path).join(", ")}`);
+                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();
                 const mainPath = path.split(SEP).pop()?.split(".")[0] + ".js";
-                const content = outputFiles.find((file) => file.path == "/" + mainPath)?.text ?? '';
+                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) {
@@ -174,8 +182,8 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
                     path,
                     workspaceRemote: workspace,
                     schemaOnly: codebase ? true : undefined,
-                    globalDeps,
-                    codebases
+                    rawWorkspaceDependencies,
+                    codebases,
                 }
                 : undefined))?.payload;
         const workspaceId = workspace.workspaceId;
@@ -242,6 +250,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             timeout: typed?.timeout,
             on_behalf_of_email: typed?.on_behalf_of_email,
         };
+        // console.log(requestBodyCommon.codebase);
         // log.info(JSON.stringify(requestBodyCommon, null, 2))
         // log.info(JSON.stringify(opts, null, 2))
         if (remote) {
@@ -693,29 +702,6 @@ async function bootstrap(opts, scriptPath, language) {
         createNew: true,
     });
 }
-export async function findGlobalDeps() {
-    var globalDeps = new Map();
-    const els = await FSFSElement(dntShim.Deno.cwd(), [], false);
-    for await (const entry of readDirRecursiveWithIgnore((p, isDir) => {
-        p = SEP + p;
-        return (!isDir &&
-            // Skip if the filename is not one of lockfile names
-            !languagesWithRawReqsSupport.some((lockfile) => p.endsWith(SEP + lockfile.rrFilename)));
-    }, els)) {
-        if (entry.isDirectory || entry.ignored)
-            continue;
-        const content = await entry.getContentText();
-        // Iterate over available languages to find which lockfile
-        languagesWithRawReqsSupport.map((lock) => {
-            if (entry.path.endsWith(lock.rrFilename)) {
-                const current = globalDeps.get(lock) ?? {};
-                current[entry.path.substring(0, entry.path.length - lock.rrFilename.length)] = content;
-                globalDeps.set(lock, current);
-            }
-        });
-    }
-    return globalDeps;
-}
 async function generateMetadata(opts, scriptPath) {
     log.info("This command only works for workspace scripts, for flows inline scripts use `wmill flow generate-locks`");
     if (scriptPath == "") {
@@ -728,12 +714,13 @@ async function generateMetadata(opts, scriptPath) {
     await requireLogin(opts);
     opts = await mergeConfigWithConfigFile(opts);
     const codebases = await listSyncCodebases(opts);
-    const globalDeps = await findGlobalDeps();
+    const rawWorkspaceDependencies = await getRawWorkspaceDependencies();
     if (scriptPath) {
         // read script metadata file
-        await generateScriptMetadataInternal(scriptPath, workspace, opts, false, false, globalDeps, codebases, false);
+        await generateScriptMetadataInternal(scriptPath, workspace, opts, false, false, rawWorkspaceDependencies, codebases, false);
     }
     else {
+        // TODO: test this as well.
         const ignore = await ignoreF(opts);
         const elems = await elementsToMap(await FSFSElement(dntShim.Deno.cwd(), codebases, false), (p, isD) => {
             return ((!isD && !exts.some((ext) => p.endsWith(ext))) ||
@@ -744,7 +731,7 @@ async function generateMetadata(opts, scriptPath) {
         let hasAny = false;
         log.info("Generating metadata for all stale scripts:");
         for (const e of Object.keys(elems)) {
-            const candidate = await generateScriptMetadataInternal(e, workspace, opts, true, true, globalDeps, codebases, false);
+            const candidate = await generateScriptMetadataInternal(e, workspace, opts, true, true, rawWorkspaceDependencies, codebases, false);
             if (candidate) {
                 hasAny = true;
                 log.info(colors.green(`+ ${candidate} `));
@@ -767,8 +754,9 @@ async function generateMetadata(opts, scriptPath) {
             log.info(colors.green.bold("No metadata to update"));
             return;
         }
+        // TODO: test this
         for (const e of Object.keys(elems)) {
-            await generateScriptMetadataInternal(e, workspace, opts, false, true, globalDeps, codebases, false);
+            await generateScriptMetadataInternal(e, workspace, opts, false, true, rawWorkspaceDependencies, codebases, false);
         }
     }
 }

package/esm/src/commands/sync/pull.js

@@ -1,6 +1,6 @@
 import { colors, Command, JSZip, log } from "../../../deps.js";
 import { getHeaders } from "../../utils/utils.js";
-export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipResourceTypes, skipSecrets, includeSchedules, includeTriggers, includeUsers, includeGroups, includeSettings, includeKey, defaultTs) {
+export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipResourceTypes, skipSecrets, includeSchedules, includeTriggers, includeUsers, includeGroups, includeSettings, includeKey, skipWorkspaceDependencies, defaultTs) {
     const requestHeaders = new Headers();
     requestHeaders.set("Authorization", "Bearer " + workspace.token);
     requestHeaders.set("Content-Type", "application/octet-stream");
@@ -10,10 +10,12 @@ export async function downloadZip(workspace, plainSecrets, skipVariables, skipRe
             requestHeaders.set(key, value);
         }
     }
-    const zipResponse = await fetch(workspace.remote +
+    const includeWorkspaceDependenciesValue = !(skipWorkspaceDependencies ?? false);
+    const url = workspace.remote +
         "api/w/" +
         workspace.workspaceId +
-        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_triggers=${includeTriggers ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&default_ts=${defaultTs ?? "bun"}&skip_resource_types=${skipResourceTypes ?? false}`, {
+        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_triggers=${includeTriggers ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&include_workspace_dependencies=${includeWorkspaceDependenciesValue}&default_ts=${defaultTs ?? "bun"}&skip_resource_types=${skipResourceTypes ?? false}`;
+    const zipResponse = await fetch(url, {
         headers: requestHeaders,
         method: "GET",
     });