litestar-vite-plugin 0.15.0-beta.4 → 0.15.0-beta.6

package/dist/js/astro.d.ts

@@ -19,7 +19,7 @@
  *       apiProxy: 'http://localhost:8000',
  *       types: {
  *         enabled: true,
- *         output: 'src/generated/api',
+ *         output: 'src/generated',
  *       },
  *     }),
  *   ],
@@ -104,7 +104,7 @@ export interface AstroTypesConfig {
      * Path to output generated TypeScript types.
      * Relative to the Astro project root.
      *
-     * @default 'src/types/api'
+     * @default 'src/generated'
      */
     output?: string;
     /**
@@ -119,6 +119,12 @@ export interface AstroTypesConfig {
      * @default 'routes.json'
      */
     routesPath?: string;
+    /**
+     * Path where Inertia page props metadata is exported by Litestar.
+     *
+     * @default 'inertia-pages.json'
+     */
+    pagePropsPath?: string;
     /**
      * Generate Zod schemas in addition to TypeScript types.
      *
@@ -131,6 +137,24 @@ export interface AstroTypesConfig {
      * @default true
      */
     generateSdk?: boolean;
+    /**
+     * Generate typed routes.ts from routes.json metadata.
+     *
+     * @default true
+     */
+    generateRoutes?: boolean;
+    /**
+     * Generate Inertia page props types from inertia-pages.json metadata.
+     *
+     * @default true
+     */
+    generatePageProps?: boolean;
+    /**
+     * Register route() globally on window object.
+     *
+     * @default false
+     */
+    globalRoute?: boolean;
     /**
      * Debounce time in milliseconds for type regeneration.
      *
@@ -207,7 +231,7 @@ export interface LitestarAstroConfig {
  * // src/pages/users/[id].astro
  * ---
  * import type { User } from '../generated/api/types.gen';
- * import { route } from '../generated/api/routes';
+ * import { route } from '../generated/routes';
  *
  * const { id } = Astro.params;
  * const response = await fetch(route('users.show', { id }));

package/dist/js/astro.js

@@ -1,11 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
-import { createTypeGenerationPlugin } from "./shared/create-type-gen-plugin.js";
+import { readBridgeConfig } from "./shared/bridge-schema.js";
+import { createLitestarTypeGenPlugin } from "./shared/typegen-plugin.js";
 function resolveConfig(config = {}) {
-  const runtimeConfigPath = process.env.LITESTAR_VITE_CONFIG_PATH;
   let hotFile;
   let proxyMode = "vite";
   let port;
+  let pythonTypesConfig;
+  let pythonExecutor;
+  let hasPythonConfig = false;
   const envPort = process.env.VITE_PORT;
   if (envPort) {
     port = Number.parseInt(envPort, 10);
@@ -13,41 +16,61 @@ function resolveConfig(config = {}) {
       port = void 0;
     }
   }
-  if (runtimeConfigPath && fs.existsSync(runtimeConfigPath)) {
-    try {
-      const json = JSON.parse(fs.readFileSync(runtimeConfigPath, "utf-8"));
-      const bundleDir = json.bundleDir ?? "public";
-      const hot = json.hotFile ?? "hot";
-      hotFile = path.resolve(process.cwd(), bundleDir, hot);
-      proxyMode = json.proxyMode ?? "vite";
-      if (json.port !== void 0) {
-        port = json.port;
-      }
-    } catch {
-      hotFile = void 0;
+  const runtime = readBridgeConfig();
+  if (runtime) {
+    hasPythonConfig = true;
+    const hot = runtime.hotFile;
+    hotFile = path.isAbsolute(hot) ? hot : path.resolve(process.cwd(), runtime.bundleDir, hot);
+    proxyMode = runtime.proxyMode;
+    port = runtime.port;
+    pythonExecutor = runtime.executor;
+    if (runtime.types) {
+      pythonTypesConfig = runtime.types;
     }
   }
   let typesConfig = false;
   if (config.types === true) {
     typesConfig = {
       enabled: true,
-      output: "src/types/api",
-      openapiPath: "openapi.json",
-      routesPath: "routes.json",
-      generateZod: false,
-      generateSdk: true,
+      output: pythonTypesConfig?.output ?? "src/generated",
+      openapiPath: pythonTypesConfig?.openapiPath ?? "openapi.json",
+      routesPath: pythonTypesConfig?.routesPath ?? "routes.json",
+      pagePropsPath: pythonTypesConfig?.pagePropsPath ?? "inertia-pages.json",
+      generateZod: pythonTypesConfig?.generateZod ?? false,
+      generateSdk: pythonTypesConfig?.generateSdk ?? true,
+      generateRoutes: pythonTypesConfig?.generateRoutes ?? true,
+      generatePageProps: pythonTypesConfig?.generatePageProps ?? true,
+      globalRoute: pythonTypesConfig?.globalRoute ?? false,
       debounce: 300
     };
   } else if (typeof config.types === "object" && config.types !== null) {
     typesConfig = {
       enabled: config.types.enabled ?? true,
-      output: config.types.output ?? "src/types/api",
-      openapiPath: config.types.openapiPath ?? "openapi.json",
-      routesPath: config.types.routesPath ?? "routes.json",
-      generateZod: config.types.generateZod ?? false,
-      generateSdk: config.types.generateSdk ?? true,
+      output: config.types.output ?? pythonTypesConfig?.output ?? "src/generated",
+      openapiPath: config.types.openapiPath ?? pythonTypesConfig?.openapiPath ?? "openapi.json",
+      routesPath: config.types.routesPath ?? pythonTypesConfig?.routesPath ?? "routes.json",
+      pagePropsPath: config.types.pagePropsPath ?? pythonTypesConfig?.pagePropsPath ?? "inertia-pages.json",
+      generateZod: config.types.generateZod ?? pythonTypesConfig?.generateZod ?? false,
+      generateSdk: config.types.generateSdk ?? pythonTypesConfig?.generateSdk ?? true,
+      generateRoutes: config.types.generateRoutes ?? pythonTypesConfig?.generateRoutes ?? true,
+      generatePageProps: config.types.generatePageProps ?? pythonTypesConfig?.generatePageProps ?? true,
+      globalRoute: config.types.globalRoute ?? pythonTypesConfig?.globalRoute ?? false,
       debounce: config.types.debounce ?? 300
     };
+  } else if (config.types !== false && pythonTypesConfig?.enabled) {
+    typesConfig = {
+      enabled: true,
+      output: pythonTypesConfig.output ?? "src/generated",
+      openapiPath: pythonTypesConfig.openapiPath ?? "openapi.json",
+      routesPath: pythonTypesConfig.routesPath ?? "routes.json",
+      pagePropsPath: pythonTypesConfig.pagePropsPath ?? "inertia-pages.json",
+      generateZod: pythonTypesConfig.generateZod ?? false,
+      generateSdk: pythonTypesConfig.generateSdk ?? true,
+      generateRoutes: pythonTypesConfig.generateRoutes ?? true,
+      generatePageProps: pythonTypesConfig.generatePageProps ?? true,
+      globalRoute: pythonTypesConfig.globalRoute ?? false,
+      debounce: 300
+    };
   }
   return {
     apiProxy: config.apiProxy ?? "http://localhost:8000",
@@ -56,7 +79,9 @@ function resolveConfig(config = {}) {
     verbose: config.verbose ?? false,
     hotFile,
     proxyMode,
-    port
+    port,
+    executor: pythonExecutor,
+    hasPythonConfig
   };
 }
 function createProxyPlugin(config) {
@@ -106,10 +131,12 @@ function litestarAstro(userConfig = {}) {
         const plugins = [createProxyPlugin(config)];
         if (config.types !== false && config.types.enabled) {
           plugins.push(
-            createTypeGenerationPlugin(config.types, {
-              frameworkName: "litestar-astro",
+            createLitestarTypeGenPlugin(config.types, {
               pluginName: "litestar-astro-types",
-              clientPlugin: "@hey-api/client-fetch"
+              frameworkName: "litestar-astro",
+              sdkClientPlugin: "@hey-api/client-fetch",
+              executor: config.executor,
+              hasPythonConfig: config.hasPythonConfig
             })
           );
         }

package/dist/js/helpers/htmx.js

@@ -28,21 +28,48 @@
  * @module
  */
 import { getCsrfToken } from "./csrf.js";
-let debug = typeof process !== "undefined" && process.env?.NODE_ENV !== "production";
+function getHeadersFromConfigRequestEvent(evt) {
+    const detail = evt.detail;
+    if (!detail || typeof detail !== "object")
+        return null;
+    const { headers } = detail;
+    if (!headers || typeof headers !== "object")
+        return null;
+    return headers;
+}
+let debug = false;
 const cache = new Map();
 const memoStore = new WeakMap();
+const registeredHtmxInstances = new WeakSet();
+function runtime(node) {
+    let store = memoStore.get(node);
+    if (!store) {
+        store = {};
+        memoStore.set(node, store);
+    }
+    return store;
+}
 // =============================================================================
 // Registration
 // =============================================================================
 export function registerHtmxExtension() {
     if (typeof window === "undefined" || !window.htmx)
         return;
+    const htmx = window.htmx;
+    if (registeredHtmxInstances.has(htmx))
+        return;
+    registeredHtmxInstances.add(htmx);
     window.htmx.defineExtension("litestar", {
         onEvent(name, evt) {
             if (name === "htmx:configRequest") {
                 const token = getCsrfToken();
-                if (token)
-                    evt.detail.headers["X-CSRF-Token"] = token;
+                const headers = getHeadersFromConfigRequestEvent(evt);
+                if (token && headers) {
+                    if (headers instanceof Headers)
+                        headers.set("X-CSRF-Token", token);
+                    else
+                        headers["X-CSRF-Token"] = token;
+                }
             }
             return true;
         },
@@ -178,12 +205,24 @@ const directives = [
             const g = expr(a.value);
             if (!g)
                 return null;
-            let bound = false;
             return (ctx, el) => {
-                if (!bound) {
-                    bound = true;
-                    el.addEventListener(name, (e) => g({ ...ctx, $event: e }));
-                }
+                const store = runtime(el);
+                const ctxKey = `__litestar_ctx:${name}`;
+                const boundKey = `__litestar_bound:${name}`;
+                // Always keep the latest context for the handler
+                store[ctxKey] = ctx;
+                // Bind the DOM listener only once per element+event
+                if (store[boundKey])
+                    return;
+                store[boundKey] = true;
+                el.addEventListener(name, (e) => {
+                    const current = memoStore.get(el)?.[ctxKey];
+                    if (!current)
+                        return;
+                    const eventCtx = Object.create(current);
+                    eventCtx.$event = e;
+                    g(eventCtx);
+                });
             };
         },
     },
@@ -421,11 +460,7 @@ function compileTextExpr(t) {
 // Utilities
 // =============================================================================
 function memo(node, key, fn) {
-    let store = memoStore.get(node);
-    if (!store) {
-        store = {};
-        memoStore.set(node, store);
-    }
+    const store = runtime(node);
     if (!(key in store)) {
         store[key] = fn();
     }
@@ -495,5 +530,3 @@ export function addDirective(dir) {
     directives.push(dir);
 }
 // Auto-register
-if (typeof window !== "undefined" && window.htmx)
-    registerHtmxExtension();

package/dist/js/helpers/index.d.ts

@@ -20,7 +20,7 @@
  *
  * For type-safe routing, import from your generated routes file:
  * ```ts
- * import { route, routes, type RouteName } from '@/generated/routes'
+ * import { route, routeDefinitions, type RouteName } from '@/generated/routes'
  *
  * // Type-safe URL generation
  * const url = route('user_detail', { user_id: 123 })  // Compile-time checked!

package/dist/js/helpers/index.js

@@ -20,7 +20,7 @@
  *
  * For type-safe routing, import from your generated routes file:
  * ```ts
- * import { route, routes, type RouteName } from '@/generated/routes'
+ * import { route, routeDefinitions, type RouteName } from '@/generated/routes'
  *
  * // Type-safe URL generation
  * const url = route('user_detail', { user_id: 123 })  // Compile-time checked!

package/dist/js/index.d.ts

@@ -54,6 +54,22 @@ export interface TypesConfig {
      * @default false
      */
     generateSdk?: boolean;
+    /**
+     * Generate typed routes.ts from routes.json metadata.
+     *
+     * Mirrors Python TypeGenConfig.generate_routes.
+     *
+     * @default true
+     */
+    generateRoutes?: boolean;
+    /**
+     * Generate Inertia page props types from inertia-pages.json metadata.
+     *
+     * Mirrors Python TypeGenConfig.generate_page_props.
+     *
+     * @default true
+     */
+    generatePageProps?: boolean;
     /**
      * Register route() function globally on window object.
      *
@@ -91,12 +107,17 @@ export interface PluginConfig {
      */
     bundleDir?: string;
     /**
-     * Vite's public directory for static, unprocessed assets.
-     * Mirrors Vite's `publicDir` option.
+     * Directory for static, unprocessed assets.
+     *
+     * This maps to Vite's `publicDir` option, but is named `staticDir` in this
+     * plugin to avoid confusion with Litestar's `bundleDir` (often `public`).
      *
-     * @default 'public'
+     * Note: The Litestar plugin defaults this to `${resourceDir}/public` to avoid
+     * Vite's `publicDir` colliding with Litestar's `bundleDir`.
+     *
+     * @default `${resourceDir}/public`
      */
-    publicDir?: string;
+    staticDir?: string;
     /**
      * Litestar's public assets directory.  These are the assets that Vite will serve when developing.
      *
@@ -116,7 +137,7 @@ export interface PluginConfig {
     /**
      * The directory where the SSR bundle should be written.
      *
-     * @default '${bundleDir}/bootstrap/ssr'
+     * @default `${resourceDir}/bootstrap/ssr`
      */
     ssrOutDir?: string;
     /**
@@ -215,50 +236,6 @@ interface RefreshConfig {
     paths: string[];
     config?: FullReloadConfig;
 }
-/**
- * Bridge schema for `.litestar.json` - the shared configuration contract
- * between Python (Litestar) and TypeScript (Vite plugin).
- *
- * Python writes this file on startup; TypeScript reads it as defaults.
- * Field names use camelCase (JavaScript convention) and match exactly
- * between the JSON file and this TypeScript interface.
- *
- * Precedence: vite.config.ts > .litestar.json > hardcoded defaults
- */
-export interface BridgeSchema {
-    assetUrl: string;
-    bundleDir: string;
-    resourceDir: string;
-    publicDir: string;
-    hotFile: string;
-    manifest: string;
-    mode: "spa" | "inertia" | "ssr" | "hybrid";
-    proxyMode: "vite_proxy" | "vite_direct" | "external_proxy";
-    host: string;
-    port: number;
-    protocol: "http" | "https";
-    ssrEnabled: boolean;
-    ssrOutDir: string | null;
-    types: {
-        enabled: boolean;
-        output: string;
-        openapiPath: string;
-        routesPath: string;
-        pagePropsPath?: string;
-        generateZod: boolean;
-        generateSdk: boolean;
-        globalRoute: boolean;
-    } | null;
-    executor: "node" | "bun" | "deno" | "yarn" | "pnpm";
-    logging: {
-        level: "quiet" | "normal" | "verbose";
-        showPathsAbsolute: boolean;
-        suppressNpmOutput: boolean;
-        suppressViteBanner: boolean;
-        timestamps: boolean;
-    } | null;
-    litestarVersion: string;
-}
 type DevServerUrl = `${"http" | "https"}://${string}:${number}`;
 /**
  * Litestar plugin for Vite.