vitest 3.0.0-beta.3 → 3.0.0

package/dist/chunks/{RandomSequencer.C6x84bNN.js → typechecker.BJMkWMXo.js}

@@ -1,10 +1,11 @@
 import { isCI } from 'std-env';
 import { writeFile, rm } from 'node:fs/promises';
 import { performance } from 'node:perf_hooks';
-import { generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks } from '@vitest/runner/utils';
-import { TraceMap, generatedPositionFor } from '@vitest/utils/source-map';
+import { TraceMap, generatedPositionFor, eachMapping } from '@vitest/utils/source-map';
 import { relative, basename, dirname, resolve, join, extname } from 'pathe';
 import { x as x$1 } from 'tinyexec';
+import { getTests, generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes } from '@vitest/runner/utils';
+import '@vitest/utils';
 import { parseAstAsync } from 'vite';
 import nodeos__default from 'node:os';
 import url from 'node:url';
@@ -12,11 +13,37 @@ import a$1 from 'node:path';
 import fs from 'node:fs';
 import Te from 'node:module';
 import require$$0 from 'fs';
-import { shuffle } from '@vitest/utils';
-import { slash } from 'vite-node/utils';
-import crypto from 'node:crypto';
 
-const hash = crypto.hash ?? ((algorithm, data, outputEncoding) => crypto.createHash(algorithm).update(data).digest(outputEncoding));
+function hasFailedSnapshot(suite) {
+  return getTests(suite).some((s) => {
+    return s.result?.errors?.some(
+      (e) => typeof e?.message === "string" && e.message.match(/Snapshot .* mismatched/)
+    );
+  });
+}
+function convertTasksToEvents(file, onTask) {
+  const packs = [];
+  const events = [];
+  function visit(suite) {
+    onTask?.(suite);
+    packs.push([suite.id, suite.result, suite.meta]);
+    events.push([suite.id, "suite-prepare"]);
+    suite.tasks.forEach((task) => {
+      if (task.type === "suite") {
+        visit(task);
+      } else {
+        onTask?.(task);
+        packs.push([task.id, task.result, task.meta]);
+        if (task.mode !== "skip" && task.mode !== "todo") {
+          events.push([task.id, "test-prepare"], [task.id, "test-finished"]);
+        }
+      }
+    });
+    events.push([suite.id, "suite-finished"]);
+  }
+  visit(file);
+  return { packs, events };
+}
 
 const isNode = typeof process < "u" && typeof process.stdout < "u" && !process.versions?.deno && !globalThis.window;
 const isDeno = typeof process < "u" && typeof process.stdout < "u" && process.versions?.deno !== void 0;
