windmill-cli 1.460.0 → 1.461.1

package/esm/dev.js

@@ -1,10 +1,12 @@
 import * as dntShim from "./_dnt.shims.js";
-import { Command, SEP, WebSocketServer, express, getPort, http, log, open, } from "./deps.js";
+import { Command, SEP, WebSocketServer, express, getPort, http, log, open, yamlParseFile, } from "./deps.js";
+import { getTypeStrFromPath } from "./types.js";
 import { ignoreF } from "./sync.js";
 import { requireLogin, resolveWorkspace } from "./context.js";
 import { mergeConfigWithConfigFile, readConfigFile, } from "./conf.js";
 import { exts } from "./script.js";
 import { inferContentTypeFromFilePath } from "./script_common.js";
+import { replaceInlineScripts } from "./flow.js";
 const PORT = 3001;
 async function dev(opts) {
     const workspace = await resolveWorkspace(opts);
@@ -16,32 +18,57 @@ async function dev(opts) {
     const base = await dntShim.Deno.realPath(".");
     opts = await mergeConfigWithConfigFile(opts);
     const ignore = await ignoreF(opts);
+    const changesTimeouts = {};
     async function watchChanges() {
         for await (const event of watcher) {
-            log.debug(">>>> event", event);
-            // Example event: { kind: "create", paths: [ "/home/alice/deno/foo.txt" ] }
-            await loadPaths(event.paths);
+            // console.log(">>>> event", event);
+            const key = event.paths.join(",");
+            if (changesTimeouts[key]) {
+                clearTimeout(changesTimeouts[key]);
+            }
+            // @ts-ignore
+            changesTimeouts[key] = setTimeout(async () => {
+                delete changesTimeouts[key];
+                await loadPaths(event.paths);
+            }, 100);
         }
     }
+    const DOT_FLOW_SEP = ".flow" + SEP;
     async function loadPaths(pathsToLoad) {
-        const paths = pathsToLoad.filter((path) => exts.some((ext) => path.endsWith(ext)));
+        const paths = pathsToLoad.filter((path) => exts.some((ext) => path.endsWith(ext)) || path.includes(DOT_FLOW_SEP));
         if (paths.length == 0) {
             return;
         }
         const cpath = (await dntShim.Deno.realPath(paths[0])).replace(base + SEP, "");
-        console.log("Detected change in " + cpath);
         if (!ignore(cpath, false)) {
-            const content = await dntShim.Deno.readTextFile(cpath);
-            const splitted = cpath.split(".");
-            const wmPath = splitted[0];
-            const lang = inferContentTypeFromFilePath(cpath, conf.defaultTs);
-            currentLastEdit = {
-                content,
-                path: wmPath,
-                language: lang,
-            };
-            broadcastChanges(currentLastEdit);
-            log.info("Updated " + wmPath);
+            const typ = getTypeStrFromPath(cpath);
+            log.info("Detected change in " + cpath + " (" + typ + ")");
+            if (typ == "flow") {
+                const localPath = cpath.split(DOT_FLOW_SEP)[0] + DOT_FLOW_SEP;
+                const localFlow = (await yamlParseFile(localPath + "flow.yaml"));
+                replaceInlineScripts(localFlow.value.modules, localPath, undefined);
+                currentLastEdit = {
+                    type: "flow",
+                    flow: localFlow,
+                    uriPath: localPath,
+                };
+                log.info("Updated " + localPath);
+                broadcastChanges(currentLastEdit);
+            }
+            else if (typ == "script") {
+                const content = await dntShim.Deno.readTextFile(cpath);
+                const splitted = cpath.split(".");
+                const wmPath = splitted[0];
+                const lang = inferContentTypeFromFilePath(cpath, conf.defaultTs);
+                currentLastEdit = {
+                    type: "script",
+                    content,
+                    path: wmPath,
+                    language: lang,
+                };
+                log.info("Updated " + wmPath);
+                broadcastChanges(currentLastEdit);
+            }
         }
     }
     const connectedClients = new Set();
@@ -84,7 +111,7 @@ async function dev(opts) {
         });
         // Start the server
         const port = await getPort.default({ port: 3001 });
-        const url = `${workspace.remote}scripts/dev?workspace=${workspace.workspaceId}&local=true` +
+        const url = `${workspace.remote}dev?workspace=${workspace.workspaceId}&local=true&wm_token=${workspace.token}` +
             (port === PORT ? "" : `&port=${port}`);
         console.log(`Go to ${url}`);
         try {

package/esm/gen/core/OpenAPI.js

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

package/esm/main.js

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

package/package.json

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

package/types/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EASR,MAAM,WAAW,CAAC;AA6InB,QAAA,MAAM,OAAO;;;;;;;;mBAOQ,CAAC;AAEtB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAUR,MAAM,WAAW,CAAC;AAiLnB,QAAA,MAAM,OAAO;;;;;;;;mBAOQ,CAAC;AAEtB,eAAe,OAAO,CAAC"}

package/types/main.d.ts

@@ -20,7 +20,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, trigger, sync, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.460.0";
+export declare const VERSION = "1.461.1";
 declare const command: Command<{
     workspace?: (import("./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;
 } & {