* 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>
324 lines
12 KiB
TypeScript
324 lines
12 KiB
TypeScript
/**
|
|
* Unit tests for script module utilities.
|
|
* These tests require no backend — they test standalone logic.
|
|
*/
|
|
|
|
import { expect, test, describe, beforeEach, afterEach } from "bun:test";
|
|
import * as fs from "node:fs";
|
|
import * as path from "node:path";
|
|
import * as os from "node:os";
|
|
import {
|
|
getModuleFolderSuffix,
|
|
isScriptModulePath,
|
|
buildModuleFolderPath,
|
|
isModuleEntryPoint,
|
|
getScriptBasePathFromModulePath,
|
|
} from "../src/utils/resource_folders.ts";
|
|
import {
|
|
writeModulesToDisk,
|
|
readModulesFromDisk,
|
|
} from "../src/commands/script/script.ts";
|
|
import { getTypeStrFromPath } from "../src/types.ts";
|
|
|
|
// =============================================================================
|
|
// Module Path Utilities
|
|
// =============================================================================
|
|
|
|
describe("getModuleFolderSuffix", () => {
|
|
test("returns __mod", () => {
|
|
expect(getModuleFolderSuffix()).toBe("__mod");
|
|
});
|
|
});
|
|
|
|
describe("isScriptModulePath", () => {
|
|
test("detects module paths", () => {
|
|
expect(isScriptModulePath("f/my_script__mod/helper.ts")).toBe(true);
|
|
expect(isScriptModulePath("u/admin/script__mod/utils/math.py")).toBe(true);
|
|
});
|
|
|
|
test("rejects non-module paths", () => {
|
|
expect(isScriptModulePath("f/my_script.ts")).toBe(false);
|
|
expect(isScriptModulePath("f/my_script__mod")).toBe(false); // no trailing /
|
|
expect(isScriptModulePath("f/my_flow__flow/flow.yaml")).toBe(false);
|
|
});
|
|
|
|
test("handles windows-style separators", () => {
|
|
expect(isScriptModulePath("f\\my_script__mod\\helper.ts")).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("buildModuleFolderPath", () => {
|
|
test("appends __mod suffix", () => {
|
|
expect(buildModuleFolderPath("f/my_script")).toBe("f/my_script__mod");
|
|
expect(buildModuleFolderPath("u/admin/tool")).toBe("u/admin/tool__mod");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// writeModulesToDisk / readModulesFromDisk round-trip
|
|
// =============================================================================
|
|
|
|
describe("module read/write round-trip", () => {
|
|
let tempDir: string;
|
|
|
|
beforeEach(() => {
|
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "wm-module-test-"));
|
|
});
|
|
|
|
afterEach(() => {
|
|
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
});
|
|
|
|
test("writes and reads back a simple module", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"helper.ts": {
|
|
content: 'export function greet() { return "hi"; }\n',
|
|
language: "bun" as const,
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, "bun");
|
|
|
|
// Verify file exists on disk
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "helper.ts"))).toBe(true);
|
|
|
|
// Read back
|
|
const result = await readModulesFromDisk(moduleFolderPath, "bun", false);
|
|
expect(result).toBeDefined();
|
|
expect(Object.keys(result!)).toEqual(["helper.ts"]);
|
|
expect(result!["helper.ts"].content).toBe('export function greet() { return "hi"; }\n');
|
|
expect(result!["helper.ts"].language).toBe("bun");
|
|
});
|
|
|
|
test("writes and reads back module with lock file", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"helper.py": {
|
|
content: "def greet():\n return 'hi'\n",
|
|
language: "python3" as const,
|
|
lock: "requests==2.31.0\n",
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, undefined);
|
|
|
|
// Verify lock file exists
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "helper.lock"))).toBe(true);
|
|
|
|
// Read back
|
|
const result = await readModulesFromDisk(moduleFolderPath, undefined, false);
|
|
expect(result).toBeDefined();
|
|
expect(result!["helper.py"].lock).toBe("requests==2.31.0\n");
|
|
});
|
|
|
|
test("writes and reads back nested module paths", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"utils/math.py": {
|
|
content: "def add(a, b):\n return a + b\n",
|
|
language: "python3" as const,
|
|
},
|
|
"utils/__init__.py": {
|
|
content: "",
|
|
language: "python3" as const,
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, undefined);
|
|
|
|
// Verify nested structure
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "utils", "math.py"))).toBe(true);
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "utils", "__init__.py"))).toBe(true);
|
|
|
|
// Read back
|
|
const result = await readModulesFromDisk(moduleFolderPath, undefined, false);
|
|
expect(result).toBeDefined();
|
|
expect(Object.keys(result!).sort()).toEqual(["utils/__init__.py", "utils/math.py"]);
|
|
expect(result!["utils/math.py"].content).toBe("def add(a, b):\n return a + b\n");
|
|
});
|
|
|
|
test("returns undefined for non-existent folder", async () => {
|
|
const result = await readModulesFromDisk(path.join(tempDir, "nonexistent__mod"), undefined, false);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
test("returns undefined for empty folder", async () => {
|
|
const emptyFolder = path.join(tempDir, "empty__mod");
|
|
fs.mkdirSync(emptyFolder);
|
|
const result = await readModulesFromDisk(emptyFolder, undefined, false);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
test("multiple modules of different languages", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"helper.ts": {
|
|
content: "export const x = 1;\n",
|
|
language: "bun" as const,
|
|
},
|
|
"other.ts": {
|
|
content: "export const y = 2;\n",
|
|
language: "bun" as const,
|
|
lock: "some-lock-content\n",
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, "bun");
|
|
const result = await readModulesFromDisk(moduleFolderPath, "bun", false);
|
|
|
|
expect(result).toBeDefined();
|
|
expect(Object.keys(result!).sort()).toEqual(["helper.ts", "other.ts"]);
|
|
expect(result!["other.ts"].lock).toBe("some-lock-content\n");
|
|
expect(result!["helper.ts"].lock).toBeUndefined();
|
|
});
|
|
|
|
test("folder layout skips entry point files", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
fs.mkdirSync(moduleFolderPath, { recursive: true });
|
|
|
|
// Simulate folder layout: script.ts is the entry point, helper.ts is a module
|
|
fs.writeFileSync(path.join(moduleFolderPath, "script.ts"), "export function main() {}\n");
|
|
fs.writeFileSync(path.join(moduleFolderPath, "script.yaml"), "description: test\n");
|
|
fs.writeFileSync(path.join(moduleFolderPath, "script.lock"), "");
|
|
fs.writeFileSync(path.join(moduleFolderPath, "helper.ts"), "export const x = 1;\n");
|
|
|
|
// With folderLayout=true, entry point files should be skipped
|
|
const result = await readModulesFromDisk(moduleFolderPath, "bun", true);
|
|
expect(result).toBeDefined();
|
|
expect(Object.keys(result!)).toEqual(["helper.ts"]);
|
|
|
|
// With folderLayout=false, all files are included
|
|
const resultFlat = await readModulesFromDisk(moduleFolderPath, "bun", false);
|
|
expect(resultFlat).toBeDefined();
|
|
expect(Object.keys(resultFlat!).sort()).toContain("script.ts");
|
|
expect(Object.keys(resultFlat!).sort()).toContain("helper.ts");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// getTypeStrFromPath with module paths
|
|
// =============================================================================
|
|
|
|
describe("getTypeStrFromPath with module paths", () => {
|
|
test("recognizes module content files as scripts", () => {
|
|
expect(getTypeStrFromPath("f/my_script__mod/helper.ts")).toBe("script");
|
|
expect(getTypeStrFromPath("u/admin/tool__mod/utils/math.py")).toBe("script");
|
|
expect(getTypeStrFromPath("f/x__mod/helper.go")).toBe("script");
|
|
});
|
|
|
|
test("recognizes module lock files as scripts", () => {
|
|
// Lock files inside __mod/ should NOT throw — they are valid module files
|
|
expect(getTypeStrFromPath("f/my_script__mod/helper.lock")).toBe("script");
|
|
expect(getTypeStrFromPath("u/admin/tool__mod/utils/math.lock")).toBe("script");
|
|
});
|
|
|
|
test("recognizes module entry points as scripts", () => {
|
|
expect(getTypeStrFromPath("f/my_script__mod/script.ts")).toBe("script");
|
|
expect(getTypeStrFromPath("f/my_script__mod/script.py")).toBe("script");
|
|
});
|
|
|
|
test("recognizes module metadata files as scripts", () => {
|
|
// .yaml/.json files inside __mod/ should be recognized
|
|
expect(getTypeStrFromPath("f/my_script__mod/script.yaml")).toBe("script");
|
|
expect(getTypeStrFromPath("f/my_script__mod/script.json")).toBe("script");
|
|
});
|
|
});
|
|
|
|
// =============================================================================
|
|
// Module read/write with multiple lock files
|
|
// =============================================================================
|
|
|
|
describe("module lock file handling", () => {
|
|
let tempDir: string;
|
|
|
|
beforeEach(() => {
|
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "wm-module-lock-test-"));
|
|
});
|
|
|
|
afterEach(() => {
|
|
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
});
|
|
|
|
test("writes and reads multiple modules each with their own lock", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"api_client.py": {
|
|
content: "import requests\ndef fetch(): pass\n",
|
|
language: "python3" as const,
|
|
lock: "requests==2.31.0\nurllib3==2.0.4\n",
|
|
},
|
|
"data_processor.py": {
|
|
content: "import pandas\ndef process(): pass\n",
|
|
language: "python3" as const,
|
|
lock: "pandas==2.1.0\nnumpy==1.25.0\n",
|
|
},
|
|
"utils.py": {
|
|
content: "def helper(): pass\n",
|
|
language: "python3" as const,
|
|
// No lock — no external deps
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, undefined);
|
|
|
|
// Verify lock files exist only for modules with locks
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "api_client.lock"))).toBe(true);
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "data_processor.lock"))).toBe(true);
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "utils.lock"))).toBe(false);
|
|
|
|
// Read back and verify
|
|
const result = await readModulesFromDisk(moduleFolderPath, undefined, false);
|
|
expect(result).toBeDefined();
|
|
expect(Object.keys(result!).sort()).toEqual(["api_client.py", "data_processor.py", "utils.py"]);
|
|
expect(result!["api_client.py"].lock).toBe("requests==2.31.0\nurllib3==2.0.4\n");
|
|
expect(result!["data_processor.py"].lock).toBe("pandas==2.1.0\nnumpy==1.25.0\n");
|
|
expect(result!["utils.py"].lock).toBeUndefined();
|
|
});
|
|
|
|
test("nested modules with lock files", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
const modules = {
|
|
"services/api.ts": {
|
|
content: "export function callApi() {}\n",
|
|
language: "bun" as const,
|
|
lock: "axios@1.5.0\n",
|
|
},
|
|
"services/db.ts": {
|
|
content: "export function query() {}\n",
|
|
language: "bun" as const,
|
|
lock: "pg@8.11.0\n",
|
|
},
|
|
};
|
|
|
|
await writeModulesToDisk(moduleFolderPath, modules, "bun");
|
|
|
|
// Verify nested lock files
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "services", "api.lock"))).toBe(true);
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "services", "db.lock"))).toBe(true);
|
|
|
|
const result = await readModulesFromDisk(moduleFolderPath, "bun", false);
|
|
expect(result).toBeDefined();
|
|
expect(result!["services/api.ts"].lock).toBe("axios@1.5.0\n");
|
|
expect(result!["services/db.ts"].lock).toBe("pg@8.11.0\n");
|
|
});
|
|
|
|
test("overwrites existing module folder on re-write", async () => {
|
|
const moduleFolderPath = path.join(tempDir, "my_script__mod");
|
|
|
|
// First write
|
|
await writeModulesToDisk(moduleFolderPath, {
|
|
"old.ts": { content: "old content\n", language: "bun" as const },
|
|
}, "bun");
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "old.ts"))).toBe(true);
|
|
|
|
// Second write with different module
|
|
await writeModulesToDisk(moduleFolderPath, {
|
|
"new.ts": { content: "new content\n", language: "bun" as const },
|
|
}, "bun");
|
|
expect(fs.existsSync(path.join(moduleFolderPath, "new.ts"))).toBe(true);
|
|
// old.ts should still exist (writeModulesToDisk doesn't clean up)
|
|
// This is intentional — cleanup happens at the sync level
|
|
});
|
|
});
|