windmill-cli 1.554.0 → 1.554.1

package/esm/gen/core/OpenAPI.js

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

package/esm/src/main.js

@@ -38,7 +38,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.554.0";
+export const VERSION = "1.554.1";
 export const WM_FORK_PREFIX = "wm-fork";
 const command = new Command()
     .name("wmill")

package/esm/windmill-utils-internal/src/inline-scripts/extractor.js

@@ -5,15 +5,18 @@ import { newPathAssigner } from "../path-utils/path-assigner.js";
  *
  * @param modules - Array of flow modules to process
  * @param mapping - Optional mapping of module IDs to custom file paths
+ * @param separator - Path separator to use
  * @param defaultTs - Default TypeScript runtime to use ("bun" or "deno")
+ * @param pathAssigner - Optional path assigner to reuse (for nested calls)
  * @returns Array of inline scripts with their paths and content
  */
-export function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs) {
-    const pathAssigner = newPathAssigner(defaultTs ?? "bun");
+export function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs, pathAssigner) {
+    // Create pathAssigner only if not provided (top-level call), but reuse it for nested calls
+    const assigner = pathAssigner ?? newPathAssigner(defaultTs ?? "bun");
     return modules.flatMap((m) => {
         if (m.value.type == "rawscript") {
             let basePath, ext;
-            [basePath, ext] = pathAssigner.assignPath(m.summary, m.value.language);
+            [basePath, ext] = assigner.assignPath(m.summary, m.value.language);
             const path = mapping[m.id] ?? basePath + ext;
             const content = m.value.content;
             const r = [{ path: path, content: content }];
@@ -27,18 +30,18 @@ export function extractInlineScripts(modules, mapping = {}, separator = "/", def
             return r;
         }
         else if (m.value.type == "forloopflow") {
-            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs);
+            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner);
         }
         else if (m.value.type == "branchall") {
-            return m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs));
+            return m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner));
         }
         else if (m.value.type == "whileloopflow") {
-            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs);
+            return extractInlineScripts(m.value.modules, mapping, separator, defaultTs, assigner);
         }
         else if (m.value.type == "branchone") {
             return [
-                ...m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs)),
-                ...extractInlineScripts(m.value.default, mapping, separator, defaultTs),
+                ...m.value.branches.flatMap((b) => extractInlineScripts(b.modules, mapping, separator, defaultTs, assigner)),
+                ...extractInlineScripts(m.value.default, mapping, separator, defaultTs, assigner),
             ];
         }
         else {

package/package.json

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

package/types/src/main.d.ts

@@ -22,7 +22,7 @@ import { pull as hubPull } from "./commands/hub/hub.js";
 import { pull, push } from "./commands/sync/sync.js";
 import { add as workspaceAdd } from "./commands/workspace/workspace.js";
 export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.554.0";
+export declare const VERSION = "1.554.1";
 export declare const WM_FORK_PREFIX = "wm-fork";
 declare const command: Command<{
     workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;

package/types/windmill-utils-internal/src/inline-scripts/extractor.d.ts

@@ -1,3 +1,4 @@
+import { PathAssigner } from "../path-utils/path-assigner.js";
 import { FlowModule } from "../gen/types.gen.js";
 /**
  * Represents an inline script extracted from a flow module
@@ -14,10 +15,12 @@ interface InlineScript {
  *
  * @param modules - Array of flow modules to process
  * @param mapping - Optional mapping of module IDs to custom file paths
+ * @param separator - Path separator to use
  * @param defaultTs - Default TypeScript runtime to use ("bun" or "deno")
+ * @param pathAssigner - Optional path assigner to reuse (for nested calls)
  * @returns Array of inline scripts with their paths and content
  */
-export declare function extractInlineScripts(modules: FlowModule[], mapping?: Record<string, string>, separator?: string, defaultTs?: "bun" | "deno"): InlineScript[];
+export declare function extractInlineScripts(modules: FlowModule[], mapping?: Record<string, string>, separator?: string, defaultTs?: "bun" | "deno", pathAssigner?: PathAssigner): InlineScript[];
 /**
  * Extracts the current mapping of module IDs to file paths from flow modules
  * by analyzing existing inline script references.

package/types/windmill-utils-internal/src/inline-scripts/extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/extractor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;GAEG;AACH,UAAU,YAAY;IACpB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,SAAS,GAAE,MAAY,EACvB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GACzB,YAAY,EAAE,CA8ChB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,GAAG,SAAS,EACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgCxB"}
+{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;GAEG;AACH,UAAU,YAAY;IACpB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,SAAS,GAAE,MAAY,EACvB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,EAC1B,YAAY,CAAC,EAAE,YAAY,GAC1B,YAAY,EAAE,CA8DhB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,GAAG,SAAS,EACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgCxB"}