@geekmidas/cli 10.0.0-alpha.47 → 10.0.0-alpha.48

package/bin/gkm.mjs

@@ -19,6 +19,10 @@ if (
 	const { createRequire } = await import('node:module');
 	const require = createRequire(import.meta.url);
 	const tsxPath = pathToFileURL(require.resolve('tsx')).href;
+	// Before tsx, so tsx reads each `.tsx` through it and compiles its JSX the
+	// way the file's own tsconfig says. See `owning-tsconfig-jsx.mjs`.
+	const jsxPath = new URL('./owning-tsconfig-jsx-register.mjs', import.meta.url)
+		.href;
 
 	const { execFileSync } = await import('node:child_process');
 	try {
@@ -26,7 +30,11 @@ if (
 			stdio: 'inherit',
 			env: {
 				...process.env,
-				NODE_OPTIONS: `${nodeOptions} --import ${tsxPath}`.trim(),
+				// `--import=<url>`, never `--import <url>`: Next.js re-parses
+				// NODE_OPTIONS for its workers, and with two space-separated imports
+				// its parser glued them into one specifier `next build` could not find.
+				NODE_OPTIONS:
+					`${nodeOptions} --import=${jsxPath} --import=${tsxPath}`.trim(),
 			},
 		});
 	} catch (e) {

package/bin/owning-tsconfig-jsx-register.mjs

@@ -0,0 +1,18 @@
+/**
+ * The `--import` that installs `owning-tsconfig-jsx.mjs` — it must come before
+ * tsx's own `--import`, so that tsx reads the source through it.
+ *
+ * Registered with `module.register()` whatever tsx chose: tsx's in-thread hooks
+ * (`registerHooks`, Node 22.22.3+ / 24.11.1+) hand off to the off-thread chain
+ * when they load a file, and on older Node tsx registers off-thread too, after
+ * this — so either way this hook is asked after tsx, for the file's source.
+ */
+
+import { register } from 'node:module';
+import { isInternalThread } from 'node:worker_threads';
+
+// As tsx guards its own: where Node runs preloads in the hooks thread too,
+// registering from there would hook the hooks.
+if (!isInternalThread) {
+	register('./owning-tsconfig-jsx.mjs', import.meta.url);
+}

package/bin/owning-tsconfig-jsx.mjs

@@ -0,0 +1,108 @@
+/**
+ * Compile a `.tsx` file's JSX the way the tsconfig that owns it says to.
+ *
+ * tsx applies one tsconfig to the whole process — the one in the directory the
+ * command ran from — and only to the files that tsconfig's `include` covers.
+ * `gkm dev` runs each app from its own directory, so a construct's template in
+ * the workspace (`constructs/templates/MagicLink.tsx`) was outside the app's
+ * `include` and compiled with esbuild's defaults: the classic runtime, which
+ * calls `React.createElement` in a file that never imported React, because the
+ * root tsconfig's `"jsx": "react-jsx"` said it need not. It threw
+ * `React is not defined` at render under `gkm dev` and rendered under
+ * `gkm test`, where Vitest compiles each file with its nearest tsconfig.
+ *
+ * Pointing tsx at the root tsconfig instead would only move the problem: an
+ * app may set its own `jsx` or `jsxImportSource` (a Hono app's `hono/jsx`), and
+ * one tsconfig per process is the same mistake `adjacent-tsconfig.mjs` exists
+ * to undo for path aliases. tsx has no per-file tsconfig, but esbuild — which
+ * tsx compiles with — honours JSX pragmas in a file over its options. So this
+ * hook, registered before tsx so that it sits between tsx and the file on disk,
+ * appends the owning tsconfig's JSX settings to the source as pragmas.
+ *
+ * The owning tsconfig is the nearest one above the file, as Vitest and
+ * `adjacent-tsconfig.mjs` choose it. A file that already carries its own JSX
+ * pragma, or whose tsconfig asks for nothing a pragma can say (`preserve`, or
+ * no `jsx` at all), is left exactly as it is. The pragma goes at the end, so no
+ * line of the file moves and its stack traces still point at the right place.
+ *
+ * Only ESM sources pass through here: for a CommonJS module tsx reads the file
+ * itself, and those keep the process tsconfig's behaviour.
+ */
+
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { getTsconfig } from 'get-tsconfig';
+
+const JSX_SOURCE = /\.[jt]sx$/;
+/** A pragma the file chose for itself, which this hook never overrides. */
+const OWN_PRAGMA = /@jsx(?:Runtime|ImportSource|Frag)?\s/;
+
+/** Directory → the pragma its owning tsconfig implies, or `null`. */
+const pragmas = new Map();
+/** Shared with `get-tsconfig`, so a config `extends` is read once. */
+const tsconfigCache = new Map();
+
+/**
+ * The pragma comment that tells esbuild what these compiler options tell
+ * TypeScript, or `null` when there is nothing to say.
+ */
+export function jsxPragma(compilerOptions = {}) {
+	const jsx = compilerOptions.jsx?.toLowerCase();
+
+	if (jsx === 'react-jsx' || jsx === 'react-jsxdev') {
+		const source = compilerOptions.jsxImportSource ?? 'react';
+		return `/* @jsxRuntime automatic @jsxImportSource ${source} */`;
+	}
+
+	if (jsx === 'react') {
+		const parts = ['@jsxRuntime classic'];
+		if (compilerOptions.jsxFactory) {
+			parts.push(`@jsx ${compilerOptions.jsxFactory}`);
+		}
+		if (compilerOptions.jsxFragmentFactory) {
+			parts.push(`@jsxFrag ${compilerOptions.jsxFragmentFactory}`);
+		}
+		return `/* ${parts.join(' ')} */`;
+	}
+
+	// `preserve` and `react-native` leave JSX in the output, which no pragma
+	// can ask for; without `jsx` TypeScript compiles no `.tsx` at all.
+	return null;
+}
+
+function pragmaFor(directory) {
+	if (!pragmas.has(directory)) {
+		const tsconfig = getTsconfig(directory, 'tsconfig.json', tsconfigCache);
+		pragmas.set(directory, jsxPragma(tsconfig?.config.compilerOptions));
+	}
+	return pragmas.get(directory);
+}
+
+/** The JSX file at this URL, when it is one of the project's own. */
+function jsxFilePath(url) {
+	if (!url.startsWith('file:')) return null;
+
+	const path = fileURLToPath(url.split(/[?#]/)[0]);
+	if (!JSX_SOURCE.test(path) || path.includes('/node_modules/')) return null;
+
+	return path;
+}
+
+/** For `module.register()`, so it runs behind tsx however tsx registered. */
+export async function load(url, context, nextLoad) {
+	const loaded = await nextLoad(url, context);
+
+	const path = jsxFilePath(url);
+	if (!path || loaded.source == null) return loaded;
+
+	const pragma = pragmaFor(dirname(path));
+	if (!pragma) return loaded;
+
+	const source =
+		typeof loaded.source === 'string'
+			? loaded.source
+			: new TextDecoder().decode(loaded.source);
+	if (OWN_PRAGMA.test(source)) return loaded;
+
+	return { ...loaded, source: `${source}\n${pragma}\n` };
+}

package/dist/index.cjs

@@ -48,7 +48,7 @@ let _geekmidas_constructs_queue = require("@geekmidas/constructs/queue");
 let _geekmidas_constructs_topic = require("@geekmidas/constructs/topic");
 let node_dns_promises = require("node:dns/promises");
 //#region package.json
-var version = "10.0.0-alpha.47";
+var version = "10.0.0-alpha.48";
 //#endregion
 //#region src/auth/credentials.ts
 /**
@@ -344,6 +344,45 @@ function normalizeRoutes(routes) {
 	return Array.isArray(routes) ? routes : [routes];
 }
 //#endregion
+//#region src/owningTsconfigJsx.ts
+const REGISTER = "owning-tsconfig-jsx-register.mjs";
+/** The CLI's `bin/` was not found above the module looking for it. */
+var OwningTsconfigJsxHookMissing = class extends Error {
+	from;
+	constructor(from) {
+		super(`Could not find bin/${REGISTER} in any directory above '${from}'. It ships with @geekmidas/cli beside bin/gkm.mjs; reinstall the package if it is missing.`);
+		this.from = from;
+		this.name = "OwningTsconfigJsxHookMissing";
+	}
+};
+/**
+* The CLI's `bin/owning-tsconfig-jsx-register.mjs`, as a file URL. Searched
+* upward because this module runs from `src/` in the repo and from a chunk in
+* `dist/` once built, and `bin/` sits beside both.
+*/
+function registerUrl() {
+	const from = (0, node_path.dirname)((0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
+	for (let dir = from;; dir = (0, node_path.dirname)(dir)) {
+		const candidate = (0, node_path.join)(dir, "bin", REGISTER);
+		if ((0, node_fs.existsSync)(candidate)) return (0, node_url.pathToFileURL)(candidate).href;
+		if ((0, node_path.dirname)(dir) === dir) throw new OwningTsconfigJsxHookMissing(from);
+	}
+}
+/**
+* `NODE_OPTIONS` for a process that runs app code through tsx, with the hook
+* that compiles each `.tsx` with its own tsconfig's JSX settings (see
+* `bin/owning-tsconfig-jsx.mjs`) put in front of every other `--import`, so it
+* is registered before tsx and reads the source on tsx's behalf.
+*
+* `bin/gkm.mjs` already starts the CLI this way, and its children inherit it;
+* this is for those that set `NODE_OPTIONS` themselves, or whose CLI was
+* started with tsx already imported.
+*/
+function withOwningTsconfigJsx(nodeOptions = "") {
+	if (nodeOptions.includes(REGISTER)) return nodeOptions;
+	return [`--import=${registerUrl()}`, nodeOptions].filter(Boolean).join(" ");
+}
+//#endregion
 //#region src/trust/index.ts
 /**
 * Installing the local edge's certificate authority into the OS trust store.
@@ -1696,7 +1735,8 @@ var EntryRunner = class {
 	async runProcess() {
 		const env = {
 			...process.env,
-			PORT: String(this.port)
+			PORT: String(this.port),
+			NODE_OPTIONS: withOwningTsconfigJsx(process.env.NODE_OPTIONS)
 		};
 		this.childProcess = (0, node_child_process.spawn)(...tsxCommand((0, node_path.dirname)(this.wrapperPath), [this.wrapperPath]), {
 			stdio: "inherit",
@@ -1946,7 +1986,8 @@ var DevServer = class {
 			env: {
 				...process.env,
 				NODE_ENV: "development",
-				GKM_DEV_PID: String(process.pid)
+				GKM_DEV_PID: String(process.pid),
+				NODE_OPTIONS: withOwningTsconfigJsx(process.env.NODE_OPTIONS)
 			},
 			detached: true
 		});
@@ -6778,7 +6819,7 @@ async function sniffEntryFile(entryPath, appPath, workspacePath) {
 			],
 			env: {
 				...process.env,
-				NODE_OPTIONS: "--import=tsx"
+				NODE_OPTIONS: withOwningTsconfigJsx("--import=tsx")
 			}
 		});
 		let stdout = "";
@@ -9094,26 +9135,26 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.47",
-	"@geekmidas/auth": "~10.0.0-alpha.47",
-	"@geekmidas/cache": "~10.0.0-alpha.47",
-	"@geekmidas/client": "~10.0.0-alpha.47",
-	"@geekmidas/cloud": "~10.0.0-alpha.47",
-	"@geekmidas/constructs": "~10.0.0-alpha.47",
-	"@geekmidas/db": "~10.0.0-alpha.47",
-	"@geekmidas/emailkit": "~10.0.0-alpha.47",
-	"@geekmidas/envkit": "~10.0.0-alpha.47",
-	"@geekmidas/errors": "~10.0.0-alpha.47",
-	"@geekmidas/events": "~10.0.0-alpha.47",
-	"@geekmidas/logger": "~10.0.0-alpha.47",
-	"@geekmidas/manifest": "~10.0.0-alpha.47",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.47",
-	"@geekmidas/schema": "~10.0.0-alpha.47",
-	"@geekmidas/services": "~10.0.0-alpha.47",
-	"@geekmidas/storage": "~10.0.0-alpha.47",
-	"@geekmidas/studio": "~10.0.0-alpha.47",
-	"@geekmidas/telescope": "~10.0.0-alpha.47",
-	"@geekmidas/testkit": "~10.0.0-alpha.47",
+	"@geekmidas/audit": "~10.0.0-alpha.48",
+	"@geekmidas/auth": "~10.0.0-alpha.48",
+	"@geekmidas/cache": "~10.0.0-alpha.48",
+	"@geekmidas/client": "~10.0.0-alpha.48",
+	"@geekmidas/cloud": "~10.0.0-alpha.48",
+	"@geekmidas/constructs": "~10.0.0-alpha.48",
+	"@geekmidas/db": "~10.0.0-alpha.48",
+	"@geekmidas/emailkit": "~10.0.0-alpha.48",
+	"@geekmidas/envkit": "~10.0.0-alpha.48",
+	"@geekmidas/errors": "~10.0.0-alpha.48",
+	"@geekmidas/events": "~10.0.0-alpha.48",
+	"@geekmidas/logger": "~10.0.0-alpha.48",
+	"@geekmidas/manifest": "~10.0.0-alpha.48",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.48",
+	"@geekmidas/schema": "~10.0.0-alpha.48",
+	"@geekmidas/services": "~10.0.0-alpha.48",
+	"@geekmidas/storage": "~10.0.0-alpha.48",
+	"@geekmidas/studio": "~10.0.0-alpha.48",
+	"@geekmidas/telescope": "~10.0.0-alpha.48",
+	"@geekmidas/testkit": "~10.0.0-alpha.48",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion