@markless/bundler 0.1.1 → 0.2.1

package/dist/vite.js

@@ -1,6 +1,9 @@
-import { b as outputDefaults, p as executionLogActivationInjection } from "./source-module-CSRzW4Ny.js";
-import { l as createPreloadGraphAdder, t as createMarklessRolldownPlugin } from "./rolldown-Czh1duwk.js";
+import { MARKLESS_DEV_ERROR_CLEAR_EVENT, MARKLESS_DEV_ERROR_CLIENT_ID, MARKLESS_DEV_ERROR_EVENT, normalizeMarklessDevError } from "./dev-error.js";
+import { m as executionLogActivationInjection, x as outputDefaults } from "./source-module-C8W2THUI.js";
+import { a as preflightTsrxModuleDiagnostics, t as createMarklessRolldownPlugin, u as createPreloadGraphAdder } from "./rolldown-CpG_S-ZJ.js";
 import { joinURL, parsePath } from "ufo";
+import { readFile } from "node:fs/promises";
+import { isAbsolute } from "node:path";
 //#region src/vite/dev-tags.ts
 function createDevTags() {
 	const tags = [];
@@ -61,27 +64,211 @@ function fetchableDevEnvironment(environment) {
 	if (typeof maybeFetchable.dispatchFetch === "function") return maybeFetchable;
 }
 //#endregion
+//#region src/dev-error/client-asset.ts
+function createDevErrorClientAsset(viteClientUrl) {
+	const base = viteClientUrl.endsWith("/@vite/client") ? viteClientUrl.slice(0, -13) : "";
+	return `import { createHotContext } from ${JSON.stringify(viteClientUrl)};
+const hot = createHotContext(${JSON.stringify(MARKLESS_DEV_ERROR_CLIENT_ID)});
+const ERROR_EVENT = ${JSON.stringify(MARKLESS_DEV_ERROR_EVENT)};
+const CLEAR_EVENT = ${JSON.stringify(MARKLESS_DEV_ERROR_CLEAR_EVENT)};
+const ELEMENT = 'markless-dev-error-overlay';
+const SUPPRESSION = 'data-markless-vite-overlay-suppression';
+const OPEN_IN_EDITOR = ${JSON.stringify(`${base}/__open-in-editor`)};
+let currentPayload;
+let observer;
+
+const styles = ${JSON.stringify(`
+:host{position:fixed;inset:0;z-index:2147483647;display:grid;place-items:center;padding:clamp(1rem,4vw,3rem);background:#0008;color:CanvasText;font-family:system-ui,sans-serif}
+*{box-sizing:border-box}.panel{width:min(60rem,100%);max-height:calc(100vh - 2rem);overflow:auto;padding:clamp(1.25rem,3vw,2.5rem);border:1px solid color-mix(in srgb,CanvasText 20%,transparent);border-top:4px solid #c9362b;border-radius:.5rem;background:Canvas;box-shadow:0 1rem 3rem #0006}
+header{display:flex;flex-direction:column;gap:.6rem}.badge{align-self:flex-start;padding:.15rem .45rem;border-radius:.25rem;background:color-mix(in srgb,#c9362b 14%,Canvas);color:#c9362b;font:600 .75rem ui-monospace,monospace}h1{margin:0;font-size:clamp(1.4rem,3vw,2rem);line-height:1.2}h2{margin:1rem 0 .25rem;font-size:.8rem;text-transform:uppercase;letter-spacing:.06em;color:color-mix(in srgb,CanvasText 65%,transparent)}p{margin:.3rem 0 1rem;line-height:1.55}a{color:LinkText}.location{display:inline-block;margin-top:1rem;font:500 .9rem ui-monospace,monospace}.frame,details pre{overflow:auto;padding:1rem;border-radius:.35rem;background:color-mix(in srgb,CanvasText 7%,Canvas);font:.85rem/1.55 ui-monospace,monospace;white-space:pre}details{margin-top:1rem;border-top:1px solid color-mix(in srgb,CanvasText 15%,transparent);padding-top:1rem}summary{cursor:pointer;font-weight:600}.recovery{margin:1.5rem 0 0;color:color-mix(in srgb,CanvasText 65%,transparent);font-size:.9rem}`)};
+
+function append(parent, tag, text, className) {
+  const node = document.createElement(tag);
+  if (text !== undefined) node.textContent = text;
+  if (className) node.className = className;
+  parent.append(node);
+  return node;
+}
+function diagnosticBody(parent, diagnostic) {
+  if (diagnostic.filename && diagnostic.line != null && diagnostic.column != null) {
+    const link = append(parent, 'a', diagnostic.filename + ':' + diagnostic.line + ':' + diagnostic.column, 'location');
+    link.href = new URL(OPEN_IN_EDITOR + '?file=' + encodeURIComponent(diagnostic.filename + ':' + diagnostic.line + ':' + diagnostic.column), document.baseURI).href;
+  }
+  if (diagnostic.why) { const section = append(parent, 'section'); append(section, 'h2', 'Why'); append(section, 'p', diagnostic.why); }
+  if (diagnostic.suggestion) { const section = append(parent, 'section'); append(section, 'h2', 'Suggested fix'); append(section, 'p', diagnostic.suggestion); }
+  if (diagnostic.frame) append(parent, 'pre', diagnostic.frame, 'frame');
+  if (diagnostic.docsUrl) {
+    try {
+      const url = new URL(diagnostic.docsUrl);
+      if (url.protocol === 'http:' || url.protocol === 'https:') { const paragraph = append(parent, 'p'); const link = append(paragraph, 'a', 'Read ' + diagnostic.code + ' documentation'); link.href = url.href; }
+    } catch { /* Invalid documentation URLs are omitted. */ }
+  }
+}
+class MarklessDevErrorOverlay extends HTMLElement {
+  constructor() {
+    super();
+    const shadow = this.attachShadow({ mode: 'open' });
+    const style = append(shadow, 'style'); style.textContent = styles;
+    const panel = append(shadow, 'article', undefined, 'panel');
+    panel.addEventListener('click', (event) => event.stopPropagation());
+    this.addEventListener('click', () => this.remove());
+  }
+  show(payload) {
+    const panel = this.shadowRoot.querySelector('.panel');
+    panel.replaceChildren();
+    const primary = payload.diagnostics[0] || { code: 'MARKLESS_DEV_RUNTIME_ERROR', message: payload.details };
+    const header = append(panel, 'header'); append(header, 'span', primary.code, 'badge'); append(header, 'h1', primary.message);
+    diagnosticBody(panel, primary);
+    for (const diagnostic of payload.diagnostics.slice(1)) {
+      const details = append(panel, 'details'); append(details, 'summary', diagnostic.code + ' — ' + diagnostic.message); diagnosticBody(details, diagnostic);
+    }
+    const technical = append(panel, 'details'); append(technical, 'summary', 'Technical details'); append(technical, 'pre', [payload.details, payload.stack].filter(Boolean).join('\\n\\n'));
+    append(panel, 'p', 'Fixing the error clears this overlay. Press Escape or click the backdrop to dismiss it temporarily.', 'recovery');
+  }
+}
+if (!customElements.get(ELEMENT)) customElements.define(ELEMENT, MarklessDevErrorOverlay);
+function removeViteOverlays() { document.querySelectorAll('vite-error-overlay').forEach((node) => node.remove()); }
+function suppressViteOverlay() {
+  removeViteOverlays();
+  if (!document.head.querySelector('style[' + SUPPRESSION + ']')) { const style = append(document.head, 'style'); style.setAttribute(SUPPRESSION, ''); style.textContent = 'vite-error-overlay{display:none!important}'; }
+  if (!observer) { observer = new MutationObserver(removeViteOverlays); observer.observe(document.documentElement, { childList: true, subtree: true }); }
+}
+function reset() {
+  removeViteOverlays(); document.querySelector(ELEMENT)?.remove(); document.head.querySelector('style[' + SUPPRESSION + ']')?.remove(); observer?.disconnect(); observer = undefined; currentPayload = undefined;
+}
+function show(payload) {
+  currentPayload = payload; suppressViteOverlay(); document.querySelector(ELEMENT)?.remove(); const overlay = document.createElement(ELEMENT); overlay.show(payload); document.body.append(overlay);
+}
+hot.on(ERROR_EVENT, show);
+hot.on(CLEAR_EVENT, ({ id }) => { if (currentPayload?.id === id) reset(); });
+hot.on('vite:beforeFullReload', reset);
+addEventListener('keydown', (event) => { if (event.key === 'Escape') document.querySelector(ELEMENT)?.remove(); });
+if (window.__MARKLESS_DEV_ERROR__) show(window.__MARKLESS_DEV_ERROR__);
+`;
+}
+//#endregion
 //#region src/vite/hmr.ts
 const SOURCE_FILE_EXTENSION = /\.tsrx(?:[?#].*)?$/;
+const RESOLVED_DEV_ERROR_CLIENT_ID = `\0${MARKLESS_DEV_ERROR_CLIENT_ID}`;
 function createViteHmr(options) {
 	let server;
+	const invalidSources = /* @__PURE__ */ new Set();
+	let invalidSourceRecheck;
+	let recheckingInvalidSources = false;
+	const preflightByFile = /* @__PURE__ */ new Map();
+	function preflight(sourceId, source) {
+		const cached = preflightByFile.get(sourceId);
+		if (cached?.source === source) return cached.verdict;
+		const verdict = preflightTsrxModuleDiagnostics({
+			filename: sourceId,
+			source
+		}).then(() => ({ messagesSent: false }), (error) => ({
+			error: normalizeMarklessDevError(error, { id: sourceId }),
+			messagesSent: false
+		}));
+		preflightByFile.set(sourceId, {
+			source,
+			verdict
+		});
+		return verdict;
+	}
+	function startInvalidSourceRecheck() {
+		if (invalidSourceRecheck || invalidSources.size === 0) return;
+		invalidSourceRecheck = setInterval(() => {
+			recheckInvalidSources();
+		}, options.invalidSourceRecheckMs ?? 300);
+		invalidSourceRecheck.unref?.();
+	}
+	function stopInvalidSourceRecheckIfIdle() {
+		if (!invalidSourceRecheck || invalidSources.size !== 0) return;
+		clearInterval(invalidSourceRecheck);
+		invalidSourceRecheck = void 0;
+	}
+	function addInvalidSource(id) {
+		if (!isAbsolute(id) || !SOURCE_FILE_EXTENSION.test(id)) return;
+		invalidSources.add(id);
+		startInvalidSourceRecheck();
+	}
+	function deleteInvalidSource(id) {
+		const deleted = invalidSources.delete(id);
+		stopInvalidSourceRecheckIfIdle();
+		return deleted;
+	}
+	async function recheckInvalidSources() {
+		if (recheckingInvalidSources) return;
+		recheckingInvalidSources = true;
+		try {
+			let recovered = false;
+			for (const id of invalidSources) {
+				let source;
+				try {
+					source = await readFile(id, "utf8");
+				} catch (error) {
+					if (hasErrorCode(error, "ENOENT") || hasErrorCode(error, "EISDIR")) {
+						if (deleteInvalidSource(id)) sendClear(id);
+					}
+					continue;
+				}
+				try {
+					await preflightTsrxModuleDiagnostics({
+						filename: id,
+						source
+					});
+				} catch {
+					continue;
+				}
+				if (!deleteInvalidSource(id)) continue;
+				sendClear(id);
+				recovered = true;
+			}
+			if (recovered) server?.environments?.[options.clientEnvironment]?.hot?.send?.({ type: "full-reload" });
+		} finally {
+			recheckingInvalidSources = false;
+			stopInvalidSourceRecheckIfIdle();
+		}
+	}
+	function sendClear(id) {
+		server?.environments?.[options.clientEnvironment]?.hot?.send?.({
+			type: "custom",
+			event: MARKLESS_DEV_ERROR_CLEAR_EVENT,
+			data: { id }
+		});
+	}
+	function cleanup() {
+		if (invalidSourceRecheck) clearInterval(invalidSourceRecheck);
+		invalidSourceRecheck = void 0;
+		invalidSources.clear();
+	}
 	return {
 		configureServer(nextServer) {
 			server = nextServer;
+			nextServer.httpServer?.once("close", cleanup);
+			nextServer.watcher?.once?.("close", cleanup);
 			if (options.enabled) installFetchViteClient(nextServer, options);
 		},
 		transformIndexHtml() {},
-		resolveId(_id) {
-			return null;
+		resolveId(id) {
+			return id === "virtual:markless:dev-error-client" ? RESOLVED_DEV_ERROR_CLIENT_ID : null;
 		},
-		load(_id) {
-			return null;
+		load(id) {
+			return id === RESOLVED_DEV_ERROR_CLIENT_ID ? createDevErrorClientAsset(joinURL(options.base, "/@vite/client")) : null;
+		},
+		reportError(environment, error) {
+			const hot = clientHot(server, options, environment);
+			if (!hot?.send) return;
+			const payload = normalizeMarklessDevError(error);
+			addInvalidSource(payload.id);
+			hot.send({
+				type: "custom",
+				event: MARKLESS_DEV_ERROR_EVENT,
+				data: payload
+			});
 		},
-		hotUpdate(environment, ctx) {
+		async hotUpdate(environment, ctx) {
 			if (!environment) return;
 			const env = marklessEnvironment(environment);
 			if (env === "lib") return;
-			const hot = env === "server" ? server?.environments?.[options.clientEnvironment]?.hot : environment.hot;
+			const hot = clientHot(server, options, environment);
 			if (!hot?.send) return;
 			if (!options.enabled) {
 				hot.send({ type: "full-reload" });
@@ -94,13 +281,42 @@ function createViteHmr(options) {
 				files.add(prefix && ctx.file.startsWith(prefix) ? `/${ctx.file.slice(prefix.length)}` : ctx.file);
 			}
 			if (!files.size) return;
+			let sendMessages = true;
+			if (ctx.file && SOURCE_FILE_EXTENSION.test(ctx.file) && ctx.read) {
+				const sourceId = parsePath(ctx.file).pathname;
+				let editedSource;
+				try {
+					editedSource = await ctx.read();
+				} catch {}
+				if (editedSource !== void 0) {
+					const verdict = await preflight(sourceId, editedSource);
+					sendMessages = !verdict.messagesSent;
+					verdict.messagesSent = true;
+					if (verdict.error) {
+						if (sendMessages) {
+							addInvalidSource(verdict.error.id);
+							hot.send({
+								type: "custom",
+								event: MARKLESS_DEV_ERROR_EVENT,
+								data: verdict.error
+							});
+						}
+						return [];
+					}
+				}
+				if (editedSource !== void 0 && sendMessages && deleteInvalidSource(sourceId)) hot.send({
+					type: "custom",
+					event: MARKLESS_DEV_ERROR_CLEAR_EVENT,
+					data: { id: sourceId }
+				});
+			}
 			const invalidationEnvironments = moduleGraphEnvironments(environment, env === "server" ? server?.environments?.[options.clientEnvironment] : void 0);
 			for (const file of files) for (const candidate of hmrCandidates(file, ctx.file)) for (const id of options.invalidateGeneratedModules?.(candidate, env) ?? []) for (const targetEnvironment of invalidationEnvironments) {
 				const module = targetEnvironment.moduleGraph?.getModuleById?.(id);
 				if (!module) continue;
 				targetEnvironment.moduleGraph?.invalidateModule?.(module, /* @__PURE__ */ new Set(), ctx.timestamp, true);
 			}
-			hot.send({
+			if (sendMessages) hot.send({
 				type: "full-reload",
 				path: firstChangedFile(files),
 				triggeredBy: ctx.file
@@ -109,6 +325,9 @@ function createViteHmr(options) {
 		}
 	};
 }
+function hasErrorCode(error, code) {
+	return typeof error === "object" && error !== null && "code" in error && error.code === code;
+}
 function installFetchViteClient(server, options) {
 	for (const environment of Object.values(server.environments)) {
 		const fetchEnv = fetchableDevEnvironment(environment);
@@ -118,7 +337,7 @@ function installFetchViteClient(server, options) {
 			const response = await dispatchFetch(request);
 			if (!response.headers.get("content-type")?.includes("text/html")) return response;
 			const html = await response.text();
-			const nextHtml = injectViteClient(html, options.base);
+			const nextHtml = injectDevClients(html, options.base);
 			const headers = new Headers(response.headers);
 			if (nextHtml !== html) headers.delete("content-length");
 			return new Response(nextHtml, {
@@ -129,12 +348,16 @@ function installFetchViteClient(server, options) {
 		};
 	}
 }
-function injectViteClient(html, base) {
-	if (!html || html.includes("/@vite/client")) return html;
-	const tag = `<script type="module" src="${joinURL(base, "/@vite/client")}"><\/script>`;
-	if (html.includes("</head>")) return html.replace("</head>", `${tag}</head>`);
-	if (html.includes("<head>")) return html.replace("<head>", `<head>${tag}`);
-	return `${tag}${html}`;
+function injectDevClients(html, base) {
+	if (!html) return html;
+	const tags = [...html.includes("/@vite/client") ? [] : [`<script type="module" src="${joinURL(base, "/@vite/client")}"><\/script>`], ...html.includes("virtual:markless:dev-error-client") ? [] : [`<script type="module" src="${joinURL(base, `/@id/__x00__${MARKLESS_DEV_ERROR_CLIENT_ID}`)}"><\/script>`]].join("");
+	if (!tags) return html;
+	if (html.includes("</head>")) return html.replace("</head>", `${tags}</head>`);
+	if (html.includes("<head>")) return html.replace("<head>", `<head>${tags}`);
+	return `${tags}${html}`;
+}
+function clientHot(server, options, environment) {
+	return marklessEnvironment(environment) === "server" ? server?.environments?.[options.clientEnvironment]?.hot : environment?.hot;
 }
 function changedFiles(modules) {
 	const files = /* @__PURE__ */ new Set();
@@ -197,6 +420,21 @@ function markless(options = {}) {
 		},
 		config(config, env) {
 			command = env.command;
+			const devEnabled = env.command === "serve";
+			rolldownOptions.executionLog = options.executionLog ?? (devEnabled ? "auto" : "never");
+			const debugEnabled = devEnabled || options.debug === true;
+			rolldownOptions.inlineResumerDebug = debugEnabled;
+			const debugDefine = JSON.stringify(debugEnabled);
+			const devDefine = JSON.stringify(devEnabled);
+			const consumerDebugDefine = config.define?.__MARKLESS_DEBUG_ENABLED__;
+			const consumerDevDefine = config.define?.__MARKLESS_DEV_ENABLED__;
+			if (consumerDebugDefine !== void 0 && consumerDebugDefine !== debugDefine && consumerDebugDefine !== debugEnabled) throw new Error("MARKLESS_DEBUG_DEFINE_CONFLICT: __MARKLESS_DEBUG_ENABLED__ is controlled by markless(). Remove the consumer definition or set markless({ debug: true }).");
+			if (consumerDevDefine !== void 0 && consumerDevDefine !== devDefine && consumerDevDefine !== devEnabled) throw new Error("MARKLESS_DEV_DEFINE_CONFLICT: __MARKLESS_DEV_ENABLED__ is controlled by markless(). Remove the consumer definition.");
+			config.define = {
+				...config.define,
+				__MARKLESS_DEBUG_ENABLED__: debugDefine,
+				__MARKLESS_DEV_ENABLED__: devDefine
+			};
 			configDefaults(config, options, rolldownOptions);
 		},
 		configResolved(resolvedConfig) {
@@ -232,6 +470,7 @@ function markless(options = {}) {
 			}
 		},
 		configureServer(server) {
+			server.config.logger?.info("markless diagnostics available - window.__MARKLESS_DEBUG__ records containers, lifecycles, and event routing; markless debugging playbook: run pnpm doctor, or read agent/markless.md in the installed @markless/core package.");
 			rolldownOptions.devServer = { transformRequest: (url, environment) => transformMarklessRequest(server, url, environment, options) };
 			hmr.configureServer(server);
 		},
@@ -260,7 +499,12 @@ function markless(options = {}) {
 		},
 		transform: { async handler(code, id, transformOptions) {
 			if (rolldownOptions.dev === true && TSRX_INPUT_FILE.test(id)) transformedTsrxSources.set(parsePath(id).pathname, code);
-			return runHook(basePlugin.transform, this, code, id, transformOptions);
+			try {
+				return await runHook(basePlugin.transform, this, code, id, transformOptions);
+			} catch (error) {
+				if (rolldownOptions.dev === true && TSRX_INPUT_FILE.test(id)) hmr.reportError(this.environment, error);
+				throw error;
+			}
 		} },
 		async hotUpdate(ctx) {
 			if (await matchesTransformedTsrxSource(ctx, transformedTsrxSources)) return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markless/bundler",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Markless build plugins for Rolldown and Vite.",
   "license": "MIT",
   "repository": {
@@ -8,12 +8,16 @@
     "url": "git+https://github.com/markless-dev/markless.git",
     "directory": "packages/bundler"
   },
-  "publishConfig": {
-    "access": "public"
-  },
+  "files": [
+    "dist"
+  ],
   "type": "module",
   "sideEffects": false,
   "exports": {
+    "./dev-error": {
+      "types": "./dist/dev-error.d.ts",
+      "default": "./dist/dev-error.js"
+    },
     "./preload": {
       "types": "./dist/preload.d.ts",
       "default": "./dist/preload.js"
@@ -27,12 +31,20 @@
       "default": "./dist/vite.js"
     }
   },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  },
   "dependencies": {
     "@thi.ng/dgraph": "^2.1.205",
     "pathe": "^2.0.3",
     "ufo": "^1.6.4",
-    "@markless/compiler": "0.1.1",
-    "@markless/web": "0.1.1"
+    "@markless/compiler": "0.2.1",
+    "@markless/serializer": "0.2.1",
+    "@markless/web": "0.2.1"
+  },
+  "devDependencies": {
+    "@markless/analyzer": "0.2.1"
   },
   "peerDependencies": {
     "rolldown": "1.0.3",
@@ -46,9 +58,6 @@
       "optional": true
     }
   },
-  "files": [
-    "dist"
-  ],
   "scripts": {
     "test:boxes": "witness run"
   }