@inertiajs/svelte 2.1.1 → 2.1.3

package/dist/components/Form.svelte

@@ -3,7 +3,7 @@
   resetFormFields,
   mergeDataIntoQueryString
 } from "@inertiajs/core";
-import { isEqual } from "es-toolkit";
+import { isEqual } from "lodash-es";
 import { onMount } from "svelte";
 import useForm from "../useForm";
 const noop = () => void 0;
@@ -25,6 +25,10 @@ export let onSuccess = noop;
 export let onError = noop;
 export let onSubmitComplete = noop;
 export let disableWhileProcessing = false;
+export let invalidateCacheTags = [];
+export let resetOnError = false;
+export let resetOnSuccess = false;
+export let setDefaultsOnSuccess = false;
 const form = useForm({});
 let formElement;
 let isDirty = false;
@@ -42,10 +46,21 @@ function updateDirtyState(event) {
 }
 export function submit() {
   const [url, _data] = mergeDataIntoQueryString(_method, _action, getData(), queryStringArrayFormat);
+  const maybeReset = (resetOption) => {
+    if (!resetOption) {
+      return;
+    }
+    if (resetOption === true) {
+      reset();
+    } else if (resetOption.length > 0) {
+      reset(...resetOption);
+    }
+  };
   const submitOptions = {
     headers,
     errorBag,
     showProgress,
+    invalidateCacheTags,
     onCancelToken,
     onBefore,
     onStart,
@@ -62,8 +77,17 @@ export function submit() {
           defaults
         });
       }
+      maybeReset(resetOnSuccess);
+      if (setDefaultsOnSuccess === true) {
+        defaults();
+      }
+    },
+    onError: (...args) => {
+      if (onError) {
+        onError(...args);
+      }
+      maybeReset(resetOnError);
     },
-    onError,
     ...options
   };
   $form.transform(() => transform(_data)).submit(_method, url, submitOptions);
@@ -72,6 +96,12 @@ function handleSubmit(event) {
   event.preventDefault();
   submit();
 }
+function handleReset(event) {
+  if (event.isTrusted) {
+    event.preventDefault();
+    reset();
+  }
+}
 export function reset(...fields) {
   resetFormFields(formElement, defaultData, fields);
 }
@@ -108,7 +138,9 @@ $: slotErrors = $form.errors;
   bind:this={formElement}
   action={_action}
   method={_method}
-  on:submit={handleSubmit} {...$$restProps}
+  on:submit={handleSubmit}
+  on:reset={handleReset}
+  {...$$restProps}
   inert={disableWhileProcessing && $form.processing ? true : undefined}
 >
   <slot

package/dist/components/Form.svelte.d.ts

