windmill-cli 1.700.2 → 1.701.0

package/esm/main.js

@@ -16752,7 +16752,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.700.2",
+    VERSION: "1.701.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -44417,7 +44417,7 @@ var require_zipEntries = __commonJS((exports, module) => {
       if (this.centralDirRecords !== this.files.length) {
         if (this.centralDirRecords !== 0 && this.files.length === 0) {
           throw new Error("Corrupted zip or bug: expected " + this.centralDirRecords + " records in central dir, got " + this.files.length);
-        } else {}
+        }
       }
     },
     readEndOfCentral: function() {
@@ -55347,7 +55347,7 @@ var require_loader = __commonJS((exports, module) => {
     var error2 = generateError(state, message);
     if (state.onWarning) {
       state.onWarning.call(null, error2);
-    } else {}
+    }
   }
   var directiveHandlers = {
     YAML: function handleYamlDirective(state, name, args) {
@@ -55885,7 +55885,7 @@ var require_loader = __commonJS((exports, module) => {
       } else if (detectedIndent) {
         sc.value += common3.repeat(`
 `, emptyLines + 1);
-      } else {}
+      }
       detectedIndent = true;
       emptyLines = 0;
       captureStart = state.position;
@@ -64370,12 +64370,16 @@ var init_path_assigner = __esm(() => {
 });
 
 // windmill-utils-internal/src/inline-scripts/extractor.ts
-function extractRawscriptInline(id, summary, rawscript, mapping, separator, assigner) {
+function extractRawscriptInline(id, summary, rawscript, mapping, separator, assigner, failOnInlineDirective) {
   const [basePath, ext2] = assigner.assignPath(summary ?? id, rawscript.language);
   const mappedPath = mapping[id];
   const path10 = mappedPath ?? basePath + ext2;
   const language = rawscript.language;
   const content = rawscript.content;
+  if (failOnInlineDirective && typeof content === "string" && content.startsWith("!inline ")) {
+    throw new Error(`Refusing to extract corrupted inline script for module '${id}': ` + `rawscript.content is the literal string \`${content.split(`
+`)[0]}\` ` + `instead of script source. The backend's flow_version.value is corrupt — ` + `re-push from a known-good local copy to repair it.`);
+  }
   const r = [{ path: path10, content, language, is_lock: false }];
   rawscript.content = "!inline " + path10.replaceAll(separator, "/");
   const lock = rawscript.lock;
@@ -64390,19 +64394,20 @@ function extractRawscriptInline(id, summary, rawscript, mapping, separator, assi
 }
 function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs, pathAssigner, options) {
   const assigner = pathAssigner ?? newPathAssigner(defaultTs ?? "bun", { skipInlineScriptSuffix: options?.skipInlineScriptSuffix });
+  const failOnInlineDirective = options?.failOnInlineDirective ?? false;
   return modules.flatMap((m) => {
     if (m.value.type == "rawscript") {
-      return extractRawscriptInline(m.id, m.summary, m.value, mapping, separator, assigner);
+      return extractRawscriptInline(m.id, m.summary, m.value, mapping, separator, assigner, failOnInlineDirective);
     } else if (m.value.type == "forloopflow") {
-      return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner);
+      return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner, options);
     } else if (m.value.type == "branchall") {
-      return m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner));
+      return m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner, options));
     } else if (m.value.type == "whileloopflow") {
-      return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner);
+      return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner, options);
     } else if (m.value.type == "branchone") {
       return [
-        ...m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner)),
-        ...extractInlineScripts(m.value.default, mapping, separator, defaultTs, assigner)
+        ...m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner, options)),
+        ...extractInlineScripts(m.value.default, mapping, separator, defaultTs, assigner, options)
       ];
     } else if (m.value.type == "aiagent") {
       return (m.value.tools ?? []).flatMap((tool) => {
@@ -64410,7 +64415,7 @@ function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs,
         if (!toolValue || toolValue.tool_type !== "flowmodule" || toolValue.type !== "rawscript") {
           return [];
         }
-        return extractRawscriptInline(tool.id, tool.summary, toolValue, mapping, separator, assigner);
+        return extractRawscriptInline(tool.id, tool.summary, toolValue, mapping, separator, assigner, failOnInlineDirective);
       });
     } else {
       return [];
@@ -64786,12 +64791,16 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
       const treePath = fileToTreePath.get(k) ?? folderNormalized + "/" + path10.basename(k, path10.extname(k));
       return tree.isStale(treePath);
     }) : changedScripts;
