@vitest/browser 2.0.0-beta.12 → 2.0.0-beta.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/context.d.ts +21 -5
  2. package/dist/client/.vite/manifest.json +6 -6
  3. package/dist/client/__vitest__/assets/index-C-LD6Fid.js +52 -0
  4. package/dist/client/__vitest__/assets/{index-goqgbqVs.css → index-DEM1IsBG.css} +1 -1
  5. package/dist/client/__vitest__/index.html +2 -2
  6. package/dist/client/__vitest_browser__/{client-Dz5Ebwug.js → client-dLyjuL0K.js} +10 -72
  7. package/dist/client/__vitest_browser__/{orchestrator-DJ6H4qlM.js → orchestrator-x0A1t8rC.js} +6 -8
  8. package/dist/client/__vitest_browser__/{tester-DHXll_4H.js → tester-BdcP5piS.js} +272 -366
  9. package/dist/client/orchestrator.html +2 -2
  10. package/dist/client/tester/tester.html +2 -2
  11. package/dist/context.js +78 -50
  12. package/dist/index.d.ts +8 -1
  13. package/dist/index.js +144 -63
  14. package/dist/providers.js +2 -2
  15. package/dist/{webdriver-CJA71Bgl.js → webdriver-BdVqnfdE.js} +26 -4
  16. package/package.json +11 -11
  17. package/dist/client/__vitest__/assets/index-BcWipdNi.js +0 -52
package/dist/client/orchestrator.html CHANGED
@@ -25,8 +25,8 @@
25
25
  </style>
26
26
  <script>{__VITEST_INJECTOR__}</script>
27
27
  {__VITEST_SCRIPTS__}
28
- <script type="module" crossorigin src="/__vitest_browser__/orchestrator-DJ6H4qlM.js"></script>
29
- <link rel="modulepreload" crossorigin href="/__vitest_browser__/client-Dz5Ebwug.js">
28
+ <script type="module" crossorigin src="/__vitest_browser__/orchestrator-x0A1t8rC.js"></script>
29
+ <link rel="modulepreload" crossorigin href="/__vitest_browser__/client-dLyjuL0K.js">
30
30
  </head>
31
31
  <body>
32
32
  <div id="vitest-tester"></div>
package/dist/client/tester/tester.html CHANGED
@@ -19,8 +19,8 @@
19
19
  <script>{__VITEST_INJECTOR__}</script>
20
20
  <script>{__VITEST_STATE__}</script>
21
21
  {__VITEST_SCRIPTS__}
22
- <script type="module" crossorigin src="/__vitest_browser__/tester-DHXll_4H.js"></script>
23
- <link rel="modulepreload" crossorigin href="/__vitest_browser__/client-Dz5Ebwug.js">
22
+ <script type="module" crossorigin src="/__vitest_browser__/tester-BdcP5piS.js"></script>
23
+ <link rel="modulepreload" crossorigin href="/__vitest_browser__/client-dLyjuL0K.js">
24
24
  </head>
25
25
  <body
26
26
  data-vitest-body
package/dist/context.js CHANGED
@@ -1,31 +1,3 @@
1
- function convertElementToXPath(element) {
2
- if (!element || !(element instanceof Element)) {
3
- throw new Error(
4
- `Expected DOM element to be an instance of Element, received ${typeof element}`
5
- );
6
- }
7
- return getPathTo(element);
8
- }
9
- function getPathTo(element) {
10
- if (element.id !== "") {
11
- return `id("${element.id}")`;
12
- }
13
- if (!element.parentNode || element === document.documentElement) {
14
- return element.tagName;
15
- }
16
- let ix = 0;
17
- const siblings = element.parentNode.childNodes;
18
- for (let i = 0; i < siblings.length; i++) {
19
- const sibling = siblings[i];
20
- if (sibling === element) {
21
- return `${getPathTo(element.parentNode)}/${element.tagName}[${ix + 1}]`;
22
- }
23
- if (sibling.nodeType === 1 && sibling.tagName === element.tagName) {
24
- ix++;
25
- }
26
- }
27
- return "invalid xpath";
28
- }
29
1
  const state = () => __vitest_worker__;
30
2
  const runner = () => __vitest_browser_runner__;
