@farm.js/create-app 0.1.15 → 0.1.17

package/dist/index.js

@@ -2187,8 +2187,8 @@ better-auth.sqlite-wal
 			}
 		],
 		ui: betterAuthUIFeature(),
-		template: () => `import { betterAuth } from "@farm.js/better-auth";
-import { auth } from "../auth.ts";
+		template: ({ importFrom }) => `import { betterAuth } from "@farm.js/better-auth";
+import { auth } from "${importFrom("src/lib/auth.ts")}";
 
 export const betterAuthIntegration = betterAuth({
   instance: auth,
@@ -2244,8 +2244,8 @@ export const auth = {
 		}],
 		notes: ["The generated Auth.js instance uses GitHub OAuth through @auth/core; add or replace providers in src/lib/auth.ts."],
 		ui: authjsUIFeature(),
-		template: () => `import { authjs } from "@farm.js/authjs";
-import { auth } from "../auth.ts";
+		template: ({ importFrom }) => `import { authjs } from "@farm.js/authjs";
+import { auth } from "${importFrom("src/lib/auth.ts")}";
 
 export const authjsIntegration = authjs({
   instance: auth,
@@ -2363,6 +2363,7 @@ export const strapiIntegration = strapi({
 async function addFarmIntegration(options) {
 	const root = node_path.default.resolve(options.root || process.cwd());
 	const definition = resolveProvider(options.provider);
+	if (!options.skipPackageJson) await assertReadablePackageJson(root);
 	if (definition.provider === "ai") return addAIRouteIntegration({
 		root,
 		definition,
@@ -2389,6 +2390,7 @@ async function addFarmIntegration(options) {
 		notes: [...definition.notes || []]
 	};
 	await writeIntegrationComponent({
+		root,
 		path: integrationFile,
 		definition,
 		force: options.force,
@@ -2450,6 +2452,7 @@ async function addAIRouteIntegration(input) {
 		notes: [...input.definition.notes || []]
 	};
 	await writeIntegrationComponent({
+		root: input.root,
 		path: routeFile,
 		definition: input.definition,
 		force: input.force,
@@ -2493,7 +2496,8 @@ async function writeIntegrationComponent(input) {
 	}
 	if (!input.dryRun) {
 		await (0, node_fs_promises.mkdir)(node_path.default.dirname(input.path), { recursive: true });
-		await (0, node_fs_promises.writeFile)(input.path, input.definition.template(), "utf8");
+		const importFrom = (rootRelativePath) => toImportPath(node_path.default.relative(node_path.default.dirname(input.path), node_path.default.join(input.root, rootRelativePath)));
+		await (0, node_fs_promises.writeFile)(input.path, input.definition.template({ importFrom }), "utf8");
 	}
 	if (exists) input.result.updated.push(input.path);
 	else input.result.created.push(input.path);
@@ -2572,14 +2576,29 @@ async function writeIntegrationSetupFiles(input) {
 		input.result[exists ? "updated" : "created"].push(absolutePath);
 	}
 }
+async function readPackageManifest(packageJsonPath) {
+	const source = await (0, node_fs_promises.readFile)(packageJsonPath, "utf8");
+	try {
+		return {
+			source,
+			manifest: JSON.parse(source)
+		};
+	} catch (error) {
+		throw new Error(`Could not parse ${packageJsonPath}: ${error instanceof Error ? error.message : error}. Fix it, or pass --skip-package-json.`);
+	}
+}
+/** Fails before any file is written, so a broken package.json leaves the app untouched. */
+async function assertReadablePackageJson(root) {
+	const packageJsonPath = node_path.default.join(root, "package.json");
+	if ((0, node_fs.existsSync)(packageJsonPath)) await readPackageManifest(packageJsonPath);
+}
 async function updatePackageJson$1(input) {
 	const packageJsonPath = node_path.default.join(input.root, "package.json");
 	if (!(0, node_fs.existsSync)(packageJsonPath)) {
 		input.result.skipped.push(packageJsonPath);
 		return;
 	}
-	const source = await (0, node_fs_promises.readFile)(packageJsonPath, "utf8");
-	const manifest = JSON.parse(source);
+	const { source, manifest } = await readPackageManifest(packageJsonPath);
 	const dependencies = missingDependencies(manifest, input.definition.dependencies);
 	const devDependencies = missingDependencies(manifest, input.definition.devDependencies);
 	manifest.dependencies = {