tsrx-typegen 0.2.2 → 0.3.1

package/src/{pack-check.mjs → pack-check.ts}

@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os'
 import { dirname, extname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 
 const moduleSpecifierNodes = (ts, sourceFile) => {
-	const nodes = []
+	const nodes: any[] = []
 	const visit = (node) => {
 		if (
 			(ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) &&
@@ -50,15 +50,19 @@ const stringsIn = (value) => {
 }
 
 const codeTarget = (target) =>
-	/\.(?:[cm]?[jt]sx?|tsrx)$/.test(target) && !/\.d\.[cm]?ts$/.test(target)
+	(!extname(target) || /\.(?:[cm]?[jt]sx?|tsrx)$/.test(target)) && !/\.d\.[cm]?ts$/.test(target)
 
-function exportBranches(exportsMap, fallbackTypes = []) {
-	const branches = []
+function exportBranches(exportsMap, fallbackTypes: any[] = []) {
+	const branches: any[] = []
 	for (const [subpath, mapping] of Object.entries(exportsMap ?? {})) {
 		const visit = (value, inheritedTypes) => {
 			if (typeof value === 'string') {
 				if (codeTarget(value)) {
-					branches.push({ subpath, runtime: value, types: inheritedTypes })
+					branches.push({
+						subpath,
+						runtime: value,
+						types: inheritedTypes.length ? inheritedTypes : fallbackTypes,
+					})
 				}
 
 				return
@@ -68,22 +72,27 @@ function exportBranches(exportsMap, fallbackTypes = []) {
 				return
 			}
 
-			const types = Object.hasOwn(value, 'types') ? stringsIn(value.types) : inheritedTypes
+			// An earlier condition cannot use a later sibling's type fallback.
+			let types = inheritedTypes
 			for (const [condition, child] of Object.entries(value)) {
-				if (condition !== 'types') {
+				if (condition === 'types') {
+					if (!types.length) {
+						types = stringsIn(child)
+					}
+				} else {
 					visit(child, types)
 				}
 			}
 		}
 
-		visit(mapping, fallbackTypes)
+		visit(mapping, [])
 	}
 
 	return branches
 }
 
 function packageFiles(root) {
-	const files = []
+	const files: any[] = []
 	const visit = (dir) => {
 		for (const entry of readdirSync(dir, { withFileTypes: true })) {
 			if (entry.name === 'node_modules') {
@@ -104,11 +113,12 @@ function packageFiles(root) {
 }
 
 function expandTarget(target, files, packageRoot) {
-	if (!target.includes('*')) {
+	const extensionless = !extname(target)
+	if (!target.includes('*') && !extensionless) {
 		return [{ path: target, capture: undefined }]
 	}
 
-	if ((target.match(/\*/g) ?? []).length !== 1) {
+	if ((target.match(/\*/g) ?? []).length > 1) {
 		throw new Error(`packed export target uses more than one wildcard: ${target}`)
 	}
 
@@ -118,19 +128,31 @@ function expandTarget(target, files, packageRoot) {
 
 	const pattern = target.slice(2)
 	const marker = pattern.indexOf('*')
-	const prefix = pattern.slice(0, marker)
-	const suffix = pattern.slice(marker + 1)
+	const prefix = marker === -1 ? pattern : pattern.slice(0, marker)
+	const suffix = marker === -1 ? '' : pattern.slice(marker + 1)
 	const matches = files.flatMap((file) => {
 		const path = relative(packageRoot, file).replaceAll('\\', '/')
+		// Extensionless source exports let the app choose platform siblings.
+		// Their wildcard captures are module stems, not source extensions.
+		if (!codeTarget(path) || (extensionless && !extname(path))) {
+			return []
+		}
+
+		const matchedPath = extensionless ? path.slice(0, -extname(path).length) : path
 		if (
-			!path.startsWith(prefix) ||
-			!path.endsWith(suffix) ||
-			path.length < prefix.length + suffix.length
+			!matchedPath.startsWith(prefix) ||
+			!matchedPath.endsWith(suffix) ||
+			matchedPath.length < prefix.length + suffix.length ||
+			(marker === -1 && matchedPath !== pattern)
 		) {
 			return []
 		}
 
-		const capture = path.slice(prefix.length, path.length - suffix.length)
+		const capture =
+			marker === -1
+				? undefined
+				: matchedPath.slice(prefix.length, matchedPath.length - suffix.length)
+
 		return [{ path: `./${path}`, capture }]
 	})
 
@@ -163,13 +185,11 @@ function packedPath(packageRoot, target) {
 function sourceFile(ts, file) {
 	const extension = extname(file).toLowerCase()
 	const scriptKind =
-		extension === '.tsx'
+		extension === '.tsx' || extension === '.tsrx'
 			? ts.ScriptKind.TSX
 			: extension === '.jsx'
 				? ts.ScriptKind.JSX
-				: extension === '.tsrx'
-					? ts.ScriptKind.Deferred
-					: ts.ScriptKind.TS
+				: ts.ScriptKind.TS
 
 	return ts.createSourceFile(
 		file,
@@ -212,7 +232,7 @@ function localSourceModule(file, specifier) {
 	return null
 }
 
-function staticRuntimeExports(ts, file, seen = new Set()) {
+function staticRuntimeExports(ts, file, seen: Set<any> = new Set()) {
 	const absolute = resolve(file)
 	if (seen.has(absolute)) {
 		return new Set()
@@ -221,7 +241,7 @@ function staticRuntimeExports(ts, file, seen = new Set()) {
 	seen.add(absolute)
 
 	const source = sourceFile(ts, absolute)
-	const names = new Set()
+	const names = new Set<any>()
 	const addBindingName = (name) => {
 		if (ts.isIdentifier(name)) {
 			names.add(name.text)
@@ -294,7 +314,13 @@ function staticRuntimeExports(ts, file, seen = new Set()) {
 	return names
 }
 
-function compilerExports(ts, program, file, cache = new Map(), pending = new Set()) {
+function compilerExports(
+	ts,
+	program,
+	file,
+	cache: Map<any, any> = new Map(),
+	pending: Set<any> = new Set(),
+) {
 	const absolute = resolve(file)
 	if (cache.has(absolute)) {
 		return cache.get(absolute)
@@ -315,8 +341,8 @@ function compilerExports(ts, program, file, cache = new Map(), pending = new Set
 		return undefined
 	}
 
-	const all = new Set()
-	const values = new Set()
+	const all = new Set<any>()
+	const values = new Set<any>()
 	for (const symbol of checker.getExportsOfModule(module)) {
 		all.add(symbol.name)
 		let resolved = symbol
@@ -335,9 +361,23 @@ function compilerExports(ts, program, file, cache = new Map(), pending = new Set
 	// target's symbols with their original flags — an ambient `declare const`
 	// still reads as a value even though no value binding crosses the edge.
 	// Subtract names whose only export edges are type-only.
-	const typeOnly = new Set()
+	const typeOnly = new Set<any>()
 	for (const statement of source.statements) {
-		if (!ts.isExportDeclaration(statement) || !statement.isTypeOnly) {
+		if (!ts.isExportDeclaration(statement)) {
+			continue
+		}
+
+		if (statement.exportClause && ts.isNamedExports(statement.exportClause)) {
+			for (const element of statement.exportClause.elements) {
+				if (statement.isTypeOnly || element.isTypeOnly) {
+					typeOnly.add(element.name.text)
+				}
+			}
+
+			continue
+		}
+
+		if (!statement.isTypeOnly) {
 			continue
 		}
 
@@ -392,6 +432,20 @@ function moduleResolutionOptions(ts) {
 		allowImportingTsExtensions: true,
 		module: ts.ModuleKind.NodeNext,
 		moduleResolution: ts.ModuleResolutionKind.NodeNext,
+		// Same precedence as repository typecheck/typegen programs
+		// (packages/cli tsconfig-envs.mjs PLATFORM_MODULE_SUFFIXES):
+		// extensionless first, then every platform suffix.
+		moduleSuffixes: [
+			'',
+			'.web',
+			'.ios',
+			'.android',
+			'.mobile',
+			'.native',
+			'.macos',
+			'.linux',
+			'.windows',
+		],
 		noEmit: true,
 		skipLibCheck: true,
 		target: ts.ScriptTarget.Latest,
@@ -421,6 +475,10 @@ function verifyDeclarationClosure(ts, packageRoot, files, manifest, failures) {
 					)
 				} else if (!pathInside(packageRoot, resolve(resolved.resolvedFileName))) {
 					failures.push(`${relative(packageRoot, file)} resolves ${specifier} outside the package`)
+				} else if (!/\.d\.[cm]?ts$/.test(resolved.resolvedFileName)) {
+					failures.push(
+						`${relative(packageRoot, file)} resolves ${specifier} to implementation source; publish its declaration`,
+					)
 				}
 
 				continue
@@ -465,7 +523,7 @@ function verifyExportMap(ts, packageRoot, files, manifest, exportsMap, failures,
 		return
 	}
 
-	const pairs = []
+	const pairs: any[] = []
 	for (const branch of branches) {
 		if (!branch.types.length) {
 			failures.push(`${branch.subpath} runtime ${branch.runtime} has no types condition`)
@@ -546,7 +604,7 @@ function verifyExportMap(ts, packageRoot, files, manifest, exportsMap, failures,
 }
 
 export function verifyPackedPackage(ts, packageRoot) {
-	const failures = []
+	const failures: any[] = []
 	const manifestPath = join(packageRoot, 'package.json')
 	let manifest
 	try {