solidstep 0.1.7 → 0.2.0

package/utils/server-action.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-action.client.d.ts","sourceRoot":"","sources":["../../utils/server-action.client.ts"],"names":[],"mappings":"AA2MA,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YAyC3E"}
+{"version":3,"file":"server-action.client.d.ts","sourceRoot":"","sources":["../../utils/server-action.client.ts"],"names":[],"mappings":"AAqOA,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YA4C3E"}

package/utils/server-action.client.js

@@ -1,6 +1,7 @@
 import fetch from './fetch.client';
 import { deserialize, toJSONAsync } from 'seroval';
 import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLPlugin, URLSearchParamsPlugin } from 'seroval-plugins/web';
+import { createDiffDOM } from './diff-dom';
 class SerovalChunkReader {
     reader;
     buffer;
@@ -15,7 +16,7 @@ class SerovalChunkReader {
         const chunk = await this.reader.read();
         if (!chunk.done) {
             // repopulate the buffer
-            let newBuffer = new Uint8Array(this.buffer.length + chunk.value.length);
+            const newBuffer = new Uint8Array(this.buffer.length + chunk.value.length);
             newBuffer.set(this.buffer);
             newBuffer.set(chunk.value, this.buffer.length);
             this.buffer = newBuffer;
@@ -135,23 +136,25 @@ async function fetchServerFunction(base, id, options, args) {
                     body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
                     headers: { ...options.headers, 'Content-Type': 'application/json' }
                 }));
-    if (response.headers.has('Location') ||
+    /*if (
+        response.headers.has('Location') ||
         response.headers.has('X-Revalidate') ||
-        response.headers.has('X-Single-Flight')) {
+        response.headers.has('X-Single-Flight')
+    ) {
         if (response.body) {
-            /* @ts-ignore-next-line */
+            /* @ts-ignore-next-line
             response.customBody = () => {
                 return deserializeStream(instance, response);
             };
         }
         return response;
-    }
+    }*/
     const contentType = response.headers.get('Content-Type');
     let result;
-    if (contentType && contentType.startsWith('text/plain')) {
+    if (contentType?.startsWith('text/plain')) {
         result = await response.text();
     }
-    else if (contentType && contentType.startsWith('application/json')) {
+    else if (contentType?.startsWith('application/json')) {
         result = await response.json();
     }
     else {
@@ -163,8 +166,29 @@ async function fetchServerFunction(base, id, options, args) {
         }
         throw result;
     }
+    if (response.headers.has('X-Revalidate')) {
+        const revalidatePath = response.headers.get('X-Revalidate');
+        const { result: actualResult, diff } = result;
+        // run algo to update UI using diff (maybe use a worker?) if the revalidate page is current page
+        if (diff && revalidatePath === window.location.pathname) {
+            const dd = createDiffDOM();
+            const didApply = dd.apply(document.body, diff);
+            if (didApply) {
+                const key = window.location.pathname;
+                sessionStorage.setItem(key, JSON.stringify(diff));
+                window.history.pushState({ revalidated: true }, '', window.location.href);
+            }
+            if (import.meta.env.DEV && !didApply) {
+                console.error('The mutation was not applied, this seems to be an edge case.');
+                console.error('Please raise an issue on GitHub describing your case.');
+                console.error('The diff calculated:', diff);
+            }
+        }
+        return actualResult;
+    }
     return result;
 }
+// biome-ignore lint/complexity/noBannedTypes: <explanation>
 export function createServerReference(fn, id, name) {
     const baseURL = import.meta.env.SERVER_BASE_URL;
     return new Proxy(fn, {
@@ -194,7 +218,10 @@ export function createServerReference(fn, id, name) {
             return target[prop];
         },
         apply(target, thisArg, args) {
-            return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, {}, args);
+            const maxClientFetchTime = +(import.meta.env.VITE_SERVER_ACTION_MAX_CLIENT_FETCH_TIME);
+            return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, {
+                MAX_FETCH_TIME: maxClientFetchTime || undefined
+            }, args);
         }
     });
 }

package/utils/server-action.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-action.server.d.ts","sourceRoot":"","sources":["../../utils/server-action.server.ts"],"names":[],"mappings":"AAgBA,OAAO,EAIN,KAAK,SAAS,EAWd,MAAM,YAAY,CAAC;AAoHpB,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,SAAS,oBAqK1D;;AAED,wBAAkD"}
+{"version":3,"file":"server-action.server.d.ts","sourceRoot":"","sources":["../../utils/server-action.server.ts"],"names":[],"mappings":"AAgBA,OAAO,EAIN,KAAK,SAAS,EAWd,MAAM,YAAY,CAAC;AAuHpB,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,SAAS,oBA0M1D;;AAED,wBAAkD"}

package/utils/server-action.server.js

@@ -7,6 +7,9 @@ import { eventHandler, setHeader, setResponseStatus, appendResponseHeader, toWeb
 import invariant from 'vinxi/lib/invariant';
 import { getManifest } from 'vinxi/manifest';
 import { RedirectError } from './redirect';
+import { createDiffDOM } from './diff-dom';
+import { getCache, invalidateCache } from './cache';
+import fetch from './fetch.server';
 function createChunk(data) {
     const encodeData = new TextEncoder().encode(data);
     const bytes = encodeData.length;
@@ -228,6 +231,37 @@ export async function handleServerFunction(event) {
                     result = null;
             }
         }
+        const revalidatePath = getResponseHeader(event, 'X-Revalidate');
+        // Step 1: check if revalidation is needed
+        if (revalidatePath) {
+            // Step 2: get generated html page from cache
+            const cacheValue = getCache(revalidatePath);
+            const oldHtml = cacheValue?.rendered;
+            // Step 3: invalidate cache for path
+            invalidateCache(revalidatePath);
+            let diff;
+            if (oldHtml) {
+                // Step 4: diff the cache with new html from server
+                const reqUrl = new URL(request.url);
+                const serverUrl = reqUrl.origin;
+                await fetch(serverUrl + revalidatePath, {
+                    method: 'GET'
+                }, false);
+                const newCacheValue = getCache(revalidatePath);
+                const newHtml = newCacheValue?.rendered;
+                const dd = createDiffDOM({
+                    skipSelector: 'SCRIPT, STYLE, NOSCRIPT',
+                    skipMode: 'full'
+                });
+                const ddDiff = dd.diff(oldHtml, newHtml);
+                diff = structuredClone(ddDiff);
+            }
+            // Step 5: add the changed html as json to the result
+            result = {
+                result,
+                diff,
+            };
+        }
         setHeader(event, 'content-type', 'text/javascript');
         return serializeToStream(instance, result);
     }