31
3
  function filepath() {
@@ -38,30 +10,86 @@ function triggerCommand(command, ...args) {
38
10
  return rpc().triggerCommand(contextId, command, filepath(), args);
39
11
  }
40
12
  const provider = runner().provider;
13
+ function convertElementToCssSelector(element) {
14
+ if (!element || !(element instanceof Element)) {
15
+ throw new Error(
16
+ `Expected DOM element to be an instance of Element, received ${typeof element}`
17
+ );
18
+ }
19
+ return getUniqueCssSelector(element);
20
+ }
21
+ function getUniqueCssSelector(el) {
22
+ const path = [];
23
+ let parent;
24
+ let hasShadowRoot = false;
25
+ while (parent = getParent(el)) {
26
+ if (parent.shadowRoot) {
27
+ hasShadowRoot = true;
28
+ }
29
+ const tag = el.tagName;
30
+ if (el.id) {
31
+ path.push(`#${el.id}`);
32
+ } else if (!el.nextElementSibling && !el.previousElementSibling) {
33
+ path.push(tag);
34
+ } else {
35
+ let index = 0;
36
+ let sameTagSiblings = 0;
37
+ let elementIndex = 0;
38
+ for (const sibling of parent.children) {
39
+ index++;
40
+ if (sibling.tagName === tag) {
41
+ sameTagSiblings++;
42
+ }
43
+ if (sibling === el) {
44
+ elementIndex = index;
45
+ }
46
+ }
47
+ if (sameTagSiblings > 1) {
48
+ path.push(`${tag}:nth-child(${elementIndex})`);
49
+ } else {
50
+ path.push(tag);
51
+ }
52
+ }
53
+ el = parent;
54
+ }
55
+ return `${provider === "webdriverio" && hasShadowRoot ? ">>>" : ""}${path.reverse().join(" > ")}`.toLowerCase();
56
+ }
57
+ function getParent(el) {
58
+ const parent = el.parentNode;
59
+ if (parent instanceof ShadowRoot) {
60
+ return parent.host;
61
+ }
62
+ return parent;
63
+ }
41
64
  const userEvent = {
42
65
  // TODO: actually setup userEvent with config options
43
66
  setup() {
44
67
  return userEvent;
45
68
  },
46
69
  click(element, options = {}) {
47
- const xpath = convertElementToXPath(element);
48
- return triggerCommand("__vitest_click", xpath, options);
70
+ const css = convertElementToCssSelector(element);
71
+ return triggerCommand("__vitest_click", css, options);
49
72
  },
50
73
  dblClick(element, options = {}) {
51
- const xpath = convertElementToXPath(element);
52
- return triggerCommand("__vitest_dblClick", xpath, options);
74
+ const css = convertElementToCssSelector(element);
75
+ return triggerCommand("__vitest_dblClick", css, options);
76
+ },
77
+ tripleClick(element, options = {}) {
78
+ const css = convertElementToCssSelector(element);
79
+ return triggerCommand("__vitest_tripleClick", css, options);
53
80
  },
54
81
  selectOptions(element, value) {
55
82
  const values = provider === "webdriverio" ? getWebdriverioSelectOptions(element, value) : getSimpleSelectOptions(element, value);
56
- return triggerCommand("__vitest_selectOptions", convertElementToXPath(element), values);
83
+ const css = convertElementToCssSelector(element);
84
+ return triggerCommand("__vitest_selectOptions", css, values);
57
85
  },
58
86
  type(element, text, options = {}) {
59
- const xpath = convertElementToXPath(element);
60
- return triggerCommand("__vitest_type", xpath, text, options);
87
+ const css = convertElementToCssSelector(element);
88
+ return triggerCommand("__vitest_type", css, text, options);
61
89
  },
62
90
  clear(element) {
63
- const xpath = convertElementToXPath(element);
64
- return triggerCommand("__vitest_clear", xpath);
91
+ const css = convertElementToCssSelector(element);
92
+ return triggerCommand("__vitest_clear", css);
65
93
  },
66
94
  tab(options = {}) {
67
95
  return triggerCommand("__vitest_tab", options);
@@ -70,22 +98,22 @@ const userEvent = {
70
98
  return triggerCommand("__vitest_keyboard", text);
71
99
  },
72
100
  hover(element) {
73
- const xpath = convertElementToXPath(element);
74
- return triggerCommand("__vitest_hover", xpath);
101
+ const css = convertElementToCssSelector(element);
102
+ return triggerCommand("__vitest_hover", css);
75
103
  },
76
104
  unhover(element) {
77
- const xpath = convertElementToXPath(element.ownerDocument.body);
78
- return triggerCommand("__vitest_hover", xpath);
105
+ const css = convertElementToCssSelector(element.ownerDocument.body);
106
+ return triggerCommand("__vitest_hover", css);
79
107
  },
80
108
  // non userEvent events, but still useful
81
109
  fill(element, text, options) {
82
- const xpath = convertElementToXPath(element);
83
- return triggerCommand("__vitest_fill", xpath, text, options);
110
+ const css = convertElementToCssSelector(element);
111
+ return triggerCommand("__vitest_fill", css, text, options);
84
112
  },
85
113
  dragAndDrop(source, target, options = {}) {
86
- const sourceXpath = convertElementToXPath(source);
87
- const targetXpath = convertElementToXPath(target);
88
- return triggerCommand("__vitest_dragAndDrop", sourceXpath, targetXpath, options);
114
+ const sourceCss = convertElementToCssSelector(source);
115
+ const targetCss = convertElementToCssSelector(target);
116
+ return triggerCommand("__vitest_dragAndDrop", sourceCss, targetCss, options);
89
117
  }
90
118
  };
91
119
  function getWebdriverioSelectOptions(element, value) {
@@ -101,7 +129,7 @@ function getWebdriverioSelectOptions(element, value) {
101
129
  if (typeof optionValue !== "string") {
102
130
  const index = options.indexOf(optionValue);
103
131
  if (index === -1) {
104
- throw new Error(`The element ${convertElementToXPath(optionValue)} was not found in the "select" options.`);
132
+ throw new Error(`The element ${convertElementToCssSelector(optionValue)} was not found in the "select" options.`);
105
133
  }
106
134
  return [{ index }];
107
135
  }
@@ -120,7 +148,7 @@ function getWebdriverioSelectOptions(element, value) {
120
148
  function getSimpleSelectOptions(element, value) {
121
149
  return (Array.isArray(value) ? value : [value]).map((v) => {
122
150
  if (typeof v !== "string") {
123
- return { element: convertElementToXPath(v) };
151
+ return { element: convertElementToCssSelector(v) };
124
152
  }
125
153
  return v;
126
154
  });
@@ -164,10 +192,10 @@ const page = {
164
192
  const number = screenshotIds[repeatCount]?.[taskName] ?? 1;
165
193
  screenshotIds[repeatCount] ??= {};
166
194
  screenshotIds[repeatCount][taskName] = number + 1;
167
- const name = options.path || `${taskName.replace(/[^a-z0-9]/g, "-")}-${number}.png`;
195
+ const name = options.path || `${taskName.replace(/[^a-z0-9]/gi, "-")}-${number}.png`;
168
196
  return triggerCommand("__vitest_screenshot", name, {
169
197
  ...options,
170
- element: options.element ? convertElementToXPath(options.element) : void 0
198
+ element: options.element ? convertElementToCssSelector(options.element) : void 0
171
199
  });
172
200
  }
173
201
  };
package/dist/index.d.ts CHANGED
@@ -1,6 +1,9 @@
1
1
  import { CDPSession, BrowserServerState as BrowserServerState$1, BrowserServerStateContext, BrowserServer as BrowserServer$1, WorkspaceProject, Vite, BrowserProvider, BrowserScript, Vitest, ProcessPool } from 'vitest/node';
2
2
  import { Plugin } from 'vitest/config';
3
+ import * as vitest from 'vitest';
3
4
  import { File, TaskResultPack, AfterSuiteRunMeta, CancelReason, UserConsoleLog, SnapshotResult, ResolvedConfig } from 'vitest';
5
+ import { ErrorWithDiff } from '@vitest/utils';
6
+ import { StackTraceParserOptions } from '@vitest/utils/source-map';
4
7
 
5
8
  type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never;
6
9
  type ReturnType<T> = T extends (...args: any) => infer R ? R : never;
@@ -41,6 +44,7 @@ interface WebSocketBrowserHandlers {
41
44
  type: 'factory' | 'redirect' | 'automock';
42
45
  mockPath?: string | null;
43
46
  resolvedId: string;
47
+ needsInterop?: boolean;
44
48
  }>;
45
49
  invalidate: (ids: string[]) => void;
46
50
  getBrowserFileSourceMap: (id: string) => SourceMap | null | {
@@ -84,7 +88,7 @@ declare class BrowserServerState implements BrowserServerState$1 {
84
88
  readonly cdps: Map<string, BrowserServerCDPHandler>;
85
89
  private contexts;
86
90
  getContext(contextId: string): BrowserServerStateContext | undefined;
87
- createAsyncContext(contextId: string, files: string[]): Promise<void>;
91
+ createAsyncContext(method: 'run' | 'collect', contextId: string, files: string[]): Promise<void>;
88
92
  removeCDPHandler(sessionId: string): Promise<void>;
89
93
  }
90
94
 
@@ -103,6 +107,7 @@ declare class BrowserServer implements BrowserServer$1 {
103
107
  state: BrowserServerState;
104
108
  provider: BrowserProvider;
105
109
  vite: Vite.ViteDevServer;
110
+ private stackTraceOptions;
106
111
  constructor(project: WorkspaceProject, base: string);
107
112
  setServer(server: Vite.ViteDevServer): void;
108
113
  getSerializableConfig(): ResolvedConfig;
@@ -112,6 +117,8 @@ declare class BrowserServer implements BrowserServer$1 {
112
117
  };
113
118
  formatScripts(scripts: BrowserScript[] | undefined): Promise<string>;
114
119
  initBrowserProvider(): Promise<void>;
120
+ parseErrorStacktrace(e: ErrorWithDiff, options?: StackTraceParserOptions): vitest.ParsedStack[];
121
+ parseStacktrace(trace: string, options?: StackTraceParserOptions): vitest.ParsedStack[];
115
122
  private cdpSessions;
116
123
  ensureCDPHandler(contextId: string, sessionId: string): Promise<BrowserServerCDPHandler>;
117
124
  close(): Promise<void>;