windmill-cli 1.396.0 → 1.397.3

package/esm/sync.js

@@ -1,15 +1,17 @@
 import * as dntShim from "./_dnt.shims.js";
 import { fetchVersion, requireLogin, resolveWorkspace } from "./context.js";
-import { colors, Command, Confirm, ensureDir, minimatch, path, ScriptService, FolderService, ResourceService, VariableService, AppService, FlowService, log, yamlStringify, yamlParse, ScheduleService, SEP, UserService, GroupService, } from "./deps.js";
+import { colors, Command, Confirm, ensureDir, minimatch, path, log, yamlStringify, yamlParse, SEP, } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { getTypeStrFromPath, parseFromPath, pushObj, showConflict, showDiff, } from "./types.js";
 import { downloadZip } from "./pull.js";
-import { exts, findContentFile, findGlobalDeps, handleScriptMetadata, removeExtensionToPath, } from "./script.js";
+import { exts, findContentFile, findGlobalDeps, findResourceFile, handleScriptMetadata, removeExtensionToPath, } from "./script.js";
 import { handleFile } from "./script.js";
-import { deepEqual } from "./utils.js";
+import { deepEqual, isFileResource } from "./utils.js";
 import { mergeConfigWithConfigFile } from "./conf.js";
 import { removePathPrefix } from "./types.js";
 import { listSyncCodebases } from "./codebase.js";
 import { generateFlowLockInternal, generateScriptMetadataInternal, } from "./metadata.js";
