windmill-cli 1.416.2 → 1.417.2

package/esm/gen/core/OpenAPI.js

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

package/esm/instance.js

@@ -166,23 +166,25 @@ async function instancePull(opts) {
     const instance = await pickInstance(opts, true);
     log.info("Pulling instance-level changes");
     log.info(`remote (${instance.name}) -> local`);
+    opts.prefix = opts.prefix ?? instance.prefix;
     let uChanges = 0;
     if (!opts.skipUsers) {
-        uChanges = (await pullInstanceUsers(true));
+        uChanges = (await pullInstanceUsers(opts, true));
     }
     let sChanges = 0;
     if (!opts.skipSettings) {
-        sChanges = (await pullInstanceSettings(true));
+        sChanges = (await pullInstanceSettings(opts, true));
     }
     let cChanges = 0;
     if (!opts.skipConfigs) {
-        cChanges = (await pullInstanceConfigs(true));
+        cChanges = (await pullInstanceConfigs(opts, true));
     }
     let gChanges = 0;
     if (!opts.skipGroups) {
-        gChanges = (await pullInstanceGroups(true));
+        gChanges = (await pullInstanceGroups(opts, true));
     }
     const totalChanges = uChanges + sChanges + cChanges + gChanges;
+    const rootDir = dntShim.Deno.cwd();
     if (totalChanges > 0) {
         let confirm = true;
         if (opts.yes !== true) {
@@ -192,17 +194,24 @@ async function instancePull(opts) {
             });
         }
         if (confirm) {
+            if (uChanges > 0) {
+                if (opts.folderPerInstance && opts.prefixSettings) {
+                    await dntShim.Deno.mkdir(path.join(rootDir, opts.prefix), {
+                        recursive: true,
+                    });
+                }
+            }
             if (!opts.skipUsers && uChanges > 0) {
-                await pullInstanceUsers();
+                await pullInstanceUsers(opts);
             }
             if (!opts.skipSettings && sChanges > 0) {
-                await pullInstanceSettings();
+                await pullInstanceSettings(opts);
             }
             if (!opts.skipConfigs && cChanges > 0) {
-                await pullInstanceConfigs();
+                await pullInstanceConfigs(opts);
             }
             if (!opts.skipGroups && gChanges > 0) {
-                await pullInstanceGroups();
+                await pullInstanceGroups(opts);
             }
         }
     }
