windmill-cli 1.589.3 → 1.591.0

package/esm/src/commands/sync/sync.js

@@ -15,7 +15,7 @@ import { removePathPrefix } from "../../types.js";
 import { listSyncCodebases } from "../../utils/codebase.js";
 import { generateScriptMetadataInternal, getRawWorkspaceDependencies, readLockfile, workspaceDependenciesPathToLanguageAndFilename, } from "../../utils/metadata.js";
 import { pushResource } from "../resource/resource.js";
-import { newPathAssigner, } from "../../../windmill-utils-internal/src/path-utils/path-assigner.js";
+import { newPathAssigner, newRawAppPathAssigner, } from "../../../windmill-utils-internal/src/path-utils/path-assigner.js";
 import { extractInlineScripts as extractInlineScriptsForFlows } from "../../../windmill-utils-internal/src/inline-scripts/extractor.js";
 import { generateFlowLockInternal } from "../flow/flow_metadata.js";
 import { isExecutionModeAnonymous } from "../app/apps.js";
@@ -189,10 +189,6 @@ function extractFields(fields) {
                 fields[k] = undefined;
             }
         }
-        // if (k == 'runType') {
-        //   fields["type"] = undefined
-        //   fields["schema"] = undefined
-        // }
     });
 }
 export function extractFieldsForRawApps(runnables) {
@@ -204,18 +200,13 @@ export function extractFieldsForRawApps(runnables) {
         }
     });
 }
-export function extractInlineScriptsForApps(key, rec, pathAssigner, toId) {
+export function extractInlineScriptsForApps(key, rec, pathAssigner, toId, removeSchema) {
     if (!rec) {
         return [];
     }
     if (typeof rec == "object") {
         return Object.entries(rec).flatMap(([k, v]) => {
-            if (k == "runType") {
-                rec["type"] = undefined;
-                rec["schema"] = undefined;
-                return [];
-            }
-            else if (k == "inlineScript" && typeof v == "object") {
+            if (k == "inlineScript" && typeof v == "object") {
                 rec["type"] = undefined;
                 const o = v;
                 const name = toId(key ?? "", rec);
@@ -238,11 +229,13 @@ export function extractInlineScriptsForApps(key, rec, pathAssigner, toId) {
                         content: lock,
                     });
                 }
-                o.schema = undefined;
+                if (removeSchema) {
+                    o.schema = undefined;
+                }
                 return r;
             }
             else {
-                return extractInlineScriptsForApps(k, v, pathAssigner, toId);
+                return extractInlineScriptsForApps(k, v, pathAssigner, toId, removeSchema);
             }
         });
     }
@@ -336,7 +329,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                         }
                         let inlineScripts;
                         try {
-                            inlineScripts = extractInlineScriptsForApps(undefined, app?.["value"], newPathAssigner(defaultTs), (_, val) => val["name"]);
+                            inlineScripts = extractInlineScriptsForApps(undefined, app?.["value"], newPathAssigner(defaultTs), (_, val) => val["name"], false);
                         }
                         catch (error) {
                             log.error(`Failed to extract inline scripts for app at path: ${p}`);
@@ -383,10 +376,11 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                         rawApp.policy = undefined;
                         let inlineScripts;
                         const value = rawApp?.["value"];
+                        const runnables = value?.["runnables"] ?? {};
                         // console.log("FOOB", value?.["runnables"])
-                        extractFieldsForRawApps(value?.["runnables"]);
+                        extractFieldsForRawApps(runnables);
                         try {
-                            inlineScripts = extractInlineScriptsForApps(undefined, value, newPathAssigner(defaultTs), (key, val_) => key);
+                            inlineScripts = extractInlineScriptsForApps(undefined, value, newRawAppPathAssigner(defaultTs), (key, val_) => key, true);
                         }
                         catch (error) {
                             log.error(`Failed to extract inline scripts for raw app at path: ${p}`);
@@ -412,6 +406,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                             log.error(`Failed to extract files for raw app at path: ${p}`);
                             throw error;
                         }
+                        // Yield inline script content and lock files
                         for (const s of inlineScripts) {
                             yield {
                                 isDirectory: false,
@@ -423,11 +418,50 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                                 },
                             };
                         }
