windmill-cli 1.641.0 → 1.643.0

package/esm/src/utils/resource_folders.js

@@ -1,367 +0,0 @@
-/**
- * Utility module for handling resource folder naming conventions.
- *
- * This module centralizes the logic for detecting and manipulating paths
- * that contain resource folders (.flow, .app, .raw_app).
- *
- * The folder suffixes can be configured to use either dot-prefixed names
- * (.flow, .app, .raw_app) or dunder-prefixed names (__flow, __app, __raw_app).
- */
-import { log, SEP, yamlParseFile } from "../../deps.js";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import process from "node:process";
-// Configuration for folder suffixes - can be switched between dot and dunder prefixes
-// The default uses dot-prefixed names (.flow, .app, .raw_app)
-const DOTTED_SUFFIXES = {
-    flow: ".flow",
-    app: ".app",
-    raw_app: ".raw_app",
-};
-// Alternative dunder-prefixed names (__flow, __app, __raw_app)
-const NON_DOTTED_SUFFIXES = {
-    flow: "__flow",
-    app: "__app",
-    raw_app: "__raw_app",
-};
-// Global state for nonDottedPaths configuration
-let _nonDottedPaths = false;
-let _nonDottedPathsLogged = false;
-/**
- * Set whether to use non-dotted paths (__flow, __app, __raw_app)
- * instead of dotted paths (.flow, .app, .raw_app).
- * This should be called once at startup based on wmill.yaml configuration.
- */
-export function setNonDottedPaths(value) {
-    if (value && !_nonDottedPathsLogged) {
-        log.info("Using non-dotted paths (__flow, __app, __raw_app)");
-        _nonDottedPathsLogged = true;
-    }
-    _nonDottedPaths = value;
-}
-/**
- * Get the current nonDottedPaths setting.
- */
-export function getNonDottedPaths() {
-    return _nonDottedPaths;
-}
-/**
- * Search for wmill.yaml by traversing upward from the current directory
- * and initialize the nonDottedPaths setting.
- * Unlike findWmillYaml() in conf.ts, this does not stop at the git root -
- * it continues searching until the filesystem root.
- * This is needed for commands like `app dev` and `app new` which may run
- * from inside folders that are deeply nested within a larger git repository.
- */
-export async function loadNonDottedPathsSetting() {
-    let currentDir = process.cwd();
-    while (true) {
-        const wmillYamlPath = path.join(currentDir, "wmill.yaml");
-        if (fs.existsSync(wmillYamlPath)) {
-            try {
-                const config = (await yamlParseFile(wmillYamlPath));
-                setNonDottedPaths(config?.nonDottedPaths ?? false);
-                log.debug(`Found wmill.yaml at ${wmillYamlPath}, nonDottedPaths=${config?.nonDottedPaths ?? false}`);
-            }
-            catch (e) {
-                log.debug(`Failed to parse wmill.yaml at ${wmillYamlPath}: ${e}`);
-            }
-            return;
-        }
-        // Check if we've reached the filesystem root
-        const parentDir = path.dirname(currentDir);
-        if (parentDir === currentDir) {
-            // Reached filesystem root without finding wmill.yaml
-            log.debug("No wmill.yaml found, using default dotted paths");
-            return;
-        }
-        currentDir = parentDir;
-    }
-}
-/**
- * Get the folder suffixes based on the global configuration.
- */
-export function getFolderSuffixes() {
-    return _nonDottedPaths ? NON_DOTTED_SUFFIXES : DOTTED_SUFFIXES;
-}
-// Metadata file names inside each folder type
-const METADATA_FILES = {
-    flow: { yaml: "flow.yaml", json: "flow.json" },
-    app: { yaml: "app.yaml", json: "app.json" },
-    raw_app: { yaml: "raw_app.yaml", json: "raw_app.json" },
-};
-/**
- * Get the folder suffix for a resource type (e.g., ".flow", ".app", ".raw_app" or "__flow", "__app", "__raw_app")
- */
-export function getFolderSuffix(type) {
-    return getFolderSuffixes()[type];
-}
-/**
- * Get the folder suffix with path separator (e.g., ".flow/", ".app/", ".raw_app/")
- */
-export function getFolderSuffixWithSep(type) {
-    return getFolderSuffixes()[type] + SEP;
-}
-/**
- * Get the metadata file name for a resource type
- */
-export function getMetadataFileName(type, format) {
-    return METADATA_FILES[type][format];
-}
-/**
- * Get the full metadata file path suffix (e.g., ".flow/flow.yaml" or "__flow/flow.yaml")
- */
-export function getMetadataPathSuffix(type, format) {
-    return getFolderSuffixes()[type] + "/" + METADATA_FILES[type][format];
-}
-// ============================================================================
-// Path Detection Functions
-// ============================================================================
-/**
- * Check if a path is inside a flow folder
- */
-export function isFlowPath(p) {
-    return p.includes(getFolderSuffixes().flow + SEP);
-}
-/**
- * Check if a path is inside an app folder
- */
-export function isAppPath(p) {
-    return p.includes(getFolderSuffixes().app + SEP);
-}
-/**
- * Check if a path is inside a raw_app folder
- */
-export function isRawAppPath(p) {
-    return p.includes(getFolderSuffixes().raw_app + SEP);
-}
-/**
- * Check if a path is inside any folder-based resource (flow, app, or raw_app)
- */
-export function isFolderResourcePath(p) {
-    return isFlowPath(p) || isAppPath(p) || isRawAppPath(p);
-}
-/**
- * Detect the resource type from a path, if any
- */
-export function detectFolderResourceType(p) {
-    if (isFlowPath(p))
-        return "flow";
-    if (isAppPath(p))
-        return "app";
-    if (isRawAppPath(p))
-        return "raw_app";
-    return null;
-}
-/**
- * Check if a path is inside a raw app backend folder.
- * Matches patterns like: .../myApp.raw_app/backend/... or .../myApp__raw_app/backend/...
- */
-export function isRawAppBackendPath(filePath) {
-    const suffixes = getFolderSuffixes();
-    // Normalize path separators for consistent matching
-    const normalizedPath = filePath.replaceAll(SEP, "/");
-    // Check if path contains pattern: *.[suffix]/backend/
-    const escapedSuffix = suffixes.raw_app.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(`${escapedSuffix}/backend/`);
-    return pattern.test(normalizedPath);
-}
-/**
- * Check if a path is inside a normal app folder (inline script).
- * Matches patterns like: .../myApp.app/... or .../myApp__app/...
- * This is used to detect inline scripts that belong to normal apps.
- */
-export function isAppInlineScriptPath(filePath) {
-    const suffixes = getFolderSuffixes();
-    // Normalize path separators for consistent matching
-    const normalizedPath = filePath.replaceAll(SEP, "/");
-    // Check if path contains pattern: *.[suffix]/
-    const escapedSuffix = suffixes.app.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(`${escapedSuffix}/`);
-    return pattern.test(normalizedPath);
-}
-/**
- * Check if a path is inside a flow folder (inline script).
- * Matches patterns like: .../myFlow.flow/... or .../myFlow__flow/...
- * This is used to detect inline scripts that belong to flows.
- */
-export function isFlowInlineScriptPath(filePath) {
-    const suffixes = getFolderSuffixes();
-    // Normalize path separators for consistent matching
-    const normalizedPath = filePath.replaceAll(SEP, "/");
-    // Check if path contains pattern: *.[suffix]/
-    const escapedSuffix = suffixes.flow.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(`${escapedSuffix}/`);
-    return pattern.test(normalizedPath);
-}
-// ============================================================================
-// Path Manipulation Functions
-// ============================================================================
-/**
- * Extract the resource name from a path (the part before the folder suffix)
- * e.g., "f/my_flow.flow/flow.yaml" -> "f/my_flow"
- */
-export function extractResourceName(p, type) {
-    const suffix = getFolderSuffixes()[type] + SEP;
-    const index = p.indexOf(suffix);
-    if (index === -1)
-        return null;
-    return p.substring(0, index);
-}
-/**
- * Extract the folder path (resource name + folder suffix)
- * e.g., "f/my_flow.flow/flow.yaml" -> "f/my_flow.flow/"
- */
-export function extractFolderPath(p, type) {
-    const suffix = getFolderSuffixes()[type] + SEP;
-    const index = p.indexOf(suffix);
-    if (index === -1)
-        return null;
-    return p.substring(0, index) + suffix;
-}
-/**
- * Build a folder path from a resource name
- * e.g., ("f/my_flow", "flow") -> "f/my_flow.flow"
- */
-export function buildFolderPath(resourceName, type) {
-    return resourceName + getFolderSuffixes()[type];
-}
-/**
- * Build a metadata file path from a resource name
- * e.g., ("f/my_flow", "flow", "yaml") -> "f/my_flow.flow/flow.yaml"
- */
-export function buildMetadataPath(resourceName, type, format) {
-    return (resourceName +
-        getFolderSuffixes()[type] +
-        SEP +
-        METADATA_FILES[type][format]);
-}
-// ============================================================================
-// Folder Validation Functions
-// ============================================================================
-/**
- * Check if a directory name ends with a specific resource folder suffix
- * e.g., "my_app.raw_app" ends with ".raw_app" or "my_app__raw_app" ends with "__raw_app"
- */
-export function hasFolderSuffix(dirName, type) {
-    return dirName.endsWith(getFolderSuffixes()[type]);
-}
-/**
- * Validate that a directory name has the expected folder suffix
- * Returns an error message if invalid, null if valid
- */
-export function validateFolderName(dirName, type) {
-    const suffixes = getFolderSuffixes();
-    if (!hasFolderSuffix(dirName, type)) {
-        return `'${dirName}' does not end with '${suffixes[type]}'`;
-    }
-    return null;
-}
-/**
- * Extract the resource name from a folder name by removing the suffix
- * e.g., "my_app.raw_app" -> "my_app" or "my_app__raw_app" -> "my_app"
- */
-export function extractNameFromFolder(folderName, type) {
-    const suffix = getFolderSuffixes()[type];
-    if (folderName.endsWith(suffix)) {
-        return folderName.substring(0, folderName.length - suffix.length);
-    }
-    return folderName;
-}
-// ============================================================================
-// Metadata File Detection Functions
-// ============================================================================
-/**
- * Check if a path ends with a flow metadata file suffix.
- * Detects BOTH API format (always dotted: .flow.json) and local format (user-configured).
- * This is necessary because the API always returns dotted format, but local files
- * may use non-dotted format if nonDottedPaths is configured.
- */
-export function isFlowMetadataFile(p) {
-    // Always check API format (dotted)
-    if (p.endsWith(DOTTED_SUFFIXES.flow + ".json") ||
-        p.endsWith(DOTTED_SUFFIXES.flow + ".yaml")) {
-        return true;
-    }
-    // Also check non-dotted format for local files
-    if (_nonDottedPaths) {
-        return (p.endsWith(NON_DOTTED_SUFFIXES.flow + ".json") ||
-            p.endsWith(NON_DOTTED_SUFFIXES.flow + ".yaml"));
-    }
-    return false;
-}
-/**
- * Check if a path ends with an app metadata file suffix.
- * Detects BOTH API format (always dotted: .app.json) and local format (user-configured).
- */
-export function isAppMetadataFile(p) {
-    // Always check API format (dotted)
-    if (p.endsWith(DOTTED_SUFFIXES.app + ".json") ||
-        p.endsWith(DOTTED_SUFFIXES.app + ".yaml")) {
-        return true;
-    }
-    // Also check non-dotted format for local files
-    if (_nonDottedPaths) {
-        return (p.endsWith(NON_DOTTED_SUFFIXES.app + ".json") ||
-            p.endsWith(NON_DOTTED_SUFFIXES.app + ".yaml"));
-    }
-    return false;
-}
-/**
- * Check if a path ends with a raw_app metadata file suffix.
- * Detects BOTH API format (always dotted: .raw_app.json) and local format (user-configured).
- */
-export function isRawAppMetadataFile(p) {
-    // Always check API format (dotted)
-    if (p.endsWith(DOTTED_SUFFIXES.raw_app + ".json") ||
-        p.endsWith(DOTTED_SUFFIXES.raw_app + ".yaml")) {
-        return true;
-    }
-    // Also check non-dotted format for local files
-    if (_nonDottedPaths) {
-        return (p.endsWith(NON_DOTTED_SUFFIXES.raw_app + ".json") ||
-            p.endsWith(NON_DOTTED_SUFFIXES.raw_app + ".yaml"));
-    }
-    return false;
-}
-/**
- * Check if a path ends with a specific raw_app metadata file
- * (inside the folder, e.g., ".raw_app/raw_app.yaml" or "__raw_app/raw_app.yaml")
- */
-export function isRawAppFolderMetadataFile(p) {
-    return (p.endsWith(getMetadataPathSuffix("raw_app", "yaml")) ||
-        p.endsWith(getMetadataPathSuffix("raw_app", "json")));
-}
-// ============================================================================
-// Sync-related Path Functions
-// ============================================================================
-/**
- * Get the path suffix to remove when converting local path to API path
- * for delete operations
- */
-export function getDeleteSuffix(type, format) {
-    return getFolderSuffixes()[type] + "/" + METADATA_FILES[type][format];
-}
-/**
- * Transform a JSON path from API format to local directory path for sync.
- * The API always returns dotted format (.flow.json, .app.json, .raw_app.json).
- * This function transforms to the user's configured format (dotted or non-dotted).
- * e.g., with nonDottedPaths=true: "f/my_flow.flow.json" -> "f/my_flow__flow"
- * e.g., with nonDottedPaths=false: "f/my_flow.flow.json" -> "f/my_flow.flow"
- */
-export function transformJsonPathToDir(p, type) {
-    // API always returns dotted format
-    const apiSuffix = DOTTED_SUFFIXES[type] + ".json";
-    if (p.endsWith(apiSuffix)) {
-        // Remove the API suffix and add user's configured suffix
-        const basePath = p.substring(0, p.length - apiSuffix.length);
-        return basePath + getFolderSuffixes()[type];
-    }
-    // Also handle the case where path already has user's configured format
-    const userSuffix = getFolderSuffixes()[type] + ".json";
-    if (p.endsWith(userSuffix)) {
-        return p.substring(0, p.length - 5); // Remove ".json"
-    }
-    // Path doesn't match expected suffix pattern, return unchanged
-    return p;
-}

