@testsmith/testblocks 0.3.0 → 0.4.0

package/dist/cli/index.js

@@ -248,7 +248,7 @@ program
                 'test:junit': 'testblocks run tests/**/*.testblocks.json -r junit -o reports',
             },
             devDependencies: {
-                '@testsmith/testblocks': '^0.3.0',
+                '@testsmith/testblocks': '^0.4.0',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));

package/dist/server/index.js

@@ -9,9 +9,39 @@ const cors_1 = __importDefault(require("cors"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 // Read version from package.json
-const packageJsonPath = path_1.default.join(__dirname, '../../package.json');
-const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
-const VERSION = packageJson.version || '0.0.0';
+function getVersion() {
+    try {
+        // Method 1: Try require.resolve (works for global/local installs)
+        try {
+            const pkgPath = require.resolve('@testsmith/testblocks/package.json');
+            const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+            if (pkg.version)
+                return pkg.version;
+        }
+        catch {
+            // Package might not be installed under this name
+        }
+        // Method 2: Try relative paths
+        const possiblePaths = [
+            path_1.default.join(__dirname, '../../package.json'),
+            path_1.default.join(__dirname, '../../../package.json'),
+            path_1.default.join(__dirname, '../../../../package.json'),
+        ];
+        for (const pkgPath of possiblePaths) {
+            if (fs_1.default.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+                if (pkg.name === '@testsmith/testblocks' && pkg.version) {
+                    return pkg.version;
+                }
+            }
+        }
+    }
+    catch {
+        // Ignore errors
+    }
+    return '0.0.0';
+}
+const VERSION = getVersion();
 const executor_1 = require("./executor");
 Object.defineProperty(exports, "TestExecutor", { enumerable: true, get: function () { return executor_1.TestExecutor; } });
 const reporters_1 = require("../cli/reporters");

package/dist/server/startServer.js

@@ -43,9 +43,97 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const executor_1 = require("./executor");
 const reporters_1 = require("../cli/reporters");
+// Read version from package.json
+function getVersion() {
+    try {
+        // Method 1: Try require.resolve to find package.json (works for global/local installs)
+        try {
+            const pkgPath = require.resolve('@testsmith/testblocks/package.json');
+            const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+            if (pkg.version)
+                return pkg.version;
+        }
+        catch {
+            // Package might not be installed under this name, try relative paths
+        }
+        // Method 2: Try relative paths from this file
+        const possiblePaths = [
+            path_1.default.join(__dirname, '../../package.json'), // dist/server -> package.json
+            path_1.default.join(__dirname, '../../../package.json'), // nested node_modules
+            path_1.default.join(__dirname, '../../../../package.json'), // scoped package in node_modules
+        ];
+        for (const pkgPath of possiblePaths) {
+            if (fs_1.default.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+                // Verify it's our package
+                if (pkg.name === '@testsmith/testblocks' && pkg.version) {
+                    return pkg.version;
+                }
+            }
+        }
+    }
+    catch {
+        // Ignore errors
+    }
+    return '0.0.0';
+}
+const VERSION = getVersion();
 const plugins_1 = require("./plugins");
 const globals_1 = require("./globals");
 const codegenManager_1 = require("./codegenManager");
+/**
+ * Merge folder hooks into a test file.
+ * Folder hooks are ordered from outermost to innermost folder.
+ * - beforeAll: run parent hooks first, then child hooks, then test file hooks
+ * - afterAll: run test file hooks first, then child hooks, then parent hooks
+ * - beforeEach/afterEach: same pattern
+ */
+function mergeFolderHooksIntoTestFile(testFile, folderHooks) {
+    if (!folderHooks || folderHooks.length === 0) {
+        return testFile;
+    }
+    // Collect all steps from folder hooks (parent to child order is already provided)
+    const beforeAllSteps = [];
+    const afterAllSteps = [];
+    const beforeEachSteps = [];
+    const afterEachSteps = [];
+    // Parent to child order for beforeAll/beforeEach
+    for (const hooks of folderHooks) {
+        if (hooks.beforeAll)
+            beforeAllSteps.push(...hooks.beforeAll);
+        if (hooks.beforeEach)
+            beforeEachSteps.push(...hooks.beforeEach);
+    }
+    // Child to parent order for afterAll/afterEach
+    for (let i = folderHooks.length - 1; i >= 0; i--) {
+        const hooks = folderHooks[i];
+        if (hooks.afterAll)
+            afterAllSteps.unshift(...hooks.afterAll);
+        if (hooks.afterEach)
+            afterEachSteps.unshift(...hooks.afterEach);
+    }
+    // Merge with test file hooks
+    const merged = {
+        ...testFile,
+        beforeAll: [
+            ...beforeAllSteps,
+            ...(testFile.beforeAll || []),
+        ],
+        afterAll: [
+            ...(testFile.afterAll || []),
+            ...afterAllSteps,
+        ],
+        beforeEach: [
+            ...beforeEachSteps,
+            ...(testFile.beforeEach || []),
+        ],
+        afterEach: [
+            ...(testFile.afterEach || []),
+            ...afterEachSteps,
+        ],
+    };
+    return merged;
+}
 async function startServer(options = {}) {
     const port = options.port || 3000;
     const workingDir = process.cwd();
@@ -73,7 +161,11 @@ async function startServer(options = {}) {
     }
     // Health check
     app.get('/api/health', (_req, res) => {
-        res.json({ status: 'ok', version: '1.0.0' });
+        res.json({ status: 'ok', version: VERSION });
+    });
+    // Version endpoint
+    app.get('/api/version', (_req, res) => {
+        res.json({ version: VERSION });
     });
     // List available plugins (with full block definitions for client registration)
     app.get('/api/plugins', (_req, res) => {
@@ -130,11 +222,13 @@ async function startServer(options = {}) {
     // Run tests
     app.post('/api/run', async (req, res) => {
         try {
-            const testFile = req.body;
+            const { testFile, folderHooks } = req.body;
             if (!testFile || !testFile.tests) {
                 return res.status(400).json({ error: 'Invalid test file format' });
             }
             console.log(`Running ${testFile.tests.length} tests from "${testFile.name}"...`);
+            // Merge folder hooks into test file
+            const mergedTestFile = mergeFolderHooksIntoTestFile(testFile, folderHooks || []);
             const globalVars = (0, globals_1.getGlobalVariables)();
             const testIdAttr = (0, globals_1.getTestIdAttribute)();
             const executor = new executor_1.TestExecutor({
@@ -144,7 +238,7 @@ async function startServer(options = {}) {
                 testIdAttribute: testIdAttr,
                 baseDir: globalsDir,
             });
-            const results = await executor.runTestFile(testFile);
+            const results = await executor.runTestFile(mergedTestFile);
             const passed = results.filter(r => r.status === 'passed').length;
             const failed = results.filter(r => r.status === 'failed').length;
             console.log(`Results: ${passed} passed, ${failed} failed`);
@@ -162,12 +256,14 @@ async function startServer(options = {}) {
     // Run a single test
     app.post('/api/run/:testId', async (req, res) => {
         try {
-            const testFile = req.body;
+            const { testFile, folderHooks } = req.body;
             const { testId } = req.params;
             const test = testFile.tests.find(t => t.id === testId);
             if (!test) {
                 return res.status(404).json({ error: `Test not found: ${testId}` });
             }
+            // Merge folder hooks for beforeEach/afterEach
+            const mergedTestFile = mergeFolderHooksIntoTestFile(testFile, folderHooks || []);
             const globalVars = (0, globals_1.getGlobalVariables)();
             const testIdAttr = (0, globals_1.getTestIdAttribute)();
             const executor = new executor_1.TestExecutor({
@@ -177,11 +273,11 @@ async function startServer(options = {}) {
                 testIdAttribute: testIdAttr,
                 baseDir: globalsDir,
             });
-            if (testFile.procedures) {
-                executor.registerProcedures(testFile.procedures);
+            if (mergedTestFile.procedures) {
+                executor.registerProcedures(mergedTestFile.procedures);
             }
             await executor.initialize();
-            const result = await executor.runTest(test, testFile.variables);
+            const result = await executor.runTest(test, mergedTestFile.variables);
             await executor.cleanup();
             res.json(result);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testsmith/testblocks",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Visual test automation tool with Blockly - API and Playwright testing",
   "author": "Roy de Kleijn",
   "license": "MIT",