windmill-cli 1.475.0 → 1.476.0

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/basename.js

@@ -17,23 +17,6 @@ import { isPosixPathSeparator } from "./_util.js";
  * assertEquals(basename("/home/user/Documents/image.png", ".png"), "image");
  * ```
  *
- * @example Working with URLs
- *
- * Note: This function doesn't automatically strip hash and query parts from
- * URLs. If your URL contains a hash or query, remove them before passing the
- * URL to the function. This can be done by passing the URL to `new URL(url)`,
- * and setting the `hash` and `search` properties to empty strings.
- *
- * ```ts
- * import { basename } from "@std/path/posix/basename";
- * import { assertEquals } from "@std/assert";
- *
- * assertEquals(basename("https://deno.land/std/path/mod.ts"), "mod.ts");
- * assertEquals(basename("https://deno.land/std/path/mod.ts", ".ts"), "mod");
- * assertEquals(basename("https://deno.land/std/path/mod.ts?a=b"), "mod.ts?a=b");
- * assertEquals(basename("https://deno.land/std/path/mod.ts#header"), "mod.ts#header");
- * ```
- *
  * Note: If you are working with file URLs,
  * use the new version of `basename` from `@std/path/posix/unstable-basename`.
  *

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/dirname.js

@@ -13,18 +13,6 @@ import { isPosixPathSeparator } from "./_util.js";
  *
  * assertEquals(dirname("/home/user/Documents/"), "/home/user");
  * assertEquals(dirname("/home/user/Documents/image.png"), "/home/user/Documents");
- * assertEquals(dirname("https://deno.land/std/path/mod.ts"), "https://deno.land/std/path");
- * ```
- *
- * @example Working with URLs
- *
- * ```ts
- * import { dirname } from "@std/path/posix/dirname";
- * import { assertEquals } from "@std/assert";
- *
- * assertEquals(dirname("https://deno.land/std/path/mod.ts"), "https://deno.land/std/path");
- * assertEquals(dirname("https://deno.land/std/path/mod.ts?a=b"), "https://deno.land/std/path");
- * assertEquals(dirname("https://deno.land/std/path/mod.ts#header"), "https://deno.land/std/path");
  * ```
  *
  * Note: If you are working with file URLs,

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/extname.js

@@ -16,22 +16,6 @@ import { isPosixPathSeparator } from "./_util.js";
  * assertEquals(extname("/home/user/Documents/image.png"), ".png");
  * ```
  *
- * @example Working with URLs
- *
- * Note: This function doesn't automatically strip hash and query parts from
- * URLs. If your URL contains a hash or query, remove them before passing the
- * URL to the function. This can be done by passing the URL to `new URL(url)`,
- * and setting the `hash` and `search` properties to empty strings.
- *
- * ```ts
- * import { extname } from "@std/path/posix/extname";
- * import { assertEquals } from "@std/assert";
- *
- * assertEquals(extname("https://deno.land/std/path/mod.ts"), ".ts");
- * assertEquals(extname("https://deno.land/std/path/mod.ts?a=b"), ".ts?a=b");
- * assertEquals(extname("https://deno.land/std/path/mod.ts#header"), ".ts#header");
- * ```
- *
  * Note: If you are working with file URLs,
  * use the new version of `extname` from `@std/path/posix/unstable-extname`.
  *

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/join.js

@@ -14,19 +14,6 @@ import { normalize } from "./normalize.js";
  * assertEquals(path, "/foo/bar/baz/asdf");
  * ```
  *
- * @example Working with URLs
- * ```ts
- * import { join } from "@std/path/posix/join";
- * import { assertEquals } from "@std/assert";
- *
- * const url = new URL("https://deno.land");
- * url.pathname = join("std", "path", "mod.ts");
- * assertEquals(url.href, "https://deno.land/std/path/mod.ts");
- *
- * url.pathname = join("//std", "path/", "/mod.ts");
- * assertEquals(url.href, "https://deno.land/std/path/mod.ts");
- * ```
- *
  * Note: If you are working with file URLs,
  * use the new version of `join` from `@std/path/posix/unstable-join`.
  *

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/join_globs.js

@@ -19,8 +19,7 @@ import { normalizeGlob } from "./normalize_glob.js";
  * @param options The options to use.
  * @returns The joined path.
  */