package/esm/src/utils/resource_types.js

@@ -1,32 +0,0 @@
-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/script_common.js

@@ -1,91 +0,0 @@
-export const workspaceDependenciesLanguages = [
-    { language: "bun", filename: "package.json" },
-    { language: "python3", filename: "requirements.in" },
-    { language: "php", filename: "composer.json" },
-    { language: "go", filename: "go.mod" },
-];
-/**
- * Returns true if a script in the given language requires a lock file.
- * Matches the condition in updateScriptLock (metadata.ts).
- */
-export function languageNeedsLock(language) {
-    return (workspaceDependenciesLanguages.some((l) => l.language === language) ||
-        language === "deno" ||
-        language === "rust" ||
-        language === "ansible");
-}
-export function inferContentTypeFromFilePath(contentPath, defaultTs) {
-    if (contentPath.endsWith(".py")) {
-        return "python3";
-    }
-    else if (contentPath.endsWith("fetch.ts")) {
-        return "nativets";
-    }
-    else if (contentPath.endsWith("bun.ts")) {
-        return "bun";
-    }
-    else if (contentPath.endsWith("deno.ts")) {
-        return "deno";
-    }
-    else if (contentPath.endsWith(".ts")) {
-        return defaultTs ?? "bun";
-    }
-    else if (contentPath.endsWith(".go")) {
-        return "go";
-    }
-    else if (contentPath.endsWith(".my.sql")) {
-        return "mysql";
-    }
-    else if (contentPath.endsWith(".bq.sql")) {
-        return "bigquery";
-    }
-    else if (contentPath.endsWith(".odb.sql")) {
-        return "oracledb";
-    }
-    else if (contentPath.endsWith(".duckdb.sql")) {
-        return "duckdb";
-    }
-    else if (contentPath.endsWith(".sf.sql")) {
-        return "snowflake";
-    }
-    else if (contentPath.endsWith(".ms.sql")) {
-        return "mssql";
-    }
-    else if (contentPath.endsWith(".pg.sql")) {
-        return "postgresql";
-    }
-    else if (contentPath.endsWith(".gql")) {
-        return "graphql";
-    }
-    else if (contentPath.endsWith(".sh")) {
-        return "bash";
-    }
-    else if (contentPath.endsWith(".ps1")) {
-        return "powershell";
-    }
-    else if (contentPath.endsWith(".php")) {
-        return "php";
-    }
-    else if (contentPath.endsWith(".rs")) {
-        return "rust";
-    }
-    else if (contentPath.endsWith(".cs")) {
-        return "csharp";
-    }
-    else if (contentPath.endsWith(".playbook.yml")) {
-        return "ansible";
-    }
-    else if (contentPath.endsWith(".nu")) {
-        return "nu";
-    }
-    else if (contentPath.endsWith(".java")) {
-        return "java";
-    }
-    else if (contentPath.endsWith(".rb")) {
-        return "ruby";
-        // for related places search: ADD_NEW_LANG
-    }
-    else {
-        throw new Error("Invalid language: " + contentPath.substring(contentPath.lastIndexOf(".")));
-    }
-}

package/esm/src/utils/upgrade.js

@@ -1,48 +0,0 @@
-import { Provider } from "../../deps.js";
-export class NpmProvider extends Provider {
-    constructor({ main, logger, ...options }) {
-        super({ main, logger });
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "npm"
-        });
-        Object.defineProperty(this, "repositoryUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "https://npmjs.org/"
-        });
-        Object.defineProperty(this, "apiUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "https://registry.npmjs.org/"
-        });
-        Object.defineProperty(this, "packageName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.packageName = "package" in options ? options.package : options.name;
-    }
-    async getVersions(name) {
-        const response = await fetch(new URL(`${this.packageName ?? name}`, this.apiUrl));
-        if (!response.ok) {
-            throw new Error("couldn't fetch the latest version - try again after sometime");
-        }
-        const { "dist-tags": { latest }, versions, } = (await response.json());
-        return {
-            latest,
-            versions: Object.keys(versions).reverse(),
-        };
-    }
-    getRepositoryUrl(name, version) {
-        return new URL(`package/${this.packageName ?? name}${version ? `/v/${version}` : ""}`, this.repositoryUrl).href;
-    }
-    getRegistryUrl(name, version) {
-        return `npm:${this.packageName ?? name}@${version}`;
-    }
-}