@testsmith/api-spector 0.7.7 → 0.7.8

package/out/main/chunks/{request-collection-KGPuvN7o.js → request-collection-gkOYlWml.js}

@@ -25,6 +25,14 @@ function findFolder(root, id) {
   }
   return null;
 }
+function folderChainTo(root, targetId) {
+  if (root.id === targetId) return [root];
+  for (const sub of root.folders) {
+    const chain = folderChainTo(sub, targetId);
+    if (chain.length > 0) return [root, ...chain];
+  }
+  return [];
+}
 function flattenFolderRequests(folder, requests) {
   const out = [];
   for (const child of orderedChildren(folder)) {
@@ -38,11 +46,13 @@ function flattenFolderRequests(folder, requests) {
   }
   return out;
 }
-function makeHook(req, collectionVars, hookType, scopeId, scopeAncestors, scopePath, mainRequestId) {
-  return { request: req, collectionVars, isHook: true, hookType, scopeId, scopeAncestors, scopePath, mainRequestId };
+function makeHook(req, collectionVars, hookType, scopeId, scopeAncestors, scopePath, mainRequestId, folderVars, folderId) {
+  return { request: req, collectionVars, isHook: true, hookType, scopeId, scopeAncestors, scopePath, mainRequestId, folderVars, folderId };
 }
-function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId, ancestorIds, parentPath, wrappers, isRoot) {
+function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId, ancestorIds, parentPath, wrappers, isRoot, inheritedFolderVars = {}) {
   const result = [];
+  const myFolderVars = { ...inheritedFolderVars, ...folder.variables ?? {} };
+  const myFolderId = folder.id;
   const scopePath = isRoot ? [] : [...parentPath, folder.name];
   const folderReqs = orderedChildren(folder).filter((c) => c.type === "request").map((c) => requests[c.id]).filter((r) => r && !r.disabled);
   const beforeAllHooks = [];
@@ -69,10 +79,10 @@ function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId,
     }
   }
   const regularReqs = folderReqs.filter((r) => !r.hookType);
-  const myWrapper = { scopeId, ancestors: ancestorIds, scopePath, before: beforeHooks, after: afterHooks };
+  const myWrapper = { scopeId, ancestors: ancestorIds, scopePath, before: beforeHooks, after: afterHooks, folderVars: myFolderVars, folderId: myFolderId };
   const allWrappers = [...wrappers, myWrapper];
   for (const req of beforeAllHooks) {
-    result.push(makeHook(req, collectionVars, "beforeAll", scopeId, ancestorIds, scopePath));
+    result.push(makeHook(req, collectionVars, "beforeAll", scopeId, ancestorIds, scopePath, void 0, myFolderVars, myFolderId));
   }
   const regularById = new Map(regularReqs.map((r) => [r.id, r]));
   const subById = new Map(folder.folders.map((f) => [f.id, f]));
@@ -84,13 +94,13 @@ function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId,
       if (filterTags.length > 0 && !filterTags.some((t) => tags.includes(t))) continue;
       for (const w of allWrappers) {
         for (const hookReq of w.before) {
-          result.push(makeHook(hookReq, collectionVars, "before", w.scopeId, w.ancestors, w.scopePath, req.id));
+          result.push(makeHook(hookReq, collectionVars, "before", w.scopeId, w.ancestors, w.scopePath, req.id, w.folderVars, w.folderId));
         }
       }
-      result.push({ request: req, collectionVars, scopeId, scopeAncestors: ancestorIds, scopePath });
+      result.push({ request: req, collectionVars, scopeId, scopeAncestors: ancestorIds, scopePath, folderVars: myFolderVars, folderId: myFolderId });
       for (const w of [...allWrappers].reverse()) {
         for (const hookReq of w.after) {
-          result.push(makeHook(hookReq, collectionVars, "after", w.scopeId, w.ancestors, w.scopePath, req.id));
+          result.push(makeHook(hookReq, collectionVars, "after", w.scopeId, w.ancestors, w.scopePath, req.id, w.folderVars, w.folderId));
         }
       }
     } else {
@@ -108,12 +118,13 @@ function buildFolderPlan(folder, requests, collectionVars, filterTags, scopeId,
         [...ancestorIds, scopeId],
         scopePath,
         allWrappers,
-        false
+        false,
+        myFolderVars
       ));
     }
   }
   for (const req of afterAllHooks) {
-    result.push(makeHook(req, collectionVars, "afterAll", scopeId, ancestorIds, scopePath));
+    result.push(makeHook(req, collectionVars, "afterAll", scopeId, ancestorIds, scopePath, void 0, myFolderVars, myFolderId));
   }
   return result;
 }
@@ -185,7 +196,7 @@ function resolveInheritedAuthAndHeaders(requestId, collection) {
 function buildRunPlan(collection, folderId, filterTags) {
   const collectionVars = collection.collectionVariables ?? {};
   const tag = (items) => items.map((i) => ({ ...i, collection: collection.name }));
-  {
+  if (!folderId) {
     return tag(buildFolderPlan(
       collection.rootFolder,
       collection.requests,
@@ -198,6 +209,52 @@ function buildRunPlan(collection, folderId, filterTags) {
       true
     ));
   }
+  const chain = folderChainTo(collection.rootFolder, folderId);
+  if (chain.length === 0) return [];
+  const targetFolder = chain[chain.length - 1];
+  const ancestors = chain.slice(0, -1);
+  const result = [];
+  const ancestorWrappers = [];
+  const ancestorIds = [];
+  for (const f of ancestors) {
+    const reqs = f.requestIds.map((id) => collection.requests[id]).filter((r) => r && !r.disabled);
+    const beforeAllH = reqs.filter((r) => r.hookType === "beforeAll");
+    const beforeH = reqs.filter((r) => r.hookType === "before");
+    const afterH = reqs.filter((r) => r.hookType === "after");
+    for (const req of beforeAllH) {
+      result.push(makeHook(req, collectionVars, "beforeAll", f.id, [...ancestorIds], []));
+    }
+    ancestorWrappers.push({
+      scopeId: f.id,
+      ancestors: [...ancestorIds],
+      scopePath: [],
+      // ancestor hooks render with no folder heading
+      before: beforeH,
+      after: afterH
+    });
+    ancestorIds.push(f.id);
+  }
+  result.push(...buildFolderPlan(
+    targetFolder,
+    collection.requests,
+    collectionVars,
+    filterTags,
+    targetFolder.id,
+    ancestorIds,
+    [],
+    ancestorWrappers,
+    true
+  ));
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    const f = ancestors[i];
+    const reqs = f.requestIds.map((id) => collection.requests[id]).filter((r) => r && !r.disabled);
+    const afterAllH = reqs.filter((r) => r.hookType === "afterAll");
+    const myAncestors = ancestorIds.slice(0, i);
+    for (const req of afterAllH) {
+      result.push(makeHook(req, collectionVars, "afterAll", f.id, myAncestors, []));
+    }
+  }
+  return tag(result);
 }
 function expandRunPlanWithData(items, ds) {
   if (!ds || ds.rows.length === 0) return items;