@reckona/mreact-router 0.0.207 → 0.0.209

package/src/tailwind-source.ts

@@ -14,7 +14,170 @@ export function prependTailwindSourceDirectives(options: {
     .map((sourceDir) => `${tailwindSourceDirective(cssDir, sourceDir)}\n`)
     .join("");
 
-  return directives.length === 0 ? options.code : `${directives}${options.code}`;
+  if (directives.length === 0) {
+    return options.code;
+  }
+
+  const insertionIndex = leadingCssPreludeEnd(options.code);
+  const prefix = options.code.slice(0, insertionIndex);
+  const suffix = options.code.slice(insertionIndex);
+  const lineEnding = suffix.startsWith("\r\n") ? "\r\n" : "\n";
+  const existingLineEnding = suffix.startsWith(lineEnding) ? lineEnding : "";
+  const separator = insertionIndex === 0 ? "" : existingLineEnding || lineEnding;
+  const formattedDirectives = directives.replaceAll("\n", lineEnding);
+  return `${prefix}${separator}${formattedDirectives}${suffix.slice(existingLineEnding.length)}`;
+}
+
+function leadingCssPreludeEnd(code: string): number {
+  let cursor = 0;
+  let lastRuleEnd = 0;
+
+  for (;;) {
+    cursor = skipCssTrivia(code, cursor);
+    const ruleEnd = consumeLeadingCssRule(code, cursor);
+    if (ruleEnd === undefined) {
+      return lastRuleEnd;
+    }
+
+    lastRuleEnd = ruleEnd;
+    cursor = ruleEnd;
+  }
+}
+
+function skipCssTrivia(code: string, start: number): number {
+  let cursor = start;
+  while (cursor < code.length) {
+    if (/\s/u.test(code[cursor] ?? "")) {
+      cursor += 1;
+      continue;
+    }
+
+    if (code.startsWith("/*", cursor)) {
+      const commentEnd = code.indexOf("*/", cursor + 2);
+      if (commentEnd < 0) {
+        return code.length;
+      }
+      cursor = commentEnd + 2;
+      continue;
+    }
+
+    break;
+  }
+
+  return cursor;
+}
+
+function consumeLeadingCssRule(code: string, start: number): number | undefined {
+  const match = /^@(charset|import|layer)(?=\s|[;{]|\/\*)/iu.exec(code.slice(start));
+  const ruleName = match?.[1]?.toLowerCase();
+  if (match === null || ruleName === undefined) {
+    return undefined;
+  }
+
+  let quote: '"' | "'" | undefined;
+  let parentheses = 0;
+  for (let cursor = start + match[0].length; cursor < code.length; cursor += 1) {
+    const character = code[cursor];
+    if (character === undefined) {
+      return undefined;
+    }
+
+    if (quote !== undefined) {
+      if (character === "\\") {
+        cursor += 1;
+      } else if (character === quote) {
+        quote = undefined;
+      }
+      continue;
+    }
+
+    if (code.startsWith("/*", cursor)) {
+      const commentEnd = code.indexOf("*/", cursor + 2);
+      if (commentEnd < 0) {
+        return undefined;
+      }
+      cursor = commentEnd + 1;
+      continue;
+    }
+
+    if (character === '"' || character === "'") {
+      quote = character;
+      continue;
+    }
+    if (character === "(") {
+      parentheses += 1;
+      continue;
+    }
+    if (character === ")") {
+      parentheses = Math.max(0, parentheses - 1);
+      continue;
+    }
+    if (character === ";" && parentheses === 0) {
+      return cursor + 1;
+    }
+    if (character === "{" && parentheses === 0) {
+      if (ruleName !== "layer") {
+        return undefined;
+      }
+
+      const blockEnd = consumeCssBlock(code, cursor);
+      if (blockEnd === undefined || !isCssTrivia(code.slice(cursor + 1, blockEnd - 1))) {
+        return undefined;
+      }
+      return blockEnd;
+    }
+    if (character === "}" && parentheses === 0) {
+      return undefined;
+    }
+  }
+
+  return undefined;
+}
+
+function consumeCssBlock(code: string, start: number): number | undefined {
+  let depth = 1;
+  let quote: '"' | "'" | undefined;
+  for (let cursor = start + 1; cursor < code.length; cursor += 1) {
+    const character = code[cursor];
+    if (character === undefined) {
+      return undefined;
+    }
+
+    if (quote !== undefined) {
+      if (character === "\\") {
+        cursor += 1;
+      } else if (character === quote) {
+        quote = undefined;
+      }
+      continue;
+    }
+
+    if (code.startsWith("/*", cursor)) {
+      const commentEnd = code.indexOf("*/", cursor + 2);
+      if (commentEnd < 0) {
+        return undefined;
+      }
+      cursor = commentEnd + 1;
+      continue;
+    }
+
+    if (character === '"' || character === "'") {
+      quote = character;
+    } else if (character === "{") {
+      depth += 1;
+    } else if (character === "}") {
+      depth -= 1;
+      if (depth === 0) {
+        return cursor + 1;
+      }
+    }
+  }
+
+  return undefined;
+}
+
+function isCssTrivia(value: string): boolean {
+  return skipCssTrivia(value, 0) === value.length;
 }
 
 function isTailwindCssEntry(code: string): boolean {

package/src/types.ts

@@ -62,13 +62,26 @@ export interface RouteHandlerContext<TParams extends RouteParams = RouteParams>
   request: Request;
 }
 
+/**
+ * Serializable location data passed to shared page and layout components.
+ *
+ * Server-only request data such as headers, body, credentials, and abort
+ * signals is available through loader and handler contexts instead.
+ */
+export interface RouteLocation {
+  readonly hash: string;
+  readonly pathname: string;
+  readonly search: string;
+  readonly url: string;
+}
+
 /**
  * Provides loader data, params, and request context to page components.
  */
 export interface PageProps<TData = unknown, TParams extends RouteParams = RouteParams> {
   data: TData;
   params: TParams;
-  request: Request;
+  request: RouteLocation;
 }
 
 /**
@@ -95,7 +108,7 @@ export function definePage<TLoader extends RouteLoader>(
 export interface LayoutProps<TParams extends RouteParams = RouteParams> {
   children: ReactCompatNode;
   params: TParams;
-  request: Request;
+  request: RouteLocation;
 }
 
 /**

package/src/vite.ts

@@ -24,6 +24,7 @@ import {
   type AppRouterProjectOptions,
   type ResolvedAppRouterProject,
 } from "./config.js";
+export type { AppRouterExecutionContracts } from "./config.js";
 import type { AppRouterImportPolicy } from "./import-policy.js";
 import { dehydrateOptionsFromModule } from "./dehydrate-policy.js";
 import {
@@ -237,6 +238,10 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
       "@reckona/mreact-shared/url-safety",
       packageFile("shared", "@reckona/mreact-shared", "url-safety"),
     ],
+    [
+      "@reckona/mreact-shared/server-render-value-internal",
+      packageFile("shared", "@reckona/mreact-shared", "server-render-value-internal"),
+    ],
   ]);
 
   // User-declared plugins captured from the resolving config. Unlike the fully