windmill-cli 1.563.2 → 1.563.4

package/esm/gen/core/OpenAPI.js

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

package/esm/src/commands/flow/flow.js

@@ -171,7 +171,7 @@ async function generateLocks(opts, folder) {
             const candidate = await generateFlowLockInternal(folder, true, workspace, opts, undefined, undefined, useRawReqs);
             if (candidate) {
                 hasAny = true;
-                log.info(colors.green(`+ ${candidate}`));
+                log.info(colors.yellow.bold(`~ ${candidate}`));
             }
         }
         if (hasAny) {

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.563.2";
+export const VERSION = "1.563.4";
 export const WM_FORK_PREFIX = "wm-fork";
 const command = new Command()
     .name("wmill")

package/esm/src/utils/metadata.js

@@ -5,8 +5,8 @@ import { defaultScriptMetadata, } from "../../bootstrap/script_bootstrap.js";
 import { languagesWithRawReqsSupport, } from "./script_common.js";
 import { inferContentTypeFromFilePath } from "./script_common.js";
 import { exts, findGlobalDeps } from "../commands/script/script.js";
-import { FSFSElement, findCodebase, yamlOptions } from "../commands/sync/sync.js";
-import { generateHash, readInlinePathSync, getHeaders } from "./utils.js";
+import { FSFSElement, findCodebase, yamlOptions, } from "../commands/sync/sync.js";
+import { generateHash, readInlinePathSync, getHeaders, writeIfChanged, } from "./utils.js";
 import { replaceInlineScripts } from "../../windmill-utils-internal/src/inline-scripts/replacer.js";
 import { extractInlineScripts as extractInlineScriptsForFlows } from "../../windmill-utils-internal/src/inline-scripts/extractor.js";
 import { argSigToJsonSchemaType } from "../../windmill-utils-internal/src/parse/parse-schema.js";
@@ -110,15 +110,14 @@ export async function generateFlowLockInternal(folder, dryRun, workspace, opts,
         //removeChangedLocks
         flowValue.value = await updateFlow(workspace, flowValue.value, remote_path, rawReqs);
         const inlineScripts = extractInlineScriptsForFlows(flowValue.value.modules, {}, SEP, opts.defaultTs);
-        inlineScripts
-            .filter((s) => s.path.endsWith(".lock"))
-            .forEach((s) => {
-            dntShim.Deno.writeTextFileSync(dntShim.Deno.cwd() + SEP + folder + SEP + s.path, s.content);
+        inlineScripts.forEach((s) => {
+            writeIfChanged(dntShim.Deno.cwd() + SEP + folder + SEP + s.path, s.content);
         });
         // Overwrite `flow.yaml` with the new lockfile references
-        await dntShim.Deno.writeTextFile(dntShim.Deno.cwd() + SEP + folder + SEP + "flow.yaml", yamlStringify(flowValue));
+        writeIfChanged(dntShim.Deno.cwd() + SEP + folder + SEP + "flow.yaml", yamlStringify(flowValue));
     }
     hashes = await generateFlowHash(rawReqs, folder, opts.defaultTs);
+    await clearGlobalLock(folder);
     for (const [path, hash] of Object.entries(hashes)) {
         await updateMetadataGlobalLock(folder, hash, path);
     }
@@ -443,7 +442,7 @@ export async function inferSchema(language, content, currentSchema, path) {
     else if (language === "ruby") {
         const { parse_ruby } = await import("../../wasm/ruby/windmill_parser_wasm.js");
         inferedSchema = JSON.parse(parse_ruby(content));
-        // for related places search: ADD_NEW_LANG 
+        // for related places search: ADD_NEW_LANG
     }
     else {
         throw new Error("Invalid language: " + language);
@@ -607,6 +606,27 @@ export async function checkifMetadataUptodate(path, hash, conf, subpath) {
 export async function generateScriptHash(rawReqs, scriptContent, newMetadataContent) {
     return await generateHash((rawReqs ?? "") + scriptContent + newMetadataContent);
 }
+export async function clearGlobalLock(path) {
+    const conf = await readLockfile();
+    if (!conf?.locks) {
+        conf.locks = {};
+    }
+    const isV2 = conf?.version == "v2";
+    if (isV2) {
+        // Remove the specific v2 lock entry
+        const key = v2LockPath(path);
+        if (conf.locks) {
+            Object.keys(conf.locks).forEach((k) => {
+                if (conf.locks) {
+                    if (k.startsWith(key)) {
+                        delete conf.locks[k];
+                    }
+                }
+            });
+        }
+        await dntShim.Deno.writeTextFile(WMILL_LOCKFILE, yamlStringify(conf, yamlOptions));
+    }
+}
 export async function updateMetadataGlobalLock(path, hash, subpath) {
     const conf = await readLockfile();
     if (!conf?.locks) {
@@ -614,7 +634,7 @@ export async function updateMetadataGlobalLock(path, hash, subpath) {
     }
     const isV2 = conf?.version == "v2";
     if (isV2) {
-        conf.locks[v2LockPath(path, hash)] = hash;
+        conf.locks[v2LockPath(path, subpath)] = hash;
     }
     else {
         if (subpath) {

package/esm/src/utils/utils.js

@@ -175,3 +175,30 @@ export async function getIsWin() {
     }
     return isWin;
 }
+/**
+ * Writes content to a file only if it differs from existing content.
+ * Creates parent directories if they don't exist.
+ *
+ * @param path - The file path to write to
+ * @param content - The content to write
+ * @returns true if file was written, false if skipped (content unchanged)
+ */
+export function writeIfChanged(path, content) {
+    try {
+        const existing = dntShim.Deno.readTextFileSync(path);
+        if (existing === content) {
+            // console.log(`Content unchanged for ${path}`);
+            return false; // Content unchanged, skip write
+        }
+    }
+    catch (error) {
+        // File doesn't exist or can't be read, proceed with write
+        if (!(error instanceof dntShim.Deno.errors.NotFound)) {
+            // If it's not a "not found" error, we might want to know about it
+            // but still proceed with the write attempt
+        }
+    }
+    // console.log(`Writing content to ${path}`);
+    dntShim.Deno.writeTextFileSync(path, content);
+    return true; // File was written
+}

package/package.json

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

package/types/src/main.d.ts

@@ -22,7 +22,7 @@ import { pull as hubPull } from "./commands/hub/hub.js";
 import { pull, push } from "./commands/sync/sync.js";
 import { add as workspaceAdd } from "./commands/workspace/workspace.js";
 export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.563.2";
+export declare const VERSION = "1.563.4";
 export declare const WM_FORK_PREFIX = "wm-fork";
 declare const command: Command<{
     workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;

package/types/src/utils/metadata.d.ts

@@ -47,6 +47,7 @@ interface Lock {
 export declare function readLockfile(): Promise<Lock>;
 export declare function checkifMetadataUptodate(path: string, hash: string, conf: Lock | undefined, subpath?: string): Promise<boolean>;
 export declare function generateScriptHash(rawReqs: string | undefined, scriptContent: string, newMetadataContent: string): Promise<string>;
+export declare function clearGlobalLock(path: string): Promise<void>;
 export declare function updateMetadataGlobalLock(path: string, hash: string, subpath?: string): Promise<void>;
 export {};
 //# sourceMappingURL=metadata.d.ts.map

package/types/src/utils/metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"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"}

package/types/src/utils/utils.d.ts

@@ -17,4 +17,13 @@ export interface Repository {
 }
 export declare function selectRepository<T extends Repository>(repositories: T[], operation?: string): Promise<T>;
 export declare function getIsWin(): Promise<boolean>;
+/**
+ * Writes content to a file only if it differs from existing content.
+ * Creates parent directories if they don't exist.
+ *
+ * @param path - The file path to write to
+ * @param content - The content to write
+ * @returns true if file was written, false if skipped (content unchanged)
+ */
+export declare function writeIfChanged(path: string, content: string): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/types/src/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/src/utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAO/C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CA2EhD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAa/D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAWzD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAE/B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASpD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,EAAE;;;;CAAsB,QAM7E;AAGD,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAGD,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EACzD,YAAY,EAAE,CAAC,EAAE,EACjB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAoCZ;AAGD,wBAAsB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAMjD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/src/utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAO/C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CA2EhD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAa/D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAWzD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAE/B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASpD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,EAAE;;;;CAAsB,QAM7E;AAGD,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAGD,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EACzD,YAAY,EAAE,CAAC,EAAE,EACjB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAoCZ;AAGD,wBAAsB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAMjD;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBrE"}