@matter/testing 0.13.1-alpha.0-20250501-80c86b03e → 0.13.1-alpha.0-20250504-87f265a2e

package/dist/esm/failure-reporter.js

@@ -5,21 +5,19 @@
  */
 import { ansi, STATUS_ICON_FAILURE } from "#tools";
 import { TextDiff } from "./text-diff.js";
-const BEGIN_ERROR = `${ansi.red}\u250F\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2505
-\u2503${ansi.not.red}`;
+const BEGIN_ERROR = `${ansi.red}\u250F\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2505${ansi.not.red}`;
 const OUTER_PREFIX = `${ansi.red}\u2503  ${ansi.not.red}`;
 const INNER_PREFIX = `${ansi.dim}\u2506  ${ansi.not.dim}`;
-const END_ERROR = `${ansi.red}\u2503
-\u2517\u2501\u2505${ansi.not.red}`;
+const END_ERROR = `${ansi.red}\u2517\u2501\u2505${ansi.not.red}`;
 var FailureReporter;
 ((FailureReporter2) => {
   function report(out, failure, title) {
-    out(BEGIN_ERROR, "\n");
+    out(BEGIN_ERROR, "\n", OUTER_PREFIX, "\n");
     out.state({ linePrefix: OUTER_PREFIX }, () => {
       out(ansi.bold.red(STATUS_ICON_FAILURE), " ", title, "\n");
       dumpDetails(out, failure);
     });
-    out(END_ERROR, "\n");
+    out(OUTER_PREFIX, "\n", END_ERROR, "\n");
   }
   FailureReporter2.report = report;
 })(FailureReporter || (FailureReporter = {}));