+import { pushResource } from "./resource.js";
 export function findCodebase(path, codebases) {
     if (!path.endsWith(".ts")) {
         return;
@@ -262,13 +264,17 @@ export function newPathAssigner(defaultTs) {
             ext = "frontend.js";
         else if (language == "php")
             ext = "php";
+        else if (language == "rust")
+            ext = "rs";
+        else if (language == "ansible")
+            ext = "playbook.yml";
         else
             ext = "no_ext";
         return [`${name}.inline_script.`, ext];
     }
     return { assignPath };
 }
-function ZipFSElement(zip, useYaml, defaultTs) {
+function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension) {
     async function _internal_file(p, f) {
         const kind = p.endsWith("flow.json")
             ? "flow"
@@ -276,7 +282,9 @@ function ZipFSElement(zip, useYaml, defaultTs) {
                 ? "app"
                 : p.endsWith("script.json")
                     ? "script"
-                    : "other";
+                    : p.endsWith("resource.json")
+                        ? "resource"
+                        : "other";
         const isJson = p.endsWith(".json");
         function transformPath() {
             if (kind == "flow") {
@@ -366,6 +374,21 @@ function ZipFSElement(zip, useYaml, defaultTs) {
                             ? yamlStringify(parsed, yamlOptions)
                             : JSON.stringify(parsed, null, 2);
                     }
+                    if (kind == "resource") {
+                        const content = await f.async("text");
+                        const parsed = JSON.parse(content);
+                        const formatExtension = resourceTypeToFormatExtension[parsed["resource_type"]];
+                        if (formatExtension) {
+                            parsed["value"]["content"] =
+                                "!inline " +
+                                    removeSuffix(p.replaceAll(SEP, "/"), ".resource.json") +
+                                    ".resource.file." +
+                                    formatExtension;
+                        }
+                        return useYaml
+                            ? yamlStringify(parsed, yamlOptions)
+                            : JSON.stringify(parsed, null, 2);
+                    }
                     return useYaml && isJson
                         ? yamlStringify(JSON.parse(content), yamlOptions)
                         : content;
@@ -388,6 +411,25 @@ function ZipFSElement(zip, useYaml, defaultTs) {
                 });
             }
         }
+        if (kind == "resource") {
+            const content = await f.async("text");
+            const parsed = JSON.parse(content);
+            const formatExtension = resourceTypeToFormatExtension[parsed["resource_type"]];
+            if (formatExtension) {
+                const fileContent = parsed["value"]["content"];
+                r.push({
+                    isDirectory: false,
+                    path: removeSuffix(finalPath, ".resource.json") +
+                        ".resource.file." +
+                        formatExtension,
+                    async *getChildren() { },
+                    // deno-lint-ignore require-await
+                    async getContentText() {
+                        return fileContent;
+                    },
+                });
+            }
+        }
         return r;
     }
     function _internal_folder(p, zip) {
@@ -479,6 +521,8 @@ export async function elementsToMap(els, ignore, json, skips) {
             continue;
         if (skips.skipResources && path.endsWith(".resource" + ext))
             continue;
+        if (skips.skipResources && isFileResource(path))
+            continue;
         if (![
             "json",
             "yaml",
@@ -492,7 +536,10 @@ export async function elementsToMap(els, ignore, json, skips) {
             "php",
             "js",
             "lock",
-        ].includes(path.split(".").pop() ?? ""))
+            "rs",
+            "yml",
+        ].includes(path.split(".").pop() ?? "") &&
+            !isFileResource(path))
             continue;
         const content = await entry.getContentText();
         if (skips.skipSecrets && path.endsWith(".variable" + ext)) {
@@ -695,7 +742,10 @@ export async function pull(opts) {
     await requireLogin(opts);
     const codebases = await listSyncCodebases(opts);
     log.info(colors.gray("Computing the files to update locally to match remote (taking wmill.yaml into account)"));
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun");
+    const resourceTypeToFormatExtension = (await wmill.fileResourceTypeToFileExtMap({
+        workspace: workspace.workspaceId,
+    }));
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
     const local = !opts.stateful
         ? await FSFSElement(dntShim.Deno.cwd(), codebases)
         : await FSFSElement(path.join(dntShim.Deno.cwd(), ".wmill"), []);
@@ -910,7 +960,10 @@ export async function push(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     log.info(colors.gray("Computing the files to update on the remote to match local (taking wmill.yaml includes/excludes into account)"));
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun");
+    const resourceTypeToFormatExtension = (await wmill.fileResourceTypeToFileExtMap({
+        workspace: workspace.workspaceId,
+    }));
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, 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);
     const version = await fetchVersion(workspace.remote);
@@ -954,9 +1007,21 @@ export async function push(opts) {
                     await ensureDir(path.dirname(stateTarget));
                     log.info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
                 }
+                if (isFileResource(change.path)) {
+                    const resourceFilePath = await findResourceFile(change.path);
+                    if (!alreadySynced.includes(resourceFilePath)) {
+                        alreadySynced.push(resourceFilePath);
+                        const newObj = parseFromPath(resourceFilePath, await dntShim.Deno.readTextFile(resourceFilePath));
+                        await pushResource(workspace.workspaceId, resourceFilePath, undefined, newObj);
+                        if (opts.stateful && stateExists) {
+                            await dntShim.Deno.writeTextFile(stateTarget, change.after);
+                        }
+                        continue;
+                    }
+                }
                 const oldObj = parseFromPath(change.path, change.before);
                 const newObj = parseFromPath(change.path, change.after);
-                await pushObj(workspace.workspaceId, change.path, oldObj, newObj, opts.plainSecrets ?? false, opts.message);
+                await pushObj(workspace.workspaceId, change.path, oldObj, newObj, opts.plainSecrets ?? false, alreadySynced, opts.message);
                 if (opts.stateful && stateExists) {
                     await dntShim.Deno.writeTextFile(stateTarget, change.after);
                 }
@@ -964,7 +1029,8 @@ export async function push(opts) {
             else if (change.name === "added") {
                 if (change.path.endsWith(".script.json") ||
                     change.path.endsWith(".script.yaml") ||
-                    change.path.endsWith(".lock")) {
+                    change.path.endsWith(".lock") ||
+                    isFileResource(change.path)) {
                     continue;
                 }
                 else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, globalDeps, codebases)) {
@@ -975,7 +1041,7 @@ export async function push(opts) {
                     log.info(`Adding ${getTypeStrFromPath(change.path)} ${change.path}`);
                 }
                 const obj = parseFromPath(change.path, change.content);
-                await pushObj(workspace.workspaceId, change.path, undefined, obj, opts.plainSecrets ?? false, opts.message);
+                await pushObj(workspace.workspaceId, change.path, undefined, obj, opts.plainSecrets ?? false, [], opts.message);
                 if (opts.stateful && stateExists) {
                     await dntShim.Deno.writeTextFile(stateTarget, change.content);
                 }
@@ -994,60 +1060,60 @@ export async function push(opts) {
                 const workspaceId = workspace.workspaceId;
                 switch (typ) {
                     case "script": {
-                        const script = await ScriptService.getScriptByPath({
+                        const script = await wmill.getScriptByPath({
                             workspace: workspaceId,
                             path: removeExtensionToPath(change.path),
                         });
-                        await ScriptService.archiveScriptByHash({
+                        await wmill.archiveScriptByHash({
                             workspace: workspaceId,
                             hash: script.hash,
                         });
                         break;
                     }
                     case "folder":
-                        await FolderService.deleteFolder({
+                        await wmill.deleteFolder({
                             workspace: workspaceId,
                             name: change.path.split(SEP)[1],
                         });
                         break;
                     case "resource":
-                        await ResourceService.deleteResource({
+                        await wmill.deleteResource({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".resource.json"),
                         });
                         break;
                     case "resource-type":
-                        await ResourceService.deleteResourceType({
+                        await wmill.deleteResourceType({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".resource-type.json"),
                         });
                         break;
                     case "flow":
-                        await FlowService.deleteFlowByPath({
+                        await wmill.deleteFlowByPath({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".flow/flow.json"),
                         });
                         break;
                     case "app":
-                        await AppService.deleteApp({
+                        await wmill.deleteApp({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".app/app.json"),
                         });
                         break;
                     case "schedule":
-                        await ScheduleService.deleteSchedule({
+                        await wmill.deleteSchedule({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".schedule.json"),
                         });
                         break;
                     case "variable":
-                        await VariableService.deleteVariable({
+                        await wmill.deleteVariable({
                             workspace: workspaceId,
                             path: removeSuffix(change.path, ".variable.json"),
                         });
                         break;
                     case "user": {
-                        const users = await UserService.listUsers({
+                        const users = await wmill.listUsers({
                             workspace: workspaceId,
                         });
                         const email = removeSuffix(removePathPrefix(change.path, "users"), ".user.json");
@@ -1055,14 +1121,14 @@ export async function push(opts) {
                         if (!user) {
                             throw new Error(`User ${email} not found`);
                         }
-                        await UserService.deleteUser({
+                        await wmill.deleteUser({
                             workspace: workspaceId,
                             username: user.username,
                         });
                         break;
                     }
                     case "group":
-                        await GroupService.deleteGroup({
+                        await wmill.deleteGroup({
                             workspace: workspaceId,
                             name: removeSuffix(removePathPrefix(change.path, "groups"), ".group.json"),
                         });

package/esm/types.js

@@ -9,7 +9,7 @@ import { pushResourceType } from "./resource-type.js";
 import { pushVariable } from "./variable.js";
 import { yamlOptions } from "./sync.js";
 import { showDiffs } from "./main.js";
-import { deepEqual } from "./utils.js";
+import { deepEqual, isFileResource } from "./utils.js";
 import { pushSchedule } from "./schedule.js";
 import { pushWorkspaceUser } from "./user.js";
 import { pushGroup } from "./user.js";
@@ -65,7 +65,7 @@ export function showConflict(path, local, remote) {
     log.info("\x1b[31mlocal\x1b[31m - \x1b[32mremote\x1b[32m");
     log.info("\n");
 }
-export async function pushObj(workspace, p, befObj, newObj, plainSecrets, message) {
+export async function pushObj(workspace, p, befObj, newObj, plainSecrets, alreadySynced, message) {
     const typeEnding = getTypeStrFromPath(p);
     if (typeEnding === "app") {
         const appName = p.split(".app" + SEP)[0];
@@ -82,7 +82,10 @@ export async function pushObj(workspace, p, befObj, newObj, plainSecrets, messag
         await pushFlow(workspace, flowName, flowName + ".flow", message);
     }
     else if (typeEnding === "resource") {
-        await pushResource(workspace, p, befObj, newObj);
+        if (!alreadySynced.includes(p)) {
+            alreadySynced.push(p);
+            await pushResource(workspace, p, befObj, newObj);
+        }
     }
     else if (typeEnding === "resource-type") {
         await pushResourceType(workspace, p, befObj, newObj);
@@ -160,6 +163,9 @@ export function getTypeStrFromPath(p) {
         return typeEnding;
     }
     else {
+        if (isFileResource(p)) {
+            return "resource";
+        }
         throw new Error("Could not infer type of path " + JSON.stringify(parsed));
     }
 }

package/esm/user.js

@@ -3,15 +3,15 @@ import * as dntShim from "./_dnt.shims.js";
 import { requireLogin } from "./context.js";
 import { isSuperset, removeType, removePathPrefix, } from "./types.js";
 import { compareInstanceObjects } from "./instance.js";
-import { colors, Command, log, Table, UserService, GroupService, WorkspaceService, GranularAclService, yamlStringify, yamlParse, } from "./deps.js";
-import { SettingService } from "./deps.js";
+import { colors, Command, log, Table, yamlStringify, yamlParse, } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 async function list(opts) {
     await requireLogin(opts);
     const perPage = 10;
     let page = 0;
     const total = [];
     while (true) {
-        const res = await UserService.listUsersAsSuperAdmin({ page, perPage });
+        const res = await wmill.listUsersAsSuperAdmin({ page, perPage });
         total.push(...res);
         page += 1;
         if (res.length < perPage) {
@@ -37,7 +37,7 @@ function rdString() {
 async function add(opts, email, password) {
     await requireLogin(opts);
     const password_final = password ?? rdString();
-    await UserService.createUserGlobally({
+    await wmill.createUserGlobally({
         requestBody: {
             email,
             password: password_final,
@@ -53,13 +53,13 @@ async function add(opts, email, password) {
 }
 async function remove(opts, email) {
     await requireLogin(opts);
-    await UserService.globalUserDelete({ email });
+    await wmill.globalUserDelete({ email });
     log.info(colors.green("Deleted User " + email));
 }
 async function createToken(opts) {
     if (opts.email && opts.password) {
         log.info("Token: " +
-            (await UserService.login({
+            (await wmill.login({
                 requestBody: {
                     email: opts.email,
                     password: opts.password,
@@ -67,7 +67,7 @@ async function createToken(opts) {
             })));
     }
     await requireLogin(opts);
-    log.info("Token: " + (await UserService.createToken({ requestBody: {} })));
+    log.info("Token: " + (await wmill.createToken({ requestBody: {} })));
 }
 export async function pushWorkspaceUser(workspace, path, user, localUser) {
     const email = removePathPrefix(removeType(path, "user"), "users");
@@ -76,7 +76,7 @@ export async function pushWorkspaceUser(workspace, path, user, localUser) {
         throw new Error(`Invalid role for user ${email}: ${localUser.role}`);
     }
     try {
-        const remoteUser = await UserService.getUser({
+        const remoteUser = await wmill.getUser({
             workspace,
             username: localUser.username,
         });
@@ -105,7 +105,7 @@ export async function pushWorkspaceUser(workspace, path, user, localUser) {
         }
         log.debug(`User ${email} is not up-to-date, updating...`);
         try {
-            await UserService.updateUser({
+            await wmill.updateUser({
                 workspace: workspace,
                 username: localUser.username,
                 requestBody: {
@@ -123,10 +123,10 @@ export async function pushWorkspaceUser(workspace, path, user, localUser) {
     else {
         console.log(colors.bold.yellow("Creating new user: " + email));
         try {
-            const automatedUsernameCreation = (await SettingService.getGlobal({
+            const automatedUsernameCreation = (await wmill.getGlobal({
                 key: "automate_username_creation",
             }));
-            await WorkspaceService.addUser({
+            await wmill.addUser({
                 workspace: workspace,
                 requestBody: {
                     email: email,
@@ -146,7 +146,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
     const name = removePathPrefix(removeType(path, "group"), "groups");
     log.debug(`Processing local group ${name}`);
     try {
-        const remoteGroup = await GroupService.getGroup({
+        const remoteGroup = await wmill.getGroup({
             workspace,
             name,
         });
@@ -176,7 +176,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
         }
         log.debug(`Group ${name} is not up-to-date, updating...`);
         try {
-            await GroupService.updateGroup({
+            await wmill.updateGroup({
                 workspace: workspace,
                 name,
                 requestBody: {
@@ -195,7 +195,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
                 }
                 else {
                     log.debug(`Adding ${member} to group ${name}`);
-                    await GroupService.addUserToGroup({
+                    await wmill.addUserToGroup({
                         workspace: workspace,
                         name,
                         requestBody: {
@@ -206,7 +206,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
                 if (localGroup.admins.includes(member) &&
                     !group.admins.includes(member)) {
                     log.debug(`Setting role of ${member} as admin in group ${name}`);
-                    await GranularAclService.addGranularAcls({
+                    await wmill.addGranularAcls({
                         workspace: workspace,
                         kind: "group_",
                         path: name,
@@ -219,7 +219,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
                 if (localGroup.members.includes(member) &&
                     !group.members.includes(member)) {
                     log.debug(`Setting role of ${member} as member in group ${name}`);
-                    await GranularAclService.addGranularAcls({
+                    await wmill.addGranularAcls({
                         workspace: workspace,
                         kind: "group_",
                         path: name,
@@ -239,14 +239,14 @@ export async function pushGroup(workspace, path, group, localGroup) {
             if (![...localGroup.members, ...localGroup.admins].includes(member)) {
                 log.debug(`Removing ${member} and any associated role from group ${name}`);
                 try {
-                    await GroupService.removeUserToGroup({
+                    await wmill.removeUserToGroup({
                         workspace: workspace,
                         name,
                         requestBody: {
                             username: member.slice(2),
                         },
                     });
-                    await GranularAclService.removeGranularAcls({
+                    await wmill.removeGranularAcls({
                         workspace: workspace,
                         kind: "group_",
                         path: name,
@@ -265,7 +265,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
     else {
         console.log(colors.bold.yellow("Creating new user: " + name));
         try {
-            await GroupService.createGroup({
+            await wmill.createGroup({
                 workspace: workspace,
                 requestBody: {
                     name,
@@ -275,7 +275,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
             for (const member of [...localGroup.members, ...localGroup.admins]) {
                 log.debug(`Adding user ${member} to group ${name}`);
                 try {
-                    await GroupService.addUserToGroup({
+                    await wmill.addUserToGroup({
                         workspace: workspace,
                         name,
                         requestBody: {
@@ -284,7 +284,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
                     });
                     if (localGroup.admins.includes(member)) {
                         log.debug(`Setting role of ${member} as admin in group ${name}`);
-                        await GranularAclService.addGranularAcls({
+                        await wmill.addGranularAcls({
                             workspace: workspace,
                             kind: "group_",
                             path: name,
@@ -308,7 +308,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
     }
 }
 export async function pullInstanceUsers(preview = false) {
-    const remoteUsers = await UserService.globalUsersExport();
+    const remoteUsers = await wmill.globalUsersExport();
     if (preview) {
         let localUsers = [];
         try {
@@ -325,7 +325,7 @@ export async function pullInstanceUsers(preview = false) {
     }
 }
 export async function pushInstanceUsers(preview = false) {
-    const remoteUsers = await UserService.globalUsersExport();
+    const remoteUsers = await wmill.globalUsersExport();
     const localUsers = (await dntShim.Deno.readTextFile("instance_users.yaml")
         .then((raw) => yamlParse(raw))
         .catch(() => []));
@@ -334,14 +334,14 @@ export async function pushInstanceUsers(preview = false) {
     }
     else {
         log.info("Pushing users to instance...");
-        await UserService.globalUsersOverwrite({
+        await wmill.globalUsersOverwrite({
             requestBody: localUsers,
         });
         log.info(colors.green("Users pushed to the instance"));
     }
 }
 export async function pullInstanceGroups(preview = false) {
-    const remoteGroups = await GroupService.exportInstanceGroups();
+    const remoteGroups = await wmill.exportInstanceGroups();
     if (preview) {
         let localGroups = [];
         try {
@@ -358,7 +358,7 @@ export async function pullInstanceGroups(preview = false) {
     }
 }
 export async function pushInstanceGroups(preview = false) {
-    const remoteGroups = await GroupService.exportInstanceGroups();
+    const remoteGroups = await wmill.exportInstanceGroups();
     const localGroups = (await dntShim.Deno.readTextFile("instance_groups.yaml")
         .then((raw) => yamlParse(raw))
         .catch(() => []));
@@ -367,7 +367,7 @@ export async function pushInstanceGroups(preview = false) {
     }
     else {
         log.info("Pushing groups to instance...");
-        await GroupService.overwriteInstanceGroups({
+        await wmill.overwriteInstanceGroups({
             requestBody: localGroups,
         });
         log.info(colors.green("Groups pushed to the instance"));

package/esm/utils.js

@@ -3,6 +3,7 @@
 import * as dntShim from "./_dnt.shims.js";
 // @ts-nocheck This file is copied from a JS project, so it's not type-safe.
 import { log, encodeHex, SEP } from "./deps.js";
+import crypto from "node:crypto";
 export function deepEqual(a, b) {
     if (a === b)
         return true;
@@ -120,3 +121,9 @@ export function readInlinePathSync(path) {
 export function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+export function isFileResource(path) {
+    const splitPath = path.split(".");
+    return (splitPath.length >= 4 &&
+        splitPath[1] == "resource" &&
+        splitPath[2] == "file");
+}

package/esm/variable.js

@@ -2,11 +2,12 @@
 import * as dntShim from "./_dnt.shims.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
 import { isSuperset, parseFromFile, removeType, } from "./types.js";
-import { colors, Command, Confirm, log, SEP, Table, VariableService, } from "./deps.js";
+import { colors, Command, Confirm, log, SEP, Table } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 async function list(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    const variables = await VariableService.listVariable({
+    const variables = await wmill.listVariable({
         workspace: workspace.workspaceId,
     });
     new Table()
@@ -25,7 +26,7 @@ export async function pushVariable(workspace, remotePath, variable, localVariabl
     remotePath = removeType(remotePath, "variable");
     log.debug(`Processing local variable ${remotePath}`);
     try {
-        variable = await VariableService.getVariable({
+        variable = await wmill.getVariable({
             workspace: workspace,
             path: remotePath.replaceAll(SEP, "/"),
             decryptSecret: plainSecrets,
@@ -42,7 +43,7 @@ export async function pushVariable(workspace, remotePath, variable, localVariabl
             return;
         }
         log.debug(`Variable ${remotePath} is not up-to-date, updating`);
-        await VariableService.updateVariable({
+        await wmill.updateVariable({
             workspace,
             path: remotePath.replaceAll(SEP, "/"),
             alreadyEncrypted: !plainSecrets,
@@ -54,7 +55,7 @@ export async function pushVariable(workspace, remotePath, variable, localVariabl
     }
     else {
         log.info(colors.yellow.bold(`Creating new variable ${remotePath}...`));
-        await VariableService.createVariable({
+        await wmill.createVariable({
             workspace,
             alreadyEncrypted: !plainSecrets,
             requestBody: {
@@ -84,7 +85,7 @@ async function add(opts, value, remotePath) {
     if (!validatePath(remotePath)) {
         return;
     }
-    if (await VariableService.existsVariable({
+    if (await wmill.existsVariable({
         workspace: workspace.workspaceId,
         path: remotePath,
     })) {

package/esm/workspace.js

@@ -2,7 +2,8 @@
 import * as dntShim from "./_dnt.shims.js";
 import { getRootStore } from "./store.js";
 import { loginInteractive, tryGetLoginInfo } from "./login.js";
-import { colors, Command, Input, log, setClient, Table, UserService, WorkspaceService, SettingService, } from "./deps.js";
+import { colors, Command, Input, log, setClient, Table } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { requireLogin } from "./context.js";
 export async function allWorkspaces() {
     try {
@@ -130,7 +131,7 @@ export async function add(opts, workspaceName, workspaceId, remote) {
     setClient(token, remote.endsWith("/") ? remote.substring(0, remote.length - 1) : remote);
     let alreadyExists = false;
     try {
-        alreadyExists = await WorkspaceService.existsWorkspace({
+        alreadyExists = await wmill.existsWorkspace({
             requestBody: { id: workspaceId },
         });
     }
@@ -141,10 +142,10 @@ export async function add(opts, workspaceName, workspaceId, remote) {
     if (opts.create) {
         if (!alreadyExists) {
             log.info(colors.yellow(`Workspace at id ${workspaceId} on ${remote} does not exist. Creating...`));
-            const automateUsernameCreation = (await SettingService.getGlobal({
+            const automateUsernameCreation = (await wmill.getGlobal({
                 key: "automate_username_creation",
             })) ?? false;
-            await WorkspaceService.createWorkspace({
+            await wmill.createWorkspace({
                 requestBody: {
                     id: workspaceId,
                     name: opts.createWorkspaceName ?? workspaceName,
@@ -156,7 +157,7 @@ export async function add(opts, workspaceName, workspaceId, remote) {
     else if (!alreadyExists) {
         log.info(colors.red.bold(`! Workspace at id ${workspaceId} on ${remote} does not exist. Re-run with --create to create it. Aborting.`));
         log.info("On that instance and with those credentials, the workspaces that you can access are:");
-        const workspaces = await WorkspaceService.listWorkspaces();
+        const workspaces = await wmill.listWorkspaces();
         for (const workspace of workspaces) {
             log.info(`- ${workspace.id} (name: ${workspace.name})`);
         }
@@ -209,7 +210,7 @@ async function remove(_opts, name) {
 }
 async function whoami(_opts) {
     await requireLogin(_opts);
-    log.info(await UserService.globalWhoami());
+    log.info(await wmill.globalWhoami());
     const activeName = await getActiveWorkspaceName(_opts);
     log.info("Active: " + colors.green.bold(activeName || "none"));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.396.0",
+  "version": "1.397.3",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",
@@ -37,7 +37,6 @@
     "jszip": "3.7.1",
     "minimatch": "*",
     "open": "*",
-    "windmill-client": "1.364.0",
     "ws": "*",
     "@deno/shim-deno": "~0.18.0"
   },