@octane-xplat/cli 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octane-xplat/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "xplat — dev/build/doctor for octane-xplat apps (web + iOS + Android from one codebase)",
   "bin": {
     "xplat": "./src/cli.mjs"

package/src/commands/doctor.mjs

@@ -1,7 +1,178 @@
 import { command } from '@alloc/cmd-ts'
 import { execFileSync } from 'node:child_process'
+import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import { dirname, join, parse, relative, resolve } from 'node:path'
 import * as p from '@clack/prompts'
 
+const frameworkFallbacks = {
+	'@octane-xplat/ui': [
+		'@nativescript-community/gesturehandler',
+		'@nativescript-community/ui-canvas',
+		'@nativescript-community/ui-drawer',
+		'@nativescript-community/ui-svg',
+	],
+	'@octane-xplat/platform': [
+		'@nativescript-community/ui-document-picker',
+		'@nativescript/biometrics',
+		'@nativescript/geolocation',
+		'@nativescript/haptics',
+		'@nativescript/imagepicker',
+		'@nativescript/local-notifications',
+		'@nativescript/secure-storage',
+		'@nativescript/social-share',
+		'nativescript-clipboard',
+	],
+}
+
+const nativePlugin = (name) =>
+	(name.startsWith('@nativescript/') ||
+		name.startsWith('@nativescript-community/') ||
+		name.startsWith('nativescript-')) &&
+	!name.endsWith('/octane') &&
+	!name.endsWith('/core')
+
+const readJson = (file) => {
+	try {
+		return JSON.parse(readFileSync(file, 'utf8'))
+	} catch {
+		return null
+	}
+}
+
+const packageName = (specifier) => {
+	if (!specifier.startsWith('@') && !specifier.includes('/')) {return specifier}
+	const parts = specifier.split('/')
+	return specifier.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0]
+}
+
+const importSpecifiers = (source) => {
+	const specs = new Set()
+	for (const pattern of [
+		/\bfrom\s*['"]([^'"]+)['"]/g,
+		/\bimport\s*['"]([^'"]+)['"]/g,
+		/\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
+	]) {
+		for (const match of source.matchAll(pattern)) {specs.add(match[1])}
+	}
+
+	return specs
+}
+
+const sourceFiles = (root) => {
+	if (!existsSync(root)) {return []}
+	const out = []
+	const visit = (dir) => {
+		for (const entry of readdirSync(dir, { withFileTypes: true })) {
+			if (entry.name === 'node_modules' || entry.name.startsWith('.')) {continue}
+			const file = join(dir, entry.name)
+			if (entry.isDirectory()) {visit(file)}
+			else if (/\.(?:m?[jt]sx?|tsrx)$/.test(entry.name)) {out.push(file)}
+		}
+	}
+
+	visit(root)
+	return out
+}
+
+const workspacePackages = (cwd) => {
+	const found = new Map()
+	let dir = resolve(cwd)
+	while (true) {
+		for (const group of ['apps', 'packages']) {
+			const parent = join(dir, group)
+			if (!existsSync(parent)) {continue}
+			for (const name of readdirSync(parent)) {
+				const root = join(parent, name)
+				const manifest = readJson(join(root, 'package.json'))
+				if (manifest?.name) {found.set(manifest.name, root)}
+			}
+		}
+
+		const next = dirname(dir)
+		if (next === dir) {break}
+		dir = next
+	}
+
+	return found
+}
+
+const packageRoot = (cwd, name, workspaces) => {
+	const direct = join(cwd, 'node_modules', ...name.split('/'))
+	if (existsSync(join(direct, 'package.json'))) {return direct}
+	return workspaces.get(name)
+}
+
+const frameworkPlugins = (cwd, name, workspaces) => {
+	const root = packageRoot(cwd, name, workspaces)
+	const manifest = root && readJson(join(root, 'package.json'))
+	const declared = [
+		...Object.keys(manifest?.dependencies ?? {}),
+		...Object.keys(manifest?.peerDependencies ?? {}),
+	].filter(nativePlugin)
+
+	return declared.length ? declared : frameworkFallbacks[name] ?? []
+}
+
+/**
+ * Find native plugins required by the framework packages reachable from an app
+ * source tree, then compare them with the app's own package.json. This is a
+ * warning because the web target does not need native plugin declarations and
+ * a package may intentionally keep an optional native capability unused.
+ */
+export function findMissingPluginDeclarations(cwd) {
+	const manifest = readJson(join(cwd, 'package.json')) ?? {}
+	const owned = new Set([
+		...Object.keys(manifest.dependencies ?? {}),
+		...Object.keys(manifest.devDependencies ?? {}),
+		...Object.keys(manifest.optionalDependencies ?? {}),
+		...Object.keys(manifest.peerDependencies ?? {}),
+	])
+
+	const workspaces = workspacePackages(cwd)
+	const pending = sourceFiles(join(cwd, 'src'))
+	for (const dir of ['app', 'src/app']) {pending.push(...sourceFiles(join(cwd, dir)))}
+	const visited = new Set()
+	const frameworks = new Map()
+
+	while (pending.length) {
+		const file = pending.pop()
+		if (visited.has(file)) {continue}
+		visited.add(file)
+		let source
+		try {
+			source = readFileSync(file, 'utf8')
+		} catch {
+			continue
+		}
+
+		for (const specifier of importSpecifiers(source)) {
+			const name = packageName(specifier)
+			if (frameworkFallbacks[name]) {
+				if (!frameworks.has(name)) {frameworks.set(name, new Set())}
+				frameworks.get(name).add(relative(cwd, file) || parse(file).base)
+				continue
+			}
+
+			const root = packageRoot(cwd, name, workspaces)
+			if (root && workspaces.has(name)) {pending.push(...sourceFiles(root))}
+		}
+	}
+
+	const missing = new Map()
+	for (const [framework] of frameworks) {
+		for (const plugin of frameworkPlugins(cwd, framework, workspaces)) {
+			if (!owned.has(plugin)) {
+				if (!missing.has(plugin)) {missing.set(plugin, new Set())}
+				missing.get(plugin).add(framework)
+			}
+		}
+	}
+
+	return [...missing.entries()]
+		.sort(([a], [b]) => a.localeCompare(b))
+		.map(([plugin, frameworks]) => ({ plugin, frameworks: [...frameworks].sort() }))
+}
+
 const check = (cmd, args) => {
 	try {
 		return {
@@ -25,6 +196,7 @@ export const doctor = command({
 	description: 'Check the toolchain for web + native builds',
 	args: {},
 	handler: async () => {
+		const cwd = process.cwd()
 		p.intro('xplat doctor')
 		const rows = []
 		const row = (name, ok, detail, hint) => rows.push({ name, ok, detail, hint })
@@ -77,6 +249,13 @@ export const doctor = command({
 			'JDK 17 (JDK 25 breaks the Android toolchain)',
 		)
 
+		const pluginWarnings = findMissingPluginDeclarations(cwd)
+		for (const { plugin, frameworks } of pluginWarnings) {
+			p.log.warn(
+				`native plugin declaration — ${plugin} is required by ${frameworks.join(', ')}; add it to this app's package.json`,
+			)
+		}
+
 		let bad = 0
 		for (const r of rows) {
 			if (r.ok) {
@@ -87,10 +266,15 @@ export const doctor = command({
 			}
 		}
 
-		p.outro(
+		const summary =
 			bad === 0
 				? 'All checks pass'
-				: `${bad} missing — web still works, native targets need the above`,
+				: `${bad} missing — web still works, native targets need the above`
+
+		p.outro(
+			pluginWarnings.length
+				? `${summary}; ${pluginWarnings.length} native plugin declaration warning(s)`
+				: summary,
 		)
 	},
 })

package/src/vite.mjs

@@ -233,7 +233,22 @@ export async function xplatNative(env, opts = {}) {
 		),
 		{
 			plugins: [pxToDip(), nsHmrClientWatchdog()],
+			build: {
+				rolldownOptions: {
+					// Dev/HMR universal emit retains JSX in expression props
+					// (e.g. `renderItem={(item) => <gridlayout>…}`) for the file's
+					// own @jsxImportSource pragma to lower. Rolldown only parses
+					// JSX in script-lang modules, so mark .tsrx transform
+					// output tsx.
+					moduleTypes: { '.tsrx': 'tsx' },
+				},
+			},
 			optimizeDeps: {
+				// vite-octane excludes `octane` from the deps bundle, so the
+				// optimizeDeps graph walk never descends into it — alien-signals
+				// (the signal impl imported by octane/universal/native) is missed
+				// and the device fetch 504s. Seed it directly.
+				include: ['alien-signals', 'alien-signals/system'],
 				// Flattened optimizeDeps chunks get mangled by the /ns/m device
 				// transform (`import import "/ns/core/utils"`) and miss the vendor
 				// manifest — serve @nativescript plugins per-module instead.