package/dist/esm/failure-reporter.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/failure-reporter.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,MAAe,2BAA2B;AAEnD,SAAS,gBAAgB;AAEzB,MAAM,cAAc,GAAG,KAAK,GAAG;AAAA,QAA+C,KAAK,IAAI,GAAG;AAC1F,MAAM,eAAe,GAAG,KAAK,GAAG,WAAM,KAAK,IAAI,GAAG;AAClD,MAAM,eAAe,GAAG,KAAK,GAAG,WAAM,KAAK,IAAI,GAAG;AAClD,MAAM,YAAY,GAAG,KAAK,GAAG;AAAA,oBAAS,KAAK,IAAI,GAAG;AAE3C,IAAU;AAAA,CAAV,CAAUA,qBAAV;AACI,WAAS,OAAO,KAAc,SAAwB,OAAe;AACxE,QAAI,aAAa,IAAI;AAErB,QAAI,MAAM,EAAE,YAAY,aAAa,GAAG,MAAM;AAC1C,UAAI,KAAK,KAAK,IAAI,mBAAmB,GAAG,KAAK,OAAO,IAAI;AACxD,kBAAY,KAAK,OAAO;AAAA,IAC5B,CAAC;AAED,QAAI,WAAW,IAAI;AAAA,EACvB;AATO,EAAAA,iBAAS;AAAA,GADH;AAajB,SAAS,UAAU,KAAc,SAAwB;AACrD,MAAI,MAAM,EAAE,YAAY,aAAa,GAAG,MAAM;AAC1C,gBAAY,KAAK,OAAO;AAAA,EAC5B,CAAC;AACL;AAEA,SAAS,YAAY,KAAc,EAAE,SAAS,QAAQ,UAAU,OAAO,OAAO,QAAQ,KAAK,GAAkB;AACzG,MAAI,MAAM,KAAK,OAAO,IAAI,OAAO,GAAG,IAAI;AAExC,MAAI,WAAW,UAAa,aAAa,QAAW;AAChD,QAAI,IAAI;AACR,QAAI,MAAM,EAAE,YAAY,OAAO,GAAG,MAAM,IAAI,SAAS,QAAQ,QAAQ,CAAC,CAAC;AACvE,QAAI,IAAI;AAAA,EACZ;AAEA,MAAI,OAAO;AACP,QAAI,IAAI;AACR,QAAI,MAAM,EAAE,YAAY,KAAK,GAAG,MAAM,IAAI,KAAK,CAAC;AAChD,QAAI,IAAI;AAAA,EACZ;AAEA,MAAI,OAAO;AACP,QAAI,MAAM,KAAK,KAAK,YAAY,GAAG,IAAI;AACvC,cAAU,KAAK,KAAK;AAAA,EACxB;AAEA,MAAI,QAAQ,QAAQ;AAChB,QAAI,MAAM;AACV,eAAWC,UAAS,QAAQ;AACxB,UAAI,MAAM,KAAK,KAAK,UAAU,EAAE,GAAG,GAAG,GAAG,IAAI;AAC7C,gBAAU,KAAKA,MAAK;AAAA,IACxB;AAAA,EACJ;AAEA,MAAI,MAAM;AACN,QAAI,MAAM,MAAM,IAAI;AAAA,EACxB;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,MAAe,2BAA2B;AAEnD,SAAS,gBAAgB;AAEzB,MAAM,cAAc,GAAG,KAAK,GAAG,yPAA4C,KAAK,IAAI,GAAG;AACvF,MAAM,eAAe,GAAG,KAAK,GAAG,WAAM,KAAK,IAAI,GAAG;AAClD,MAAM,eAAe,GAAG,KAAK,GAAG,WAAM,KAAK,IAAI,GAAG;AAClD,MAAM,YAAY,GAAG,KAAK,GAAG,qBAAM,KAAK,IAAI,GAAG;AAExC,IAAU;AAAA,CAAV,CAAUA,qBAAV;AACI,WAAS,OAAO,KAAc,SAAwB,OAAe;AACxE,QAAI,aAAa,MAAM,cAAc,IAAI;AAEzC,QAAI,MAAM,EAAE,YAAY,aAAa,GAAG,MAAM;AAC1C,UAAI,KAAK,KAAK,IAAI,mBAAmB,GAAG,KAAK,OAAO,IAAI;AACxD,kBAAY,KAAK,OAAO;AAAA,IAC5B,CAAC;AAED,QAAI,cAAc,MAAM,WAAW,IAAI;AAAA,EAC3C;AATO,EAAAA,iBAAS;AAAA,GADH;AAajB,SAAS,UAAU,KAAc,SAAwB;AACrD,MAAI,MAAM,EAAE,YAAY,aAAa,GAAG,MAAM;AAC1C,gBAAY,KAAK,OAAO;AAAA,EAC5B,CAAC;AACL;AAEA,SAAS,YAAY,KAAc,EAAE,SAAS,QAAQ,UAAU,OAAO,OAAO,QAAQ,KAAK,GAAkB;AACzG,MAAI,MAAM,KAAK,OAAO,IAAI,OAAO,GAAG,IAAI;AAExC,MAAI,WAAW,UAAa,aAAa,QAAW;AAChD,QAAI,IAAI;AACR,QAAI,MAAM,EAAE,YAAY,OAAO,GAAG,MAAM,IAAI,SAAS,QAAQ,QAAQ,CAAC,CAAC;AACvE,QAAI,IAAI;AAAA,EACZ;AAEA,MAAI,OAAO;AACP,QAAI,IAAI;AACR,QAAI,MAAM,EAAE,YAAY,KAAK,GAAG,MAAM,IAAI,KAAK,CAAC;AAChD,QAAI,IAAI;AAAA,EACZ;AAEA,MAAI,OAAO;AACP,QAAI,MAAM,KAAK,KAAK,YAAY,GAAG,IAAI;AACvC,cAAU,KAAK,KAAK;AAAA,EACxB;AAEA,MAAI,QAAQ,QAAQ;AAChB,QAAI,MAAM;AACV,eAAWC,UAAS,QAAQ;AACxB,UAAI,MAAM,KAAK,KAAK,UAAU,EAAE,GAAG,GAAG,GAAG,IAAI;AAC7C,gBAAU,KAAKA,MAAK;AAAA,IACxB;AAAA,EACJ;AAEA,MAAI,MAAM;AACN,QAAI,MAAM,MAAM,IAAI;AAAA,EACxB;AACJ;",
   "names": ["FailureReporter", "cause"]
 }

package/dist/esm/print-report.d.ts