@@ -211,7 +220,6 @@ async function instancePull(opts) {
     }
     if (opts.includeWorkspaces) {
         log.info("\nPulling all workspaces");
-        const rootDir = dntShim.Deno.cwd();
         const localWorkspaces = await getLocalWorkspaces(rootDir, instance.prefix, opts.folderPerInstance);
         const previousActiveWorkspace = await getActiveWorkspace(undefined);
         const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
@@ -278,19 +286,19 @@ async function instancePush(opts) {
     log.info(`remote (${instance.name}) <- local`);
     let uChanges = 0;
     if (!opts.skipUsers) {
-        uChanges = (await pushInstanceUsers(true));
+        uChanges = (await pushInstanceUsers(opts, true));
     }
     let sChanges = 0;
     if (!opts.skipSettings) {
-        sChanges = (await pushInstanceSettings(true, opts.baseUrl));
+        sChanges = (await pushInstanceSettings(opts, true));
     }
     let cChanges = 0;
     if (!opts.skipConfigs) {
-        cChanges = (await pushInstanceConfigs(true));
+        cChanges = (await pushInstanceConfigs(opts, true));
     }
     let gChanges = 0;
     if (!opts.skipGroups) {
-        gChanges = (await pushInstanceGroups(true));
+        gChanges = (await pushInstanceGroups(opts, true));
     }
     const totalChanges = uChanges + sChanges + cChanges + gChanges;
     if (totalChanges > 0) {
@@ -303,16 +311,16 @@ async function instancePush(opts) {
         }
         if (confirm) {
             if (!opts.skipUsers && uChanges > 0) {
-                await pushInstanceUsers();
+                await pushInstanceUsers(opts);
             }
             if (!opts.skipSettings && sChanges > 0) {
-                await pushInstanceSettings(false, opts.baseUrl);
+                await pushInstanceSettings(opts);
             }
             if (!opts.skipConfigs && cChanges > 0) {
-                await pushInstanceConfigs();
+                await pushInstanceConfigs(opts);
             }
             if (!opts.skipGroups && gChanges > 0) {
-                await pushInstanceGroups();
+                await pushInstanceGroups(opts);
             }
         }
     }
@@ -525,6 +533,7 @@ const command = new Command()
     .option("--folder-per-instance", "Create a folder per instance")
     .option("--instance <instance:string>", "Name of the instance to pull from, override the active instance")
     .option("--prefix <prefix:string>", "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces")
+    .option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance")
     .action(instancePull)
     .command("push")
     .description("Push instance settings, users, configs, group and overwrite remote")
@@ -537,6 +546,7 @@ const command = new Command()
     .option("--folder-per-instance", "Create a folder per instance")
     .option("--instance <instance:string>", "Name of the instance to push to, override the active instance")
     .option("--prefix <prefix:string>", "Prefix of the local workspaces folders to push")
+    .option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance")
     .action(instancePush)
     .command("whoami")
     .description("Display information about the currently logged-in user")

package/esm/main.js

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

package/esm/settings.js

@@ -10,6 +10,20 @@ import { deepEqual } from "./utils.js";
 import * as wmill from "./gen/services.gen.js";
 import { removeWorkerPrefix } from "./worker_groups.js";
 import process from "node:process";
+const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
+let instanceSettingsPath = INSTANCE_SETTINGS_PATH;
+async function checkInstanceSettingsPath(opts) {
+    if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+        instanceSettingsPath = `${opts.prefix}/${INSTANCE_SETTINGS_PATH}`;
+    }
+}
+const INSTANCE_CONFIGS_PATH = "instance_configs.yaml";
+let instanceConfigsPath = INSTANCE_CONFIGS_PATH;
+async function checkInstanceConfigPath(opts) {
+    if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+        instanceConfigsPath = `${opts.prefix}/${INSTANCE_CONFIGS_PATH}`;
+    }
+}
 export async function pushWorkspaceSettings(workspace, _path, settings, localSettings) {
     try {
         const remoteSettings = await wmill.getSettings({
@@ -203,14 +217,14 @@ export async function pushWorkspaceKey(workspace, _path, key, localKey) {
         log.debug(`Workspace encryption key is up to date`);
     }
 }
-const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
-export async function readInstanceSettings() {
+export async function readInstanceSettings(opts) {
     let localSettings = [];
+    await checkInstanceSettingsPath(opts);
     try {
-        localSettings = (await yamlParseFile(INSTANCE_SETTINGS_PATH));
+        localSettings = (await yamlParseFile(instanceSettingsPath));
     }
     catch {
-        log.warn(`No ${INSTANCE_SETTINGS_PATH} found`);
+        log.warn(`No ${instanceSettingsPath} found`);
     }
     return localSettings;
 }
@@ -222,7 +236,7 @@ async function processInstanceSettings(settings, mode) {
         const res = [];
         for (const s of settings) {
             if (SENSITIVE_FIELD.includes(s.name) && typeof s.value === "string") {
-                res.push(await processField(s, "value", encKey, mode));
+                res.push((await processField(s, "value", encKey, mode)));
             }
             else if (s.name == "oauths") {
                 if (typeof s.value === "object") {
@@ -251,33 +265,36 @@ async function processInstanceSettings(settings, mode) {
 async function processField(obj, field, encKey, mode) {
     return {
         ...obj,
-        [field]: mode === "encode" ? await encrypt(obj[field], encKey) : await decrypt(obj[field], encKey),
+        [field]: mode === "encode"
+            ? await encrypt(obj[field], encKey)
+            : (await decrypt(obj[field], encKey)),
     };
 }
-export async function pullInstanceSettings(preview = false) {
+export async function pullInstanceSettings(opts, preview = false) {
     const remoteSettings = await wmill.listGlobalSettings();
+    await checkInstanceSettingsPath(opts);
     if (preview) {
-        const localSettings = await readInstanceSettings();
+        const localSettings = await readInstanceSettings(opts);
         const processedSettings = await processInstanceSettings(remoteSettings, "encode");
         return compareInstanceObjects(processedSettings, localSettings, "name", "setting");
     }
     else {
         log.info("Pulling settings from instance");
         const processedSettings = await processInstanceSettings(remoteSettings, "encode");
-        await dntShim.Deno.writeTextFile(INSTANCE_SETTINGS_PATH, yamlStringify(processedSettings));
-        log.info(colors.green(`Settings written to ${INSTANCE_SETTINGS_PATH}`));
+        await dntShim.Deno.writeTextFile(instanceSettingsPath, yamlStringify(processedSettings));
+        log.info(colors.green(`Settings written to ${instanceSettingsPath}`));
     }
 }
-export async function pushInstanceSettings(preview = false, baseUrl) {
+export async function pushInstanceSettings(opts, preview = false) {
     const remoteSettings = await wmill.listGlobalSettings();
-    let localSettings = await readInstanceSettings();
+    let localSettings = await readInstanceSettings(opts);
     localSettings = await processInstanceSettings(localSettings, "decode");
-    if (baseUrl) {
+    if (opts.baseUrl) {
         localSettings = localSettings.filter((s) => s.name !== "base_url");
         localSettings.push({
             name: "base_url",
             //@ts-ignore
-            value: baseUrl,
+            value: opts.baseUrl,
         });
     }
     if (preview) {
@@ -320,17 +337,18 @@ export async function pushInstanceSettings(preview = false, baseUrl) {
         log.info(colors.green("Settings pushed to instance"));
     }
 }
-export async function readLocalConfigs() {
+export async function readLocalConfigs(opts) {
     let localConfigs = [];
+    await checkInstanceConfigPath(opts);
     try {
-        localConfigs = (await yamlParseFile("instance_configs.yaml"));
+        localConfigs = (await yamlParseFile(instanceConfigsPath));
     }
     catch {
-        log.warn("No instance_configs.yaml found");
+        log.warn(`No ${instanceConfigsPath} found`);
     }
     return localConfigs;
 }
-export async function pullInstanceConfigs(preview = false) {
+export async function pullInstanceConfigs(opts, preview = false) {
     const remoteConfigs = (await wmill.listConfigs()).map((x) => {
         return {
             ...x,
@@ -338,23 +356,23 @@ export async function pullInstanceConfigs(preview = false) {
         };
     });
     if (preview) {
-        const localConfigs = await readLocalConfigs();
+        const localConfigs = await readLocalConfigs(opts);
         return compareInstanceObjects(remoteConfigs, localConfigs, "name", "config");
     }
     else {
         log.info("Pulling configs from instance");
-        await dntShim.Deno.writeTextFile("instance_configs.yaml", yamlStringify(remoteConfigs));
-        log.info(colors.green("Configs written to instance_configs.yaml"));
+        await dntShim.Deno.writeTextFile(instanceConfigsPath, yamlStringify(remoteConfigs));
+        log.info(colors.green(`Configs written to ${instanceConfigsPath}`));
     }
 }
-export async function pushInstanceConfigs(preview = false) {
+export async function pushInstanceConfigs(opts, preview = false) {
     const remoteConfigs = (await wmill.listConfigs()).map((x) => {
         return {
             ...x,
             name: removeWorkerPrefix(x.name),
         };
     });
-    const localConfigs = await readLocalConfigs();
+    const localConfigs = await readLocalConfigs(opts);
     if (preview) {
         return compareInstanceObjects(localConfigs, remoteConfigs, "name", "config");
     }

package/esm/user.js

@@ -5,6 +5,20 @@ import { isSuperset, removeType, removePathPrefix, } from "./types.js";
 import { compareInstanceObjects } from "./instance.js";
 import { colors, Command, log, Table, yamlStringify, yamlParseFile, } from "./deps.js";
 import * as wmill from "./gen/services.gen.js";
+const INSTANCE_USERS_PATH = "instance_users.yaml";
+let instanceUsersPath = INSTANCE_USERS_PATH;
+function checkInstanceUsersPath(opts) {
+    if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+        instanceUsersPath = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
+    }
+}
+const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
+let instanceGroupsPath = INSTANCE_GROUPS_PATH;
+function checkInstanceGroupsPath(opts) {
+    if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+        instanceGroupsPath = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
+    }
+}
 async function list(opts) {
     await requireLogin(opts);
     const perPage = 10;
@@ -314,41 +328,44 @@ export async function pushGroup(workspace, path, group, localGroup) {
         }
     }
 }
-export async function pullInstanceUsers(preview = false) {
+export async function pullInstanceUsers(opts, preview = false) {
     const remoteUsers = await wmill.globalUsersExport();
+    checkInstanceUsersPath(opts);
     if (preview) {
-        const localUsers = await readInstanceUsers();
+        const localUsers = await readInstanceUsers(opts);
         return compareInstanceObjects(remoteUsers, localUsers, "email", "user");
     }
     else {
         log.info("Pulling users from instance...");
-        await dntShim.Deno.writeTextFile("instance_users.yaml", yamlStringify(remoteUsers));
-        log.info(colors.green("Users written to instance_users.yaml"));
+        await dntShim.Deno.writeTextFile(instanceUsersPath, yamlStringify(remoteUsers));
+        log.info(colors.green(`Users written to ${instanceUsersPath}`));
     }
 }
-export async function readInstanceUsers() {
+export async function readInstanceUsers(opts) {
     let localUsers = [];
+    await checkInstanceUsersPath(opts);
     try {
-        localUsers = (await yamlParseFile("instance_users.yaml"));
+        localUsers = (await yamlParseFile(instanceUsersPath));
     }
     catch {
-        log.warn("No instance_users.yaml file found");
+        log.warn(`No ${instanceUsersPath} file found`);
     }
     return localUsers;
 }
-export async function readInstanceGroups() {
+export async function readInstanceGroups(opts) {
     let localGroups = [];
+    checkInstanceGroupsPath(opts);
     try {
-        localGroups = (await yamlParseFile("instance_groups.yaml"));
+        localGroups = (await yamlParseFile(instanceGroupsPath));
     }
     catch {
-        log.warn("No instance_groups.yaml file found");
+        log.warn(`No ${instanceGroupsPath} file found`);
     }
     return localGroups;
 }
-export async function pushInstanceUsers(preview = false) {
+export async function pushInstanceUsers(opts, preview = false) {
     const remoteUsers = await wmill.globalUsersExport();
-    const localUsers = await readInstanceUsers();
+    const localUsers = await readInstanceUsers(opts);
     if (preview) {
         return compareInstanceObjects(localUsers, remoteUsers, "email", "user");
     }
@@ -360,21 +377,22 @@ export async function pushInstanceUsers(preview = false) {
         log.info(colors.green("Users pushed to the instance"));
     }
 }
-export async function pullInstanceGroups(preview = false) {
+export async function pullInstanceGroups(opts, preview = false) {
     const remoteGroups = await wmill.exportInstanceGroups();
+    checkInstanceGroupsPath(opts);
     if (preview) {
-        const localGroups = await readInstanceGroups();
+        const localGroups = await readInstanceGroups(opts);
         return compareInstanceObjects(remoteGroups, localGroups, "name", "group");
     }
     else {
         log.info("Pulling groups from instance...");
-        await dntShim.Deno.writeTextFile("instance_groups.yaml", yamlStringify(remoteGroups));
-        log.info(colors.green("Groups written to instance_groups.yaml"));
+        await dntShim.Deno.writeTextFile(instanceGroupsPath, yamlStringify(remoteGroups));
+        log.info(colors.green(`Groups written to ${instanceGroupsPath}`));
     }
 }
-export async function pushInstanceGroups(preview = false) {
+export async function pushInstanceGroups(opts, preview = false) {
     const remoteGroups = await wmill.exportInstanceGroups();
-    const localGroups = await readInstanceGroups();
+    const localGroups = await readInstanceGroups(opts);
     if (preview) {
         return compareInstanceObjects(localGroups, remoteGroups, "name", "group");
     }

package/esm/worker_groups.js

@@ -44,7 +44,7 @@ export async function displayWorkerGroups(opts) {
 }
 async function pullWorkerGroups(opts) {
     await pickInstance(opts, true);
-    const totalChanges = await pullInstanceConfigs(true) ?? 0;
+    const totalChanges = await pullInstanceConfigs(opts, true) ?? 0;
     if (totalChanges === 0) {
         log.info("No changes to apply");
         return;
@@ -57,12 +57,12 @@ async function pullWorkerGroups(opts) {
         });
     }
     if (confirm) {
-        await pullInstanceConfigs(false);
+        await pullInstanceConfigs(opts, false);
     }
 }
 async function pushWorkerGroups(opts) {
     await pickInstance(opts, true);
-    const totalChanges = await pushInstanceConfigs(true) ?? 0;
+    const totalChanges = await pushInstanceConfigs(opts, true) ?? 0;
     if (totalChanges === 0) {
         log.info("No changes to apply");
         return;
@@ -75,7 +75,7 @@ async function pushWorkerGroups(opts) {
         });
     }
     if (confirm) {
-        await pushInstanceConfigs(false);
+        await pushInstanceConfigs(opts, false);
     }
 }
 const command = new Command()

package/package.json

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

package/types/instance.d.ts

@@ -28,6 +28,7 @@ export type InstanceSyncOptions = {
     folderPerInstance?: boolean;
     yes?: boolean;
     prefix?: string;
+    prefixSettings?: boolean;
 };
 export declare function pickInstance(opts: InstanceSyncOptions, allowNew: boolean): Promise<Instance>;
 export declare function getActiveInstance(opts: {

package/types/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAML,OAAO,EAGR,MAAM,WAAW,CAAC;AAgCnB,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAiBxD;AACD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,EAAE,EACR,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;GA2C1B;AA4BD,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KACpC,CAAC,IAAI,CAAC,GAAG,MAAM;CACjB,CAAC;AACF,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC7B,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,MAAM,UAwBnB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAuElB;AA4VD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAgBD,QAAA,MAAM,OAAO;;;;;;oBAmGW,CAAC;AAEzB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAML,OAAO,EAGR,MAAM,WAAW,CAAC;AAgCnB,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAiBxD;AACD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,EAAE,EACR,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;GA2C1B;AA4BD,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KACpC,CAAC,IAAI,CAAC,GAAG,MAAM;CACjB,CAAC;AACF,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC7B,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,MAAM,UAwBnB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAuElB;AAqWD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAgBD,QAAA,MAAM,OAAO;;;;;;oBA0GW,CAAC;AAEzB,eAAe,OAAO,CAAC"}

package/types/main.d.ts

@@ -19,7 +19,7 @@ import { pull as hubPull } from "./hub.js";
 import { pull, push } from "./sync.js";
 import { add as workspaceAdd } from "./workspace.js";
 export { flow, app, script, workspace, resource, user, variable, hub, folder, schedule, sync, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.416.2";
+export declare const VERSION = "1.417.2";
 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/settings.d.ts

@@ -1,3 +1,4 @@
+import { InstanceSyncOptions } from "./instance.js";
 import { Config, GlobalSetting } from "./gen/types.gen.js";
 export interface SimplifiedSettings {
     auto_invite_enabled: boolean;
@@ -18,10 +19,10 @@ export interface SimplifiedSettings {
 }
 export declare function pushWorkspaceSettings(workspace: string, _path: string, settings: SimplifiedSettings | undefined, localSettings: SimplifiedSettings): Promise<void>;
 export declare function pushWorkspaceKey(workspace: string, _path: string, key: string | undefined, localKey: string): Promise<void>;
-export declare function readInstanceSettings(): Promise<GlobalSetting[]>;
-export declare function pullInstanceSettings(preview?: boolean): Promise<number | undefined>;
-export declare function pushInstanceSettings(preview?: boolean, baseUrl?: string): Promise<number | undefined>;
-export declare function readLocalConfigs(): Promise<Config[]>;
-export declare function pullInstanceConfigs(preview?: boolean): Promise<number | undefined>;
-export declare function pushInstanceConfigs(preview?: boolean): Promise<number | undefined>;
+export declare function readInstanceSettings(opts: InstanceSyncOptions): Promise<GlobalSetting[]>;
+export declare function pullInstanceSettings(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function pushInstanceSettings(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function readLocalConfigs(opts: InstanceSyncOptions): Promise<Config[]>;
+export declare function pullInstanceConfigs(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function pushInstanceConfigs(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
 //# sourceMappingURL=settings.d.ts.map

package/types/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAI3D,MAAM,WAAW,kBAAkB;IAKjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wBAAwB,CAAC,EAAE,GAAG,CAAC;IAC/B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;IACjC,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,kBAAkB,GAAG,SAAS,EACxC,aAAa,EAAE,kBAAkB,iBA2LlC;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,QAAQ,EAAE,MAAM,iBA4BjB;AAID,wBAAsB,oBAAoB,6BASzC;AA4CD,wBAAsB,oBAAoB,CAAC,OAAO,UAAQ,+BAuBzD;AAED,wBAAsB,oBAAoB,CACxC,OAAO,GAAE,OAAe,EACxB,OAAO,CAAC,EAAE,MAAM,+BA4DjB;AAED,wBAAsB,gBAAgB,sBASrC;AAED,wBAAsB,mBAAmB,CAAC,OAAO,UAAQ,+BA2BxD;AAED,wBAAsB,mBAAmB,CAAC,OAAO,GAAE,OAAe,+BAmDjE"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAMA,OAAO,EAA0B,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAI5E,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAI3D,MAAM,WAAW,kBAAkB;IAKjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wBAAwB,CAAC,EAAE,GAAG,CAAC;IAC/B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;IACjC,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAkBD,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,kBAAkB,GAAG,SAAS,EACxC,aAAa,EAAE,kBAAkB,iBA2LlC;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,QAAQ,EAAE,MAAM,iBA4BjB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,mBAAmB,4BAWnE;AA0DD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,mBAAmB,EACzB,OAAO,UAAQ,+BAgChB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BA4DzB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,mBAAmB,qBAY1B;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,mBAAmB,EACzB,OAAO,UAAQ,+BA4BhB;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAoDzB"}

package/types/user.d.ts

@@ -1,3 +1,4 @@
+import { InstanceSyncOptions } from "./instance.js";
 import { Command } from "./deps.js";
 import { ExportedUser, InstanceGroup } from "./gen/types.gen.js";
 interface SimplifiedUser {
@@ -12,12 +13,12 @@ interface SimplifiedGroup {
     members: string[];
 }
 export declare function pushGroup(workspace: string, path: string, group: SimplifiedGroup | undefined, localGroup: SimplifiedGroup): Promise<void>;
-export declare function pullInstanceUsers(preview?: boolean): Promise<number | undefined>;
-export declare function readInstanceUsers(): Promise<ExportedUser[]>;
-export declare function readInstanceGroups(): Promise<InstanceGroup[]>;
-export declare function pushInstanceUsers(preview?: boolean): Promise<number | undefined>;
-export declare function pullInstanceGroups(preview?: boolean): Promise<number | undefined>;
-export declare function pushInstanceGroups(preview?: boolean): Promise<number | undefined>;
+export declare function pullInstanceUsers(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function readInstanceUsers(opts: InstanceSyncOptions): Promise<ExportedUser[]>;
+export declare function readInstanceGroups(opts: InstanceSyncOptions): Promise<InstanceGroup[]>;
+export declare function pushInstanceUsers(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function pullInstanceGroups(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
+export declare function pushInstanceGroups(opts: InstanceSyncOptions, preview?: boolean): Promise<number | undefined>;
 declare const command: Command<void, void, {
     email?: import("./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType | undefined;
 } & {

package/types/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,OAAO,EAKR,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,YAAY,EAEZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAwF5B,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,eAAe,GAAG,SAAS,EAClC,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgLf;AAED,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,OAAe,+BAc/D;AAED,wBAAsB,iBAAiB,4BAQtC;AAED,wBAAsB,kBAAkB,6BAUvC;AAED,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,OAAe,+BAc/D;AAED,wBAAsB,kBAAkB,CAAC,OAAO,UAAQ,+BAgBvD;AAED,wBAAsB,kBAAkB,CAAC,OAAO,GAAE,OAAe,+BAchE;AAED,QAAA,MAAM,OAAO;;;;;;;;;;oBA8BgB,CAAC;AAE9B,eAAe,OAAO,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AAUA,OAAO,EAA0B,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAEL,OAAO,EAKR,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,YAAY,EAEZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAwG5B,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,eAAe,GAAG,SAAS,EAClC,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgLf;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAiBzB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,2BAWhE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,4BAajE;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,UAAQ,+BAmBhB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,QAAA,MAAM,OAAO;;;;;;;;;;oBA8BgB,CAAC;AAE9B,eAAe,OAAO,CAAC"}