@empiricalrun/test-run 0.14.2 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @empiricalrun/test-run
 
+## 0.15.0
+
+### Minor Changes
+
+- c815fc2: feat: use common code to modify html report paths for shard/non-shard
+
+### Patch Changes
+
+- Updated dependencies [c815fc2]
+  - @empiricalrun/reporter@0.28.0
+
 ## 0.14.2
 
 ### Patch Changes

package/dist/bin/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBzC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,QAwJlD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAezC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,QAsLlD"}

package/dist/bin/commands/run.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerRunCommand = registerRunCommand;
 const dashboard_1 = require("../../dashboard");
+const env_files_1 = require("../../env-files");
 const cmd_1 = require("../../lib/cmd");
 const run_all_tests_1 = require("../../lib/run-all-tests");
 const run_specific_test_1 = require("../../lib/run-specific-test");
-const types_1 = require("../../types");
 const utils_1 = require("../../utils");
 const config_parser_1 = require("../../utils/config-parser");
 function registerRunCommand(program) {
@@ -70,30 +70,55 @@ function registerRunCommand(program) {
                 ]
                 : undefined);
         const environmentSlug = process.env.TEST_RUN_ENVIRONMENT || "";
-        const environmentVariables = await (0, dashboard_1.fetchEnvironmentVariables)();
+        const useEnvFilePrecedence = process.env.ENV_FILE_PRECEDENCE === "true";
         const envOverrides = {};
