Refactoring

falsandtru · Feb 13, 2024 · eae11e7 · eae11e7
1 parent 3821e85
commit eae11e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gh-pages/docs/apis/pjax/config/index.md b/gh-pages/docs/apis/pjax/config/index.md
@@ -44,7 +44,7 @@ Set a dictionary object having has/get/set/delete methods of Map to pass the doc
 
 ## fetch: {...} = ...
 
-### rewrite?: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, cache?: Document) => XMLHttpRequest | undefined
+### rewrite?: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, memory?: Document) => XMLHttpRequest | undefined
 
 Rewrite the XHR object, or replace it with another or fake.
 
@@ -58,7 +58,7 @@ Wait for the specified milliseconds after sending a request.
 
 ## update: {...} = ...
 
-### rewrite?: (url: string, document: Document, area: string, cache?: Document) => void
+### rewrite?: (url: string, document: Document, area: string, memory?: Document) => void
 
 Rewrite the source document object.
 If you use the sequence option, you should use only it instead of this.

diff --git a/index.d.ts b/index.d.ts
@@ -21,13 +21,13 @@ export interface Config {
   readonly replace?: string;
   readonly memory?: Dict<string, Document>;
   readonly fetch?: {
-    readonly rewrite?: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, cache?: Document) => XMLHttpRequest | undefined;
+    readonly rewrite?: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, memory?: Document) => XMLHttpRequest | undefined;
     readonly headers?: Headers;
     readonly timeout?: number;
     readonly wait?: number;
   };
   readonly update?: {
-    readonly rewrite?: (url: string, document: Document, area: string, cache?: Document) => void;
+    readonly rewrite?: (url: string, document: Document, area: string, memory?: Document) => void;
     readonly head?: string;
     readonly css?: boolean;
     readonly script?: boolean;

diff --git a/src/layer/domain/router/module/fetch/xhr.ts b/src/layer/domain/router/module/fetch/xhr.ts
@@ -14,7 +14,7 @@ export function xhr(
   body: FormData | null,
   timeout: number,
   cancellation: Cancellee<Error>,
-  rewrite: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, cache?: Document | undefined) => XMLHttpRequest | undefined = noop,
+  rewrite: (url: string, method: string, headers: Headers, timeout: number, body: FormData | null, memory?: Document | undefined) => XMLHttpRequest | undefined = noop,
   memory?: Document,
 ): AtomicPromise<Either<Error, Response>> {
   return new AtomicPromise<Either<Error, Response>>(resolve => {

diff --git a/test/integration/config/update.rewrite.test.ts b/test/integration/config/update.rewrite.test.ts
@@ -16,10 +16,10 @@ describe('Integration: Config', function () {
       new Pjax({
         memory: new Cache(100),
         update: {
-          rewrite(url, doc, area, cache) {
+          rewrite(url, doc, area, memory) {
             switch (url.split('/').at(-1)) {
               case '2.html':
-                cache && doc.querySelector(area)?.replaceWith(cache.querySelector(area)!.cloneNode(true));
+                memory && doc.querySelector(area)?.replaceWith(memory.querySelector(area)!.cloneNode(true));
             }
           },
         },