windmill-cli 1.775.1 → 1.775.2

package/esm/main.js

@@ -16784,7 +16784,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.775.1",
+    VERSION: "1.775.2",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -27187,7 +27187,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.775.1";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.775.2";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -38825,6 +38825,8 @@ import * as fs9 from "node:fs";
 import * as path6 from "node:path";
 import process14 from "node:process";
 import { spawn } from "node:child_process";
+import { createRequire as createRequire2 } from "node:module";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 function conditionsFor(svelte) {
   return svelte ? [...DEFAULT_BUILD_OPTIONS.conditions, "svelte"] : DEFAULT_BUILD_OPTIONS.conditions;
 }
@@ -38847,29 +38849,41 @@ function detectFrameworks(appDir) {
     return { svelte: false, vue: false };
   }
 }
+async function loadSvelteCompiler(appDir) {
+  try {
+    const requireFromApp = createRequire2(path6.join(path6.resolve(appDir), "package.json"));
+    const entry = requireFromApp.resolve("svelte/compiler");
+    return await import(pathToFileURL2(entry).href);
+  } catch {
+    return await import("svelte/compiler");
+  }
+}
 function createSveltePlugin(appDir) {
+  let compilerPromise;
+  const svelteCompiler = () => compilerPromise ??= loadSvelteCompiler(appDir);
+  const messageConverter = (source, filename) => ({ message, start, end }) => {
+    let location;
+    if (start && end) {
+      const lineText = source.split(/\r\n|\r|\n/g)[start.line - 1];
+      const lineEnd = start.line === end.line ? end.column : lineText.length;
+      location = {
+        file: filename,
+        line: start.line,
+        column: start.column,
+        length: lineEnd - start.column,
+        lineText
+      };
+    }
+    return { text: message, location };
+  };
   return {
     name: "svelte",
     setup(build) {
       build.onLoad({ filter: /\.svelte$/ }, async (args) => {
-        const svelte = await import("svelte/compiler");
+        const svelte = await svelteCompiler();
         const source = await readTextFile(args.path);
         const filename = path6.relative(process14.cwd(), args.path);
-        const convertMessage = ({ message, start, end }) => {
-          let location;
-          if (start && end) {
-            const lineText = source.split(/\r\n|\r|\n/g)[start.line - 1];
-            const lineEnd = start.line === end.line ? end.column : lineText.length;
-            location = {
-              file: filename,
-              line: start.line,
-              column: start.column,
-              length: lineEnd - start.column,
-              lineText
-            };
-          }
-          return { text: message, location };
-        };
+        const convertMessage = messageConverter(source, filename);
         try {
           const { js, warnings } = svelte.compile(source, { filename });
           const contents = js.code + `//# sourceMappingURL=` + js.map.toUrl();
@@ -38878,6 +38892,27 @@ function createSveltePlugin(appDir) {
           return { errors: [convertMessage(e)] };
         }
       });
+      build.onLoad({ filter: /\.svelte\.[jt]s$/ }, async (args) => {
+        const svelte = await svelteCompiler();
+        const source = await readTextFile(args.path);
+        const filename = path6.relative(process14.cwd(), args.path);
+        const convertMessage = messageConverter(source, filename);
+        try {
+          const code2 = filename.endsWith(".ts") ? (await build.esbuild.transform(source, {
+            loader: "ts",
+            sourcefile: filename
+          })).code : source;
+          const { js, warnings } = svelte.compileModule(code2, { filename });
+          const contents = js.code + `//# sourceMappingURL=` + js.map.toUrl();
+          return {
+            contents,
+            loader: "js",
+            warnings: warnings.map(convertMessage)
+          };
+        } catch (e) {
+          return { errors: [convertMessage(e)] };
+        }
+      });
     }
   };
 }
@@ -38899,13 +38934,13 @@ async function ensureNodeModules(appDir) {
   const nodeModulesPath = path6.join(targetDir, "node_modules");
   if (!fs9.existsSync(nodeModulesPath)) {
     info(colors.yellow("\uD83D\uDCE6 node_modules not found, running npm install..."));
-    const code2 = await new Promise((resolve7, reject) => {
+    const code2 = await new Promise((resolve8, reject) => {
       const npmInstall = spawn("npm", ["install"], {
         cwd: targetDir,
         stdio: "inherit",
         shell: true
       });
-      npmInstall.on("close", (code3) => resolve7(code3 ?? 0));
+      npmInstall.on("close", (code3) => resolve8(code3 ?? 0));
       npmInstall.on("error", reject);
     });
     if (code2 !== 0) {
@@ -39266,7 +39301,7 @@ async function pollJobWithQueueLogging(workspace, jobId, options) {
       info(colors.gray(`${label}${jobId}: still polling, queue status unavailable...`));
     }
     const delayMs = Date.now() - startedAt < fastPollDurationMs ? fastPollIntervalMs : slowPollIntervalMs;
-    await new Promise((resolve7) => setTimeout(resolve7, delayMs));
+    await new Promise((resolve8) => setTimeout(resolve8, delayMs));
   }
 }
 var DEFAULT_FAST_POLL_INTERVAL_MS = 100, DEFAULT_FAST_POLL_DURATION_MS = 2000, DEFAULT_SLOW_POLL_INTERVAL_MS = 2000, QUEUE_LOG_INTERVAL_MS = 5000, HEARTBEAT_INTERVAL_MS = 60000, MAX_CONSECUTIVE_POLL_ERRORS = 10;
@@ -43224,8 +43259,8 @@ var require_lib2 = __commonJS((exports, module) => {
       return this;
     }
     var p = this.constructor;
-    return this.then(resolve8, reject2);
-    function resolve8(value) {
+    return this.then(resolve9, reject2);
+    function resolve9(value) {
       function yes() {
         return value;
       }
@@ -43378,8 +43413,8 @@ var require_lib2 = __commonJS((exports, module) => {
     }
     return out;
   }
-  Promise2.resolve = resolve7;
-  function resolve7(value) {
+  Promise2.resolve = resolve8;
+  function resolve8(value) {
     if (value instanceof this) {
       return value;
     }
@@ -43733,10 +43768,10 @@ var require_utils = __commonJS((exports) => {
     var promise = external.Promise.resolve(inputData).then(function(data3) {
       var isBlob2 = support.blob && (data3 instanceof Blob || ["[object File]", "[object Blob]"].indexOf(Object.prototype.toString.call(data3)) !== -1);
       if (isBlob2 && typeof FileReader !== "undefined") {
-        return new external.Promise(function(resolve7, reject) {
+        return new external.Promise(function(resolve8, reject) {
           var reader = new FileReader;
           reader.onload = function(e) {
-            resolve7(e.target.result);
+            resolve8(e.target.result);
           };
           reader.onerror = function(e) {
             reject(e.target.error);
@@ -44200,7 +44235,7 @@ var require_StreamHelper = __commonJS((exports, module) => {
     }
   }
   function accumulate(helper, updateCallback) {
-    return new external.Promise(function(resolve7, reject) {
+    return new external.Promise(function(resolve8, reject) {
       var dataArray = [];
       var { _internalType: chunkType, _outputType: resultType, _mimeType: mimeType } = helper;
       helper.on("data", function(data3, meta) {
@@ -44214,7 +44249,7 @@ var require_StreamHelper = __commonJS((exports, module) => {
       }).on("end", function() {
         try {
           var result = transformZipOutput(resultType, concat(chunkType, dataArray), mimeType);
-          resolve7(result);
+          resolve8(result);
         } catch (e) {
           reject(e);
         }
@@ -49791,7 +49826,7 @@ var require_load = __commonJS((exports, module) => {
   var Crc32Probe = require_Crc32Probe();
   var nodejsUtils = require_nodejsUtils();
   function checkEntryCRC32(zipEntry) {
-    return new external.Promise(function(resolve7, reject) {
+    return new external.Promise(function(resolve8, reject) {
       var worker = zipEntry.decompressed.getContentWorker().pipe(new Crc32Probe);
       worker.on("error", function(e) {
         reject(e);
@@ -49799,7 +49834,7 @@ var require_load = __commonJS((exports, module) => {
         if (worker.streamInfo.crc32 !== zipEntry.decompressed.crc32) {
           reject(new Error("Corrupted zip : CRC32 mismatch"));
         } else {
-          resolve7();
+          resolve8();
         }
       }).resume();
     });
@@ -49927,7 +49962,7 @@ async function parseTarResponse(response) {
   const buffer = Buffer.from(await response.arrayBuffer());
   const entries = new Map;
   const ex = $extract();
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     ex.on("entry", (header, stream, next) => {
       const chunks = [];
       stream.on("data", (chunk) => chunks.push(chunk));
@@ -49941,7 +49976,7 @@ async function parseTarResponse(response) {
       stream.on("error", reject);
       stream.resume();
     });
-    ex.on("finish", () => resolve7(new TarAsZip(entries)));
+    ex.on("finish", () => resolve8(new TarAsZip(entries)));
     ex.on("error", reject);
     Readable2.from(buffer).pipe(ex);
   });
@@ -52893,7 +52928,7 @@ var require_compile = __commonJS((exports) => {
     const schOrFunc = root.refs[ref];
     if (schOrFunc)
       return schOrFunc;
-    let _sch = resolve7.call(this, root, ref);
+    let _sch = resolve8.call(this, root, ref);
     if (_sch === undefined) {
       const schema = (_a = root.localRefs) === null || _a === undefined ? undefined : _a[ref];
       const { schemaId } = this.opts;
@@ -52920,7 +52955,7 @@ var require_compile = __commonJS((exports) => {
   function sameSchemaEnv(s1, s2) {
     return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
   }
-  function resolve7(root, ref) {
+  function resolve8(root, ref) {
     let sch;
     while (typeof (sch = this.refs[ref]) == "string")
       ref = sch;
@@ -53450,7 +53485,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return uri;
   }
-  function resolve7(baseURI, relativeURI, options) {
+  function resolve8(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
     const resolved = resolveComponent(parse7(baseURI, schemelessOptions), parse7(relativeURI, schemelessOptions), schemelessOptions, true);
     schemelessOptions.skipEscape = true;
@@ -53678,7 +53713,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   var fastUri = {
     SCHEMES,
     normalize: normalize5,
-    resolve: resolve7,
+    resolve: resolve8,
     resolveComponent,
     equal: equal2,
     serialize,
@@ -56369,11 +56404,11 @@ var require_tslib = __commonJS((exports, module) => {
     };
     __awaiter2 = function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve7) {
-          resolve7(value);
+        return value instanceof P ? value : new P(function(resolve8) {
+          resolve8(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve7, reject) {
+      return new (P || (P = Promise))(function(resolve8, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -56389,7 +56424,7 @@ var require_tslib = __commonJS((exports, module) => {
           }
         }
         function step(result) {
-          result.done ? resolve7(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -56618,14 +56653,14 @@ var require_tslib = __commonJS((exports, module) => {
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve7, reject) {
-            v = o[n](v), settle(resolve7, reject, v.done, v.value);
+          return new Promise(function(resolve8, reject) {
+            v = o[n](v), settle(resolve8, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve7, reject, d, v) {
+      function settle(resolve8, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve7({ value: v2, done: d });
+          resolve8({ value: v2, done: d });
         }, reject);
       }
     };
@@ -64781,11 +64816,11 @@ var init_specific_items = __esm(async () => {
 
 // src/utils/tar.ts
 function createTarBlob(entries) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const p = $pack();
     const chunks = [];
     p.on("data", (chunk) => chunks.push(new Uint8Array(chunk)));
-    p.on("end", () => resolve7(new Blob(chunks)));
+    p.on("end", () => resolve8(new Blob(chunks)));
     p.on("error", reject);
     for (const entry of entries) {
       p.entry({ name: entry.name }, Buffer.from(entry.content));
@@ -66772,7 +66807,7 @@ async function list4(opts) {
     new Table2().header(["path", "summary", "language", "created by"]).padding(2).border(true).body(total.map((x) => [x.path, x.summary, x.language, x.created_by])).render();
   }
 }
-async function resolve7(input) {
+async function resolve8(input) {
   if (!input) {
     throw new Error("No data given");
   }
@@ -66798,7 +66833,7 @@ async function run2(opts, path10) {
   }
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
-  const input = opts.data ? await resolve7(opts.data) : {};
+  const input = opts.data ? await resolve8(opts.data) : {};
   if (!opts.data) {
     try {
       const script = await getScriptByPath({
@@ -66864,7 +66899,7 @@ ${script.lock_error_logs}`);
       break;
     } catch {
       retries++;
-      await new Promise((resolve8) => setTimeout(resolve8, 100));
+      await new Promise((resolve9) => setTimeout(resolve9, 100));
     }
   }
   if (retries >= MAX_RETRIES) {
@@ -66901,7 +66936,7 @@ async function track_job(workspace, id) {
         info("failed to get job updated. skipping log streaming.");
         break;
       }
-      await new Promise((resolve8) => setTimeout(resolve8, 500));
+      await new Promise((resolve9) => setTimeout(resolve9, 500));
       continue;
     }
     if (!running && updates.running === true) {
@@ -66921,7 +66956,7 @@ async function track_job(workspace, id) {
       info(colors.yellow("Job suspended. Waiting for it to continue..."));
     }
   }
-  await new Promise((resolve8, _) => setTimeout(() => resolve8(undefined), 1000));
+  await new Promise((resolve9, _) => setTimeout(() => resolve9(undefined), 1000));
   try {
     const final_job = await getCompletedJob({ workspace, id });
     if ((final_job.logs?.length ?? -1) > logOffset) {
@@ -67106,7 +67141,7 @@ async function preview(opts, filePath) {
   const codebases = await listSyncCodebases(opts);
   const language = inferContentTypeFromFilePath(filePath, opts?.defaultTs);
   const content = await readTextFile(filePath);
-  const input = opts.data ? await resolve7(opts.data) : {};
+  const input = opts.data ? await resolve8(opts.data) : {};
   const isFolderLayout = isModuleEntryPoint(filePath);
   const moduleFolderPath = isFolderLayout ? path9.dirname(filePath) : filePath.substring(0, filePath.indexOf(".")) + getModuleFolderSuffix();
   const modules = await readModulesFromDisk(moduleFolderPath, opts?.defaultTs, isFolderLayout);
@@ -67237,7 +67272,7 @@ async function preview(opts, filePath) {
         }
         break;
       } catch {
-        await new Promise((resolve8) => setTimeout(resolve8, 100));
+        await new Promise((resolve9) => setTimeout(resolve9, 100));
       }
     }
   } else {
@@ -71812,7 +71847,7 @@ import { sep as SEP10 } from "node:path";
 import { writeFile as writeFile8, stat as stat8, rm as rm3, readdir as readdir5 } from "node:fs/promises";
 import { readFileSync as readFileSync2, existsSync as existsSync8, readdirSync as readdirSync2, statSync as statSync2, writeFileSync as writeFileSync5 } from "node:fs";
 import * as path13 from "node:path";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 function loadParser(pkgName) {
   let p = _parserCache.get(pkgName);
   if (!p) {
@@ -72683,7 +72718,7 @@ var init_metadata = __esm(async () => {
     init_relative_imports()
   ]);
   import_yaml13 = __toESM(require_dist(), 1);
-  _require = createRequire2(import.meta.url);
+  _require = createRequire3(import.meta.url);
   _parserCache = new Map;
   LockfileGenerationError = class LockfileGenerationError extends Error {
     constructor(message) {
@@ -74558,7 +74593,7 @@ async function waitForJob(workspace, jobId) {
   }
   let syncIteration = 0;
   let lastQueueLogAt = Date.now();
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     async function checkJob() {
       try {
         const maybeJob = await getCompletedJobResultMaybe({
@@ -74570,7 +74605,7 @@ async function waitForJob(workspace, jobId) {
           if (!maybeJob.success && typeof maybeJob.result === "object" && maybeJob.result !== null && "error" in maybeJob.result) {
             reject(maybeJob.result.error);
           } else {
-            resolve9(maybeJob.result);
+            resolve10(maybeJob.result);
           }
           return;
         }
@@ -75561,8 +75596,8 @@ This folder is for SQL migration files that will be applied to datatables during
           process.stdout.write(`\r${colors.gray(`${frames[i++ % frames.length]} Creating Claude session...`)}`);
         }, 80);
         try {
-          await new Promise((resolve9, reject) => {
-            exec(`claude --session-id "${sessionId}" -p "Say: Your app is ready, click on preview to test it!"`, { cwd: absAppDir }, (error2) => error2 ? reject(error2) : resolve9());
+          await new Promise((resolve10, reject) => {
+            exec(`claude --session-id "${sessionId}" -p "Say: Your app is ready, click on preview to test it!"`, { cwd: absAppDir }, (error2) => error2 ? reject(error2) : resolve10());
           });
         } finally {
           clearInterval(spinner);
@@ -79512,7 +79547,7 @@ async function run3(opts, path22) {
   }
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
-  const input = opts.data ? await resolve7(opts.data) : {};
+  const input = opts.data ? await resolve8(opts.data) : {};
   if (!opts.data) {
     try {
       const flow = await getFlowByPath({
@@ -79593,7 +79628,7 @@ async function run3(opts, path22) {
             forLoopFailed = refreshedModule.type === "Failure";
             break;
           }
-          await new Promise((resolve9) => setTimeout(resolve9, 200));
+          await new Promise((resolve10) => setTimeout(resolve10, 200));
         }
         if (forLoopFailed)
           break;
@@ -79609,7 +79644,7 @@ async function run3(opts, path22) {
         info(colors.dim(status));
         lastStatus = status;
       }
-      await new Promise((resolve9, _) => setTimeout(() => resolve9(undefined), 100));
+      await new Promise((resolve10, _) => setTimeout(() => resolve10(undefined), 100));
       if (isCompleted)
         break;
       continue;
@@ -79645,7 +79680,7 @@ async function run3(opts, path22) {
       break;
     } catch {
       retries++;
-      await new Promise((resolve9) => setTimeout(resolve9, 100));
+      await new Promise((resolve10) => setTimeout(resolve10, 100));
     }
   }
   if (retries >= MAX_RETRIES) {
@@ -79708,7 +79743,7 @@ async function preview2(opts, flowPath) {
     const resolvedCodebases = await Promise.resolve(codebases);
     tempScriptRefs = await buildPreviewTempScriptRefs2(workspace, opts, resolvedCodebases, { kind: "flow", folder: flowPath });
   }
-  const input = opts.data ? await resolve7(opts.data) : {};
+  const input = opts.data ? await resolve8(opts.data) : {};
   debug(`Flow value: ${JSON.stringify(localFlow.value, null, 2)}`);
   const flowWmPath = stripFlowSuffix(flowPath).replaceAll(SEP20, "/");
   if (opts.step) {
@@ -93352,7 +93387,7 @@ async function dev2(opts) {
       }
       socket.destroy();
     });
-    return new Promise((resolve9) => {
+    return new Promise((resolve10) => {
       proxyServer.listen(proxyPort, BIND_HOST, () => {
         console.log(`Dev proxy listening on http://localhost:${proxyPort}`);
         if (opts.path) {
@@ -93362,7 +93397,7 @@ async function dev2(opts) {
           console.log("(pass --path <path> to skip the picker)");
         }
         maybeOpenBrowser(`http://localhost:${proxyPort}/`);
-        resolve9();
+        resolve10();
       });
     });
   }
@@ -93468,9 +93503,9 @@ class NpmProvider extends Provider {
       if (verbose)
         process.stderr.write(d);
     });
-    const exitCode = await new Promise((resolve9, reject) => {
+    const exitCode = await new Promise((resolve10, reject) => {
       proc.on("error", reject);
-      proc.on("close", resolve9);
+      proc.on("close", resolve10);
     }).catch((e) => {
       throw new Error(`failed to run npm: ${e instanceof Error ? e.message : e}
 
@@ -96957,16 +96992,16 @@ async function startServe(opts) {
     error(`server error: ${err.message}`);
     process.exitCode = 1;
   });
-  await new Promise((resolve9) => server.listen(port, host, () => resolve9()));
+  await new Promise((resolve10) => server.listen(port, host, () => resolve10()));
   return {
     host,
     port,
     user: DEFAULT_USER,
     password,
     connectionString: (datatableName) => `postgresql://${DEFAULT_USER}:${encodeURIComponent(password)}@${host}:${port}/${encodeURIComponent(datatableName)}`,
-    close: () => new Promise((resolve9) => {
-      server.close(() => resolve9());
-      setTimeout(resolve9, 1000).unref();
+    close: () => new Promise((resolve10) => {
+      server.close(() => resolve10());
+      setTimeout(resolve10, 1000).unref();
     })
   };
 }
@@ -97475,13 +97510,13 @@ async function psql(opts) {
     }
     handle.close().finally(() => process.exit(1));
   });
-  const exitCode = await new Promise((resolve9) => {
+  const exitCode = await new Promise((resolve10) => {
     child.on("exit", (code2, signal) => {
       if (signal && typeof signal === "string") {
         const num = signalToNumber(signal);
-        resolve9(num !== undefined ? 128 + num : 1);
+        resolve10(num !== undefined ? 128 + num : 1);
       } else {
-        resolve9(code2 ?? 0);
+        resolve10(code2 ?? 0);
       }
     });
   });

package/package.json

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