windmill-utils-internal 1.3.0 → 1.3.2

package/dist/gen/types.gen.js

@@ -1,3 +1,2 @@
-"use strict";
 // This file is auto-generated by @hey-api/openapi-ts
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @fileoverview Main entry point for windmill-utils-internal package
  *
@@ -8,26 +7,8 @@
  * - Schema parsing and conversion utilities
  * - Cross-platform path constants
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DELIMITER = exports.SEP = void 0;
-__exportStar(require("./inline-scripts"), exports);
-__exportStar(require("./path-utils"), exports);
-__exportStar(require("./parse"), exports);
-__exportStar(require("./config"), exports);
-var constants_1 = require("./constants");
-Object.defineProperty(exports, "SEP", { enumerable: true, get: function () { return constants_1.SEP; } });
-Object.defineProperty(exports, "DELIMITER", { enumerable: true, get: function () { return constants_1.DELIMITER; } });
+export * from "./inline-scripts";
+export * from "./path-utils";
+export * from "./parse";
+export * from "./config";
+export { SEP, DELIMITER } from "./constants";

package/dist/inline-scripts/extractor.d.ts

@@ -1,3 +1,4 @@
+import { PathAssigner } from "../path-utils/path-assigner";
 import { FlowModule } from "../gen/types.gen";
 /**
  * Represents an inline script extracted from a flow module
@@ -8,16 +9,26 @@ interface InlineScript {
     /** The actual script content */
     content: string;
 }
+/**
+ * Options for extractInlineScripts function
+ */
+export interface ExtractInlineScriptsOptions {
+    /** When true, skip the .inline_script. suffix in file names */
+    skipInlineScriptSuffix?: boolean;
+}
 /**
  * Extracts inline scripts from flow modules, converting them to separate files
  * and replacing the original content with file references.
  *
  * @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)
+ * @param options - Optional configuration options
  * @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, options?: ExtractInlineScriptsOptions): InlineScript[];
 /**
  * Extracts the current mapping of module IDs to file paths from flow modules
  * by analyzing existing inline script references.

package/dist/inline-scripts/extractor.js

@@ -1,23 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractInlineScripts = extractInlineScripts;
-exports.extractCurrentMapping = extractCurrentMapping;
-const path_assigner_1 = require("../path-utils/path-assigner");
+import { newPathAssigner } from "../path-utils/path-assigner";
 /**
  * Extracts inline scripts from flow modules, converting them to separate files
  * and replacing the original content with file references.
  *
  * @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)
+ * @param options - Optional configuration options
  * @returns Array of inline scripts with their paths and content
  */
