@inertiajs/core 3.0.0-beta.2 → 3.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inertiajs/core",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "license": "MIT",
   "description": "A framework for creating server-driven single page apps.",
   "contributors": [
@@ -50,9 +50,8 @@
   },
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@types/lodash-es": "^4.17.12",
-    "laravel-precognition": "2.0.0-beta.3",
-    "lodash-es": "^4.17.23"
+    "es-toolkit": "^1.33.0",
+    "laravel-precognition": "2.0.0-beta.5"
   },
   "peerDependencies": {
     "axios": "^1.13.2"
@@ -78,7 +77,7 @@
     "dev": "pnpx concurrently -c \"#ffcf00,#3178c6\" \"pnpm dev:build\" \"pnpm dev:types\" --names build,types",
     "dev:build": "./build.js --watch",
     "dev:types": "tsc --watch --preserveWatchOutput",
-    "es2020-check": "pnpm build:with-deps && es-check es2020 \"dist/index.js\" --checkFeatures --module --noCache --verbose",
+    "es2022-check": "pnpm build:with-deps && es-check es2022 \"dist/index.js\" --checkFeatures --module --noCache --verbose",
     "test": "vitest run"
   }
 }

package/types/index.d.ts

@@ -11,7 +11,7 @@ export { default as createHeadManager } from './head';
 export { http } from './http';
 export { HttpCancelledError, HttpNetworkError, HttpResponseError } from './httpErrors';
 export { default as useInfiniteScroll } from './infiniteScroll';
-export { createLayoutPropsStore, mergeLayoutProps, normalizeLayouts, type LayoutDefinition, type LayoutPropsStore, } from './layout';
+export { createLayoutPropsStore, normalizeLayouts, type LayoutDefinition, type LayoutPropsStore } from './layout';
 export { shouldIntercept, shouldNavigate } from './navigationEvents';
 export { progress, default as setupProgress } from './progress';
 export { FormComponentResetSymbol, resetFormFields } from './resetFormFields';

package/types/layout.d.ts

