@stacksjs/stx 0.2.98 → 0.2.100

package/dist/client-script-bundler.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import fs from "node:fs";
 import { getPublicEnvDefine } from "./public-env.js";
+import { stateDir } from "./state-dir.js";
 const EXTERNAL_PATTERNS = [
   /^stx$/,
   /^@stacksjs\/stx$/,
@@ -97,7 +98,7 @@ function createBundlePlugin(projectRoot, templateDir, tmpEntry, inputFiles) {
   };
 }
 export async function bundleClientScript(code, filePath, options = {}) {
-  const projectRoot = options.projectRoot || process.cwd(), minify = options.minify ?? !1, cacheDir = options.cacheDir || path.join(projectRoot, ".stx", "bundle-cache"), hasher = new Bun.CryptoHasher("md5");
+  const projectRoot = options.projectRoot || process.cwd(), minify = options.minify ?? !1, cacheDir = options.cacheDir || stateDir(projectRoot, "bundle-cache"), hasher = new Bun.CryptoHasher("md5");
   hasher.update(code + filePath);
   const hash = hasher.digest("hex").slice(0, 12), cachePath = path.join(cacheDir, `${hash}.js`), depsPath = path.join(cacheDir, `${hash}.deps.json`), cacheFile = Bun.file(cachePath);
   if (await cacheFile.exists()) {
@@ -125,7 +126,7 @@ export async function bundleClientScript(code, filePath, options = {}) {
     }
     console.log("[stx:bundler] cache invalidated by dep change:", hash);
   }
-  const tmpDir = path.join(projectRoot, ".stx", "bundle-tmp"), tmpEntry = path.join(tmpDir, `${hash}.ts`), tmpOutDir = path.join(tmpDir, "out", hash);
+  const tmpDir = stateDir(projectRoot, "bundle-tmp"), tmpEntry = path.join(tmpDir, `${hash}.ts`), tmpOutDir = path.join(tmpDir, "out", hash);
   fs.mkdirSync(tmpDir, { recursive: !0 });
   fs.mkdirSync(tmpOutDir, { recursive: !0 });
   const templateDir = path.dirname(filePath), declNames = [], declRegex = /^(export\s+)?(?:const|let|var)\s+(?:\{([^}]+)\}|(\w+))/gm, funcRegex = /^(export\s+)?(?:async\s+)?function\s+(\w+)/gm;

package/dist/component-processing.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { createSafeFunction, isExpressionSafe, safeEvaluateObject } from "./safe-evaluator.js";
-import { renderComponentWithSlot } from "./utils.js";
+import { renderComponentWithSlot, userComponentFileExists } from "./utils.js";
 export function pascalToKebab(str) {
   return str.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2").toLowerCase();
 }
