* feat: add script module mode with folder model for Bun and Python Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add missing modules field to RawCode in bun_executor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * feat: enrich WAC templates with checkpoint and replay semantics Add prominent comments explaining that all computation must happen inside task/step/taskScript or it will be replayed on resume/retry. Clarify that waitForApproval does not hold a worker and that approve/reject URLs are available in the timeline step details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(cli): script module sync idempotency, per-module hash tracking, and preview support - Fix pull→push idempotency: use `??` instead of `||` for module lock field so empty strings are preserved (matches API's `lock: ""`) - Add per-module hash tracking in wmill-lock.yaml following the flow inline script pattern (SCRIPT_TOP_HASH + per-module subpath hashes) - Selective module lock regeneration: only regenerate locks for modules whose content actually changed, not all modules - Use unfiltered rawWorkspaceDependencies for module hashes to match what updateModuleLocks passes to fetchScriptLock - Show changed module names in stale script output for clarity - Add module support to `script preview` command: read modules from __mod/ folder and pass them in the preview API request - Add preview tests for taskScript pattern (flat and folder layout) - Update test assertion for module stale detection output Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): WAC UI improvements — reorder templates, module tab rename, import consolidation - Reorder WAC template buttons: TypeScript before Python in ScriptBuilder, CreateActionsScript, and CreateActionsFlow - Remove dropdown items from +Script button (simplify to direct link) - Move "Import Workflow-as-Code" to +Flow dropdown with dedicated drawer - Add module tab rename: pencil icon on hover opens popover with validation, fixed-width icon container prevents layout shift Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: remaining module-mode changes from working branch - Backend parser updates for WAC detection - CLI sync/types updates for raw app path and module support - Frontend UI polish (Dev.svelte, ScriptRow, script hash page) - Test fixture updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(cli): add test for module modification detection in generate-metadata Verifies that modifying a single module file re-triggers stale detection and only the changed module is listed, not all modules. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): critical fixes from PR review - Fix hardcoded dev path in bun_executor.rs WAC v2 wrapper — use "windmill-client" import instead of absolute filesystem path - Fix missed no_main_func → auto_kind rename in parser TS test - Add modules column to clone_script SQL (windmill-common and windmill-api-workspaces) so cloned scripts retain their modules - Add modules: None to RawCode structs in worker tests - Restore complete sqlx cache (merge main's cache + our new queries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix clone warning treated as error in CI Change `.clone()` on double reference to `*k` dereference in scripts.rs hash implementation. Update sqlx cache with new query hashes from modified clone_script SQL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use published parser wasm versions for CI build The local file:// paths for windmill-parser-wasm-py and windmill-parser-wasm-ts don't exist in the Cloudflare Pages build environment. Revert to published npm versions (1.655.0). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): update parser wasm packages to 1.657.2 Use newly published windmill-parser-wasm-ts and windmill-parser-wasm-py v1.657.2 which include auto_kind/WAC detection changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): regenerate package-lock.json for npm ci compatibility Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use main's lockfile as base, update only parser wasm packages Regenerating package-lock.json from scratch pulled different dependency versions causing svelte-check type errors. Instead, start from main's lockfile and only update the two changed packages. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): add modules column to fetch_script_for_update query The Script<SR> struct has a modules field (FromRow), but fetch_script_for_update didn't SELECT modules, causing a runtime error "no column found for name: modules" when the worker processed dependency jobs. This was the root cause of the relock_skip test timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix script module execution for Python and Bun - Fix modules not passed through job queue: inject _MODULES into PushArgs.extra when pushing Code jobs so worker can extract them - Fix Python module imports: use relative imports (from .helper) and add sys.path.insert for module directory in wrapper - Fix Python tests: use relative imports and empty lock to prevent pip from resolving module names as packages - Add local file check in Bun loader for module resolution - Ignore Bun module test (bundle mode loader integration tracked separately) - Add missing modules column to fetch_script_for_update query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): remove unnecessary empty lock in Python module tests Relative imports (from .helper) are not parsed as pip packages, so the empty lock workaround is not needed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix module execution for Python and Bun — all tests pass Python modules: - Use relative imports (from .helper import greet) since scripts run as packages - Add sys.path.insert for module directory in wrapper to ensure local modules take precedence over pip packages with same name Bun modules: - Use bundled output (./out/main.js) as wrapper import when modules are present — the bundled output has module content inlined by Bun.build, avoiding runtime loader resolution issues - Add local file check in loader.bun.js onResolve to short-circuit API URL resolution for module files on disk Job queue: - Inject _MODULES into PushArgs.extra when pushing Code jobs so the worker can extract them at execution time Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review — simplify, fix correctness, remove dead code Critical fixes: - Replace all CLI `no_main_func` references with `auto_kind` (string) to match the backend migration and API changes - Remove duplicated `compute_python_module_dir` in worker.rs, use the canonical version from python_executor.rs High priority: - Auto-create `__init__.py` in intermediate directories for nested Python modules so imports like `from .utils.math import add` work without users manually creating __init__.py files - Remove redundant `sys_path_insert` — relative imports use Python's package system, not sys.path Medium: - Fix lock file base name extraction: use regex to strip only the final extension (`.replace(/\.[^.]+$/, '')`) instead of `indexOf(".")` which breaks for files like `helper.test.ts` Simplification: - Remove dead `{#if false}` Popover block in ScriptEditor.svelte - Guard loader.bun.js local file check to only run for relative paths (matching the Windows loader pattern) - Add clarifying comment on Bun dual mechanism (build + run phases) - Add maintenance comment on manual Hash impl for NewScript Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final review fixes — stale cleanup, baseName, auto_kind export - Fix sync.ts baseName extraction using indexOf(".") → regex (same fix as script.ts/metadata.ts, missed this instance) - Add stale module file cleanup in writeModulesToDisk: removes files from __mod/ that are no longer in the modules map before writing, fixing the pull→push cycle that couldn't delete modules - Log warning when _MODULES serialization fails in job push instead of silently dropping modules - Use strict equality (===) for auto_kind comparison - Exclude auto_kind from workspace export — it is auto-detected by the parser at deploy time from script content Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(cli): remove auto_kind from push, comparison, and metadata auto_kind is auto-detected by the parser at deploy time, so the CLI should not send it, compare it, or write it to script.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove erroneously added backend/backend/.sqlx directory Duplicate .sqlx cache was committed at the wrong nested path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback + fix CI dead_code warning Frontend (ScriptEditor.svelte): - Fix switchToMain() missing lastSyncedCode update — prevents stale code sync on external changes while editing a module tab - Fix formatAction saving module code to main script's localStorage draft — now saves main code when on a module tab - Fix non-null assertion on inferModuleLang in renameModule — fall back to original language instead of force unwrap - Remove redundant activeModuleTab truthy check in runTest CLI (script.ts): - Clean up empty directories after removing stale module files in writeModulesToDisk Backend: - Add path traversal guard in write_module_files — reject module paths containing ".." - Fix dead_code warning on auto_kind field in workspace export struct Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): improve auto_kind UX + address review findings - Rename "Include without main function" toggle to "Include library scripts" in script list (ItemsList.svelte) - Update NoMainFuncBadge: "No main" → "Library" with clearer tooltip - Filter module file extensions by main script language — Python scripts only allow .py modules, TypeScript only .ts, etc. - Split flushModuleState into flushModuleContent (no UI side-effect) and flushModuleState (flush + reset tab), reducing duplication - Dynamic placeholder and hint text in add module popover based on main script language Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
592 lines
21 KiB
TypeScript
592 lines
21 KiB
TypeScript
/**
|
|
* Unit tests for resource_folders.ts path detection and manipulation functions.
|
|
* Tests both dotted (.flow, .app, .raw_app) and non-dotted (__flow, __app, __raw_app) modes.
|
|
*/
|
|
|
|
import { expect, test, describe, beforeEach } from "bun:test";
|
|
import {
|
|
setNonDottedPaths,
|
|
getNonDottedPaths,
|
|
getFolderSuffixes,
|
|
getFolderSuffix,
|
|
getMetadataFileName,
|
|
getMetadataPathSuffix,
|
|
isFlowPath,
|
|
isAppPath,
|
|
isRawAppPath,
|
|
isFolderResourcePath,
|
|
detectFolderResourceType,
|
|
isRawAppBackendPath,
|
|
isAppInlineScriptPath,
|
|
isFlowInlineScriptPath,
|
|
extractResourceName,
|
|
extractFolderPath,
|
|
buildFolderPath,
|
|
buildMetadataPath,
|
|
hasFolderSuffix,
|
|
validateFolderName,
|
|
extractNameFromFolder,
|
|
isFlowMetadataFile,
|
|
isAppMetadataFile,
|
|
isRawAppMetadataFile,
|
|
isRawAppFolderMetadataFile,
|
|
getDeleteSuffix,
|
|
transformJsonPathToDir,
|
|
isModuleEntryPoint,
|
|
getScriptBasePathFromModulePath,
|
|
} from "../src/utils/resource_folders.ts";
|
|
import { removeWorkerPrefix } from "../src/commands/worker-groups/worker-groups.ts";
|
|
|
|
// =============================================================================
|
|
// Helper: reset to dotted mode before each test
|
|
// =============================================================================
|
|
|
|
beforeEach(() => {
|
|
setNonDottedPaths(false);
|
|
});
|
|
|
|
// =============================================================================
|
|
// Configuration Functions
|
|
// =============================================================================
|
|
|
|
describe("setNonDottedPaths / getNonDottedPaths", () => {
|
|
test("defaults to false (dotted)", () => {
|
|
expect(getNonDottedPaths()).toBe(false);
|
|
});
|
|
|
|
test("can be set to true", () => {
|
|
setNonDottedPaths(true);
|
|
expect(getNonDottedPaths()).toBe(true);
|
|
});
|
|
|
|
test("can be toggled back to false", () => {
|
|
setNonDottedPaths(true);
|
|
setNonDottedPaths(false);
|
|
expect(getNonDottedPaths()).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("getFolderSuffixes", () => {
|
|
test("returns dotted suffixes by default", () => {
|
|
const suffixes = getFolderSuffixes();
|
|
expect(suffixes.flow).toBe(".flow");
|
|
expect(suffixes.app).toBe(".app");
|
|
expect(suffixes.raw_app).toBe(".raw_app");
|
|
});
|
|
|
|
test("returns non-dotted suffixes when configured", () => {
|
|
setNonDottedPaths(true);
|
|
const suffixes = getFolderSuffixes();
|
|
expect(suffixes.flow).toBe("__flow");
|
|
expect(suffixes.app).toBe("__app");
|
|
expect(suffixes.raw_app).toBe("__raw_app");
|
|
});
|
|
});
|
|
|
|
describe("getFolderSuffix", () => {
|
|
test("returns correct suffix for each type (dotted)", () => {
|
|
expect(getFolderSuffix("flow")).toBe(".flow");
|
|
expect(getFolderSuffix("app")).toBe(".app");
|
|
expect(getFolderSuffix("raw_app")).toBe(".raw_app");
|
|
});
|
|
|
|
test("returns correct suffix for each type (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(getFolderSuffix("flow")).toBe("__flow");
|
|
expect(getFolderSuffix("app")).toBe("__app");
|
|
expect(getFolderSuffix("raw_app")).toBe("__raw_app");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Metadata File Names
|
|
// =============================================================================
|
|
|
|
describe("getMetadataFileName", () => {
|
|
test("returns correct metadata file names", () => {
|
|
expect(getMetadataFileName("flow", "yaml")).toBe("flow.yaml");
|
|
expect(getMetadataFileName("flow", "json")).toBe("flow.json");
|
|
expect(getMetadataFileName("app", "yaml")).toBe("app.yaml");
|
|
expect(getMetadataFileName("app", "json")).toBe("app.json");
|
|
expect(getMetadataFileName("raw_app", "yaml")).toBe("raw_app.yaml");
|
|
expect(getMetadataFileName("raw_app", "json")).toBe("raw_app.json");
|
|
});
|
|
});
|
|
|
|
describe("getMetadataPathSuffix", () => {
|
|
test("returns correct path suffix (dotted)", () => {
|
|
expect(getMetadataPathSuffix("flow", "yaml")).toBe(".flow/flow.yaml");
|
|
expect(getMetadataPathSuffix("app", "json")).toBe(".app/app.json");
|
|
expect(getMetadataPathSuffix("raw_app", "yaml")).toBe(".raw_app/raw_app.yaml");
|
|
});
|
|
|
|
test("returns correct path suffix (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(getMetadataPathSuffix("flow", "yaml")).toBe("__flow/flow.yaml");
|
|
expect(getMetadataPathSuffix("app", "json")).toBe("__app/app.json");
|
|
expect(getMetadataPathSuffix("raw_app", "yaml")).toBe("__raw_app/raw_app.yaml");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Path Detection Functions (dotted mode)
|
|
// =============================================================================
|
|
|
|
describe("isFlowPath (dotted)", () => {
|
|
test("detects flow paths", () => {
|
|
expect(isFlowPath("f/my_flow.flow/flow.yaml")).toBe(true);
|
|
expect(isFlowPath("u/admin/test.flow/step.ts")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-flow paths", () => {
|
|
expect(isFlowPath("f/my_script.ts")).toBe(false);
|
|
expect(isFlowPath("f/my_app.app/app.yaml")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("isAppPath (dotted)", () => {
|
|
test("detects app paths", () => {
|
|
expect(isAppPath("f/my_app.app/app.yaml")).toBe(true);
|
|
expect(isAppPath("u/admin/dashboard.app/inline.ts")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-app paths", () => {
|
|
expect(isAppPath("f/my_script.ts")).toBe(false);
|
|
expect(isAppPath("f/my_flow.flow/flow.yaml")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("isRawAppPath (dotted)", () => {
|
|
test("detects raw_app paths", () => {
|
|
expect(isRawAppPath("f/my_raw.raw_app/raw_app.yaml")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-raw_app paths", () => {
|
|
expect(isRawAppPath("f/my_app.app/app.yaml")).toBe(false);
|
|
expect(isRawAppPath("f/my_script.ts")).toBe(false);
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Path Detection Functions (non-dotted mode)
|
|
// =============================================================================
|
|
|
|
describe("isFlowPath (non-dotted)", () => {
|
|
test("detects non-dotted flow paths", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isFlowPath("f/my_flow__flow/flow.yaml")).toBe(true);
|
|
});
|
|
|
|
test("rejects dotted flow paths in non-dotted mode", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isFlowPath("f/my_flow.flow/flow.yaml")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("isAppPath (non-dotted)", () => {
|
|
test("detects non-dotted app paths", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isAppPath("f/my_app__app/app.yaml")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("isRawAppPath (non-dotted)", () => {
|
|
test("detects non-dotted raw_app paths", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isRawAppPath("f/my_raw__raw_app/raw_app.yaml")).toBe(true);
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Composite Path Detection
|
|
// =============================================================================
|
|
|
|
describe("isFolderResourcePath", () => {
|
|
test("returns true for any folder resource path", () => {
|
|
expect(isFolderResourcePath("f/x.flow/flow.yaml")).toBe(true);
|
|
expect(isFolderResourcePath("f/x.app/app.yaml")).toBe(true);
|
|
expect(isFolderResourcePath("f/x.raw_app/raw_app.yaml")).toBe(true);
|
|
});
|
|
|
|
test("returns false for non-folder paths", () => {
|
|
expect(isFolderResourcePath("f/script.ts")).toBe(false);
|
|
expect(isFolderResourcePath("f/var.variable.yaml")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("detectFolderResourceType", () => {
|
|
test("detects flow type", () => {
|
|
expect(detectFolderResourceType("f/x.flow/flow.yaml")).toBe("flow");
|
|
});
|
|
|
|
test("detects app type", () => {
|
|
expect(detectFolderResourceType("f/x.app/app.yaml")).toBe("app");
|
|
});
|
|
|
|
test("detects raw_app type", () => {
|
|
expect(detectFolderResourceType("f/x.raw_app/raw_app.yaml")).toBe("raw_app");
|
|
});
|
|
|
|
test("returns null for non-folder paths", () => {
|
|
expect(detectFolderResourceType("f/script.ts")).toBeNull();
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Inline Script / Backend Path Detection
|
|
// =============================================================================
|
|
|
|
describe("isRawAppBackendPath", () => {
|
|
test("detects raw app backend paths (dotted)", () => {
|
|
expect(isRawAppBackendPath("f/my_app.raw_app/backend/handler.ts")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-backend raw app paths", () => {
|
|
expect(isRawAppBackendPath("f/my_app.raw_app/raw_app.yaml")).toBe(false);
|
|
});
|
|
|
|
test("detects raw app backend paths (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isRawAppBackendPath("f/my_app__raw_app/backend/handler.ts")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("isAppInlineScriptPath", () => {
|
|
test("detects inline script paths in apps", () => {
|
|
expect(isAppInlineScriptPath("f/dashboard.app/inline_0.ts")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-app paths", () => {
|
|
expect(isAppInlineScriptPath("f/script.ts")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("isFlowInlineScriptPath", () => {
|
|
test("detects inline script paths in flows", () => {
|
|
expect(isFlowInlineScriptPath("f/pipeline.flow/step_0.ts")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-flow paths", () => {
|
|
expect(isFlowInlineScriptPath("f/script.ts")).toBe(false);
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Path Manipulation Functions
|
|
// =============================================================================
|
|
|
|
describe("extractResourceName", () => {
|
|
test("extracts name from flow path", () => {
|
|
expect(extractResourceName("f/my_flow.flow/flow.yaml", "flow")).toBe("f/my_flow");
|
|
});
|
|
|
|
test("extracts name from app path", () => {
|
|
expect(extractResourceName("f/dashboard.app/app.yaml", "app")).toBe("f/dashboard");
|
|
});
|
|
|
|
test("extracts name from raw_app path", () => {
|
|
expect(extractResourceName("f/my_raw.raw_app/raw_app.yaml", "raw_app")).toBe("f/my_raw");
|
|
});
|
|
|
|
test("returns null when type doesn't match", () => {
|
|
expect(extractResourceName("f/script.ts", "flow")).toBeNull();
|
|
});
|
|
|
|
test("works in non-dotted mode", () => {
|
|
setNonDottedPaths(true);
|
|
expect(extractResourceName("f/my_flow__flow/flow.yaml", "flow")).toBe("f/my_flow");
|
|
});
|
|
});
|
|
|
|
describe("extractFolderPath", () => {
|
|
test("extracts folder path from flow", () => {
|
|
expect(extractFolderPath("f/my_flow.flow/flow.yaml", "flow")).toBe("f/my_flow.flow/");
|
|
});
|
|
|
|
test("returns null when type doesn't match", () => {
|
|
expect(extractFolderPath("f/script.ts", "flow")).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("buildFolderPath", () => {
|
|
test("builds folder path (dotted)", () => {
|
|
expect(buildFolderPath("f/my_flow", "flow")).toBe("f/my_flow.flow");
|
|
expect(buildFolderPath("f/dashboard", "app")).toBe("f/dashboard.app");
|
|
expect(buildFolderPath("f/my_raw", "raw_app")).toBe("f/my_raw.raw_app");
|
|
});
|
|
|
|
test("builds folder path (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(buildFolderPath("f/my_flow", "flow")).toBe("f/my_flow__flow");
|
|
expect(buildFolderPath("f/dashboard", "app")).toBe("f/dashboard__app");
|
|
expect(buildFolderPath("f/my_raw", "raw_app")).toBe("f/my_raw__raw_app");
|
|
});
|
|
});
|
|
|
|
describe("buildMetadataPath", () => {
|
|
test("builds metadata path (dotted, yaml)", () => {
|
|
expect(buildMetadataPath("f/my_flow", "flow", "yaml")).toBe("f/my_flow.flow/flow.yaml");
|
|
});
|
|
|
|
test("builds metadata path (dotted, json)", () => {
|
|
expect(buildMetadataPath("f/dashboard", "app", "json")).toBe("f/dashboard.app/app.json");
|
|
});
|
|
|
|
test("builds metadata path (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(buildMetadataPath("f/my_flow", "flow", "yaml")).toBe("f/my_flow__flow/flow.yaml");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Folder Validation Functions
|
|
// =============================================================================
|
|
|
|
describe("hasFolderSuffix", () => {
|
|
test("returns true for matching suffix", () => {
|
|
expect(hasFolderSuffix("my_flow.flow", "flow")).toBe(true);
|
|
expect(hasFolderSuffix("dashboard.app", "app")).toBe(true);
|
|
expect(hasFolderSuffix("my_raw.raw_app", "raw_app")).toBe(true);
|
|
});
|
|
|
|
test("returns false for non-matching suffix", () => {
|
|
expect(hasFolderSuffix("my_flow.app", "flow")).toBe(false);
|
|
expect(hasFolderSuffix("script.ts", "flow")).toBe(false);
|
|
});
|
|
|
|
test("works in non-dotted mode", () => {
|
|
setNonDottedPaths(true);
|
|
expect(hasFolderSuffix("my_flow__flow", "flow")).toBe(true);
|
|
expect(hasFolderSuffix("my_flow.flow", "flow")).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("validateFolderName", () => {
|
|
test("returns null for valid folder name", () => {
|
|
expect(validateFolderName("my_flow.flow", "flow")).toBeNull();
|
|
});
|
|
|
|
test("returns error message for invalid folder name", () => {
|
|
const result = validateFolderName("my_flow.app", "flow");
|
|
expect(result).not.toBeNull();
|
|
expect(result).toContain("my_flow.app");
|
|
expect(result).toContain(".flow");
|
|
});
|
|
});
|
|
|
|
describe("extractNameFromFolder", () => {
|
|
test("extracts name by removing suffix (dotted)", () => {
|
|
expect(extractNameFromFolder("my_flow.flow", "flow")).toBe("my_flow");
|
|
expect(extractNameFromFolder("dashboard.app", "app")).toBe("dashboard");
|
|
expect(extractNameFromFolder("my_raw.raw_app", "raw_app")).toBe("my_raw");
|
|
});
|
|
|
|
test("returns original name if suffix doesn't match", () => {
|
|
expect(extractNameFromFolder("my_script", "flow")).toBe("my_script");
|
|
});
|
|
|
|
test("extracts name (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(extractNameFromFolder("my_flow__flow", "flow")).toBe("my_flow");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Metadata File Detection Functions
|
|
// =============================================================================
|
|
|
|
describe("isFlowMetadataFile", () => {
|
|
test("detects dotted flow metadata files", () => {
|
|
expect(isFlowMetadataFile("f/my_flow.flow.json")).toBe(true);
|
|
expect(isFlowMetadataFile("f/my_flow.flow.yaml")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-flow metadata files", () => {
|
|
expect(isFlowMetadataFile("f/my_app.app.json")).toBe(false);
|
|
expect(isFlowMetadataFile("f/script.ts")).toBe(false);
|
|
});
|
|
|
|
test("detects non-dotted flow metadata files when configured", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isFlowMetadataFile("f/my_flow__flow.json")).toBe(true);
|
|
expect(isFlowMetadataFile("f/my_flow__flow.yaml")).toBe(true);
|
|
// API format (dotted) is always detected
|
|
expect(isFlowMetadataFile("f/my_flow.flow.json")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("isAppMetadataFile", () => {
|
|
test("detects dotted app metadata files", () => {
|
|
expect(isAppMetadataFile("f/dashboard.app.json")).toBe(true);
|
|
expect(isAppMetadataFile("f/dashboard.app.yaml")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-app metadata files", () => {
|
|
expect(isAppMetadataFile("f/my_flow.flow.json")).toBe(false);
|
|
});
|
|
|
|
test("detects non-dotted app metadata files when configured", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isAppMetadataFile("f/dashboard__app.json")).toBe(true);
|
|
// API format always detected
|
|
expect(isAppMetadataFile("f/dashboard.app.json")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("isRawAppMetadataFile", () => {
|
|
test("detects dotted raw_app metadata files", () => {
|
|
expect(isRawAppMetadataFile("f/my_raw.raw_app.json")).toBe(true);
|
|
expect(isRawAppMetadataFile("f/my_raw.raw_app.yaml")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-raw_app metadata files", () => {
|
|
expect(isRawAppMetadataFile("f/my_app.app.json")).toBe(false);
|
|
});
|
|
|
|
test("detects non-dotted raw_app metadata files when configured", () => {
|
|
setNonDottedPaths(true);
|
|
expect(isRawAppMetadataFile("f/my_raw__raw_app.json")).toBe(true);
|
|
expect(isRawAppMetadataFile("f/my_raw.raw_app.json")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("isRawAppFolderMetadataFile", () => {
|
|
test("detects raw_app folder metadata file (dotted)", () => {
|
|
expect(isRawAppFolderMetadataFile("f/my_raw.raw_app/raw_app.yaml")).toBe(true);
|
|
expect(isRawAppFolderMetadataFile("f/my_raw.raw_app/raw_app.json")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-metadata files", () => {
|
|
expect(isRawAppFolderMetadataFile("f/my_raw.raw_app/backend/handler.ts")).toBe(false);
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Sync-related Path Functions
|
|
// =============================================================================
|
|
|
|
describe("getDeleteSuffix", () => {
|
|
test("returns correct delete suffix", () => {
|
|
expect(getDeleteSuffix("flow", "yaml")).toBe(".flow/flow.yaml");
|
|
expect(getDeleteSuffix("app", "json")).toBe(".app/app.json");
|
|
expect(getDeleteSuffix("raw_app", "yaml")).toBe(".raw_app/raw_app.yaml");
|
|
});
|
|
|
|
test("returns correct delete suffix (non-dotted)", () => {
|
|
setNonDottedPaths(true);
|
|
expect(getDeleteSuffix("flow", "yaml")).toBe("__flow/flow.yaml");
|
|
});
|
|
});
|
|
|
|
describe("transformJsonPathToDir", () => {
|
|
test("transforms API dotted .flow.json to dotted dir", () => {
|
|
expect(transformJsonPathToDir("f/my_flow.flow.json", "flow")).toBe("f/my_flow.flow");
|
|
});
|
|
|
|
test("transforms API dotted .app.json to dotted dir", () => {
|
|
expect(transformJsonPathToDir("f/dashboard.app.json", "app")).toBe("f/dashboard.app");
|
|
});
|
|
|
|
test("transforms API dotted to non-dotted dir when configured", () => {
|
|
setNonDottedPaths(true);
|
|
expect(transformJsonPathToDir("f/my_flow.flow.json", "flow")).toBe("f/my_flow__flow");
|
|
});
|
|
|
|
test("handles already-configured format", () => {
|
|
setNonDottedPaths(true);
|
|
expect(transformJsonPathToDir("f/my_flow__flow.json", "flow")).toBe("f/my_flow__flow");
|
|
});
|
|
|
|
test("returns unchanged path when suffix doesn't match", () => {
|
|
expect(transformJsonPathToDir("f/script.ts", "flow")).toBe("f/script.ts");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// removeWorkerPrefix (from worker-groups.ts)
|
|
// =============================================================================
|
|
|
|
// =============================================================================
|
|
// Module Path Functions
|
|
// =============================================================================
|
|
|
|
describe("isModuleEntryPoint", () => {
|
|
test("detects entry point files in __mod folders", () => {
|
|
expect(isModuleEntryPoint("f/my_script__mod/script.ts")).toBe(true);
|
|
expect(isModuleEntryPoint("u/admin/tool__mod/script.py")).toBe(true);
|
|
expect(isModuleEntryPoint("f/nested/path/script__mod/script.go")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-entry-point files in __mod folders", () => {
|
|
expect(isModuleEntryPoint("f/my_script__mod/helper.ts")).toBe(false);
|
|
expect(isModuleEntryPoint("f/my_script__mod/utils/math.py")).toBe(false);
|
|
expect(isModuleEntryPoint("f/my_script__mod/helper.lock")).toBe(false);
|
|
});
|
|
|
|
test("rejects entry point files in subdirectories of __mod", () => {
|
|
expect(isModuleEntryPoint("f/my_script__mod/sub/script.ts")).toBe(false);
|
|
});
|
|
|
|
test("rejects paths without __mod", () => {
|
|
expect(isModuleEntryPoint("f/my_script.ts")).toBe(false);
|
|
expect(isModuleEntryPoint("f/script.ts")).toBe(false);
|
|
});
|
|
|
|
test("handles windows-style separators", () => {
|
|
expect(isModuleEntryPoint("f\\my_script__mod\\script.ts")).toBe(true);
|
|
expect(isModuleEntryPoint("f\\my_script__mod\\helper.ts")).toBe(false);
|
|
});
|
|
|
|
test("matches any extension for script.*", () => {
|
|
expect(isModuleEntryPoint("f/x__mod/script.yaml")).toBe(true);
|
|
expect(isModuleEntryPoint("f/x__mod/script.json")).toBe(true);
|
|
expect(isModuleEntryPoint("f/x__mod/script.lock")).toBe(true);
|
|
expect(isModuleEntryPoint("f/x__mod/script.sh")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("getScriptBasePathFromModulePath", () => {
|
|
test("extracts base path from module entry point", () => {
|
|
expect(getScriptBasePathFromModulePath("f/my_script__mod/script.ts")).toBe("f/my_script");
|
|
expect(getScriptBasePathFromModulePath("u/admin/tool__mod/script.py")).toBe("u/admin/tool");
|
|
});
|
|
|
|
test("extracts base path from module helper files", () => {
|
|
expect(getScriptBasePathFromModulePath("f/my_script__mod/helper.ts")).toBe("f/my_script");
|
|
expect(getScriptBasePathFromModulePath("f/my_script__mod/utils/math.py")).toBe("f/my_script");
|
|
});
|
|
|
|
test("extracts base path from nested script paths", () => {
|
|
expect(getScriptBasePathFromModulePath("f/deeply/nested/script__mod/helper.ts")).toBe("f/deeply/nested/script");
|
|
});
|
|
|
|
test("returns undefined for non-module paths", () => {
|
|
expect(getScriptBasePathFromModulePath("f/my_script.ts")).toBeUndefined();
|
|
expect(getScriptBasePathFromModulePath("f/my_flow.flow/flow.yaml")).toBeUndefined();
|
|
});
|
|
|
|
test("handles windows-style separators", () => {
|
|
expect(getScriptBasePathFromModulePath("f\\my_script__mod\\helper.ts")).toBe("f/my_script");
|
|
});
|
|
});
|
|
|
|
describe("removeWorkerPrefix", () => {
|
|
test("removes worker__ prefix", () => {
|
|
expect(removeWorkerPrefix("worker__default")).toBe("default");
|
|
expect(removeWorkerPrefix("worker__gpu")).toBe("gpu");
|
|
});
|
|
|
|
test("returns name unchanged if no prefix", () => {
|
|
expect(removeWorkerPrefix("default")).toBe("default");
|
|
expect(removeWorkerPrefix("gpu")).toBe("gpu");
|
|
});
|
|
|
|
test("handles empty string", () => {
|
|
expect(removeWorkerPrefix("")).toBe("");
|
|
});
|
|
|
|
test("handles worker__ as the entire name", () => {
|
|
expect(removeWorkerPrefix("worker__")).toBe("");
|
|
});
|
|
});
|