@@ -363,17 +390,13 @@ async function collectTests(ctx, filepath) {
       return getName(callee.tag);
     }
     if (callee.type === "MemberExpression") {
-      const object = callee.object;
-      if (object?.name?.startsWith("__vite_ssr_")) {
-        return getName(callee.property);
+      if (callee.object?.type === "Identifier" && ["it", "test", "describe", "suite"].includes(callee.object.name)) {
+        return callee.object?.name;
       }
-      return getName(object?.property);
-    }
-    if (callee.type === "SequenceExpression" && callee.expressions.length === 2) {
-      const [e0, e1] = callee.expressions;
-      if (e0.type === "Literal" && e0.value === 0) {
-        return getName(e1);
+      if (callee.object?.name?.startsWith("__vite_ssr_")) {
+        return getName(callee.property);
       }
+      return getName(callee.object?.property);
     }
     return null;
   };
@@ -388,8 +411,8 @@ async function collectTests(ctx, filepath) {
         return;
       }
       const property = callee?.property?.name;
-      const mode = !property || property === name ? "run" : property;
-      if (mode === "each" || mode === "skipIf" || mode === "runIf" || mode === "for") {
+      let mode = !property || property === name ? "run" : property;
+      if (["each", "for", "skipIf", "runIf"].includes(mode)) {
         return;
       }
       let start;
@@ -404,10 +427,11 @@ async function collectTests(ctx, filepath) {
       const {
         arguments: [messageNode]
       } = node;
-      if (!messageNode) {
-        return;
+      const isQuoted = messageNode?.type === "Literal" || messageNode?.type === "TemplateLiteral";
+      const message = isQuoted ? request.code.slice(messageNode.start + 1, messageNode.end - 1) : request.code.slice(messageNode.start, messageNode.end);
+      if (mode === "skipIf" || mode === "runIf") {
+        mode = "skip";
       }
-      const message = getNodeAsString(messageNode, request.code);
       definitions.push({
         start,
         end,
@@ -487,35 +511,6 @@ async function collectTests(ctx, filepath) {
     definitions
   };
 }
-function getNodeAsString(node, code) {
-  if (node.type === "Literal") {
-    return String(node.value);
-  } else if (node.type === "Identifier") {
-    return node.name;
-  } else if (node.type === "TemplateLiteral") {
-    return mergeTemplateLiteral(node, code);
-  } else {
-    return code.slice(node.start, node.end);
-  }
-}
-function mergeTemplateLiteral(node, code) {
-  let result = "";
-  let expressionsIndex = 0;
-  for (let quasisIndex = 0; quasisIndex < node.quasis.length; quasisIndex++) {
-    result += node.quasis[quasisIndex].value.raw;
-    if (expressionsIndex in node.expressions) {
-      const expression = node.expressions[expressionsIndex];
-      const string = expression.type === "Literal" ? expression.raw : getNodeAsString(expression, code);
-      if (expression.type === "TemplateLiteral") {
-        result += `\${\`${string}\`}`;
-      } else {
-        result += `\${${string}}`;
-      }
-      expressionsIndex++;
-    }
-  }
-  return result;
-}
 
 const A=r=>r!==null&&typeof r=="object",a=(r,t)=>Object.assign(new Error(`[${r}]: ${t}`),{code:r}),_="ERR_INVALID_PACKAGE_CONFIG",E="ERR_INVALID_PACKAGE_TARGET",I$1="ERR_PACKAGE_PATH_NOT_EXPORTED",R$1=/^\d+$/,O=/^(\.{1,2}|node_modules)$/i,w=/\/|\\/;var h$1=(r=>(r.Export="exports",r.Import="imports",r))(h$1||{});const f=(r,t,e,o,c)=>{if(t==null)return [];if(typeof t=="string"){const[n,...i]=t.split(w);if(n===".."||i.some(l=>O.test(l)))throw a(E,`Invalid "${r}" target "${t}" defined in the package config`);return [c?t.replace(/\*/g,c):t]}if(Array.isArray(t))return t.flatMap(n=>f(r,n,e,o,c));if(A(t)){for(const n of Object.keys(t)){if(R$1.test(n))throw a(_,"Cannot contain numeric property keys");if(n==="default"||o.includes(n))return f(r,t[n],e,o,c)}return []}throw a(E,`Invalid "${r}" target "${t}"`)},s="*",m=(r,t)=>{const e=r.indexOf(s),o=t.indexOf(s);return e===o?t.length>r.length:o>e};function d(r,t){if(!t.includes(s)&&r.hasOwnProperty(t))return [t];let e,o;for(const c of Object.keys(r))if(c.includes(s)){const[n,i,l]=c.split(s);if(l===void 0&&t.startsWith(n)&&t.endsWith(i)){const g=t.slice(n.length,-i.length||void 0);g&&(!e||m(e,c))&&(e=c,o=g);}}return [e,o]}const p=r=>Object.keys(r).reduce((t,e)=>{const o=e===""||e[0]!==".";if(t===void 0||t===o)return o;throw a(_,'"exports" cannot contain some keys starting with "." and some not')},void 0),u=/^\w+:/,v=(r,t,e)=>{if(!r)throw new Error('"exports" is required');t=t===""?".":`./${t}`,(typeof r=="string"||Array.isArray(r)||A(r)&&p(r))&&(r={".":r});const[o,c]=d(r,t),n=f(h$1.Export,r[o],t,e,c);if(n.length===0)throw a(I$1,t==="."?'No "exports" main defined':`Package subpath '${t}' is not defined by "exports"`);for(const i of n)if(!i.startsWith("./")&&!u.test(i))throw a(E,`Invalid "exports" target "${i}" defined in the package config`);return n};
 
@@ -573,9 +568,12 @@ async function getTsconfig(root, config) {
   if (!tsconfig) {
     throw new Error("no tsconfig.json found");
   }
+  const tsconfigName = basename(tsconfig.path, ".json");
+  const tempTsConfigName = `${tsconfigName}.vitest-temp.json`;
+  const tempTsbuildinfoName = `${tsconfigName}.tmp.tsbuildinfo`;
   const tempConfigPath = join(
     dirname(tsconfig.path),
-    "tsconfig.vitest-temp.json"
+    tempTsConfigName
   );
   try {
     const tmpTsConfig = { ...tsconfig.config };
@@ -584,13 +582,13 @@ async function getTsconfig(root, config) {
     tmpTsConfig.compilerOptions.incremental = true;
     tmpTsConfig.compilerOptions.tsBuildInfoFile = join(
       process.versions.pnp ? join(nodeos__default.tmpdir(), "vitest") : __dirname,
-      "tsconfig.tmp.tsbuildinfo"
+      tempTsbuildinfoName
     );
     const tsconfigFinalContent = JSON.stringify(tmpTsConfig, null, 2);
     await writeFile(tempConfigPath, tsconfigFinalContent);
     return { path: tempConfigPath, config: tmpTsConfig };
   } catch (err) {
-    throw new Error("failed to write tsconfig.temp.json", { cause: err });
+    throw new Error(`failed to write ${tempTsConfigName}`, { cause: err });
   }
 }
 async function getRawErrsMapFromTsCompile(tscErrorStdout) {
@@ -751,7 +749,7 @@ class Typechecker {
         }
       };
       errors.forEach(({ error, originalError }) => {
-        const processedPos = traceMap ? generatedPositionFor(traceMap, {
+        const processedPos = traceMap ? findGeneratedPosition(traceMap, {
           line: originalError.line,
           column: originalError.column,
           source: basename(path)
@@ -918,64 +916,42 @@ class Typechecker {
   getTestFiles() {
     return Object.values(this._tests || {}).map((i) => i.file);
   }
-  getTestPacks() {
-    return Object.values(this._tests || {}).map(({ file }) => getTasks(file)).flat().map((i) => [i.id, i.result, { typecheck: true }]);
+  getTestPacksAndEvents() {
+    const packs = [];
+    const events = [];
+    for (const { file } of Object.values(this._tests || {})) {
+      const result = convertTasksToEvents(file);
+      packs.push(...result.packs);
+      events.push(...result.events);
+    }
+    return { packs, events };
   }
 }
-
-class BaseSequencer {
-  ctx;
-  constructor(ctx) {
-    this.ctx = ctx;
-  }
-  // async so it can be extended by other sequelizers
-  async shard(files) {
-    const { config } = this.ctx;
-    const { index, count } = config.shard;
-    const shardSize = Math.ceil(files.length / count);
-    const shardStart = shardSize * (index - 1);
-    const shardEnd = shardSize * index;
-    return [...files].map((spec) => {
-      const fullPath = resolve(slash(config.root), slash(spec.moduleId));
-      const specPath = fullPath?.slice(config.root.length);
-      return {
-        spec,
-        hash: hash("sha1", specPath, "hex")
-      };
-    }).sort((a, b) => a.hash < b.hash ? -1 : a.hash > b.hash ? 1 : 0).slice(shardStart, shardEnd).map(({ spec }) => spec);
-  }
-  // async so it can be extended by other sequelizers
-  async sort(files) {
-    const cache = this.ctx.cache;
-    return [...files].sort((a, b) => {
-      const keyA = `${a.project.name}:${relative(this.ctx.config.root, a.moduleId)}`;
-      const keyB = `${b.project.name}:${relative(this.ctx.config.root, b.moduleId)}`;
-      const aState = cache.getFileTestResults(keyA);
-      const bState = cache.getFileTestResults(keyB);
-      if (!aState || !bState) {
-        const statsA = cache.getFileStats(keyA);
-        const statsB = cache.getFileStats(keyB);
-        if (!statsA || !statsB) {
-          return !statsA && statsB ? -1 : !statsB && statsA ? 1 : 0;
-        }
-        return statsB.size - statsA.size;
-      }
-      if (aState.failed && !bState.failed) {
-        return -1;
-      }
-      if (!aState.failed && bState.failed) {
-        return 1;
-      }
-      return bState.duration - aState.duration;
-    });
+function findGeneratedPosition(traceMap, { line, column, source }) {
+  const found = generatedPositionFor(traceMap, {
+    line,
+    column,
+    source
+  });
+  if (found.line !== null) {
+    return found;
   }
-}
-
-class RandomSequencer extends BaseSequencer {
-  async sort(files) {
-    const { sequence } = this.ctx.config;
-    return shuffle(files, sequence.seed);
+  const mappings = [];
+  eachMapping(traceMap, (m) => {
+    if (m.source === source && m.originalLine !== null && m.originalColumn !== null && (line === m.originalLine ? column < m.originalColumn : line < m.originalLine)) {
+      mappings.push(m);
+    }
+  });
+  const next = mappings.sort(
+    (a, b) => a.originalLine === b.originalLine ? a.originalColumn - b.originalColumn : a.originalLine - b.originalLine
+  ).at(0);
+  if (next) {
+    return {
+      line: next.generatedLine,
+      column: next.generatedColumn
+    };
   }
+  return { line: null, column: null };
 }
 
-export { BaseSequencer as B, RandomSequencer as R, Typechecker as T, TypeCheckError as a, isTTY as b, getOutputFile as g, hash as h, isWindows as i, wrapSerializableConfig as w };
+export { TypeCheckError as T, Typechecker as a, isWindows as b, convertTasksToEvents as c, getOutputFile as g, hasFailedSnapshot as h, isTTY as i, wrapSerializableConfig as w };

package/dist/chunks/{utils.Coei4Wlj.js → utils.DJWL04yX.js}

@@ -14,7 +14,6 @@ const F_LONG_DASH = "\u23AF";
 const F_TREE_NODE_MIDDLE = "\u251C\u2500\u2500";
 const F_TREE_NODE_END = "\u2514\u2500\u2500";
 
-const spinnerMap = /* @__PURE__ */ new WeakMap();
 const pointer = c.yellow(F_POINTER);
 const skipped = c.dim(c.gray(F_DOWN));
 const benchmarkPass = c.green(F_DOT);
@@ -130,12 +129,6 @@ function getStateSymbol(task) {
     if (task.type === "suite") {
       return pointer;
     }
-    let spinner = spinnerMap.get(task);
-    if (!spinner) {
-      spinner = elegantSpinner();
-      spinnerMap.set(task, spinner);
-    }
-    return c.yellow(spinner());
   }
   if (task.result.state === "pass") {
     return task.meta?.benchmark ? benchmarkPass : testPass;
@@ -145,14 +138,6 @@ function getStateSymbol(task) {
   }
   return " ";
 }
-const spinnerFrames = process.platform === "win32" ? ["-", "\\", "|", "/"] : ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-function elegantSpinner() {
-  let index = 0;
-  return () => {
-    index = ++index % spinnerFrames.length;
-    return spinnerFrames[index];
-  };
-}
 function formatTimeString(date) {
   return date.toTimeString().split(" ")[0];
 }
@@ -179,18 +164,23 @@ function withLabel(color, label, message) {
 function padSummaryTitle(str) {
   return c.dim(`${str.padStart(11)} `);
 }
+function truncateString(text, maxLength) {
+  const plainText = stripVTControlCharacters(text);
+  if (plainText.length <= maxLength) {
+    return text;
+  }
+  return `${plainText.slice(0, maxLength - 1)}\u2026`;
+}
 
 var utils = /*#__PURE__*/Object.freeze({
   __proto__: null,
   benchmarkPass: benchmarkPass,
   countTestErrors: countTestErrors,
   divider: divider,
-  elegantSpinner: elegantSpinner,
   formatProjectName: formatProjectName,
   formatTestPath: formatTestPath,
   formatTime: formatTime,
   formatTimeString: formatTimeString,
-  getCols: getCols,
   getStateString: getStateString,
   getStateSymbol: getStateSymbol,
   padSummaryTitle: padSummaryTitle,
@@ -198,12 +188,11 @@ var utils = /*#__PURE__*/Object.freeze({
   pointer: pointer,
   renderSnapshotSummary: renderSnapshotSummary,
   skipped: skipped,
-  spinnerFrames: spinnerFrames,
-  spinnerMap: spinnerMap,
   suiteFail: suiteFail,
   taskFail: taskFail,
   testPass: testPass,
+  truncateString: truncateString,
   withLabel: withLabel
 });
 
-export { F_POINTER as F, formatTimeString as a, F_RIGHT as b, F_CHECK as c, divider as d, getStateString as e, formatProjectName as f, getStateSymbol as g, formatTime as h, countTestErrors as i, F_TREE_NODE_END as j, F_TREE_NODE_MIDDLE as k, getCols as l, padSummaryTitle as p, renderSnapshotSummary as r, taskFail as t, utils as u, withLabel as w };
+export { F_POINTER as F, formatProjectName as a, taskFail as b, F_RIGHT as c, divider as d, F_CHECK as e, formatTimeString as f, getStateSymbol as g, getStateString as h, formatTime as i, countTestErrors as j, F_TREE_NODE_END as k, F_TREE_NODE_MIDDLE as l, padSummaryTitle as p, renderSnapshotSummary as r, truncateString as t, utils as u, withLabel as w };