delacour 0.1.0-alpha.1 → 0.1.0-alpha.2

package/README.md

@@ -121,15 +121,22 @@ never written to it.
 
 ## After `init`
 
-Three things need a human, because each is a decision inside a file you own:
+Three things need a human, because each is a decision inside a file you own. `init` copies the
+`provider` item in alongside `styles`, so the root every pressable needs is one import away — but
+mounting it is an edit to your layout, and that stays yours:
 
 ```tsx
 // app/_layout.tsx
 import "@/styles/global.css";
-import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { DelacourProvider } from "@/components/ui/provider";
+import { Stack } from "expo-router";
 
 export default function RootLayout() {
-	return <GestureHandlerRootView style={{ flex: 1 }}>{/* … */}</GestureHandlerRootView>;
+	return (
+		<DelacourProvider>
+			<Stack />
+		</DelacourProvider>
+	);
 }
 ```
 

package/dist/index.js

@@ -9943,13 +9943,13 @@ const DEFAULT_REGISTRY_URL = "https://raw.githubusercontent.com/delacournz/delac
 * Replaced at build time with the git tag being published (see `tsdown.config.ts`).
 * `main` in a working tree, where there is no tag yet.
 */
-const DEFAULT_REGISTRY_REF = "090ab14dc722b9c4de3295b0709e13da4c8afc24";
+const DEFAULT_REGISTRY_REF = "10f3730f22e550ce8327ff388dacf6191975fda8";
 const RAW_GITHUB = "https://raw.githubusercontent.com";
 const GITHUB_SHORTHAND = /^github:([^/#]+)\/([^/#]+)(?:#(.+))?$/;
 /** `https://raw.githubusercontent.com/owner/repo` and nothing more. */
 const BARE_RAW_REPO = new RegExp(`^${RAW_GITHUB}/([^/]+)/([^/]+)$`);
 function resolveRegistrySource(options) {
-	const ref = options.ref || "090ab14dc722b9c4de3295b0709e13da4c8afc24";
+	const ref = options.ref || "10f3730f22e550ce8327ff388dacf6191975fda8";
 	const url = options.url?.trim();
 	if (!url) return remote(`${DEFAULT_REGISTRY_URL}/${ref}`);
 	const shorthand = GITHUB_SHORTHAND.exec(url);
@@ -12128,23 +12128,40 @@ function matchesEntry(imported, target) {
 * Every pressable in the library is a Gesture Handler detector, and a detector
 * outside a `GestureHandlerRootView` never receives a touch. Nothing throws;
 * the button simply does not respond.
+*
+* `DelacourProvider` is that root, plus the other layers, so mounting it
+* counts. The copied components are skipped on purpose: `provider.tsx` itself
+* names both, and `init` copies it into every project, so a walk that read it
+* would pass an app that never mounted anything. The app root is read one level
+* deep as well as the usual `app/` and `src/` walks, because a blank Expo
+* template mounts everything from `App.tsx` at the top.
+*
+* Exported for the tests; `runChecks` is the entry point.
 */
 async function checkGestureHandlerRoot(config) {
+	const appRoot = config.app.resolved.root;
+	const skip = Object.values(config.directories);
 	const roots = [
 		"src/app",
 		"app",
 		"src"
-	].map((path) => join(config.app.resolved.root, path));
-	if ((await Promise.all(roots.map((root) => containsText(root, "GestureHandlerRootView")))).some(Boolean)) return {
-		name: "Gesture Handler",
-		status: "pass",
-		detail: "GestureHandlerRootView found at the app root"
-	};
+	].map((path) => join(appRoot, path));
+	for (const needle of ["DelacourProvider", "GestureHandlerRootView"]) {
+		const walked = await Promise.all(roots.map((root) => containsText(root, needle, { skip })));
+		if (await containsText(appRoot, needle, {
+			skip,
+			recursive: false
+		}) || walked.some(Boolean)) return {
+			name: "Gesture Handler",
+			status: "pass",
+			detail: `${needle} found at the app root`
+		};
+	}
 	return {
 		name: "Gesture Handler",
 		status: "warn",
-		detail: "no GestureHandlerRootView found",
-		fix: "Wrap your root layout in <GestureHandlerRootView style={{ flex: 1 }}> — presses do nothing without it."
+		detail: "no DelacourProvider or GestureHandlerRootView found",
+		fix: "Wrap your root layout in <DelacourProvider> from your ui directory — or, by hand, <GestureHandlerRootView style={{ flex: 1 }}>. Presses do nothing without one of them."
 	};
 }
 /**
@@ -12203,16 +12220,18 @@ async function readExpoConfig(cwd) {
 		return null;
 	}
 }
-async function containsText(directory, needle) {
+async function containsText(directory, needle, options = {}) {
 	let entries;
 	try {
-		entries = await readdir(directory, { recursive: true });
+		entries = await readdir(directory, { recursive: options.recursive ?? true });
 	} catch {
 		return false;
 	}
 	for (const entry of entries) {
-		if (!/\.tsx?$/.test(entry)) continue;
-		if ((await read$1(join(directory, entry)))?.includes(needle)) return true;
+		if (!/\.tsx?$/.test(entry) || entry.includes("node_modules")) continue;
+		const path = join(directory, entry);
+		if (options.skip?.some((skipped) => path === skipped || path.startsWith(`${skipped}/`))) continue;
+		if ((await read$1(path))?.includes(needle)) return true;
 	}
 	return false;
 }
@@ -12341,6 +12360,7 @@ function toPosix$1(path) {
 //#region src/commands/init.ts
 var init_exports = /* @__PURE__ */ __exportAll({
 	defaultPlacement: () => defaultPlacement,
+	followUps: () => followUps,
 	init: () => init
 });
 async function init(components, options) {
@@ -12366,7 +12386,11 @@ async function init(components, options) {
 		packageName: placement.packageName
 	}), placement.root, output);
 	await wireUpApp(resolved, resolved.package ? project.workspaceRoot : null, output);
-	await add(["styles", ...components], {
+	await add([
+		"styles",
+		"provider",
+		...components
+	], {
 		...options,
 		cwd: placement.root,
 		overwrite: true
@@ -12509,6 +12533,7 @@ async function wireUpApp(config, workspaceRoot, output) {
 		metro.snippet
 	].join("\n"));
 	await ensureUniwindEnv(config, output);
+	await ensureExpoEnv(config, output);
 	const block = buildStylesBlock({
 		cssPath: config.app.resolved.css,
 		directories: config.directories
@@ -12540,6 +12565,25 @@ async function ensureUniwindEnv(config, output) {
 	output.success(`Wrote ${style.path("uniwind-env.d.ts")} — the app needs it too, not just the package`);
 }
 /**
+* The file Expo's own CLI writes on first `start`, and nothing before that.
+*
+* `expo/types` is what declares `*.css` as a module. A template without a
+* router — `blank-typescript` — ships no `expo-env.d.ts`, so the CSS import
+* `init` just asked for fails `tsc` with "Cannot find module … './styles/global.css'"
+* until the app has been started once. Metro is fine either way; only the
+* typecheck a reader runs first is not.
+*/
+async function ensureExpoEnv(config, output) {
+	if (config.framework !== "expo") return;
+	const path = join(config.app.resolved.root, "expo-env.d.ts");
+	if (existsSync(path)) return;
+	await write$1(path, `${EXPO_ENV_REFERENCE}\n`);
+	output.success(`Wrote ${style.path("expo-env.d.ts")} — it declares *.css as a module`);
+}
+const EXPO_ENV_REFERENCE = `/// <reference types="expo/types" />
+
+// NOTE: This file should not be edited and should be in your git ignore`;
+/**
 * What is left, and why the CLI did not just do it.
 *
 * Each of these needs a decision or an AST edit inside a file the project owns.
@@ -12547,18 +12591,30 @@ async function ensureUniwindEnv(config, output) {
 * the only chance to see it.
 */
 function printFollowUps(config, output) {
-	const items = [];
-	if (Object.keys(config.aliases).length > 0) items.push(`Set ${style.code("experiments.tsconfigPaths: true")} in app.config — Metro ignores tsconfig paths without it.`);
-	items.push(`Import ${style.code(`"${config.aliases.styles ?? "."}/${basename(config.app.resolved.css)}"`)} as the first statement of your root layout — without it every component renders unstyled.`);
-	items.push(`Wrap the app root in ${style.code("<GestureHandlerRootView style={{ flex: 1 }}>")} — presses do nothing without it.`);
-	items.push(`${style.code("theme.css")} is the file to edit — replace it with the theme.css tab from https://ui.delacour.co.nz/theme, or paste a shadcn or tweakcn globals.css over it and run ${style.code("delacour theme")}.`);
 	output.info([
 		`A few things need you:`,
-		...items.map((line) => `  • ${line}`),
+		...followUps(config).map((line) => `  • ${line}`),
 		"",
 		`Run ${style.code("delacour doctor")} to check.`
 	].join("\n"));
 }
+/**
+* The follow-up lines themselves, in the order they are printed.
+*
+* Exported so the order is testable: the CSS import goes first because it is
+* the only one of these that produces no error at all, and the provider before
+* the theme because a theme is a choice and a root that receives touches is not.
+*/
+function followUps(config) {
+	const items = [];
+	if (Object.keys(config.aliases).length > 0) items.push(`Set ${style.code("experiments.tsconfigPaths: true")} in app.config — Metro ignores tsconfig paths without it.`);
+	const cssImport = config.aliases.styles ? `${config.aliases.styles}/${basename(config.app.resolved.css)}` : `./${short(config.app.resolved.root, config.app.resolved.css)}`;
+	items.push(`Import ${style.code(`"${cssImport}"`)} as the first statement of your root layout — without it every component renders unstyled.`);
+	const providerImport = `${config.aliases.ui ?? `./${short(config.app.resolved.root, config.directories.ui)}`}/provider`;
+	items.push(`Wrap the app root in ${style.code("<DelacourProvider>")} from ${style.code(`"${providerImport}"`)} — presses do nothing without it.`);
+	items.push(`${style.code("theme.css")} is the file to edit — replace it with the theme.css tab from https://ui.delacour.co.nz/theme, or paste a shadcn or tweakcn globals.css over it and run ${style.code("delacour theme")}.`);
+	return items;
+}
 function warnAboutStack(project, output) {
 	if (!project.packageJson) {
 		output.warn("No package.json here. Run this inside your Expo app.");
@@ -28411,7 +28467,7 @@ function report(result, output) {
 }
 //#endregion
 //#region src/index.ts
-const program = new Command().name("delacour").description("Add React Native components to your Expo app. You own the code.").version("0.1.0-alpha.1");
+const program = new Command().name("delacour").description("Add React Native components to your Expo app. You own the code.").version("0.1.0-alpha.2");
 /** Shared by every command that reads the registry. */
 function withRegistryOptions(command) {
 	return command.addOption(new Option("--registry <url>", "registry to read from: a URL, github:owner/repo, or a local path")).addOption(new Option("--ref <ref>", "git ref to read the registry at").default(DEFAULT_REGISTRY_REF)).addOption(new Option("--offline", "use only what is already cached")).addOption(new Option("-c, --cwd <path>", "directory to work in").default(process.cwd()));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "delacour",
-	"version": "0.1.0-alpha.1",
+	"version": "0.1.0-alpha.2",
 	"description": "Add React Native components to your Expo app. You own the code.",
 	"type": "module",
 	"license": "MIT",