veryfront 0.1.173 → 0.1.174

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.173",
+    "version": "0.1.174",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "exclude": [

package/esm/src/rendering/orchestrator/html-imported-css.d.ts

@@ -0,0 +1,17 @@
+interface CssFsAdapterLike {
+    readFile(path: string): Promise<string>;
+}
+interface CssLoggerLike {
+    debug(message: string, context?: Record<string, unknown>): void;
+}
+interface MergeImportedCssOptions {
+    fs: CssFsAdapterLike;
+    logger: CssLoggerLike;
+    projectDir: string;
+    globalCSS: string | undefined;
+    cssImports: string[] | undefined;
+    stylesheetPath: string;
+}
+export declare function mergeImportedCSS({ fs, logger, projectDir, globalCSS, cssImports, stylesheetPath, }: MergeImportedCssOptions): Promise<string | undefined>;
+export {};
+//# sourceMappingURL=html-imported-css.d.ts.map

package/esm/src/rendering/orchestrator/html-imported-css.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"html-imported-css.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html-imported-css.ts"],"names":[],"mappings":"AAMA,UAAU,gBAAgB;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACzC;AAED,UAAU,aAAa;IACrB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CACjE;AAED,UAAU,uBAAuB;IAC/B,EAAE,EAAE,gBAAgB,CAAC;IACrB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,gBAAgB,CAAC,EACrC,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,EACT,UAAU,EACV,cAAc,GACf,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkDvD"}

package/esm/src/rendering/orchestrator/html-imported-css.js

@@ -0,0 +1,49 @@
+import { join } from "../../platform/compat/path/index.js";
+import { normalizeCssModuleKey, rewriteCssModuleContent, } from "../../transforms/css-modules/naming.js";
+export async function mergeImportedCSS({ fs, logger, projectDir, globalCSS, cssImports, stylesheetPath, }) {
+    if (!cssImports || cssImports.length === 0)
+        return globalCSS;
+    const normalizedStylesheetPath = stylesheetPath.replace(/^\/+/, "");
+    const configuredStylesheetAbsolute = normalizeCssModuleKey(join(projectDir, normalizedStylesheetPath));
+    const uniqueImports = new Map();
+    for (const cssPath of cssImports) {
+        const normalized = normalizeCssModuleKey(cssPath);
+        if (!uniqueImports.has(normalized)) {
+            uniqueImports.set(normalized, cssPath);
+        }
+    }
+    const sortedImports = [...uniqueImports.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+    const regularCssSegments = [];
+    const moduleCssSegments = [];
+    for (const [normalizedCssPath, cssPath] of sortedImports) {
+        if (normalizedCssPath === configuredStylesheetAbsolute) {
+            continue;
+        }
+        try {
+            const content = await fs.readFile(cssPath);
+            if (!content)
+                continue;
+            if (normalizedCssPath.endsWith(".module.css")) {
+                moduleCssSegments.push(rewriteCssModuleContent(content, normalizedCssPath));
+            }
+            else {
+                regularCssSegments.push(content);
+            }
+        }
+        catch (_) {
+            logger.debug("Could not load imported CSS file", { cssPath });
+        }
+    }
+    if (regularCssSegments.length === 0 && moduleCssSegments.length === 0)
+        return globalCSS;
+    const combined = [globalCSS, ...regularCssSegments, ...moduleCssSegments]
+        .filter(Boolean)
+        .join("\n");
+    logger.debug("Merged imported CSS with global stylesheet", {
+        importedCount: regularCssSegments.length + moduleCssSegments.length,
+        regularCount: regularCssSegments.length,
+        moduleCount: moduleCssSegments.length,
+        totalLength: combined.length,
+    });
+    return combined;
+}

package/esm/src/rendering/orchestrator/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,SAAS,EAET,UAAU,EACX,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAgFhD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,2FAA2F;IAC3F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAqEZ,sBAAsB;YAqDtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAgF9B;;;;OAIG;YACW,gBAAgB;CA0D/B"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,SAAS,EAET,UAAU,EACX,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA6EhD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,2FAA2F;IAC3F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAqEZ,sBAAsB;YAqDtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAgF9B;;;;OAIG;YACW,gBAAgB;CAc/B"}

package/esm/src/rendering/orchestrator/html.js

@@ -9,9 +9,9 @@ import { extractRelativePath } from "../../utils/route-path-utils.js";
 import { resolveAppComponentPath } from "../layouts/utils/app-resolver.js";
 import { StreamTimeoutError, streamToString } from "../utils/stream-utils.js";
 import { profilePhase, profileSyncPhase } from "../../observability/request-profiler.js";
-import { normalizeCssModuleKey, rewriteCssModuleContent, } from "../../transforms/css-modules/naming.js";
 import { extractProjectClassesForRoute, startPreparedCSSWarmup, startProjectCSSPreparation, } from "./html-project-css.js";
 import { buildHeadElements as buildCollectedHeadElements, mergeFrontmatter as mergeCollectedFrontmatter, } from "./html-head.js";
