generatesaas 3.6.0 → 3.8.0

package/dist/skill/content/generatesaas-update/scripts/classify-files.js

@@ -9,7 +9,13 @@
 
 const fs = require("node:fs");
 const path = require("node:path");
-const { findProjectRoot, hashFile, TEMPLATE_HASHES_FILE, HASHES_FILE, STAGING_DIR } = require("./_helpers.js");
+const {
+	findProjectRoot,
+	hashFile,
+	TEMPLATE_HASHES_FILE,
+	HASHES_FILE,
+	STAGING_DIR
+} = require("./_helpers.js");
 
 // ── Import Scanning ──
 
@@ -28,16 +34,17 @@ function extractImports(content, filePath) {
 
 	const patterns = [
 		/(?:import|export)\s[\s\S]*?from\s+['"]([^'"]+)['"]/g,
-		/(?:require|import)\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
+		/(?:require|import)\s*\(\s*['"]([^'"]+)['"]\s*\)/g
 	];
 
 	for (const pattern of patterns) {
-		let m;
-		while ((m = pattern.exec(content)) !== null) {
+		let m = pattern.exec(content);
+		while (m !== null) {
 			const p = m[1];
 			if (p.startsWith(".") || p.startsWith("~/") || p.startsWith("@/") || p.startsWith("#")) {
 				imports.add(p);
 			}
+			m = pattern.exec(content);
 		}
 	}
 
@@ -53,7 +60,11 @@ function matchImportToFile(importPath, fromFilePath, knownFileSet) {
 
 	if (importPath.startsWith("./") || importPath.startsWith("../")) {
 		basePath = path.normalize(path.join(path.dirname(fromFilePath), importPath));
-	} else if (importPath.startsWith("~/") || importPath.startsWith("@/") || importPath.startsWith("#")) {
+	} else if (
+		importPath.startsWith("~/") ||
+		importPath.startsWith("@/") ||
+		importPath.startsWith("#")
+	) {
 		// Alias - strip prefix. ~ and @ typically resolve from the app root.
 		basePath = importPath.replace(/^[~@#]\//, "");
 	} else {
@@ -64,7 +75,19 @@ function matchImportToFile(importPath, fromFilePath, knownFileSet) {
 	basePath = basePath.split(path.sep).join("/");
 	if (basePath.startsWith("./")) basePath = basePath.slice(2);
 
-	const extensions = ["", ".ts", ".js", ".vue", ".tsx", ".jsx", "/index.ts", "/index.js", "/index.vue"];
+	const extensions = [
+		"",
+		".ts",
+		".js",
+		".vue",
+		".tsx",
+		".jsx",
+		"/index.ts",
+		"/index.js",
+		"/index.tsx",
+		"/index.jsx",
+		"/index.vue"
+	];
 	for (const ext of extensions) {
 		const candidate = basePath + ext;
 		if (knownFileSet.has(candidate)) return candidate;
@@ -72,7 +95,7 @@ function matchImportToFile(importPath, fromFilePath, knownFileSet) {
 
 	// For alias imports, also try matching as a suffix of known files
 	if (!importPath.startsWith("./") && !importPath.startsWith("../")) {
-		const suffix = "/" + basePath;
+		const suffix = `/${basePath}`;
 		for (const ext of extensions) {
 			const needle = suffix + ext;
 			for (const known of knownFileSet) {
@@ -101,7 +124,7 @@ function deletedTreeAncestor(filePath, root, baselineFiles) {
 		const dir = parts.slice(0, i).join("/");
 		if (fs.existsSync(path.join(root, dir))) continue;
 		// First missing ancestor. Did it exist in the old template?
-		const existedInTemplate = baselineFiles.some((f) => f === dir || f.startsWith(dir + "/"));
+		const existedInTemplate = baselineFiles.some((f) => f === dir || f.startsWith(`${dir}/`));
 		return existedInTemplate ? dir : null;
 	}
 	return null;
@@ -121,13 +144,13 @@ function buildCrossDependencies(root, classification, stagingDir) {
 		...classification.new,
 		...classification.newInDeletedTree,
 		...classification.deleted,
-		...classification.removed,
+		...classification.removed
 	]);
 
 	const crossDeps = {
 		modifiedImportsUnmodified: {},
 		unmodifiedImportsModified: {},
-		newImportsModified: {},
+		newImportsModified: {}
 	};
 
 	function addDep(bucket, key, value) {
@@ -154,7 +177,11 @@ function buildCrossDependencies(root, classification, stagingDir) {
 	}
 
 	function readSafe(fullPath) {
-		try { return fs.readFileSync(fullPath, "utf-8"); } catch { return null; }
+		try {
+			return fs.readFileSync(fullPath, "utf-8");
+		} catch {
+			return null;
+		}
 	}
 
 	// Scan modified files (user's current versions)
@@ -192,7 +219,9 @@ function buildCrossDependencies(root, classification, stagingDir) {
 function main() {
 	const root = findProjectRoot();
 	if (!root) {
-		console.error("Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project.");
+		console.error(
+			"Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project."
+		);
 		process.exit(1);
 	}
 
@@ -237,7 +266,7 @@ function main() {
 		deleted: [],
 		new: [],
 		newInDeletedTree: [],
-		removed: [],
+		removed: []
 	};
 
 	const baselineFiles = Object.keys(baselineHashes);
@@ -296,7 +325,7 @@ function main() {
 	// Write classification
 	fs.writeFileSync(
 		path.join(refsDir, "classification.json"),
-		JSON.stringify(classification, null, "\t") + "\n",
+		`${JSON.stringify(classification, null, "\t")}\n`,
 		"utf-8"
 	);
 

package/dist/skill/content/generatesaas-update/scripts/complete-update.js

@@ -13,7 +13,19 @@
 
 const fs = require("node:fs");
 const path = require("node:path");
-const { findProjectRoot, hashFile, walkDir, ensureDir, MANIFEST_FILE, HASHES_FILE, TEMPLATE_HASHES_FILE, TEMPLATE_DIR, STAGING_DIR, STAGING_META_FILE, INTERNAL_DIR } = require("./_helpers.js");
+const {
+	findProjectRoot,
+	hashFile,
+	walkDir,
+	ensureDir,
+	MANIFEST_FILE,
+	HASHES_FILE,
+	TEMPLATE_HASHES_FILE,
+	TEMPLATE_DIR,
+	STAGING_DIR,
+	STAGING_META_FILE,
+	INTERNAL_DIR
+} = require("./_helpers.js");
 
 /**
  * Safety net for the held-back list. An upstream change was demonstrably never
@@ -94,7 +106,9 @@ function archivePlanFile(root) {
 function main() {
 	const root = findProjectRoot();
 	if (!root) {
-		console.error("Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project.");
+		console.error(
+			"Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project."
+		);
 		process.exit(1);
 	}
 
@@ -116,9 +130,7 @@ function main() {
 	// Read held-back files list (created by the AI for skipped/held-back files)
 	const heldBackPath = path.join(root, INTERNAL_DIR, "held-back.json");
 	const heldBack = new Set(
-		fs.existsSync(heldBackPath)
-			? JSON.parse(fs.readFileSync(heldBackPath, "utf-8"))
-			: []
+		fs.existsSync(heldBackPath) ? JSON.parse(fs.readFileSync(heldBackPath, "utf-8")) : []
 	);
 
 	if (heldBack.size > 0) {
@@ -137,7 +149,9 @@ function main() {
 		// never applied but are missing from held-back.json.
 		const netted = applyHeldBackSafetyNet(root, stagingDir, stagingFiles, heldBack);
 		if (netted.length > 0) {
-			console.warn(`Safety net: ${netted.length} upstream change(s) were never applied and were missing from held-back.json.`);
+			console.warn(
+				`Safety net: ${netted.length} upstream change(s) were never applied and were missing from held-back.json.`
+			);
 			console.warn("Holding them back so the next update re-surfaces them:");
 			for (const rel of netted) console.warn(`  - ${rel}`);
 		}
@@ -150,12 +164,19 @@ function main() {
 		// A wrong held-back entry silently corrupts the next update's diff baseline.
 		for (const rel of heldBack) {
 			if (!stagingFiles.has(rel)) {
-				console.warn(`  Warning: held-back "${rel}" is not in staging - nothing to hold back. Check .generatesaas/held-back.json.`);
+				console.warn(
+					`  Warning: held-back "${rel}" is not in staging - nothing to hold back. Check .generatesaas/held-back.json.`
+				);
 				continue;
 			}
 			const oldTemplateFile = path.join(templateDir, rel);
-			if (fs.existsSync(oldTemplateFile) && hashFile(oldTemplateFile) === hashFile(path.join(stagingDir, rel))) {
-				console.warn(`  Warning: held-back "${rel}" is identical in the old template and staging - no upstream change to preserve.`);
+			if (
+				fs.existsSync(oldTemplateFile) &&
+				hashFile(oldTemplateFile) === hashFile(path.join(stagingDir, rel))
+			) {
+				console.warn(
+					`  Warning: held-back "${rel}" is identical in the old template and staging - no upstream change to preserve.`
+				);
 			}
 		}
 
@@ -199,8 +220,14 @@ function main() {
 			templateHashes[rel] = hashFile(path.join(templateDir, rel));
 		}
 		fs.mkdirSync(path.dirname(templateHashesPath), { recursive: true });
-		fs.writeFileSync(templateHashesPath, JSON.stringify(templateHashes, null, "\t") + "\n", "utf-8");
-		console.log(`Tracked ${Object.keys(templateHashes).length} template hashes in ${TEMPLATE_HASHES_FILE}`);
+		fs.writeFileSync(
+			templateHashesPath,
+			`${JSON.stringify(templateHashes, null, "\t")}\n`,
+			"utf-8"
+		);
+		console.log(
+			`Tracked ${Object.keys(templateHashes).length} template hashes in ${TEMPLATE_HASHES_FILE}`
+		);
 	}
 
 	// Clean up staging
@@ -239,13 +266,13 @@ function main() {
 	const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
 	manifest.version = targetVersion;
 
-	fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, "\t") + "\n", "utf-8");
+	fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, "\t")}\n`, "utf-8");
 	console.log(`Updated manifest to version ${targetVersion}`);
 
 	// Write hashes to separate file
 	const hashesPath = path.join(root, HASHES_FILE);
 	fs.mkdirSync(path.dirname(hashesPath), { recursive: true });
-	fs.writeFileSync(hashesPath, JSON.stringify(fileHashes, null, "\t") + "\n", "utf-8");
+	fs.writeFileSync(hashesPath, `${JSON.stringify(fileHashes, null, "\t")}\n`, "utf-8");
 	console.log(`Tracked ${Object.keys(fileHashes).length} file hashes in ${HASHES_FILE}`);
 
 	// Archive the finished plan file so the next update's pre-flight check doesn't

package/dist/skill/content/generatesaas-update/scripts/prepare-update.js

@@ -9,7 +9,17 @@
 const fs = require("node:fs");
 const path = require("node:path");
 const { execFileSync } = require("node:child_process");
-const { findProjectRoot, ensureDir, hashFile, walkDir, shouldExcludeWalk, TEMPLATE_HASHES_FILE, TEMPLATE_DIR, STAGING_DIR, STAGING_META_FILE } = require("./_helpers.js");
+const {
+	findProjectRoot,
+	ensureDir,
+	hashFile,
+	walkDir,
+	shouldExcludeWalk,
+	TEMPLATE_HASHES_FILE,
+	TEMPLATE_DIR,
+	STAGING_DIR,
+	STAGING_META_FILE
+} = require("./_helpers.js");
 
 // Paths whose upstream changes always carry follow-up work for the user:
 // database schema changes may need a migration, incoming migrations must be
@@ -19,13 +29,15 @@ const { findProjectRoot, ensureDir, hashFile, walkDir, shouldExcludeWalk, TEMPLA
 const SENSITIVE_PATTERNS = [
 	/^packages\/database\/src\/db\//,
 	/^packages\/database\/drizzle\//,
-	/(^|\/)\.env\.example$/,
+	/(^|\/)\.env\.example$/
 ];
 
 function main() {
 	const root = findProjectRoot();
 	if (!root) {
-		console.error("Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project.");
+		console.error(
+			"Error: .generatesaas/manifest.json not found. Run this from a GenerateSaaS project."
+		);
 		process.exit(1);
 	}
 
@@ -105,7 +117,9 @@ function main() {
 
 	console.log(`  Added: ${added.length}, Modified: ${modified.length}, Removed: ${removed.length}`);
 	if (renamed.length > 0) {
-		console.log(`  Renamed: ${renamed.length} (see update-manifest.json - port customizations before deleting the old paths)`);
+		console.log(
+			`  Renamed: ${renamed.length} (see update-manifest.json - port customizations before deleting the old paths)`
+		);
 	}
 	if (sensitive.length > 0) {
 		console.log(`  Sensitive (schema / migrations / env example): ${sensitive.length}`);
@@ -151,7 +165,7 @@ function main() {
 		}
 
 		if (diff) {
-			const diffPath = path.join(diffsDir, filePath + ".diff");
+			const diffPath = path.join(diffsDir, `${filePath}.diff`);
 			ensureDir(path.dirname(diffPath));
 			fs.writeFileSync(diffPath, diff, "utf-8");
 			diffCount++;
@@ -167,11 +181,11 @@ function main() {
 		modified,
 		removed,
 		renamed,
-		sensitive,
+		sensitive
 	};
 	fs.writeFileSync(
 		path.join(refsDir, "update-manifest.json"),
-		JSON.stringify(updateManifest, null, "\t") + "\n",
+		`${JSON.stringify(updateManifest, null, "\t")}\n`,
 		"utf-8"
 	);
 	console.log("Written: references/update-manifest.json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generatesaas",
-  "version": "3.6.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "CLI for scaffolding and managing GenerateSaaS projects",
   "license": "UNLICENSED",
@@ -19,8 +19,10 @@
     "tar": "^7.5.22"
   },
   "devDependencies": {
+    "@repo/eslint-config": "0.0.0",
     "@repo/tsconfig": "1.0.0",
     "@types/node": "26.2.0",
+    "eslint": "^9.39.5",
     "tsup": "^8.5.1",
     "typescript": "6.0.3",
     "vitest": "4.1.10"
@@ -33,6 +35,7 @@
     "postbuild": "node -e \"const fs=require('node:fs');fs.rmSync('dist/skill/content',{recursive:true,force:true});fs.mkdirSync('dist/skill',{recursive:true});fs.cpSync('src/skill/content','dist/skill/content',{recursive:true});fs.rmSync('dist/generators/content',{recursive:true,force:true});fs.mkdirSync('dist/generators',{recursive:true});fs.cpSync('src/generators/content','dist/generators/content',{recursive:true})\"",
     "dev": "tsup --watch",
     "check-types": "tsc --noEmit",
+    "lint": "eslint --cache .",
     "test": "vitest run",
     "test:playground": "vitest run --config vitest.playground.config.ts"
   }