@playwright/test 1.37.0-alpha-aug-5-2023 → 1.37.0-alpha-aug-6-2023

package/lib/isomorphic/stringInternPool.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StringInternPool = void 0;
+exports.StringInternPool = exports.JsonStringInternalizer = void 0;
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -33,4 +33,26 @@ class StringInternPool {
     return result;
   }
 }
-exports.StringInternPool = StringInternPool;
+exports.StringInternPool = StringInternPool;
+class JsonStringInternalizer {
+  constructor(pool) {
+    this._pool = void 0;
+    this._pool = pool;
+  }
+  traverse(value) {
+    if (typeof value !== 'object') return;
+    if (Array.isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        if (typeof value[i] === 'string') value[i] = this.intern(value[i]);else this.traverse(value[i]);
+      }
+    } else {
+      for (const name in value) {
+        if (typeof value[name] === 'string') value[name] = this.intern(value[name]);else this.traverse(value[name]);
+      }
+    }
+  }
+  intern(value) {
+    return this._pool.internString(value);
+  }
+}
+exports.JsonStringInternalizer = JsonStringInternalizer;

package/lib/plugins/webServerPlugin.js

@@ -27,9 +27,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const DEFAULT_ENVIRONMENT_VARIABLES = {
-  'BROWSER': 'none' // Disable that create-react-app will open the page in the browser
+  'BROWSER': 'none',
+  // Disable that create-react-app will open the page in the browser
+  'FORCE_COLOR': '1',
+  'DEBUG_COLORS': '1'
 };
-
 const debugWebServer = (0, _utilsBundle.debug)('pw:webserver');
 class WebServerPlugin {
   constructor(options, checkPortOnly) {
@@ -97,11 +99,12 @@ class WebServerPlugin {
     debugWebServer(`Process started`);
     launchedProcess.stderr.on('data', line => {
       var _onStdErr, _ref;
-      if (debugWebServer.enabled || this._options.stderr === 'pipe' || !this._options.stderr) (_onStdErr = (_ref = this._reporter).onStdErr) === null || _onStdErr === void 0 ? void 0 : _onStdErr.call(_ref, '[WebServer] ' + line.toString());
+      if (debugWebServer.enabled || this._options.stderr === 'pipe' || !this._options.stderr) (_onStdErr = (_ref = this._reporter).onStdErr) === null || _onStdErr === void 0 ? void 0 : _onStdErr.call(_ref, _utilsBundle.colors.dim('[WebServer] ') + line.toString());
     });
     launchedProcess.stdout.on('data', line => {
       var _onStdOut, _ref2;
-      if (debugWebServer.enabled || this._options.stdout === 'pipe') (_onStdOut = (_ref2 = this._reporter).onStdOut) === null || _onStdOut === void 0 ? void 0 : _onStdOut.call(_ref2, '[WebServer] ' + line.toString());
+      process.stdout.write(line);
+      if (debugWebServer.enabled || this._options.stdout === 'pipe') (_onStdOut = (_ref2 = this._reporter).onStdOut) === null || _onStdOut === void 0 ? void 0 : _onStdOut.call(_ref2, _utilsBundle.colors.dim('[WebServer] ') + line.toString());
     });
   }
   async _waitForProcess() {

package/lib/reporters/merge.js

@@ -62,11 +62,12 @@ function patchAttachmentPaths(events, resourceDir) {
 function parseEvents(reportJsonl) {
   return reportJsonl.toString().split('\n').filter(line => line.length).map(line => JSON.parse(line));
 }
-async function extractAndParseReports(dir, shardFiles, printStatus) {
+async function extractAndParseReports(dir, shardFiles, stringPool, 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)}`);
@@ -76,6 +77,10 @@ async function extractAndParseReports(dir, shardFiles, printStatus) {
       const content = await zipFile.read(entryName);
       if (entryName.endsWith('.jsonl')) {
         const parsedEvents = parseEvents(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({
           metadata: findMetadata(parsedEvents, file),
           parsedEvents
@@ -101,7 +106,8 @@ async function mergeEvents(dir, shardReportFiles, printStatus) {
   const configureEvents = [];
   const beginEvents = [];
   const endEvents = [];
-  const shardEvents = await extractAndParseReports(dir, shardReportFiles, printStatus);
+  const stringPool = new _stringInternPool.StringInternPool();
+  const shardEvents = await extractAndParseReports(dir, shardReportFiles, stringPool, printStatus);
   shardEvents.sort((a, b) => {
     var _a$metadata$shard$cur, _a$metadata$shard, _b$metadata$shard$cur, _b$metadata$shard;
     const shardA = (_a$metadata$shard$cur = (_a$metadata$shard = a.metadata.shard) === null || _a$metadata$shard === void 0 ? void 0 : _a$metadata$shard.current) !== null && _a$metadata$shard$cur !== void 0 ? _a$metadata$shard$cur : 0;
@@ -114,7 +120,7 @@ async function mergeEvents(dir, shardReportFiles, printStatus) {
     parsedEvents
   } of shardEvents) {
     for (const event of parsedEvents) {
-      if (event.method === 'onConfigure') configureEvents.push(event);else if (event.method === 'onBegin') beginEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);else if (event.method === 'onBlobReportMetadata') new ProjectNamePatcher(allTestIds, event.params.projectSuffix || '').patchEvents(parsedEvents);else events.push(event);
+      if (event.method === 'onConfigure') configureEvents.push(event);else if (event.method === 'onBegin') beginEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);else if (event.method === 'onBlobReportMetadata') new ProjectNamePatcher(allTestIds, stringPool, event.params.projectSuffix || '').patchEvents(parsedEvents);else events.push(event);
     }
   }
   return [mergeConfigureEvents(configureEvents), mergeBeginEvents(beginEvents), ...events, mergeEndEvents(endEvents), {
@@ -208,10 +214,10 @@ function printStatusToStdout(message) {
   process.stdout.write(`${message}\n`);
 }
 class ProjectNamePatcher {
-  constructor(_allTestIds, _projectNameSuffix) {
+  constructor(_allTestIds, _stringPool, _projectNameSuffix) {
     this._testIds = new Set();
-    this._stringPool = new _stringInternPool.StringInternPool();
     this._allTestIds = _allTestIds;
+    this._stringPool = _stringPool;
     this._projectNameSuffix = _projectNameSuffix;
   }
   patchEvents(events) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.37.0-alpha-aug-5-2023",
+  "version": "1.37.0-alpha-aug-6-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-5-2023"
+    "playwright-core": "1.37.0-alpha-aug-6-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"