-        environmentVariables.forEach((envVar) => {
-            envOverrides[envVar.name] = envVar.value;
-        });
-        if (Object.keys(envOverrides).length > 0) {
-            console.log(`Loaded environment variables: ${Object.keys(envOverrides).join(", ")}`);
+        if (!useEnvFilePrecedence) {
+            const environmentVariables = await (0, dashboard_1.fetchEnvironmentVariables)();
+            environmentVariables.forEach((envVar) => {
+                envOverrides[envVar.name] = envVar.value;
+            });
+            if (Object.keys(envOverrides).length > 0) {
+                console.log(`Loaded environment variables: ${Object.keys(envOverrides).join(", ")}`);
+            }
+        }
+        if (environmentSlug) {
+            (0, env_files_1.writeEnvFiles)({
+                repoDir,
+                envSetup: {
+                    environments: [
+                        {
+                            slug: environmentSlug,
+                            vars: envOverrides,
+                        },
+                    ],
+                    activeEnvironmentSlug: environmentSlug,
+                },
+                logger: { info: (msg) => console.log(`[Env Files] ${msg}`) },
+            });
         }
-        let environmentSpecificProjects = [];
-        let platform = types_1.Platform.WEB;
+        let environmentMatch = [];
+        let environmentIgnore = [];
         try {
             if (environmentSlug) {
-                const { environment, build: latestBuild } = await (0, dashboard_1.fetchEnvironmentAndBuild)(projectName, environmentSlug);
-                platform = environment.platform;
-                environmentSpecificProjects = environment.playwright_projects;
-                if (!process.env.BUILD_URL) {
-                    process.env.BUILD_URL = latestBuild?.build_url;
+                const environment = await (0, dashboard_1.fetchEnvironment)(projectName, environmentSlug);
+                if (environment.playwright_projects_match &&
+                    environment.playwright_projects_match.length > 0) {
+                    environmentMatch = environment.playwright_projects_match;
+                    environmentIgnore = environment.playwright_projects_ignore ?? [];
                 }
-                const buildUrl = process.env.BUILD_URL;
+            }
+            const buildUrl = envOverrides.BUILD_URL;
+            if (buildUrl) {
                 await (0, utils_1.downloadBuild)(buildUrl);
             }
-            const projectFilters = await (0, utils_1.generateProjectFilters)({
-                platform,
-                filteringSets: [...options.project, ...environmentSpecificProjects],
+            const hasExplicitProjectFilter = options.project.length > 0 &&
+                !(options.project.length === 1 && options.project[0] === "*");
+            const matchPatterns = hasExplicitProjectFilter || environmentMatch.length === 0
+                ? [...options.project, ...environmentMatch]
+                : environmentMatch;
+            const projectFilters = await (0, utils_1.generateProjectFiltersV2)({
+                match: matchPatterns,
+                ignore: environmentIgnore,
                 repoDir,
             });
             if (options.skipTeardown) {
@@ -106,7 +131,6 @@ function registerRunCommand(program) {
                     tests,
                     projects: projectFilters,
                     passthroughArgs: pwOptions.join(" "),
-                    platform,
                     envOverrides,
                     repoDir,
                 });
@@ -115,7 +139,6 @@ function registerRunCommand(program) {
                 commandToRun = (0, run_all_tests_1.runAllTestsCmd)({
                     projects: projectFilters,
                     passthroughArgs: pwOptions.join(" "),
-                    platform,
                     envOverrides,
                 });
             }

package/dist/dashboard.d.ts

@@ -1,4 +1,4 @@
-import { Build, Environment } from "./types";
+import { Environment } from "./types";
 export type EnvironmentVariable = {
     id: number;
     project_id: number;
@@ -7,9 +7,6 @@ export type EnvironmentVariable = {
     created_at: string;
     updated_at: string;
 };
-export declare const fetchEnvironmentAndBuild: (projectName: string, environmentSlug: string) => Promise<{
-    environment: Environment;
-    build: Build;
-}>;
+export declare const fetchEnvironment: (projectName: string, environmentSlug: string) => Promise<Environment>;
 export declare const fetchEnvironmentVariables: () => Promise<EnvironmentVariable[]>;
 //# sourceMappingURL=dashboard.d.ts.map

package/dist/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../src/dashboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAIF,eAAO,MAAM,wBAAwB,GACnC,aAAa,MAAM,EACnB,iBAAiB,MAAM,KACtB,OAAO,CAAC;IACT,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;CACd,CAwDA,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAa,OAAO,CACxD,mBAAmB,EAAE,CAkDtB,CAAC"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../src/dashboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAIF,eAAO,MAAM,gBAAgB,GAC3B,aAAa,MAAM,EACnB,iBAAiB,MAAM,KACtB,OAAO,CAAC,WAAW,CAyDrB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAa,OAAO,CACxD,mBAAmB,EAAE,CAkDtB,CAAC"}

package/dist/dashboard.js

@@ -3,19 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchEnvironmentVariables = exports.fetchEnvironmentAndBuild = void 0;
+exports.fetchEnvironmentVariables = exports.fetchEnvironment = void 0;
 const async_retry_1 = __importDefault(require("async-retry"));
 const utils_1 = require("./utils");
 const DOMAIN = process.env.DASHBOARD_DOMAIN || "https://dash.empirical.run";
-const fetchEnvironmentAndBuild = async (projectName, environmentSlug) => {
+const fetchEnvironment = async (projectName, environmentSlug) => {
     const projectRepo = (0, utils_1.buildRepoName)(projectName);
     const data = await (0, async_retry_1.default)(async (bail) => {
         if (!process.env.EMPIRICALRUN_API_KEY) {
-            console.error("No API token found. Skipping fetch environment and latest build from dashboard.");
+            console.error("No API token found. Skipping fetch environment from dashboard.");
             return;
         }
-        // TODO: This API endpoint is deprecated. We should use the /list endpoint instead.
-        const resp = await fetch(`${DOMAIN}/api/environments?project_repo_name=${projectRepo}&environment_slug=${environmentSlug}`, {
+        const resp = await fetch(`${DOMAIN}/api/environments/list?project_repo_name=${projectRepo}&environment_slug=${environmentSlug}&is_disabled=false`, {
             method: "GET",
             headers: {
                 "Content-Type": "application/json",
@@ -28,7 +27,7 @@ const fetchEnvironmentAndBuild = async (projectName, environmentSlug) => {
                 bail(new Error(erroredResponse?.error?.message));
                 return;
             }
-            throw new Error(`Failed to fetch environment and latest build from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}`);
+            throw new Error(`Failed to fetch environment from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}`);
         }
         return (await resp.json());
     }, {
@@ -37,12 +36,13 @@ const fetchEnvironmentAndBuild = async (projectName, environmentSlug) => {
         maxTimeout: 60_000,
         factor: 3,
     });
-    if (!data?.data) {
-        throw new Error(`Failed to fetch environment and latest build from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}.`);
+    const environment = data?.data?.environments?.find((env) => env.slug === environmentSlug);
+    if (!environment) {
+        throw new Error(`Failed to fetch environment from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}.`);
     }
-    return data.data;
+    return environment;
 };
-exports.fetchEnvironmentAndBuild = fetchEnvironmentAndBuild;
+exports.fetchEnvironment = fetchEnvironment;
 const fetchEnvironmentVariables = async () => {
     if (!process.env.EMPIRICALRUN_API_KEY) {
         return [];

package/dist/env-files.d.ts

@@ -0,0 +1,16 @@
+export interface EnvFilesLogger {
+    info(message: string): void;
+}
+export type EnvSetup = {
+    environments: Array<{
+        slug: string;
+        vars: Record<string, string>;
+    }>;
+    activeEnvironmentSlug?: string;
+};
+export declare function writeEnvFiles({ repoDir, envSetup, logger, }: {
+    repoDir: string;
+    envSetup: EnvSetup;
+    logger: EnvFilesLogger;
+}): void;
+//# sourceMappingURL=env-files.d.ts.map

package/dist/env-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-files.d.ts","sourceRoot":"","sources":["../src/env-files.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,YAAY,EAAE,KAAK,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC,CAAC;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAwDF,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,MAAM,GACP,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,cAAc,CAAC;CACxB,QAoDA"}

package/dist/env-files.js

@@ -0,0 +1,139 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeEnvFiles = writeEnvFiles;
+const dotenv_1 = require("dotenv");
+const fs = __importStar(require("fs"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const path = __importStar(require("path"));
+const ENVIRONMENTS_FILE_PATH = ".empiricalrun/ENVIRONMENTS.yaml";
+function parseDotenv(content) {
+    return (0, dotenv_1.parse)(content);
+}
+function buildDotenvContent(vars) {
+    return Object.entries(vars)
+        .map(([k, v]) => {
+        if (v.includes("#") || v.includes("\n") || v !== v.trim()) {
+            const escaped = v
+                .replace(/\\/g, "\\\\")
+                .replace(/"/g, '\\"')
+                .replace(/\n/g, "\\n");
+            return `${k}="${escaped}"`;
+        }
+        return `${k}=${v}`;
+    })
+        .join("\n");
+}
+function parseEnvironmentsYaml(value) {
+    if (typeof value !== "object" || value === null)
+        return null;
+    const obj = value;
+    if (!("environments" in obj) || !Array.isArray(obj.environments))
+        return null;
+    const environments = [];
+    for (const env of obj.environments) {
+        if (typeof env !== "object" || env === null)
+            continue;
+        const e = env;
+        if (typeof e.slug !== "string" || !e.slug.trim())
+            continue;
+        if (typeof e.name !== "string" || !e.name.trim())
+            continue;
+        environments.push({
+            slug: e.slug,
+            name: e.name,
+            env_files: Array.isArray(e.env_files)
+                ? e.env_files
+                : undefined,
+            variables: Array.isArray(e.variables)
+                ? e.variables
+                : undefined,
+        });
+    }
+    return { environments };
+}
+function readEnvironmentsYaml(repoDir) {
+    const yamlPath = path.join(repoDir, ENVIRONMENTS_FILE_PATH);
+    if (!fs.existsSync(yamlPath))
+        return null;
+    const content = fs.readFileSync(yamlPath, "utf-8");
+    const parsed = js_yaml_1.default.load(content);
+    return parseEnvironmentsYaml(parsed);
+}
+function writeEnvFiles({ repoDir, envSetup, logger, }) {
+    const yamlConfig = readEnvironmentsYaml(repoDir);
+    for (const env of envSetup.environments) {
+        const merged = {};
+        const yamlEntry = yamlConfig?.environments.find((e) => e.slug.toLowerCase() === env.slug.toLowerCase());
+        // 1. Read and merge template files from repo (cascade order)
+        if (yamlEntry?.env_files) {
+            for (const file of yamlEntry.env_files) {
+                const filePath = path.join(repoDir, file);
+                if (fs.existsSync(filePath)) {
+                    const content = fs.readFileSync(filePath, "utf-8");
+                    Object.assign(merged, parseDotenv(content));
+                }
+            }
+        }
+        // 2. Overlay variables from YAML
+        if (yamlEntry?.variables) {
+            for (const v of yamlEntry.variables) {
+                merged[v.name] = v.value;
+            }
+        }
+        // 3. Overlay DB vars (highest precedence)
+        Object.assign(merged, env.vars);
+        // 4. Write .env.<slug>
+        const slug = env.slug.toLowerCase();
+        const envFilePath = path.join(repoDir, `.env.${slug}`);
+        fs.writeFileSync(envFilePath, buildDotenvContent(merged));
+        logger.info(`Wrote ${envFilePath}`);
+    }
+    // Symlink .env to the active environment
+    if (envSetup.activeEnvironmentSlug) {
+        const slug = envSetup.activeEnvironmentSlug.toLowerCase();
+        const envPath = path.join(repoDir, ".env");
+        const target = `.env.${slug}`;
+        if (fs.existsSync(envPath)) {
+            fs.unlinkSync(envPath);
+        }
+        fs.symlinkSync(target, envPath);
+        logger.info(`Symlinked .env -> ${target}`);
+    }
+    logger.info(`Wrote .env files for ${envSetup.environments.length} environments`);
+}

package/dist/glob-matcher.d.ts

@@ -14,4 +14,15 @@ export declare const filterArrayByGlobMatchersSet: (input: string[], globMatcher
  * @returns Array of project names that match the patterns
  */
 export declare const filterProjectsByGlobPatterns: (allProjectNames: string[], patterns: string[]) => string[];
+/**
+ * Filters playwright projects using match and ignore patterns.
+ * Match patterns are OR'd (project must match any).
+ * Ignore patterns are then applied to exclude (project must not match any).
+ *
+ * @param allProjectNames - Array of all available project names
+ * @param match - Array of glob patterns to include (OR'd together)
+ * @param ignore - Array of glob patterns to exclude (OR'd together)
+ * @returns Array of project names that match
+ */
+export declare const filterProjectsByMatchAndIgnore: (allProjectNames: string[], match: string[], ignore: string[]) => string[];
 //# sourceMappingURL=glob-matcher.d.ts.map

package/dist/glob-matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glob-matcher.d.ts","sourceRoot":"","sources":["../src/glob-matcher.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,OAAO,MAAM,EAAE,EACf,iBAAiB,MAAM,EAAE,EAAE,KAC1B,MAAM,EAUR,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,iBAAiB,MAAM,EAAE,EACzB,UAAU,MAAM,EAAE,KACjB,MAAM,EASR,CAAC"}
+{"version":3,"file":"glob-matcher.d.ts","sourceRoot":"","sources":["../src/glob-matcher.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,OAAO,MAAM,EAAE,EACf,iBAAiB,MAAM,EAAE,EAAE,KAC1B,MAAM,EAUR,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,iBAAiB,MAAM,EAAE,EACzB,UAAU,MAAM,EAAE,KACjB,MAAM,EASR,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,8BAA8B,GACzC,iBAAiB,MAAM,EAAE,EACzB,OAAO,MAAM,EAAE,EACf,QAAQ,MAAM,EAAE,KACf,MAAM,EAYR,CAAC"}

package/dist/glob-matcher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterProjectsByGlobPatterns = exports.filterArrayByGlobMatchersSet = void 0;
+exports.filterProjectsByMatchAndIgnore = exports.filterProjectsByGlobPatterns = exports.filterArrayByGlobMatchersSet = void 0;
 const minimatch_1 = require("minimatch");
 /**
  * Filters an array using glob pattern matchers.
@@ -35,3 +35,21 @@ const filterProjectsByGlobPatterns = (allProjectNames, patterns) => {
     return (0, exports.filterArrayByGlobMatchersSet)(allProjectNames, globMatcherSets);
 };
 exports.filterProjectsByGlobPatterns = filterProjectsByGlobPatterns;
+/**
+ * Filters playwright projects using match and ignore patterns.
+ * Match patterns are OR'd (project must match any).
+ * Ignore patterns are then applied to exclude (project must not match any).
+ *
+ * @param allProjectNames - Array of all available project names
+ * @param match - Array of glob patterns to include (OR'd together)
+ * @param ignore - Array of glob patterns to exclude (OR'd together)
+ * @returns Array of project names that match
+ */
+const filterProjectsByMatchAndIgnore = (allProjectNames, match, ignore) => {
+    let result = allProjectNames.filter((name) => match.some((pattern) => (0, minimatch_1.minimatch)(name, pattern)));
+    if (ignore.length > 0) {
+        result = result.filter((name) => !ignore.some((pattern) => (0, minimatch_1.minimatch)(name, pattern)));
+    }
+    return result;
+};
+exports.filterProjectsByMatchAndIgnore = filterProjectsByMatchAndIgnore;

package/dist/index.d.ts

@@ -2,13 +2,13 @@ import { JSONReport as PlaywrightJSONReport } from "@playwright/test/reporter";
 import { spawnCmd } from "./lib/cmd";
 import { runSpecificTestsCmd } from "./lib/run-specific-test";
 import { parseTestListOutput } from "./stdout-parser";
-import { Platform, TestCase } from "./types";
+import { TestCase } from "./types";
 import { getProjectsFromPlaywrightConfig } from "./utils/config";
-export { getProjectsFromPlaywrightConfig, parseTestListOutput, Platform, runSpecificTestsCmd, spawnCmd, };
+export { getProjectsFromPlaywrightConfig, parseTestListOutput, runSpecificTestsCmd, spawnCmd, };
 export { type BuildTestListOptions, type BuildTestListResult, buildTestListFromFailedTestRun, type FailedTest, } from "./failed-test-list";
 export * from "./glob-matcher";
 export { type CancellationWatcher, startCancellationWatcher, } from "./lib/cancellation-watcher";
-export { filterArrayByGlobMatchersSet, generateProjectFilters } from "./utils";
+export { filterArrayByGlobMatchersSet, generateProjectFilters, generateProjectFiltersV2, } from "./utils";
 export declare function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }: {
     testName: string;
     suites: string[];

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,QAAQ,EACR,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,8BAA8B,EAC9B,KAAK,UAAU,GAChB,MAAM,oBAAoB,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EACL,KAAK,mBAAmB,EACxB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAc/E,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAoBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,8BAA8B,EAC9B,KAAK,UAAU,GAChB,MAAM,oBAAoB,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EACL,KAAK,mBAAmB,EACxB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,SAAS,CAAC;AAcjB,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAmBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.startCancellationWatcher = exports.buildTestListFromFailedTestRun = exports.spawnCmd = exports.runSpecificTestsCmd = exports.Platform = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
+exports.generateProjectFiltersV2 = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.startCancellationWatcher = exports.buildTestListFromFailedTestRun = exports.spawnCmd = exports.runSpecificTestsCmd = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
 exports.runSingleTest = runSingleTest;
 exports.listProjectsAndTests = listProjectsAndTests;
 const fs_1 = __importDefault(require("fs"));
@@ -28,22 +28,17 @@ const run_specific_test_1 = require("./lib/run-specific-test");
 Object.defineProperty(exports, "runSpecificTestsCmd", { enumerable: true, get: function () { return run_specific_test_1.runSpecificTestsCmd; } });
 const stdout_parser_1 = require("./stdout-parser");
 Object.defineProperty(exports, "parseTestListOutput", { enumerable: true, get: function () { return stdout_parser_1.parseTestListOutput; } });
-const types_1 = require("./types");
-Object.defineProperty(exports, "Platform", { enumerable: true, get: function () { return types_1.Platform; } });
-const utils_1 = require("./utils");
 const config_1 = require("./utils/config");
 Object.defineProperty(exports, "getProjectsFromPlaywrightConfig", { enumerable: true, get: function () { return config_1.getProjectsFromPlaywrightConfig; } });
-// For test-run package, the library entrypoint, we only support web platform
-// The bin entrypoint has support for mobile also
-const supportedPlatform = types_1.Platform.WEB;
 var failed_test_list_1 = require("./failed-test-list");
 Object.defineProperty(exports, "buildTestListFromFailedTestRun", { enumerable: true, get: function () { return failed_test_list_1.buildTestListFromFailedTestRun; } });
 __exportStar(require("./glob-matcher"), exports);
 var cancellation_watcher_1 = require("./lib/cancellation-watcher");
 Object.defineProperty(exports, "startCancellationWatcher", { enumerable: true, get: function () { return cancellation_watcher_1.startCancellationWatcher; } });
-var utils_2 = require("./utils");
-Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: true, get: function () { return utils_2.filterArrayByGlobMatchersSet; } });
-Object.defineProperty(exports, "generateProjectFilters", { enumerable: true, get: function () { return utils_2.generateProjectFilters; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: true, get: function () { return utils_1.filterArrayByGlobMatchersSet; } });
+Object.defineProperty(exports, "generateProjectFilters", { enumerable: true, get: function () { return utils_1.generateProjectFilters; } });
+Object.defineProperty(exports, "generateProjectFiltersV2", { enumerable: true, get: function () { return utils_1.generateProjectFiltersV2; } });
 function getSummaryJsonPath(repoDir) {
     const pathForPlaywright147 = path_1.default.join(repoDir, "playwright-report", "summary.json");
     const pathForOtherPlaywrightVersions = path_1.default.join(repoDir, "summary.json");
@@ -57,7 +52,6 @@ async function runSingleTest({ testName, suites, filePath, projects, envOverride
         tests: [{ name: testName, dir: testDir, filePath, suites }],
         projects,
         envOverrides,
-        platform: supportedPlatform,
         repoDir,
     });
     const { hasTestPassed } = await (0, cmd_1.runTestsForCmd)(commandToRun, repoDir, {
@@ -73,7 +67,7 @@ async function runSingleTest({ testName, suites, filePath, projects, envOverride
     };
 }
 async function listProjectsAndTests(repoDir) {
-    const testRunner = (0, utils_1.getTestRunner)(types_1.Platform.WEB);
+    const testRunner = "playwright";
     const args = [testRunner, "test", "--list"];
     const { output, code } = await (0, cmd_1.spawnCmd)("npx", args, {
         cwd: repoDir,

package/dist/lib/merge-reports/html.d.ts

@@ -1,2 +1,2 @@
-export declare function patchMergedHtmlReport(htmlFilePath: string, urlMappings: Record<string, string>): Promise<void>;
+export declare function patchMergedHtmlReport(htmlFilePath: string, summaryJsonFilePath: string): Promise<void>;
 //# sourceMappingURL=html.d.ts.map

package/dist/lib/merge-reports/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAwEA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CA8Gf"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAaA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgIf"}

package/dist/lib/merge-reports/html.js

@@ -5,36 +5,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchMergedHtmlReport = patchMergedHtmlReport;
 const zip_1 = require("@empiricalrun/r2-uploader/zip");
+const reporter_1 = require("@empiricalrun/reporter");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../../logger");
-const types_1 = require("./types");
-function patchHtmlReportAttachments(report, urlMap) {
-    let patchCount = 0;
-    // report.json has files[].tests[], individual test files have tests[] directly
-    const tests = report.files
-        ? report.files.flatMap((f) => f.tests)
-        : report.tests || [];
-    for (const test of tests) {
-        for (const result of test.results || []) {
-            for (const attachment of result.attachments || []) {
-                if (attachment.path) {
-                    for (const [fileName, url] of urlMap) {
-                        if (attachment.path.endsWith(fileName)) {
-                            attachment.path = url;
-                            patchCount++;
-                            break;
-                        }
-                    }
+async function patchMergedHtmlReport(htmlFilePath, summaryJsonFilePath) {
+    let summaryContent;
+    try {
+        summaryContent = await fs_1.default.promises.readFile(summaryJsonFilePath, "utf8");
+    }
+    catch (error) {
+        logger_1.logger.error(`[Merge Reports] Failed to read summary.json:`, error);
+        return;
+    }
+    const summaryJson = JSON.parse(summaryContent);
+    const attachmentMap = (0, reporter_1.buildTestAttachmentMap)(summaryJson, {
+        transformAttachment: (attachment) => {
+            // Ensure attachment.name includes a file extension so that
+            // Playwright's downloadFileNameForAttachment() uses it as-is
+            // instead of parsing the (now URL) path for an extension.
+            if (attachment.path && !attachment.name.includes(".")) {
+                const ext = attachment.path.match(/\.[^/.]+$/)?.[0];
+                if (ext) {
+                    return { ...attachment, name: attachment.name + ext };
                 }
             }
-        }
-    }
-    return patchCount;
-}
-async function patchMergedHtmlReport(htmlFilePath, urlMappings) {
-    if (Object.keys(urlMappings).length === 0) {
-        logger_1.logger.debug(`[Merge Reports] No URL mappings to apply`);
+            return attachment;
+        },
+    });
+    if (attachmentMap.size === 0) {
+        logger_1.logger.debug(`[Merge Reports] No attachments found in summary.json`);
         return;
     }
     let htmlContent;
@@ -66,30 +66,21 @@ async function patchMergedHtmlReport(htmlFilePath, urlMappings) {
         await fs_1.default.promises.unlink(zipPath);
         logger_1.logger.info(`[Merge Reports] Zip extracted in ${Date.now() - stepTime}ms`);
         const jsonFiles = (await fs_1.default.promises.readdir(tempDir)).filter((f) => f.endsWith(".json"));
-        logger_1.logger.info(`[Merge Reports] Patching ${jsonFiles.length} JSON files with ${Object.keys(urlMappings).length} mappings`);
-        const urlMap = (0, types_1.buildUrlMap)(urlMappings);
+        logger_1.logger.info(`[Merge Reports] Patching ${jsonFiles.length} JSON files using summary.json attachment map`);
         stepTime = Date.now();
-        let totalPatchCount = 0;
         const patchResults = await Promise.allSettled(jsonFiles.map(async (file) => {
             const filePath = path_1.default.join(tempDir, file);
             const content = await fs_1.default.promises.readFile(filePath, "utf8");
-            const report = JSON.parse(content);
-            const patchCount = patchHtmlReportAttachments(report, urlMap);
-            if (patchCount > 0) {
-                await fs_1.default.promises.writeFile(filePath, JSON.stringify(report), "utf8");
-                logger_1.logger.debug(`[Merge Reports] Patched ${file} (${patchCount} paths)`);
-            }
-            return patchCount;
+            const reportJson = JSON.parse(content);
+            (0, reporter_1.replaceMediaPaths)(reportJson, attachmentMap);
+            await fs_1.default.promises.writeFile(filePath, JSON.stringify(reportJson), "utf8");
         }));
         for (const result of patchResults) {
             if (result.status === "rejected") {
                 logger_1.logger.error(`[Merge Reports] Failed to patch JSON file:`, result.reason);
             }
-            else {
-                totalPatchCount += result.value;
-            }
         }
-        logger_1.logger.info(`[Merge Reports] JSON patching completed in ${Date.now() - stepTime}ms (${totalPatchCount} paths patched)`);
+        logger_1.logger.info(`[Merge Reports] JSON patching completed in ${Date.now() - stepTime}ms`);
         stepTime = Date.now();
         const newBuffer = await (0, zip_1.createZipFromDirectory)(tempDir);
         const newBase64 = newBuffer.toString("base64");

package/dist/lib/merge-reports/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2B/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAsDf;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA4DhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2B/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAsDf;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA+EhC"}

package/dist/lib/merge-reports/index.js

@@ -166,44 +166,60 @@ async function mergeReports(options) {
     const outputDir = path_1.default.join(cwd, "playwright-report");
     const projectName = process.env.PROJECT_NAME;
     const runId = process.env.TEST_RUN_GITHUB_ACTION_ID;
-    if (!projectName || !runId) {
-        logger_1.logger.error(`[Merge Reports] PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set`);
-        return { success: false };
-    }
-    if (!fs_1.default.existsSync(blobDir)) {
-        logger_1.logger.error(`[Merge Reports] Blob directory does not exist: ${blobDir}`);
-        return { success: false };
-    }
-    const urlMappings = await extractUrlMappingsFromBlobs(blobDir);
-    const { success } = await runPlaywrightMergeReports({
-        blobDir,
-        outputDir,
-        cwd,
-    });
-    if (!success) {
-        return { success: false };
-    }
-    const htmlFilePath = path_1.default.join(outputDir, "index.html");
-    const jsonFilePath = path_1.default.join(cwd, "summary.json");
-    await Promise.all([
-        (0, html_1.patchMergedHtmlReport)(htmlFilePath, urlMappings),
-        (0, json_1.patchSummaryJson)(jsonFilePath, urlMappings),
-    ]);
-    const enableS3 = process.env.ENABLE_S3_UPLOADS === "true";
-    const credentials = getCredentialsFromEnv(enableS3);
-    if (credentials) {
-        const { baseUrl, uploadBucket } = getStorageConfig(enableS3);
-        await uploadMergedReports(cwd, outputDir, {
-            projectName,
-            runId,
-            baseUrl,
-            uploadBucket,
-            credentials,
+    // Track peak memory usage
+    let peakMemoryMb = 0;
+    const memoryInterval = setInterval(() => {
+        const currentMemoryMb = process.memoryUsage().heapUsed / 1024 / 1024;
+        if (currentMemoryMb > peakMemoryMb) {
+            peakMemoryMb = currentMemoryMb;
+        }
+    }, 100);
+    try {
+        if (!projectName || !runId) {
+            logger_1.logger.error(`[Merge Reports] PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set`);
+            return { success: false };
+        }
+        if (!fs_1.default.existsSync(blobDir)) {
+            logger_1.logger.error(`[Merge Reports] Blob directory does not exist: ${blobDir}`);
+            return { success: false };
+        }
+        const urlMappings = await extractUrlMappingsFromBlobs(blobDir);
+        const { success } = await runPlaywrightMergeReports({
+            blobDir,
+            outputDir,
+            cwd,
         });
+        if (!success) {
+            return { success: false };
+        }
+        const htmlFilePath = path_1.default.join(outputDir, "index.html");
+        const jsonFilePath = path_1.default.join(cwd, "summary.json");
+        // Patch summary.json first (replaces local paths with URLs),
+        // then patch the HTML report (reads the patched summary.json to build an attachment map).
+        await (0, json_1.patchSummaryJson)(jsonFilePath, urlMappings);
+        await (0, html_1.patchMergedHtmlReport)(htmlFilePath, jsonFilePath);
+        const enableS3 = process.env.ENABLE_S3_UPLOADS === "true";
+        const credentials = getCredentialsFromEnv(enableS3);
+        if (credentials) {
+            const { baseUrl, uploadBucket } = getStorageConfig(enableS3);
+            await uploadMergedReports(cwd, outputDir, {
+                projectName,
+                runId,
+                baseUrl,
+                uploadBucket,
+                credentials,
+            });
+        }
+        else {
+            const storageType = enableS3 ? "S3" : "R2";
+            logger_1.logger.info(`[Merge Reports] ${storageType} credentials not found, skipping upload`);
+        }
+        return { success: true };
     }
-    else {
-        const storageType = enableS3 ? "S3" : "R2";
-        logger_1.logger.info(`[Merge Reports] ${storageType} credentials not found, skipping upload`);
+    finally {
+        clearInterval(memoryInterval);
+        // Write metadata file for parent process to read
+        const metadataPath = path_1.default.join(cwd, "merge-metadata.json");
+        fs_1.default.writeFileSync(metadataPath, JSON.stringify({ peakMemoryMb: Math.round(peakMemoryMb) }));
     }
-    return { success: true };
 }

package/dist/lib/merge-reports/json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/json.ts"],"names":[],"mappings":"AA8EA,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAyCf"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/json.ts"],"names":[],"mappings":"AAoCA,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAyCf"}

package/dist/lib/merge-reports/json.js

@@ -4,38 +4,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchSummaryJson = patchSummaryJson;
+const reporter_1 = require("@empiricalrun/reporter");
 const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("../../logger");
 const types_1 = require("./types");
 function patchAttachmentPaths(report, urlMap) {
     let patchCount = 0;
-    function processSuite(suite) {
-        for (const spec of suite.specs) {
-            for (const test of spec.tests) {
-                for (const result of test.results) {
-                    for (const attachment of result.attachments) {
-                        if (attachment.path) {
-                            for (const [fileName, url] of urlMap) {
-                                if (attachment.path.endsWith(fileName)) {
-                                    attachment.path = url;
-                                    patchCount++;
-                                    break;
-                                }
+    (0, reporter_1.traverseJsonReportSuites)(report, (spec) => {
+        for (const test of spec.tests) {
+            for (const result of test.results || []) {
+                for (const attachment of result.attachments || []) {
+                    if (attachment.path) {
+                        for (const [fileName, url] of urlMap) {
+                            if (attachment.path.endsWith(fileName)) {
+                                attachment.path = url;
+                                patchCount++;
+                                break;
                             }
                         }
                     }
                 }
             }
         }
-        if (suite.suites) {
-            for (const nested of suite.suites) {
-                processSuite(nested);
-            }
-        }
-    }
-    for (const suite of report.suites) {
-        processSuite(suite);
-    }
+    });
     return patchCount;
 }
 async function patchSummaryJson(jsonFilePath, urlMappings) {

package/dist/lib/run-all-tests.d.ts

@@ -1,9 +1,8 @@
-import { CommandToRun, Platform, TestCase } from "../types";
-export declare function runAllTestsCmd({ projects, passthroughArgs, patternsToGrep, filesFilter, envOverrides, platform, }: {
+import { CommandToRun, TestCase } from "../types";
+export declare function runAllTestsCmd({ projects, passthroughArgs, patternsToGrep, filesFilter, envOverrides, }: {
     tests?: TestCase[];
     projects: string[];
     passthroughArgs?: string;
-    platform: Platform;
     filesFilter?: string;
     envOverrides?: Record<string, string>;
     patternsToGrep?: string[];

package/dist/lib/run-all-tests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-all-tests.d.ts","sourceRoot":"","sources":["../../src/lib/run-all-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAQ5D,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,eAAe,EACf,cAAc,EACd,WAAW,EACX,YAAY,EACZ,QAAQ,GACT,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,GAAG,YAAY,CAsBf"}
+{"version":3,"file":"run-all-tests.d.ts","sourceRoot":"","sources":["../../src/lib/run-all-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,eAAe,EACf,cAAc,EACd,WAAW,EACX,YAAY,GACb,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,GAAG,YAAY,CAsBf"}

package/dist/lib/run-all-tests.js

@@ -6,8 +6,8 @@ const cmd_1 = require("./cmd");
 function normalizeSpaces(command) {
     return command.trim().replace(/ +/g, " ");
 }
-function runAllTestsCmd({ projects, passthroughArgs, patternsToGrep, filesFilter, envOverrides, platform, }) {
-    const testRunner = (0, utils_1.getTestRunner)(platform);
+function runAllTestsCmd({ projects, passthroughArgs, patternsToGrep, filesFilter, envOverrides, }) {
+    const testRunner = (0, utils_1.getTestRunner)();
     const projectsArg = (projects || [])
         .map((project) => `--project ${project}`)
         .join(" ");

package/dist/lib/run-specific-test.d.ts

@@ -1,9 +1,8 @@
-import { CommandToRun, Platform, TestCase } from "../types";
-export declare function runSpecificTestsCmd({ tests, projects, passthroughArgs, platform, envOverrides, repoDir, }: {
+import { CommandToRun, TestCase } from "../types";
+export declare function runSpecificTestsCmd({ tests, projects, passthroughArgs, envOverrides, repoDir, }: {
     tests?: TestCase[];
     projects: string[];
     passthroughArgs?: string;
-    platform: Platform;
     filesFilter?: string;
     envOverrides?: Record<string, string>;
     repoDir: string;

package/dist/lib/run-specific-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../../src/lib/run-specific-test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAY5D,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,YAAY,CAAC,CA2FxB"}
+{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../../src/lib/run-specific-test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAYlD,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,YAAY,CAAC,CAsFxB"}

package/dist/lib/run-specific-test.js

@@ -7,7 +7,7 @@ exports.runSpecificTestsCmd = runSpecificTestsCmd;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const run_all_tests_1 = require("./run-all-tests");
-async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, platform, envOverrides, repoDir, }) {
+async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, envOverrides, repoDir, }) {
     if (!tests || tests.length === 0) {
         throw new Error("No tests found");
     }
@@ -63,7 +63,7 @@ async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, plat
             }
         }
     }
-    const teardownLabels = await (0, utils_1.labelTeardownProjects)(projects, platform, repoDir);
+    const teardownLabels = await (0, utils_1.labelTeardownProjects)(projects, repoDir);
     const isRunningForTeardownProjectOnly = teardownLabels && teardownLabels.every((label) => label.isTeardown);
     if (isRunningForTeardownProjectOnly) {
         // To run teardown projects, we need to run the `setup` project first, and playwright runs
@@ -81,7 +81,6 @@ async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, plat
         passthroughArgs,
         projects,
         envOverrides,
-        platform,
         patternsToGrep,
     });
     return commandToRun;

package/dist/types/index.d.ts

@@ -11,26 +11,13 @@ export type Environment = {
     id: number;
     project_id: number;
     slug: string;
-    playwright_projects: string[];
-    platform: Platform;
-};
-export type Build = {
-    id: number;
-    build_url: string;
+    playwright_projects_match?: string[];
+    playwright_projects_ignore?: string[];
 };
 export type PartialPackageJSON = {
     name: string;
     scripts: Record<string, string>;
 };
-export declare enum Platform {
-    WEB = "web",
-    ANDROID = "android",
-    IOS = "ios"
-}
-export declare enum TestFramework {
-    PLAYWRIGHT = "playwright",
-    APPWRIGHT = "appwright"
-}
 export type PlaywProjectConfig = {
     name: string;
     teardown?: string;

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAEF,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAED,oBAAY,aAAa;IACvB,UAAU,eAAe;IACzB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC"}

package/dist/types/index.js

@@ -1,14 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestFramework = exports.Platform = void 0;
-var Platform;
-(function (Platform) {
-    Platform["WEB"] = "web";
-    Platform["ANDROID"] = "android";
-    Platform["IOS"] = "ios";
-})(Platform || (exports.Platform = Platform = {}));
-var TestFramework;
-(function (TestFramework) {
-    TestFramework["PLAYWRIGHT"] = "playwright";
-    TestFramework["APPWRIGHT"] = "appwright";
-})(TestFramework || (exports.TestFramework = TestFramework = {}));

package/dist/utils/config.d.ts

@@ -1,4 +1,4 @@
 import { PlaywrightProject } from "@empiricalrun/shared-types/tool-results";
-import { Platform } from "../types";
-export declare function getProjectsFromPlaywrightConfig(platform: Platform, repoDir: string): Promise<PlaywrightProject[]>;
+export declare function parseProjectsFromOutput(result: string): PlaywrightProject[];
+export declare function getProjectsFromPlaywrightConfig(repoDir: string): Promise<PlaywrightProject[]>;
 //# sourceMappingURL=config.d.ts.map

package/dist/utils/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAK5E,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAyE9B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAK5E,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAwB3E;AAED,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4D9B"}

package/dist/utils/config.js

@@ -3,13 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseProjectsFromOutput = parseProjectsFromOutput;
 exports.getProjectsFromPlaywrightConfig = getProjectsFromPlaywrightConfig;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const types_1 = require("../types");
-async function getProjectsFromPlaywrightConfig(platform, repoDir) {
-    const configName = platform === types_1.Platform.WEB ? "playwright.config.ts" : "appwright.config.ts";
+function parseProjectsFromOutput(result) {
+    // Extract JSON from between markers to ignore noisy stdout from npx/ts-node
+    const markerStart = "___PROJECTS_JSON_START___";
+    const markerEnd = "___PROJECTS_JSON_END___";
+    const startIdx = result.indexOf(markerStart);
+    const endIdx = result.indexOf(markerEnd);
+    const jsonStr = startIdx !== -1 && endIdx !== -1
+        ? result.substring(startIdx + markerStart.length, endIdx)
+        : result;
+    // Custom deserializer that reconstructs regex objects
+    return JSON.parse(jsonStr, (key, value) => {
+        if (value && typeof value === "object") {
+            if (value.__regex) {
+                return new RegExp(value.source, value.flags);
+            }
+            if (value.__function) {
+                // Note: Functions can't be fully reconstructed, but we preserve the source
+                return value.source;
+            }
+        }
+        return value;
+    });
+}
+async function getProjectsFromPlaywrightConfig(repoDir) {
+    const configName = "playwright.config.ts";
     try {
         const configPath = path_1.default.join(repoDir, configName);
         const tmpScriptPath = path_1.default.join(repoDir, "temp-extract-projects.js");
@@ -34,14 +57,16 @@ async function getProjectsFromPlaywrightConfig(platform, repoDir) {
           });
         }
 
+        const MARKER_START = '___PROJECTS_JSON_START___';
+        const MARKER_END = '___PROJECTS_JSON_END___';
         try {
           // Import the config directly with the full path
           const configModule = require('${configPath.replace(/\\/g, "\\\\")}');
           const projects = configModule.default?.projects || configModule.projects || [];
-          console.log(serializeWithSpecialTypes(projects));
+          console.log(MARKER_START + serializeWithSpecialTypes(projects) + MARKER_END);
         } catch (error) {
           console.error('Error loading config:', error.message);
-          console.log('[]'); // Return empty array on error
+          console.log(MARKER_START + '[]' + MARKER_END); // Return empty array on error
         }
       `);
         const result = (0, child_process_1.execSync)(`npx -y ts-node@latest "${tmpScriptPath}"`, {
@@ -54,20 +79,7 @@ async function getProjectsFromPlaywrightConfig(platform, repoDir) {
             cwd: repoDir,
         });
         fs_1.default.unlinkSync(tmpScriptPath);
-        // Custom deserializer that reconstructs regex objects
-        const projects = JSON.parse(result, (key, value) => {
-            if (value && typeof value === "object") {
-                if (value.__regex) {
-                    return new RegExp(value.source, value.flags);
-                }
-                if (value.__function) {
-                    // Note: Functions can't be fully reconstructed, but we preserve the source
-                    return value.source;
-                }
-            }
-            return value;
-        });
-        return projects;
+        return parseProjectsFromOutput(result);
     }
     catch (error) {
         console.error("Error extracting Playwright projects:", error);

package/dist/utils/index.d.ts

@@ -1,5 +1,4 @@
 import { Node, SourceFile } from "ts-morph";
-import { Platform, TestFramework } from "../types";
 export declare function getAllFilePaths(directoryPath: string | undefined, repoDir: string, filters?: {
     filePath?: string;
 }): Promise<string[]>;
@@ -29,19 +28,23 @@ export declare function markTestAsOnly({ sourceFile, parentDescribeNode, testCas
     filePath: string;
 }): Promise<void>;
 export { filterArrayByGlobMatchersSet } from "../glob-matcher";
-export declare function labelTeardownProjects(projectNames: string[], platform: Platform, repoDir: string): Promise<{
+export declare function labelTeardownProjects(projectNames: string[], repoDir: string): Promise<{
     isTeardown: boolean;
     correspondingSetupProject: string | undefined;
 }[]>;
-export declare const generateProjectFilters: ({ platform, filteringSets, repoDir, }: {
-    platform: Platform;
+export declare const generateProjectFilters: ({ filteringSets, repoDir, }: {
     filteringSets: string[];
     repoDir: string;
 }) => Promise<string[]>;
+export declare const generateProjectFiltersV2: ({ match, ignore, repoDir, }: {
+    match: string[];
+    ignore: string[];
+    repoDir: string;
+}) => Promise<string[]>;
 export declare function buildRepoName(projectName: string): string;
 export declare const pickNameFromPackageJson: () => Promise<string | undefined>;
 export declare const downloadBuild: (buildUrl: string) => Promise<void>;
-export declare const getTestRunner: (platform: Platform) => TestFramework;
+export declare const getTestRunner: () => string;
 export declare const handleTeardownSkipFlag: (directory: string, repoDir: string) => Promise<void>;
 /**
  * function to get the test block and test node for the scenario

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAW,UAAU,EAAc,MAAM,UAAU,CAAC;AAKjE,OAAO,EAAsB,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGvE,wBAAsB,eAAe,CACnC,aAAa,EAAE,MAAM,YAAU,EAC/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED,eAAO,MAAM,gCAAgC,GAC3C,YAAY,UAAU,KACrB,MAgBF,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IAAE,YAAY,EAAE,IAAI,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC,CAStE;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQnB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAWnE;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,SAAS,GACrB,IAAI,GAAG,SAAS,CA2BlB;AAED,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,MAAM,oBA+BjB;AAED,wBAAsB,cAAc,CAAC,EACnC,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,QAAQ,GACT,EAAE;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,kBAAkB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAgBA;AAED,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAE/D,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EAAE,EACtB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CACR;IACE,UAAU,EAAE,OAAO,CAAC;IACpB,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/C,EAAE,CACJ,CAkBA;AAED,eAAO,MAAM,sBAAsB,GAAU,uCAI1C;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,KAAG,OAAO,CAAC,MAAM,EAAE,CAgBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,eAAO,MAAM,uBAAuB,QAAa,OAAO,CACtD,MAAM,GAAG,SAAS,CAMnB,CAAC;AAEF,eAAO,MAAM,aAAa,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,IAAI,CAclE,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,UAAU,QAAQ,KAAG,aAIlD,CAAC;AAqEF,eAAO,MAAM,sBAAsB,GACjC,WAAW,MAAM,EACjB,SAAS,MAAM,kBAmBhB,CAAC;AA0BF;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,OAAO,EACP,OAAO,GACR,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG;IACF,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;CACxB,CAiDA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/dist/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleTeardownSkipFlag = exports.getTestRunner = exports.downloadBuild = exports.pickNameFromPackageJson = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.getTestModuleAliasFromSourceFile = void 0;
+exports.handleTeardownSkipFlag = exports.getTestRunner = exports.downloadBuild = exports.pickNameFromPackageJson = exports.generateProjectFiltersV2 = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.getTestModuleAliasFromSourceFile = void 0;
 exports.getAllFilePaths = getAllFilePaths;
 exports.getTestCaseNode = getTestCaseNode;
 exports.hasTestBlock = hasTestBlock;
@@ -21,7 +21,6 @@ const ts_morph_1 = require("ts-morph");
 const util_1 = require("util");
 const glob_matcher_1 = require("../glob-matcher");
 const cmd_1 = require("../lib/cmd");
-const types_1 = require("../types");
 const config_1 = require("./config");
 async function getAllFilePaths(directoryPath = "tests", repoDir, filters = {}) {
     let filePaths = [];
@@ -169,8 +168,8 @@ async function markTestAsOnly({ sourceFile, parentDescribeNode, testCaseNode, fi
 }
 var glob_matcher_2 = require("../glob-matcher");
 Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: true, get: function () { return glob_matcher_2.filterArrayByGlobMatchersSet; } });
-async function labelTeardownProjects(projectNames, platform, repoDir) {
-    const allProjects = await (0, config_1.getProjectsFromPlaywrightConfig)(platform, repoDir);
+async function labelTeardownProjects(projectNames, repoDir) {
+    const allProjects = await (0, config_1.getProjectsFromPlaywrightConfig)(repoDir);
     return projectNames.map((projectName) => {
         const setupForTeardown = allProjects.find((p) => p.teardown === projectName);
         if (setupForTeardown) {
@@ -187,8 +186,8 @@ async function labelTeardownProjects(projectNames, platform, repoDir) {
         }
     });
 }
-const generateProjectFilters = async ({ platform, filteringSets, repoDir, }) => {
-    const allProjects = await (0, config_1.getProjectsFromPlaywrightConfig)(platform, repoDir);
+const generateProjectFilters = async ({ filteringSets, repoDir, }) => {
+    const allProjects = await (0, config_1.getProjectsFromPlaywrightConfig)(repoDir);
     const allProjectNames = allProjects.map((project) => project.name);
     const filters = filteringSets.map((matchingString) => matchingString.split(","));
     const filteredProjects = (0, glob_matcher_1.filterArrayByGlobMatchersSet)(allProjectNames, filters);
@@ -198,6 +197,16 @@ const generateProjectFilters = async ({ platform, filteringSets, repoDir, }) =>
     return filteredProjects;
 };
 exports.generateProjectFilters = generateProjectFilters;
+const generateProjectFiltersV2 = async ({ match, ignore, repoDir, }) => {
+    const allProjects = await (0, config_1.getProjectsFromPlaywrightConfig)(repoDir);
+    const allProjectNames = allProjects.map((project) => project.name);
+    const filteredProjects = (0, glob_matcher_1.filterProjectsByMatchAndIgnore)(allProjectNames, match, ignore);
+    if (filteredProjects.length === 0) {
+        throw new Error("No projects found in playwright config that matches the filtering criteria");
+    }
+    return filteredProjects;
+};
+exports.generateProjectFiltersV2 = generateProjectFiltersV2;
 function buildRepoName(projectName) {
     return `${projectName}-tests`;
 }
@@ -224,10 +233,8 @@ const downloadBuild = async (buildUrl) => {
     }
 };
 exports.downloadBuild = downloadBuild;
-const getTestRunner = (platform) => {
-    return platform === types_1.Platform.WEB
-        ? types_1.TestFramework.PLAYWRIGHT
-        : types_1.TestFramework.APPWRIGHT;
+const getTestRunner = () => {
+    return "playwright";
 };
 exports.getTestRunner = getTestRunner;
 const getAllTeardownFiles = async (directory, repoDir) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.14.2",
+  "version": "0.15.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -33,18 +33,20 @@
     "commander": "^12.1.0",
     "console-log-level": "^1.4.1",
     "dotenv": "^16.4.5",
+    "js-yaml": "^4.1.0",
     "minimatch": "^10.0.1",
     "ts-morph": "^23.0.0",
     "@empiricalrun/r2-uploader": "^0.9.1",
-    "@empiricalrun/reporter": "^0.27.0"
+    "@empiricalrun/reporter": "^0.28.0"
   },
   "devDependencies": {
     "@playwright/test": "1.57.0",
     "@types/async-retry": "^1.4.8",
+    "@types/js-yaml": "^4.0.9",
     "@types/console-log-level": "^1.4.5",
     "@types/node": "^22.5.5",
     "memfs": "^4.17.1",
-    "@empiricalrun/shared-types": "0.12.0"
+    "@empiricalrun/shared-types": "0.12.1"
   },
   "scripts": {
     "dev": "tsc --build --watch",

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/cmd.ts","./src/dashboard.ts","./src/failed-test-list.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/bin/commands/estimate-time-shard.ts","./src/bin/commands/failed-list.ts","./src/bin/commands/merge.ts","./src/bin/commands/optimize-shards.ts","./src/bin/commands/run.ts","./src/lib/cancellation-watcher.ts","./src/lib/cmd.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/lib/merge-reports/html.ts","./src/lib/merge-reports/index.ts","./src/lib/merge-reports/json.ts","./src/lib/merge-reports/types.ts","./src/stdout-parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}
+{"root":["./src/cmd.ts","./src/dashboard.ts","./src/env-files.ts","./src/failed-test-list.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/bin/commands/estimate-time-shard.ts","./src/bin/commands/failed-list.ts","./src/bin/commands/merge.ts","./src/bin/commands/optimize-shards.ts","./src/bin/commands/run.ts","./src/lib/cancellation-watcher.ts","./src/lib/cmd.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/lib/merge-reports/html.ts","./src/lib/merge-reports/index.ts","./src/lib/merge-reports/json.ts","./src/lib/merge-reports/types.ts","./src/stdout-parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}