svelte-ag 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-ag",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Useful svelte components",
   "bugs": "https://github.com/ageorgeh/svelte-ag/issues",
   "author": "Alexander Hornung",
@@ -53,7 +53,7 @@
     "bits-ui": "^2.18.1",
     "clsx": "^2.1.1",
     "dequal": "^2.0.3",
-    "devalue": "^5.8.0",
+    "devalue": "^5.8.1",
     "embla-carousel-svelte": "8.6.0",
     "es-module-lexer": "^2.1.0",
     "formsnap": "2.0.1",
@@ -61,56 +61,56 @@
     "runed": "0.37.1",
     "svelte-toolbelt": "^0.10.6",
     "sveltekit-superforms": "2.30.1",
-    "tailwind-merge": "^3.5.0",
+    "tailwind-merge": "^3.6.0",
     "tailwind-variants": "^3.2.2",
-    "ts-ag": "^1.2.3",
+    "ts-ag": "^1.2.7",
     "tsc-alias": "^1.8.17",
-    "valibot": "^1.4.0"
+    "valibot": "^1.4.1"
   },
   "devDependencies": {
-    "@actions/languageserver": "^0.3.55",
+    "@actions/languageserver": "^0.3.57",
     "@eslint/js": "^10.0.1",
-    "@iconify/json": "^2.2.470",
+    "@iconify/json": "^2.2.483",
     "@iconify/tailwind4": "^1.2.3",
     "@iconify/types": "^2.0.0",
-    "@internationalized/date": "^3.12.1",
-    "@lucide/svelte": "^1.14.0",
-    "@playwright/test": "1.59.1",
+    "@internationalized/date": "^3.12.2",
+    "@lucide/svelte": "^1.17.0",
+    "@playwright/test": "1.60.0",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@sveltejs/kit": "^2.59.1",
-    "@sveltejs/package": "^2.5.7",
-    "@sveltejs/vite-plugin-svelte": "^7.1.1",
+    "@sveltejs/kit": "^2.63.0",
+    "@sveltejs/package": "^2.5.8",
+    "@sveltejs/vite-plugin-svelte": "^7.1.2",
     "@tailwindcss/typography": "^0.5.19",
-    "@tailwindcss/vite": "^4.2.4",
+    "@tailwindcss/vite": "^4.3.0",
     "@testing-library/svelte": "^5.3.1",
-    "@types/node": "^24.12.2",
-    "@typescript/native-preview": "7.0.0-dev.20260506.1",
-    "eslint": "^10.3.0",
+    "@types/node": "^24.13.0",
+    "@typescript/native-preview": "7.0.0-dev.20260604.1",
+    "eslint": "^10.4.1",
     "eslint-plugin-better-tailwindcss": "^4.5.0",
-    "eslint-plugin-svelte": "^3.17.1",
+    "eslint-plugin-svelte": "^3.19.0",
     "globals": "^17.6.0",
-    "happy-dom": "^20.9.0",
+    "happy-dom": "^20.10.1",
     "husky": "^9.1.7",
-    "lint-staged": "^17.0.2",
-    "oxfmt": "^0.51.0",
-    "rolldown": "1.0.0-rc.18",
-    "rolldown-plugin-dts": "^0.24.1",
+    "lint-staged": "^17.0.7",
+    "oxfmt": "^0.53.0",
+    "rolldown": "1.1.0",
+    "rolldown-plugin-dts": "^0.25.2",
     "rollup-plugin-svelte": "^7.2.3",
     "semantic-release": "^25.0.3",
-    "svelte": "^5.55.5",
-    "svelte-check": "^4.4.8",
-    "svelte-preprocess": "^6.0.3",
-    "svelte2tsx": "^0.7.55",
-    "tailwindcss": "4.2.4",
-    "tsdown": "^0.21.10",
-    "tsx": "^4.21.0",
+    "svelte": "^5.56.2",
+    "svelte-check": "^4.6.0",
+    "svelte-preprocess": "^6.0.5",
+    "svelte2tsx": "^0.7.56",
+    "tailwindcss": "4.3.0",
+    "tsdown": "^0.22.2",
+    "tsx": "^4.22.4",
     "tw-animate-css": "^1.4.0",
-    "type-fest": "^5.6.0",
+    "type-fest": "^5.7.0",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.2",
+    "typescript-eslint": "^8.60.1",
     "typescript-svelte-plugin": "^0.3.52",
-    "vite": "^8.0.10",
-    "vitest": "^4.1.5"
+    "vite": "^8.0.16",
+    "vitest": "^4.1.8"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.0.0",

package/src/lib/api/query/query.svelte.ts

@@ -195,19 +195,19 @@ export class Requestor<
    * Then it separates the outputs and resolves each of the promises
    */
   private async flushBatchQueue(batchId: string): Promise<void> {
-    const queue = this.#batchQueue[batchId].splice(0);
+    const queue = this.#batchQueue[batchId]?.splice(0) ?? [];
+    if (queue.length === 0) return;
 
     // TODO maybe remove the unBatchOutput function and just always return the
     // same response and then its on each consumer of each query to find the relevant records
     try {
       const batchedInput = this.#batchInput(queue.map((q) => q.input));
-
       const res = await this.fetch(batchedInput);
+
       const output = await this.#unBatchOutput(
         queue.map((q) => q.input),
         res
       );
-
       if (output.length !== queue.length) {
         throw new Error(`Batch output length mismatch for ${batchId}`);
       }
@@ -232,8 +232,12 @@ export class Requestor<
 
         if (!this.#batchTimers[batchId]) {
           this.#batchTimers[batchId] = setTimeout(() => {
+            delete this.#batchTimers[batchId];
+
             void this.flushBatchQueue(batchId).finally(() => {
-              delete this.#batchTimers[batchId];
+              if (this.#batchQueue[batchId]?.length === 0) {
+                delete this.#batchQueue[batchId];
+              }
             });
           }, this.#batchDelay);
         }

package/src/lib/api/query/query.unit.test.ts

@@ -272,6 +272,70 @@ describe('Requestor', () => {
 
     await Promise.all([p1Expectation, p2Expectation]);
   });
+
+  it('schedules a new batch for requests added while a previous batch is in flight', async () => {
+    const firstFetch = deferred<Response>();
+    const secondFetch = deferred<Response>();
+
+    const fetchMock = vi.fn((_url: string, init?: RequestInit) => {
+      if (init?.body === JSON.stringify({ ids: [1] })) {
+        return firstFetch.promise;
+      }
+
+      if (init?.body === JSON.stringify({ ids: [2] })) {
+        return secondFetch.promise;
+      }
+
+      throw new Error(`Unexpected request body: ${String(init?.body)}`);
+    });
+
+    vi.stubGlobal('fetch', fetchMock);
+
+    const requestor = createBatchedRequestor({
+      canBatch: (input) => ('group' in input && input.group) || false,
+      batchInput: (inputs) => ({ ids: inputs.map(getSingleId) }),
+      unBatchOutput: (inputs) => inputs.map((input) => jsonResponse({ id: getSingleId(input) }))
+    });
+
+    const p1 = requestor.request({ id: 1, group: 'team' });
+
+    await vi.advanceTimersByTimeAsync(100);
+
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock).toHaveBeenLastCalledWith(
+      `${API_URL}//users`,
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({ ids: [1] }),
+        credentials: 'include'
+      })
+    );
+
+    const p2 = requestor.request({ id: 2, group: 'team' });
+
+    await vi.advanceTimersByTimeAsync(99);
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+
+    await vi.advanceTimersByTimeAsync(1);
+
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(fetchMock).toHaveBeenLastCalledWith(
+      `${API_URL}//users`,
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({ ids: [2] }),
+        credentials: 'include'
+      })
+    );
+
+    firstFetch.resolve(jsonFetchResponse({ ok: true }));
+    secondFetch.resolve(jsonFetchResponse({ ok: true }));
+
+    const [response1, response2] = await Promise.all([p1, p2]);
+
+    await expect(response1.json()).resolves.toEqual({ id: 1 });
+    await expect(response2.json()).resolves.toEqual({ id: 2 });
+  });
 });
 
 describe('Query', () => {