-                        const runnables = value?.["runnables"];
-                        if (runnables) {
-                            rawApp.runnables = runnables;
-                            delete rawApp?.["value"];
+                        // Yield each runnable as a separate YAML file in the backend folder
+                        // For inline scripts, simplify the YAML - inlineScript is not needed since
+                        // content/lock/language can be derived from sibling files
+                        for (const [runnableId, runnable] of Object.entries(runnables)) {
+                            const runnableObj = runnable;
+                            let simplifiedRunnable;
+                            if (runnableObj.inlineScript) {
+                                // For inline scripts, remove inlineScript and just keep type: 'inline'
+                                // plus any other metadata (name, fields, etc.)
+                                simplifiedRunnable = { type: "inline" };
+                                // Copy over any other fields that aren't inlineScript or type
+                                for (const [key, value] of Object.entries(runnableObj)) {
+                                    if (key !== "inlineScript" && key !== "type") {
+                                        simplifiedRunnable[key] = value;
+                                    }
+                                }
+                            }
+                            else if (runnableObj.type === "path" && runnableObj.runType) {
+                                // For path-based runnables, convert from API format to file format
+                                // { type: "path", runType: "script" } -> { type: "script" }
+                                // Also remove schema field
+                                const { type: _type, runType, schema: _schema, ...rest } = runnableObj;
+                                simplifiedRunnable = {
+                                    type: runType,
+                                    ...rest,
+                                };
+                            }
+                            else {
+                                // For other runnables, keep as-is
+                                simplifiedRunnable = runnableObj;
+                            }
+                            yield {
+                                isDirectory: false,
+                                path: path.join(finalPath, APP_BACKEND_FOLDER, `${runnableId}.yaml`),
+                                async *getChildren() { },
+                                // deno-lint-ignore require-await
+                                async getContentText() {
+                                    return yamlStringify(simplifiedRunnable, yamlOptions);
+                                },
+                            };
                         }
+                        // Remove runnables and value from raw_app.yaml - they are now in separate files
+                        delete rawApp?.["value"];
+                        // Don't include runnables in raw_app.yaml anymore
                         yield {
                             isDirectory: false,
                             path: path.join(finalPath, "raw_app.yaml"),

package/esm/src/main.js

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

package/esm/src/utils/resource_types.js

@@ -0,0 +1,32 @@
+export function compileResourceTypeToTsType(schema) {
+    function rec(x, root = false) {
+        let res = "{\n";
+        const entries = Object.entries(x);
+        if (entries.length == 0) {
+            return "any";
+        }
+        let i = 0;
+        for (let [name, prop] of entries) {
+            if (prop.type == "object") {
+                res += `  ${name}: ${rec(prop.properties ?? {})}`;
+            }
+            else if (prop.type == "array") {
+                res += `  ${name}: ${prop?.items?.type ?? "any"}[]`;
+            }
+            else {
+                let typ = prop?.type ?? "any";
+                if (typ == "integer") {
+                    typ = "number";
+                }
+                res += `  ${name}: ${typ}`;
+            }
+            i++;
+            if (i < entries.length) {
+                res += ",\n";
+            }
+        }
+        res += "\n}";
+        return res;
+    }
+    return rec(schema.properties, true);
+}

package/esm/src/utils/utils.js

@@ -223,3 +223,11 @@ export async function fetchRemoteVersion(workspace) {
     }
     log.info(colors.gray("Remote version: " + version));
 }
+export function toCamel(s) {
+    return s.replace(/([-_][a-z])/gi, ($1) => {
+        return $1.toUpperCase().replace("-", "").replace("_", "");
+    });
+}
+export function capitalize(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}

package/esm/windmill-utils-internal/src/path-utils/path-assigner.js

@@ -42,6 +42,55 @@ export function getLanguageExtension(language, defaultTs = "bun") {
     }
     return LANGUAGE_EXTENSIONS[language] || "no_ext";
 }