+import { mergeImportedCSS as mergeImportedProjectCss } from "./html-imported-css.js";
 const logger = rendererLogger.component("html-generator");
 function applyExplicitThemeToDocument(html, colorScheme, enabled) {
     if (!enabled || !colorScheme)
@@ -297,53 +297,13 @@ export class HTMLGenerator {
      * double-loading globals.css when it's both auto-discovered and explicitly imported.
      */
     async mergeImportedCSS(globalCSS, cssImports, stylesheetPath) {
-        if (!cssImports || cssImports.length === 0)
-            return globalCSS;
-        const normalizedStylesheetPath = stylesheetPath.replace(/^\/+/, "");
-        const configuredStylesheetAbsolute = normalizeCssModuleKey(join(this.config.projectDir, normalizedStylesheetPath));
-        const uniqueImports = new Map();
-        for (const cssPath of cssImports) {
-            const normalized = normalizeCssModuleKey(cssPath);
-            if (!uniqueImports.has(normalized)) {
-                uniqueImports.set(normalized, cssPath);
-            }
-        }
-        const sortedImports = [...uniqueImports.entries()].sort((a, b) => a[0].localeCompare(b[0]));
-        const regularCssSegments = [];
-        const moduleCssSegments = [];
-        for (const [normalizedCssPath, cssPath] of sortedImports) {
-            // Deduplicate only exact path matches to avoid skipping unrelated files
-            // like /styles/globals.css when the configured stylesheet is /globals.css.
-            if (normalizedCssPath === configuredStylesheetAbsolute) {
-                continue;
-            }
-            try {
-                const content = await this.config.adapter.fs.readFile(cssPath);
-                if (!content)
-                    continue;
-                if (normalizedCssPath.endsWith(".module.css")) {
-                    moduleCssSegments.push(rewriteCssModuleContent(content, normalizedCssPath));
-                }
-                else {
-                    regularCssSegments.push(content);
-                }
-            }
-            catch (_) {
-                /* expected: imported CSS file may not exist */
-                logger.debug("Could not load imported CSS file", { cssPath });
-            }
-        }
-        if (regularCssSegments.length === 0 && moduleCssSegments.length === 0)
-            return globalCSS;
-        const combined = [globalCSS, ...regularCssSegments, ...moduleCssSegments]
-            .filter(Boolean)
-            .join("\n");
-        logger.debug("Merged imported CSS with global stylesheet", {
-            importedCount: regularCssSegments.length + moduleCssSegments.length,
-            regularCount: regularCssSegments.length,
-            moduleCount: moduleCssSegments.length,
-            totalLength: combined.length,
+        return mergeImportedProjectCss({
+            fs: this.config.adapter.fs,
+            logger,
+            projectDir: this.config.projectDir,
+            globalCSS,
+            cssImports,
+            stylesheetPath,
         });
-        return combined;
     }
 }

package/esm/src/utils/version-constant.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.173";
+export declare const VERSION = "0.1.174";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.173";
+export const VERSION = "0.1.174";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.173",
+  "version": "0.1.174",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.173",
+  "version": "0.1.174",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "exclude": [

package/src/src/rendering/orchestrator/html-imported-css.ts

@@ -0,0 +1,81 @@
+import { join } from "../../platform/compat/path/index.js";
+import {
+  normalizeCssModuleKey,
+  rewriteCssModuleContent,
+} from "../../transforms/css-modules/naming.js";
+
+interface CssFsAdapterLike {
+  readFile(path: string): Promise<string>;
+}
+
+interface CssLoggerLike {
+  debug(message: string, context?: Record<string, unknown>): void;
+}
+
+interface MergeImportedCssOptions {
+  fs: CssFsAdapterLike;
+  logger: CssLoggerLike;
+  projectDir: string;
+  globalCSS: string | undefined;
+  cssImports: string[] | undefined;
+  stylesheetPath: string;
+}
+
+export async function mergeImportedCSS({
+  fs,
+  logger,
+  projectDir,
+  globalCSS,
+  cssImports,
+  stylesheetPath,
+}: MergeImportedCssOptions): Promise<string | undefined> {
+  if (!cssImports || cssImports.length === 0) return globalCSS;
+
+  const normalizedStylesheetPath = stylesheetPath.replace(/^\/+/, "");
+  const configuredStylesheetAbsolute = normalizeCssModuleKey(
+    join(projectDir, normalizedStylesheetPath),
+  );
+  const uniqueImports = new Map<string, string>();
+  for (const cssPath of cssImports) {
+    const normalized = normalizeCssModuleKey(cssPath);
+    if (!uniqueImports.has(normalized)) {
+      uniqueImports.set(normalized, cssPath);
+    }
+  }
+
+  const sortedImports = [...uniqueImports.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+  const regularCssSegments: string[] = [];
+  const moduleCssSegments: string[] = [];
+
+  for (const [normalizedCssPath, cssPath] of sortedImports) {
+    if (normalizedCssPath === configuredStylesheetAbsolute) {
+      continue;
+    }
+
+    try {
+      const content = await fs.readFile(cssPath);
+      if (!content) continue;
+
+      if (normalizedCssPath.endsWith(".module.css")) {
+        moduleCssSegments.push(rewriteCssModuleContent(content, normalizedCssPath));
+      } else {
+        regularCssSegments.push(content);
+      }
+    } catch (_) {
+      logger.debug("Could not load imported CSS file", { cssPath });
+    }
+  }
+
+  if (regularCssSegments.length === 0 && moduleCssSegments.length === 0) return globalCSS;
+
+  const combined = [globalCSS, ...regularCssSegments, ...moduleCssSegments]
+    .filter(Boolean)
+    .join("\n");
+  logger.debug("Merged imported CSS with global stylesheet", {
+    importedCount: regularCssSegments.length + moduleCssSegments.length,
+    regularCount: regularCssSegments.length,
+    moduleCount: moduleCssSegments.length,
+    totalLength: combined.length,
+  });
+  return combined;
+}

package/src/src/rendering/orchestrator/html.ts

@@ -27,10 +27,6 @@ import { extractRelativePath } from "../../utils/route-path-utils.js";
 import { resolveAppComponentPath } from "../layouts/utils/app-resolver.js";
 import { StreamTimeoutError, streamToString } from "../utils/stream-utils.js";
 import { profilePhase, profileSyncPhase } from "../../observability/request-profiler.js";
-import {
-  normalizeCssModuleKey,
-  rewriteCssModuleContent,
-} from "../../transforms/css-modules/naming.js";
 import {
   extractProjectClassesForRoute,
   type ProjectCSSResult,
@@ -41,6 +37,7 @@ import {
   buildHeadElements as buildCollectedHeadElements,
   mergeFrontmatter as mergeCollectedFrontmatter,
 } from "./html-head.js";
+import { mergeImportedCSS as mergeImportedProjectCss } from "./html-imported-css.js";
 
 const logger = rendererLogger.component("html-generator");
 
@@ -508,57 +505,13 @@ export class HTMLGenerator {
     cssImports: string[] | undefined,
     stylesheetPath: string,
   ): Promise<string | undefined> {
-    if (!cssImports || cssImports.length === 0) return globalCSS;
-
-    const normalizedStylesheetPath = stylesheetPath.replace(/^\/+/, "");
-    const configuredStylesheetAbsolute = normalizeCssModuleKey(
-      join(this.config.projectDir, normalizedStylesheetPath),
-    );
-    const uniqueImports = new Map<string, string>();
-    for (const cssPath of cssImports) {
-      const normalized = normalizeCssModuleKey(cssPath);
-      if (!uniqueImports.has(normalized)) {
-        uniqueImports.set(normalized, cssPath);
-      }
-    }
-
-    const sortedImports = [...uniqueImports.entries()].sort((a, b) => a[0].localeCompare(b[0]));
-    const regularCssSegments: string[] = [];
-    const moduleCssSegments: string[] = [];
-
-    for (const [normalizedCssPath, cssPath] of sortedImports) {
-      // Deduplicate only exact path matches to avoid skipping unrelated files
-      // like /styles/globals.css when the configured stylesheet is /globals.css.
-      if (normalizedCssPath === configuredStylesheetAbsolute) {
-        continue;
-      }
-
-      try {
-        const content = await this.config.adapter.fs.readFile(cssPath);
-        if (!content) continue;
-
-        if (normalizedCssPath.endsWith(".module.css")) {
-          moduleCssSegments.push(rewriteCssModuleContent(content, normalizedCssPath));
-        } else {
-          regularCssSegments.push(content);
-        }
-      } catch (_) {
-        /* expected: imported CSS file may not exist */
-        logger.debug("Could not load imported CSS file", { cssPath });
-      }
-    }
-
-    if (regularCssSegments.length === 0 && moduleCssSegments.length === 0) return globalCSS;
-
-    const combined = [globalCSS, ...regularCssSegments, ...moduleCssSegments]
-      .filter(Boolean)
-      .join("\n");
-    logger.debug("Merged imported CSS with global stylesheet", {
-      importedCount: regularCssSegments.length + moduleCssSegments.length,
-      regularCount: regularCssSegments.length,
-      moduleCount: moduleCssSegments.length,
-      totalLength: combined.length,
+    return mergeImportedProjectCss({
+      fs: this.config.adapter.fs,
+      logger,
+      projectDir: this.config.projectDir,
+      globalCSS,
+      cssImports,
+      stylesheetPath,
     });
-    return combined;
   }
 }

package/src/src/utils/version-constant.ts

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.173";
+export const VERSION = "0.1.174";