@stacksjs/stx 0.2.155 → 0.2.157

package/dist/config.d.ts

@@ -1,5 +1,21 @@
-import path from 'node:path';
 import type { StxConfig, StxOptions } from './types';
+export declare const defaultConfig: StxConfig;
+/**
+ * Resolve `root`, `pagesDir` and the template directories, in place.
+ *
+ * This is the ONE resolution pass. It used to live inline in `loadStxConfig`,
+ * while `bun-plugin`'s `serve()` read the same config file through bunfig and
+ * used the literal strings — so the same key meant two different directories
+ * depending on which path rendered the page, and `root` being *inferred* from
+ * the filesystem meant an ordinary Stacks layout hit the disagreement without
+ * anyone opting into anything (#1851).
+ *
+ * Prefixing is idempotent: a value that already starts with `root` is left
+ * alone. Directory strings stay project-root-relative rather than becoming
+ * absolute — see the note in the issue thread; that contract change is
+ * separable from this correctness fix.
+ */
+export declare function resolveStxDirectories(loaded: StxConfig, cwd: string): StxConfig;
 /**
  * Load the stx config for a project.
  *
@@ -11,10 +27,27 @@ import type { StxConfig, StxOptions } from './types';
  * Results are cached per cwd so repeated calls don't re-read disk.
  */
 export declare function loadStxConfig(cwd?: string): Promise<StxConfig>;
+export declare const config: StxConfig;
 /**
  * Helper function to define stx configuration
  */
 export declare function defineStxConfig(config: StxOptions): StxOptions;
+/**
+ * Configuration validation error
+ */
+export interface ConfigValidationError {
+    path: string;
+    message: string;
+    severity: 'error' | 'warning';
+}
+/**
+ * Configuration validation result
+ */
+export interface ConfigValidationResult {
+    valid: boolean;
+    errors: ConfigValidationError[];
+    warnings: ConfigValidationError[];
+}
 /**
  * Validate stx configuration
  *
@@ -30,23 +63,3 @@ export declare function defineStxConfig(config: StxOptions): StxOptions;
  * ```
  */
 export declare function validateConfig(config: StxOptions): ConfigValidationResult;
-export declare const defaultConfig: StxConfig;
-// Export a synchronous getter that returns defaults immediately, then loads async
-// This allows the module to be imported instantly without blocking
-export declare const config: StxConfig;
-/**
- * Configuration validation error
- */
-export declare interface ConfigValidationError {
-  path: string
-  message: string
-  severity: 'error' | 'warning'
-}
-/**
- * Configuration validation result
- */
-export declare interface ConfigValidationResult {
-  valid: boolean
-  errors: ConfigValidationError[]
-  warnings: ConfigValidationError[]
-}

package/dist/config.js

@@ -372,6 +372,38 @@ function resolveStxRoot(configRoot, configPagesDir, cwd) {
     return { root: "resources/views", pagesDir: defaultPagesDir };
   return { root: ".", pagesDir: defaultPagesDir };
 }
+const announcedRoots = new Set;
+function alreadyUnderRoot(value, root) {
+  const normalizedRoot = root.replace(/[\\/]+$/, "");
+  if (!normalizedRoot || normalizedRoot === ".")
+    return !0;
+  const normalizedValue = value.replace(/\\/g, "/"), rootAsPosix = normalizedRoot.replace(/\\/g, "/");
+  return normalizedValue === rootAsPosix || normalizedValue.startsWith(`${rootAsPosix}/`);
+}
+export function resolveStxDirectories(loaded, cwd) {
+  const inferred = !loaded.root, resolved = resolveStxRoot(loaded.root, loaded.pagesDir, cwd);
+  loaded.root = resolved.root;
+  loaded.pagesDir = resolved.pagesDir;
+  if (inferred && resolved.root !== ".") {
+    const announceKey = `${cwd}::${resolved.root}`;
+    if (!announcedRoots.has(announceKey)) {
+      announcedRoots.add(announceKey);
+      console.warn(`[stx] No "root" in config \u2014 inferred "${resolved.root}" from the project layout. Template directories are resolved under it; set root explicitly to pin this.`);
+    }
+  }
+  if (loaded.root && loaded.root !== ".") {
+    const rootPrefix = loaded.root;
+    for (const key of ["partialsDir", "componentsDir", "layoutsDir"]) {
+      const value = loaded[key];
+      if (typeof value !== "string" || !value)
+        continue;
+      if (path.isAbsolute(value) || alreadyUnderRoot(value, rootPrefix))
+        continue;
+      loaded[key] = path.join(rootPrefix, value);
+    }
+  }
+  return loaded;
+}
 function warnMissingDirs(loaded, cwd) {
   const keys = ["componentsDir", "layoutsDir", "partialsDir"];
   for (const key of keys) {
@@ -381,8 +413,8 @@ function warnMissingDirs(loaded, cwd) {
     const abs = path.isAbsolute(value) ? value : path.join(cwd, value);
     if (fs.existsSync(abs))
       continue;
-    const prefixed = !!loaded.root && loaded.root !== ".";
-    console.warn(`[stx] ${String(key)} resolves to "${abs}", which does not exist. Configured as "${value}"` + (prefixed ? ` and prefixed with root "${loaded.root}" \u2014 a value that already includes the root gets it twice.` : "."));
+    const root = loaded.root, underRoot = !!root && root !== ".";
+    console.warn(`[stx] ${String(key)} resolves to "${abs}", which does not exist. Configured as "${value}"` + (underRoot ? `, resolved under root "${root}".` : "."));
   }
 }
 function applyStateDir(loaded) {
@@ -418,18 +450,7 @@ export async function loadStxConfig(cwd) {
       verbose: !1
     })).config;
     applyStateDir(loaded);
-    const resolved = resolveStxRoot(loaded.root, loaded.pagesDir, effectiveCwd);
-    loaded.root = resolved.root;
-    loaded.pagesDir = resolved.pagesDir;
-    if (loaded.root && loaded.root !== ".") {
-      const rootPrefix = loaded.root;
-      if (loaded.partialsDir && !path.isAbsolute(loaded.partialsDir))
-        loaded.partialsDir = path.join(rootPrefix, loaded.partialsDir);
-      if (loaded.componentsDir && !path.isAbsolute(loaded.componentsDir))
-        loaded.componentsDir = path.join(rootPrefix, loaded.componentsDir);
-      if (loaded.layoutsDir && !path.isAbsolute(loaded.layoutsDir))
-        loaded.layoutsDir = path.join(rootPrefix, loaded.layoutsDir);
-    }
+    resolveStxDirectories(loaded, effectiveCwd);
     warnMissingDirs(loaded, effectiveCwd);
     if (loaded.plugins && loaded.plugins.length > 0) {
       const { pluginManager } = await import("./plugin-system.js"), pluginComponentDirs = [], pluginPageDirs = [];