+/**
+ * Reverse mapping from file extensions to languages.
+ * Used when deriving language from file extension.
+ */
+export const EXTENSION_TO_LANGUAGE = {
+    "py": "python3",
+    "bun.ts": "bun",
+    "deno.ts": "deno",
+    "go": "go",
+    "sh": "bash",
+    "ps1": "powershell",
+    "pg.sql": "postgresql",
+    "my.sql": "mysql",
+    "bq.sql": "bigquery",
+    "odb.sql": "oracledb",
+    "sf.sql": "snowflake",
+    "ms.sql": "mssql",
+    "gql": "graphql",
+    "native.ts": "nativets",
+    "frontend.js": "frontend",
+    "php": "php",
+    "rs": "rust",
+    "cs": "csharp",
+    "nu": "nu",
+    "playbook.yml": "ansible",
+    "java": "java",
+    "duckdb.sql": "duckdb",
+    // Plain .ts defaults to bun (will be overridden by defaultTs setting)
+    "ts": "bun",
+};
+/**
+ * Gets the language from a file extension.
+ *
+ * @param ext - File extension (e.g., "py", "ts", "bun.ts")
+ * @param defaultTs - Default TypeScript runtime for plain .ts files
+ * @returns The language, or undefined if not recognized
+ */
+export function getLanguageFromExtension(ext, defaultTs = "bun") {
+    // Check for compound extensions first (e.g., "bun.ts", "pg.sql")
+    const lang = EXTENSION_TO_LANGUAGE[ext];
+    if (lang) {
+        // For plain .ts, return the default TypeScript runtime
+        if (ext === "ts") {
+            return defaultTs;
+        }
+        return lang;
+    }
+    return undefined;
+}
 /**
  * Creates a new path assigner for inline scripts.
  *
@@ -69,3 +118,32 @@ export function newPathAssigner(defaultTs) {
     }
     return { assignPath };
 }
+/**
+ * Creates a new path assigner for raw app runnables.
+ * Unlike newPathAssigner, this does NOT add ".inline_script." prefix since
+ * everything in raw_app/backend/ is already known to be for inline scripts.
+ *
+ * @param defaultTs - Default TypeScript runtime ("bun" or "deno")
+ * @returns Path assigner function
+ */
+export function newRawAppPathAssigner(defaultTs) {
+    let counter = 0;
+    const seen_names = new Set();
+    function assignPath(summary, language) {
+        let name;
+        name = summary?.toLowerCase()?.replaceAll(" ", "_") ?? "";
+        let original_name = name;
+        if (name == "") {
+            original_name = "runnable";
+            name = `runnable_0`;
+        }
+        while (seen_names.has(name)) {
+            counter++;
+            name = `${original_name}_${counter}`;
+        }
+        seen_names.add(name);
+        const ext = getLanguageExtension(language, defaultTs);
+        return [`${name}.`, ext];
+    }
+    return { assignPath };
+}

package/package.json

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

package/types/bootstrap/common.d.ts

@@ -1,4 +1,16 @@
+import type { ScriptLang } from "../gen/types.gen.js";
 export type EnumType = string[] | undefined;
+export type Schema = {
+    $schema: string | undefined;
+    type: string;
+    "x-windmill-dyn-select-code"?: string;
+    "x-windmill-dyn-select-lang"?: ScriptLang;
+    properties: {
+        [name: string]: SchemaProperty;
+    };
+    order?: string[];
+    required: string[];
+};
 export interface SchemaProperty {
     type: string | undefined;
     description?: string;

package/types/bootstrap/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/bootstrap/common.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;AAE5C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,eAAe,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;QAC7D,eAAe,CAAC,EAAE,QAAQ,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,CAAC,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/bootstrap/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,QAAQ,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;AAE5C,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,UAAU,CAAC;IAC1C,UAAU,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,eAAe,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;QAC7D,eAAe,CAAC,EAAE,QAAQ,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,CAAC,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}

package/types/deps/jsr.io/@windmill-labs/shared-utils/{1.0.10 → 1.0.11}/lib.es.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.es.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@windmill-labs/shared-utils/1.0.10/lib.es.js"],"names":[],"mappings":"AA+4CA,wCAEC;AA7DD,2CAmCC;AAzJD,2DA4EC;AA8ED,iEAMC;AAgBG,sCAA0F"}
+{"version":3,"file":"lib.es.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@windmill-labs/shared-utils/1.0.11/lib.es.js"],"names":[],"mappings":"AA+4CA,wCAEC;AA7DD,2CAmCC;AAzJD,2DA4EC;AA8ED,iEAMC;AAgBG,sCAA0F"}

package/types/deps.d.ts

@@ -30,6 +30,6 @@ export { WebSocketServer, WebSocket } from "ws";
 export * as getPort from "get-port";
 export * as open from "open";
 export * as esMain from "es-main";
-export * as windmillUtils from "./deps/jsr.io/@windmill-labs/shared-utils/1.0.10/lib.es.js";
+export * as windmillUtils from "./deps/jsr.io/@windmill-labs/shared-utils/1.0.11/lib.es.js";
 export declare function setClient(token?: string, baseUrl?: string): void;
 //# sourceMappingURL=deps.d.ts.map