windmill-ts 0.6.3 → 0.7.1

package/dist/package.json

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

package/dist/src/generator/flows.js

@@ -14,6 +14,7 @@ const preamble = dedent `
   };
 
   type RunFlowAsyncOptions = {
+    scheduledFor?: Date | null;
     detached?: boolean;
   };
 
@@ -22,14 +23,20 @@ const preamble = dedent `
     args: z.input<(typeof ${mapName})[Path]>,
     options?: RunFlowAsyncOptions,
   ) => {
-    const { detached = false } = options ?? {};
+    const { scheduledFor, detached = false } = options ?? {};
     const schema = ${mapName}[flowPath];
 
     const runner = detached
       ? runDetached
       : <T extends unknown>(cb: () => Promise<T>) => cb();
 
-    return runner(() => wmill.runFlowAsync(flowPath, schema.parse(args)));
+    const scheduledInSeconds = Math.ceil(
+      Math.max((scheduledFor?.getTime() ?? 0) - Date.now(), 0) / 1000,
+    );
+
+    return runner(
+      () => wmill.runFlowAsync(flowPath, schema.parse(args), scheduledInSeconds)
+    );
   };
 
   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;;;;;;;;;2DAS+B,OAAO;;4BAEtC,OAAO;;;;qBAId,OAAO;;;;;;;;;gEASoC,OAAO;;;aAG1D,OAAO;;;wCAGoB,OAAO;CAC9C,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACxD,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,SAAS,EAAE;QACtB,OAAO;QACP,QAAQ;KACT,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;sDAC+B,OAAO;;4BAEjC,OAAO;;qBAEd,OAAO;;;;;;;;;;2DAU+B,OAAO;;4BAEtC,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;gEAeoC,OAAO;;;aAG1D,OAAO;;;wCAGoB,OAAO;CAC9C,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACxD,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,SAAS,EAAE;QACtB,OAAO;QACP,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/src/generator/preamble.js

@@ -1,9 +1,11 @@
 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 { 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
@@ -26,17 +28,28 @@ const preamble = dedent `
     }) as T;
   }
 
-  export const runDetached = async <T extends unknown>(cb: () => Promise<T>) => {
-    const originalRootFlowJobId = process.env["WM_ROOT_FLOW_JOB_ID"];
-    delete (process.env as Record<string, string | undefined>)[
-      "WM_ROOT_FLOW_JOB_ID"
-    ];
-
-    const result = await cb();
+  const ${envStorageName} = new AsyncLocalStorage<Record<string, string | undefined>>();
 
-    process.env["WM_ROOT_FLOW_JOB_ID"] = originalRootFlowJobId!;
+  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) => {
+      return Reflect.set(target, prop, value, receiver);
+    }
+  })
 
-    return result;
+  export const runDetached = async <T extends unknown>(cb: () => Promise<T>) => {
+    return ${envStorageName}.run(
+      { WM_JOB_ID: undefined, WM_ROOT_FLOW_JOB_ID: undefined },
+      () => cb(),
+    );
   };
 `;
 export const writePreamble = async () => {

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,QAAQ,GAAG,MAAM,CAAA;;;;IAInB;AACA;;qEAEqE,CAAC,EACxE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BD,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,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAE3C,MAAM,QAAQ,GAAG,MAAM,CAAA;;;;;IAKnB;AACA;;qEAEqE,CAAC,EACxE;;;;;;;;;;;;;;;;;;;UAmBQ,cAAc;;;;;sBAKF,cAAc;;;;;;;;;;;;;aAavB,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"}

package/dist/src/generator/scripts.js

@@ -14,6 +14,7 @@ const preamble = dedent `
   };
 
   type RunScriptAsyncOptions = {
+    scheduledFor?: Date | null;
     detached?: boolean;
   };
 
@@ -22,14 +23,25 @@ const preamble = dedent `
     args: z.input<(typeof ${mapName})[Path]>,
     options?: RunScriptAsyncOptions,
   ) => {
-    const { detached = false } = options ?? {};
+    const { scheduledFor, detached = false } = options ?? {};
     const schema = ${mapName}[scriptPath];
 
     const runner = detached
       ? runDetached
       : <T extends unknown>(cb: () => Promise<T>) => cb();
 
-    return runner(() => wmill.runScriptAsync(scriptPath, null, schema.parse(args)));
+    const scheduledInSeconds = Math.ceil(
+      Math.max((scheduledFor?.getTime() ?? 0) - Date.now(), 0) / 1000,
+    );
+
+    return runner(() =>
+      wmill.runScriptAsync(
+        scriptPath,
+        null,
+        schema.parse(args),
+        scheduledInSeconds,
+      ),
+    );
   };
 
   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;;;;;;;;;6DASiC,OAAO;;4BAExC,OAAO;;;;qBAId,OAAO;;;;;;;;;kEASsC,OAAO;;;aAG5D,OAAO;;;0CAGsB,OAAO;CAChD,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IAC1D,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,WAAW,EAAE;QACxB,OAAO;QACP,QAAQ;KACT,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;wDACiC,OAAO;;4BAEnC,OAAO;;qBAEd,OAAO;;;;;;;;;;6DAUiC,OAAO;;4BAExC,OAAO;;;;qBAId,OAAO;;;;;;;;;;;;;;;;;;;;kEAoBsC,OAAO;;;aAG5D,OAAO;;;0CAGsB,OAAO;CAChD,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IAC1D,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,EAAG,CAAC;IAEhC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,WAAW,EAAE;QACxB,OAAO;QACP,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

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