@@ -3,10 +3,7 @@ import { type Errors, type FormDataConvertible } from '@inertiajs/core';
 declare const __propDef: {
     props: {
         [x: string]: any;
-        action?: string | {
-            url: string;
-            method: import("@inertiajs/core").Method;
-        } | undefined;
+        action?: string | import("@inertiajs/core").UrlMethodPair | undefined;
         method?: import("@inertiajs/core").Method | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | undefined;
         headers?: Record<string, string> | undefined;
         queryStringArrayFormat?: "indices" | "brackets" | undefined;
@@ -26,6 +23,10 @@ declare const __propDef: {
         onError?: import("@inertiajs/core").GlobalEventCallback<"error", import("@inertiajs/core").RequestPayload> | undefined;
         onSubmitComplete?: ((props: import("@inertiajs/core").FormComponentonSubmitCompleteArguments) => void) | undefined;
         disableWhileProcessing?: boolean | undefined;
+        invalidateCacheTags?: string | string[] | undefined;
+        resetOnError?: boolean | string[] | undefined;
+        resetOnSuccess?: boolean | string[] | undefined;
+        setDefaultsOnSuccess?: boolean | undefined;
         submit?: (() => void) | undefined;
         reset?: ((...fields: string[]) => void) | undefined;
         clearErrors?: ((...fields: string[]) => void) | undefined;

package/dist/components/Link.svelte

@@ -13,6 +13,7 @@ export let queryStringArrayFormat = "brackets";
 export let async = false;
 export let prefetch = false;
 export let cacheFor = 0;
+export let cacheTags = [];
 $: _method = typeof href === "object" ? href.method : method;
 $: _href = typeof href === "object" ? href.url : href;
 $: asProp = _method !== "get" ? "button" : as.toLowerCase();
@@ -39,6 +40,7 @@ $: elProps = {
     async,
     prefetch,
     cacheFor,
+    cacheTags,
   }}
   {...$$restProps}
   {...elProps}

package/dist/components/Link.svelte.d.ts

@@ -1,12 +1,9 @@
 import { SvelteComponent } from "svelte";
-import type { CacheForOption, FormDataConvertible, LinkPrefetchOption, Method, PreserveStateOption } from '@inertiajs/core';
+import type { CacheForOption, FormDataConvertible, LinkPrefetchOption, Method, PreserveStateOption, UrlMethodPair } from '@inertiajs/core';
 declare const __propDef: {
     props: {
         [x: string]: any;
-        href?: string | {
-            url: string;
-            method: Method;
-        } | undefined;
+        href?: (string | UrlMethodPair) | undefined;
         as?: keyof HTMLElementTagNameMap | undefined;
         data?: Record<string, FormDataConvertible> | undefined;
         method?: Method | undefined;
@@ -20,6 +17,7 @@ declare const __propDef: {
         async?: boolean | undefined;
         prefetch?: (boolean | LinkPrefetchOption | LinkPrefetchOption[]) | undefined;
         cacheFor?: (CacheForOption | CacheForOption[]) | undefined;
+        cacheTags?: string | string[] | undefined;
     };
     events: {
         focus: FocusEvent;

package/dist/createInertiaApp.js

@@ -14,7 +14,7 @@ export default async function createInertiaApp({ id = 'app', resolve, setup, pro
     const svelteApp = setup({
         el,
         App: App,
-        props
+        props,
     });
     if (isServer) {
         const { html, head, css } = svelteApp;

package/dist/link.d.ts

@@ -1,15 +1,10 @@
-import { type GlobalEventsMap, type LinkComponentBaseProps, type Method, type VisitOptions } from '@inertiajs/core';
+import { type GlobalEventsMap, type LinkComponentBaseProps, type VisitOptions } from '@inertiajs/core';
 import type { CancelTokenSource } from 'axios';
 import type { ActionReturn } from 'svelte/action';
 interface ActionElement extends HTMLElement {
     href?: string;
 }
-type ActionParameters = Omit<LinkComponentBaseProps, 'onCancelToken'> & Omit<VisitOptions, keyof LinkComponentBaseProps> & {
-    href?: string | {
-        url: string;
-        method: Method;
-    };
-};
+type ActionParameters = Omit<LinkComponentBaseProps, 'onCancelToken'> & Omit<VisitOptions, keyof LinkComponentBaseProps>;
 type SelectedEventKeys = 'start' | 'progress' | 'finish' | 'before' | 'cancel' | 'success' | 'error' | 'prefetching' | 'prefetched';
 type SelectedGlobalEventsMap = Pick<GlobalEventsMap, SelectedEventKeys>;
 type ActionAttributes = {

package/dist/link.js

@@ -1,9 +1,10 @@
-import { mergeDataIntoQueryString, router, shouldIntercept, } from '@inertiajs/core';
+import { mergeDataIntoQueryString, router, shouldIntercept, shouldNavigate, } from '@inertiajs/core';
 function link(node, initialParams = {}) {
     let inFlightCount = 0;
     let hoverTimeout;
     let prefetchModes = [];
     let cacheForValue;
+    let cacheTags = [];
     let method;
     let href;
     let data;
@@ -29,17 +30,29 @@ function link(node, initialParams = {}) {
                 prefetch();
             }
         },
+        keydown: (event) => {
+            if (shouldIntercept(event) && shouldNavigate(event)) {
+                event.preventDefault();
+                prefetch();
+            }
+        },
         mouseup: (event) => {
             event.preventDefault();
             router.visit(href, visitParams);
         },
+        keyup: (event) => {
+            if (shouldNavigate(event)) {
+                event.preventDefault();
+                router.visit(href, visitParams);
+            }
+        },
         click: (event) => {
             if (shouldIntercept(event)) {
                 event.preventDefault();
             }
         },
     };
-    function update({ cacheFor = 0, prefetch = false, ...params }) {
+    function update({ cacheFor = 0, prefetch = false, cacheTags: cacheTagValues = [], ...params }) {
         prefetchModes = (() => {
             if (prefetch === true) {
                 return ['hover'];
@@ -58,6 +71,7 @@ function link(node, initialParams = {}) {
             }
             return 30_000;
         })();
+        cacheTags = cacheTagValues;
         method = typeof params.href === 'object' ? params.href.method : (params.method?.toLowerCase() || 'get');
         [href, data] = hrefAndData(method, params);
         if (node.tagName === 'A') {
@@ -108,7 +122,7 @@ function link(node, initialParams = {}) {
             ...baseParams,
             onPrefetching: (visit) => dispatchEvent('prefetching', { detail: { visit } }),
             onPrefetched: (response, visit) => dispatchEvent('prefetched', { detail: { response, visit } }),
-        }, { cacheFor: cacheForValue });
+        }, { cacheFor: cacheForValue, cacheTags });
     }
     function updateNodeAttributes() {
         if (inFlightCount > 0) {

package/dist/page.d.ts

@@ -1,6 +1,11 @@
 import { type Page } from '@inertiajs/core';
-export declare const setPage: (this: void, value: Page<import("@inertiajs/core").PageProps>) => void;
+type SveltePage = Omit<Page, 'props'> & {
+    props: Page['props'] & {
+        [key: string]: any;
+    };
+};
+export declare const setPage: (this: void, value: SveltePage) => void;
 declare const _default: {
-    subscribe: (this: void, run: import("svelte/store").Subscriber<Page<import("@inertiajs/core").PageProps>>, invalidate?: import("svelte/store").Invalidator<Page<import("@inertiajs/core").PageProps>> | undefined) => import("svelte/store").Unsubscriber;
+    subscribe: (this: void, run: import("svelte/store").Subscriber<SveltePage>, invalidate?: import("svelte/store").Invalidator<SveltePage> | undefined) => import("svelte/store").Unsubscriber;
 };
 export default _default;

package/dist/useForm.d.ts

@@ -1,4 +1,4 @@
-import type { ErrorValue, FormDataErrors, FormDataKeys, FormDataType, FormDataValues, Method, Progress, VisitOptions } from '@inertiajs/core';
+import type { ErrorValue, FormDataErrors, FormDataKeys, FormDataType, FormDataValues, Method, Progress, UrlMethodPair, VisitOptions } from '@inertiajs/core';
 import { type Writable } from 'svelte/store';
 type InertiaFormStore<TForm extends object> = Writable<InertiaForm<TForm>> & InertiaForm<TForm>;
 type FormOptions = Omit<VisitOptions, 'data'>;
@@ -22,10 +22,7 @@ export interface InertiaFormProps<TForm extends object> {
     resetAndClearErrors<K extends FormDataKeys<TForm>>(...fields: K[]): this;
     setError<K extends FormDataKeys<TForm>>(field: K, value: ErrorValue): this;
     setError(errors: FormDataErrors<TForm>): this;
-    submit: (...args: [Method, string, FormOptions?] | [{
-        url: string;
-        method: Method;
-    }, FormOptions?]) => void;
+    submit: (...args: [Method, string, FormOptions?] | [UrlMethodPair, FormOptions?]) => void;
     get(url: string, options?: FormOptions): void;
     post(url: string, options?: FormOptions): void;
     put(url: string, options?: FormOptions): void;

package/dist/useForm.js

@@ -1,6 +1,5 @@
 import { router } from '@inertiajs/core';
-import { cloneDeep, isEqual } from 'es-toolkit';
-import { get, has, set } from 'es-toolkit/compat';
+import { cloneDeep, get, has, isEqual, set } from 'lodash-es';
 import { writable } from 'svelte/store';
 export default function useForm(rememberKeyOrData, maybeData) {
     const rememberKey = typeof rememberKeyOrData === 'string' ? rememberKeyOrData : null;
@@ -13,6 +12,7 @@ export default function useForm(rememberKeyOrData, maybeData) {
     let cancelToken = null;
     let recentlySuccessfulTimeoutId = null;
     let transform = (data) => data;
+    let defaultsCalledInOnSuccess = false;
     const store = writable({
         ...(restored ? restored.data : data),
         isDirty: false,
@@ -37,6 +37,7 @@ export default function useForm(rememberKeyOrData, maybeData) {
             return this;
         },
         defaults(fieldOrFields, maybeValue) {
+            defaultsCalledInOnSuccess = true;
             if (typeof fieldOrFields === 'undefined') {
                 defaults = cloneDeep(this.data());
             }
@@ -86,6 +87,7 @@ export default function useForm(rememberKeyOrData, maybeData) {
             const method = objectPassed ? args[0].method : args[0];
             const url = objectPassed ? args[0].url : args[1];
             const options = (objectPassed ? args[1] : args[2]) ?? {};
+            defaultsCalledInOnSuccess = false;
             const data = transform(this.data());
             const _options = {
                 ...options,
@@ -125,7 +127,9 @@ export default function useForm(rememberKeyOrData, maybeData) {
                     this.setStore('recentlySuccessful', true);
                     recentlySuccessfulTimeoutId = setTimeout(() => this.setStore('recentlySuccessful', false), 2000);
                     const onSuccess = options.onSuccess ? await options.onSuccess(page) : null;
-                    this.defaults(cloneDeep(this.data()));
+                    if (!defaultsCalledInOnSuccess) {
+                        this.defaults(cloneDeep(this.data()));
+                    }
                     return onSuccess;
                 },
                 onError: (errors) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inertiajs/svelte",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "license": "MIT",
   "description": "The Svelte adapter for Inertia.js",
   "contributors": [
@@ -16,6 +16,14 @@
   "bugs": {
     "url": "https://github.com/inertiajs/inertia/issues"
   },
+  "files": [
+    "dist",
+    "!dist/**/*.test.*",
+    "!dist/**/*.spec.*"
+  ],
+  "type": "module",
+  "types": "./dist/index.d.ts",
+  "svelte": "./dist/index.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -26,26 +34,14 @@
       "svelte": "./dist/server.js"
     }
   },
-  "files": [
-    "dist",
-    "!dist/**/*.test.*",
-    "!dist/**/*.spec.*"
-  ],
-  "peerDependencies": {
-    "svelte": "^4.0.0 || ^5.0.0 || ^5.0.0-next.244"
-  },
-  "dependencies": {
-    "es-toolkit": "^1.33.0",
-    "html-escape": "^2.0.0",
-    "@inertiajs/core": "2.1.1"
-  },
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.2.0",
-    "@sveltejs/kit": "^2.20.6",
+    "@sveltejs/kit": "^2.36.3",
     "@sveltejs/package": "^2.3.4",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@types/html-escape": "^2.0.2",
-    "axios": "^1.8.2",
+    "axios": "^1.11.0",
+    "es-check": "^9.3.1",
     "publint": "^0.2.10",
     "svelte": "^4.2.19",
     "svelte-check": "^4.0.0",
@@ -53,14 +49,22 @@
     "typescript": "^5.5.4",
     "vite": "^5.4.19"
   },
-  "svelte": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "type": "module",
+  "peerDependencies": {
+    "svelte": "^4.0.0 || ^5.0.0"
+  },
+  "dependencies": {
+    "@types/lodash-es": "^4.17.12",
+    "html-escape": "^2.0.0",
+    "lodash-es": "^4.17.21",
+    "@inertiajs/core": "2.1.3"
+  },
   "scripts": {
-    "dev": "pnpm package --watch",
     "build": "pnpm package && publint",
-    "package": "svelte-kit sync && svelte-package --input src",
+    "build:with-deps": "svelte-kit sync && vite build --config vite-with-deps.config.js",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
+    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+    "dev": "pnpm package --watch",
+    "es2020-check": "pnpm build:with-deps && es-check es2020 \"dist/**/*.js\" --checkFeatures --module --noCache --verbose",
+    "package": "svelte-kit sync && svelte-package --input src"
   }
 }