@@ -20,6 +20,8 @@ export declare function defaultDescriptor(runner: TestRunner): Promise<{
     name: string;
     kind: TestDescriptor.Kind;
     path?: string;
+    subpath?: string;
+    app?: string;
     isDisabled?: boolean;
     timeoutMs?: number;
     description?: string;
@@ -29,5 +31,6 @@ export declare function defaultDescriptor(runner: TestRunner): Promise<{
     runAt?: Date;
     passed?: boolean;
     durationMs?: number;
+    picsValues?: import("./index.js").PicsFile;
 }>;
 //# sourceMappingURL=print-report.d.ts.map

package/dist/esm/print-report.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-report.d.ts","sourceRoot":"","sources":["../../src/print-report.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,OAAO,QAEhF;AAiGD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,UAAU;;;;;;;;;;;;;;GAgDzD"}
+{"version":3,"file":"print-report.d.ts","sourceRoot":"","sources":["../../src/print-report.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,OAAO,QAEhF;AAqGD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,UAAU;;;;;;;;;;;;;;;;;GAuCzD"}

package/dist/esm/print-report.js

@@ -3,10 +3,10 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Progress, STATUS_ICON_FAILURE, STATUS_ICON_SUCCESS } from "@matter/tools";
+import { Progress, STATUS_ICON_FAILURE, STATUS_ICON_SKIPPED, STATUS_ICON_SUCCESS } from "@matter/tools";
 import colors from "ansi-colors";
 import { chip } from "./chip/chip.js";
-import { InvalidPicsExpressionError, PicsExpression } from "./chip/pics-expression.js";
+import { InvalidPicsExpressionError, PicsExpression } from "./chip/pics/expression.js";
 import { createNodejsMocha } from "./nodejs.js";
 import { TestDescriptor } from "./test-descriptor.js";
 function printReport(descriptor, includeDisabled) {
@@ -49,7 +49,7 @@ function printDescriptor(descriptor, includeDisabled, prefix = "", path) {
           title = `${STATUS_ICON_FAILURE} ${title}`;
           break;
         default:
-          title = `  ${title}`;
+          title = `${STATUS_ICON_SKIPPED} ${title}`;
       }
     }
     if (member.durationMs !== void 0) {
@@ -64,7 +64,7 @@ function printDescriptor(descriptor, includeDisabled, prefix = "", path) {
     if (member.pics) {
       try {
         const expr = new PicsExpression(member.pics);
-        if (expr.evaluate(chip.pics)) {
+        if (expr.evaluate(member.picsValues ?? chip.defaultPics)) {
           title = `${title} ${colors.dim.green(member.pics)}`;
         } else {
           title = `${title} ${colors.dim.red(member.pics)}`;
@@ -78,7 +78,11 @@ function printDescriptor(descriptor, includeDisabled, prefix = "", path) {
       }
     }
     if (member.path && member.path !== path) {
-      title = `${title} ${colors.dim.blueBright(member.path)}`;
+      let { path: path2 } = member;
+      if (member.subpath) {
+        path2 = `${path2}#${member.subpath}`;
+      }
+      title = `${title} ${colors.dim.blueBright(path2)}`;
     }
     if (member.kind === "manual") {
       title = colors.strikethrough(title);
@@ -98,17 +102,10 @@ async function defaultDescriptor(runner) {
     TestDescriptor.visit(descriptor, (descriptor2) => {
       used.add(descriptor2);
     });
-    let unused = TestDescriptor.filter(chip.tests.descriptor, (descriptor2, recurse) => {
-      if (descriptor2.kind === "py" || descriptor2.kind === "yaml") {
-        if (used.has(descriptor2)) {
-          return;
-        }
-      }
-      const result = recurse();
-      if (!result || result.kind === "suite" && !result.members?.length) {
-        return;
+    let unused = TestDescriptor.filter(chip.tests.descriptor, {
+      predicate(descriptor2) {
+        return descriptor2.kind !== "py" && descriptor2.kind !== "yaml" || !used.has(descriptor2);
       }
-      return result;
     });
     if (unused) {
       unused = {

package/dist/esm/print-report.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/print-report.ts"],
-  "mappings": "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",
-  "names": ["descriptor"]
+  "mappings": "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",
+  "names": ["path", "descriptor"]
 }

package/dist/esm/test-descriptor.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { FilesystemSync } from "#tools";
-import type { PicsFile } from "./chip/pics-file.js";
+import type { PicsFile } from "./chip/pics/file.js";
 /**
  * Metadata for a single test or group of tests.
  */
@@ -12,6 +12,8 @@ export interface TestDescriptor {
     name: string;
     kind: TestDescriptor.Kind;
     path?: string;
+    subpath?: string;
+    app?: string;
     members?: TestDescriptor[];
     isDisabled?: boolean;
     timeoutMs?: number;
@@ -22,6 +24,7 @@ export interface TestDescriptor {
     runAt?: Date;
     passed?: boolean;
     durationMs?: number;
+    picsValues?: PicsFile;
 }
 export interface TestFileDescriptor extends TestDescriptor {
     path: string;
@@ -29,7 +32,14 @@ export interface TestFileDescriptor extends TestDescriptor {
 export interface TestSuiteDescriptor extends TestDescriptor {
     members: TestDescriptor[];
 }
+export interface RootTestDescriptor extends TestDescriptor {
+    format?: number;
+}
 export declare namespace TestDescriptor {
+    /**
+     * Used to validate format of test descriptor files.
+     */
+    const CURRENT_FORMAT = 2;
     type Kind = "suite" | "js" | "py" | "yaml" | "manual" | "step";
     const DEFAULT_FILENAME = "build/test-report.json";
     interface Filesystem extends FilesystemSync<Stat> {
@@ -38,23 +48,18 @@ export declare namespace TestDescriptor {
     interface Stat extends FilesystemSync.Stat {
         descriptor: TestDescriptor;
     }
-    /**
-     * Create a filtering predicate based on specified criteria.
-     *
-     * The predicate treats tests as atomic and ignores empty suites.
-     */
-    function predicateFor(criteria: {
+    type Criteria = {
         includePaths?: string[];
         kinds?: Kind[];
         pics?: PicsFile;
-    }): Predicate;
-    interface Predicate {
-        (descriptor: TestDescriptor, recurse: () => TestDescriptor | undefined): TestDescriptor | undefined;
-    }
+        predicate?: (descriptor: TestDescriptor) => boolean;
+    };
     /**
-     * Filter a {@link TestDescriptor} hierarchy using a predicate.
+     * Create a filter function for specified criteria.
+     *
+     * The filter treats tests as atomic and ignores empty suites.
      */
-    function filter(descriptor: TestDescriptor, predicate: Predicate): TestDescriptor | undefined;
+    function filter(descriptor: TestDescriptor, criteria: Criteria): TestDescriptor | undefined;
     /**
      * Visit a {@link TestDescriptor} hierarchy.
      */

package/dist/esm/test-descriptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-descriptor.d.ts","sourceRoot":"","sources":["../../src/test-descriptor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACvD,OAAO,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,yBAAiB,cAAc,CAAC;IAC5B,KAAY,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE/D,MAAM,gBAAgB,2BAA2B,CAAC;IAEzD,UAAiB,UAAW,SAAQ,cAAc,CAAC,IAAI,CAAC;QACpD,UAAU,EAAE,cAAc,CAAC;KAC9B;IAED,UAAiB,IAAK,SAAQ,cAAc,CAAC,IAAI;QAC7C,UAAU,EAAE,cAAc,CAAC;KAC9B;IAED;;;;OAIG;IACH,SAAgB,YAAY,CAAC,QAAQ,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;KAAE,GAAG,SAAS,CA4D9G;IAED,UAAiB,SAAS;QACtB,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;KACvG;IAED;;OAEG;IACH,SAAgB,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,CAqBnG;IAED;;OAEG;IACH,SAAgB,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,GAAG,IAAI,CAY1G;IAED;;OAEG;IACH,SAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwBrE;IAED;;OAEG;IACH,SAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,iBAEvE;IAED;;;;;OAKG;IACH,SAAgB,KAAK,CAAC,CAAC,SAAS,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CA8CvF;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC,UAAU,CA+G1E;CACJ"}
+{"version":3,"file":"test-descriptor.d.ts","sourceRoot":"","sources":["../../src/test-descriptor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,QAAQ,CAAC;CACzB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACvD,OAAO,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,yBAAiB,cAAc,CAAC;IAC5B;;OAEG;IACI,MAAM,cAAc,IAAI,CAAC;IAEhC,KAAY,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAE/D,MAAM,gBAAgB,2BAA2B,CAAC;IAEzD,UAAiB,UAAW,SAAQ,cAAc,CAAC,IAAI,CAAC;QACpD,UAAU,EAAE,cAAc,CAAC;KAC9B;IAED,UAAiB,IAAK,SAAQ,cAAc,CAAC,IAAI;QAC7C,UAAU,EAAE,cAAc,CAAC;KAC9B;IAED,KAAY,QAAQ,GAAG;QACnB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;QACf,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,cAAc,KAAK,OAAO,CAAC;KACvD,CAAC;IAEF;;;;OAIG;IACH,SAAgB,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS,CA6EjG;IAED;;OAEG;IACH,SAAgB,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,GAAG,IAAI,CAY1G;IAED;;OAEG;IACH,SAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwBrE;IAED;;OAEG;IACH,SAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,iBAKvE;IAED;;;;;OAKG;IACH,SAAgB,KAAK,CAAC,CAAC,SAAS,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CA8CvF;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC,UAAU,CA+G1E;CACJ"}

package/dist/esm/test-descriptor.js

@@ -4,74 +4,70 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { readFile, writeFile } from "node:fs/promises";
-import { PicsExpression } from "./chip/pics-expression.js";
+import { PicsExpression } from "./chip/pics/expression.js";
 var TestDescriptor;
 ((TestDescriptor2) => {
+  TestDescriptor2.CURRENT_FORMAT = 2;
   TestDescriptor2.DEFAULT_FILENAME = "build/test-report.json";
-  function predicateFor(criteria) {
-    const { includePaths, kinds, pics } = criteria;
-    let inclusion;
+  function filter(descriptor, criteria) {
+    const { includePaths, kinds, pics, predicate } = criteria;
+    let memberNames;
     if (includePaths) {
-      inclusion = {};
+      memberNames = {};
       for (const path of includePaths) {
-        let incl = inclusion;
-        for (const segment of path.split("/").filter((segment2) => segment2 !== "")) {
+        let incl = memberNames;
+        const segments = path.split("/");
+        if (segments[0] === "") {
+          segments[0] = descriptor.name;
+        }
+        for (const segment of segments) {
           incl = incl[segment] ??= {};
         }
       }
     }
-    let firstLevel = true;
-    return (descriptor, recurse) => {
-      if (!firstLevel && inclusion && !inclusion[descriptor.name]) {
+    return filter2(descriptor, memberNames);
+    function filter2(descriptor2, names) {
+      const memberNames2 = names?.[descriptor2.name];
+      if (names && !memberNames2) {
         return;
       }
-      if (pics && descriptor.pics !== void 0) {
-        const expr = new PicsExpression(descriptor.pics);
+      if (pics && descriptor2.pics !== void 0) {
+        descriptor2.picsValues = pics;
+        const expr = new PicsExpression(descriptor2.pics);
         if (!expr.evaluate(pics)) {
           return;
         }
       }
-      if (descriptor.kind === "suite") {
-        const revertInclusion = inclusion;
-        try {
-          if (firstLevel) {
-            firstLevel = false;
-          } else if (inclusion) {
-            inclusion = inclusion[descriptor.name];
+      if (descriptor2.kind === "suite") {
+        const { members } = descriptor2;
+        if (!members?.length) {
+          return;
+        }
+        let filteredMembers;
+        for (const member of members) {
+          const filteredMember = filter2(member, memberNames2);
+          if (!filteredMember) {
+            continue;
           }
-          const result = recurse();
-          if (!result?.members?.length) {
-            return;
+          if (predicate && !predicate(filteredMember)) {
+            continue;
+          }
+          if (filteredMembers) {
+            filteredMembers.push(filteredMember);
+          } else {
+            filteredMembers = [filteredMember];
           }
-          return result;
-        } finally {
-          inclusion = revertInclusion;
         }
-      }
-      if (kinds && !kinds.includes(descriptor.kind)) {
+        if (filteredMembers) {
+          return { ...descriptor2, members: filteredMembers };
+        }
         return;
       }
-      return descriptor;
-    };
-  }
-  TestDescriptor2.predicateFor = predicateFor;
-  function filter(descriptor, predicate) {
-    return predicate(descriptor, () => {
-      let { members } = descriptor;
-      if (members) {
-        members = members.map((member) => filter(member, predicate)).filter((member) => member);
-      }
-      if (descriptor.members === void 0 || members?.length === descriptor.members?.length) {
-        return descriptor;
-      }
-      descriptor = { ...descriptor };
-      if (members?.length) {
-        descriptor.members = members;
-      } else {
-        delete descriptor.members;
+      if (kinds && !kinds.includes(descriptor2.kind)) {
+        return;
       }
-      return descriptor;
-    });
+      return descriptor2;
+    }
   }
   TestDescriptor2.filter = filter;
   function visit(descriptor, fn) {
@@ -94,7 +90,7 @@ var TestDescriptor;
     };
     try {
       const json = await readFile(path, "utf-8");
-      descriptor = JSON.parse(json);
+      descriptor = JSON.parse(json, (k, v) => k === "picsValues" ? void 0 : v);
       if (typeof descriptor?.name !== "string" || descriptor.kind !== "suite" || !Array.isArray(descriptor.members)) {
         throw new Error(`Invalid test descriptor "${path}"`);
       }
@@ -107,7 +103,10 @@ var TestDescriptor;
   }
   TestDescriptor2.open = open;
   async function save(path, descriptor) {
-    await writeFile(path, JSON.stringify(descriptor, void 0, 4));
+    await writeFile(
+      path,
+      JSON.stringify(descriptor, (k, v) => k === "picsValues" ? void 0 : v, 4)
+    );
   }
   TestDescriptor2.save = save;
   function merge(previous, updates) {

package/dist/esm/test-descriptor.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/test-descriptor.ts"],
-  "mappings": "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",
-  "names": ["TestDescriptor", "segment", "descriptor"]
+  "mappings": "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",
+  "names": ["TestDescriptor", "filter", "descriptor", "memberNames"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/testing",
-    "version": "0.13.1-alpha.0-20250501-80c86b03e",
+    "version": "0.13.1-alpha.0-20250504-87f265a2e",
     "description": "Test harness for running JavaScript and Matter certification tests",
     "type": "module",
     "scripts": {
@@ -45,7 +45,7 @@
         "#tools/ansi-text": "@matter/tools/ansi-text"
     },
     "dependencies": {
-        "@matter/tools": "0.13.1-alpha.0-20250501-80c86b03e",
+        "@matter/tools": "0.13.1-alpha.0-20250504-87f265a2e",
         "@types/express": "^5.0.1",
         "ansi-colors": "^4.1.3",
         "chai": "^4.5.0",

package/src/chip/chip.ts

@@ -12,7 +12,7 @@ import type { Container } from "../docker/container.js";
 import { afterOne, beforeOne } from "../mocha.js";
 import type { TestRunner } from "../runner.js";
 import { TestDescriptor } from "../test-descriptor.js";
-import { PicsFile } from "./pics-file.js";
+import { PicsFile } from "./pics/file.js";
 import { State } from "./state.js";
 
 /**
@@ -28,6 +28,7 @@ import { State } from "./state.js";
  * We execute test logic within a Docker container available at {@link https://github.com/matter-js/matter.js-chip}.
  */
 export interface Chip extends chip.Builder {
+    (subject: Subject): chip.Builder;
     (...include: string[]): chip.Builder;
 
     /**
@@ -98,7 +99,12 @@ export interface Chip extends chip.Builder {
     /**
      * The active PICS configuration.
      */
-    pics: PicsFile;
+    defaultPics: PicsFile;
+
+    /**
+     * The filename for default PICS in the container.
+     */
+    defaultPicsFile: string;
 
     /**
      * The timeout for tests without an explicit timeout (defaults to 30s).
@@ -140,13 +146,12 @@ function createBuilder(initial: {
                 }
             }
 
-            const predicate = TestDescriptor.predicateFor({
+            const tests = TestDescriptor.filter(chip.tests.descriptor, {
                 includePaths: [...includePaths],
                 kinds: ["py", "yaml"],
-                pics: chip.pics,
+                pics: subject?.pics ?? chip.defaultPics,
             });
 
-            const tests = TestDescriptor.filter(chip.tests.descriptor, predicate);
             if (!tests?.members) {
                 return this;
             }
@@ -159,10 +164,7 @@ function createBuilder(initial: {
         },
 
         exclude(...glob: string[]) {
-            const tests = TestDescriptor.filter(
-                chip.tests.descriptor,
-                TestDescriptor.predicateFor({ includePaths: globSync(glob, chip.tests) }),
-            );
+            const tests = TestDescriptor.filter(chip.tests.descriptor, { includePaths: globSync(glob, chip.tests) });
 
             if (!tests) {
                 return this;
@@ -231,16 +233,16 @@ function createBuilder(initial: {
     function defineTests(descriptor: TestDescriptor) {
         switch (descriptor.kind) {
             case "suite":
-                implementSuite(descriptor);
+                defineSuite(descriptor);
                 break;
 
             default:
-                implementTest(descriptor);
+                defineTest(descriptor);
                 break;
         }
     }
 
-    function implementSuite(descriptor: TestDescriptor) {
+    function defineSuite(descriptor: TestDescriptor) {
         const mocha = State.mocha;
 
         const { name, members } = descriptor;
@@ -277,7 +279,7 @@ function createBuilder(initial: {
         });
     }
 
-    function implementTest(descriptor: TestDescriptor) {
+    function defineTest(descriptor: TestDescriptor) {
         State.install();
         const test = chip.testFor(descriptor);
         const mochaTest = it(descriptor.name, function () {
@@ -300,8 +302,16 @@ function createBuilder(initial: {
     }
 }
 
-function chipFn(...include: string[]): chip.Builder {
-    return createBuilder({ include });
+function chipFn(subjectOrFirstInclusion: Subject.Factory | string | undefined, ...include: string[]): chip.Builder {
+    if (typeof subjectOrFirstInclusion === "function") {
+        return chip.subject(subjectOrFirstInclusion).include(...include);
+    }
+
+    if (typeof subjectOrFirstInclusion === "string") {
+        include = [subjectOrFirstInclusion, ...include];
+    }
+
+    return createBuilder({ include: [...include] });
 }
 
 Object.defineProperties(chipFn, {
@@ -339,8 +349,12 @@ Object.defineProperties(chipFn, {
         get: () => State.isInitialized,
     },
 
-    pics: {
-        get: () => State.pics,
+    defaultPics: {
+        get: () => State.defaultPics,
+    },
+
+    defaultPicsFilename: {
+        get: () => State.defaultPicsFilename,
     },
 
     pullBeforeTesting: {

package/src/chip/command-pipe.ts

@@ -17,9 +17,13 @@ export abstract class CommandPipe {
     #filename: string;
     #subject: BackchannelCommand.Subject;
 
-    constructor(subject: BackchannelCommand.Subject, appName: string) {
+    constructor(subject: BackchannelCommand.Subject, filename: string) {
         this.#subject = subject;
-        this.#filename = `/tmp/chip_${appName}_fifo_${process.pid}`;
+        this.#filename = filename;
+    }
+
+    static filenameFor(app: string) {
+        return `/tmp/chip_${app}_fifo_${process.pid}`;
     }
 
     get filename() {

package/src/chip/config.ts

@@ -5,6 +5,7 @@
  */
 
 import { env } from "node:process";
+import { PicsSource } from "./pics/source.js";
 
 /**
  * Significant locations within the test container.
@@ -17,7 +18,6 @@ export namespace ContainerPaths {
     export const descriptorFile = `/lib/test-descriptor.json`;
     export const pythonCommissioner = `/src/python_testing/hello_test.py`;
     export const chipPics = "/src/app/tests/suites/certification/ci-pics-values";
-    export const matterJsPics = "/matter-js-pics.properties";
     export const accessoryClient =
         "/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/accessory_server_bridge.py";
 }
@@ -56,8 +56,6 @@ export namespace Constants {
     export const initTimeout = 60_000;
     export const defaultTimeoutMs = 60_000;
 
-    export const localPicsOverrideFile = "src/chip/matter-js-pics.properties";
-
     /**
      * We set the commissioning timeout value very low because this timeout is tested and waiting the default 180s.
      * sucks.  The timeout must be high enough for actual commissioning to succeed.
@@ -74,9 +72,6 @@ export namespace Constants {
      * Default arguments provided to the YAML runner.
      */
     export const YamlRunnerArgs = [
-        "--PICS",
-        ContainerPaths.matterJsPics,
-
         // This makes CHIP logs unconditional which would be nice if it intermingled with our logs but currently they
         // only appear once test is run; haven't tracked down how to stream them yet
         // "--show_adapter_logs",
@@ -93,12 +88,17 @@ export namespace Constants {
      * Default arguments provided to the Python runner.
      */
     export const PythonRunnerArgs = [
-        "--PICS",
-        ContainerPaths.matterJsPics,
-
         // Our PID is meaningless within the container but Python uses in the name of the command pipe.  We pass in our
         // actual PID to ensure no collision if multiple instances run
         "--app-pid",
         process.pid.toString(),
     ];
+
+    export const defaultPics: PicsSource = {
+        kind: "composite",
+        sources: [
+            { kind: "chip", name: ContainerPaths.chipPics },
+            { kind: "file", name: "src/chip/matter-js-pics.properties" },
+        ],
+    };
 }