rootless-config 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rootless-config",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "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

@@ -1,11 +1,11 @@
 /*-------- rootless migrate — moves existing root configs into .root container --------*/
 
 import path from 'node:path'
-import { readdir, unlink } from 'node:fs/promises'
+import { readdir, readFile, 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, isPatchable, NEVER_MIGRATE } from '../../core/scriptPatcher.js'
+import { patchPackageScripts, isPatchable, NEVER_MIGRATE, patchServerScript } from '../../core/scriptPatcher.js'
 
 // Files that are OS/editor/VCS noise — never migrate, never touch
 const SYSTEM_FILES = new Set([
@@ -92,6 +92,33 @@ export default {
       const dest = path.join(destDir, name)
 
       if (isCleanMode) {
+        // For PS1 server scripts: patch $root before writing to .root/assets/
+        if (name.endsWith('.ps1')) {
+          const raw = await readFile(src, 'utf8')
+          const patched = patchServerScript(raw)
+          if (patched) {
+            await atomicWrite(dest, patched)
+            await unlink(src)
+            logger.success(`Moved+patched .root/${destSubdir}/${name} (server root → project root)`)
+            continue
+          }
+        }
+        // For .cmd/.bat launcher scripts: fix relative path to .ps1 → use %~dp0
+        // so the ps1 is found relative to the cmd file's own location
+        if (name.endsWith('.cmd') || name.endsWith('.bat')) {
+          const raw = await readFile(src, 'utf8')
+          // Replace: -File .server.ps1  →  -File "%~dp0.server.ps1"
+          const patched = raw.replace(
+            /(-File\s+)(?!")([^\s"]+\.ps1)/gi,
+            (_, flag, ps1) => `${flag}"%~dp0${ps1}"`
+          )
+          if (patched !== raw) {
+            await atomicWrite(dest, patched)
+            await unlink(src)
+            logger.success(`Moved+patched .root/${destSubdir}/${name} (ps1 path → %~dp0-relative)`)
+            continue
+          }
+        }
         // Binary-safe stream copy — works for .png, .js, .css, etc.
         await copyFile(src, dest)
         await unlink(src)

package/src/core/scriptPatcher.js

@@ -459,6 +459,74 @@ async function patchPackageScripts(projectRoot, configsDir, logger) {
   return changed
 }
 
+/**
+ * Patches a PowerShell HTTP server script (.server.ps1 style) so it works
+ * correctly after being moved to .root/assets/.
+ *
+ * The script originally uses $PSScriptRoot as web root. After migration,
+ * $PSScriptRoot = .root/assets/ — so subdirectories left in the project root
+ * (viewer/, agreement/, etc.) are invisible to it.
+ *
+ * This patch:
+ *  1. Sets $root to the project root (2 dirs up from $PSScriptRoot)
+ *  2. Keeps $assetsRoot pointing to .root/assets/ for fallback
+ *  3. After path resolution, falls back to $assetsRoot when file not found in $root
+ *  4. Fixes the 404 page lookup to also check $assetsRoot
+ *
+ * Returns patched content, or null if the file doesn't look like a server script.
+ */
+function patchServerScript(content) {
+  // Only patch scripts that use $PSScriptRoot as web root
+  if (!content.includes('$PSScriptRoot') || !content.includes('$root')) return null
+
+  let out = content
+
+  // 1. Redefine $root → project root (2 levels up), keep $assetsRoot for fallback
+  out = out.replace(
+    /\$root(\s*)=(\s*)\$PSScriptRoot\.TrimEnd\('\\\\?'\)\s*\+\s*'\\\\'?/,
+    `$assetsRoot$1=$2$PSScriptRoot.TrimEnd('\\') + '\\'
+$root$1=$2(Get-Item "$PSScriptRoot\\..\\..").FullName.TrimEnd('\\') + '\\'`
+  )
+
+  // If the above didn't match (different whitespace/quoting), try simpler form
+  if (out === content) {
+    const marker = `$root           = $PSScriptRoot.TrimEnd('\\') + '\\'`
+    if (content.includes(marker)) {
+      out = out.replace(
+        marker,
+        `$assetsRoot     = $PSScriptRoot.TrimEnd('\\') + '\\'
+$root           = (Get-Item "$PSScriptRoot\\..\\..").FullName.TrimEnd('\\') + '\\'`
+      )
+    }
+  }
+
+  // 2. Add rootless fallback after $filePath = $resolved
+  const filePathLine = '            $filePath = $resolved'
+  if (out.includes(filePathLine)) {
+    out = out.replace(
+      filePathLine,
+      filePathLine + `
+            # rootless: fallback to .root/assets/ when file not found in project root
+            if ($relPath -ne '' -and -not (Test-Path $filePath)) {
+                $assetsCandidate = [System.IO.Path]::GetFullPath((Join-Path $assetsRoot $relPath))
+                if (Test-Path $assetsCandidate) { $filePath = $assetsCandidate }
+            }`
+    )
+  }
+
+  // 3. Fix 404 page lookup to also check $assetsRoot
+  const notFoundLine = '                    $candidate = Join-Path $root $filename'
+  if (out.includes(notFoundLine)) {
+    out = out.replace(
+      notFoundLine,
+      notFoundLine + `
+                    if (-not (Test-Path $candidate -PathType Leaf)) { $candidate = Join-Path $assetsRoot $filename }`
+    )
+  }
+
+  return out === content ? null : out
+}
+
 /**
  * Add "prepare": "rootless prepare --yes" to project's package.json.
  */
@@ -492,5 +560,6 @@ export {
   NEVER_MIGRATE,
   ROOT_REQUIRED_PATTERNS,
   WEB_ASSET_PATTERNS,
+  patchServerScript,
 }