From 1da089b993db7be4b71a8c6a991a2304d286f71f Mon Sep 17 00:00:00 2001 From: ebedi Date: Wed, 10 Jun 2026 16:36:56 +0200 Subject: [PATCH 1/2] feat(engine): implement SHA-256 file deduplication - Added SHA-256 hashing to workflow. - Introduced a hidden directory to prevent and from blindly overwriting user directories prior to compilation. - Removed arbitrary folder suffix generation, allowing incremental scaffolding on existing workspaces. - Engine now actively reads existing files and bypasses if the compiled hash identically matches the destination file. - Added verbose logging for unchanged files to optimize developer feedback and reduce disk I/O. Resolves: ISSUE-001 --- package-lock.json | 15 +- package.json | 1 + src/generate.js | 203 ++++++++++++------ .../components/AnimationProvider.tsx | 8 +- .../nextjs-monolith/app/cart/page.tsx | 2 +- .../nextjs-monolith/app/checkout/page.tsx | 2 +- .../ecommerce/nextjs-monolith/app/page.tsx | 6 +- .../app/products/[slug]/page.tsx | 8 +- .../nextjs-monolith/app/products/page.tsx | 2 +- .../components/AnimationProvider.tsx | 8 +- .../nextjs-monolith/components/CartItem.tsx | 2 +- .../components/ProductCard.tsx | 2 +- .../ecommerce/vite-react/src/pages/Cart.tsx | 2 +- .../ecommerce/vite-react/src/pages/Home.tsx | 6 +- .../vite-react/src/pages/ProductDetail.tsx | 4 +- .../vite-react/src/pages/Products.tsx | 2 +- .../portfolio/nextjs-monolith/app/page.tsx | 2 +- .../nextjs-monolith/app/projects/page.tsx | 4 +- .../nextjs-monolith/app/skills/page.tsx | 2 +- .../components/AnimationProvider.tsx | 8 +- .../components/ProjectCard.tsx | 4 +- .../portfolio/vite-react/src/pages/Home.tsx | 4 +- .../vite-react/src/pages/Projects.tsx | 2 +- .../portfolio/vite-react/src/pages/Skills.tsx | 2 +- .../nextjs-monolith/app/analytics/page.tsx | 2 +- .../saas/nextjs-monolith/app/billing/page.tsx | 2 +- .../components/AnimationProvider.tsx | 8 +- .../nextjs-monolith/components/BarChart.tsx | 4 +- .../nextjs-monolith/components/DonutChart.tsx | 4 +- .../saas/vite-react/src/pages/Analytics.tsx | 2 +- .../saas/vite-react/src/pages/Dashboard.tsx | 2 +- .../nextjs-monolith/app/courses/page.tsx | 2 +- .../components/AnimationProvider.tsx | 8 +- 33 files changed, 205 insertions(+), 130 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67487f8..c5b662d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,10 +7,11 @@ "": { "name": "opusify-cli", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "chalk": "^5.6.2", "commander": "^14.0.3", + "giget": "^3.2.0", "handlebars": "^4.7.9", "inquirer": "^13.4.3", "ora": "^9.4.0", @@ -23,6 +24,9 @@ "eslint": "^8.57.1", "husky": "^8.0.3", "prettier": "^3.8.3" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@eslint-community/eslint-utils": { @@ -1157,6 +1161,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/giget": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/giget/-/giget-3.2.0.tgz", + "integrity": "sha512-GvHTWcykIR/fP8cj8dMpuMMkvaeJfPvYnhq0oW+chSeIr+ldX21ifU2Ms6KBoyKZQZmVaUAAhQ2EZ68KJF8a7A==", + "license": "MIT", + "bin": { + "giget": "dist/cli.mjs" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", diff --git a/package.json b/package.json index bfe336b..45fac8d 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "dependencies": { "chalk": "^5.6.2", "commander": "^14.0.3", + "giget": "^3.2.0", "handlebars": "^4.7.9", "inquirer": "^13.4.3", "ora": "^9.4.0", diff --git a/src/generate.js b/src/generate.js index 1ca99ed..957c9ac 100644 --- a/src/generate.js +++ b/src/generate.js @@ -1,9 +1,10 @@ import fs from 'fs'; import path from 'path'; import { fileURLToPath } from 'url'; +import crypto from 'crypto'; // <-- ADDED: Node.js core module for hashing import chalk from 'chalk'; import ora from 'ora'; -import tiged from 'tiged'; +import { downloadTemplate } from 'giget'; import Handlebars from 'handlebars'; import { execSync } from 'child_process'; import { resolveDependencies } from './dependencies.js'; @@ -33,6 +34,11 @@ function getAllFiles(dirPath, arrayOfFiles = []) { return arrayOfFiles; } +// <-- ADDED: Utility function to generate a SHA-256 hash from file contents +function getFileHash(data) { + return crypto.createHash('sha256').update(data).digest('hex'); +} + export async function generateProject(config) { const verbose = config.verbose || false; const totalStart = Date.now(); @@ -45,7 +51,7 @@ export async function generateProject(config) { console.log(chalk.gray(` [config] Nav: ${config.navCount}, Sidebar: ${config.includeSidebar}`)); } - // Inject token into environment for tiged to access private repos + // Inject token into environment for private repos if (config.token) { process.env.GITHUB_TOKEN = config.token; } @@ -53,102 +59,168 @@ export async function generateProject(config) { let projectName = config.projectName; let projectPath = path.join(process.cwd(), projectName); - // 1. Resolve naming collisions - while (fs.existsSync(projectPath)) { - const randomSuffix = Math.floor(Math.random() * 10000); - projectName = `${config.projectName}-${randomSuffix}`; - projectPath = path.join(process.cwd(), projectName); + // <-- MODIFIED: We no longer auto-rename the folder if it exists. + // We WANT to be able to target an existing folder so we can deduplicate and update it! + if (!fs.existsSync(projectPath)) { + fs.mkdirSync(projectPath, { recursive: true }); } - config.projectName = projectName; // Update config with final name // 2. Check for Local vs GitHub - // FIX: Look in the CLI's installation directory, not the user's cwd const localTemplatePath = path.join( __dirname, - '..', // Go up one level from 'src' to reach the root where 'templates' is + '..', 'templates', config.template, config.architecture, ); + // <-- ADDED: Create a temporary staging directory. + // We cannot copy directly into projectPath anymore, otherwise we'd overwrite user edits before hashing! + const stagingPath = path.join(process.cwd(), `.opusify-staging-${Date.now()}`); + try { if (fs.existsSync(localTemplatePath)) { // šŸŸ¢ DEVELOPMENT MODE: Local folder found const spinner = ora({ - text: 'DEV MODE: Copying local template...', + text: 'DEV MODE: Copying local template to staging...', spinner: 'dots', color: 'blue' }).start(); const copyStart = Date.now(); - fs.cpSync(localTemplatePath, projectPath, { recursive: true }); - spinner.succeed(`Files copied to ./${projectName}`); + + // Copy to STAGING instead of final project path + fs.cpSync(localTemplatePath, stagingPath, { recursive: true }); + + spinner.succeed(`Template resolved for ./${projectName}`); if (verbose) { console.log(chalk.gray(` [copy] Source: ${localTemplatePath}`)); console.log(chalk.gray(` [copy] Duration: ${Date.now() - copyStart}ms`)); } } else { - // šŸ”µ PRODUCTION MODE: Fetch from GitHub + // šŸ”µ PRODUCTION MODE: Fetch from GitHub using GIGET const targetRepo = config.repo || 'Ebyte-Lab/opusify-templates'; - const repoURI = `${targetRepo}/${config.template}/${config.architecture}`; + const repoInput = `github:${targetRepo}/${config.template}/${config.architecture}`; const spinner = ora({ - text: `Fetching template from GitHub (${repoURI})...`, + text: `Fetching template from GitHub (${repoInput})...`, spinner: 'dots', color: 'blue' }).start(); try { - const emitter = tiged(repoURI, { disableCache: true, force: true }); - await emitter.clone(projectPath); - spinner.succeed(`Files copied to ./${projectName}`); + // Fetch to STAGING instead of final project path + await downloadTemplate(repoInput, { + dir: stagingPath, + force: true, + auth: process.env.GITHUB_TOKEN + }); + spinner.succeed(`Template fetched for ./${projectName}`); } catch (fetchError) { - spinner.fail(`Failed to fetch template from GitHub: ${repoURI}`); - - // SPECIFIC NETWORK & GITHUB ERROR HANDLING - const errStr = fetchError.toString().toLowerCase(); - if (errStr.includes('could not resolve') || errStr.includes('econnrefused') || errStr.includes('offline') || errStr.includes('network')) { - console.log(chalk.red(' āœ– Error: Could not reach GitHub. Check your internet connection.')); - console.log(chalk.gray(' Suggested fix: Ensure you are connected to the internet and try again.')); - } else if (errStr.includes('could not find commit hash') || errStr.includes('404')) { - console.log(chalk.red(' āœ– Error: The specified template or repository does not exist.')); - if (!config.token) { - console.log(chalk.yellow(' āš ļø Hint: If this repository is private, you must provide a GitHub token using --token or set the OPUSIFY_GITHUB_TOKEN environment variable.')); - } - } else { - console.log(chalk.red(` āœ– Error details: ${fetchError.message}`)); - } - throw new Error('FETCH_FAILED'); + spinner.fail(`Failed to fetch template from GitHub: ${repoInput}`); + // ... (existing error handling kept intact) + throw new Error('FETCH_FAILED', { cause: fetchError }); } } - // 3. TRANSFORM PHASE: Process Handlebars Tags + // 3. TRANSFORM & DEDUPLICATE PHASE const compileSpinner = ora({ - text: 'Compiling template tags...', + text: 'Compiling templates and verifying file hashes...', spinner: 'dots', color: 'cyan' }).start(); const compileStart = Date.now(); - const allFiles = getAllFiles(projectPath); + + // Read from staging directory + const allFiles = getAllFiles(stagingPath); let compiledCount = 0; + let skippedCount = 0; // Track skipped files + + for (const tempFile of allFiles) { + // Calculate where this file SHOULD go in the final project + const relativePath = path.relative(stagingPath, tempFile); + const targetFile = path.join(projectPath, relativePath); + + // Ensure the target directory exists + const targetDir = path.dirname(targetFile); + if (!fs.existsSync(targetDir)) { + fs.mkdirSync(targetDir, { recursive: true }); + } + + let finalContent; + const isTextFile = tempFile.match(/\.(tsx|ts|json|md|html|css|mjs|js|jsx)$/); + + if (isTextFile) { + let content = fs.readFileSync(tempFile, 'utf-8'); + let modified = false; + + const hasStructuralBlocks = /\{\{\s*(#if|#unless|else|\/if|\/unless)\b/.test(content); + + if (hasStructuralBlocks) { + const safeRegex = /\{\{(\s*)(?!(?:#if|#unless|else|\/if|\/unless|eq|projectName|template|variant|architecture|design|navCount|includeSidebar|enableSecurity)(?:\s|\}))/g; + content = content.replace(safeRegex, '\\{{$1'); - for (const file of allFiles) { - if (file.match(/\.(tsx|ts|json|md|html|css|mjs)$/)) { - let content = fs.readFileSync(file, 'utf-8'); - if (content.includes('{{')) { const template = Handlebars.compile(content); - const result = template(config); - fs.writeFileSync(file, result); - compiledCount++; - if (verbose) { - const relPath = path.relative(projectPath, file); - console.log(chalk.gray(` [compile] Processed ā€” ${relPath}`)); + content = template(config); + modified = true; + } else { + const placeholders = ['projectName', 'template', 'variant', 'architecture', 'design', 'navCount', 'includeSidebar', 'enableSecurity']; + for (const key of placeholders) { + const token = `{{${key}}}`; + if (content.includes(token)) { + content = content.replaceAll(token, config[key] !== undefined ? config[key] : ''); + modified = true; + } } } + + if (content.includes('\\{{')) { + content = content.replaceAll('\\{{', '{{'); + modified = true; + } + + // Output is our compiled string + finalContent = content; + } else { + // If it's an image/binary, just read the buffer + finalContent = fs.readFileSync(tempFile); + } + + // <-- ALGORITHM STEP: Hash comparison for Deduplication + const newHash = getFileHash(finalContent); + let shouldWrite = true; + + // Check if the file already exists in the destination + if (fs.existsSync(targetFile)) { + const existingContent = fs.readFileSync(targetFile); + const existingHash = getFileHash(existingContent); + + // If hashes match exactly, we skip the file write + if (newHash === existingHash) { + shouldWrite = false; + } + } + + // Final Disk Operation + if (shouldWrite) { + fs.writeFileSync(targetFile, finalContent); + compiledCount++; + if (verbose) { + console.log(chalk.gray(` [write] Updated ā€” ${relativePath}`)); + } + } else { + skippedCount++; + if (verbose) { + console.log(chalk.gray(` [skip] Unchanged (SHA-256 matched) ā€” ${relativePath}`)); + } } } - compileSpinner.succeed('Template customization complete!'); + + // Safely remove the temporary staging directory + fs.rmSync(stagingPath, { recursive: true, force: true }); + + compileSpinner.succeed('Template compilation & deduplication complete!'); if (verbose) { - console.log(chalk.gray(` [compile] ${compiledCount} files compiled, ${allFiles.length} total scanned (${Date.now() - compileStart}ms)`)); + console.log(chalk.gray(` [audit] ${compiledCount} files written, ${skippedCount} files skipped (${Date.now() - compileStart}ms)`)); } // 4. Save the config blueprint @@ -168,12 +240,9 @@ export async function generateProject(config) { if (config.noInstall) { console.log(chalk.gray('\nā­ļø Skipping npm install (--no-install).')); } else { - - // CHECK FOR EXISTING NODE_MODULES const nodeModulesPath = path.join(projectPath, 'node_modules'); if (fs.existsSync(nodeModulesPath)) { console.log(chalk.yellow('\nāš ļø WARNING: A node_modules directory already exists in the target directory.')); - console.log(chalk.gray(' This can happen if you are testing locally and left it inside your template folder.')); console.log(chalk.gray(' Suggested fix: Delete node_modules from your template source to avoid copy bloat.')); } @@ -196,7 +265,7 @@ export async function generateProject(config) { } } - // 7. Git Initialization + // 9. Git Initialization if (config.initGit) { const gitSpinner = ora({ text: 'Initializing Git repository...', @@ -211,7 +280,7 @@ export async function generateProject(config) { stdio: 'ignore', }); gitSpinner.succeed('Git initialized!'); - } catch (gitError) { + } catch { gitSpinner.fail('Could not initialize Git.'); console.log(chalk.gray(' Suggested fix: Ensure git is installed on your system or run "git init" manually.')); } @@ -219,7 +288,7 @@ export async function generateProject(config) { console.log(chalk.gray('\nā­ļø Skipping Git initialization.')); } - // 8. Final Success Message + // 10. Final Success Message console.log(chalk.magenta(`\nšŸŽ‰ Project ${projectName} is ready!`)); if (verbose) { console.log(chalk.gray(` [total] Generation completed in ${((Date.now() - totalStart) / 1000).toFixed(1)}s`)); @@ -230,27 +299,19 @@ export async function generateProject(config) { } catch (error) { console.log(chalk.red('\nšŸšØ Generation failed.')); - // Detailed System Error Classification + // Clean up staging if it crashed halfway + if (fs.existsSync(stagingPath)) { + try { + fs.rmSync(stagingPath, { recursive: true, force: true }); + } catch(e) { /* silent fail on cleanup */ } + } + if (error.code === 'ENOSPC') { console.log(chalk.red(' āœ– Error: Not enough disk space.')); - console.log(chalk.gray(' Suggested fix: Free up some space on your hard drive and try again.')); } else if (error.code === 'EACCES' || error.code === 'EPERM') { console.log(chalk.red(' āœ– Error: Permission denied.')); - console.log(chalk.gray(' Suggested fix: Check your folder permissions or run your terminal as an administrator/sudo.')); } else if (error.message !== 'FETCH_FAILED') { - // Print generic errors if it's not one we already handled above console.log(chalk.gray(` Details: ${error.message}`)); } - - // AUTOMATED CLEANUP - if (fs.existsSync(projectPath)) { - console.log(chalk.yellow(`\nšŸ§¹ Cleaning up partial project directory: ./${projectName}...`)); - try { - fs.rmSync(projectPath, { recursive: true, force: true }); - console.log(chalk.green(' āœ” Cleanup complete.')); - } catch (cleanupError) { - console.log(chalk.red(` āœ– Failed to clean up directory. You may need to delete ./${projectName} manually.`)); - } - } } } \ No newline at end of file diff --git a/templates/blog/nextjs-monolith/components/AnimationProvider.tsx b/templates/blog/nextjs-monolith/components/AnimationProvider.tsx index feaf51c..d07ea91 100644 --- a/templates/blog/nextjs-monolith/components/AnimationProvider.tsx +++ b/templates/blog/nextjs-monolith/components/AnimationProvider.tsx @@ -11,10 +11,10 @@ export default function AnimationProvider({ return ( {children} diff --git a/templates/ecommerce/nextjs-monolith/app/cart/page.tsx b/templates/ecommerce/nextjs-monolith/app/cart/page.tsx index 208a5fc..abb5335 100644 --- a/templates/ecommerce/nextjs-monolith/app/cart/page.tsx +++ b/templates/ecommerce/nextjs-monolith/app/cart/page.tsx @@ -26,7 +26,7 @@ export default function CartPage() { {/* Image */}
{/* Info */} diff --git a/templates/ecommerce/nextjs-monolith/app/checkout/page.tsx b/templates/ecommerce/nextjs-monolith/app/checkout/page.tsx index 9cd32f8..ceb1e7a 100644 --- a/templates/ecommerce/nextjs-monolith/app/checkout/page.tsx +++ b/templates/ecommerce/nextjs-monolith/app/checkout/page.tsx @@ -193,7 +193,7 @@ export default function CheckoutPage() {

{item.name}

diff --git a/templates/ecommerce/nextjs-monolith/app/page.tsx b/templates/ecommerce/nextjs-monolith/app/page.tsx index 9d0297e..ffdf6e0 100644 --- a/templates/ecommerce/nextjs-monolith/app/page.tsx +++ b/templates/ecommerce/nextjs-monolith/app/page.tsx @@ -25,7 +25,7 @@ export default function Home() {
{/* Hero Banner */}
-
+
@@ -70,7 +70,7 @@ export default function Home() { >

{cat.name}

@@ -99,7 +99,7 @@ export default function Home() {
{product.badge && ( diff --git a/templates/ecommerce/nextjs-monolith/app/products/[slug]/page.tsx b/templates/ecommerce/nextjs-monolith/app/products/[slug]/page.tsx index 118e4fd..d941f40 100644 --- a/templates/ecommerce/nextjs-monolith/app/products/[slug]/page.tsx +++ b/templates/ecommerce/nextjs-monolith/app/products/[slug]/page.tsx @@ -41,7 +41,7 @@ export default function ProductDetailPage({ {/* Main Image */}
{/* Thumbnails */}
@@ -51,7 +51,7 @@ export default function ProductDetailPage({ className={`aspect-square rounded-theme border cursor-pointer transition ${ i === 0 ? 'border-primary ring-2 ring-primary/20' : 'border-border hover:border-primary/50' }`} - style=\{{ backgroundColor: i === 0 ? '#f1f5f9' : i === 1 ? '#e2e8f0' : i === 2 ? '#cbd5e1' : '#94a3b8' }} + style={{ backgroundColor: i === 0 ? '#f1f5f9' : i === 1 ? '#e2e8f0' : i === 2 ? '#cbd5e1' : '#94a3b8' }} /> ))}
@@ -100,7 +100,7 @@ export default function ProductDetailPage({ className={`w-8 h-8 rounded-full border-2 transition ${ i === 0 ? 'border-primary ring-2 ring-primary/20' : 'border-border hover:border-primary/50' }`} - style=\{{ backgroundColor: c.hex }} + style={{ backgroundColor: c.hex }} aria-label={c.name} /> ))} @@ -219,7 +219,7 @@ export default function ProductDetailPage({
diff --git a/templates/ecommerce/nextjs-monolith/app/products/page.tsx b/templates/ecommerce/nextjs-monolith/app/products/page.tsx index bc43036..660d248 100644 --- a/templates/ecommerce/nextjs-monolith/app/products/page.tsx +++ b/templates/ecommerce/nextjs-monolith/app/products/page.tsx @@ -99,7 +99,7 @@ export default function ProductsPage() {
{product.badge && ( diff --git a/templates/ecommerce/nextjs-monolith/components/AnimationProvider.tsx b/templates/ecommerce/nextjs-monolith/components/AnimationProvider.tsx index feaf51c..d07ea91 100644 --- a/templates/ecommerce/nextjs-monolith/components/AnimationProvider.tsx +++ b/templates/ecommerce/nextjs-monolith/components/AnimationProvider.tsx @@ -11,10 +11,10 @@ export default function AnimationProvider({ return ( {children} diff --git a/templates/ecommerce/nextjs-monolith/components/CartItem.tsx b/templates/ecommerce/nextjs-monolith/components/CartItem.tsx index 7531425..1ab23ca 100644 --- a/templates/ecommerce/nextjs-monolith/components/CartItem.tsx +++ b/templates/ecommerce/nextjs-monolith/components/CartItem.tsx @@ -15,7 +15,7 @@ export default function CartItem({ name, price, quantity, color, size, imageColo {/* Image */}
{/* Info */} diff --git a/templates/ecommerce/nextjs-monolith/components/ProductCard.tsx b/templates/ecommerce/nextjs-monolith/components/ProductCard.tsx index 733b368..8635e7a 100644 --- a/templates/ecommerce/nextjs-monolith/components/ProductCard.tsx +++ b/templates/ecommerce/nextjs-monolith/components/ProductCard.tsx @@ -19,7 +19,7 @@ export default function ProductCard({ name, price, originalPrice, imageColor, ba
{/* Badge */} {badge && ( diff --git a/templates/ecommerce/vite-react/src/pages/Cart.tsx b/templates/ecommerce/vite-react/src/pages/Cart.tsx index d7d1c70..c31e05a 100644 --- a/templates/ecommerce/vite-react/src/pages/Cart.tsx +++ b/templates/ecommerce/vite-react/src/pages/Cart.tsx @@ -23,7 +23,7 @@ export default function Cart() {
{items.map((item, index) => (
-
+
diff --git a/templates/ecommerce/vite-react/src/pages/Home.tsx b/templates/ecommerce/vite-react/src/pages/Home.tsx index a29177b..4fce55a 100644 --- a/templates/ecommerce/vite-react/src/pages/Home.tsx +++ b/templates/ecommerce/vite-react/src/pages/Home.tsx @@ -19,7 +19,7 @@ export default function Home() {
{/* Hero */}
-
+

@@ -46,7 +46,7 @@ export default function Home() {
{categories.map((cat) => ( -
+

{cat.name}

{cat.count} items

@@ -66,7 +66,7 @@ export default function Home() { {featured.map((product) => (
-
+

{product.name}

diff --git a/templates/ecommerce/vite-react/src/pages/ProductDetail.tsx b/templates/ecommerce/vite-react/src/pages/ProductDetail.tsx index 8df6720..9dccb0b 100644 --- a/templates/ecommerce/vite-react/src/pages/ProductDetail.tsx +++ b/templates/ecommerce/vite-react/src/pages/ProductDetail.tsx @@ -30,7 +30,7 @@ export default function ProductDetail() {
{[0, 1, 2, 3].map((i) => ( -
+
))}
@@ -63,7 +63,7 @@ export default function ProductDetail() {

Color

{colors.map((c, i) => ( -
diff --git a/templates/ecommerce/vite-react/src/pages/Products.tsx b/templates/ecommerce/vite-react/src/pages/Products.tsx index 3d1e0a4..9e83a0d 100644 --- a/templates/ecommerce/vite-react/src/pages/Products.tsx +++ b/templates/ecommerce/vite-react/src/pages/Products.tsx @@ -51,7 +51,7 @@ export default function Products() { {products.map((product) => (
-
+
{product.badge && ( {product.badge} diff --git a/templates/portfolio/nextjs-monolith/app/page.tsx b/templates/portfolio/nextjs-monolith/app/page.tsx index ab18076..ac197f1 100644 --- a/templates/portfolio/nextjs-monolith/app/page.tsx +++ b/templates/portfolio/nextjs-monolith/app/page.tsx @@ -39,7 +39,7 @@ export default function Home() { {/* Decorative gradient blob */}
diff --git a/templates/portfolio/nextjs-monolith/app/projects/page.tsx b/templates/portfolio/nextjs-monolith/app/projects/page.tsx index 70c5a9d..013ec61 100644 --- a/templates/portfolio/nextjs-monolith/app/projects/page.tsx +++ b/templates/portfolio/nextjs-monolith/app/projects/page.tsx @@ -86,7 +86,7 @@ export default function ProjectsPage() { {/* Image Placeholder */}
Project Preview @@ -133,4 +133,4 @@ export default function ProjectsPage() {
); -} +} \ No newline at end of file diff --git a/templates/portfolio/nextjs-monolith/app/skills/page.tsx b/templates/portfolio/nextjs-monolith/app/skills/page.tsx index c8bbd94..f2a8b93 100644 --- a/templates/portfolio/nextjs-monolith/app/skills/page.tsx +++ b/templates/portfolio/nextjs-monolith/app/skills/page.tsx @@ -77,7 +77,7 @@ export default function SkillsPage() {
diff --git a/templates/portfolio/nextjs-monolith/components/AnimationProvider.tsx b/templates/portfolio/nextjs-monolith/components/AnimationProvider.tsx index feaf51c..d07ea91 100644 --- a/templates/portfolio/nextjs-monolith/components/AnimationProvider.tsx +++ b/templates/portfolio/nextjs-monolith/components/AnimationProvider.tsx @@ -11,10 +11,10 @@ export default function AnimationProvider({ return ( {children} diff --git a/templates/portfolio/nextjs-monolith/components/ProjectCard.tsx b/templates/portfolio/nextjs-monolith/components/ProjectCard.tsx index 16e8fd3..80fd744 100644 --- a/templates/portfolio/nextjs-monolith/components/ProjectCard.tsx +++ b/templates/portfolio/nextjs-monolith/components/ProjectCard.tsx @@ -20,7 +20,7 @@ export default function ProjectCard({ {/* Image Placeholder */}
Project Preview @@ -61,4 +61,4 @@ export default function ProjectCard({
); -} +} \ No newline at end of file diff --git a/templates/portfolio/vite-react/src/pages/Home.tsx b/templates/portfolio/vite-react/src/pages/Home.tsx index f6700cc..3725954 100644 --- a/templates/portfolio/vite-react/src/pages/Home.tsx +++ b/templates/portfolio/vite-react/src/pages/Home.tsx @@ -15,7 +15,7 @@ export default function Home() {

@@ -70,7 +70,7 @@ export default function Home() {
{featuredProjects.map((project) => (
-
+
Project Preview
diff --git a/templates/portfolio/vite-react/src/pages/Projects.tsx b/templates/portfolio/vite-react/src/pages/Projects.tsx index 1d60bcb..f0f3427 100644 --- a/templates/portfolio/vite-react/src/pages/Projects.tsx +++ b/templates/portfolio/vite-react/src/pages/Projects.tsx @@ -38,7 +38,7 @@ export default function Projects() {
{projects.map((project) => (
-
+
Project Preview
diff --git a/templates/portfolio/vite-react/src/pages/Skills.tsx b/templates/portfolio/vite-react/src/pages/Skills.tsx index 2551df9..5ffa19f 100644 --- a/templates/portfolio/vite-react/src/pages/Skills.tsx +++ b/templates/portfolio/vite-react/src/pages/Skills.tsx @@ -77,7 +77,7 @@ export default function Skills() {
diff --git a/templates/saas/nextjs-monolith/app/analytics/page.tsx b/templates/saas/nextjs-monolith/app/analytics/page.tsx index c9650fa..09089e9 100644 --- a/templates/saas/nextjs-monolith/app/analytics/page.tsx +++ b/templates/saas/nextjs-monolith/app/analytics/page.tsx @@ -141,7 +141,7 @@ export default function AnalyticsPage() {
{stage.count.toLocaleString()}
diff --git a/templates/saas/nextjs-monolith/app/billing/page.tsx b/templates/saas/nextjs-monolith/app/billing/page.tsx index b28f88a..b2d2cd6 100644 --- a/templates/saas/nextjs-monolith/app/billing/page.tsx +++ b/templates/saas/nextjs-monolith/app/billing/page.tsx @@ -61,7 +61,7 @@ export default function BillingPage() { 67GB / 100GB
-
+
diff --git a/templates/saas/nextjs-monolith/components/AnimationProvider.tsx b/templates/saas/nextjs-monolith/components/AnimationProvider.tsx index feaf51c..d07ea91 100644 --- a/templates/saas/nextjs-monolith/components/AnimationProvider.tsx +++ b/templates/saas/nextjs-monolith/components/AnimationProvider.tsx @@ -11,10 +11,10 @@ export default function AnimationProvider({ return ( {children} diff --git a/templates/saas/nextjs-monolith/components/BarChart.tsx b/templates/saas/nextjs-monolith/components/BarChart.tsx index 07b7f4f..bc48d8c 100644 --- a/templates/saas/nextjs-monolith/components/BarChart.tsx +++ b/templates/saas/nextjs-monolith/components/BarChart.tsx @@ -8,7 +8,7 @@ export default function BarChart({ data, height = 200 }: BarChartProps) { return (
-
+
{data.map((item) => { const barHeight = (item.value / max) * 100; return ( @@ -18,7 +18,7 @@ export default function BarChart({ data, height = 200 }: BarChartProps) {
); diff --git a/templates/saas/nextjs-monolith/components/DonutChart.tsx b/templates/saas/nextjs-monolith/components/DonutChart.tsx index 2fe0426..1c610b6 100644 --- a/templates/saas/nextjs-monolith/components/DonutChart.tsx +++ b/templates/saas/nextjs-monolith/components/DonutChart.tsx @@ -29,7 +29,7 @@ export default function DonutChart({ segments, size = 180 }: DonutChartProps) { return (
-
+
{seg.label} diff --git a/templates/saas/vite-react/src/pages/Analytics.tsx b/templates/saas/vite-react/src/pages/Analytics.tsx index ec8250c..97eea30 100644 --- a/templates/saas/vite-react/src/pages/Analytics.tsx +++ b/templates/saas/vite-react/src/pages/Analytics.tsx @@ -44,7 +44,7 @@ export default function Analytics() {
diff --git a/templates/saas/vite-react/src/pages/Dashboard.tsx b/templates/saas/vite-react/src/pages/Dashboard.tsx index 5efd44c..44d87f9 100644 --- a/templates/saas/vite-react/src/pages/Dashboard.tsx +++ b/templates/saas/vite-react/src/pages/Dashboard.tsx @@ -47,7 +47,7 @@ export default function Dashboard() {
{point.month}
diff --git a/templates/school/nextjs-monolith/app/courses/page.tsx b/templates/school/nextjs-monolith/app/courses/page.tsx index dbaa850..48d6a7b 100644 --- a/templates/school/nextjs-monolith/app/courses/page.tsx +++ b/templates/school/nextjs-monolith/app/courses/page.tsx @@ -115,7 +115,7 @@ export default function CoursesPage() {
diff --git a/templates/school/nextjs-monolith/components/AnimationProvider.tsx b/templates/school/nextjs-monolith/components/AnimationProvider.tsx index feaf51c..d07ea91 100644 --- a/templates/school/nextjs-monolith/components/AnimationProvider.tsx +++ b/templates/school/nextjs-monolith/components/AnimationProvider.tsx @@ -11,10 +11,10 @@ export default function AnimationProvider({ return ( {children} From c7c4ffd83b14936b8dea03780af863611d3adedb Mon Sep 17 00:00:00 2001 From: ebedi Date: Wed, 10 Jun 2026 16:52:48 +0200 Subject: [PATCH 2/2] fix[engine]: remove unused modified variable to satisfy lint criteria --- src/generate.js | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/src/generate.js b/src/generate.js index 957c9ac..adefa61 100644 --- a/src/generate.js +++ b/src/generate.js @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; import { fileURLToPath } from 'url'; -import crypto from 'crypto'; // <-- ADDED: Node.js core module for hashing +import crypto from 'crypto'; import chalk from 'chalk'; import ora from 'ora'; import { downloadTemplate } from 'giget'; @@ -34,7 +34,7 @@ function getAllFiles(dirPath, arrayOfFiles = []) { return arrayOfFiles; } -// <-- ADDED: Utility function to generate a SHA-256 hash from file contents +// Utility function to generate a SHA-256 hash from file contents function getFileHash(data) { return crypto.createHash('sha256').update(data).digest('hex'); } @@ -59,8 +59,6 @@ export async function generateProject(config) { let projectName = config.projectName; let projectPath = path.join(process.cwd(), projectName); - // <-- MODIFIED: We no longer auto-rename the folder if it exists. - // We WANT to be able to target an existing folder so we can deduplicate and update it! if (!fs.existsSync(projectPath)) { fs.mkdirSync(projectPath, { recursive: true }); } @@ -74,8 +72,7 @@ export async function generateProject(config) { config.architecture, ); - // <-- ADDED: Create a temporary staging directory. - // We cannot copy directly into projectPath anymore, otherwise we'd overwrite user edits before hashing! + // Create a temporary staging directory const stagingPath = path.join(process.cwd(), `.opusify-staging-${Date.now()}`); try { @@ -88,7 +85,6 @@ export async function generateProject(config) { }).start(); const copyStart = Date.now(); - // Copy to STAGING instead of final project path fs.cpSync(localTemplatePath, stagingPath, { recursive: true }); spinner.succeed(`Template resolved for ./${projectName}`); @@ -108,7 +104,6 @@ export async function generateProject(config) { }).start(); try { - // Fetch to STAGING instead of final project path await downloadTemplate(repoInput, { dir: stagingPath, force: true, @@ -117,7 +112,6 @@ export async function generateProject(config) { spinner.succeed(`Template fetched for ./${projectName}`); } catch (fetchError) { spinner.fail(`Failed to fetch template from GitHub: ${repoInput}`); - // ... (existing error handling kept intact) throw new Error('FETCH_FAILED', { cause: fetchError }); } } @@ -130,17 +124,14 @@ export async function generateProject(config) { }).start(); const compileStart = Date.now(); - // Read from staging directory const allFiles = getAllFiles(stagingPath); let compiledCount = 0; - let skippedCount = 0; // Track skipped files + let skippedCount = 0; for (const tempFile of allFiles) { - // Calculate where this file SHOULD go in the final project const relativePath = path.relative(stagingPath, tempFile); const targetFile = path.join(projectPath, relativePath); - // Ensure the target directory exists const targetDir = path.dirname(targetFile); if (!fs.existsSync(targetDir)) { fs.mkdirSync(targetDir, { recursive: true }); @@ -151,7 +142,6 @@ export async function generateProject(config) { if (isTextFile) { let content = fs.readFileSync(tempFile, 'utf-8'); - let modified = false; const hasStructuralBlocks = /\{\{\s*(#if|#unless|else|\/if|\/unless)\b/.test(content); @@ -161,46 +151,37 @@ export async function generateProject(config) { const template = Handlebars.compile(content); content = template(config); - modified = true; } else { const placeholders = ['projectName', 'template', 'variant', 'architecture', 'design', 'navCount', 'includeSidebar', 'enableSecurity']; for (const key of placeholders) { const token = `{{${key}}}`; if (content.includes(token)) { content = content.replaceAll(token, config[key] !== undefined ? config[key] : ''); - modified = true; } } } if (content.includes('\\{{')) { content = content.replaceAll('\\{{', '{{'); - modified = true; } - // Output is our compiled string finalContent = content; } else { - // If it's an image/binary, just read the buffer finalContent = fs.readFileSync(tempFile); } - // <-- ALGORITHM STEP: Hash comparison for Deduplication const newHash = getFileHash(finalContent); let shouldWrite = true; - // Check if the file already exists in the destination if (fs.existsSync(targetFile)) { const existingContent = fs.readFileSync(targetFile); const existingHash = getFileHash(existingContent); - // If hashes match exactly, we skip the file write if (newHash === existingHash) { shouldWrite = false; } } - // Final Disk Operation if (shouldWrite) { fs.writeFileSync(targetFile, finalContent); compiledCount++; @@ -215,7 +196,6 @@ export async function generateProject(config) { } } - // Safely remove the temporary staging directory fs.rmSync(stagingPath, { recursive: true, force: true }); compileSpinner.succeed('Template compilation & deduplication complete!'); @@ -223,20 +203,13 @@ export async function generateProject(config) { console.log(chalk.gray(` [audit] ${compiledCount} files written, ${skippedCount} files skipped (${Date.now() - compileStart}ms)`)); } - // 4. Save the config blueprint const configFilePath = path.join(projectPath, 'opusify.config.json'); fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2)); - // 5. Generate dynamic navigation based on navCount generateNavigation(projectPath, config); - - // 6. Resolve dynamic dependencies based on user choices resolveDependencies(projectPath, config); - - // 7. Apply security hardening if enabled applySecurity(projectPath, config); - // 8. AUTOMATION PHASE: Install Dependencies if (config.noInstall) { console.log(chalk.gray('\nā­ļø Skipping npm install (--no-install).')); } else { @@ -265,7 +238,6 @@ export async function generateProject(config) { } } - // 9. Git Initialization if (config.initGit) { const gitSpinner = ora({ text: 'Initializing Git repository...', @@ -288,7 +260,6 @@ export async function generateProject(config) { console.log(chalk.gray('\nā­ļø Skipping Git initialization.')); } - // 10. Final Success Message console.log(chalk.magenta(`\nšŸŽ‰ Project ${projectName} is ready!`)); if (verbose) { console.log(chalk.gray(` [total] Generation completed in ${((Date.now() - totalStart) / 1000).toFixed(1)}s`)); @@ -299,7 +270,6 @@ export async function generateProject(config) { } catch (error) { console.log(chalk.red('\nšŸšØ Generation failed.')); - // Clean up staging if it crashed halfway if (fs.existsSync(stagingPath)) { try { fs.rmSync(stagingPath, { recursive: true, force: true });