-export function joinGlobs(globs, options = {}) {
-    const { globstar = false } = options;
+export function joinGlobs(globs, { extended = true, globstar = false } = {}) {
     if (!globstar || globs.length === 0) {
         return join(...globs);
     }
@@ -36,5 +35,5 @@ export function joinGlobs(globs, options = {}) {
     }
     if (!joined)
         return ".";
-    return normalizeGlob(joined, { globstar });
+    return normalizeGlob(joined, { extended, globstar });
 }

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/normalize.js

@@ -17,24 +17,6 @@ import { isPosixPathSeparator } from "./_util.js";
  * assertEquals(path, "/foo/bar/baz/asdf");
  * ```
  *
- * @example Working with URLs
- *
- * Note: This function will remove the double slashes from a URL's scheme.
- * Hence, do not pass a full URL to this function. Instead, pass the pathname of
- * the URL.
- *
- * ```ts
- * import { normalize } from "@std/path/posix/normalize";
- * import { assertEquals } from "@std/assert";
- *
- * const url = new URL("https://deno.land");
- * url.pathname = normalize("//std//assert//.//mod.ts");
- * assertEquals(url.href, "https://deno.land/std/assert/mod.ts");
- *
- * url.pathname = normalize("std/assert/../async/retry.ts");
- * assertEquals(url.href, "https://deno.land/std/async/retry.ts");
- * ```
- *
  * Note: If you are working with file URLs,
  * use the new version of `normalize` from `@std/path/posix/unstable-normalize`.
  *

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/posix/normalize_glob.js

@@ -18,8 +18,7 @@ import { SEPARATOR_PATTERN } from "./constants.js";
  * @param options The options to use.
  * @returns The normalized path.
  */
-export function normalizeGlob(glob, options = {}) {
-    const { globstar = false } = options;
+export function normalizeGlob(glob, { globstar = false } = {}) {
     if (glob.match(/\0/g)) {
         throw new Error(`Glob contains invalid characters: "${glob}"`);
     }

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/windows/join_globs.js

@@ -20,8 +20,7 @@ import { normalizeGlob } from "./normalize_glob.js";
  * @param options The options for glob pattern.
  * @returns The joined glob pattern.
  */
-export function joinGlobs(globs, options = {}) {
-    const { globstar = false } = options;
+export function joinGlobs(globs, { extended = true, globstar = false } = {}) {
     if (!globstar || globs.length === 0) {
         return join(...globs);
     }
@@ -37,5 +36,5 @@ export function joinGlobs(globs, options = {}) {
     }
     if (!joined)
         return ".";
-    return normalizeGlob(joined, { globstar });
+    return normalizeGlob(joined, { extended, globstar });
 }

package/esm/deps/jsr.io/@std/path/{1.0.8 → 1.0.6}/windows/normalize_glob.js

@@ -18,8 +18,7 @@ import { SEPARATOR_PATTERN } from "./constants.js";
  * @param options The options for glob pattern.
  * @returns The normalized glob pattern.
  */
-export function normalizeGlob(glob, options = {}) {
-    const { globstar = false } = options;
+export function normalizeGlob(glob, { globstar = false } = {}) {
     if (glob.match(/\0/g)) {
         throw new Error(`Glob contains invalid characters: "${glob}"`);
     }

package/esm/deps.js

@@ -12,14 +12,14 @@ export { NpmProvider } from "./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-r
 export { Provider } from "./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/upgrade/mod.js";
 export { CompletionsCommand } from "./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/completions/mod.js";
 // std
-export { ensureDir } from "./deps/jsr.io/@std/fs/1.0.14/mod.js";
-export { SEPARATOR as SEP } from "./deps/jsr.io/@std/path/1.0.8/mod.js";
-export * as path from "./deps/jsr.io/@std/path/1.0.8/mod.js";
-export { encodeHex } from "./deps/jsr.io/@std/encoding/1.0.7/mod.js";
-export { writeAllSync } from "./deps/jsr.io/@std/io/0.225.2/write_all.js";
-export { copy } from "./deps/jsr.io/@std/io/0.225.2/copy.js";
-export { readAll } from "./deps/jsr.io/@std/io/0.225.2/read_all.js";
-export * as log from "./deps/jsr.io/@std/log/0.224.14/mod.js";
+export { ensureDir } from "./deps/jsr.io/@std/fs/1.0.3/mod.js";
+export { SEPARATOR as SEP } from "./deps/jsr.io/@std/path/1.0.6/mod.js";
+export * as path from "./deps/jsr.io/@std/path/1.0.6/mod.js";
+export { encodeHex } from "./deps/jsr.io/@std/encoding/1.0.5/mod.js";
+export { writeAllSync } from "./deps/jsr.io/@std/io/0.224.8/write_all.js";
+export { copy } from "./deps/jsr.io/@std/io/0.224.8/copy.js";
+export { readAll } from "./deps/jsr.io/@std/io/0.224.8/read_all.js";
+export * as log from "./deps/jsr.io/@std/log/0.224.7/mod.js";
 export { stringify as yamlStringify } from "./deps/jsr.io/@std/yaml/1.0.5/mod.js";
 import { parse as yamlParse } from "./deps/jsr.io/@std/yaml/1.0.5/mod.js";
 export async function yamlParseFile(path, options = {}) {

package/esm/flow.js

@@ -196,7 +196,7 @@ async function generateLocks(opts, folder) {
     }
     else {
         const ignore = await ignoreF(opts);
-        const elems = Object.keys(await elementsToMap(await FSFSElement(dntShim.Deno.cwd(), []), (p, isD) => {
+        const elems = Object.keys(await elementsToMap(await FSFSElement(dntShim.Deno.cwd(), [], true), (p, isD) => {
             return (ignore(p, isD) ||
                 (!isD &&
                     !p.endsWith(SEP + "flow.yaml") &&

package/esm/gen/core/OpenAPI.js

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

package/esm/gen/services.gen.js

@@ -7752,6 +7752,24 @@ export const getFolder = (data) => {
         }
     });
 };
+/**
+ * exists folder
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data.name
+ * @returns boolean folder exists
+ * @throws ApiError
+ */
+export const existsFolder = (data) => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/w/{workspace}/folders/exists/{name}',
+        path: {
+            workspace: data.workspace,
+            name: data.name
+        }
+    });
+};
 /**
  * get folder usage
  * @param data The data for the request.

package/esm/main.js

@@ -34,7 +34,7 @@ export { flow, app, script, workspace, resource, user, variable, hub, folder, sc
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.475.0";
+export const VERSION = "1.476.0";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))

package/esm/metadata.js

@@ -47,7 +47,7 @@ function findClosestRawReqs(lang, remotePath, globalDeps) {
 }
 const TOP_HASH = "__flow_hash";
 async function generateFlowHash(folder) {
-    const elems = await FSFSElement(path.join(dntShim.Deno.cwd(), folder), []);
+    const elems = await FSFSElement(path.join(dntShim.Deno.cwd(), folder), [], true);
     const hashes = {};
     for await (const f of elems.getChildren()) {
         if (exts.some((e) => f.path.endsWith(e))) {

package/esm/pull.js

@@ -1,6 +1,6 @@
 import { colors, Command, JSZip, log } from "./deps.js";
 import { getHeaders } from "./utils.js";
-export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipSecrets, includeSchedules, includeTriggers, includeUsers, includeGroups, includeSettings, includeKey, defaultTs) {
+export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipResourceTypes, skipSecrets, includeSchedules, includeTriggers, includeUsers, includeGroups, includeSettings, includeKey, defaultTs) {
     const requestHeaders = new Headers();
     requestHeaders.set("Authorization", "Bearer " + workspace.token);
     requestHeaders.set("Content-Type", "application/octet-stream");
@@ -13,7 +13,7 @@ export async function downloadZip(workspace, plainSecrets, skipVariables, skipRe
     const zipResponse = await fetch(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"}`, {
+        `/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}`, {
         headers: requestHeaders,
         method: "GET",
     });

package/esm/script.js

@@ -168,7 +168,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             // }
         }
         if (typed && codebase) {
-            typed.codebase = codebase.digest;
+            typed.codebase = await codebase.getDigest();
         }
         const requestBodyCommon = {
             content,
@@ -192,8 +192,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
             has_preprocessor: typed?.has_preprocessor,
             priority: typed?.priority,
             concurrency_key: typed?.concurrency_key,
-            //@ts-ignore
-            codebase: codebase?.digest,
+            codebase: await codebase?.getDigest(),
             timeout: typed?.timeout,
             on_behalf_of_email: typed?.on_behalf_of_email,
         };
