@testsmith/testblocks 0.8.1 → 0.8.2

package/dist/cli/index.js

@@ -97,6 +97,75 @@ function findPluginsDir(startDir) {
     }
     return null;
 }
+/**
+ * Load folder hooks from a test file's directory up to the root globals directory
+ * Returns hooks in order from outermost folder to innermost
+ */
+function loadFolderHooks(testFilePath, globalsDir) {
+    let currentDir = path.dirname(path.resolve(testFilePath));
+    const stopDir = globalsDir ? path.resolve(globalsDir) : null;
+    // Collect hooks from innermost to outermost
+    const collectedHooks = [];
+    while (currentDir) {
+        const hooksPath = path.join(currentDir, '_hooks.testblocks.json');
+        if (fs.existsSync(hooksPath)) {
+            try {
+                const content = fs.readFileSync(hooksPath, 'utf-8');
+                const hooksFile = JSON.parse(content);
+                collectedHooks.push(hooksFile);
+            }
+            catch (e) {
+                console.warn(`Warning: Could not load hooks from ${hooksPath}: ${e.message}`);
+            }
+        }
+        // Stop at globals directory or root
+        if (stopDir && currentDir === stopDir)
+            break;
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir)
+            break; // Reached root
+        currentDir = parentDir;
+    }
+    // Reverse to get outermost-to-innermost order
+    return collectedHooks.reverse();
+}
+/**
+ * Merge folder hooks into a test file
+ * - beforeAll/beforeEach: parent hooks run first
+ * - afterAll/afterEach: child hooks run first (reverse order)
+ */
+function mergeFolderHooksIntoTestFile(testFile, folderHooks) {
+    if (!folderHooks || folderHooks.length === 0) {
+        return testFile;
+    }
+    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
+    return {
+        ...testFile,
+        beforeAll: [...beforeAllSteps, ...(testFile.beforeAll || [])],
+        afterAll: [...(testFile.afterAll || []), ...afterAllSteps],
+        beforeEach: [...beforeEachSteps, ...(testFile.beforeEach || [])],
+        afterEach: [...(testFile.afterEach || []), ...afterEachSteps],
+    };
+}
 const program = new commander_1.Command();
 program
     .name('testblocks')
@@ -219,12 +288,18 @@ program
             }
             console.log(`Running: ${basename}`);
             const content = fs.readFileSync(file, 'utf-8');
-            const testFile = JSON.parse(content);
+            let testFile = JSON.parse(content);
             // Skip files that have no tests array (e.g., hooks-only files)
             if (!testFile.tests || !Array.isArray(testFile.tests)) {
                 console.log('  (no tests in file)\n');
                 continue;
             }
+            // Load and merge folder hooks
+            const globalsDir = fs.existsSync(globalsPath) ? path.dirname(globalsPath) : null;
+            const folderHooks = loadFolderHooks(file, globalsDir);
+            if (folderHooks.length > 0) {
+                testFile = mergeFolderHooksIntoTestFile(testFile, folderHooks);
+            }
             // Apply filter if specified
             if (options.filter) {
                 const filterRegex = new RegExp(options.filter, 'i');
@@ -359,7 +434,7 @@ program
                 'test:junit': 'testblocks run tests/**/*.testblocks.json -r junit -o reports',
             },
             devDependencies: {
-                '@testsmith/testblocks': '^0.8.1',
+                '@testsmith/testblocks': '^0.8.2',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));

package/package.json

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