@savvy-web/tsdown-plugins 2.11.5 → 2.11.7

package/build/strip-maps.js

@@ -1,7 +1,7 @@
 import { rmSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { Result } from "effect";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { Result } from "effect";
 import { descendSync } from "@effected/walker";
 import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 

package/build/sync-public.js

@@ -2,8 +2,8 @@ import { findRelativeSpecifiers } from "../dts/relative-imports.js";
 import { ConfigValidationError } from "../errors.js";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { Result } from "effect";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { Result } from "effect";
 import { descendSync } from "@effected/walker";
 import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 

package/dts/resolved-tsconfig.js

@@ -2,7 +2,9 @@ import { tsconfigSyncOptions } from "../tsconfig/sync-options.js";
 import { existsSync, realpathSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { tmpdir } from "node:os";
+import { GlobPattern, GlobPatternOptions } from "@effected/glob";
 import { TsconfigLoaderSync } from "@effected/tsconfig-json";
+import { Result } from "effect";
 
 // src/dts/resolved-tsconfig.ts
 /**
@@ -113,25 +115,33 @@ function absoluteFileSet(configPath, baseDir) {
 		...exclude !== void 0 ? { exclude } : {}
 	};
 }
-const GLOB_CHARS = /[*?{[]/;
+/**
+* tsconfig globs have only `*`, `?` and `**`: an extglob's parentheses, or a leading `#` or `!`, are literal
+* text in a directory name, so none of them may end the literal prefix.
+*/
+const TSCONFIG_GLOB = GlobPatternOptions.make({
+	noext: true,
+	nocomment: true,
+	nonegate: true
+});
 /**
 * Resolve symlinks in the literal directory prefix of an absolute path or glob (everything before the
-* first segment carrying a glob character), leaving the pattern tail untouched. A prefix that does not
-* exist is returned unchanged.
+* first segment carrying a glob character), leaving the pattern tail untouched. A pattern the kit rejects,
+* a prefix that does not exist, or one whose spelling the kit changed (an undone escape) is returned unchanged.
 */
 function canonicalGlob(absPath) {
-	const segments = absPath.split("/");
-	let firstGlob = segments.findIndex((seg) => GLOB_CHARS.test(seg));
-	if (firstGlob === -1) firstGlob = segments.length;
-	const prefix = segments.slice(0, firstGlob).join("/") || "/";
-	const tail = segments.slice(firstGlob);
+	const compiled = GlobPattern.compileResult(absPath, TSCONFIG_GLOB);
+	if (Result.isFailure(compiled)) return absPath;
+	const prefix = compiled.success.literalPrefix;
+	if (!absPath.startsWith(prefix)) return absPath;
+	const tail = absPath.slice(prefix.length);
 	let canonicalPrefix;
 	try {
 		canonicalPrefix = realpathSync.native(prefix);
 	} catch {
 		return absPath;
 	}
-	return tail.length === 0 ? canonicalPrefix : join(canonicalPrefix, ...tail);
+	return /^\/*$/.test(tail) ? canonicalPrefix : join(canonicalPrefix, tail);
 }
 /**
 * Write the resolved tsconfig to a temp file and return its absolute path.

package/meta/scrub-declaration-maps.js

@@ -1,7 +1,7 @@
 import { readFileSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { Result } from "effect";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
+import { Result } from "effect";
 import { descendSync } from "@effected/walker";
 import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 import { decode, encode } from "@jridgewell/sourcemap-codec";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/tsdown-plugins",
-	"version": "2.11.5",
+	"version": "2.11.7",
 	"private": false,
 	"description": "Interface-only tsdown/rolldown plugin pack powering @savvy-web/bundler",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/tsdown-plugins",
@@ -30,24 +30,23 @@
 	},
 	"dependencies": {
 		"@changesets/get-release-plan": "^5.0.2",
-		"@effect/platform-node": "~4.1.1",
-		"@effected/env": "^0.9.0",
-		"@effected/glob": "^0.17.0",
-		"@effected/images": "^0.8.0",
-		"@effected/jsonc": "^0.22.0",
-		"@effected/npm": "^0.29.0",
-		"@effected/package-json": "^0.28.0",
-		"@effected/semver": "^0.20.0",
-		"@effected/tsconfig-json": "^0.19.0",
-		"@effected/walker": "^0.24.0",
-		"@effected/workspaces": "^0.41.0",
+		"@effect/platform-node": "~4.1.2",
+		"@effected/env": "^0.11.0",
+		"@effected/glob": "^0.19.0",
+		"@effected/images": "^0.9.0",
+		"@effected/jsonc": "^0.24.0",
+		"@effected/npm": "^0.30.1",
+		"@effected/package-json": "^0.30.0",
+		"@effected/semver": "^0.22.0",
+		"@effected/tsconfig-json": "^0.20.1",
+		"@effected/walker": "^0.25.1",
+		"@effected/workspaces": "^0.43.0",
 		"@jridgewell/sourcemap-codec": "^1.6.0",
 		"@microsoft/api-extractor": "^7.60.1",
 		"@microsoft/tsdoc": "~0.17.1",
 		"@microsoft/tsdoc-config": "~0.18.3",
-		"@tsdoctor/manifest": "^0.3.0",
-		"effect": "~4.1.1",
-		"picocolors": "^1.1.1",
+		"@tsdoctor/manifest": "^0.4.0",
+		"effect": "~4.1.2",
 		"tsdown": "^0.23.4",
 		"typescript": "7.1.0-beta"
 	}

package/report/formatters/terminal.js

@@ -1,6 +1,6 @@
 import { formatTime } from "../timer.js";
 import { ciFatalCallout, ciFatalCountForPackage, suppressedSummary } from "./diagnostics.js";
-import pc from "picocolors";
+import { Sgr } from "@effected/env";
 
 // src/report/formatters/terminal.ts
 const fmtBytes = (n) => n < 1024 ? `${n} B` : `${(n / 1024).toFixed(2)} kB`;
@@ -12,40 +12,41 @@ const diagLine = (d) => {
 const TerminalFormatter = {
 	format: "terminal",
 	render: (reports, ctx) => {
-		const color = (fn, s) => ctx.noColor ? s : fn(s);
+		const level = ctx.noColor ? "none" : "basic";
+		const color = (style, s) => Sgr.paint(level, style, s);
 		const lines = [];
 		let totalMs = 0;
 		for (const r of reports) {
-			lines.push(color(pc.bold, r.package));
+			lines.push(color("bold", r.package));
 			for (const g of r.targetGroups) {
-				const status = g.errors.length ? color(pc.red, "✗") : color(pc.green, "✓");
+				const status = g.errors.length ? color("red", "✗") : color("green", "✓");
 				lines.push(`  ${status} ${g.id}  ${fileCount(g)} files · ${formatTime(g.timings.totalMs)}`);
 				totalMs += g.timings.totalMs;
 				if (ctx.verbose) for (const p of g.passes) {
-					lines.push(`    ${color(pc.dim, `${p.id} (${formatTime(p.ms)})`)}`);
+					lines.push(`    ${color("dim", `${p.id} (${formatTime(p.ms)})`)}`);
 					for (const f of p.files) {
 						const gz = f.gzip !== void 0 ? ` │ gzip ${fmtBytes(f.gzip)}` : "";
 						lines.push(`      ${f.path}  ${fmtBytes(f.bytes)}${gz}`);
 					}
 				}
-				for (const e of g.errors) lines.push(`    ${color(pc.red, "error")} ${diagLine(e)}`);
+				for (const e of g.errors) lines.push(`    ${color("red", "error")} ${diagLine(e)}`);
 				for (const w of g.warnings) {
-					const tag = w.ciFatal === true ? color(pc.red, " [fails CI]") : "";
-					lines.push(`    ${color(pc.yellow, "warn")} ${diagLine(w)}${tag}`);
+					const tag = w.ciFatal === true ? color("red", " [fails CI]") : "";
+					lines.push(`    ${color("yellow", "warn")} ${diagLine(w)}${tag}`);
 				}
 				if (g.suppressed.length > 0) {
-					if (ctx.verbose) for (const s of g.suppressed) lines.push(`    ${color(pc.dim, `suppressed ${s.code ?? "?"}`)} ${diagLine(s)}`);
-					else lines.push(`    ${color(pc.dim, `suppressed ${g.suppressed.length}: ${suppressedSummary(g.suppressed)}`)}`);
+					if (ctx.verbose) for (const s of g.suppressed) lines.push(`    ${color("dim", `suppressed ${s.code ?? "?"}`)} ${diagLine(s)}`);
+					else lines.push(`    ${color("dim", `suppressed ${g.suppressed.length}: ${suppressedSummary(g.suppressed)}`)}`);
 				}
 			}
 			const fatal = ciFatalCountForPackage(r);
-			if (fatal > 0) lines.push(`  ${color(pc.red, ciFatalCallout(fatal))}`);
+			if (fatal > 0) lines.push(`  ${color("red", ciFatalCallout(fatal))}`);
 		}
 		const pkgs = reports.length;
 		if (pkgs > 0) {
 			const pkgLabel = `${pkgs} package${pkgs === 1 ? "" : "s"}`;
 			const hasErrors = reports.some((r) => r.targetGroups.some((g) => g.errors.length > 0));
-			lines.push(hasErrors ? `${color(pc.red, "✗")} build failed · ${pkgLabel} · ${formatTime(totalMs)}` : `${color(pc.green, "✔")} build complete · ${pkgLabel} · ${formatTime(totalMs)}`);
+			lines.push(hasErrors ? `${color("red", "✗")} build failed · ${pkgLabel} · ${formatTime(totalMs)}` : `${color("green", "✔")} build complete · ${pkgLabel} · ${formatTime(totalMs)}`);
 		}
 		const content = lines.join("\n");
 		return content === "" ? [] : [{

package/report/tsdown-logger.js

@@ -1,6 +1,7 @@
+import { Sgr } from "@effected/env";
+
 // src/report/tsdown-logger.ts
-const ANSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
-const join = (args) => args.map((a) => String(a)).join(" ").replace(ANSI, "").trim();
+const join = (args) => Sgr.strip(args.map((a) => String(a)).join(" ")).trim();
 /**
 * Warnings that are advisory noise for THIS builder and go to the `suppressed` bucket (recorded
 * for accounting, never surfaced). rolldown-plugin-dts announces its tsgo generator as experimental