windmill-cli 1.725.0 → 1.726.0

package/esm/main.js

@@ -16772,7 +16772,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.725.0",
+    VERSION: "1.726.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25347,7 +25347,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.725.0";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.726.0";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -65974,6 +65974,7 @@ __export(exports_sync, {
   readDirRecursiveWithIgnore: () => readDirRecursiveWithIgnore2,
   push: () => push4,
   pull: () => pull,
+  preservePendingScriptLocks: () => preservePendingScriptLocks,
   isWhitelisted: () => isWhitelisted,
   isCaseInsensitiveFilesystem: () => isCaseInsensitiveFilesystem,
   ignoreF: () => ignoreF,
@@ -67301,6 +67302,42 @@ async function isCaseInsensitiveFilesystem(dir) {
   _caseInsensitiveFsCache = result;
   return result;
 }
+function preservePendingScriptLocks(remote, local) {
+  const modMeta = getModuleFolderSuffix() + "/script";
+  for (const metaKey of Object.keys(remote)) {
+    const isYaml = metaKey.endsWith(".script.yaml") || metaKey.endsWith(modMeta + ".yaml");
+    const isJson = metaKey.endsWith(".script.json") || metaKey.endsWith(modMeta + ".json");
+    if (!isYaml && !isJson)
+      continue;
+    const localMeta = local[metaKey];
+    if (localMeta === undefined)
+      continue;
+    let remoteParsed;
+    let localParsed;
+    try {
+      remoteParsed = isYaml ? yamlParseContent(metaKey, remote[metaKey]) : JSON.parse(remote[metaKey]);
+      localParsed = isYaml ? yamlParseContent(metaKey, localMeta) : JSON.parse(localMeta);
+    } catch {
+      continue;
+    }
+    if (typeof remoteParsed !== "object" || remoteParsed === null)
+      continue;
+    if (typeof localParsed !== "object" || localParsed === null)
+      continue;
+    const remoteLock = remoteParsed["lock"];
+    if (remoteLock !== undefined && remoteLock !== null)
+      continue;
+    const localLock = localParsed["lock"];
+    if (typeof localLock !== "string" || !localLock.startsWith("!inline "))
+      continue;
+    const lockKey = localLock.slice("!inline ".length);
+    if (local[lockKey] === undefined)
+      continue;
+    remoteParsed["lock"] = localLock;
+    remote[metaKey] = isYaml ? import_yaml11.stringify(remoteParsed, yamlOptions) : JSON.stringify(remoteParsed, null, 2);
+    remote[lockKey] = local[lockKey];
+  }
+}
 async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges, specificItems, branchOverride, isEls1Remote, caseInsensitiveFs) {
   let [m1, m2] = els2 ? await Promise.all([
     elementsToMap(els1, ignore, json, skips, specificItems, branchOverride, isEls1Remote),
@@ -67324,6 +67361,9 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
       }
     }
   }
+  if (isEls1Remote === true) {
+    preservePendingScriptLocks(m1, m2);
+  }
   const changes = [];
   function parseYaml(k, v) {
     if (k.endsWith(".script.yaml")) {

package/package.json

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