windmill-cli 1.396.1 → 1.397.3

package/esm/apps.js

@@ -1,7 +1,8 @@
 // deno-lint-ignore-file no-explicit-any
 import * as dntShim from "./_dnt.shims.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
-import { AppService, colors, Command, log, SEP, Table, yamlParse, } from "./deps.js";
+import { colors, Command, log, SEP, Table, yamlParse } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { isSuperset } from "./types.js";
 import { readInlinePathSync } from "./utils.js";
 const alreadySynced = [];
@@ -14,7 +15,7 @@ export async function pushApp(workspace, remotePath, localPath, message) {
     let app = undefined;
     // deleting old app if it exists in raw mode
     try {
-        app = await AppService.getAppByPath({
+        app = await wmill.getAppByPath({
             workspace,
             path: remotePath,
         });
@@ -58,7 +59,7 @@ export async function pushApp(workspace, remotePath, localPath, message) {
             return;
         }
         log.info(colors.bold.yellow(`Updating app ${remotePath}...`));
-        await AppService.updateApp({
+        await wmill.updateApp({
             workspace,
             path: remotePath,
             requestBody: {
@@ -69,7 +70,7 @@ export async function pushApp(workspace, remotePath, localPath, message) {
     }
     else {
         log.info(colors.yellow.bold("Creating new app..."));
-        await AppService.createApp({
+        await wmill.createApp({
             workspace,
             requestBody: {
                 path: remotePath,
@@ -86,7 +87,7 @@ async function list(opts) {
     const perPage = 10;
     const total = [];
     while (true) {
-        const res = await AppService.listApps({
+        const res = await wmill.listApps({
             workspace: workspace.workspaceId,
             page,
             perPage,

package/esm/bootstrap/script_bootstrap.js

@@ -54,4 +54,22 @@ function main() {
   return "Hello world";
 }
 `,
+    rust: `fn main() -> Result<(), String> {
+  println!("Hello World");
+  Ok(())
+}
+`,
+    ansible: `---
+inventory:
+  - resource_type: ansible_inventory
+---
+- name: Echo
+  hosts: 127.0.0.1
+  connection: local
+
+  tasks:
+  - name: Print debug message
+    debug:
+      msg: "Hello, world!"
+`
 };

package/esm/context.js

@@ -1,6 +1,7 @@
 // deno-lint-ignore-file no-explicit-any
 import * as dntShim from "./_dnt.shims.js";
-import { colors, log, setClient, UserService } from "./deps.js";
+import { colors, log, setClient } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { loginInteractive, tryGetLoginInfo } from "./login.js";
 import { getHeaders } from "./utils.js";
 import { addWorkspace, getActiveWorkspace, getWorkspaceByName, removeWorkspace, } from "./workspace.js";
@@ -60,7 +61,7 @@ export async function requireLogin(opts) {
     }
     setClient(token, workspace.remote.substring(0, workspace.remote.length - 1));
     try {
-        return await UserService.globalWhoami();
+        return await wmill.globalWhoami();
     }
     catch {
         log.info("! Could not reach API given existing credentials. Attempting to reauth...");
@@ -72,7 +73,7 @@ export async function requireLogin(opts) {
         workspace.token = newToken;
         addWorkspace(workspace, opts);
         setClient(token, workspace.remote.substring(0, workspace.remote.length - 1));
-        return await UserService.globalWhoami();
+        return await wmill.globalWhoami();
     }
 }
 export async function fetchVersion(baseUrl) {

package/esm/deps.js

@@ -1,6 +1,5 @@
-// windmill
-export * from "windmill-client";
 // cliffy
+import * as dntShim from "./_dnt.shims.js";
 export { Command } from "./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js";
 export { Table } from "./deps/jsr.io/@windmill-labs/cliffy-table/1.0.0-rc.5/mod.js";
 export { colors } from "./deps/jsr.io/@windmill-labs/cliffy-ansi/1.0.0-rc.5/colors.js";
@@ -32,3 +31,21 @@ export { WebSocketServer, WebSocket } from "ws";
 export * as getPort from "get-port";
 export * as open from "open";
 export * as esMain from "es-main";
+import { OpenAPI } from "./gen/index.js";
+export function setClient(token, baseUrl) {
+    if (baseUrl === undefined) {
+        baseUrl =
+            getEnv("BASE_INTERNAL_URL") ??
+                getEnv("BASE_URL") ??
+                "http://localhost:8000";
+    }
+    if (token === undefined) {
+        token = getEnv("WM_TOKEN") ?? "no_token";
+    }
+    OpenAPI.WITH_CREDENTIALS = true;
+    OpenAPI.TOKEN = token;
+    OpenAPI.BASE = baseUrl + "/api";
+}
+const getEnv = (key) => {
+    return dntShim.Deno.env.get(key);
+};

package/esm/flow.js

@@ -2,7 +2,8 @@
 import * as dntShim from "./_dnt.shims.js";
 import { isSuperset } from "./types.js";
 import { Confirm, SEP, log, yamlStringify } from "./deps.js";
-import { colors, Command, FlowService, JobService, Table, yamlParse, } from "./deps.js";
+import { colors, Command, Table, yamlParse } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
 import { resolve, track_job } from "./script.js";
 import { defaultFlowDefinition } from "./bootstrap/flow_bootstrap.js";
@@ -55,7 +56,7 @@ export async function pushFlow(workspace, remotePath, localPath, message) {
     remotePath = remotePath.replaceAll(SEP, "/");
     let flow = undefined;
     try {
-        flow = await FlowService.getFlowByPath({
+        flow = await wmill.getFlowByPath({
             workspace: workspace,
             path: remotePath,
         });
@@ -75,7 +76,7 @@ export async function pushFlow(workspace, remotePath, localPath, message) {
             return;
         }
         log.info(colors.bold.yellow(`Updating flow ${remotePath}...`));
-        await FlowService.updateFlow({
+        await wmill.updateFlow({
             workspace: workspace,
             path: remotePath.replaceAll(SEP, "/"),
             requestBody: {
@@ -88,7 +89,7 @@ export async function pushFlow(workspace, remotePath, localPath, message) {
     else {
         log.info(colors.bold.yellow("Creating new flow..."));
         try {
-            await FlowService.createFlow({
+            await wmill.createFlow({
                 workspace: workspace,
                 requestBody: {
                     path: remotePath.replaceAll(SEP, "/"),
@@ -118,7 +119,7 @@ async function list(opts) {
     const perPage = 10;
     const total = [];
     while (true) {
-        const res = await FlowService.listFlows({
+        const res = await wmill.listFlows({
             workspace: workspace.workspaceId,
             page,
             perPage,
@@ -142,14 +143,14 @@ async function run(opts, path) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     const input = opts.data ? await resolve(opts.data) : {};
-    const id = await JobService.runFlowByPath({
+    const id = await wmill.runFlowByPath({
         workspace: workspace.workspaceId,
         path,
         requestBody: input,
     });
     let i = 0;
     while (true) {
-        const jobInfo = await JobService.getJob({
+        const jobInfo = await wmill.getJob({
             workspace: workspace.workspaceId,
             id,
         });
@@ -176,7 +177,7 @@ async function run(opts, path) {
         log.info(colors.green.underline.bold("Flow ran to completion"));
         log.info("\n");
     }
-    const jobInfo = await JobService.getCompletedJob({
+    const jobInfo = await wmill.getCompletedJob({
         workspace: workspace.workspaceId,
         id,
     });

package/esm/folder.js

@@ -1,12 +1,13 @@
 // deno-lint-ignore-file no-explicit-any
 import * as dntShim from "./_dnt.shims.js";
-import { colors, Command, FolderService, log, SEP, Table, } from "./deps.js";
+import { colors, Command, log, SEP, Table } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
 import { isSuperset, parseFromFile } from "./types.js";
 async function list(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    const folders = await FolderService.listFolders({
+    const folders = await wmill.listFolders({
         workspace: workspace.workspaceId,
     });
     new Table()
@@ -31,7 +32,7 @@ export async function pushFolder(workspace, name, folder, localFolder) {
     log.debug(`Processing local folder ${name}`);
     // deleting old app if it exists in raw mode
     try {
-        folder = await FolderService.getFolder({ workspace, name });
+        folder = await wmill.getFolder({ workspace, name });
         log.debug(`Folder ${name} exists on remote`);
     }
     catch {
@@ -45,7 +46,7 @@ export async function pushFolder(workspace, name, folder, localFolder) {
         }
         log.debug(`Folder ${name} is not up-to-date, updating...`);
         try {
-            await FolderService.updateFolder({
+            await wmill.updateFolder({
                 workspace: workspace,
                 name: name,
                 requestBody: {
@@ -61,7 +62,7 @@ export async function pushFolder(workspace, name, folder, localFolder) {
     else {
         console.log(colors.bold.yellow("Creating new folder: " + name));
         try {
-            await FolderService.createFolder({
+            await wmill.createFolder({
                 workspace: workspace,
                 requestBody: {
                     name: name,

package/esm/gen/core/ApiError.js

@@ -0,0 +1,41 @@
+export class ApiError extends Error {
+    constructor(request, response, message) {
+        super(message);
+        Object.defineProperty(this, "url", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "status", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "statusText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "body", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "request", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = 'ApiError';
+        this.url = response.url;
+        this.status = response.status;
+        this.statusText = response.statusText;
+        this.body = response.body;
+        this.request = request;
+    }
+}

package/esm/gen/core/ApiRequestOptions.js

@@ -0,0 +1 @@
+export {};

package/esm/gen/core/ApiResult.js

@@ -0,0 +1 @@
+export {};

package/esm/gen/core/CancelablePromise.js

@@ -0,0 +1,130 @@
+export class CancelError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'CancelError';
+    }
+    get isCancelled() {
+        return true;
+    }
+}
+export class CancelablePromise {
+    constructor(executor) {
+        Object.defineProperty(this, "_isResolved", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_isRejected", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_isCancelled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cancelHandlers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "promise", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_resolve", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_reject", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this._isResolved = false;
+        this._isRejected = false;
+        this._isCancelled = false;
+        this.cancelHandlers = [];
+        this.promise = new Promise((resolve, reject) => {
+            this._resolve = resolve;
+            this._reject = reject;
+            const onResolve = (value) => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this._isResolved = true;
+                if (this._resolve)
+                    this._resolve(value);
+            };
+            const onReject = (reason) => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this._isRejected = true;
+                if (this._reject)
+                    this._reject(reason);
+            };
+            const onCancel = (cancelHandler) => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this.cancelHandlers.push(cancelHandler);
+            };
+            Object.defineProperty(onCancel, 'isResolved', {
+                get: () => this._isResolved,
+            });
+            Object.defineProperty(onCancel, 'isRejected', {
+                get: () => this._isRejected,
+            });
+            Object.defineProperty(onCancel, 'isCancelled', {
+                get: () => this._isCancelled,
+            });
+            return executor(onResolve, onReject, onCancel);
+        });
+    }
+    get [Symbol.toStringTag]() {
+        return "Cancellable Promise";
+    }
+    then(onFulfilled, onRejected) {
+        return this.promise.then(onFulfilled, onRejected);
+    }
+    catch(onRejected) {
+        return this.promise.catch(onRejected);
+    }
+    finally(onFinally) {
+        return this.promise.finally(onFinally);
+    }
+    cancel() {
+        if (this._isResolved || this._isRejected || this._isCancelled) {
+            return;
+        }
+        this._isCancelled = true;
+        if (this.cancelHandlers.length) {
+            try {
+                for (const cancelHandler of this.cancelHandlers) {
+                    cancelHandler();
+                }
+            }
+            catch (error) {
+                console.warn('Cancellation threw an error', error);
+                return;
+            }
+        }
+        this.cancelHandlers.length = 0;
+        if (this._reject)
+            this._reject(new CancelError('Request aborted'));
+    }
+    get isCancelled() {
+        return this._isCancelled;
+    }
+}

package/esm/gen/core/OpenAPI.js

@@ -0,0 +1,41 @@
+import * as dntShim from "../../_dnt.shims.js";
+const getEnv = (key) => {
+    return dntShim.Deno.env.get(key);
+};
+const baseUrl = getEnv("BASE_INTERNAL_URL") ?? getEnv("BASE_URL") ?? "http://localhost:8000";
+const baseUrlApi = (baseUrl ?? '') + "/api";
+export class Interceptors {
+    constructor() {
+        Object.defineProperty(this, "_fns", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this._fns = [];
+    }
+    eject(fn) {
+        const index = this._fns.indexOf(fn);
+        if (index !== -1) {
+            this._fns = [...this._fns.slice(0, index), ...this._fns.slice(index + 1)];
+        }
+    }
+    use(fn) {
+        this._fns = [...this._fns, fn];
+    }
+}
+export const OpenAPI = {
+    BASE: baseUrlApi,
+    CREDENTIALS: 'include',
+    ENCODE_PATH: undefined,
+    HEADERS: undefined,
+    PASSWORD: undefined,
+    TOKEN: getEnv("WM_TOKEN"),
+    USERNAME: undefined,
+    VERSION: '1.397.3',
+    WITH_CREDENTIALS: true,
+    interceptors: {
+        request: new Interceptors(),
+        response: new Interceptors(),
+    },
+};