rootless-config 1.7.3 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rootless-config",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "Store project config files outside the project root, auto-deploy them where tools expect them.",
   "type": "module",
   "bin": {
@@ -8,7 +8,8 @@
   },
   "main": "./src/index.js",
   "exports": {
-    ".": "./src/index.js"
+    ".": "./src/index.js",
+    "./serve": "./src/serve/index.js"
   },
   "files": [
     "bin",

package/src/cli/commands/activate.js

@@ -142,10 +142,15 @@ export default {
       return
     }
 
-    // Если stdout пайпится (Invoke-Expression) — выводим HOOK_BODY
-    // Если терминал — показываем подсказку
+    // Если stdout пайпится (Invoke-Expression) — выводим одну строку PS,
+    // которая декодирует base64 и исполняет весь блок целиком.
+    // Это обходит проблему PS-пайпа (строки идут по одной → незакрытые блоки).
+    // Правильный вызов: rootless activate | Invoke-Expression
     if (!process.stdout.isTTY) {
-      process.stdout.write(HOOK_BODY + '\n')
+      const encoded = Buffer.from(HOOK_BODY, 'utf8').toString('base64')
+      process.stdout.write(
+        `[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${encoded}')) | Invoke-Expression\n`
+      )
     } else {
       logger.info('')
       logger.info('To activate the CURRENT session, run:')

package/src/index.js

@@ -5,6 +5,7 @@ import { createWatcher } from './watch/watcher.js'
 import { createDirtySet } from './watch/dirtySet.js'
 import { runIncrementalRegeneration } from './watch/incrementalRegeneration.js'
 import { resolveContainerPath } from './core/pathResolver.js'
+import { resolveStaticFile, getServeDirs } from './serve/index.js'
 
 async function prepare(options = {}) {
   return preparePipeline(options)
@@ -36,4 +37,4 @@ async function watch(options = {}) {
   }
 }
 
-export { prepare, watch, clean }
+export { prepare, watch, clean, resolveStaticFile, getServeDirs }

package/src/serve/index.js

@@ -0,0 +1,74 @@
+/*-------- Public serve API — for use in Tandem Sites and other dev servers --------*/
+
+import path from 'node:path'
+import { stat, readFile } from 'node:fs/promises'
+
+/**
+ * Resolves a URL path to a real file on disk.
+ *
+ * Search order (first match wins):
+ *   [1] projectRoot          — real files/folders in project root
+ *   [2] .root/assets/        — files migrated to rootless container
+ *   [3] .root/env/           — .env files in rootless container
+ *
+ * Also tries index.html / index.htm for directory requests.
+ *
+ * @param {string} requestPath  — e.g. '/viewer/app/code/app.js' or '/'
+ * @param {string} projectRoot  — absolute path to the project root
+ * @returns {Promise<string|null>} absolute path to the file, or null if not found
+ */
+async function resolveStaticFile(requestPath, projectRoot) {
+  const containerPath = path.join(projectRoot, '.root')
+  const assetsDir     = path.join(containerPath, 'assets')
+  const envDir        = path.join(containerPath, 'env')
+  const searchDirs    = [projectRoot, assetsDir, envDir]
+
+  const rel = decodeURIComponent(requestPath).replace(/^\//, '') || ''
+
+  for (const dir of searchDirs) {
+    // Block access to .root internals when searching from projectRoot
+    if (dir === projectRoot && rel.startsWith('.root')) continue
+
+    const candidates = rel === ''
+      ? [
+          path.join(dir, 'index.html'),
+          path.join(dir, 'index.htm'),
+        ]
+      : [
+          path.join(dir, rel),
+          path.join(dir, rel, 'index.html'),
+          path.join(dir, rel, 'index.htm'),
+        ]
+
+    for (const candidate of candidates) {
+      try {
+        if ((await stat(candidate)).isFile()) return candidate
+      } catch {
+        // not found, try next
+      }
+    }
+  }
+
+  return null
+}
+
+/**
+ * Returns the ordered list of directories that rootless serves from.
+ * Useful for configuring a static server manually.
+ *
+ * @param {string} projectRoot
+ * @returns {{ projectRoot: string, assetsDir: string, envDir: string, searchDirs: string[] }}
+ */
+function getServeDirs(projectRoot) {
+  const containerPath = path.join(projectRoot, '.root')
+  const assetsDir     = path.join(containerPath, 'assets')
+  const envDir        = path.join(containerPath, 'env')
+  return {
+    projectRoot,
+    assetsDir,
+    envDir,
+    searchDirs: [projectRoot, assetsDir, envDir],
+  }
+}
+
+export { resolveStaticFile, getServeDirs }