windmill-cli 1.655.0 → 1.657.0

package/esm/main.js

@@ -11785,7 +11785,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.655.0",
+    VERSION: "1.657.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -59380,7 +59380,7 @@ async function generateMetadata(opts, scriptPath) {
   } else {
     const ignore = await ignoreF(opts);
     const elems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => {
-      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p);
+      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p);
     }, false, {});
     let hasAny = false;
     info("Generating metadata for all stale scripts:");
@@ -60584,8 +60584,8 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
   if (Object.keys(filteredDeps).length > 0 && !noStaleMessage) {
     info((await blueColor())(`Found workspace dependencies (${workspaceDependenciesLanguages.map((l) => l.filename).join("/")}) for ${folder}, using them`));
   }
+  let changedScripts = [];
   if (!justUpdateMetadataLock) {
-    const changedScripts = [];
     for (const [path7, hash2] of Object.entries(hashes)) {
       if (path7 == TOP_HASH) {
         continue;
@@ -60627,6 +60627,11 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
   if (!noStaleMessage) {
     info(colors.green(`Flow ${remote_path} lockfiles updated`));
   }
+  const updatedScripts = changedScripts.map((p) => {
+    const parts = p.split(SEP7);
+    return parts[parts.length - 1].replace(/\.[^.]+$/, "");
+  });
+  return { path: remote_path, updatedScripts };
 }
 async function filterWorkspaceDependenciesForFlow(flowValue, rawWorkspaceDependencies, folder) {
   const clonedValue = structuredClone(flowValue);
@@ -62984,7 +62989,6 @@ __export(exports_metadata, {
   getRawWorkspaceDependencies: () => getRawWorkspaceDependencies,
   generateScriptMetadataInternal: () => generateScriptMetadataInternal,
   generateScriptHash: () => generateScriptHash,
-  generateAllMetadata: () => generateAllMetadata,
   filterWorkspaceDependenciesForScripts: () => filterWorkspaceDependenciesForScripts,
   filterWorkspaceDependencies: () => filterWorkspaceDependencies,
   extractWorkspaceDepsAnnotation: () => extractWorkspaceDepsAnnotation,
@@ -63012,7 +63016,6 @@ function loadParser(pkgName) {
   }
   return p;
 }
-async function generateAllMetadata() {}
 async function getRawWorkspaceDependencies() {
   const rawWorkspaceDeps = {};
   try {
@@ -63407,6 +63410,9 @@ async function inferSchema(language, content, currentSchema, path8) {
     }
     currentSchema.properties[arg.name] = sortObject(currentSchema.properties[arg.name]);
     argSigToJsonSchemaType(arg.typ, currentSchema.properties[arg.name]);
+    if (arg.otyp && arg.otyp.includes("[") && arg.otyp.includes("|")) {
+      currentSchema.properties[arg.name].originalType = arg.otyp;
+    }
     currentSchema.properties[arg.name].default = arg.default;
     if (!arg.has_default && !currentSchema.required.includes(arg.name)) {
       currentSchema.required.push(arg.name);
@@ -63951,6 +63957,7 @@ async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, op
   if (Object.keys(filteredDeps).length > 0 && !noStaleMessage) {
     info((await blueColor())(`Found workspace dependencies (${workspaceDependenciesLanguages.map((l) => l.filename).join("/")}) for ${appFolder}, using them`));
   }
+  let updatedScripts = [];
   if (!justUpdateMetadataLock) {
     const changedScripts = [];
     for (const [scriptPath, hash2] of Object.entries(hashes)) {
@@ -63973,11 +63980,13 @@ async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, op
           runnables = rawAppFile.runnables;
         }
         replaceInlineScripts2(runnables, runnablesPath + SEP11, false);
-        await updateRawAppRunnables(workspace, runnables, remote_path, appFolder, filteredDeps, opts.defaultTs);
+        updatedScripts = await updateRawAppRunnables(workspace, runnables, remote_path, appFolder, filteredDeps, opts.defaultTs, noStaleMessage);
       } else {
         const normalAppFile = appFile;
         replaceInlineScripts2(normalAppFile.value, appFolder + SEP11, false);
-        normalAppFile.value = await updateAppInlineScripts(workspace, normalAppFile.value, remote_path, appFolder, filteredDeps, opts.defaultTs);
+        const result = await updateAppInlineScripts(workspace, normalAppFile.value, remote_path, appFolder, filteredDeps, opts.defaultTs, noStaleMessage);
+        normalAppFile.value = result.value;
+        updatedScripts = result.updatedScripts;
         writeIfChanged(appFilePath, import_yaml17.stringify(appFile, yamlOptions));
       }
     } else if (!noStaleMessage) {
@@ -63992,6 +64001,7 @@ async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, op
   if (!noStaleMessage) {
     info(colors.green(`App ${remote_path} lockfiles updated`));
   }
+  return { path: remote_path, updatedScripts };
 }
 async function filterWorkspaceDependenciesForApp(appValue, rawWorkspaceDependencies, folder) {
   const scripts = [];
@@ -64033,7 +64043,8 @@ async function traverseAndProcessInlineScripts(obj, processor, currentPath = [])
   }
   return result;
 }
-async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder, rawDeps, defaultTs = "bun") {
+async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder, rawDeps, defaultTs = "bun", noStaleMessage) {
+  const updatedRunnables = [];
   const runnablesFolder = path9.join(appFolder, APP_BACKEND_FOLDER);
   try {
     await mkdir4(runnablesFolder, { recursive: true });
@@ -64070,8 +64081,9 @@ async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder
       writeRunnableToBackend(runnablesFolder, runnableId, simplifiedRunnable);
       continue;
     }
-    info(colors.gray(`Generating lock for runnable ${runnableId} (${language})
-        }`));
+    if (!noStaleMessage) {
+      info(colors.gray(`Generating lock for runnable ${runnableId} (${language})`));
+    }
     try {
       const lock = await generateInlineScriptLock(workspace, content, language, `${remotePath}/${runnableId}`, rawDeps);
       const [basePathO, ext2] = pathAssigner.assignPath(runnable.name ?? runnableId, language);
@@ -64089,15 +64101,20 @@ async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder
         }
       }
       writeRunnableToBackend(runnablesFolder, runnableId, simplifiedRunnable);
-      info(colors.gray(`  Written ${runnableId}.yaml, ${basePath}${ext2}${lock ? ` and ${basePath}lock` : ""}`));
+      updatedRunnables.push(runnableId);
+      if (!noStaleMessage) {
+        info(colors.gray(`  Written ${runnableId}.yaml, ${basePath}${ext2}${lock ? ` and ${basePath}lock` : ""}`));
+      }
     } catch (error2) {
       error(colors.red(`Failed to generate lock for runnable ${runnableId}: ${error2.message}`));
       writeRunnableToBackend(runnablesFolder, runnableId, runnable);
     }
   }
+  return updatedRunnables;
 }
-async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder, rawDeps, defaultTs = "bun") {
+async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder, rawDeps, defaultTs = "bun", noStaleMessage) {
   const pathAssigner = newPathAssigner(defaultTs, { skipInlineScriptSuffix: getNonDottedPaths() });
+  const updatedScripts = [];
   const processor = async (inlineScript, context) => {
     const language = inlineScript.language;
     const content = inlineScript.content;
@@ -64113,7 +64130,9 @@ async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder
     try {
       let lock;
       if (language !== "frontend") {
-        info(colors.gray(`Generating lock for inline script "${scriptName}" at ${context.path.join(".")} (${language})`));
+        if (!noStaleMessage) {
+          info(colors.gray(`Generating lock for inline script "${scriptName}" at ${context.path.join(".")} (${language})`));
+        }
         lock = await generateInlineScriptLock(workspace, content, language, scriptPath, rawDeps);
       }
       const [basePathO, ext2] = pathAssigner.assignPath(scriptName, language);
@@ -64126,7 +64145,12 @@ async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder
       }
       const inlineContentRef = `!inline ${basePath}${ext2}`;
       const inlineLockRef = lock && lock !== "" ? `!inline ${basePath}lock` : "";
-      info(colors.gray(`  Written ${basePath}${ext2}${lock ? ` and ${basePath}lock` : ""}`));
+      if (!noStaleMessage) {
+        info(colors.gray(`  Written ${basePath}${ext2}${lock ? ` and ${basePath}lock` : ""}`));
+      }
+      if (language !== "frontend") {
+        updatedScripts.push(scriptName);
+      }
       return {
         ...inlineScript,
         content: inlineContentRef,
@@ -64137,7 +64161,8 @@ async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder
       return inlineScript;
     }
   };
-  return await traverseAndProcessInlineScripts(appValue, processor);
+  const updatedValue = await traverseAndProcessInlineScripts(appValue, processor);
+  return { value: updatedValue, updatedScripts };
 }
 async function generateInlineScriptLock(workspace, content, language, scriptPath, rawWorkspaceDependencies) {
   const filteredDeps = rawWorkspaceDependencies ? filterWorkspaceDependencies(rawWorkspaceDependencies, content, language) : undefined;
@@ -67265,6 +67290,8 @@ function migrateToGroupedFormat(settings) {
     result.color = settings.color;
   if (settings.operator_settings !== undefined)
     result.operator_settings = settings.operator_settings;
+  if (settings.datatable !== undefined)
+    result.datatable = settings.datatable;
   if (settings.slack_team_id !== undefined)
     result.slack_team_id = settings.slack_team_id;
   if (settings.slack_name !== undefined)
@@ -67333,6 +67360,7 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       mute_critical_alerts: remoteSettings.mute_critical_alerts,
       color: remoteSettings.color,
       operator_settings: remoteSettings.operator_settings,
+      datatable: remoteSettings.datatable,
       slack_team_id: remoteSettings.slack_team_id,
       slack_name: remoteSettings.slack_name,
       slack_command_script: remoteSettings.slack_command_script
@@ -67491,6 +67519,13 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       requestBody: localSettings.operator_settings
     });
   }
