rootless-config 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rootless-config",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Store project config files outside the project root, auto-deploy them where tools expect them.",
   "type": "module",
   "bin": {

package/src/cli/commands/migrate.js

@@ -5,20 +5,38 @@ import { readdir, unlink } from 'node:fs/promises'
 import { createLogger } from '../../utils/logger.js'
 import { fileExists, ensureDir, atomicWrite, copyFile, readJsonFile } from '../../utils/fsUtils.js'
 import { confirm } from '../../utils/prompt.js'
-import { patchPackageScripts, isRootRequired, isPatchable, isWebAsset, NEVER_MIGRATE } from '../../core/scriptPatcher.js'
+import { patchPackageScripts, isPatchable, NEVER_MIGRATE } from '../../core/scriptPatcher.js'
 
-// A file is migratable when rootless knows what to do with it:
-//  - isRootRequired → must be in root (will be copied there by prepare)
-//  - isPatchable    → can be redirected via --config flag in package.json scripts
-// Anything that's NEVER_MIGRATE (lock files, package.json) is excluded.
+// Files that are OS/editor/VCS noise — never migrate, never touch
+const SYSTEM_FILES = new Set([
+  '.DS_Store', 'Thumbs.db', 'desktop.ini', '.git', '.svn',
+])
 
+/**
+ * Determine which .root sub-folder a file should land in:
+ *  env/     — .env* files (always copied to root by prepare)
+ *  configs/ — tool configs that support --config flags (scripts get patched)
+ *  assets/  — everything else (always copied to root by prepare)
+ */
+function getDestSubdir(filename) {
+  if (/^\.env/.test(filename)) return 'env'
+  if (isPatchable(filename)) return 'configs'
+  return 'assets'
+}
+
+/**
+ * Returns ALL files in projectRoot that should be migrated.
+ * Excludes: directories, package manager lock files, OS noise.
+ */
 async function findMigratableFiles(projectRoot) {
   const entries = await readdir(projectRoot, { withFileTypes: true })
   return entries
     .filter(e => {
       if (!e.isFile()) return false
       if (NEVER_MIGRATE.has(e.name)) return false
-      return isRootRequired(e.name) || isPatchable(e.name)
+      if (SYSTEM_FILES.has(e.name)) return false
+      if (e.name === '.root') return false
+      return true  // migrate EVERYTHING else
     })
     .map(e => e.name)
     .sort()
@@ -66,8 +84,7 @@ export default {
 
     for (const name of candidates) {
       const src = path.join(projectRoot, name)
-      const isEnv = /^\.env/.test(name)
-      const destSubdir = isEnv ? 'env' : (isWebAsset(name) ? 'assets' : 'configs')
+      const destSubdir = getDestSubdir(name)
       const destDir = path.join(containerPath, destSubdir)
 
       await ensureDir(destDir)

package/src/cli/commands/setup.js

@@ -1,21 +1,62 @@
-/*-------- rootless setup — one-command full root cleanup: init + migrate + prepare --------*/
+/*-------- rootless setup — one-command full root cleanup: init + normalize + migrate --------*/
 
 import path from 'node:path'
+import { readdir, rename } from 'node:fs/promises'
 import { createLogger } from '../../utils/logger.js'
+import { fileExists, ensureDir } from '../../utils/fsUtils.js'
+import { isPatchable } from '../../core/scriptPatcher.js'
 import initCmd from './init.js'
 import migrateCmd from './migrate.js'
-import prepareCmd from './prepare.js'
+
+/**
+ * Fix files that ended up in the wrong subfolder from a previous run.
+ * Non-patchable files (web assets, docs, scripts) belong in assets/, not configs/.
+ */
+async function normalizeContainer(containerPath, logger) {
+  const configsDir = path.join(containerPath, 'configs')
+  const assetsDir  = path.join(containerPath, 'assets')
+  if (!(await fileExists(configsDir))) return
+
+  const entries = await readdir(configsDir, { withFileTypes: true })
+  for (const e of entries) {
+    if (!e.isFile()) continue
+    if (!isPatchable(e.name)) {
+      // Not a tool config — belongs in assets/
+      await ensureDir(assetsDir)
+      await rename(
+        path.join(configsDir, e.name),
+        path.join(assetsDir, e.name)
+      )
+      logger.debug(`Normalized: .root/configs/${e.name} → .root/assets/${e.name}`)
+    }
+  }
+}
+
+/**
+ * Count total files managed across all .root subdirectories.
+ */
+async function countRootFiles(containerPath) {
+  let total = 0
+  for (const sub of ['env', 'assets', 'configs']) {
+    const dir = path.join(containerPath, sub)
+    if (!(await fileExists(dir))) continue
+    const entries = await readdir(dir, { withFileTypes: true })
+    total += entries.filter(e => e.isFile()).length
+  }
+  return total
+}
 
 export default {
   name: 'setup',
-  description: 'Full automated root cleanup: init .root, migrate all configs, prepare (copy + patch scripts)',
+  description: 'Full automated root cleanup: move ALL files into .root container (run prepare to deploy)',
 
   async handler(args) {
     const logger = createLogger({ verbose: args.verbose ?? false })
     const projectRoot = args.cwd ? path.resolve(args.cwd) : process.cwd()
+    const containerPath = path.join(projectRoot, '.root')
 
     logger.info('─────────────────────────────────────────')
-    logger.info(' rootless setup — cleaning your project root')
+    logger.info(' rootless setup — moving everything to .root/')
     logger.info('─────────────────────────────────────────')
     logger.info('')
 
@@ -24,31 +65,36 @@ export default {
     await initCmd.handler({ ...args, yes: true, cwd: projectRoot })
     logger.info('')
 
-    // ── Step 2: migrate ───────────────────────────────────────────────────────
-    logger.info('[2/3] Migrating config files from root…')
-    await migrateCmd.handler({ ...args, yes: true, cwd: projectRoot })
+    // ── Step 2: normalize existing .root structure (fix misrouted files) ──────
+    logger.info('[2/3] Normalizing .root structure…')
+    await normalizeContainer(containerPath, logger)
+    logger.success('Structure normalized')
     logger.info('')
 
-    // ── Step 3: prepare ───────────────────────────────────────────────────────
-    logger.info('[3/3] Preparing root (copying mandatory files + patching scripts)…')
-    await prepareCmd.handler({ ...args, yes: true })
+    // ── Step 3: migrate ALL files from root → .root/ ──────────────────────────
+    logger.info('[3/3] Migrating files from root to .root/…')
+    await migrateCmd.handler({ ...args, yes: true, cwd: projectRoot })
     logger.info('')
 
+    const total = await countRootFiles(containerPath)
+
     logger.info('─────────────────────────────────────────')
-    logger.success('Setup complete! Your project root is clean.')
-    logger.info('')
-    logger.info('What happened:')
-    logger.info('  • .root/ container created')
-    logger.info('  • Config files moved to .root/configs/')
-    logger.info('  • .env* files moved to .root/env/')
-    logger.info('  • Web assets moved to .root/assets/')
-    logger.info('  • package.json scripts patched with --config flags')
-    logger.info('  • Mandatory files copied back to root (prepare)')
-    logger.info('')
-    logger.info('Next steps:')
-    logger.info('  rootless status   — see what\'s managed')
-    logger.info('  rootless doctor   — verify everything is wired correctly')
-    logger.info('  rootless watch    — auto-sync on .root/ changes')
+    logger.success(`Setup complete! ${total} files now managed in .root/`)
+    logger.info('')
+    logger.info('Your project root is now clean.')
+    logger.info('')
+    logger.info('  .root/env/     — .env files')
+    logger.info('  .root/assets/  — web assets, HTML, images, scripts')
+    logger.info('  .root/configs/ — tool configs (vite, eslint, jest…)')
+    logger.info('')
+    logger.info('⚠  Files were REMOVED from root.')
+    logger.info('   Run the following before deploying or starting the project:')
+    logger.info('')
+    logger.info('   rootless prepare   — copies files back to root')
+    logger.info('')
+    logger.info('Other commands:')
+    logger.info('  rootless status    — show what is managed')
+    logger.info('  rootless watch     — auto-sync .root/ → root on changes')
     logger.info('─────────────────────────────────────────')
   },
 }