@adonisjs/inertia 4.0.0-next.2 → 4.0.0-next.4

package/build/{chunk-PDP56GPP.js → chunk-PJU4O2LR.js}

@@ -13,11 +13,8 @@ type ExtractProps<T> = Omit<
 >`,
   react: `import type React from 'react'
 
-type ExtractProps<T> = T extends React.FC<infer Props>
-? Props
-: T extends React.Component<infer Props>
-? Props
-: never`
+type ExtractProps<T> =
+  T extends React.FC<infer Props> ? Props : T extends React.Component<infer Props> ? Props : never`
 };
 var indexPages = function(config) {
   if (!SUPPORTED_FRAMEWORKS.includes(config.framework)) {
@@ -26,14 +23,29 @@ var indexPages = function(config) {
     );
   }
   return {
+    /**
+     * Executes the page indexing process to generate TypeScript definitions.
+     *
+     * @param _ - Unused first parameter (assembler context)
+     * @param indexGenerator - The index generator instance used to register the pages type generation
+     */
     run(_, indexGenerator) {
       indexGenerator.add("inertiaPages", {
         source: "inertia/pages",
         glob: GLOB[config.framework],
         output: ".adonisjs/server/pages.d.ts",
+        /**
+         * Generates the TypeScript module declaration for Inertia pages.
+         *
+         * @param vfs - Virtual file system containing the scanned page files
+         * @param buffer - Buffer instance for writing the generated TypeScript code
+         * @param __ - Unused third parameter
+         * @param helpers - Helper utilities for path manipulation and imports
+         */
         as(vfs, buffer, __, helpers) {
           const filesList = vfs.asList();
-          buffer.write(TYPES_EXTRACTION_HELPER[config.framework]);
+          buffer.writeLine(`import '@adonisjs/inertia/types'`);
+          buffer.writeLine(TYPES_EXTRACTION_HELPER[config.framework]);
           buffer.write(`declare module '@adonisjs/inertia/types' {`).indent();
           buffer.write(`export interface InertiaPages {`).indent();
           Object.keys(filesList).forEach((key) => {

package/build/{chunk-GO6QSFRS.js → chunk-XFUDVODO.js}

@@ -1,9 +1,9 @@
-import {
-  debug_default
-} from "./chunk-4EZ2J6OA.js";
 import {
   InertiaHeaders
 } from "./chunk-DISC5OYC.js";
+import {
+  debug_default
+} from "./chunk-4EZ2J6OA.js";
 import {
   __export
 } from "./chunk-MLKGABMK.js";
@@ -79,10 +79,10 @@ function isAlwaysProp(propValue) {
 function isOptionalProp(propValue) {
   return OPTIONAL_PROP in propValue;
 }
-async function unpackPropValue(value) {
-  return serialize(value);
+async function unpackPropValue(value, containerResolver) {
+  return serialize(value, containerResolver);
 }
-async function buildStandardVisitProps(pageProps) {
+async function buildStandardVisitProps(pageProps, containerResolver) {
   const mergeProps = [];
   const deepMergeProps = [];
   const newProps = {};
@@ -141,11 +141,11 @@ async function buildStandardVisitProps(pageProps) {
   await Promise.all(
     unpackedValues.map(async ({ key, value }) => {
       if (typeof value === "function") {
-        return Promise.resolve(value()).then((r) => unpackPropValue(r)).then((jsonValue) => {
+        return Promise.resolve(value()).then((r) => unpackPropValue(r, containerResolver)).then((jsonValue) => {
           newProps[key] = jsonValue;
         });
       } else {
-        return unpackPropValue(value).then((jsonValue) => {
+        return unpackPropValue(value, containerResolver).then((jsonValue) => {
           newProps[key] = jsonValue;
         });
       }
@@ -158,7 +158,7 @@ async function buildStandardVisitProps(pageProps) {
     deferredProps
   };
 }
-async function buildPartialRequestProps(pageProps, cherryPickProps) {
+async function buildPartialRequestProps(pageProps, cherryPickProps, containerResolver) {
   const mergeProps = [];
   const deepMergeProps = [];
   const newProps = {};
@@ -208,11 +208,11 @@ async function buildPartialRequestProps(pageProps, cherryPickProps) {
   await Promise.all(
     unpackedValues.map(async ({ key, value }) => {
       if (typeof value === "function") {
-        return Promise.resolve(value()).then((r) => unpackPropValue(r)).then((jsonValue) => {
+        return Promise.resolve(value()).then((r) => unpackPropValue(r, containerResolver)).then((jsonValue) => {
           newProps[key] = jsonValue;
         });
       } else {
-        return unpackPropValue(value).then((jsonValue) => {
+        return unpackPropValue(value, containerResolver).then((jsonValue) => {
           newProps[key] = jsonValue;
         });
       }
@@ -367,10 +367,10 @@ var Inertia = class {
       });
       debug_default("building props for a partial reload %O", requestInfo);
       debug_default("cherry picking props %s", cherryPickProps);
-      return buildPartialRequestProps(finalProps, cherryPickProps);
+      return buildPartialRequestProps(finalProps, cherryPickProps, this.ctx.containerResolver);
     }
     debug_default("building props for a standard visit %O", requestInfo);
-    return buildStandardVisitProps(finalProps);
+    return buildStandardVisitProps(finalProps, this.ctx.containerResolver);
   }
   /**
    * Handle Inertia request by setting headers and returning page object
@@ -447,7 +447,7 @@ var Inertia = class {
       return this.#cachedVersion;
     }
     if (this.#vite?.hasManifestFile) {
-      this.#cachedVersion = createHash("md5").update(JSON.stringify(this.#vite.manifest)).digest("hex");
+      this.#cachedVersion = createHash("md5").update(JSON.stringify(this.#vite.manifest())).digest("hex");
     } else {
       this.#cachedVersion = "1";
     }

package/build/factories/main.js

@@ -1,14 +1,14 @@
 import {
   defineConfig
-} from "../chunk-PDP56GPP.js";
+} from "../chunk-PJU4O2LR.js";
 import {
   Inertia,
   ServerRenderer
-} from "../chunk-GO6QSFRS.js";
-import "../chunk-4EZ2J6OA.js";
+} from "../chunk-XFUDVODO.js";
 import {
   InertiaHeaders
 } from "../chunk-DISC5OYC.js";
+import "../chunk-4EZ2J6OA.js";
 import "../chunk-MLKGABMK.js";
 
 // factories/inertia_factory.ts

package/build/index.js

@@ -1,17 +1,17 @@
 import {
   defineConfig,
   indexPages
-} from "./chunk-PDP56GPP.js";
+} from "./chunk-PJU4O2LR.js";
 import {
   Inertia,
   InertiaManager,
   ServerRenderer,
   symbols_exports
-} from "./chunk-GO6QSFRS.js";
-import "./chunk-4EZ2J6OA.js";
+} from "./chunk-XFUDVODO.js";
 import {
   InertiaHeaders
 } from "./chunk-DISC5OYC.js";
+import "./chunk-4EZ2J6OA.js";
 import "./chunk-MLKGABMK.js";
 export {
   Inertia,

package/build/providers/inertia_provider.js

@@ -1,8 +1,8 @@
 import {
   InertiaManager
-} from "../chunk-GO6QSFRS.js";
-import "../chunk-4EZ2J6OA.js";
+} from "../chunk-XFUDVODO.js";
 import "../chunk-DISC5OYC.js";
+import "../chunk-4EZ2J6OA.js";
 import "../chunk-MLKGABMK.js";
 
 // providers/inertia_provider.ts

package/build/src/client/helpers.d.ts

@@ -22,4 +22,4 @@
  *
  * @throws {Error} When none of the provided paths can be resolved in the pages registry
  */
-export declare function resolvePageComponent<T>(path: string | string[], pages: Record<string, Promise<T> | (() => Promise<T>)>): Promise<T>;
+export declare function resolvePageComponent<T>(path: string | string[], pages: Record<string, Promise<T> | (() => Promise<T>) | T>): Promise<T>;

package/build/src/index_pages.d.ts

@@ -1,5 +1,29 @@
+/**
+ * Creates an AdonisJS assembler hook to automatically generate TypeScript definitions
+ * for Inertia.js pages based on the specified framework.
+ *
+ * This function scans page components in the 'inertia/pages' directory and generates
+ * type definitions that map page names to their component props.
+ *
+ * @param config - Configuration object specifying the frontend framework
+ * @param config.framework - The frontend framework ('vue3' or 'react')
+ *
+ * @example
+ * // In your adonisrc.ts file
+ * export default defineConfig({
+ *   assembler: {
+ *     onBuildStarting: [indexPages({ framework: 'vue3' })]
+ *   }
+ * })
+ */
 export declare const indexPages: (config: {
     framework: "vue3" | "react";
 }) => {
+    /**
+     * Executes the page indexing process to generate TypeScript definitions.
+     *
+     * @param _ - Unused first parameter (assembler context)
+     * @param indexGenerator - The index generator instance used to register the pages type generation
+     */
     run(_: import("@adonisjs/assembler").DevServer | import("@adonisjs/assembler").TestRunner | import("@adonisjs/assembler").Bundler, indexGenerator: import("@adonisjs/assembler/index_generator").IndexGenerator): void;
 };

package/build/src/inertia.d.ts

@@ -23,7 +23,7 @@ import { defer, merge, always, optional, deepMerge } from './props.ts';
  * inertia.location('/dashboard')
  * ```
  */
-export declare class Inertia<Pages extends Record<string, ComponentProps>> {
+export declare class Inertia<Pages> {
     #private;
     protected ctx: HttpContext;
     protected config: InertiaConfig;
@@ -175,7 +175,7 @@ export declare class Inertia<Pages extends Record<string, ComponentProps>> {
      * })
      * ```
      */
-    page<Page extends keyof Pages & string>(page: Page, pageProps: AsPageProps<Pages[Page]>): Promise<PageObject<Pages[Page]>>;
+    page<Page extends keyof Pages & string>(page: Page, pageProps: Pages[Page] extends ComponentProps ? AsPageProps<Pages[Page]> : never): Promise<PageObject<Pages[Page]>>;
     /**
      * Render a page using Inertia
      *
@@ -202,7 +202,7 @@ export declare class Inertia<Pages extends Record<string, ComponentProps>> {
      * const html = await inertia.render('Home', { welcome: 'Hello World' })
      * ```
      */
-    render<Page extends keyof Pages & string>(page: Page, pageProps: AsPageProps<Pages[Page]>, viewProps?: Record<string, any>): Promise<string | PageObject<Pages[Page]>>;
+    render<Page extends keyof Pages & string>(page: Page, pageProps: Pages[Page] extends ComponentProps ? AsPageProps<Pages[Page]> : never, viewProps?: Record<string, any>): Promise<string | PageObject<Pages[Page]>>;
     /**
      * Clear the browser history on the next navigation
      *

package/build/src/inertia_middleware.d.ts

@@ -1,9 +1,9 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import { type Inertia } from './inertia.js';
-import type { ComponentProps, InertiaPages, PageProps } from './types.js';
+import type { InertiaPages, PageProps } from './types.js';
 declare module '@adonisjs/core/http' {
     interface HttpContext {
-        inertia: Inertia<InertiaPages extends Record<string, ComponentProps> ? InertiaPages : never>;
+        inertia: Inertia<InertiaPages>;
     }
 }
 /**

package/build/src/inertia_middleware.js

@@ -1,12 +1,12 @@
 import {
   InertiaManager
-} from "../chunk-GO6QSFRS.js";
-import {
-  debug_default
-} from "../chunk-4EZ2J6OA.js";
+} from "../chunk-XFUDVODO.js";
 import {
   InertiaHeaders
 } from "../chunk-DISC5OYC.js";
+import {
+  debug_default
+} from "../chunk-4EZ2J6OA.js";
 import "../chunk-MLKGABMK.js";
 
 // src/inertia_middleware.ts

package/build/src/props.d.ts

@@ -1,5 +1,6 @@
 import { type AsyncOrSync } from '@poppinss/utils/types';
 import { type DeferProp, type PageProps, type AlwaysProp, type OptionalProp, type MergeableProp, type ComponentProps, type UnPackedPageProps } from './types.ts';
+import { type ContainerResolver } from '@adonisjs/core/container';
 /**
  * Creates a deferred prop that is never included in standard visits but must be shared with
  * the client during standard visits. Can be explicitly requested and supports merging.
@@ -230,7 +231,7 @@ export declare function isOptionalProp<T extends UnPackedPageProps>(propValue: O
  * // Returns: { props: { user: {...} }, deferredProps: { default: ['posts'] }, mergeProps: ['settings'] }
  * ```
  */
-export declare function buildStandardVisitProps(pageProps: PageProps): Promise<{
+export declare function buildStandardVisitProps(pageProps: PageProps, containerResolver: ContainerResolver<any>): Promise<{
     props: ComponentProps;
     mergeProps: string[];
     deepMergeProps: string[];
@@ -261,7 +262,7 @@ export declare function buildStandardVisitProps(pageProps: PageProps): Promise<{
  * // Returns: { props: { posts: [...], stats: [...] }, mergeProps: [], deferredProps: {} }
  * ```
  */
-export declare function buildPartialRequestProps(pageProps: PageProps, cherryPickProps: string[]): Promise<{
+export declare function buildPartialRequestProps(pageProps: PageProps, cherryPickProps: string[], containerResolver: ContainerResolver<any>): Promise<{
     props: ComponentProps;
     mergeProps: string[];
     deepMergeProps: string[];

package/build/src/server_renderer.d.ts

@@ -47,7 +47,7 @@ export declare class ServerRenderer {
      * const { head, body } = await renderer.render(pageObject)
      * ```
      */
-    render(pageObject: PageObject): Promise<{
+    render(pageObject: PageObject<any>): Promise<{
         head: string[];
         body: string;
     }>;

package/build/src/types.d.ts

@@ -290,7 +290,7 @@ export type InertiaConfigInput = DeepPartial<InertiaConfig>;
  *
  * @template Props - The props type for the page component
  */
-export type PageObject<Props extends PageProps = PageProps> = {
+export type PageObject<Props> = {
     /**
      * The name/path of the component to render
      */
@@ -373,7 +373,7 @@ export interface InertiaPages {
  * @param page - The page object containing component and props data
  * @returns Promise resolving to an object with head tags and body HTML
  */
-export type RenderInertiaSsrApp = (page: PageObject) => Promise<{
+export type RenderInertiaSsrApp = (page: PageObject<any>) => Promise<{
     head: string[];
     body: string;
 }>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/inertia",
   "description": "Official Inertia.js adapter for AdonisJS",
-  "version": "4.0.0-next.2",
+  "version": "4.0.0-next.4",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@adonisjs/assembler": "^8.0.0-next.9",
     "@adonisjs/core": "^7.0.0-next.1",
-    "@adonisjs/eslint-config": "^3.0.0-next.1",
+    "@adonisjs/eslint-config": "^3.0.0-next.4",
     "@adonisjs/prettier-config": "^1.4.5",
     "@adonisjs/session": "^8.0.0-next.0",
     "@adonisjs/tsconfig": "^2.0.0-next.0",
@@ -58,21 +58,21 @@
     "@japa/snapshot": "^2.0.9",
     "@poppinss/ts-exec": "^1.4.1",
     "@release-it/conventional-changelog": "^10.0.1",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.6.0",
     "@types/supertest": "^6.0.3",
     "c8": "^10.1.3",
     "copyfiles": "^2.4.1",
-    "cross-env": "^10.0.0",
-    "del-cli": "^6.0.0",
+    "cross-env": "^10.1.0",
+    "del-cli": "^7.0.0",
     "edge.js": "^6.3.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.36.0",
     "get-port": "^7.1.0",
     "prettier": "^3.6.2",
-    "release-it": "^19.0.4",
+    "release-it": "^19.0.5",
     "supertest": "^7.1.4",
     "tsup": "^8.5.0",
     "typescript": "~5.9.2",
-    "vite": "^7.1.5"
+    "vite": "^7.1.7"
   },
   "dependencies": {
     "@poppinss/utils": "^7.0.0-next.3",