windmill-ts 1.4.3 → 1.5.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "windmill-ts",
-    "version": "1.4.3",
+    "version": "1.5.0",
     "description": "Type-safe client for Windmill",
     "main": "dist/src/index.js",
     "bin": "dist/src/index.js",

package/dist/src/generator/flows.js

@@ -3,40 +3,66 @@ import { listFlows } from "../windmill/flows.js";
 import { getContext } from "./context.js";
 import { generateSchemas } from "./common.js";
 const mapName = "flows";
-const preamble = dedent `  
-  export const runFlow = <Path extends keyof typeof ${mapName}>(
-    flowPath: Path,
-    args: z.input<(typeof ${mapName})[Path]>,
-  ) => {
-    const schema = ${mapName}[flowPath];
-
-    return wmill.runFlow(flowPath, schema.parse(args));
-  };
-
+const preamble = dedent `
   type RunFlowAsyncOptions = {
     scheduledFor?: Date | null;
     detached?: boolean;
+    /** Override the worker tag for this run */
+    tag?: string;
   };
 
-  export const runFlowAsync = <Path extends keyof typeof ${mapName}>(
+  type RunFlowOptions = RunFlowAsyncOptions & {
+    /** Log status messages while waiting for the job to complete */
+    verbose?: boolean;
+  };
+
+  // NOTE: We use raw fetch here because JobService.runFlowByPath doesn't
+  // expose the root_job parameter, which is needed for proper job hierarchy tracking.
+  export const runFlowAsync = async <Path extends keyof typeof ${mapName}>(
     flowPath: Path,
     args: z.input<(typeof ${mapName})[Path]>,
     options?: RunFlowAsyncOptions,
   ) => {
-    const { scheduledFor, detached = false } = options ?? {};
+    const { scheduledFor, detached = true, tag } = options ?? {};
     const schema = ${mapName}[flowPath];
 
-    const runner = detached
-      ? runDetached
-      : <T extends unknown>(cb: () => Promise<T>) => cb();
-
     const scheduledInSeconds = Math.ceil(
       Math.max((scheduledFor?.getTime() ?? 0) - Date.now(), 0) / 1000,
     );
 
-    return runner(
-      () => wmill.runFlowAsync(flowPath, schema.parse(args), scheduledInSeconds)
-    );
+    const params: Record<string, string> = {};
+    if (scheduledInSeconds) params["scheduled_in_secs"] = String(scheduledInSeconds);
+    if (tag) params["tag"] = tag;
+    if (!detached) {
+      const parentJobId = process.env["WM_JOB_ID"];
+      if (parentJobId) params["parent_job"] = parentJobId;
+      const rootJobId = process.env["WM_ROOT_FLOW_JOB_ID"];
+      if (rootJobId) params["root_job"] = rootJobId;
+    }
+
+    const url = new URL(\`\${wmill.OpenAPI.BASE}/w/\${process.env["WM_WORKSPACE"]}/jobs/run/f/\${flowPath}\`);
+    url.search = new URLSearchParams(params).toString();
+
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": \`Bearer \${wmill.OpenAPI.TOKEN}\`,
+      },
+      body: JSON.stringify(schema.parse(args)),
+    });
+
+    return response.text();
+  };
+
+  export const runFlow = async <Path extends keyof typeof ${mapName}>(
+    flowPath: Path,
+    args: z.input<(typeof ${mapName})[Path]>,
+    options?: RunFlowOptions,
+  ) => {
+    const { verbose, ...asyncOptions } = options ?? {};
+    const jobId = await runFlowAsync(flowPath, args, asyncOptions);
+    return wmill.waitJob(jobId, verbose);
   };
 
   export const getFlowArgsSchema = <Path extends keyof typeof ${mapName}>(

package/dist/src/generator/flows.js.map

@@ -1 +1 @@
-{"version":3,"file":"flows.js","sourceRoot":"","sources":["../../../src/generator/flows.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,OAAO,GAAG,OAAO,CAAC;AAExB,MAAM,QAAQ,GAAG,MAAM,CAAA;sDAC+B,OAAO;;4BAEjC,OAAO;;qBAEd,OAAO;;;;;;;;;;2DAU+B,OAAO;;4BAEtC,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;gEAeoC,OAAO;;;aAG1D,OAAO;;;wCAGoB,OAAO;;kEAEmB,OAAO;CACxE,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,EAAG,CAAC;IAExC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,SAAS,EAAE;QACtB,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS;KAClC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"flows.js","sourceRoot":"","sources":["../../../src/generator/flows.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,OAAO,GAAG,OAAO,CAAC;AAExB,MAAM,QAAQ,GAAG,MAAM,CAAA;;;;;;;;;;;;;;;iEAe0C,OAAO;;4BAE5C,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4DA+BgC,OAAO;;4BAEvC,OAAO;;;;;;;;gEAQ6B,OAAO;;;aAG1D,OAAO;;;wCAGoB,OAAO;;kEAEmB,OAAO;CACxE,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,EAAG,CAAC;IAExC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,SAAS,EAAE;QACtB,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS;KAClC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/src/generator/preamble.js

@@ -1,11 +1,9 @@
 import dedent from "dedent";
 import { getContext } from "./context.js";
-export const envStorageName = "envStorage";
 const preamble = dedent `
   // This file is auto-generated by windmill-ts, do not modify it manually
   import { z } from 'zod';
   import * as wmill from 'windmill-client';
-  import type { AsyncLocalStorage } from 'node:async_hooks';
   ${
 /* NOTE: Windmill has JSX enabled, so <T> is illegal.
          The usual way to fix this is <T,>, but some formatters/editors
@@ -27,46 +25,6 @@ const preamble = dedent `
       }
     }) as T;
   }
-
-  let ${envStorageName}: AsyncLocalStorage<Record<string, string | undefined>> | null = null;
-
-  if (typeof process !== 'undefined') {
-    const { AsyncLocalStorage } = await import('node:async_hooks');
-    ${envStorageName} = new AsyncLocalStorage();
-
-    const originalProcessEnv = process.env;
-    process.env = new Proxy(originalProcessEnv, {
-      get: (target, prop, receiver) => {
-        const store = ${envStorageName}!.getStore();
-        if (store != null && prop in store && typeof prop === 'string') {
-          return store[prop];
-        }
-    
-        return Reflect.get(target, prop, receiver);
-      },
-      set: (target, prop, value, receiver) => {
-        if (typeof prop === 'string') {
-          target[prop] = value;
-          return true;
-        }
-
-        return Reflect.set(target, prop, value, receiver);
-      }
-    })
-  }
-
-  export const runDetached = async <T extends unknown>(cb: () => Promise<T>) => {
-    if (${envStorageName} == null) {
-      console.warn("Calling \`runDetached\` in a non-Node environment is unsupported.");
-
-      return cb();
-    }
-
-    return ${envStorageName}.run(
-      { WM_JOB_ID: undefined, WM_ROOT_FLOW_JOB_ID: undefined },
-      () => cb(),
-    );
-  };
 `;
 export const writePreamble = async () => {
     const { write } = getContext();

package/dist/src/generator/preamble.js.map

@@ -1 +1 @@
-{"version":3,"file":"preamble.js","sourceRoot":"","sources":["../../../src/generator/preamble.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAE3C,MAAM,QAAQ,GAAG,MAAM,CAAA;;;;;IAKnB;AACA;;qEAEqE,CAAC,EACxE;;;;;;;;;;;;;;;;;;;QAmBM,cAAc;;;;MAIhB,cAAc;;;;;wBAKI,cAAc;;;;;;;;;;;;;;;;;;;UAmB5B,cAAc;;;;;;aAMX,cAAc;;;;;CAK1B,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACtC,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC,CAAC"}
+{"version":3,"file":"preamble.js","sourceRoot":"","sources":["../../../src/generator/preamble.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,QAAQ,GAAG,MAAM,CAAA;;;;IAInB;AACA;;qEAEqE,CAAC,EACxE;;;;;;;;;;;;;;;;;;CAkBD,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACtC,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC,CAAC"}

package/dist/src/generator/scripts.js

@@ -3,44 +3,66 @@ import { listScripts } from "../windmill/scripts.js";
 import { getContext } from "./context.js";
 import { generateSchemas } from "./common.js";
 const mapName = "scripts";
-const preamble = dedent `  
-  export const runScript = <Path extends keyof typeof ${mapName}>(
-    scriptPath: Path,
-    args: z.input<(typeof ${mapName})[Path]>,
-  ) => {
-    const schema = ${mapName}[scriptPath];
-
-    return wmill.runScriptByPath(scriptPath, schema.parse(args));
-  };
-
+const preamble = dedent `
   type RunScriptAsyncOptions = {
     scheduledFor?: Date | null;
     detached?: boolean;
+    /** Override the worker tag for this run */
+    tag?: string;
   };
 
-  export const runScriptAsync = <Path extends keyof typeof ${mapName}>(
+  type RunScriptOptions = RunScriptAsyncOptions & {
+    /** Log status messages while waiting for the job to complete */
+    verbose?: boolean;
+  };
+
+  // NOTE: We use raw fetch here because JobService.runScriptByPath doesn't
+  // expose the root_job parameter, which is needed for proper job hierarchy tracking.
+  export const runScriptAsync = async <Path extends keyof typeof ${mapName}>(
     scriptPath: Path,
     args: z.input<(typeof ${mapName})[Path]>,
     options?: RunScriptAsyncOptions,
   ) => {
-    const { scheduledFor, detached = false } = options ?? {};
+    const { scheduledFor, detached = false, tag } = options ?? {};
     const schema = ${mapName}[scriptPath];
 
-    const runner = detached
-      ? runDetached
-      : <T extends unknown>(cb: () => Promise<T>) => cb();
-
     const scheduledInSeconds = Math.ceil(
       Math.max((scheduledFor?.getTime() ?? 0) - Date.now(), 0) / 1000,
     );
 
-    return runner(() =>
-      wmill.runScriptByPathAsync(
-        scriptPath,
-        schema.parse(args),
-        scheduledInSeconds,
-      ),
-    );
+    const params: Record<string, string> = {};
+    if (scheduledInSeconds) params["scheduled_in_secs"] = String(scheduledInSeconds);
+    if (tag) params["tag"] = tag;
+    if (!detached) {
+      const parentJobId = process.env["WM_JOB_ID"];
+      if (parentJobId) params["parent_job"] = parentJobId;
+      const rootJobId = process.env["WM_ROOT_FLOW_JOB_ID"];
+      if (rootJobId) params["root_job"] = rootJobId;
+    }
+
+    const url = new URL(\`\${wmill.OpenAPI.BASE}/w/\${process.env["WM_WORKSPACE"]}/jobs/run/p/\${scriptPath}\`);
+    url.search = new URLSearchParams(params).toString();
+
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": \`Bearer \${wmill.OpenAPI.TOKEN}\`,
+      },
+      body: JSON.stringify(schema.parse(args)),
+    });
+
+    return response.text();
+  };
+
+  export const runScript = async <Path extends keyof typeof ${mapName}>(
+    scriptPath: Path,
+    args: z.input<(typeof ${mapName})[Path]>,
+    options?: RunScriptOptions,
+  ) => {
+    const { verbose, ...asyncOptions } = options ?? {};
+    const jobId = await runScriptAsync(scriptPath, args, asyncOptions);
+    return wmill.waitJob(jobId, verbose);
   };
 
   export const getScriptArgsSchema = <Path extends keyof typeof ${mapName}>(

package/dist/src/generator/scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../src/generator/scripts.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,OAAO,GAAG,SAAS,CAAC;AAE1B,MAAM,QAAQ,GAAG,MAAM,CAAA;wDACiC,OAAO;;4BAEnC,OAAO;;qBAEd,OAAO;;;;;;;;;;6DAUiC,OAAO;;4BAExC,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;;;;;kEAmBsC,OAAO;;;aAG5D,OAAO;;;0CAGsB,OAAO;;sEAEqB,OAAO;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IAC1D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,EAAG,CAAC;IAExC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,WAAW,EAAE;QACxB,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;KACpC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../src/generator/scripts.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,OAAO,GAAG,SAAS,CAAC;AAE1B,MAAM,QAAQ,GAAG,MAAM,CAAA;;;;;;;;;;;;;;;mEAe4C,OAAO;;4BAE9C,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8DA+BkC,OAAO;;4BAEzC,OAAO;;;;;;;;kEAQ+B,OAAO;;;aAG5D,OAAO;;;0CAGsB,OAAO;;sEAEqB,OAAO;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IAC1D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,EAAG,CAAC;IAExC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,WAAW,EAAE;QACxB,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;KACpC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-ts",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Type-safe client for Windmill",
   "main": "dist/src/index.js",
   "bin": "dist/src/index.js",