@pyreon/vite-plugin 0.13.1 → 0.15.0

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src/index.ts","uid":"e8011ffc-1"}]}],"isRoot":true},"nodeParts":{"e8011ffc-1":{"renderedLength":13659,"gzipLength":4823,"brotliLength":0,"metaUid":"e8011ffc-0"}},"nodeMetas":{"e8011ffc-0":{"id":"/src/index.ts","moduleParts":{"index.js":"e8011ffc-1"},"imported":[{"uid":"e8011ffc-2"},{"uid":"e8011ffc-3"},{"uid":"e8011ffc-4"}],"importedBy":[],"isEntry":true},"e8011ffc-2":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"e8011ffc-0"}]},"e8011ffc-3":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"e8011ffc-0"}]},"e8011ffc-4":{"id":"@pyreon/compiler","moduleParts":{},"imported":[],"importedBy":[{"uid":"e8011ffc-0"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src/index.ts","uid":"170e8aa8-1"}]}],"isRoot":true},"nodeParts":{"170e8aa8-1":{"renderedLength":22365,"gzipLength":7629,"brotliLength":0,"metaUid":"170e8aa8-0"}},"nodeMetas":{"170e8aa8-0":{"id":"/src/index.ts","moduleParts":{"index.js":"170e8aa8-1"},"imported":[{"uid":"170e8aa8-2"},{"uid":"170e8aa8-3"},{"uid":"170e8aa8-4"}],"importedBy":[],"isEntry":true},"170e8aa8-2":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"170e8aa8-0"}]},"170e8aa8-3":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"170e8aa8-0"}]},"170e8aa8-4":{"id":"@pyreon/compiler","moduleParts":{},"imported":[],"importedBy":[{"uid":"170e8aa8-0"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -1,5 +1,5 @@
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { generateContext, transformJSX } from "@pyreon/compiler";
 
 //#region src/index.ts
@@ -38,12 +38,6 @@ import { generateContext, transformJSX } from "@pyreon/compiler";
 */
 const HMR_RUNTIME_ID = "\0pyreon/hmr-runtime";
 const HMR_RUNTIME_IMPORT = "virtual:pyreon/hmr-runtime";
-const COMPAT_JSX_SOURCE = {
-	react: "@pyreon/react-compat",
-	preact: "@pyreon/preact-compat",
-	vue: "@pyreon/vue-compat",
-	solid: "@pyreon/solid-compat"
-};
 const COMPAT_ALIASES = {
 	react: {
 		react: "@pyreon/react-compat",
@@ -71,6 +65,59 @@ const COMPAT_ALIASES = {
 	}
 };
 /**
+* Detect whether a file id resolves to a `@pyreon/*` framework-package source
+* (i.e. a published Pyreon package whose .tsx is being pulled in via the
+* `bun` condition workspace-link, NOT user code, NOT an example app).
+*
+* Why this exists: in compat mode, OXC's per-project `importSource` is set
+* to `@pyreon/core` and the resolveId hook redirects `@pyreon/core/jsx-runtime`
+* to the compat package. That's correct for user code (the whole point of
+* compat mode) but WRONG for framework-internal sources like
+* `@pyreon/zero/src/link.tsx`, which need the real `@pyreon/core` runtime.
+* The fix skips the redirect when the importer is a `@pyreon/*` framework
+* file. Result: published-package consumers (where `@pyreon/zero` resolves
+* to its pre-built `lib/`) and workspace-dev consumers (where it resolves
+* to source) both get correct JSX runtime resolution.
+*
+* Detection heuristic: walk to nearest `package.json`, require BOTH:
+*   1. `name` starts with `@pyreon/` (workspace member of the @pyreon scope)
+*   2. file path contains `/packages/` AND NOT `/examples/`
+*
+* Step 2 excludes the existing `@pyreon/example-{react,vue,solid,preact}-compat`
+* apps under `examples/`. Without it, user code in those apps would skip the
+* compat-mode JSX-runtime redirect and import `@pyreon/core/jsx-runtime`
+* directly — breaking the React/Vue/Solid/Preact compat layer's contract.
+*
+* Result cached per directory. The `/packages/` + `/examples/` check is a
+* structural property of the monorepo (workspace layout), not the package
+* name — so it's robust against renames.
+*/
+function isPyreonWorkspaceFile(id, cache) {
+	const queryIdx = id.indexOf("?");
+	const filePath = queryIdx === -1 ? id : id.slice(0, queryIdx);
+	if (!filePath || filePath[0] === "\0") return false;
+	if (!filePath.includes("/packages/") || filePath.includes("/examples/")) return false;
+	let dir = dirname(filePath);
+	for (let i = 0; i < 12; i++) {
+		const cached = cache.get(dir);
+		if (cached !== void 0) return cached;
+		const pkgPath = join(dir, "package.json");
+		if (existsSync(pkgPath)) {
+			let isPyreon = false;
+			try {
+				const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+				isPyreon = typeof pkg.name === "string" && pkg.name.startsWith("@pyreon/");
+			} catch {}
+			cache.set(dir, isPyreon);
+			return isPyreon;
+		}
+		const parent = dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return false;
+}
+/**
 * Return the Pyreon compat target for an import specifier, or undefined if
 * the import should not be redirected.
 */
@@ -90,20 +137,21 @@ function pyreonPlugin(options) {
 	const compat = options?.compat;
 	let isBuild = false;
 	let projectRoot = "";
+	const signalExportRegistry = /* @__PURE__ */ new Map();
+	const resolveCache = /* @__PURE__ */ new Map();
+	const pyreonWorkspaceDirCache = /* @__PURE__ */ new Map();
 	return {
 		name: "pyreon",
 		enforce: "pre",
 		config(userConfig, env) {
 			isBuild = env.command === "build";
 			projectRoot = userConfig.root ?? process.cwd();
-			const optimizeDepsExclude = compat ? Object.keys(COMPAT_ALIASES[compat]) : [];
-			const jsxSource = compat ? COMPAT_JSX_SOURCE[compat] : "@pyreon/core";
 			return {
 				resolve: { conditions: ["bun"] },
-				optimizeDeps: { exclude: optimizeDepsExclude },
+				optimizeDeps: { exclude: compat ? Object.keys(COMPAT_ALIASES[compat]) : [] },
 				oxc: { jsx: {
 					runtime: "automatic",
-					importSource: jsxSource
+					importSource: "@pyreon/core"
 				} },
 				...env.isSsrBuild && ssrConfig ? { build: {
 					ssr: true,
@@ -111,8 +159,12 @@ function pyreonPlugin(options) {
 				} } : {}
 			};
 		},
+		async buildStart() {
+			await prescanSignalExports(projectRoot, signalExportRegistry);
+		},
 		async resolveId(id, importer) {
 			if (id === HMR_RUNTIME_IMPORT) return HMR_RUNTIME_ID;
+			if (compat && (id === "@pyreon/core/jsx-runtime" || id === "@pyreon/core/jsx-dev-runtime") && importer && isPyreonWorkspaceFile(importer, pyreonWorkspaceDirCache)) return;
 			const target = getCompatTarget(compat, id);
 			if (!target) return;
 			return (await this.resolve(target, importer, { skipSelf: true }))?.id;
@@ -120,7 +172,7 @@ function pyreonPlugin(options) {
 		load(id) {
 			if (id === HMR_RUNTIME_ID) return HMR_RUNTIME_SOURCE;
 		},
-		transform(code, id, transformOptions) {
+		async transform(code, id, transformOptions) {
 			const ext = getExt(id);
 			if (ext !== ".tsx" && ext !== ".jsx" && ext !== ".pyreon") return;
 			if (compat === "react" || compat === "preact" || compat === "vue" || compat === "solid") {
@@ -133,7 +185,12 @@ function pyreonPlugin(options) {
 				}
 				return;
 			}
-			const result = transformJSX(code, id, { ssr: transformOptions?.ssr === true });
+			scanSignalExports(code, normalizeModuleId(id), signalExportRegistry);
+			const knownSignals = await resolveImportedSignals(code, id, signalExportRegistry, this, resolveCache);
+			const result = transformJSX(code, id, {
+				ssr: transformOptions?.ssr === true,
+				knownSignals
+			});
 			for (const w of result.warnings) this.warn(`${w.message} (${id}:${w.line}:${w.column})`);
 			let output = result.code;
 			if (!isBuild) {
@@ -212,8 +269,18 @@ function generateProjectContext(root) {
 * The arguments are extracted via balanced-paren matching in `injectHmr`.
 * A brace-depth check filters out matches inside functions/blocks — only
 * module-scope (depth 0) signals are rewritten for HMR state preservation.
+*
+* The optional `<...>` group accepts a TypeScript type parameter so that
+* `signal<T>(initial)` declarations are also rewritten — without it, any
+* generic-typed module-scope signal silently skipped HMR preservation.
+*
+* The inner `(?:[^<>]|<[^<>]*>)*` permits one level of generic nesting
+* (e.g. `signal<Array<Row>>([])`, `signal<Map<string, number>>(m)`).
+* Deeper nesting (`signal<Array<{ id: T<U> }>>(...)`) falls back to
+* not-rewritten — tracked as a follow-up if real consumers need it,
+* but unlikely at module scope where generics are usually shallow.
 */
-const SIGNAL_PREFIX_RE = /^((?:export\s+)?(?:const|let)\s+(\w+)\s*=\s*)signal\(/gm;
+const SIGNAL_PREFIX_RE = /^((?:export\s+)?(?:const|let)\s+(\w+)\s*=\s*)signal(?:<(?:[^<>]|<[^<>]*>)*>)?\(/gm;
 /**
 * Detect whether the module exports any component-like functions
 * (uppercase first letter — standard convention for JSX components).
@@ -366,6 +433,137 @@ function getExt(id) {
 function isAssetRequest(url) {
 	return url.startsWith("/@") || url.startsWith("/__") || url.includes("/node_modules/") || /\.(css|js|ts|tsx|jsx|json|ico|png|jpg|jpeg|gif|svg|woff2?|ttf|eot|map)(\?|$)/.test(url);
 }
+/**
+* Normalize a Vite module ID by stripping query strings (?v=..., ?t=...)
+* and resolving to an absolute path for consistent registry lookups.
+*/
+function normalizeModuleId(id) {
+	const queryIndex = id.indexOf("?");
+	return queryIndex >= 0 ? id.slice(0, queryIndex) : id;
+}
+/**
+* Pre-scan all source files in the project for signal exports.
+*
+* Called from `buildStart` so the registry is fully populated before any
+* transforms run. This solves the build ordering problem where component.tsx
+* is transformed before store.ts — without pre-scanning, the registry would
+* be empty and imported signals would not be auto-called.
+*/
+async function prescanSignalExports(root, registry) {
+	const files = [];
+	function walk(dir) {
+		try {
+			for (const entry of readdirSync(dir)) {
+				if (entry.startsWith(".") || entry === "node_modules" || entry === "dist" || entry === "lib" || entry === "build") continue;
+				const full = join(dir, entry);
+				try {
+					if (statSync(full).isDirectory()) walk(full);
+					else if (/\.(ts|tsx|js|jsx)$/.test(entry)) files.push(full);
+				} catch {}
+			}
+		} catch {}
+	}
+	walk(root);
+	for (const file of files) try {
+		scanSignalExports(readFileSync(file, "utf-8"), file, registry);
+	} catch {}
+}
+/**
+* Scan a module's source for exported signal declarations and register them.
+*
+* Detects patterns:
+*   1. `export const x = signal(...)` or `export const x = computed(...)` — inline export
+*   2. `const x = signal(...); export { x }` — separate declaration + named export
+*   3. `export default signal(...)` — default export (tracked as 'default')
+*
+* Re-exports (`export { x } from './signals'`) are NOT detected — the source
+* module must be scanned directly. This is a known limitation.
+*
+* Uses simple regex — no AST parse needed.
+*/
+function scanSignalExports(code, moduleId, registry) {
+	const normalizedId = normalizeModuleId(moduleId);
+	let match;
+	const signals = /* @__PURE__ */ new Set();
+	const EXPORT_CONST_RE = /export\s+const\s+(\w+)\s*=\s*(?:signal|computed)\s*[<(]/g;
+	while ((match = EXPORT_CONST_RE.exec(code)) !== null) signals.add(match[1]);
+	const localSignals = /* @__PURE__ */ new Set();
+	const LOCAL_SIGNAL_RE = /(?:^|[\s;])const\s+(\w+)\s*=\s*(?:signal|computed)\s*[<(]/gm;
+	while ((match = LOCAL_SIGNAL_RE.exec(code)) !== null) localSignals.add(match[1]);
+	if (localSignals.size > 0) {
+		const NAMED_EXPORT_RE = /export\s*\{([^}]+)\}/g;
+		while ((match = NAMED_EXPORT_RE.exec(code)) !== null) {
+			if (code.slice(match.index + match[0].length).trimStart().startsWith("from")) continue;
+			for (const spec of match[1].split(",")) {
+				const trimmed = spec.trim();
+				if (!trimmed) continue;
+				const parts = trimmed.split(/\s+as\s+/);
+				const localName = parts[0].trim();
+				const exportedName = (parts[1] ?? parts[0]).trim();
+				if (localSignals.has(localName)) signals.add(exportedName);
+			}
+		}
+	}
+	if (/export\s+default\s+(?:signal|computed)\s*[<(]/.test(code)) signals.add("default");
+	if (signals.size > 0) registry.set(normalizedId, signals);
+	else registry.delete(normalizedId);
+}
+/**
+* Resolve imported signal names from the signal export registry.
+*
+* For each import in the source, resolves the module and checks if it has
+* signal exports in the registry. Returns the local names of imported signals.
+*
+* Handles named imports (`import { x } from ...`) and default imports
+* (`import x from ...` — matched against 'default' in the registry).
+*/
+async function resolveImportedSignals(code, _moduleId, registry, pluginCtx, resolveCache) {
+	if (registry.size === 0) return [];
+	const knownSignals = [];
+	let match;
+	/** Resolve a source specifier to a normalized module ID, using the cache. */
+	async function resolveSource(source) {
+		const cacheKey = `${_moduleId}::${source}`;
+		if (resolveCache.has(cacheKey)) return resolveCache.get(cacheKey) ?? null;
+		let resolvedId = null;
+		try {
+			const resolved = await pluginCtx.resolve(source, _moduleId, { skipSelf: true });
+			resolvedId = resolved?.id ? normalizeModuleId(resolved.id) : null;
+		} catch {}
+		resolveCache.set(cacheKey, resolvedId);
+		return resolvedId;
+	}
+	const IMPORT_RE = /import\s+(?!type\s)\{([^}]+)\}\s*from\s*['"]([^'"]+)['"]/g;
+	while ((match = IMPORT_RE.exec(code)) !== null) {
+		const specifiers = match[1];
+		const source = match[2];
+		const resolvedId = await resolveSource(source);
+		if (!resolvedId) continue;
+		const exportedSignals = registry.get(resolvedId);
+		if (!exportedSignals) continue;
+		for (const spec of specifiers.split(",")) {
+			const trimmed = spec.trim();
+			if (!trimmed) continue;
+			const parts = trimmed.split(/\s+as\s+/);
+			const importedName = parts[0].trim();
+			const localName = (parts[1] ?? parts[0]).trim();
+			if (exportedSignals.has(importedName)) knownSignals.push(localName);
+		}
+	}
+	const DEFAULT_IMPORT_RE = /import\s+(?!type\s)(\w+)\s+from\s*['"]([^'"]+)['"]/g;
+	while ((match = DEFAULT_IMPORT_RE.exec(code)) !== null) {
+		const fullMatch = match[0];
+		if (/import\s+type\s+/.test(fullMatch)) continue;
+		const localName = match[1];
+		const source = match[2];
+		const resolvedId = await resolveSource(source);
+		if (!resolvedId) continue;
+		const exportedSignals = registry.get(resolvedId);
+		if (!exportedSignals) continue;
+		if (exportedSignals.has("default")) knownSignals.push(localName);
+	}
+	return knownSignals;
+}
 const HMR_RUNTIME_SOURCE = `
 const REGISTRY_KEY = "__pyreon_hmr_registry__";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/vite-plugin",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "description": "Vite plugin for Pyreon — .pyreon SFC support, HMR, compiler integration",
   "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/vite-plugin#readme",
   "bugs": {
@@ -14,6 +14,7 @@
   },
   "files": [
     "lib",
+    "!lib/**/*.map",
     "src",
     "README.md",
     "LICENSE"
@@ -42,7 +43,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@pyreon/compiler": "^0.13.1"
+    "@pyreon/compiler": "^0.15.0"
   },
   "devDependencies": {
     "vite": "^8.0.0"