@shivaedev/create-app 0.36.0 → 0.38.0

package/src/starterPatch.ts

@@ -1,8 +1,8 @@
 import { join } from "node:path";
 import { Effect, FileSystem } from "effect";
-import { renderTemplate } from "./generation.ts";
-import { checkedProcess } from "./runProcess.ts";
-import type { Template } from "./template.ts";
+import { renderTemplate } from "#generation.ts";
+import { checkedProcess } from "#runProcess.ts";
+import type { Template } from "#template.ts";
 
 export const starterPatch = Effect.fn("CreateApp.starterPatch")(function* (
 	target: string,
@@ -26,18 +26,30 @@ export const starterPatch = Effect.fn("CreateApp.starterPatch")(function* (
 	yield* renderTemplate(repository, base, name);
 	yield* checkedProcess(repository, "git", ["add", "--all"]);
 	const tree = (yield* checkedProcess(repository, "git", ["write-tree"])).trim();
+	const conflicts: { path: string; indexInfo: string }[] = [];
+	const retained: Template[number][] = [];
 	for (const entry of base) {
-		yield* checkedProcess(target, "git", ["hash-object", "-w", "--", join(repository, entry.path)]);
+		const hash = (yield* checkedProcess(target, "git", ["hash-object", "-w", "--", join(repository, entry.path)])).trim();
+		if (!incoming.some((file) => file.path === entry.path)) {
+			const ours = yield* checkedProcess(target, "git", ["--literal-pathspecs", "ls-files", "--stage", "--full-name", "-z", "--", entry.path]);
+			if (!ours.startsWith(`100644 ${hash} 0\t`)) {
+				const indexedPath = ours.slice(ours.indexOf("\t") + 1, -1);
+				const indexInfo = [`0 ${hash}\t${indexedPath}\0`, `100644 ${hash} 1\t${indexedPath}\0`, ours.replace(" 0\t", " 2\t")].join("");
+				conflicts.push({ indexInfo, path: entry.path });
+				// Git apply rejects these deletions before applying any of the delta.
+				retained.push(entry);
+			}
+		}
 	}
 	for (const path of yield* fs.readDirectory(repository)) {
 		if (path !== ".git") {
 			yield* fs.remove(join(repository, path), { recursive: true });
 		}
 	}
-	yield* renderTemplate(repository, incoming, name);
+	yield* renderTemplate(repository, [...incoming, ...retained], name);
 	yield* checkedProcess(repository, "git", ["add", "--all"]);
 	const patch = yield* checkedProcess(repository, "git", ["diff", "--cached", "--binary", "--full-index", "--no-renames", tree]);
 	const path = join(directory, "starter.patch");
 	yield* fs.writeFileString(path, patch);
-	return { empty: patch.length === 0, path };
+	return { conflicts, empty: patch.length === 0, path };
 });

package/src/template.ts

@@ -14,12 +14,21 @@ export function appTemplate(template: Template, minimal = false): Template {
 		return files;
 	}
 	return files
-		.filter((entry) => !entry.path.startsWith("src/modules/notes/"))
+		.filter((entry) => !(entry.path.startsWith("src/modules/notes/") || entry.path.startsWith("tooling/notes/")))
 		.map((entry) => {
 			if (entry.path === "package.json" && minimalManifest !== undefined) {
 				return { ...entry, content: minimalManifest.content };
 			}
-			if (!["src/admin/modules.ts", "src/server/modules.ts", "src/server/workerModules.ts", "src/client/modules.ts"].includes(entry.path)) {
+			// Updates must reconstruct historical minimal files exactly to recognize unmodified deletions.
+			if (
+				![
+					"src/admin/foundation.ts",
+					"src/admin/modules.ts",
+					"src/server/modules.ts",
+					"src/server/workerModules.ts",
+					"src/client/modules.ts",
+				].includes(entry.path)
+			) {
 				return entry;
 			}
 			const source = Buffer.from(entry.content, "base64")
@@ -39,6 +48,7 @@ const Manifest = Schema.Struct({
 	packageManager: Schema.String,
 	private: Schema.Boolean,
 	scripts: Versions,
+	shivaedevSkills: Schema.optional(Schema.Array(Schema.String)),
 	type: Schema.String,
 	version: Schema.String,
 });
@@ -55,6 +65,7 @@ const manifestOrder = [
 	"devDependencies",
 	"packageManager",
 	"engines",
+	"shivaedevSkills",
 ] as const satisfies ReadonlyArray<keyof typeof Manifest.Type>;
 
 export function manifestJson(manifest: typeof Manifest.Type) {
@@ -86,7 +97,11 @@ export function prepareManifest(source: string, versions: Readonly<Record<string
 			versions,
 		),
 		devDependencies: registryDependencies(manifest.devDependencies, versions),
-		scripts: Object.fromEntries(Object.entries(scripts).map(([name, script]) => [name, script.replaceAll("--conditions=source ", "")])),
+		scripts: Object.fromEntries(
+			Object.entries(scripts)
+				.filter(([name]) => !minimal || name !== "browser-check:live-notes")
+				.map(([name, script]) => [name, script.replaceAll("--conditions=source ", "")]),
+		),
 	};
 	return manifestJson(prepared);
 }

package/src/updateApp.ts

@@ -1,22 +1,31 @@
 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, path: string) {
+const applyPatch = Effect.fn("CreateApp.applyPatch")(function* (
+	target: string,
+	repository: string,
+	patch: Effect.Success<ReturnType<typeof starterPatch>>,
+) {
 	const prefix = relative(repository, target);
-	const result = yield* runProcess(repository, "git", ["apply", "--3way", ...(prefix ? [`--directory=${prefix}`] : []), 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) {
+		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." });
 	}
@@ -44,11 +53,16 @@ export const updateApp = Effect.fn("CreateApp.updateApp")(function* (folder: str
 				appTemplate(previous, generation.minimal),
 				appTemplate(current, generation.minimal),
 			);
-			if (!patch.empty) {
-				yield* applyPatch(target, repository, patch.path);
+			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) {