@shivaedev/create-app 0.35.0 → 0.37.0

package/src/updateApp.ts

@@ -1,20 +1,43 @@
-import { join, resolve } from "node:path";
+import { join, relative, resolve } from "node:path";
 import { Console, Effect, FileSystem, Schema } from "effect";
-import { CreateAppError } from "./CreateAppError.ts";
-import { GENERATION_FILE, Generation, readTemplate, writeGeneration } from "./generation.ts";
-import { historicalTemplate } from "./historicalTemplate.ts";
-import { checkedProcess, runProcess } from "./runProcess.ts";
-import { starterPatch } from "./starterPatch.ts";
-import { appTemplate } from "./template.ts";
-import { updateChecks } from "./updateChecks.ts";
+import { CreateAppError } from "#CreateAppError.ts";
+import { GENERATION_FILE, Generation, readTemplate, writeGeneration } from "#generation.ts";
+import { historicalTemplate } from "#historicalTemplate.ts";
+import { checkedProcess, runProcess } from "#runProcess.ts";
+import { starterPatch } from "#starterPatch.ts";
+import { appTemplate } from "#template.ts";
+import { updateChecks } from "#updateChecks.ts";
+
+const applyPatch = Effect.fn("CreateApp.applyPatch")(function* (
+	target: string,
+	repository: string,
+	patch: Effect.Success<ReturnType<typeof starterPatch>>,
+) {
+	const prefix = relative(repository, target);
+	if (!patch.empty) {
+		const result = yield* runProcess(repository, "git", ["apply", "--3way", ...(prefix ? [`--directory=${prefix}`] : []), patch.path]);
+		if (result.code !== 0) {
+			const conflicts = (yield* checkedProcess(target, "git", ["diff", "--name-only", "--diff-filter=U", "--", "."])).trim();
+			if (!conflicts) {
+				return yield* new CreateAppError({ message: result.stderr.trim() });
+			}
+		}
+	}
+	if (patch.conflicts.length > 0) {
+		yield* checkedProcess(repository, "git", ["update-index", "-z", "--index-info"], patch.conflicts.map((conflict) => conflict.indexInfo).join(""));
+	}
+	if ((yield* checkedProcess(target, "git", ["diff", "--cached", "--name-only", "--", "."])).trim() === "") {
+		return yield* new CreateAppError({ message: "The starter delta applied no changes. The generation record is unchanged." });
+	}
+});
 
 export const updateApp = Effect.fn("CreateApp.updateApp")(function* (folder: string, templatePath: string, version: string) {
 	return yield* Effect.scoped(
 		Effect.gen(function* () {
 			const fs = yield* FileSystem.FileSystem;
 			const target = resolve(folder);
-			yield* checkedProcess(target, "git", ["rev-parse", "--show-toplevel"]);
-			if ((yield* checkedProcess(target, "git", ["status", "--porcelain"])).trim() !== "") {
+			const repository = (yield* checkedProcess(target, "git", ["rev-parse", "--show-toplevel"])).trim();
+			if ((yield* checkedProcess(target, "git", ["status", "--porcelain", "--", "."])).trim() !== "") {
 				return yield* new CreateAppError({ message: "Refusing to update a dirty working tree. Commit or stash your changes first." });
 			}
 			const generation = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Generation))(
@@ -30,17 +53,16 @@ export const updateApp = Effect.fn("CreateApp.updateApp")(function* (folder: str
 				appTemplate(previous, generation.minimal),
 				appTemplate(current, generation.minimal),
 			);
-			if (!patch.empty) {
-				const result = yield* runProcess(target, "git", ["apply", "--3way", patch.path]);
-				if (result.code !== 0) {
-					const conflicts = (yield* checkedProcess(target, "git", ["diff", "--name-only", "--diff-filter=U"])).trim();
-					if (!conflicts) {
-						return yield* new CreateAppError({ message: result.stderr.trim() });
-					}
-				}
+			if (!patch.empty || patch.conflicts.length > 0) {
+				yield* applyPatch(target, repository, patch);
 			}
 			yield* writeGeneration(target, { ...generation, version });
 			const failures = yield* updateChecks(target);
+			if (patch.conflicts.length > 0) {
+				failures.push(
+					`Starter deletions conflict with app changes:\n${patch.conflicts.map((conflict) => conflict.path).join("\n")}\nKeep a file with git add -- <path>, or accept its deletion with git rm -- <path>.`,
+				);
+			}
 			if (failures.length > 0) {
 				return yield* new CreateAppError({
 					message: `Recorded create-app ${version}. Finish the update before committing:\n${failures.join("\n\n")}`,

package/src/updateChecks.ts

@@ -1,6 +1,6 @@
 import { Console, Effect } from "effect";
-import { CreateAppError } from "./CreateAppError.ts";
-import { checkedProcess, runProcess } from "./runProcess.ts";
+import { CreateAppError } from "#CreateAppError.ts";
+import { checkedProcess, runProcess } from "#runProcess.ts";
 
 const conflictMarkers = Effect.fn("CreateApp.conflictMarkers")(function* (target: string) {
 	const result = yield* runProcess(target, "git", [
@@ -23,7 +23,10 @@ const conflictMarkers = Effect.fn("CreateApp.conflictMarkers")(function* (target
 
 export const updateChecks = Effect.fn("CreateApp.updateChecks")(function* (target: string) {
 	const failures: string[] = [];
-	for (const args of [["install"], ["run", "typecheck"]]) {
+	for (const args of [
+		["install", "--no-frozen-lockfile"],
+		["run", "typecheck"],
+	]) {
 		yield* Console.log(`Running pnpm ${args.join(" ")}...`);
 		const result = yield* runProcess(target, "pnpm", args);
 		if (result.code !== 0) {
@@ -39,7 +42,7 @@ export const updateChecks = Effect.fn("CreateApp.updateChecks")(function* (targe
 	if (markers.length > 0) {
 		failures.unshift(`Files with conflict markers:\n${markers.join("\n")}`);
 	}
-	const unresolved = (yield* checkedProcess(target, "git", ["diff", "--name-only", "--diff-filter=U"])).trim();
+	const unresolved = (yield* checkedProcess(target, "git", ["diff", "--name-only", "--diff-filter=U", "--", "."])).trim();
 	if (unresolved !== "") {
 		failures.push(`Unresolved Git conflicts:\n${unresolved}`);
 	}