create-epinoetics-app 1.0.6 → 1.0.7

package/bin/create-epinoetics-app.js

@@ -6,6 +6,7 @@ import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { run } from '../src/index.js';
 import { runAdd } from '../src/adder.js';
+import { runSync } from '../src/syncer.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(resolve(__dirname, '../package.json'), 'utf8'));
@@ -37,8 +38,12 @@ program
 program
   .command('add')
   .description('Add a feature to an existing project (run from code/api-nest)')
-  .action(() => {
-    runAdd();
-  });
+  .action(() => runAdd());
+
+// ── sync ──────────────────────────────────────────────────────────
+program
+  .command('sync')
+  .description('Pull latest boilerplate updates (run from code/api-nest)')
+  .action(() => runSync());
 
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-epinoetics-app",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Scaffold a new project from your boilerplate repos",
   "type": "module",
   "bin": {

package/src/cloner.js

@@ -80,8 +80,26 @@ export async function cloneAndMergeNest({ projectName, database, selectedFeature
   // 6. Write scaffold.config.json
   writeScaffoldConfig({ dest, database, selectedFeatures, repoUrl });
 
-  // 7. Strip .git
-  fs.rmSync(join(dest, '.git'), { recursive: true, force: true });
+  // 7. Protect src/features/ from future syncs
+  writeGitExclude({ dest });
+
+  // NOTE: .git is intentionally kept so `sync` can pull updates later
+}
+
+// ── Write .git/info/exclude to protect key dirs from sync ─────────
+function writeGitExclude({ dest }) {
+  const excludePath = join(dest, '.git', 'info', 'exclude');
+  const lines = [
+    '# Added by create-epinoetics-app — do not edit',
+    'src/features/',
+    'scaffold.config.json',
+    '.env',
+    '.env.local',
+  ].join('\n');
+
+  fs.mkdirSync(join(dest, '.git', 'info'), { recursive: true });
+  fs.writeFileSync(excludePath, lines, 'utf8');
+  p.log.step(`Protected src/features/ from sync`);
 }
 
 // ── Write scaffold.config.json ────────────────────────────────────

package/src/syncer.js

@@ -0,0 +1,99 @@
+import * as p from '@clack/prompts';
+import chalk from 'chalk';
+import { join } from 'path';
+import { simpleGit } from 'simple-git';
+import { NEST_DATABASES } from './repos.js';
+import fs from 'fs';
+
+export async function runSync() {
+  console.log('');
+  p.intro(
+    chalk.bgHex('#7c3aed').white(' create-epinoetics-app sync ') +
+    chalk.dim(' pull latest boilerplate updates')
+  );
+
+  const cwd = process.cwd();
+
+  // ── 1. Read scaffold.config.json ──────────────────────────────────
+  const configPath = join(cwd, 'scaffold.config.json');
+  if (!fs.existsSync(configPath)) {
+    p.log.error(
+      'No scaffold.config.json found.\n' +
+      chalk.dim('Make sure you are inside the code/api-nest directory.')
+    );
+    process.exit(1);
+  }
+
+  const config   = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  const database = NEST_DATABASES.find(d => d.id === config.database);
+
+  p.note(
+    [
+      `${chalk.dim('branch  '.padEnd(14))} ${chalk.cyan(config.branch)}`,
+      `${chalk.dim('features'.padEnd(14))} ${config.features.length ? config.features.map(f => chalk.cyan(f)).join(chalk.dim(', ')) : chalk.dim('none')}`,
+    ].join('\n'),
+    'Syncing'
+  );
+
+  const confirm = await p.confirm({
+    message: `Pull latest changes from ${chalk.cyan(config.branch)}?`,
+  });
+  if (p.isCancel(confirm) || !confirm) return cancel();
+
+  // ── 2. Make sure .git exists ──────────────────────────────────────
+  const gitDir = join(cwd, '.git');
+  if (!fs.existsSync(gitDir)) {
+    p.log.error(
+      '.git directory not found.\n' +
+      chalk.dim('Re-scaffold this project to enable sync.')
+    );
+    process.exit(1);
+  }
+
+  // ── 3. Stash any local changes ────────────────────────────────────
+  const git     = simpleGit(cwd);
+  const spinner = p.spinner();
+
+  spinner.start('Stashing local changes...');
+  try {
+    await git.stash(['push', '--include-untracked', '-m', 'create-epinoetics-app sync']);
+    spinner.stop(`${chalk.green('✓')} Local changes stashed`);
+  } catch {
+    spinner.stop(chalk.dim('Nothing to stash'));
+  }
+
+  // ── 4. Pull latest from the db branch ────────────────────────────
+  const pullSpinner = p.spinner();
+  pullSpinner.start(`Pulling latest from ${chalk.cyan(config.branch)}...`);
+
+  try {
+    await git.pull('origin', config.branch, ['--rebase']);
+    pullSpinner.stop(`${chalk.green('✓')} Pulled latest changes`);
+  } catch (err) {
+    pullSpinner.stop(`${chalk.red('✗')} Pull failed  ${chalk.dim(err.message)}`);
+    p.log.warn('Restoring your stashed changes...');
+    await git.stash(['pop']).catch(() => {});
+    process.exit(1);
+  }
+
+  // ── 5. Restore stashed changes ────────────────────────────────────
+  const stashList = await git.stashList();
+  if (stashList.total > 0) {
+    const restoreSpinner = p.spinner();
+    restoreSpinner.start('Restoring your local changes...');
+    try {
+      await git.stash(['pop']);
+      restoreSpinner.stop(`${chalk.green('✓')} Local changes restored`);
+    } catch (err) {
+      restoreSpinner.stop(`${chalk.yellow('⚠')} Conflict restoring stash — resolve manually`);
+      p.log.warn(`Run ${chalk.cyan('git stash pop')} to restore your changes.`);
+    }
+  }
+
+  p.outro(chalk.green('Sync complete!'));
+}
+
+function cancel() {
+  p.cancel('Cancelled.');
+  process.exit(0);
+}