@happyvertical/smrt-core 0.40.57 → 0.40.59

package/dist/manifest.json

@@ -2,7 +2,7 @@
   "version": "1.0.0",
   "timestamp": 0,
   "packageName": "@happyvertical/smrt-core",
-  "packageVersion": "0.40.57",
+  "packageVersion": "0.40.59",
   "objects": {
     "@happyvertical/smrt-core:SmrtClass": {
       "name": "smrtclass",

package/dist/smrt-knowledge.json

@@ -2,12 +2,12 @@
   "schemaVersion": 1,
   "generatedAt": "1970-01-01T00:00:00.000Z",
   "packageName": "@happyvertical/smrt-core",
-  "packageVersion": "0.40.57",
+  "packageVersion": "0.40.59",
   "sourceManifestPath": "dist/manifest.json",
   "agentDocPath": "AGENTS.md",
   "sourceHashes": {
-    "manifest": "ec396f60efc06b74cb3db4d78bd95e192380d9d34c4f76d77b4c21ae4925bf4d",
-    "packageJson": "2e1cd253572f6d502ecbbfe5644d0f33439f9bffd586f145ca554efb4332bdff",
+    "manifest": "384c4ae94adeb769528078f5348773b81d35c10ed3361200bf58a8ee5cd19d47",
+    "packageJson": "6a589b7675e2fdf821a6dbd218a42c256bcfea53fedd57197c1c1ceb835d6b7b",
     "agents": "ab30f2e4beb8d45e210d596794be5e7d93c99c21a517876f09d08d9a3b5f13df",
     "moduleDoc:agents/change-feed.md": "5278797d6c049ea21071b011182a9fcd79d17f9d74e0f90a93caa4c05c25294f",
     "moduleDoc:agents/change-signals.md": "d9cb6a5541728ffea46607a6b1d4fa61d4621849f2b4ea86a0645fbb0af892e9",

package/dist/vite-plugin/sveltekit-generator.js

@@ -665,7 +665,7 @@ async function generateSvelteKitRoutes(projectRoot, manifest, options) {
 	if (generateSyncApplyRoute(projectRoot, manifest, options)) generatedRoutePaths.push(join(projectRoot, options.routesDir, "sync", "apply", "+server.ts"));
 	if (generateChangesRoute(projectRoot, manifest, options)) generatedRoutePaths.push(join(projectRoot, options.routesDir, "_changes", "+server.ts"));
 	if (generateEventsRoute(projectRoot, manifest, options, computeWebManifestHash(manifest))) generatedRoutePaths.push(join(projectRoot, options.routesDir, "_events", "+server.ts"));
-	updateGitignore(projectRoot, options, generatedRoutePaths);
+	updateGitignore(projectRoot, generatedRoutePaths);
 	const skippedMsg = skippedCollections > 0 ? ` (skipped ${skippedCollections} collection classes)` : "";
 	console.log(`[smrt] Generated routes for ${generatedCount} SMRT objects${skippedMsg}`);
 }
@@ -1621,12 +1621,12 @@ function rolesFrom(value: unknown): string[] {
 /**
 * Updates .gitignore to exclude auto-generated routes
 */
-function updateGitignore(projectRoot, options, generatedRoutePaths) {
+function updateGitignore(projectRoot, generatedRoutePaths) {
 	const gitignorePath = join(projectRoot, ".gitignore");
 	let gitignoreContent = "";
 	if (existsSync(gitignorePath)) gitignoreContent = readFileSync(gitignorePath, "utf-8");
 	const generatedPaths = [...new Set(generatedRoutePaths.map((path) => gitignorePatternForPath(relative(projectRoot, path))))].sort((a, b) => a.localeCompare(b));
-	const updatedContent = updateGeneratedRouteIgnoreBlock(gitignoreContent, options.routesDir, generatedPaths);
+	const updatedContent = updateGeneratedRouteIgnoreBlock(gitignoreContent, generatedPaths);
 	if (updatedContent !== gitignoreContent) {
 		writeFileSync(gitignorePath, updatedContent, "utf-8");
 		console.log("[smrt] Updated .gitignore with generated route paths");
@@ -1635,23 +1635,48 @@ function updateGitignore(projectRoot, options, generatedRoutePaths) {
 function gitignorePatternForPath(path) {
 	return path.replaceAll("\\", "/").replaceAll(/([*?[\]\\!#])/g, "\\$1");
 }
-function updateGeneratedRouteIgnoreBlock(gitignoreContent, routesDir, generatedPaths) {
+/**
+* Whether a line has the shape versions before #2185 wrote beneath the legacy
+* header: a recursive `+server.ts` wildcard, optionally negated. The pattern is
+* matched by shape rather than against the currently configured `routesDir`,
+* because a project that moved `routesDir` after adopting the plugin (as
+* `@happyvertical/smrt-content` did, `src/routes/api` -> `src/routes/api/v1`)
+* still carries the pair its earlier `routesDir` produced.
+*/
+function isLegacyGeneratedRoutePattern(line) {
+	if (line.startsWith("#")) return false;
+	return /^!?[^\s].*\/\*\*\/\+server\.ts$/.test(line);
+}
+/**
+* Drop the generator-owned legacy header together with the contiguous run of
+* legacy-shaped patterns directly beneath it. Only that recognized run is
+* migrated: the first line that is not legacy-shaped ends it, so an application
+* rule — including an identical broad pattern the project owns elsewhere in the
+* file — survives untouched.
+*/
+function stripLegacyGeneratedRouteIgnores(lines) {
+	const headerIndex = lines.indexOf(LEGACY_GITIGNORE_HEADER);
+	if (headerIndex === -1) return;
+	let end = headerIndex + 1;
+	while (end < lines.length && isLegacyGeneratedRoutePattern(lines[end])) end += 1;
+	if (end > headerIndex + 1) lines.splice(headerIndex, end - headerIndex);
+}
+function updateGeneratedRouteIgnoreBlock(gitignoreContent, generatedPaths) {
 	const lines = gitignoreContent.split("\n");
-	const startIndex = lines.indexOf(GITIGNORE_MANAGED_BLOCK_START);
-	const endIndex = lines.indexOf(GITIGNORE_MANAGED_BLOCK_END);
 	const managedBlock = [
 		GITIGNORE_MANAGED_BLOCK_START,
 		...generatedPaths,
 		GITIGNORE_MANAGED_BLOCK_END
 	];
-	if (startIndex !== -1 || endIndex !== -1) {
+	if (lines.includes(GITIGNORE_MANAGED_BLOCK_START) || lines.includes(GITIGNORE_MANAGED_BLOCK_END)) {
+		stripLegacyGeneratedRouteIgnores(lines);
+		const startIndex = lines.indexOf(GITIGNORE_MANAGED_BLOCK_START);
+		const endIndex = lines.indexOf(GITIGNORE_MANAGED_BLOCK_END);
 		if (startIndex === -1 || endIndex < startIndex) return gitignoreContent;
 		lines.splice(startIndex, endIndex - startIndex + 1, ...generatedPaths.length > 0 ? managedBlock : []);
 		return lines.join("\n");
 	}
-	const legacyPattern = `${routesDir.replaceAll("\\", "/")}/**/+server.ts`;
-	const legacyIndex = lines.findIndex((line, index) => line === LEGACY_GITIGNORE_HEADER && lines[index + 1] === legacyPattern);
-	if (legacyIndex !== -1) lines.splice(legacyIndex, 2);
+	stripLegacyGeneratedRouteIgnores(lines);
 	if (generatedPaths.length === 0) return lines.join("\n");
 	let updatedContent = lines.join("\n");
 	if (updatedContent.length > 0 && !updatedContent.endsWith("\n")) updatedContent += "\n";