@@ -1,11 +1,12 @@
+import type { LayoutProps, NamedLayoutProps } from './types';
 export interface LayoutDefinition<Component> {
     component: Component;
     props: Record<string, unknown>;
     name?: string;
 }
 export interface LayoutPropsStore {
-    set(props: Record<string, unknown>): void;
-    setFor(name: string, props: Record<string, unknown>): void;
+    set(props: Partial<LayoutProps>): void;
+    setFor<K extends keyof NamedLayoutProps>(name: K, props: Partial<NamedLayoutProps[K]>): void;
     get(): {
         shared: Record<string, unknown>;
         named: Record<string, Record<string, unknown>>;
@@ -14,22 +15,6 @@ export interface LayoutPropsStore {
     subscribe(callback: () => void): () => void;
 }
 export declare function createLayoutPropsStore(): LayoutPropsStore;
-/**
- * Merges layout props from three sources with priority: dynamic > static > defaults.
- * Only keys present in `defaults` are included in the result.
- *
- * @example
- * ```ts
- * mergeLayoutProps(
- *   { title: 'Default', showSidebar: true },  // defaults declared in useLayoutProps()
- *   { title: 'My Page', color: 'blue' },       // static props from layout definition
- *   { showSidebar: false, fontSize: 16 },       // dynamic props from setLayoutProps()
- * )
- * // => { title: 'My Page', showSidebar: false }
- * // 'color' and 'fontSize' are excluded because they're not declared in defaults
- * ```
- */
-export declare function mergeLayoutProps<T extends Record<string, unknown>>(defaults: T, staticProps: Record<string, unknown>, dynamicProps: Record<string, unknown>): T;
 type ComponentCheck<T> = (value: unknown) => value is T;
 /**
  * Normalizes layout definitions into a consistent structure.

package/types/page.d.ts

@@ -13,6 +13,12 @@ declare class CurrentPage {
     protected cleared: boolean;
     protected pendingDeferredProps: Pick<Page, 'deferredProps' | 'url' | 'component'> | null;
     protected historyQuotaExceeded: boolean;
+    protected optimisticBaseline: Partial<Page['props']>;
+    protected pendingOptimistics: {
+        id: number;
+        callback: (props: Page['props']) => Partial<Page['props']> | void;
+    }[];
+    protected optimisticCounter: number;
     init<ComponentType = Component>({ initialPage, swapComponent, resolveComponent, onFlash, }: RouterInitParams<ComponentType>): this;
     set(page: Page, { replace, preserveScroll, preserveState, viewTransition, }?: {
         replace?: boolean;
@@ -40,8 +46,15 @@ declare class CurrentPage {
         viewTransition: Visit['viewTransition'];
     }): Promise<unknown>;
     resolve(component: string, page?: Page): Promise<Component>;
-    recordOptimisticUpdate(keys: string[], updatedAt: number): void;
-    shouldPreserveOptimistic(key: string, updatedAt: number): boolean;
+    nextOptimisticId(): number;
+    setBaseline(key: string, value: unknown): void;
+    updateBaseline(key: string, value: unknown): void;
+    hasBaseline(key: string): boolean;
+    registerOptimistic(id: number, callback: (props: Page['props']) => Partial<Page['props']> | void): void;
+    unregisterOptimistic(id: number): void;
+    replayOptimistics(): Partial<Page['props']>;
+    pendingOptimisticCount(): number;
+    clearOptimisticState(): void;
     isTheSame(page: Page): boolean;
     on(event: PageEvent, callback: VoidFunction): VoidFunction;
     fireEventsFor(event: PageEvent): void;

package/types/types.d.ts

@@ -40,6 +40,8 @@ export type DefaultInertiaConfig = {
     errorValueType: string;
     flashDataType: PageFlashData;
     sharedPageProps: PageProps;
+    layoutProps: Record<string, unknown>;
+    namedLayoutProps: Record<string, Record<string, unknown>>;
 };
 /**
  * Designed to allow overriding of some core types using TypeScript
@@ -48,6 +50,9 @@ export type DefaultInertiaConfig = {
  * @see {@link DefaultInertiaConfig} for keys to override
  * @example
  * ```ts
+ * // global.d.ts
+ * import '@inertiajs/core'
+ *
  * declare module '@inertiajs/core' {
  *   export interface InertiaConfig {
  *     errorValueType: string[]
@@ -57,6 +62,14 @@ export type DefaultInertiaConfig = {
  *     sharedPageProps: {
  *       auth: { user: User | null }
  *     }
+ *     layoutProps: {
+ *       title: string
+ *       showSidebar: boolean
+ *     }
+ *     namedLayoutProps: {
+ *       app: { title: string; theme: string }
+ *       content: { padding: string; maxWidth: string }
+ *     }
  *   }
  * }
  * ```
@@ -67,6 +80,8 @@ export type InertiaConfigFor<Key extends keyof DefaultInertiaConfig> = Key exten
 export type ErrorValue = InertiaConfigFor<'errorValueType'>;
 export type FlashData = InertiaConfigFor<'flashDataType'>;
 export type SharedPageProps = InertiaConfigFor<'sharedPageProps'>;
+export type LayoutProps = InertiaConfigFor<'layoutProps'>;
+export type NamedLayoutProps = InertiaConfigFor<'namedLayoutProps'>;
 export type Errors = Record<string, ErrorValue>;
 export type ErrorBag = Record<string, Errors>;
 export type FormDataConvertibleValue = Blob | FormDataEntryValue | Date | boolean | number | null | undefined;
@@ -159,9 +174,9 @@ export interface ClientSideVisitOptions<TProps = Page['props']> {
     onError?: (errors: Errors) => void;
     onFinish?: (visit: ClientSideVisitOptions<TProps>) => void;
     onFlash?: (flash: FlashData) => void;
-    onSuccess?: (page: Page) => void;
+    onSuccess?: (page: Page<SharedPageProps>) => void;
 }
-export type PageResolver = (name: string, page?: Page) => Component;
+export type PageResolver = (name: string, page?: Page<SharedPageProps>) => Component;
 export type PageHandler<ComponentType = Component> = ({ component, page, preserveState, }: {
     component: ComponentType;
     page: Page;
@@ -177,7 +192,7 @@ export type CancelToken = {
     cancel: VoidFunction;
 };
 export type CancelTokenCallback = (cancelToken: CancelToken) => void;
-export type OptimisticCallback<TProps = Page['props']> = (props: TProps) => Partial<TProps> | void;
+export type OptimisticCallback<TProps = Page<SharedPageProps>['props']> = (props: TProps) => Partial<TProps> | void;
 export type Visit<T extends RequestPayload = RequestPayload> = {
     method: Method;
     data: T;
@@ -238,23 +253,23 @@ export type GlobalEventsMap<T extends RequestPayload = RequestPayload> = {
         result: void;
     };
     beforeUpdate: {
-        parameters: [Page];
+        parameters: [Page<SharedPageProps>];
         details: {
-            page: Page;
+            page: Page<SharedPageProps>;
         };
         result: void;
     };
     navigate: {
-        parameters: [Page];
+        parameters: [Page<SharedPageProps>];
         details: {
-            page: Page;
+            page: Page<SharedPageProps>;
         };
         result: void;
     };
     success: {
-        parameters: [Page];
+        parameters: [Page<SharedPageProps>];
         details: {
-            page: Page;
+            page: Page<SharedPageProps>;
         };
         result: void;
     };
@@ -492,7 +507,7 @@ export type ProgressSettings = {
 export type UrlMethodPair = {
     url: string;
     method: Method;
-    component?: string | string[];
+    component?: string | Record<string, string>;
 };
 export type UseFormTransformCallback<TForm> = (data: TForm) => object;
 export type UseFormWithPrecognitionArguments = [Method | (() => Method), string | (() => string)] | [UrlMethodPair | (() => UrlMethodPair)];
@@ -503,7 +518,7 @@ export type UseFormSubmitOptions = Omit<VisitOptions, 'data'>;
 export type UseFormSubmitArguments = [Method, string, UseFormSubmitOptions?] | [UrlMethodPair, UseFormSubmitOptions?] | [UseFormSubmitOptions?];
 export type UseHttpSubmitArguments<TResponse = unknown, TForm = unknown> = [Method, string, UseHttpSubmitOptions<TResponse, TForm>?] | [UrlMethodPair, UseHttpSubmitOptions<TResponse, TForm>?] | [UseHttpSubmitOptions<TResponse, TForm>?];
 export type FormComponentOptions = Pick<VisitOptions, 'preserveScroll' | 'preserveState' | 'preserveUrl' | 'replace' | 'only' | 'except' | 'reset' | 'viewTransition'>;
-export type FormComponentOptimisticCallback<TProps = Page['props']> = (props: TProps, formData: Record<string, FormDataConvertible>) => Partial<TProps> | void;
+export type FormComponentOptimisticCallback<TProps = Page<SharedPageProps>['props']> = (props: TProps, formData: Record<string, FormDataConvertible>) => Partial<TProps> | void;
 export type FormComponentProps = Partial<Pick<Visit, 'headers' | 'queryStringArrayFormat' | 'errorBag' | 'showProgress' | 'invalidateCacheTags'> & Omit<VisitCallbacks, 'onPrefetched' | 'onPrefetching'>> & {
     method?: Method | Uppercase<Method>;
     action?: string | UrlMethodPair;