-    await replaceInlineScripts(flowValue.value.modules, fileReader, exports_log, folder + SEP7, SEP7, locksToRemove);
+    const missingFiles = [];
+    await replaceInlineScripts(flowValue.value.modules, fileReader, exports_log, folder + SEP7, SEP7, locksToRemove, missingFiles);
     if (flowValue.value.failure_module) {
-      await replaceInlineScripts([flowValue.value.failure_module], fileReader, exports_log, folder + SEP7, SEP7, locksToRemove);
+      await replaceInlineScripts([flowValue.value.failure_module], fileReader, exports_log, folder + SEP7, SEP7, locksToRemove, missingFiles);
     }
     if (flowValue.value.preprocessor_module) {
-      await replaceInlineScripts([flowValue.value.preprocessor_module], fileReader, exports_log, folder + SEP7, SEP7, locksToRemove);
+      await replaceInlineScripts([flowValue.value.preprocessor_module], fileReader, exports_log, folder + SEP7, SEP7, locksToRemove, missingFiles);
+    }
+    if (missingFiles.length > 0) {
+      throw new Error(`Cannot regenerate lock for flow ${remote_path}: missing inline script file(s): ${missingFiles.join(", ")}. ` + `Either restore the file(s) or remove the !inline reference(s) from flow.yaml before retrying.`);
     }
     const tempScriptRefs = tree?.getTempScriptRefs(folderNormalized);
     const savedNotes = flowValue.value.notes;
@@ -64804,12 +64813,13 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
     const lockAssigner = newPathAssigner(opts.defaultTs ?? "bun", {
       skipInlineScriptSuffix: getNonDottedPaths()
     });
-    const inlineScripts = extractInlineScripts(flowValue.value.modules, currentMapping, SEP7, opts.defaultTs, lockAssigner);
+    const extractOpts = { skipInlineScriptSuffix: getNonDottedPaths(), failOnInlineDirective: true };
+    const inlineScripts = extractInlineScripts(flowValue.value.modules, currentMapping, SEP7, opts.defaultTs, lockAssigner, extractOpts);
     if (flowValue.value.failure_module) {
-      inlineScripts.push(...extractInlineScripts([flowValue.value.failure_module], currentMapping, SEP7, opts.defaultTs, lockAssigner));
+      inlineScripts.push(...extractInlineScripts([flowValue.value.failure_module], currentMapping, SEP7, opts.defaultTs, lockAssigner, extractOpts));
     }
     if (flowValue.value.preprocessor_module) {
-      inlineScripts.push(...extractInlineScripts([flowValue.value.preprocessor_module], currentMapping, SEP7, opts.defaultTs, lockAssigner));
+      inlineScripts.push(...extractInlineScripts([flowValue.value.preprocessor_module], currentMapping, SEP7, opts.defaultTs, lockAssigner, extractOpts));
     }
     inlineScripts.forEach((s) => {
       writeIfChanged(process.cwd() + SEP7 + folder + SEP7 + s.path, s.content);
@@ -65931,12 +65941,12 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             try {
               const assigner = newPathAssigner(defaultTs, { skipInlineScriptSuffix: getNonDottedPaths() });
               const inlineMapping = extractCurrentMapping(flow.value.modules, {}, flow.value.failure_module, flow.value.preprocessor_module);
-              inlineScripts = extractInlineScripts(flow.value.modules, inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() });
+              inlineScripts = extractInlineScripts(flow.value.modules, inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths(), failOnInlineDirective: true });
               if (flow.value.failure_module) {
-                inlineScripts.push(...extractInlineScripts([flow.value.failure_module], inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
+                inlineScripts.push(...extractInlineScripts([flow.value.failure_module], inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths(), failOnInlineDirective: true }));
               }
               if (flow.value.preprocessor_module) {
-                inlineScripts.push(...extractInlineScripts([flow.value.preprocessor_module], inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
+                inlineScripts.push(...extractInlineScripts([flow.value.preprocessor_module], inlineMapping, SEP9, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths(), failOnInlineDirective: true }));
               }
             } catch (error2) {
               error(`Failed to extract inline scripts for flow at path: ${p}`);
@@ -75684,7 +75694,7 @@ async function pushFlow(workspace, remotePath, localPath, message, permissionedA
     await replaceInlineScripts([localFlow.value.preprocessor_module], fileReader, exports_log, localPath, SEP20, undefined, missingFiles);
   }
   if (missingFiles.length > 0) {
-    warn(colors.yellow(`Warning: missing inline script file(s): ${missingFiles.join(", ")}. ` + `The flow will be pushed with unresolved !inline references.`));
+    throw new Error(`Cannot push flow ${remotePath}: missing inline script file(s): ${missingFiles.join(", ")}. ` + `Either restore the file(s) or remove the !inline reference(s) from flow.yaml before pushing.`);
   }
   const hasOnBehalfOf = localFlow.has_on_behalf_of ?? !!localFlow.on_behalf_of_email;
   delete localFlow.has_on_behalf_of;
@@ -89676,7 +89686,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.700.2";
+var VERSION = "1.701.0";
 async function checkVersionSafe(cmd) {
   const mainCommand = cmd.getMainCommand();
   const upgradeCommand = mainCommand.getCommand("upgrade");

package/package.json

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