@telorun/test 0.4.31 → 0.4.33

package/dist/suite.js

@@ -1,3 +1,4 @@
+import { selectByPatterns } from "@telorun/glob";
 import { Kernel, LocalFileSource } from "@telorun/kernel";
 import { Type } from "@sinclair/typebox";
 import * as fs from "fs";
@@ -38,35 +39,25 @@ function createColors(stream) {
         dim: (t) => c("2", t),
     };
 }
-function globToRegex(pattern) {
-    const re = pattern
-        .replace(/[.+^${}()|[\]\\]/g, "\\$&")
-        .replace(/\*\*\//g, "(.+/)?")
-        .replace(/\*/g, "[^/]+");
-    return new RegExp(`^${re}$`);
-}
 function discoverTests(baseDir, include, exclude, filter) {
     const entries = fs.readdirSync(baseDir, { recursive: true, encoding: "utf8" });
-    const includeRe = include.map(globToRegex);
-    const excludeRe = exclude.map(globToRegex);
-    const results = [];
+    const rels = entries.map((entry) => entry.replace(/\\/g, "/"));
+    // Match with the monorepo's single glob engine. `applyDefaultIgnore: false`
+    // skips only the soft tier; the hard tier still denies `node_modules` — the
+    // symlinked workspace dupes / vendored copies that must never run as
+    // workspace tests — so discovery only adds the user-facing `exclude`
+    // (defaults to __fixtures__).
+    const selected = selectByPatterns(rels, include, {
+        applyDefaultIgnore: false,
+        exclude,
+    });
     // Dedupe by realpath: pnpm symlinks workspace packages into multiple
     // node_modules locations, so the same test file can be reached via
     // many paths. Without dedupe, recursive traversal yields the same yaml
     // dozens of times under different prefixes.
     const seen = new Set();
-    for (const entry of entries) {
-        const rel = entry.replace(/\\/g, "/");
-        // Hard-skip node_modules: those are always symlinked workspace dupes
-        // (or vendored copies that shouldn't run as workspace tests). The
-        // user-facing `exclude` defaults to `__fixtures__` only, but
-        // node_modules is a hard architectural skip.
-        if (rel.split("/").includes("node_modules"))
-            continue;
-        if (!includeRe.some((re) => re.test(rel)))
-            continue;
-        if (excludeRe.some((re) => re.test(rel)))
-            continue;
+    const results = [];
+    for (const rel of selected) {
         if (filter && !rel.includes(filter))
             continue;
         const abs = path.resolve(baseDir, rel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/test",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "Telo Test module - Test runner for Telo manifests.",
   "keywords": [
     "telo",
@@ -33,12 +33,13 @@
   ],
   "dependencies": {
     "@sinclair/typebox": "^0.34.48",
-    "@telorun/kernel": "0.37.0"
+    "@telorun/glob": "0.2.0",
+    "@telorun/kernel": "0.39.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0",
-    "@telorun/sdk": "0.36.0"
+    "@telorun/sdk": "0.38.0"
   },
   "peerDependencies": {
     "@telorun/sdk": "*"

package/src/suite.ts

@@ -1,3 +1,4 @@
+import { selectByPatterns } from "@telorun/glob";
 import { Kernel, LocalFileSource } from "@telorun/kernel";
 import type { ResourceContext, Runnable } from "@telorun/sdk";
 import { Static, Type } from "@sinclair/typebox";
@@ -62,14 +63,6 @@ function createColors(stream: NodeJS.WritableStream) {
   };
 }
 
-function globToRegex(pattern: string): RegExp {
-  const re = pattern
-    .replace(/[.+^${}()|[\]\\]/g, "\\$&")
-    .replace(/\*\*\//g, "(.+/)?")
-    .replace(/\*/g, "[^/]+");
-  return new RegExp(`^${re}$`);
-}
-
 function discoverTests(
   baseDir: string,
   include: string[],
@@ -77,25 +70,25 @@ function discoverTests(
   filter?: string,
 ): string[] {
   const entries = fs.readdirSync(baseDir, { recursive: true, encoding: "utf8" });
-  const includeRe = include.map(globToRegex);
-  const excludeRe = exclude.map(globToRegex);
+  const rels = entries.map((entry) => entry.replace(/\\/g, "/"));
+
+  // Match with the monorepo's single glob engine. `applyDefaultIgnore: false`
+  // skips only the soft tier; the hard tier still denies `node_modules` — the
+  // symlinked workspace dupes / vendored copies that must never run as
+  // workspace tests — so discovery only adds the user-facing `exclude`
+  // (defaults to __fixtures__).
+  const selected = selectByPatterns(rels, include, {
+    applyDefaultIgnore: false,
+    exclude,
+  });
 
-  const results: string[] = [];
   // Dedupe by realpath: pnpm symlinks workspace packages into multiple
   // node_modules locations, so the same test file can be reached via
   // many paths. Without dedupe, recursive traversal yields the same yaml
   // dozens of times under different prefixes.
   const seen = new Set<string>();
-
-  for (const entry of entries) {
-    const rel = entry.replace(/\\/g, "/");
-    // Hard-skip node_modules: those are always symlinked workspace dupes
-    // (or vendored copies that shouldn't run as workspace tests). The
-    // user-facing `exclude` defaults to `__fixtures__` only, but
-    // node_modules is a hard architectural skip.
-    if (rel.split("/").includes("node_modules")) continue;
-    if (!includeRe.some((re) => re.test(rel))) continue;
-    if (excludeRe.some((re) => re.test(rel))) continue;
+  const results: string[] = [];
+  for (const rel of selected) {
     if (filter && !rel.includes(filter)) continue;
     const abs = path.resolve(baseDir, rel);
     let real: string;