@reckona/mreact-router 0.0.150 → 0.0.152

package/src/tailwind-source.ts

@@ -0,0 +1,37 @@
+import { dirname, relative, sep } from "node:path";
+
+export function prependTailwindSourceDirectives(options: {
+  code: string;
+  cssFile: string;
+  sourceDirs: readonly string[];
+}): string {
+  if (!isTailwindCssEntry(options.code)) {
+    return options.code;
+  }
+
+  const cssDir = dirname(options.cssFile);
+  const directives = [...new Set(options.sourceDirs)]
+    .map((sourceDir) => `${tailwindSourceDirective(cssDir, sourceDir)}\n`)
+    .join("");
+
+  return directives.length === 0 ? options.code : `${directives}${options.code}`;
+}
+
+function isTailwindCssEntry(code: string): boolean {
+  return (
+    /@import\s+(?:url\()?["']tailwindcss(?:\/[^"']*)?["']\)?/u.test(code) ||
+    /@tailwind\s+(?:base|components|utilities)\b/u.test(code)
+  );
+}
+
+function tailwindSourceDirective(cssDir: string, sourceDir: string): string {
+  const relativeSourceDir = relative(cssDir, sourceDir).split(sep).join("/");
+  const normalizedSourceDir =
+    relativeSourceDir === ""
+      ? "."
+      : relativeSourceDir.startsWith(".")
+        ? relativeSourceDir
+        : `./${relativeSourceDir}`;
+
+  return `@source ${JSON.stringify(`${normalizedSourceDir}/**/*.{js,jsx,ts,tsx,mdx}`)};`;
+}

package/src/typed-routes.ts

@@ -6,9 +6,12 @@ export type RouteSearchParams = Record<
 
 export type RouteParamsFor<Path extends `/${string}`> = Simplify<ExtractRouteParams<Path>>;
 
-export type AppRouteHref<Path extends `/${string}`> = HasRouteParams<Path> extends true
-  ? (options: DynamicHrefOptions<Path>) => string
-  : (options?: StaticHrefOptions) => string;
+export type AppRouteHref<Path extends `/${string}`> = keyof RouteParamsFor<Path> extends never
+  ? (options?: StaticHrefOptions) => string
+  : (options: DynamicHrefOptions<Path>) => string;
+
+export type AppRouteLinkHref<Path extends `/${string}`> =
+  `${AppRouteLinkPathname<Path>}${AppRouteLinkHrefSuffix}`;
 
 export interface StaticHrefOptions {
   hash?: string | undefined;
@@ -35,6 +38,22 @@ type SegmentRouteParam<Segment extends string> = Segment extends `:...${infer Na
 
 type Simplify<T> = { [Key in keyof T]: T[Key] } & {};
 
+export type AppRouteLinkHrefSuffix = "" | `?${string}` | `#${string}` | `?${string}#${string}`;
+
+export type AppRouteLinkPathname<Path extends `/${string}`> = Path extends "/"
+  ? "/"
+  : Path extends `/${infer Segments}`
+    ? `/${AppRouteLinkSegments<Segments>}`
+    : never;
+
+export type AppRouteLinkSegments<Segments extends string> = Segments extends `${infer Segment}/${infer Rest}`
+  ? `${AppRouteLinkSegment<Segment>}/${AppRouteLinkSegments<Rest>}`
+  : AppRouteLinkSegment<Segments>;
+
+export type AppRouteLinkSegment<Segment extends string> = Segment extends `:${string}`
+  ? string
+  : Segment;
+
 export function href<const Path extends `/${string}`>(
   path: Path,
   ...args: HasRouteParams<Path> extends true

package/src/vite.ts

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import type { ServerResponse } from "node:http";
-import { dirname, relative, sep } from "node:path";
+import { dirname } from "node:path";
 import { formatDiagnostic } from "@reckona/mreact-compiler";
 import {
   createCompilerModuleContext,
@@ -49,6 +49,7 @@ import {
 import { createRouteMatcher, scanAppRoutes, type AppRoute } from "./routes.js";
 import { resolveRequestHost, type RequestHostPolicy } from "./serve.js";
 import { hasJsxSyntax } from "./source-jsx.js";
+import { prependTailwindSourceDirectives } from "./tailwind-source.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 
 export interface AppRouterViteMiddlewareOptions extends AppRouterProjectOptions {
@@ -743,49 +744,13 @@ async function loadDevCssSourceModule(options: {
 }): Promise<string | undefined> {
   const code = await readFile(options.cssFile, "utf8");
 
-  return prependDevTailwindSourceDirectives({
+  return prependTailwindSourceDirectives({
     code,
     cssFile: options.cssFile,
     sourceDirs: options.sourceDirs,
   });
 }
 
-function prependDevTailwindSourceDirectives(options: {
-  code: string;
-  cssFile: string;
-  sourceDirs: readonly string[];
-}): string {
-  if (!isTailwindCssEntry(options.code)) {
-    return options.code;
-  }
-
-  const cssDir = dirname(options.cssFile);
-  const directives = [...new Set(options.sourceDirs)]
-    .map((sourceDir) => `${devTailwindSourceDirective(cssDir, sourceDir)}\n`)
-    .join("");
-
-  return directives.length === 0 ? options.code : `${directives}${options.code}`;
-}
-
-function isTailwindCssEntry(code: string): boolean {
-  return (
-    /@import\s+(?:url\()?["']tailwindcss(?:\/[^"']*)?["']\)?/u.test(code) ||
-    /@tailwind\s+(?:base|components|utilities)\b/u.test(code)
-  );
-}
-
-function devTailwindSourceDirective(cssDir: string, sourceDir: string): string {
-  const relativeSourceDir = relative(cssDir, sourceDir).split(sep).join("/");
-  const normalizedSourceDir =
-    relativeSourceDir === ""
-      ? "."
-      : relativeSourceDir.startsWith(".")
-        ? relativeSourceDir
-        : `./${relativeSourceDir}`;
-
-  return `@source ${JSON.stringify(`${normalizedSourceDir}/**/*.{js,jsx,ts,tsx,mdx}`)};`;
-}
-
 function importerInRuntimePackage(
   importer: string | undefined,
   directories: readonly string[],