@@ -632,7 +631,7 @@ export async function findGlobalDeps() {
     const pkgs = {};
     const reqs = {};
     const composers = {};
-    const els = await FSFSElement(dntShim.Deno.cwd(), []);
+    const els = await FSFSElement(dntShim.Deno.cwd(), [], false);
     for await (const entry of readDirRecursiveWithIgnore((p, isDir) => {
         p = SEP + p;
         return (!isDir &&
@@ -674,7 +673,7 @@ async function generateMetadata(opts, scriptPath) {
     }
     else {
         const ignore = await ignoreF(opts);
-        const elems = await elementsToMap(await FSFSElement(dntShim.Deno.cwd(), codebases), (p, isD) => {
+        const elems = await elementsToMap(await FSFSElement(dntShim.Deno.cwd(), codebases, false), (p, isD) => {
             return ((!isD && !exts.some((ext) => p.endsWith(ext))) ||
                 ignore(p, isD) ||
                 p.includes(".flow" + SEP) ||

package/esm/sync.js

@@ -46,7 +46,7 @@ export function findCodebase(path, codebases) {
         }
     }
 }
-async function addCodebaseDigestIfRelevant(path, content, codebases) {
+async function addCodebaseDigestIfRelevant(path, content, codebases, ignoreCodebaseChanges) {
     const isScript = path.endsWith(".script.yaml");
     if (!isScript) {
         return content;
@@ -67,7 +67,12 @@ async function addCodebaseDigestIfRelevant(path, content, codebases) {
         if (c) {
             const parsed = yamlParseContent(path, content);
             if (parsed && typeof parsed == "object") {
-                parsed["codebase"] = c.digest;
+                if (ignoreCodebaseChanges) {
+                    parsed["codebase"] = undefined;
+                }
+                else {
+                    parsed["codebase"] = await c.getDigest();
+                }
                 parsed["lock"] = "";
                 return yamlStringify(parsed, yamlOptions);
             }
@@ -78,7 +83,7 @@ async function addCodebaseDigestIfRelevant(path, content, codebases) {
     }
     return content;
 }
-export async function FSFSElement(p, codebases) {
+export async function FSFSElement(p, codebases, ignoreCodebaseChanges) {
     function _internal_element(localP, isDir, codebases) {
         return {
             isDirectory: isDir,
@@ -101,7 +106,7 @@ export async function FSFSElement(p, codebases) {
             async getContentText() {
                 const content = await dntShim.Deno.readTextFile(localP);
                 const itemPath = localP.substring(p.length + 1);
-                const r = await addCodebaseDigestIfRelevant(itemPath, content, codebases);
+                const r = await addCodebaseDigestIfRelevant(itemPath, content, codebases, ignoreCodebaseChanges);
                 return r;
             },
         };
@@ -279,7 +284,7 @@ export function newPathAssigner(defaultTs) {
     }
     return { assignPath };
 }
-function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension) {
+function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ignoreCodebaseChanges) {
     async function _internal_file(p, f) {
         const kind = p.endsWith("flow.json")
             ? "flow"
@@ -375,6 +380,9 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension) {
                         else {
                             parsed["lock"] = undefined;
                         }
+                        if (ignoreCodebaseChanges && parsed["codebase"]) {
+                            parsed["codebase"] = undefined;
+                        }
                         return useYaml
                             ? yamlStringify(parsed, yamlOptions)
                             : JSON.stringify(parsed, null, 2);
@@ -536,9 +544,9 @@ export async function elementsToMap(els, ignore, json, skips) {
             continue;
         if (skips.skipResources && path.endsWith(".resource" + ext))
             continue;
-        if (skips.skipVariables && path.endsWith(".variable" + ext))
+        if (skips.skipResourceTypes && path.endsWith(".resource-type" + ext))
             continue;
-        if (skips.skipResources && path.endsWith(".resource" + ext))
+        if (skips.skipVariables && path.endsWith(".variable" + ext))
             continue;
         if (skips.skipResources && isFileResource(path))
             continue;
@@ -583,7 +591,7 @@ export async function elementsToMap(els, ignore, json, skips) {
     }
     return map;
 }
-async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases) {
+async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges) {
     const [m1, m2] = els2
         ? await Promise.all([
             elementsToMap(els1, ignore, json, skips),
@@ -646,16 +654,18 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
                 if (deepEqual(before, after)) {
                     continue;
                 }
-                if (before.codebase != undefined) {
-                    delete before.codebase;
-                    m2[k] = yamlStringify(before, yamlOptions);
-                }
-                if (after.codebase != undefined) {
-                    if (before.codebase != after.codebase) {
-                        codebaseChanges[k] = after.codebase;
+                if (!ignoreCodebaseChanges) {
+                    if (before.codebase != undefined) {
+                        delete before.codebase;
+                        m2[k] = yamlStringify(before, yamlOptions);
+                    }
+                    if (after.codebase != undefined) {
+                        if (before.codebase != after.codebase) {
+                            codebaseChanges[k] = after.codebase;
+                        }
+                        delete after.codebase;
+                        v = yamlStringify(after, yamlOptions);
                     }
-                    delete after.codebase;
-                    v = yamlStringify(after, yamlOptions);
                 }
                 if (skipMetadata) {
                     continue;
@@ -685,29 +695,33 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
             }
         }
     }
-    for (const [k, v] of Object.entries(remoteCodebase)) {
-        const tsFile = k.replace(".script.yaml", ".ts");
-        if (changes.find((c) => c.path == tsFile && (c.name == "edited" || c.name == "deleted"))) {
-            continue;
-        }
-        let c = findCodebase(tsFile, codebases);
-        if (c?.digest != v) {
-            changes.push({
-                name: "edited",
-                path: tsFile,
-                codebase: v,
-                before: m1[tsFile],
-                after: m2[tsFile],
-            });
+    if (!ignoreCodebaseChanges) {
+        for (const [k, v] of Object.entries(remoteCodebase)) {
+            const tsFile = k.replace(".script.yaml", ".ts");
+            if (changes.find((c) => c.path == tsFile && (c.name == "edited" || c.name == "deleted"))) {
+                continue;
+            }
+            const c = findCodebase(tsFile, codebases);
+            if (await c?.getDigest() != v) {
+                changes.push({
+                    name: "edited",
+                    path: tsFile,
+                    codebase: v,
+                    before: m1[tsFile],
+                    after: m2[tsFile],
+                });
+            }
         }
     }
-    for (const change of changes) {
-        const codebase = codebaseChanges[change.path];
-        if (!codebase)
-            continue;
-        const tsFile = change.path.replace(".script.yaml", ".ts");
-        if (change.name == "edited" && change.path == tsFile) {
-            change.codebase = codebase;
+    if (!ignoreCodebaseChanges) {
+        for (const change of changes) {
+            const codebase = codebaseChanges[change.path];
+            if (!codebase)
+                continue;
+            const tsFile = change.path.replace(".script.yaml", ".ts");
+            if (change.name == "edited" && change.path == tsFile) {
+                change.codebase = codebase;
+            }
         }
     }
     changes.sort((a, b) => getOrderFromPath(a.path) == getOrderFromPath(b.path)
@@ -829,6 +843,10 @@ export async function ignoreF(wmillconf) {
     }
     // new Gitignore.default({ initialRules: ignoreContent.split("\n")}).ignoreContent).compile();
     return (p, isDirectory) => {
+        const ext = wmillconf.json ? ".json" : ".yaml";
+        if (!isDirectory && p.endsWith(".resource-type" + ext)) {
+            return wmillconf.skipResourceTypes ?? false;
+        }
         return (!isWhitelisted(p) &&
             (isNotWmillFile(p, isDirectory) ||
                 (!isDirectory && whitelist != undefined && !whitelist.approve(p))));
@@ -901,11 +919,11 @@ export async function pull(opts) {
     catch {
         // ignore
     }
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, true);
     const local = !opts.stateful
-        ? await FSFSElement(dntShim.Deno.cwd(), codebases)
-        : await FSFSElement(path.join(dntShim.Deno.cwd(), ".wmill"), []);
-    const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases);
+        ? await FSFSElement(dntShim.Deno.cwd(), codebases, true)
+        : await FSFSElement(path.join(dntShim.Deno.cwd(), ".wmill"), [], true);
+    const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true);
     log.info(`remote (${workspace.name}) -> local: ${changes.length} changes to apply`);
     if (changes.length > 0) {
         prettyChanges(changes);
@@ -1089,11 +1107,10 @@ export async function push(opts) {
     catch {
         // ignore
     }
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
-    const local = await FSFSElement(path.join(dntShim.Deno.cwd(), ""), codebases);
-    const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases);
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, false);
+    const local = await FSFSElement(path.join(dntShim.Deno.cwd(), ""), codebases, false);
+    const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false);
     const globalDeps = await findGlobalDeps();
-    console.log("globalDeps", globalDeps);
     const tracker = await buildTracker(changes);
     const staleScripts = [];
     const staleFlows = [];
@@ -1408,6 +1425,7 @@ const command = new Command()
     .option("--skip-variables", "Skip syncing variables (including secrets)")
     .option("--skip-secrets", "Skip syncing only secrets variables")
     .option("--skip-resources", "Skip syncing  resources")
+    .option("--skip-resource-types", "Skip syncing  resource types")
     // .option("--skip-scripts-metadata", "Skip syncing scripts metadata, focus solely on logic")
     .option("--include-schedules", "Include syncing  schedules")
     .option("--include-triggers", "Include syncing triggers")
@@ -1428,6 +1446,7 @@ const command = new Command()
     .option("--skip-variables", "Skip syncing variables (including secrets)")
     .option("--skip-secrets", "Skip syncing only secrets variables")
     .option("--skip-resources", "Skip syncing  resources")
+    .option("--skip-resource-types", "Skip syncing  resource types")
     // .option("--skip-scripts-metadata", "Skip syncing scripts metadata, focus solely on logic")
     .option("--include-schedules", "Include syncing schedules")
     .option("--include-triggers", "Include syncing triggers")

package/package.json

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

package/types/codebase.d.ts

@@ -1,6 +1,6 @@
 import { Codebase, SyncOptions } from "./conf.js";
 export type SyncCodebase = Codebase & {
-    digest: string;
+    getDigest: () => Promise<string>;
 };
-export declare function listSyncCodebases(options: SyncOptions): Promise<SyncCodebase[]>;
+export declare function listSyncCodebases(options: SyncOptions): SyncCodebase[];
 //# sourceMappingURL=codebase.d.ts.map

package/types/codebase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codebase.d.ts","sourceRoot":"","sources":["../src/codebase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAIlD,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACzD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAmBzB"}
+{"version":3,"file":"codebase.d.ts","sourceRoot":"","sources":["../src/codebase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAIlD,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAC3E,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,WAAW,GACnB,YAAY,EAAE,CAyBhB"}

package/types/conf.d.ts

@@ -8,6 +8,7 @@ export interface SyncOptions {
     json?: boolean;
     skipVariables?: boolean;
     skipResources?: boolean;
+    skipResourceTypes?: boolean;
     skipSecrets?: boolean;
     includeSchedules?: boolean;
     includeTriggers?: boolean;

package/types/conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAe3D;AAED,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAG1B"}
+{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAe3D;AAED,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAG1B"}

package/types/deps/jsr.io/@std/bytes/{1.0.5 → 1.0.2}/concat.d.ts

@@ -1,5 +1,3 @@
-import type { Uint8Array_ } from "./_types.js";
-export type { Uint8Array_ };
 /**
  * Concatenate an array of byte slices into a single slice.
  *
@@ -17,5 +15,5 @@ export type { Uint8Array_ };
  * assertEquals(concat([a, b]), new Uint8Array([0, 1, 2, 3, 4, 5]));
  * ```
  */
-export declare function concat(buffers: Uint8Array[]): Uint8Array_;
+export declare function concat(buffers: Uint8Array[]): Uint8Array;
 //# sourceMappingURL=concat.d.ts.map

package/types/deps/jsr.io/@std/bytes/1.0.2/concat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"concat.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/bytes/1.0.2/concat.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAaxD"}

package/types/deps/jsr.io/@std/encoding/{1.0.7 → 1.0.5}/_base32_common.d.ts

@@ -1,4 +1,3 @@
-import type { Uint8Array_ } from "./_types.js";
 /**
  * Decodes an encoded string with the given lookup table.
  *
@@ -6,7 +5,7 @@ import type { Uint8Array_ } from "./_types.js";
  * @param lookup The lookup table
  * @returns The encoded string.
  */
-export declare function decode(b32: string, lookup: ReadonlyArray<string>): Uint8Array_;
+export declare function decode(b32: string, lookup: ReadonlyArray<string>): Uint8Array;
 /**
  * Encodes the given data using the lookup table.
  *

package/types/deps/jsr.io/@std/encoding/1.0.5/_base32_common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_base32_common.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/encoding/1.0.5/_base32_common.ts"],"names":[],"mappings":"AAyCA;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,UAAU,CAqE7E;AA6BD;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,EACvC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,GAC5B,MAAM,CA6DR"}

package/types/deps/jsr.io/@std/encoding/{1.0.7 → 1.0.5}/_validate_binary_like.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_validate_binary_like.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/encoding/1.0.7/_validate_binary_like.ts"],"names":[],"mappings":"AAeA,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CAa9D"}
+{"version":3,"file":"_validate_binary_like.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/encoding/1.0.5/_validate_binary_like.ts"],"names":[],"mappings":"AAeA,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CAa9D"}