@@ -537,7 +537,10 @@ export async function processCustomElements(template, context, filePath, compone
     let result = html;
     const tags = findComponentTags(result, tagPattern, skipTags);
     for (let i = tags.length - 1;i >= 0; i--) {
-      const tag = tags[i], componentPath = isPascalCase ? pascalToKebab(tag.tagName) : tag.tagName, rawProps = parseMultilineAttributes(tag.attributes), props = {};
+      const tag = tags[i], componentPath = isPascalCase ? pascalToKebab(tag.tagName) : tag.tagName;
+      if (!isPascalCase && tag.tagName.includes("-") && !await userComponentFileExists(componentPath, componentsDir, context, filePath, options))
+        continue;
+      const rawProps = parseMultilineAttributes(tag.attributes), props = {};
       for (const [attrName, attrValue] of Object.entries(rawProps)) {
         if (attrName.startsWith("@"))
           continue;

package/dist/component-renderer.js

@@ -610,6 +610,8 @@ async function processCustomElementTags(template, context, filePath, options, de
         result = result.substring(0, tag.startIndex) + rendered + result.substring(tag.endIndex);
         continue;
       }
+      if (!isPascalCase && tag.tagName.includes("-") && !await userComponentFileExists(componentPath, componentsDir, context, filePath, options))
+        continue;
       const mergedProps = {};
       for (const [key, value] of Object.entries(resolvedProps.static))
         mergedProps[key] = value;

package/dist/config.js

@@ -11,6 +11,7 @@ import { imgDirective } from "./media/image/directive.js";
 import { videoDirective } from "./media/video/directive.js";
 import { pwaDirectives } from "./pwa/directives.js";
 import { metaDirective, structuredDataDirective } from "./seo.js";
+import { DEFAULT_STATE_DIR, rebaseOntoStateDir, setStateDir, stateDirName } from "./state-dir.js";
 import { webComponentDirectiveHandler } from "./web-components.js";
 export const defaultConfig = {
   enabled: !0,
@@ -21,6 +22,7 @@ export const defaultConfig = {
   defaultLayout: "default",
   debug: !1,
   cache: !0,
+  stateDir: DEFAULT_STATE_DIR,
   cachePath: ".stx/cache",
   cacheVersion: "1.0.0",
   build: {
@@ -370,6 +372,17 @@ function resolveStxRoot(configRoot, configPagesDir) {
     return { root: "resources/views", pagesDir: defaultPagesDir };
   return { root: ".", pagesDir: defaultPagesDir };
 }
+function applyStateDir(loaded) {
+  setStateDir(loaded.stateDir);
+  loaded.stateDir = stateDirName();
+  loaded.cachePath = rebaseOntoStateDir(loaded.cachePath);
+  if (loaded.build)
+    loaded.build.cacheDir = rebaseOntoStateDir(loaded.build.cacheDir);
+  if (loaded.media?.cache)
+    loaded.media.cache.directory = rebaseOntoStateDir(loaded.media.cache.directory);
+  if (loaded.story)
+    loaded.story.outDir = rebaseOntoStateDir(loaded.story.outDir);
+}
 let _config = null;
 const _cwdConfigCache = new Map;
 let _configPromise = null;
@@ -390,7 +403,9 @@ export async function loadStxConfig(cwd) {
       cwd: effectiveCwd,
       defaultConfig,
       verbose: !1
-    })).config, resolved = resolveStxRoot(loaded.root, loaded.pagesDir);
+    })).config;
+    applyStateDir(loaded);
+    const resolved = resolveStxRoot(loaded.root, loaded.pagesDir);
     loaded.root = resolved.root;
     loaded.pagesDir = resolved.pagesDir;
     if (loaded.root && loaded.root !== ".") {

package/dist/dev-server/crosswind.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { hasLocalConfig } from "bunfig/discovery";
+import { stateDir } from "../state-dir.js";
 import { colors } from "./terminal-colors.js";
 let crosswindModule = null, crosswindLoadAttempted = !1, cachedConfig = null, cachedCSS = "", isBuilding = !1;
 const MAX_CACHE = 256, cssByClassSet = new Map;
@@ -232,7 +233,7 @@ export async function generateCrosswindCSS(htmlContent, appDir) {
       return "";
     const resolveRoot = appDir ? path.resolve(appDir) : process.cwd();
     if (!diskCacheRoot)
-      diskCacheRoot = path.join(resolveRoot, ".stx/cache");
+      diskCacheRoot = stateDir(resolveRoot, "cache");
     const classSetKey = [...classes].sort().join(" "), cacheKey = `${configFingerprint || "default"}::${classSetKey}`, cached = cssByClassSet.get(cacheKey);
     if (cached !== void 0) {
       setLruCache(cacheKey, cached);

package/dist/dev-server/serve-app.js

@@ -11,6 +11,7 @@ import {
   stopHmrServer
 } from "../hot-reload.js";
 import { partialsCache } from "../includes.js";
+import { stateDir } from "../state-dir.js";
 import { plugin as stxPlugin } from "../plugin.js";
 import { createRouter, matchRoute, formatRoutes, findErrorPage } from "../router.js";
 import {
@@ -138,7 +139,7 @@ export async function serveApp(appDir = ".", options = {}) {
         console.warn(`${colors.yellow}Broadcasting failed to start: ${err.message}${colors.reset}`);
       }
   } catch {}
-  const outputDir = path.join(absoluteAppDir, ".stx/output");
+  const outputDir = stateDir(absoluteAppDir, "output");
   fs.mkdirSync(outputDir, { recursive: !0 });
   const builtPages = new Map, streamingRoutes = new Set, renderErrorPage = async (statusCode) => {
     const errorPagePath = findErrorPage(pagesDir, statusCode);
@@ -184,7 +185,7 @@ export async function serveApp(appDir = ".", options = {}) {
       merged.componentsDir = resolveRel(merged.componentsDir);
       merged.layoutsDir = resolveRel(merged.layoutsDir);
       merged.storesDir = resolveRel(merged.storesDir || "stores");
-      merged.cachePath = resolveRel(merged.cachePath || ".stx/cache");
+      merged.cachePath = resolveRel(merged.cachePath) ?? stateDir(absoluteAppDir, "cache");
       const isStaticBuild = !requestParams && !options.profile, cacheEnabled = merged.cache !== !1;
       if (cacheEnabled && isStaticBuild) {
         const memEntry = templateCache.get(route.filePath);
@@ -353,7 +354,7 @@ export async function serveApp(appDir = ".", options = {}) {
       if (url.pathname === "/_stx/img") {
         const { handleImageRequest } = await import("../image-optimization/serve.js"), imgResponse = await handleImageRequest(request, {
           publicDir: path.join(absoluteAppDir, publicDirName),
-          cacheDir: path.join(absoluteAppDir, ".stx/cache/img")
+          cacheDir: stateDir(absoluteAppDir, "cache", "img")
         });
         if (imgResponse)
           return imgResponse;

package/dist/dev-server/serve-file.js

@@ -10,6 +10,7 @@ import {
   stopHmrServer
 } from "../hot-reload.js";
 import { partialsCache } from "../includes.js";
+import { stateDir } from "../state-dir.js";
 import { plugin as stxPlugin } from "../plugin.js";
 import { clearComponentCache } from "../utils.js";
 import {
@@ -37,7 +38,7 @@ export async function serveStxFile(filePath, options = {}) {
     console.error(`${colors.red}Error: Unsupported file type: ${colors.bright}${absolutePath}${colors.reset}. Only .stx and .md files are supported.`);
     return !1;
   }
-  const outputDir = path.join(process.cwd(), ".stx/output");
+  const outputDir = stateDir(process.cwd(), "output");
   fs.mkdirSync(outputDir, { recursive: !0 });
   console.log(`${colors.blue}Building ${colors.bright}${filePath}${colors.reset}...`);
   let htmlContent = null;

package/dist/dev-server/serve-multi.js

@@ -5,6 +5,7 @@ import { readMarkdownFile } from "../assets.js";
 import { stxClientHelpers } from "../client-helpers.js";
 import { config } from "../config.js";
 import { partialsCache } from "../includes.js";
+import { stateDir } from "../state-dir.js";
 import { plugin as stxPlugin } from "../plugin.js";
 import { clearComponentCache } from "../utils.js";
 import {
@@ -45,7 +46,7 @@ export async function serveMultipleStxFiles(filePaths, options = {}) {
       return !1;
     }
   }
-  const outputDir = path.join(process.cwd(), ".stx/output");
+  const outputDir = stateDir(process.cwd(), "output");
   fs.mkdirSync(outputDir, { recursive: !0 });
   const commonDir = findCommonDir(filePaths.map((f) => path.dirname(path.resolve(f))));
   console.log(`${colors.blue}Processing ${colors.bright}${filePaths.length}${colors.reset} files...`);

package/dist/index.d.ts

@@ -107,6 +107,8 @@ export * from './scaffolding';
 export * from './script-classifier';
 export * from './seo';
 export * from './serve';
+// Where stx keeps its generated state (`.stx/` by default, configurable)
+export * from './state-dir';
 export * from './style-scoping';
 export * from './template-compiler';
 export * from './template-hydrator';

package/dist/index.js

@@ -63,6 +63,7 @@ export * from "./scaffolding.js";
 export * from "./script-classifier.js";
 export * from "./seo.js";
 export * from "./serve.js";
+export * from "./state-dir.js";
 export * from "./style-scoping.js";
 export * from "./template-compiler.js";
 export * from "./template-hydrator.js";