-function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs) {
-    const pathAssigner = (0, path_assigner_1.newPathAssigner)(defaultTs ?? "bun");
+export function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs, pathAssigner, options) {
+    // Create pathAssigner only if not provided (top-level call), but reuse it for nested calls
+    const assigner = pathAssigner ?? newPathAssigner(defaultTs ?? "bun", { skipInlineScriptSuffix: options?.skipInlineScriptSuffix });
     return modules.flatMap((m) => {
         if (m.value.type == "rawscript") {
-            let basePath, ext;
-            [basePath, ext] = pathAssigner.assignPath(m.summary, m.value.language);
+            const [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 }];
@@ -31,18 +30,18 @@ function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs)
             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 {
@@ -58,7 +57,7 @@ function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs)
  * @param mapping - Existing mapping to extend (defaults to empty object)
  * @returns Record mapping module IDs to their corresponding file paths
  */
-function extractCurrentMapping(modules, mapping = {}) {
+export function extractCurrentMapping(modules, mapping = {}) {
     if (!modules || !Array.isArray(modules)) {
         return mapping;
     }

package/dist/inline-scripts/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./replacer"), exports);
-__exportStar(require("./extractor"), exports);
+export * from "./replacer";
+export * from "./extractor";

package/dist/inline-scripts/replacer.d.ts

@@ -13,4 +13,4 @@ import { FlowModule } from "../gen/types.gen";
 export declare function replaceInlineScripts(modules: FlowModule[], fileReader: (path: string) => Promise<string>, logger: {
     info: (message: string) => void;
     error: (message: string) => void;
-} | undefined, localPath: string, separator?: string, removeLocks?: string[], renamer?: (path: string, newPath: string) => void, deleter?: (path: string) => void): Promise<void>;
+} | undefined, localPath: string, separator?: string, removeLocks?: string[]): Promise<void>;

package/dist/inline-scripts/replacer.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceInlineScripts = replaceInlineScripts;
 /**
  * Replaces inline script references with actual file content from the filesystem.
  * This function recursively processes all flow modules and their nested structures.
@@ -12,17 +9,17 @@ exports.replaceInlineScripts = replaceInlineScripts;
  * @param removeLocks - Optional array of paths for which to remove lock files
  * @returns Promise that resolves when all inline scripts have been replaced
  */
-async function replaceInlineScripts(modules, fileReader, logger = {
+export async function replaceInlineScripts(modules, fileReader, logger = {
     info: () => { },
     error: () => { },
-}, localPath, separator = "/", removeLocks, renamer, deleter) {
+}, localPath, separator = "/", removeLocks) {
     await Promise.all(modules.map(async (module) => {
         if (!module.value) {
             throw new Error(`Module value is undefined for module ${module.id}`);
         }
         if (module.value.type === "rawscript" && module.value.content && module.value.content.startsWith("!inline")) {
             const path = module.value.content.split(" ")[1];
-            const pathPrefix = path.split(".")[0];
+            // const pathPrefix = path.split(".")[0];
             const pathSuffix = path.split(".").slice(1).join(".");
             // new path is the module id with the same suffix
             const newPath = module.id + "." + pathSuffix;
@@ -73,7 +70,8 @@ async function replaceInlineScripts(modules, fileReader, logger = {
                     module.value.lock = await fileReader(path.replaceAll("/", separator));
                 }
                 catch {
-                    logger.error(`Lock file ${path} not found`);
+                    logger.error(`Lock file ${path} not found, treating as empty`);
+                    module.value.lock = "";
                 }
             }
         }

package/dist/parse/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./parse-schema"), exports);
+export * from "./parse-schema";

package/dist/parse/parse-schema.d.ts

@@ -1,7 +1,10 @@
 /**
  * Type alias for enum values - can be an array of strings or undefined
  */
-export type EnumType = string[] | undefined;
+export type EnumType = string[] | {
+    label: string;
+    value: string;
+}[] | undefined;
 /**
  * Represents a property in a JSON schema with various validation and display options
  */
@@ -16,7 +19,7 @@ export interface SchemaProperty {
     items?: {
         type?: "string" | "number" | "bytes" | "object" | "resource";
         contentEncoding?: "base64";
-        enum?: string[];
+        enum?: EnumType;
         resourceType?: string;
         properties?: {
             [name: string]: SchemaProperty;

package/dist/parse/parse-schema.js

@@ -1,6 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.argSigToJsonSchemaType = argSigToJsonSchemaType;
+const ITEMS_PRESERVED_FIELDS = [
+    "properties",
+    "required",
+    "additionalProperties",
+    "enum",
+    "resourceType",
+    "contentEncoding",
+    "description",
+];
 /**
  * Converts argument signature types to JSON schema properties.
  * This function handles various Windmill-specific types and converts them
@@ -9,7 +15,7 @@ exports.argSigToJsonSchemaType = argSigToJsonSchemaType;
  * @param t - The argument signature type definition (can be string or complex object types)
  * @param oldS - Existing schema property to update with new type information
  */
-function argSigToJsonSchemaType(t, oldS) {
+export function argSigToJsonSchemaType(t, oldS) {
     const newS = { type: "" };
     if (t === "int") {
         newS.type = "integer";
@@ -159,17 +165,34 @@ function argSigToJsonSchemaType(t, oldS) {
                 newS.items = { type: "object", properties: properties };
             }
             else {
-                newS.items = { type: "object" };
+                // Preserve ALL user-defined fields when parser cannot infer structure
+                newS.items = { type: oldS.items?.type || "object" };
+                if (oldS.items && typeof oldS.items === "object") {
+                    ITEMS_PRESERVED_FIELDS.forEach((field) => {
+                        if (oldS.items && oldS.items[field] !== undefined) {
+                            newS.items[field] = oldS.items[field];
+                        }
+                    });
+                }
             }
             newS.originalType = "record[]";
         }
         else {
-            newS.items = { type: "object" };
+            // Preserve ALL user-defined fields for untyped lists (same as record[] branch)
+            newS.items = { type: oldS.items?.type || "object" };
+            if (oldS.items && typeof oldS.items === "object") {
+                ITEMS_PRESERVED_FIELDS.forEach((field) => {
+                    if (oldS.items && oldS.items[field] !== undefined) {
+                        newS.items[field] = oldS.items[field];
+                    }
+                });
+            }
             newS.originalType = "object[]";
         }
     }
     else {
-        newS.type = "object";
+        // Preserve existing type when inference fails, default to "object" for undefined/null
+        newS.type = oldS.type ?? "object";
     }
     const preservedFields = [
         "description",

package/dist/path-utils/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./path-assigner"), exports);
+export * from "./path-assigner";

package/dist/path-utils/path-assigner.d.ts

@@ -16,13 +16,43 @@ export declare const LANGUAGE_EXTENSIONS: Record<SupportedLanguage, string>;
  * @returns File extension string (without the dot)
  */
 export declare function getLanguageExtension(language: SupportedLanguage, defaultTs?: "bun" | "deno"): string;
+/**
+ * Reverse mapping from file extensions to languages.
+ * Used when deriving language from file extension.
+ */
+export declare const EXTENSION_TO_LANGUAGE: Record<string, SupportedLanguage>;
+/**
+ * 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 declare function getLanguageFromExtension(ext: string, defaultTs?: "bun" | "deno"): SupportedLanguage | undefined;
 export interface PathAssigner {
     assignPath(summary: string | undefined, language: SupportedLanguage): [string, string];
 }
+export interface PathAssignerOptions {
+    defaultTs: "bun" | "deno";
+    /** When true, skip the .inline_script. suffix in file names */
+    skipInlineScriptSuffix?: boolean;
+}
 /**
  * Creates a new path assigner for inline scripts.
  *
  * @param defaultTs - Default TypeScript runtime ("bun" or "deno")
+ * @param options - Optional configuration (can pass options object instead of defaultTs)
+ * @returns Path assigner function
+ */
+export declare function newPathAssigner(defaultTs: "bun" | "deno" | PathAssignerOptions, options?: {
+    skipInlineScriptSuffix?: boolean;
+}): PathAssigner;
+/**
+ * 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 declare function newPathAssigner(defaultTs: "bun" | "deno"): PathAssigner;
+export declare function newRawAppPathAssigner(defaultTs: "bun" | "deno"): PathAssigner;

package/dist/path-utils/path-assigner.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LANGUAGE_EXTENSIONS = void 0;
-exports.getLanguageExtension = getLanguageExtension;
-exports.newPathAssigner = newPathAssigner;
 const INLINE_SCRIPT_PREFIX = "inline_script";
 /**
  * Mapping of supported languages to their file extensions
  */
-exports.LANGUAGE_EXTENSIONS = {
+export const LANGUAGE_EXTENSIONS = {
     python3: "py",
     bun: "bun.ts",
     deno: "deno.ts",
@@ -41,19 +36,74 @@ exports.LANGUAGE_EXTENSIONS = {
  * @param defaultTs - Default TypeScript runtime ("bun" or "deno")
  * @returns File extension string (without the dot)
  */
-function getLanguageExtension(language, defaultTs = "bun") {
+export function getLanguageExtension(language, defaultTs = "bun") {
     if (language === defaultTs || language === "bunnative") {
         return "ts";
     }
-    return exports.LANGUAGE_EXTENSIONS[language] || "no_ext";
+    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.
  *
  * @param defaultTs - Default TypeScript runtime ("bun" or "deno")
+ * @param options - Optional configuration (can pass options object instead of defaultTs)
  * @returns Path assigner function
  */
-function newPathAssigner(defaultTs) {
+export function newPathAssigner(defaultTs, options) {
+    // Handle both old signature (defaultTs string) and new signature (options object)
+    const resolvedOptions = typeof defaultTs === "object"
+        ? defaultTs
+        : { defaultTs, skipInlineScriptSuffix: options?.skipInlineScriptSuffix };
+    const { defaultTs: tsRuntime, skipInlineScriptSuffix } = resolvedOptions;
     let counter = 0;
     const seen_names = new Set();
     function assignPath(summary, language) {
@@ -69,8 +119,39 @@ function newPathAssigner(defaultTs) {
             name = `${original_name}_${counter}`;
         }
         seen_names.add(name);
+        const ext = getLanguageExtension(language, tsRuntime);
+        // When skipInlineScriptSuffix is true, don't add .inline_script. to the path
+        const suffix = skipInlineScriptSuffix ? "." : ".inline_script.";
+        return [`${name}${suffix}`, ext];
+    }
+    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}.inline_script.`, ext];
+        return [`${name}.`, ext];
     }
     return { assignPath };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-utils-internal",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Internal utility functions for Windmill",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",