+  if (!deepEqual(localSettings.datatable, settings.datatable)) {
+    debug(`Updating datatable config...`);
+    await editDataTableConfig({
+      workspace,
+      requestBody: { settings: localSettings.datatable ?? { datatables: {} } }
+    });
+  }
   if (localSettings.slack_command_script != settings.slack_command_script) {
     debug(`Updating slack command script...`);
     await editSlackCommand({
@@ -77322,6 +77357,23 @@ folder related commands
 - \`folder add-missing\` - create default folder.meta.yaml for all subdirectories of f/ that are missing one
   - \`-y, --yes\` - skip confirmation prompt
 
+### generate-metadata
+
+Generate metadata (locks, schemas) for all scripts, flows, and apps
+
+**Arguments:** \`[folder:string]\`
+
+**Options:**
+- \`--yes\` - Skip confirmation prompt
+- \`--dry-run\` - Show what would be updated without making changes
+- \`--lock-only\` - Re-generate only the lock files
+- \`--schema-only\` - Re-generate only script schemas (skips flows and apps)
+- \`--skip-scripts\` - Skip processing scripts
+- \`--skip-flows\` - Skip processing flows
+- \`--skip-apps\` - Skip processing apps
+- \`-i --includes <patterns:file[]>\` - Comma separated patterns to specify which files to include
+- \`-e --excludes <patterns:file[]>\` - Comma separated patterns to specify which files to exclude
+
 ### gitsync-settings
 
 Manage git-sync settings between local wmill.yaml and Windmill backend
@@ -78996,7 +79048,7 @@ async function generateMetadata2(opts, folder) {
   info(colors.gray(`Checking ${checking.join(", ")}...`));
   if (!skipScripts) {
     const scriptElems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => {
-      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p);
+      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p);
     }, false, {});
     for (const e of Object.keys(scriptElems)) {
       const candidate = await generateScriptMetadataInternal(e, workspace, opts, true, true, rawWorkspaceDependencies, codebases, false);
@@ -79037,10 +79089,14 @@ async function generateMetadata2(opts, folder) {
   }
   let filteredItems = staleItems;
   if (folder) {
-    if (folder.endsWith(SEP21)) {
+    folder = folder.replaceAll("\\", "/");
+    if (folder.endsWith("/")) {
       folder = folder.substring(0, folder.length - 1);
     }
-    filteredItems = staleItems.filter((item) => item.folder === folder || item.folder.startsWith(folder + SEP21));
+    filteredItems = staleItems.filter((item) => {
+      const normalizedFolder = item.folder.replaceAll("\\", "/");
+      return normalizedFolder === folder || normalizedFolder.startsWith(folder + "/");
+    });
   }
   if (filteredItems.length === 0) {
     info(colors.green("All metadata up-to-date"));
@@ -79094,13 +79150,15 @@ async function generateMetadata2(opts, folder) {
   }
   for (const item of flows) {
     current++;
-    info(`${formatProgress(current)} flow   ${colors.cyan(item.path)}`);
-    await generateFlowLockInternal(item.folder, false, workspace, opts, false, true);
+    const result = await generateFlowLockInternal(item.folder, false, workspace, opts, false, true);
+    const scriptsInfo = result?.updatedScripts?.length ? `: ${colors.gray(result.updatedScripts.join(", "))}` : "";
+    info(`${formatProgress(current)} flow   ${colors.cyan(item.path)}${scriptsInfo}`);
   }
   for (const item of apps2) {
     current++;
-    info(`${formatProgress(current)} app    ${colors.cyan(item.path)}`);
-    await generateAppLocksInternal(item.folder, item.isRawApp, false, workspace, opts, false, true);
+    const result = await generateAppLocksInternal(item.folder, item.isRawApp, false, workspace, opts, false, true);
+    const scriptsInfo = result?.updatedScripts?.length ? `: ${colors.gray(result.updatedScripts.join(", "))}` : "";
+    info(`${formatProgress(current)} app    ${colors.cyan(item.path)}${scriptsInfo}`);
   }
   info("");
   info(colors.green(`Done. Updated ${total} item(s).`));
@@ -79183,7 +79241,7 @@ var docs_default = command30;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.655.0";
+var VERSION = "1.657.0";
 var command31 = new Command().name("wmill").action(() => info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`)).description("Windmill CLI").globalOption("--workspace <workspace:string>", "Specify the target workspace. This overrides the default workspace.").globalOption("--debug --verbose", "Show debug/verbose logs").globalOption("--show-diffs", "Show diff informations when syncing (may show sensitive informations)").globalOption("--token <token:string>", "Specify an API token. This will override any stored token.").globalOption("--base-url <baseUrl:string>", "Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.").globalOption("--config-dir <configDir:string>", "Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.").env("HEADERS <headers:string>", `Specify headers to use for all requests. e.g: "HEADERS='h1: v1, h2: v2'"`).version(VERSION).versionOption(false).command("init", init_default).command("app", app_default).command("flow", flow_default).command("script", script_default).command("workspace", workspace_default).command("resource", resource_default).command("resource-type", resource_type_default).command("user", user_default).command("variable", variable_default).command("hub", hub_default).command("folder", folder_default).command("schedule", schedule_default).command("trigger", trigger_default).command("dev", dev_default2).command("sync", sync_default).command("lint", lint_default).command("gitsync-settings", gitsync_settings_default).command("instance", instance_default).command("worker-groups", worker_groups_default).command("workers", workers_default).command("queues", queues_default).command("dependencies", dependencies_default).command("jobs", jobs_default).command("generate-metadata", generate_metadata_default).command("docs", docs_default).command("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.655.0",
+  "version": "1.657.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",