windmill-cli 1.693.5 → 1.694.0

package/esm/main.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -13185,7 +13203,7 @@ function sameValueZero(a, b) {
 }
 function equal(a, b) {
   const seen = new Map;
-  return function compare(a2, b2) {
+  return function compare3(a2, b2) {
     if (sameValueZero(a2, b2))
       return true;
     if (isPrimitive(a2) || isPrimitive(b2))
@@ -13210,7 +13228,7 @@ function equal(a, b) {
         throw new TypeError("Cannot compare WeakSet instances");
       }
       if (a2 instanceof WeakRef) {
-        return compare(a2.deref(), b2.deref());
+        return compare3(a2.deref(), b2.deref());
       }
       if (seen.get(a2) === b2) {
         return true;
@@ -13232,7 +13250,7 @@ function equal(a, b) {
             return a2.symmetricDifference(b2).size === 0;
           }
           for (const key of aKeys) {
-            if (!b2.has(key) || !compare(a2.get(key), b2.get(key))) {
+            if (!b2.has(key) || !compare3(a2.get(key), b2.get(key))) {
               return false;
             }
           }
@@ -13241,9 +13259,9 @@ function equal(a, b) {
         let unmatchedEntries = a2.size;
         for (const [aKey, aValue] of a2.entries()) {
           for (const [bKey, bValue] of b2.entries()) {
-            if (!compare(aKey, bKey))
+            if (!compare3(aKey, bKey))
               continue;
-            if (aKey === aValue && bKey === bValue || compare(aValue, bValue)) {
+            if (aKey === aValue && bKey === bValue || compare3(aValue, bValue)) {
               unmatchedEntries--;
               break;
             }
@@ -13263,7 +13281,7 @@ function equal(a, b) {
         keys = getKeysDeep(a2).union(getKeysDeep(b2));
       }
       for (const key of keys) {
-        if (!compare(a2[key], b2[key])) {
+        if (!compare3(a2[key], b2[key])) {
           return false;
         }
         if (key in a2 && !(key in b2) || key in b2 && !(key in a2)) {
@@ -16692,7 +16710,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.693.4",
+    VERSION: "1.694.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25082,6 +25100,24 @@ async function requireLogin(opts) {
       throw new Error(`Network error: Could not connect to Windmill server at ${workspace.remote}`);
     }
     if (opts.token || opts.baseUrl) {
+      const isApiError = error2 && typeof error2 === "object" && "name" in error2 && error2.name === "ApiError";
+      if (isApiError) {
+        const status = error2.status;
+        const body = error2.body;
+        let bodyStr = typeof body === "object" && body !== null ? JSON.stringify(body) : String(body ?? "").trim();
+        bodyStr = bodyStr.replace(/\s*[@(]\w+\.rs:\d+[:\d]*\)?/g, "");
+        bodyStr = bodyStr.replace(/^(Permission denied|Not authorized): /, "");
+        if (status === 403) {
+          info(colors.red(`Permission denied: the token is valid but lacks the required scope.${bodyStr ? `
+${bodyStr}` : ""}`));
+        } else if (status === 401) {
+          info(colors.red(`Could not authenticate with the provided credentials. Please check your --token and --base-url and try again.${bodyStr ? `
+${bodyStr}` : ""}`));
+        } else {
+          info(colors.red(`Request failed (${status ?? "unknown"}): ${bodyStr}`));
+        }
+        return process.exit(1);
+      }
       info(colors.red("Could not authenticate with the provided credentials. Please check your --token and --base-url and try again."));
       return process.exit(1);
     }
@@ -30405,7 +30441,7 @@ var require_stream = __commonJS((exports, module) => {
       if (!duplex.push(data3))
         ws.pause();
     });
-    ws.once("error", function error(err) {
+    ws.once("error", function error2(err) {
       if (duplex.destroyed)
         return;
       terminateOnDestroy = false;
@@ -30423,7 +30459,7 @@ var require_stream = __commonJS((exports, module) => {
         return;
       }
       let called = false;
-      ws.once("error", function error(err2) {
+      ws.once("error", function error2(err2) {
         called = true;
         callback(err2);
       });
@@ -30437,7 +30473,7 @@ var require_stream = __commonJS((exports, module) => {
     };
     duplex._final = function(callback) {
       if (ws.readyState === ws.CONNECTING) {
-        ws.once("open", function open() {
+        ws.once("open", function open2() {
           duplex._final(callback);
         });
         return;
@@ -30461,7 +30497,7 @@ var require_stream = __commonJS((exports, module) => {
     };
     duplex._write = function(chunk, encoding, callback) {
       if (ws.readyState === ws.CONNECTING) {
-        ws.once("open", function open() {
+        ws.once("open", function open2() {
           duplex._write(chunk, encoding, callback);
         });
         return;
@@ -35512,7 +35548,7 @@ var require_BufferList = __commonJS((exports, module) => {
       this.tail = null;
       this.length = 0;
     }
-    BufferList.prototype.push = function push(v) {
+    BufferList.prototype.push = function push2(v) {
       var entry = { data: v, next: null };
       if (this.length > 0)
         this.tail.next = entry;
@@ -35543,7 +35579,7 @@ var require_BufferList = __commonJS((exports, module) => {
       this.head = this.tail = null;
       this.length = 0;
     };
-    BufferList.prototype.join = function join(s) {
+    BufferList.prototype.join = function join9(s) {
       if (this.length === 0)
         return "";
       var p = this.head;
@@ -37478,7 +37514,7 @@ var require_nodejsUtils = __commonJS((exports, module) => {
 
 // node_modules/set-immediate-shim/index.js
 var require_set_immediate_shim = __commonJS((exports, module) => {
-  module.exports = typeof setImmediate === "function" ? setImmediate : function setImmediate() {
+  module.exports = typeof setImmediate === "function" ? setImmediate : function setImmediate2() {
     var args = [].slice.apply(arguments);
     args.splice(1, 0, 0);
     setTimeout.apply(null, args);
@@ -45833,7 +45869,7 @@ var require_headers = __commonJS((exports) => {
     }
     return result;
   };
-  exports.encode = function encode(opts) {
+  exports.encode = function encode2(opts) {
     const buf = b4a.alloc(512);
     let name = opts.name;
     let prefix = "";
@@ -45874,7 +45910,7 @@ var require_headers = __commonJS((exports) => {
     b4a.write(buf, encodeOct(cksum(buf), 6), 148);
     return buf;
   };
-  exports.decode = function decode(buf, filenameEncoding, allowUnknownFormat) {
+  exports.decode = function decode2(buf, filenameEncoding, allowUnknownFormat) {
     let typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET;
     let name = decodeStr(buf, 0, 100, filenameEncoding);
     const mode = decodeOct(buf, 100, 8);
@@ -48785,7 +48821,7 @@ var require_subschema = __commonJS((exports) => {
 
 // node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS((exports, module) => {
-  module.exports = function equal(a, b) {
+  module.exports = function equal2(a, b) {
     if (a === b)
       return true;
     if (a && b && typeof a == "object" && typeof b == "object") {
@@ -48797,7 +48833,7 @@ var require_fast_deep_equal = __commonJS((exports, module) => {
         if (length != b.length)
           return false;
         for (i = length;i-- !== 0; )
-          if (!equal(a[i], b[i]))
+          if (!equal2(a[i], b[i]))
             return false;
         return true;
       }
@@ -48816,7 +48852,7 @@ var require_fast_deep_equal = __commonJS((exports, module) => {
           return false;
       for (i = length;i-- !== 0; ) {
         var key = keys[i];
-        if (!equal(a[key], b[key]))
+        if (!equal2(a[key], b[key]))
           return false;
       }
       return true;
@@ -72316,7 +72352,7 @@ async function pushSchedule(workspace, path19, schedule, localSchedule, permissi
           ...preserveFields
         }
       });
-      if (localSchedule.enabled != schedule.enabled) {
+      if (localSchedule.enabled !== undefined && localSchedule.enabled !== schedule.enabled) {
         info(colors.bold.yellow(`Schedule ${path19} is ${localSchedule.enabled ? "enabled" : "disabled"} locally but not on remote, updating remote`));
         await setScheduleEnabled({
           workspace,
@@ -72351,13 +72387,31 @@ async function enable(opts, path19) {
   opts = await mergeConfigWithConfigFile(opts);
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
-  await setScheduleEnabled({
-    workspace: workspace.workspaceId,
-    path: path19,
-    requestBody: { enabled: true }
-  });
+  try {
+    await setScheduleEnabled({
+      workspace: workspace.workspaceId,
+      path: path19,
+      requestBody: { enabled: true, force: opts.force }
+    });
+  } catch (e) {
+    const conflict = parseForkConflict(e);
+    if (conflict) {
+      error(`Cannot enable schedule '${path19}': the parent workspace '${conflict.parentWorkspaceId}' has the same path configured. ` + `Both crons would fire on every tick and the script would run twice per scheduled time.
+` + `Re-run with --force to enable anyway.`);
+      process.exit(1);
+    }
+    throw e;
+  }
   info(colors.green(`Schedule ${path19} enabled.`));
 }
+function parseForkConflict(e) {
+  const body = e?.body;
+  const raw = typeof body === "string" ? body : e?.message ?? "";
+  const m = String(raw).match(/fork-conflict:([^:]+):(.+)/);
+  if (!m)
+    return;
+  return { kind: m[1], parentWorkspaceId: m[2].trim() };
+}
 async function disable(opts, path19) {
   opts = await mergeConfigWithConfigFile(opts);
   const workspace = await resolveWorkspace(opts);
@@ -72398,7 +72452,7 @@ var init_schedule = __esm(async () => {
     init_types()
   ]);
   import_yaml26 = __toESM(require_dist(), 1);
-  command16 = new Command().description("schedule related commands").option("--json", "Output as JSON (for piping to jq)").action(list9).command("list", "list all schedules").option("--json", "Output as JSON (for piping to jq)").action(list9).command("get", "get a schedule's details").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(get7).command("new", "create a new schedule locally").arguments("<path:string>").action(newSchedule).command("push", "push a local schedule spec. This overrides any remote versions.").arguments("<file_path:string> <remote_path:string>").action(push8).command("enable", "Enable a schedule").arguments("<path:string>").action(enable).command("disable", "Disable a schedule").arguments("<path:string>").action(disable).command("set-permissioned-as", "Set the email (run-as user) for a schedule (requires admin or wm_deployers group)").arguments("<path:string> <email:string>").action(async (opts, schedulePath, email) => {
+  command16 = new Command().description("schedule related commands").option("--json", "Output as JSON (for piping to jq)").action(list9).command("list", "list all schedules").option("--json", "Output as JSON (for piping to jq)").action(list9).command("get", "get a schedule's details").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(get7).command("new", "create a new schedule locally").arguments("<path:string>").action(newSchedule).command("push", "push a local schedule spec. This overrides any remote versions.").arguments("<file_path:string> <remote_path:string>").action(push8).command("enable", "Enable a schedule").option("--force", "Bypass the fork-conflict warning when the parent workspace has the same schedule (acknowledges that both crons will fire)").arguments("<path:string>").action(enable).command("disable", "Disable a schedule").arguments("<path:string>").action(disable).command("set-permissioned-as", "Set the email (run-as user) for a schedule (requires admin or wm_deployers group)").arguments("<path:string> <email:string>").action(async (opts, schedulePath, email) => {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     const cache3 = new Map;
@@ -85544,6 +85598,7 @@ schedule related commands
 - \`schedule new <path:string>\` - create a new schedule locally
 - \`schedule push <file_path:string> <remote_path:string>\` - push a local schedule spec. This overrides any remote versions.
 - \`schedule enable <path:string>\` - Enable a schedule
+  - \`--force\` - Bypass the fork-conflict warning when the parent workspace has the same schedule (acknowledges that both crons will fire)
 - \`schedule disable <path:string>\` - Disable a schedule
 - \`schedule set-permissioned-as <path:string> <email:string>\` - Set the email (run-as user) for a schedule (requires admin or wm_deployers group)
 
@@ -88690,7 +88745,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.693.4";
+var VERSION = "1.694.0";
 async function checkVersionSafe(cmd) {
   const mainCommand = cmd.getMainCommand();
   const upgradeCommand = mainCommand.getCommand("upgrade");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.693.5",
+  "version": "1.694.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",