@playwright/test 1.37.0-alpha-aug-8-2023 → 1.37.0-alpha-aug-9-2023

package/lib/common/config.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultTimeout = exports.defaultReporter = exports.defaultGrep = exports.builtInReporters = exports.FullProjectInternal = exports.FullConfigInternal = void 0;
+exports.getProjectId = getProjectId;
 exports.takeFirst = takeFirst;
 exports.toReporters = toReporters;
 var _fs = _interopRequireDefault(require("fs"));
@@ -135,6 +136,7 @@ class FullConfigInternal {
         const candidate = name + (i ? i : '');
         if (usedNames.has(candidate)) continue;
         p.id = candidate;
+        p.project.__projectId = p.id;
         usedNames.add(candidate);
         break;
       }
@@ -143,9 +145,6 @@ class FullConfigInternal {
 }
 exports.FullConfigInternal = FullConfigInternal;
 class FullProjectInternal {
-  static from(config) {
-    return config[projectInternalSymbol];
-  }
   constructor(configDir, config, fullConfig, projectConfig, configCLIOverrides, throwawayArtifactsPath) {
     this.project = void 0;
     this.fullConfig = void 0;
@@ -179,7 +178,6 @@ class FullProjectInternal {
       dependencies: projectConfig.dependencies || [],
       teardown: projectConfig.teardown
     };
-    this.project[projectInternalSymbol] = this;
     this.fullyParallel = takeFirst(configCLIOverrides.fullyParallel, projectConfig.fullyParallel, config.fullyParallel, undefined);
     this.expect = takeFirst(projectConfig.expect, config.expect, {});
     this.respectGitIgnore = !projectConfig.testDir && !config.testDir;
@@ -252,4 +250,6 @@ exports.defaultGrep = defaultGrep;
 const defaultReporter = process.env.CI ? 'dot' : 'list';
 exports.defaultReporter = defaultReporter;
 const configInternalSymbol = Symbol('configInternalSymbol');
-const projectInternalSymbol = Symbol('projectInternalSymbol');
+function getProjectId(project) {
+  return project.__projectId;
+}

package/lib/isomorphic/teleReceiver.js

@@ -97,7 +97,7 @@ class TeleReporterReceiver {
     this._reporter.onConfigure(this._config);
   }
   _onProject(project) {
-    let projectSuite = this._rootSuite.suites.find(suite => suite.project().id === project.id);
+    let projectSuite = this._rootSuite.suites.find(suite => suite.project().__projectId === project.id);
     if (!projectSuite) {
       projectSuite = new TeleSuite(project.name, 'project');
       this._rootSuite.suites.push(projectSuite);
@@ -219,7 +219,7 @@ class TeleReporterReceiver {
   }
   _parseProject(project) {
     return {
-      id: project.id,
+      __projectId: project.id,
       metadata: project.metadata,
       name: project.name,
       outputDir: this._absolutePath(project.outputDir),

package/lib/reporters/blob.js

@@ -46,6 +46,7 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     var _config$shard;
     const metadata = {
       version: currentBlobReportVersion,
+      userAgent: (0, _utils.getUserAgent)(),
       name: process.env.PWTEST_BLOB_REPORT_NAME,
       shard: (_config$shard = config.shard) !== null && _config$shard !== void 0 ? _config$shard : undefined
     };

package/lib/reporters/json.js

@@ -67,7 +67,7 @@ class JSONReporter extends _empty.default {
             repeatEach: project.repeatEach,
             retries: project.retries,
             metadata: project.metadata,
-            id: _config.FullProjectInternal.from(project).id,
+            id: (0, _config.getProjectId)(project),
             name: project.name,
             testDir: toPosixPath(project.testDir),
             testIgnore: serializePatterns(project.testIgnore),
@@ -83,7 +83,7 @@ class JSONReporter extends _empty.default {
   _mergeSuites(suites) {
     const fileSuites = new _utils.MultiMap();
     for (const projectSuite of suites) {
-      const projectId = _config.FullProjectInternal.from(projectSuite.project()).id;
+      const projectId = (0, _config.getProjectId)(projectSuite.project());
       const projectName = projectSuite.project().name;
       for (const fileSuite of projectSuite.suites) {
         const file = fileSuite.location.file;

package/lib/reporters/merge.js

@@ -34,6 +34,7 @@ async function createMergedReport(config, dir, reporterDescriptions) {
   const reporters = await (0, _reporters.createReporters)(config, 'merge', reporterDescriptions);
   const multiplexer = new _multiplexer.Multiplexer(reporters);
   const receiver = new _teleReceiver.TeleReporterReceiver(_path.default.sep, multiplexer, false, config.config);
+  const stringPool = new _stringInternPool.StringInternPool();
   let printStatus = () => {};
   if (!multiplexer.printsToStdio()) {
     printStatus = printStatusToStdout;
@@ -41,14 +42,28 @@ async function createMergedReport(config, dir, reporterDescriptions) {
   }
   const shardFiles = await sortedShardFiles(dir);
   if (shardFiles.length === 0) throw new Error(`No report files found in ${dir}`);
-  const events = await mergeEvents(dir, shardFiles, printStatus);
-  patchAttachmentPaths(events, dir);
-  printStatus(`processing ${events.length} test events`);
-  for (const event of events) {
-    if (event.method === 'onEnd') printStatus(`building final report`);
-    await receiver.dispatch(event);
-    if (event.method === 'onEnd') printStatus(`finished building report`);
+  const eventData = await mergeEvents(dir, shardFiles, stringPool, printStatus);
+  printStatus(`processing test events`);
+  const dispatchEvents = async events => {
+    for (const event of events) {
+      if (event.method === 'onEnd') printStatus(`building final report`);
+      await receiver.dispatch(event);
+      if (event.method === 'onEnd') printStatus(`finished building report`);
+    }
+  };
+  await dispatchEvents(eventData.prologue);
+  for (const {
+    reportFile,
+    idsPatcher
+  } of eventData.reports) {
+    const reportJsonl = await _fs.default.promises.readFile(reportFile);
+    const events = parseTestEvents(reportJsonl);
+    new _stringInternPool.JsonStringInternalizer(stringPool).traverse(events);
+    idsPatcher.patchEvents(events);
+    patchAttachmentPaths(events, dir);
+    await dispatchEvents(events);
   }
+  await dispatchEvents(eventData.epilogue);
 }
 function patchAttachmentPaths(events, resourceDir) {
   for (const event of events) {
@@ -59,37 +74,43 @@ function patchAttachmentPaths(events, resourceDir) {
     }
   }
 }
-function parseEvents(reportJsonl) {
-  return reportJsonl.toString().split('\n').filter(line => line.length).map(line => JSON.parse(line));
+const commonEventNames = ['onBlobReportMetadata', 'onConfigure', 'onProject', 'onBegin', 'onEnd'];
+const commonEvents = new Set(commonEventNames);
+const commonEventRegex = new RegExp(`${commonEventNames.join('|')}`);
+function parseCommonEvents(reportJsonl) {
+  return reportJsonl.toString().split('\n').filter(line => commonEventRegex.test(line)) // quick filter
+  .map(line => JSON.parse(line)).filter(event => commonEvents.has(event.method));
+}
+function parseTestEvents(reportJsonl) {
+  return reportJsonl.toString().split('\n').filter(line => line.length).map(line => JSON.parse(line)).filter(event => !commonEvents.has(event.method));
 }
-async function extractAndParseReports(dir, shardFiles, stringPool, printStatus) {
+async function extractAndParseReports(dir, shardFiles, internalizer, printStatus) {
   const shardEvents = [];
   await _fs.default.promises.mkdir(_path.default.join(dir, 'resources'), {
     recursive: true
   });
-  const internalizer = new _stringInternPool.JsonStringInternalizer(stringPool);
   for (const file of shardFiles) {
     const absolutePath = _path.default.join(dir, file);
     printStatus(`extracting: ${(0, _util.relativeFilePath)(absolutePath)}`);
     const zipFile = new _utils.ZipFile(absolutePath);
     const entryNames = await zipFile.entries();
     for (const entryName of entryNames.sort()) {
+      const fileName = _path.default.join(dir, entryName);
       const content = await zipFile.read(entryName);
       if (entryName.endsWith('.jsonl')) {
-        const parsedEvents = parseEvents(content);
+        const parsedEvents = parseCommonEvents(content);
         // Passing reviver to JSON.parse doesn't work, as the original strings
         // keep beeing used. To work around that we traverse the parsed events
         // as a post-processing step.
         internalizer.traverse(parsedEvents);
         shardEvents.push({
           file,
+          localPath: fileName,
           metadata: findMetadata(parsedEvents, file),
           parsedEvents
         });
-      } else {
-        const fileName = _path.default.join(dir, entryName);
-        await _fs.default.promises.writeFile(fileName, content);
       }
+      await _fs.default.promises.writeFile(fileName, content);
     }
     zipFile.close();
   }
@@ -102,13 +123,12 @@ function findMetadata(events, file) {
   if (metadata.version > _blob.currentBlobReportVersion) throw new Error(`Blob report ${file} was created with a newer version of Playwright.`);
   return metadata;
 }
-async function mergeEvents(dir, shardReportFiles, printStatus) {
-  const stringPool = new _stringInternPool.StringInternPool();
-  const events = [];
+async function mergeEvents(dir, shardReportFiles, stringPool, printStatus) {
+  const internalizer = new _stringInternPool.JsonStringInternalizer(stringPool);
   const configureEvents = [];
   const projectEvents = [];
   const endEvents = [];
-  const blobs = await extractAndParseReports(dir, shardReportFiles, stringPool, printStatus);
+  const blobs = await extractAndParseReports(dir, shardReportFiles, internalizer, printStatus);
   // Sort by (report name; shard; file name), so that salt generation below is deterministic when:
   // - report names are unique;
   // - report names are missing;
@@ -125,28 +145,41 @@ async function mergeEvents(dir, shardReportFiles, printStatus) {
   });
   const saltSet = new Set();
   printStatus(`merging events`);
+  const reports = [];
   for (const {
     file,
     parsedEvents,
-    metadata
+    metadata,
+    localPath
   } of blobs) {
     // Generate unique salt for each blob.
     const sha1 = (0, _utils.calculateSha1)(metadata.name || _path.default.basename(file)).substring(0, 16);
     let salt = sha1;
     for (let i = 0; saltSet.has(salt); i++) salt = sha1 + '-' + i;
     saltSet.add(salt);
-    new IdsPatcher(stringPool, metadata.name, salt).patchEvents(parsedEvents);
+    const idsPatcher = new IdsPatcher(stringPool, metadata.name, salt);
+    idsPatcher.patchEvents(parsedEvents);
     for (const event of parsedEvents) {
-      if (event.method === 'onConfigure') configureEvents.push(event);else if (event.method === 'onProject') projectEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);else if (event.method !== 'onBlobReportMetadata' && event.method !== 'onBegin') events.push(event);
+      if (event.method === 'onConfigure') configureEvents.push(event);else if (event.method === 'onProject') projectEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);
     }
+
+    // Save information about the reports to stream their test events later.
+    reports.push({
+      idsPatcher,
+      reportFile: localPath
+    });
   }
-  return [mergeConfigureEvents(configureEvents), ...projectEvents, {
-    method: 'onBegin',
-    params: undefined
-  }, ...events, mergeEndEvents(endEvents), {
-    method: 'onExit',
-    params: undefined
-  }];
+  return {
+    prologue: [mergeConfigureEvents(configureEvents), ...projectEvents, {
+      method: 'onBegin',
+      params: undefined
+    }],
+    reports,
+    epilogue: [mergeEndEvents(endEvents), {
+      method: 'onExit',
+      params: undefined
+    }]
+  };
 }
 function mergeConfigureEvents(configureEvents) {
   if (!configureEvents.length) throw new Error('No configure events found');

package/lib/reporters/teleEmitter.js

@@ -160,7 +160,7 @@ class TeleReporterEmitter {
   _serializeProject(suite) {
     const project = suite.project();
     const report = {
-      id: _config.FullProjectInternal.from(project).id,
+      id: (0, _config.getProjectId)(project),
       metadata: project.metadata,
       name: project.name,
       outputDir: this._relativePath(project.outputDir),

package/lib/transform/compilationCache.js

@@ -19,6 +19,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _utilsBundle = require("../utilsBundle");
+var _utils = require("playwright-core/lib/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -95,8 +96,8 @@ function getFromCompilationCache(filename, hash, moduleUrl) {
       _fs.default.mkdirSync(_path.default.dirname(cachePath), {
         recursive: true
       });
-      if (map) _fs.default.writeFileSync(sourceMapPath, JSON.stringify(map), 'utf8');
-      _fs.default.writeFileSync(codePath, code, 'utf8');
+      if (map) (0, _utils.writeFileSyncAtomic)(sourceMapPath, JSON.stringify(map), 'utf8');
+      (0, _utils.writeFileSyncAtomic)(codePath, code, 'utf8');
       _innerAddToCompilationCache(filename, {
         codePath,
         sourceMapPath,

package/lib/transform/transform.js

@@ -144,7 +144,7 @@ function transformHook(originalCode, filename, moduleUrl) {
     cachedCode,
     addToCache
   } = (0, _compilationCache.getFromCompilationCache)(filename, hash, moduleUrl);
-  if (cachedCode) return cachedCode;
+  if (cachedCode !== undefined) return cachedCode;
 
   // We don't use any browserslist data, but babel checks it anyway.
   // Silence the annoying warning.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.37.0-alpha-aug-8-2023",
+  "version": "1.37.0-alpha-aug-9-2023",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
@@ -41,7 +41,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.37.0-alpha-aug-8-2023"
+    "playwright-core": "1.37.0-alpha-aug-9-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"