@stencil/core 5.0.0-beta.11 → 5.0.0-beta.12

package/dist/compiler/browser.js

@@ -1693,6 +1693,18 @@ const createJsVarName = (fileName) => {
 	}
 	return fileName;
 };
+/**
+* Create a function that lowercases the first string parameter before passing it to the provided function
+* @param fn the function to pass the lowercased path to
+* @returns the result of the provided function
+*/
+const lowerPathParam = (fn) => (p) => fn(p.toLowerCase());
+/**
+* Determine if a stringified file path is a TypeScript declaration file based on the extension at the end of the path.
+* @param p the path to evaluate
+* @returns `true` if the path ends in `.d.ts` (case-sensitive), `false` otherwise.
+*/
+const isDtsFile = lowerPathParam((p) => p.endsWith(".d.ts") || p.endsWith(".d.mts") || p.endsWith(".d.cts"));
 function getTextDocs(docs) {
 	if (docs == null) return "";
 	return [escapeWithPattern(docs.text.replace(LINE_BREAK_REGEX, " "), /\*\//, "*\\/", true), ...docs.tags.filter((tag) => tag.name !== "internal").map((tag) => {
@@ -1832,7 +1844,7 @@ const validateComponentTag = (tag) => {
 };
 //#endregion
 //#region src/version.ts
-const version = "5.0.0-beta.11";
+const version = "5.0.0-beta.12";
 //#endregion
 //#region src/compiler/events.ts
 const buildEvents = () => {
@@ -1895,6 +1907,7 @@ const resolve = (id, _opts, cb) => {
 };
 //#endregion
 //#region src/compiler/sys/resolve/resolve-utils.ts
+const isLocalModule = (p) => p.startsWith(".") || p.startsWith("/");
 const isNodeModulePath = (p) => normalizePath(p).split("/").includes("node_modules");
 const getModuleId = (orgImport) => {
 	if (orgImport.startsWith("~")) orgImport = orgImport.substring(1);
@@ -4047,6 +4060,39 @@ const DEFAULT_BROWSER_TARGETS = [
 //#endregion
 //#region src/compiler/style/css-parser/parse-css.ts
 /**
+* Splits a selector list on top-level commas in a single pass: a comma only
+* splits when it's outside a quoted string and at paren depth 0, so commas in
+* `:is(:a,:has(:b))` or `[title="a,b"]` aren't treated as separators.
+* Backslash escapes (inside or outside a string) are skipped so they can't shift state,
+* so e.g. `[title="a\,b"]` is treated as a single selector.
+* @param selectors The selector list to split
+* @returns An array of selectors, with whitespace trimmed from each selector
+*/
+const splitSelectorList = (selectors) => {
+	const parts = [];
+	let depth = 0;
+	let quote = null;
+	let start = 0;
+	for (let i = 0; i < selectors.length; i++) {
+		const ch = selectors[i];
+		if (quote) {
+			if (ch === "\\") i++;
+			else if (ch === quote) quote = null;
+			continue;
+		}
+		if (ch === "\"" || ch === "'") quote = ch;
+		else if (ch === "\\") i++;
+		else if (ch === "(") depth++;
+		else if (ch === ")") depth = Math.max(0, depth - 1);
+		else if (ch === "," && depth === 0) {
+			parts.push(selectors.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(selectors.slice(start));
+	return parts.map((s) => s.trim());
+};
+/**
 * Parses CSS string input into an AST representation.
 * Used for minification, finding & resolving URLs and during SSR / prerendering, removing unused selectors.
 *
@@ -4171,11 +4217,8 @@ const parseCss = (css, filePath) => {
 	const selector = () => {
 		const m = match(/^([^{]+)/);
 		if (!m) return null;
-		return trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "").replace(/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'/g, function(str) {
-			return str.replace(/,/g, "‌");
-		}).split(/\s*(?![^(]*\)),\s*/).map(function(s) {
-			return s.replace(/\u200C/g, ",");
-		});
+		const cleaned = trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "");
+		return splitSelectorList(cleaned);
 	};
 	const declaration = () => {
 		const pos = position();
@@ -13956,25 +13999,161 @@ function matchesNamedDeclaration(name) {
 	};
 }
 /**
-* Finds a re-export of `className` in `sourceFile` - `export { X } from './y'` or
-* `export { X as Y } from './y'` - as used by barrel entry points (e.g. `@stencil/core`'s own
-* public `index.d.mts`, which re-exports its runtime API from `./declarations/stencil-public-runtime`
-* rather than declaring it directly).
+* Finds a re-export of `className` in `sourceFile`: `export { X } from './y'`, or the
+* bundler-split shape `import { X as name } from './y'; export { name };` (no `from` clause).
 * @param sourceFile the (barrel) source file to scan
 * @param className the exported name to look for
-* @returns the module specifier and the name to look for in that module (the local name, before
-* any `as` aliasing), or `undefined` if no matching re-export is found
+* @returns the module specifier and name to look for there (before any `as` aliasing), or
+* `undefined` if not found
 */
 function findReExport(sourceFile, className) {
 	for (const stmt of sourceFile.statements) {
-		if (!ts$1.isExportDeclaration(stmt) || !stmt.moduleSpecifier || !ts$1.isStringLiteral(stmt.moduleSpecifier) || !stmt.exportClause || !ts$1.isNamedExports(stmt.exportClause)) continue;
-		for (const element of stmt.exportClause.elements) if (element.name.text === className) return {
+		if (!ts$1.isExportDeclaration(stmt) || !stmt.exportClause || !ts$1.isNamedExports(stmt.exportClause)) continue;
+		const element = stmt.exportClause.elements.find((el) => el.name.text === className);
+		if (!element) continue;
+		if (stmt.moduleSpecifier && ts$1.isStringLiteral(stmt.moduleSpecifier)) return {
 			moduleSpecifier: stmt.moduleSpecifier.text,
 			localName: element.propertyName?.text ?? element.name.text
 		};
+		const importOrigin = findImportOrigin(sourceFile, element.propertyName?.text ?? element.name.text);
+		if (importOrigin) return importOrigin;
+	}
+}
+/**
+* Finds `name`'s import in `sourceFile` and returns its module and origin name (before any `as`
+* aliasing; `'default'` for a default import).
+* @param sourceFile the source file to scan for a matching import
+* @param name the local (post-aliasing) name an import bound
+* @returns the import's module specifier and origin name, or `undefined` if `name` isn't imported
+*/
+function findImportOrigin(sourceFile, name) {
+	for (const stmt of sourceFile.statements) {
+		if (!ts$1.isImportDeclaration(stmt) || !stmt.importClause || !ts$1.isStringLiteral(stmt.moduleSpecifier)) continue;
+		const moduleSpecifier = stmt.moduleSpecifier.text;
+		if (stmt.importClause.name?.text === name) return {
+			moduleSpecifier,
+			localName: "default"
+		};
+		const bindings = stmt.importClause.namedBindings;
+		if (!bindings || !ts$1.isNamedImports(bindings)) continue;
+		const element = bindings.elements.find((el) => el.name.text === name);
+		if (element) return {
+			moduleSpecifier,
+			localName: element.propertyName?.text ?? element.name.text
+		};
 	}
 }
 /**
+* Finds `name` as a top-level declaration in `sf` (see `matchesNamedDeclaration`), following a
+* same-file export alias if `name` is only ever the public side of a local rename
+* (`export { RealName as name }`, no `from` clause).
+* @param sf the source file to search
+* @param name the declaration name to look for, which may only exist as an export alias
+* @returns the matched statement, or `undefined`
+*/
+function findStatementByName(sf, name) {
+	const direct = sf.statements.find(matchesNamedDeclaration(name));
+	if (direct) return direct;
+	for (const stmt of sf.statements) {
+		if (!ts$1.isExportDeclaration(stmt) || stmt.moduleSpecifier || !stmt.exportClause || !ts$1.isNamedExports(stmt.exportClause)) continue;
+		const aliasedName = stmt.exportClause.elements.find((el) => el.name.text === name)?.propertyName?.text;
+		if (aliasedName && aliasedName !== name) return sf.statements.find(matchesNamedDeclaration(aliasedName));
+	}
+}
+/**
+* Picks the runtime target out of a `package.json` `exports` condition entry - prefers `import`
+* over `require`/`node`/`default`, recursing into nested condition objects.
+* @param entry an `exports` map value: a path string, or nested conditions
+* @returns the resolved relative path, or `undefined` if no usable condition was found
+*/
+function pickJsCondition(entry) {
+	if (typeof entry === "string") return entry;
+	if (typeof entry !== "object" || entry === null) return;
+	const conditions = entry;
+	for (const key of [
+		"import",
+		"require",
+		"node",
+		"default"
+	]) if (key in conditions) {
+		const picked = pickJsCondition(conditions[key]);
+		if (picked) return picked;
+	}
+}
+/**
+* Reads and parses `filePath` as JS, with parent nodes set - unlike `tsGetSourceFile`, which
+* never triggers binding, so `.parent` stays unset and `node.getSourceFile()` returns `undefined`.
+* @param config the current Stencil validated config
+* @param filePath the absolute path of the JS file to read and parse
+* @returns the parsed source file, or `undefined` if it couldn't be read
+*/
+function readJsSourceFile(config, filePath) {
+	try {
+		const text = config.sys.readFileSync(filePath);
+		if (typeof text !== "string") return;
+		return ts$1.createSourceFile(filePath, text, ts$1.ScriptTarget.ESNext, true, ts$1.ScriptKind.JS);
+	} catch {
+		return;
+	}
+}
+/**
+* Resolves the runtime JS entry for a bare (non-relative) module specifier by reading its
+* package's own `package.json` `exports` map, instead of `tsResolveModuleName` - which always
+* resolves to the package's `types` entry, an ambient signature with no body a mixin factory's
+* class can never be found inside.
+* @param config the current Stencil validated config
+* @param compilerCtx the current compiler context
+* @param moduleSpecifier the bare package specifier to resolve
+* @param containingFile the file the specifier was imported from
+* @returns the resolved JS source file, or `undefined` if it couldn't be resolved this way
+*/
+function resolveModuleJsEntry(config, compilerCtx, moduleSpecifier, containingFile) {
+	if (isLocalModule(moduleSpecifier)) return;
+	const pkgJsonPath = tsResolveModuleNamePackageJsonPath(config, compilerCtx, moduleSpecifier, containingFile);
+	if (!pkgJsonPath) return;
+	let pkgJson;
+	try {
+		pkgJson = JSON.parse(config.sys.readFileSync(pkgJsonPath));
+	} catch {
+		return;
+	}
+	const pkgName = pkgJson.name;
+	if (!pkgName || !moduleSpecifier.startsWith(pkgName) || !pkgJson.exports) return;
+	const subpath = moduleSpecifier === pkgName ? "." : `.${moduleSpecifier.slice(pkgName.length)}`;
+	const exportsMap = pkgJson.exports;
+	const conditionEntry = typeof exportsMap === "string" ? subpath === "." ? exportsMap : void 0 : exportsMap[subpath] ?? (subpath === "." ? exportsMap : void 0);
+	const target = conditionEntry && pickJsCondition(conditionEntry);
+	if (!target) return;
+	return readJsSourceFile(config, normalizePath(join$1(dirname(pkgJsonPath), target)));
+}
+/**
+* Finds `className`'s class inside a resolved JS entry (see `resolveModuleJsEntry`), following
+* re-export hops the same way `resolveAndProcessExtendedClass` walks a `.d.ts`/`.ts` source.
+* @param config the current Stencil validated config
+* @param compilerCtx the current compiler context
+* @param source the JS source file to search
+* @param className the class (or mixin factory) name to look for
+* @param hopsRemaining re-export hops still allowed before giving up
+* @returns the found class and the source file it's declared in, or `undefined`
+*/
+function findClassInJsModule(config, compilerCtx, source, className, hopsRemaining = 3) {
+	const matchedStatement = findStatementByName(source, className);
+	if (matchedStatement) {
+		const classNode = ts$1.isClassDeclaration(matchedStatement) ? matchedStatement : findClassWalk(matchedStatement);
+		return classNode && {
+			classNode,
+			sourceFile: source
+		};
+	}
+	if (hopsRemaining <= 0) return;
+	const reExport = findReExport(source, className);
+	if (!reExport) return;
+	const resolvedFileName = tsResolveModuleName(config, compilerCtx, reExport.moduleSpecifier, source.fileName)?.resolvedModule?.resolvedFileName;
+	const nextSource = resolvedFileName && readJsSourceFile(config, resolvedFileName);
+	if (!nextSource) return;
+	return findClassInJsModule(config, compilerCtx, nextSource, reExport.localName, hopsRemaining - 1);
+}
+/**
 * Filters `dedupeMembers` down to entries not already present in `staticMembers`
 * (by name, or `methodName` for change handlers) - used so an extending
 * class's own members win over inherited ones.
@@ -14080,9 +14259,11 @@ function convertDiskSourceFileDecorators(sourceFile, config, target = ts$1.Scrip
 * @param ogModule the original module file of the class declaration
 * @param targetScriptTarget the script target to convert decorators with, if needed
 * @param barrelHopsRemaining re-export hops still allowed before giving up
+* @param originalModuleSpecifier the specifier this lookup started from, before any barrel hops
+* @param originalContainingFile the file `originalModuleSpecifier` was imported from
 * @returns the found class declaration, or `undefined`
 */
-function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, currentSource, moduleSpecifier, className, dependentClasses, typeChecker, ogModule, targetScriptTarget = ts$1.ScriptTarget.ESNext, barrelHopsRemaining = 1) {
+function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, currentSource, moduleSpecifier, className, dependentClasses, typeChecker, ogModule, targetScriptTarget = ts$1.ScriptTarget.ESNext, barrelHopsRemaining = 1, originalModuleSpecifier = moduleSpecifier, originalContainingFile = currentSource.fileName) {
 	let keepLooking = true;
 	const foundFile = tsResolveModuleName(buildCtx.config, compilerCtx, moduleSpecifier, currentSource.fileName);
 	if (!foundFile?.resolvedModule || !className) return;
@@ -14098,10 +14279,10 @@ function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration,
 		}
 		foundSource = convertDiskSourceFileDecorators(foundSource, buildCtx.config, targetScriptTarget);
 	}
-	const matchedStatement = foundSource.statements.find(matchesNamedDeclaration(className));
+	const matchedStatement = findStatementByName(foundSource, className);
 	if (!matchedStatement) {
 		const reExport = barrelHopsRemaining > 0 ? findReExport(foundSource, className) : void 0;
-		if (reExport) return resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, foundSource, reExport.moduleSpecifier, reExport.localName, dependentClasses, typeChecker, ogModule, targetScriptTarget, barrelHopsRemaining - 1);
+		if (reExport) return resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, foundSource, reExport.moduleSpecifier, reExport.localName, dependentClasses, typeChecker, ogModule, targetScriptTarget, barrelHopsRemaining - 1, originalModuleSpecifier, originalContainingFile);
 		const err = buildWarn(buildCtx.diagnostics);
 		err.messageText = `Unable to find "${className}" in the imported module "${moduleSpecifier}".
                   Please import class / mixin-factory declarations directly and not via barrel files.`;
@@ -14109,16 +14290,25 @@ function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration,
 		return;
 	}
 	let foundClassDeclaration = matchedStatement ? ts$1.isClassDeclaration(matchedStatement) ? matchedStatement : void 0 : void 0;
+	let foundClassSource = foundSource;
 	if (!foundClassDeclaration && matchedStatement) {
 		foundClassDeclaration = findClassWalk(matchedStatement);
 		keepLooking = false;
+		if (!foundClassDeclaration && isDtsFile(foundSource.fileName) && !isLocalModule(originalModuleSpecifier)) {
+			const jsSource = resolveModuleJsEntry(buildCtx.config, compilerCtx, originalModuleSpecifier, originalContainingFile);
+			const foundInJs = jsSource && findClassInJsModule(buildCtx.config, compilerCtx, jsSource, className);
+			if (foundInJs) {
+				foundClassDeclaration = foundInJs.classNode;
+				foundClassSource = foundInJs.sourceFile;
+			}
+		}
 		if (!foundClassDeclaration) warnMixinFactoryClassNotFound(buildCtx, className, classDeclaration);
 	}
 	if (foundClassDeclaration && !dependentClasses.some((dc) => dc.classNode === foundClassDeclaration)) {
 		dependentClasses.push({
 			classNode: foundClassDeclaration,
-			sourceFile: foundSource,
-			fileName: foundFile.resolvedModule.resolvedFileName
+			sourceFile: foundClassSource,
+			fileName: foundClassSource.fileName
 		});
 		if (keepLooking) buildExtendsTree(compilerCtx, foundClassDeclaration, dependentClasses, typeChecker, buildCtx, ogModule);
 	}
@@ -14525,19 +14715,6 @@ function getExtendsClassNames(node) {
 	if (ts$1.isCallExpression(expr) && expr.expression.getText() === "Mixin") return expr.arguments.filter(ts$1.isIdentifier).map((id) => id.text);
 	return [];
 }
-function findImportSpecifier(sf, localName) {
-	for (const stmt of sf.statements) {
-		if (!ts$1.isImportDeclaration(stmt) || !ts$1.isStringLiteral(stmt.moduleSpecifier)) continue;
-		const clause = stmt.importClause;
-		if (!clause) continue;
-		if (clause.name?.text === localName) return stmt.moduleSpecifier.text;
-		const bindings = clause.namedBindings;
-		if (bindings && ts$1.isNamedImports(bindings)) {
-			for (const el of bindings.elements) if (el.name.text === localName) return stmt.moduleSpecifier.text;
-		}
-	}
-	return null;
-}
 /**
 * A single-file mini-program (see `convertInMemorySourceDecorators`) can
 * never load an imported module's own `SourceFile`, so a type that's
@@ -14561,7 +14738,7 @@ function reclassifyGlobalTypeReferences(members, declaringSf, declaringPath, res
 		if (!references) return;
 		Object.entries(references).forEach(([typeName, reference]) => {
 			if (reference.location !== "global") return;
-			const specifier = findImportSpecifier(declaringSf, typeName);
+			const specifier = findImportOrigin(declaringSf, typeName)?.moduleSpecifier;
 			if (!specifier) return;
 			const resolved = resolveImport(specifier, declaringPath);
 			reference.location = "import";
@@ -14584,7 +14761,7 @@ function reclassifyGlobalTypeReferences(members, declaringSf, declaringPath, res
 * differ from `sf`/`path` if resolved through a re-export), or `undefined`
 */
 function findDeclarationOrReExport(sf, path, name, resolveImport) {
-	const direct = sf.statements.find(matchesNamedDeclaration(name));
+	const direct = findStatementByName(sf, name);
 	if (direct) return {
 		statement: direct,
 		sourceFile: sf,
@@ -14597,7 +14774,7 @@ function findDeclarationOrReExport(sf, path, name, resolveImport) {
 	const { code, path: resolvedPath } = resolved;
 	const isTs = resolvedPath.endsWith(".tsx") || resolvedPath.endsWith(".ts");
 	const reExportSf = ts$1.createSourceFile(resolvedPath, code, ts$1.ScriptTarget.ESNext, true, isTs ? ts$1.ScriptKind.TSX : ts$1.ScriptKind.JS);
-	const statement = reExportSf.statements.find(matchesNamedDeclaration(reExport.localName));
+	const statement = findStatementByName(reExportSf, reExport.localName);
 	if (!statement) return void 0;
 	return {
 		statement,
@@ -14634,7 +14811,7 @@ function resolveAncestors(classNode, sf, path, resolveImport, visited, ancestors
 		let foundSf = sf;
 		let foundPath = path;
 		let keepLooking = true;
-		const sameFileStatement = sf.statements.find(matchesNamedDeclaration(parentName));
+		const sameFileStatement = findStatementByName(sf, parentName);
 		if (sameFileStatement) {
 			if (ts$1.isClassDeclaration(sameFileStatement)) foundClass = sameFileStatement;
 			else {
@@ -14643,7 +14820,7 @@ function resolveAncestors(classNode, sf, path, resolveImport, visited, ancestors
 				if (!foundClass) warnMixinFactoryClassNotFound(buildCtx, parentName, rootClassDeclaration);
 			}
 		} else {
-			const specifier = findImportSpecifier(sf, parentName);
+			const specifier = findImportOrigin(sf, parentName)?.moduleSpecifier;
 			if (!specifier) continue;
 			const resolved = resolveImport(specifier, path);
 			if (!resolved) continue;

package/dist/compiler/index.mjs

@@ -1,3 +1,3 @@
-import { _ as buildId, a as createPrerenderer, b as versions, c as createWorkerContext, d as nodeRequire, f as optimizeCss, g as getScopeId, h as cmpMetaToDocsComponent, i as createSystem, l as createWorkerMessageHandler, m as generateManifest, n as transpile, o as loadConfig, p as validateConfig, r as transpileSync, s as createCompiler, t as ts, u as optimizeJs, v as vermoji, x as scopeCss, y as version } from "../compiler-2EypBn_Y.mjs";
+import { _ as buildId, a as createPrerenderer, b as versions, c as createWorkerContext, d as nodeRequire, f as optimizeCss, g as getScopeId, h as cmpMetaToDocsComponent, i as createSystem, l as createWorkerMessageHandler, m as generateManifest, n as transpile, o as loadConfig, p as validateConfig, r as transpileSync, s as createCompiler, t as ts, u as optimizeJs, v as vermoji, x as scopeCss, y as version } from "../compiler-BjKDj129.mjs";
 import { a as LOG_LEVELS, i as CustomElementsExportBehaviorOptions } from "../node-HKfDhPR3.mjs";
 export { CustomElementsExportBehaviorOptions, LOG_LEVELS, buildId, cmpMetaToDocsComponent, createCompiler, createPrerenderer, createSystem, createWorkerContext, createWorkerMessageHandler, generateManifest, getScopeId, loadConfig, nodeRequire, optimizeCss, optimizeJs, scopeCss, transpile, transpileSync, ts, validateConfig, vermoji, version, versions };

package/dist/{compiler-2EypBn_Y.mjs → compiler-BjKDj129.mjs}

@@ -461,9 +461,9 @@ const scopeCss = (cssText, scopeId, commentOriginalSelector) => {
 };
 //#endregion
 //#region src/version.ts
-const version = "5.0.0-beta.11";
-const buildId = "1789429964";
-const vermoji = "🍦";
+const version = "5.0.0-beta.12";
+const buildId = "1789547794";
+const vermoji = "🏇";
 /**
 * Get the installed version of a tool/dependency.
 * Handles packages with exports maps that point to subdirectories.
@@ -2854,6 +2854,7 @@ const setPackageVersionByContent = (pkgVersions, pkgContent) => {
 		if (pkg.name && pkg.version) setPackageVersion(pkgVersions, pkg.name, pkg.version);
 	} catch {}
 };
+const isLocalModule = (p) => p.startsWith(".") || p.startsWith("/");
 const isNodeModulePath = (p) => normalizePath(p).split("/").includes("node_modules");
 const getModuleId = (orgImport) => {
 	if (orgImport.startsWith("~")) orgImport = orgImport.substring(1);
@@ -15691,25 +15692,161 @@ function matchesNamedDeclaration(name) {
 	};
 }
 /**
-* Finds a re-export of `className` in `sourceFile` - `export { X } from './y'` or
-* `export { X as Y } from './y'` - as used by barrel entry points (e.g. `@stencil/core`'s own
-* public `index.d.mts`, which re-exports its runtime API from `./declarations/stencil-public-runtime`
-* rather than declaring it directly).
+* Finds a re-export of `className` in `sourceFile`: `export { X } from './y'`, or the
+* bundler-split shape `import { X as name } from './y'; export { name };` (no `from` clause).
 * @param sourceFile the (barrel) source file to scan
 * @param className the exported name to look for
-* @returns the module specifier and the name to look for in that module (the local name, before
-* any `as` aliasing), or `undefined` if no matching re-export is found
+* @returns the module specifier and name to look for there (before any `as` aliasing), or
+* `undefined` if not found
 */
 function findReExport(sourceFile, className) {
 	for (const stmt of sourceFile.statements) {
-		if (!ts.isExportDeclaration(stmt) || !stmt.moduleSpecifier || !ts.isStringLiteral(stmt.moduleSpecifier) || !stmt.exportClause || !ts.isNamedExports(stmt.exportClause)) continue;
-		for (const element of stmt.exportClause.elements) if (element.name.text === className) return {
+		if (!ts.isExportDeclaration(stmt) || !stmt.exportClause || !ts.isNamedExports(stmt.exportClause)) continue;
+		const element = stmt.exportClause.elements.find((el) => el.name.text === className);
+		if (!element) continue;
+		if (stmt.moduleSpecifier && ts.isStringLiteral(stmt.moduleSpecifier)) return {
 			moduleSpecifier: stmt.moduleSpecifier.text,
 			localName: element.propertyName?.text ?? element.name.text
 		};
+		const importOrigin = findImportOrigin(sourceFile, element.propertyName?.text ?? element.name.text);
+		if (importOrigin) return importOrigin;
 	}
 }
 /**
+* Finds `name`'s import in `sourceFile` and returns its module and origin name (before any `as`
+* aliasing; `'default'` for a default import).
+* @param sourceFile the source file to scan for a matching import
+* @param name the local (post-aliasing) name an import bound
+* @returns the import's module specifier and origin name, or `undefined` if `name` isn't imported
+*/
+function findImportOrigin(sourceFile, name) {
+	for (const stmt of sourceFile.statements) {
+		if (!ts.isImportDeclaration(stmt) || !stmt.importClause || !ts.isStringLiteral(stmt.moduleSpecifier)) continue;
+		const moduleSpecifier = stmt.moduleSpecifier.text;
+		if (stmt.importClause.name?.text === name) return {
+			moduleSpecifier,
+			localName: "default"
+		};
+		const bindings = stmt.importClause.namedBindings;
+		if (!bindings || !ts.isNamedImports(bindings)) continue;
+		const element = bindings.elements.find((el) => el.name.text === name);
+		if (element) return {
+			moduleSpecifier,
+			localName: element.propertyName?.text ?? element.name.text
+		};
+	}
+}
+/**
+* Finds `name` as a top-level declaration in `sf` (see `matchesNamedDeclaration`), following a
+* same-file export alias if `name` is only ever the public side of a local rename
+* (`export { RealName as name }`, no `from` clause).
+* @param sf the source file to search
+* @param name the declaration name to look for, which may only exist as an export alias
+* @returns the matched statement, or `undefined`
+*/
+function findStatementByName(sf, name) {
+	const direct = sf.statements.find(matchesNamedDeclaration(name));
+	if (direct) return direct;
+	for (const stmt of sf.statements) {
+		if (!ts.isExportDeclaration(stmt) || stmt.moduleSpecifier || !stmt.exportClause || !ts.isNamedExports(stmt.exportClause)) continue;
+		const aliasedName = stmt.exportClause.elements.find((el) => el.name.text === name)?.propertyName?.text;
+		if (aliasedName && aliasedName !== name) return sf.statements.find(matchesNamedDeclaration(aliasedName));
+	}
+}
+/**
+* Picks the runtime target out of a `package.json` `exports` condition entry - prefers `import`
+* over `require`/`node`/`default`, recursing into nested condition objects.
+* @param entry an `exports` map value: a path string, or nested conditions
+* @returns the resolved relative path, or `undefined` if no usable condition was found
+*/
+function pickJsCondition(entry) {
+	if (typeof entry === "string") return entry;
+	if (typeof entry !== "object" || entry === null) return;
+	const conditions = entry;
+	for (const key of [
+		"import",
+		"require",
+		"node",
+		"default"
+	]) if (key in conditions) {
+		const picked = pickJsCondition(conditions[key]);
+		if (picked) return picked;
+	}
+}
+/**
+* Reads and parses `filePath` as JS, with parent nodes set - unlike `tsGetSourceFile`, which
+* never triggers binding, so `.parent` stays unset and `node.getSourceFile()` returns `undefined`.
+* @param config the current Stencil validated config
+* @param filePath the absolute path of the JS file to read and parse
+* @returns the parsed source file, or `undefined` if it couldn't be read
+*/
+function readJsSourceFile(config, filePath) {
+	try {
+		const text = config.sys.readFileSync(filePath);
+		if (typeof text !== "string") return;
+		return ts.createSourceFile(filePath, text, ts.ScriptTarget.ESNext, true, ts.ScriptKind.JS);
+	} catch {
+		return;
+	}
+}
+/**
+* Resolves the runtime JS entry for a bare (non-relative) module specifier by reading its
+* package's own `package.json` `exports` map, instead of `tsResolveModuleName` - which always
+* resolves to the package's `types` entry, an ambient signature with no body a mixin factory's
+* class can never be found inside.
+* @param config the current Stencil validated config
+* @param compilerCtx the current compiler context
+* @param moduleSpecifier the bare package specifier to resolve
+* @param containingFile the file the specifier was imported from
+* @returns the resolved JS source file, or `undefined` if it couldn't be resolved this way
+*/
+function resolveModuleJsEntry(config, compilerCtx, moduleSpecifier, containingFile) {
+	if (isLocalModule(moduleSpecifier)) return;
+	const pkgJsonPath = tsResolveModuleNamePackageJsonPath(config, compilerCtx, moduleSpecifier, containingFile);
+	if (!pkgJsonPath) return;
+	let pkgJson;
+	try {
+		pkgJson = JSON.parse(config.sys.readFileSync(pkgJsonPath));
+	} catch {
+		return;
+	}
+	const pkgName = pkgJson.name;
+	if (!pkgName || !moduleSpecifier.startsWith(pkgName) || !pkgJson.exports) return;
+	const subpath = moduleSpecifier === pkgName ? "." : `.${moduleSpecifier.slice(pkgName.length)}`;
+	const exportsMap = pkgJson.exports;
+	const conditionEntry = typeof exportsMap === "string" ? subpath === "." ? exportsMap : void 0 : exportsMap[subpath] ?? (subpath === "." ? exportsMap : void 0);
+	const target = conditionEntry && pickJsCondition(conditionEntry);
+	if (!target) return;
+	return readJsSourceFile(config, normalizePath(join$2(dirname$1(pkgJsonPath), target)));
+}
+/**
+* Finds `className`'s class inside a resolved JS entry (see `resolveModuleJsEntry`), following
+* re-export hops the same way `resolveAndProcessExtendedClass` walks a `.d.ts`/`.ts` source.
+* @param config the current Stencil validated config
+* @param compilerCtx the current compiler context
+* @param source the JS source file to search
+* @param className the class (or mixin factory) name to look for
+* @param hopsRemaining re-export hops still allowed before giving up
+* @returns the found class and the source file it's declared in, or `undefined`
+*/
+function findClassInJsModule(config, compilerCtx, source, className, hopsRemaining = 3) {
+	const matchedStatement = findStatementByName(source, className);
+	if (matchedStatement) {
+		const classNode = ts.isClassDeclaration(matchedStatement) ? matchedStatement : findClassWalk(matchedStatement);
+		return classNode && {
+			classNode,
+			sourceFile: source
+		};
+	}
+	if (hopsRemaining <= 0) return;
+	const reExport = findReExport(source, className);
+	if (!reExport) return;
+	const resolvedFileName = tsResolveModuleName(config, compilerCtx, reExport.moduleSpecifier, source.fileName)?.resolvedModule?.resolvedFileName;
+	const nextSource = resolvedFileName && readJsSourceFile(config, resolvedFileName);
+	if (!nextSource) return;
+	return findClassInJsModule(config, compilerCtx, nextSource, reExport.localName, hopsRemaining - 1);
+}
+/**
 * Filters `dedupeMembers` down to entries not already present in `staticMembers`
 * (by name, or `methodName` for change handlers) - used so an extending
 * class's own members win over inherited ones.
@@ -15815,9 +15952,11 @@ function convertDiskSourceFileDecorators(sourceFile, config, target = ts.ScriptT
 * @param ogModule the original module file of the class declaration
 * @param targetScriptTarget the script target to convert decorators with, if needed
 * @param barrelHopsRemaining re-export hops still allowed before giving up
+* @param originalModuleSpecifier the specifier this lookup started from, before any barrel hops
+* @param originalContainingFile the file `originalModuleSpecifier` was imported from
 * @returns the found class declaration, or `undefined`
 */
-function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, currentSource, moduleSpecifier, className, dependentClasses, typeChecker, ogModule, targetScriptTarget = ts.ScriptTarget.ESNext, barrelHopsRemaining = 1) {
+function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, currentSource, moduleSpecifier, className, dependentClasses, typeChecker, ogModule, targetScriptTarget = ts.ScriptTarget.ESNext, barrelHopsRemaining = 1, originalModuleSpecifier = moduleSpecifier, originalContainingFile = currentSource.fileName) {
 	let keepLooking = true;
 	const foundFile = tsResolveModuleName(buildCtx.config, compilerCtx, moduleSpecifier, currentSource.fileName);
 	if (!foundFile?.resolvedModule || !className) return;
@@ -15833,10 +15972,10 @@ function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration,
 		}
 		foundSource = convertDiskSourceFileDecorators(foundSource, buildCtx.config, targetScriptTarget);
 	}
-	const matchedStatement = foundSource.statements.find(matchesNamedDeclaration(className));
+	const matchedStatement = findStatementByName(foundSource, className);
 	if (!matchedStatement) {
 		const reExport = barrelHopsRemaining > 0 ? findReExport(foundSource, className) : void 0;
-		if (reExport) return resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, foundSource, reExport.moduleSpecifier, reExport.localName, dependentClasses, typeChecker, ogModule, targetScriptTarget, barrelHopsRemaining - 1);
+		if (reExport) return resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration, foundSource, reExport.moduleSpecifier, reExport.localName, dependentClasses, typeChecker, ogModule, targetScriptTarget, barrelHopsRemaining - 1, originalModuleSpecifier, originalContainingFile);
 		const err = buildWarn(buildCtx.diagnostics);
 		err.messageText = `Unable to find "${className}" in the imported module "${moduleSpecifier}".
                   Please import class / mixin-factory declarations directly and not via barrel files.`;
@@ -15844,16 +15983,25 @@ function resolveAndProcessExtendedClass(compilerCtx, buildCtx, classDeclaration,
 		return;
 	}
 	let foundClassDeclaration = matchedStatement ? ts.isClassDeclaration(matchedStatement) ? matchedStatement : void 0 : void 0;
+	let foundClassSource = foundSource;
 	if (!foundClassDeclaration && matchedStatement) {
 		foundClassDeclaration = findClassWalk(matchedStatement);
 		keepLooking = false;
+		if (!foundClassDeclaration && isDtsFile(foundSource.fileName) && !isLocalModule(originalModuleSpecifier)) {
+			const jsSource = resolveModuleJsEntry(buildCtx.config, compilerCtx, originalModuleSpecifier, originalContainingFile);
+			const foundInJs = jsSource && findClassInJsModule(buildCtx.config, compilerCtx, jsSource, className);
+			if (foundInJs) {
+				foundClassDeclaration = foundInJs.classNode;
+				foundClassSource = foundInJs.sourceFile;
+			}
+		}
 		if (!foundClassDeclaration) warnMixinFactoryClassNotFound(buildCtx, className, classDeclaration);
 	}
 	if (foundClassDeclaration && !dependentClasses.some((dc) => dc.classNode === foundClassDeclaration)) {
 		dependentClasses.push({
 			classNode: foundClassDeclaration,
-			sourceFile: foundSource,
-			fileName: foundFile.resolvedModule.resolvedFileName
+			sourceFile: foundClassSource,
+			fileName: foundClassSource.fileName
 		});
 		if (keepLooking) buildExtendsTree(compilerCtx, foundClassDeclaration, dependentClasses, typeChecker, buildCtx, ogModule);
 	}
@@ -16260,19 +16408,6 @@ function getExtendsClassNames(node) {
 	if (ts.isCallExpression(expr) && expr.expression.getText() === "Mixin") return expr.arguments.filter(ts.isIdentifier).map((id) => id.text);
 	return [];
 }
-function findImportSpecifier(sf, localName) {
-	for (const stmt of sf.statements) {
-		if (!ts.isImportDeclaration(stmt) || !ts.isStringLiteral(stmt.moduleSpecifier)) continue;
-		const clause = stmt.importClause;
-		if (!clause) continue;
-		if (clause.name?.text === localName) return stmt.moduleSpecifier.text;
-		const bindings = clause.namedBindings;
-		if (bindings && ts.isNamedImports(bindings)) {
-			for (const el of bindings.elements) if (el.name.text === localName) return stmt.moduleSpecifier.text;
-		}
-	}
-	return null;
-}
 /**
 * A single-file mini-program (see `convertInMemorySourceDecorators`) can
 * never load an imported module's own `SourceFile`, so a type that's
@@ -16296,7 +16431,7 @@ function reclassifyGlobalTypeReferences(members, declaringSf, declaringPath, res
 		if (!references) return;
 		Object.entries(references).forEach(([typeName, reference]) => {
 			if (reference.location !== "global") return;
-			const specifier = findImportSpecifier(declaringSf, typeName);
+			const specifier = findImportOrigin(declaringSf, typeName)?.moduleSpecifier;
 			if (!specifier) return;
 			const resolved = resolveImport(specifier, declaringPath);
 			reference.location = "import";
@@ -16319,7 +16454,7 @@ function reclassifyGlobalTypeReferences(members, declaringSf, declaringPath, res
 * differ from `sf`/`path` if resolved through a re-export), or `undefined`
 */
 function findDeclarationOrReExport(sf, path, name, resolveImport) {
-	const direct = sf.statements.find(matchesNamedDeclaration(name));
+	const direct = findStatementByName(sf, name);
 	if (direct) return {
 		statement: direct,
 		sourceFile: sf,
@@ -16332,7 +16467,7 @@ function findDeclarationOrReExport(sf, path, name, resolveImport) {
 	const { code, path: resolvedPath } = resolved;
 	const isTs = resolvedPath.endsWith(".tsx") || resolvedPath.endsWith(".ts");
 	const reExportSf = ts.createSourceFile(resolvedPath, code, ts.ScriptTarget.ESNext, true, isTs ? ts.ScriptKind.TSX : ts.ScriptKind.JS);
-	const statement = reExportSf.statements.find(matchesNamedDeclaration(reExport.localName));
+	const statement = findStatementByName(reExportSf, reExport.localName);
 	if (!statement) return void 0;
 	return {
 		statement,
@@ -16369,7 +16504,7 @@ function resolveAncestors(classNode, sf, path, resolveImport, visited, ancestors
 		let foundSf = sf;
 		let foundPath = path;
 		let keepLooking = true;
-		const sameFileStatement = sf.statements.find(matchesNamedDeclaration(parentName));
+		const sameFileStatement = findStatementByName(sf, parentName);
 		if (sameFileStatement) {
 			if (ts.isClassDeclaration(sameFileStatement)) foundClass = sameFileStatement;
 			else {
@@ -16378,7 +16513,7 @@ function resolveAncestors(classNode, sf, path, resolveImport, visited, ancestors
 				if (!foundClass) warnMixinFactoryClassNotFound(buildCtx, parentName, rootClassDeclaration);
 			}
 		} else {
-			const specifier = findImportSpecifier(sf, parentName);
+			const specifier = findImportOrigin(sf, parentName)?.moduleSpecifier;
 			if (!specifier) continue;
 			const resolved = resolveImport(specifier, path);
 			if (!resolved) continue;
@@ -21898,6 +22033,39 @@ const DEFAULT_BROWSER_TARGETS = [
 //#endregion
 //#region src/compiler/style/css-parser/parse-css.ts
 /**
+* Splits a selector list on top-level commas in a single pass: a comma only
+* splits when it's outside a quoted string and at paren depth 0, so commas in
+* `:is(:a,:has(:b))` or `[title="a,b"]` aren't treated as separators.
+* Backslash escapes (inside or outside a string) are skipped so they can't shift state,
+* so e.g. `[title="a\,b"]` is treated as a single selector.
+* @param selectors The selector list to split
+* @returns An array of selectors, with whitespace trimmed from each selector
+*/
+const splitSelectorList = (selectors) => {
+	const parts = [];
+	let depth = 0;
+	let quote = null;
+	let start = 0;
+	for (let i = 0; i < selectors.length; i++) {
+		const ch = selectors[i];
+		if (quote) {
+			if (ch === "\\") i++;
+			else if (ch === quote) quote = null;
+			continue;
+		}
+		if (ch === "\"" || ch === "'") quote = ch;
+		else if (ch === "\\") i++;
+		else if (ch === "(") depth++;
+		else if (ch === ")") depth = Math.max(0, depth - 1);
+		else if (ch === "," && depth === 0) {
+			parts.push(selectors.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(selectors.slice(start));
+	return parts.map((s) => s.trim());
+};
+/**
 * Parses CSS string input into an AST representation.
 * Used for minification, finding & resolving URLs and during SSR / prerendering, removing unused selectors.
 *
@@ -22022,11 +22190,8 @@ const parseCss = (css, filePath) => {
 	const selector = () => {
 		const m = match(/^([^{]+)/);
 		if (!m) return null;
-		return trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "").replace(/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'/g, function(str) {
-			return str.replace(/,/g, "‌");
-		}).split(/\s*(?![^(]*\)),\s*/).map(function(s) {
-			return s.replace(/\u200C/g, ",");
-		});
+		const cleaned = trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "");
+		return splitSelectorList(cleaned);
 	};
 	const declaration = () => {
 		const pos = position();

package/dist/runtime/server/runner.mjs

@@ -12358,6 +12358,39 @@ const TASK_CANCELED_MSG = `task canceled`;
 //#endregion
 //#region src/compiler/style/css-parser/parse-css.ts
 /**
+* Splits a selector list on top-level commas in a single pass: a comma only
+* splits when it's outside a quoted string and at paren depth 0, so commas in
+* `:is(:a,:has(:b))` or `[title="a,b"]` aren't treated as separators.
+* Backslash escapes (inside or outside a string) are skipped so they can't shift state,
+* so e.g. `[title="a\,b"]` is treated as a single selector.
+* @param selectors The selector list to split
+* @returns An array of selectors, with whitespace trimmed from each selector
+*/
+const splitSelectorList = (selectors) => {
+	const parts = [];
+	let depth = 0;
+	let quote = null;
+	let start = 0;
+	for (let i = 0; i < selectors.length; i++) {
+		const ch = selectors[i];
+		if (quote) {
+			if (ch === "\\") i++;
+			else if (ch === quote) quote = null;
+			continue;
+		}
+		if (ch === "\"" || ch === "'") quote = ch;
+		else if (ch === "\\") i++;
+		else if (ch === "(") depth++;
+		else if (ch === ")") depth = Math.max(0, depth - 1);
+		else if (ch === "," && depth === 0) {
+			parts.push(selectors.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(selectors.slice(start));
+	return parts.map((s) => s.trim());
+};
+/**
 * Parses CSS string input into an AST representation.
 * Used for minification, finding & resolving URLs and during SSR / prerendering, removing unused selectors.
 *
@@ -12482,11 +12515,8 @@ const parseCss = (css, filePath) => {
 	const selector = () => {
 		const m = match(/^([^{]+)/);
 		if (!m) return null;
-		return trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "").replace(/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'/g, function(str) {
-			return str.replace(/,/g, "‌");
-		}).split(/\s*(?![^(]*\)),\s*/).map(function(s) {
-			return s.replace(/\u200C/g, ",");
-		});
+		const cleaned = trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, "");
+		return splitSelectorList(cleaned);
 	};
 	const declaration = () => {
 		const pos = position();

package/dist/sys/node/worker.mjs

@@ -1,4 +1,4 @@
-import { l as createWorkerMessageHandler } from "../../compiler-2EypBn_Y.mjs";
+import { l as createWorkerMessageHandler } from "../../compiler-BjKDj129.mjs";
 import { t as createNodeSys } from "../../node-HKfDhPR3.mjs";
 //#region src/sys/node/node-worker-thread.ts
 /**

package/dist/testing/index.mjs

@@ -32,7 +32,7 @@ import "@rollup/pluginutils";
 import { createHash } from "crypto";
 import { afterAll, vi } from "vitest";
 //#region src/version.ts
-const version = "5.0.0-beta.11";
+const version = "5.0.0-beta.12";
 const MEMBER_FLAGS = {
 	String: 1,
 	Number: 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stencil/core",
-  "version": "5.0.0-beta.11",
+  "version": "5.0.0-beta.12",
   "description": "A Compiler for Web Components and Progressive Web Apps",
   "keywords": [
     "components",
@@ -125,9 +125,9 @@
     "terser": "^5.50.0",
     "tinyglobby": "^0.2.17",
     "typescript": ">5.0.0 <7.0.0",
-    "@stencil/cli": "5.0.0-beta.11",
-    "@stencil/dev-server": "5.0.0-beta.11",
-    "@stencil/mock-doc": "5.0.0-beta.11"
+    "@stencil/cli": "5.0.0-beta.12",
+    "@stencil/dev-server": "5.0.0-beta.12",
+    "@stencil/mock-doc": "5.0.0-beta.12"
   },
   "devDependencies": {
     "@ionic/prettier-config": "^4.0.0",