edges-svelte 3.0.0 → 3.0.3

package/dist/client/NavigationSync.svelte.js

@@ -6,7 +6,8 @@ const NULL_MARKER = '__EDGES_NULL__';
 const BIGINT_MARKER = '__EDGES_BIGINT__';
 const EDGES_STATE_FIELD = '__edges_state__';
 const EDGES_REV_FIELD = '__edges_rev__';
-let lastAppliedRevision = 0;
+const SEEN_REVISIONS_LIMIT = 200;
+const seenRevisions = new Set();
 const decodeEdgesValue = (value) => {
     if (value && typeof value === 'object') {
         if (UNDEFINED_MARKER in value)
@@ -26,6 +27,21 @@ const decodeEdgesValue = (value) => {
     }
     return value;
 };
+const tryDecodeLegacyString = (value) => {
+    const trimmed = value.trim();
+    if (!(trimmed.startsWith('{') || trimmed.startsWith('['))) {
+        return value;
+    }
+    if (!trimmed.includes(UNDEFINED_MARKER) && !trimmed.includes(NULL_MARKER) && !trimmed.includes(BIGINT_MARKER)) {
+        return value;
+    }
+    try {
+        return decodeEdgesValue(JSON.parse(trimmed));
+    }
+    catch {
+        return value;
+    }
+};
 export function registerStateUpdate(key, callback) {
     if (browser) {
         stateUpdateCallbacks.set(key, callback);
@@ -39,15 +55,7 @@ export function processEdgesState(edgesState) {
     window.__SAFE_SSR_STATE__ = store;
     batch(() => {
         for (const [key, value] of Object.entries(edgesState)) {
-            let processedValue = decodeEdgesValue(value);
-            if (typeof value === 'string') {
-                try {
-                    processedValue = decodeEdgesValue(JSON.parse(value));
-                }
-                catch {
-                    /*  do nothing  */
-                }
-            }
+            const processedValue = typeof value === 'string' ? tryDecodeLegacyString(value) : decodeEdgesValue(value);
             store.set(key, processedValue);
             const callback = stateUpdateCallbacks.get(key);
             if (callback) {
@@ -63,11 +71,17 @@ export function applyEdgesFromPayload(payload) {
     const rawState = data[EDGES_STATE_FIELD];
     if (!rawState || typeof rawState !== 'object')
         return;
-    const revision = Number(data[EDGES_REV_FIELD] ?? 0);
-    if (Number.isFinite(revision) && revision > 0) {
-        if (revision <= lastAppliedRevision)
+    const revision = data[EDGES_REV_FIELD];
+    if (typeof revision === 'string' && revision.length > 0) {
+        if (seenRevisions.has(revision))
             return;
-        lastAppliedRevision = revision;
+        seenRevisions.add(revision);
+        if (seenRevisions.size > SEEN_REVISIONS_LIMIT) {
+            const oldestRevision = seenRevisions.values().next().value;
+            if (oldestRevision) {
+                seenRevisions.delete(oldestRevision);
+            }
+        }
     }
     processEdgesState(rawState);
 }

package/dist/context/Context.d.ts

@@ -9,7 +9,7 @@ export interface ContextData {
         providersAutoKeyCounters?: Map<string, number>;
         providersConstructionStack?: string[];
         edgesDirtyKeys?: Set<string>;
-        edgesRevision?: number;
+        edgesRevision?: string;
     } & App.ContextDataExtended;
 }
 declare class RequestContextManager {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './provider/Provider.js';
 export { batch, transaction } from './utils/batch.js';
+export { __withEdgesUniversalLoad } from './server/ServerSync.js';
 export type * from './types.js';

package/dist/index.js

@@ -1,2 +1,3 @@
 export * from './provider/Provider.js';
 export { batch, transaction } from './utils/batch.js';
+export { __withEdgesUniversalLoad } from './server/ServerSync.js';

package/dist/plugin/EdgesAutoHandlePlugin.js

@@ -60,8 +60,9 @@ export function createEdgesPluginFactory(packageName, serverPath) {
             return `${beforeImports}\n${SYNC_MARKER}\n${importLine}\n${afterImports}`;
         };
         const ensureAstServerImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesServerLoad as ${AST_SERVER_LOAD_ALIAS}, __withEdgesActions as ${AST_ACTIONS_ALIAS} } from '${serverPath}';`);
-        const ensureAstUniversalImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesUniversalLoad as ${AST_UNIVERSAL_LOAD_ALIAS} } from '${serverPath}';`);
-        const ensureRegexImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesServerLoad, __withEdgesActions, __withEdgesUniversalLoad } from '${serverPath}';`);
+        const ensureAstUniversalImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesUniversalLoad as ${AST_UNIVERSAL_LOAD_ALIAS} } from '${packageName}';`);
+        const ensureRegexServerImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesServerLoad, __withEdgesActions } from '${serverPath}';`);
+        const ensureRegexUniversalImport = (sourceCode) => ensureSyncImport(sourceCode, `import { __withEdgesUniversalLoad } from '${packageName}';`);
         const findExportedLocal = (sourceFile, code, exportedName) => {
             const edits = [];
             let localName = null;
@@ -117,7 +118,7 @@ export function createEdgesPluginFactory(packageName, serverPath) {
             if (!LOAD_EXPORT_PATTERN.test(sourceCode) && !ACTIONS_EXPORT_PATTERN.test(sourceCode)) {
                 return null;
             }
-            let wrapped = ensureRegexImport(sourceCode);
+            let wrapped = ensureRegexServerImport(sourceCode);
             if (LOAD_EXPORT_PATTERN.test(wrapped)) {
                 wrapped = wrapped
                     .replace(LOAD_EXPORT_PATTERN, (match) => match.replace('export const load', 'const __userLoad'))
@@ -133,7 +134,7 @@ export function createEdgesPluginFactory(packageName, serverPath) {
         const wrapUniversalRouteModuleRegex = (sourceCode) => {
             if (!LOAD_EXPORT_PATTERN.test(sourceCode))
                 return null;
-            let wrapped = ensureRegexImport(sourceCode);
+            let wrapped = ensureRegexUniversalImport(sourceCode);
             wrapped = wrapped
                 .replace(LOAD_EXPORT_PATTERN, (match) => match.replace('export const load', 'const __userUniversalLoad'))
                 .concat('\n\nexport const load = __withEdgesUniversalLoad(__userUniversalLoad);');

package/dist/server/EdgesHandle.js

@@ -1,14 +1,14 @@
 import { stateSerialize } from '../store/State.svelte.js';
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { randomUUID } from 'node:crypto';
 import { RequestContext } from '../context/Context.js';
 const storage = new AsyncLocalStorage();
-let requestRevision = 0;
 export const edgesHandle = async (event, callback, silentChromeDevtools = false) => {
     const requestSymbol = Symbol('request');
     return await storage.run({
         event: event,
         symbol: requestSymbol,
-        data: { providers: new Map(), edgesDirtyKeys: new Set(), edgesRevision: ++requestRevision }
+        data: { providers: new Map(), edgesDirtyKeys: new Set(), edgesRevision: randomUUID() }
     }, async () => {
         RequestContext.init(() => {
             const context = storage.getStore();

package/dist/server/ServerSync.js

@@ -34,7 +34,7 @@ const getEdgesDelta = () => {
     try {
         const context = RequestContext.current();
         const dirtyKeys = context.data.edgesDirtyKeys;
-        const rev = context.data.edgesRevision ?? 0;
+        const rev = context.data.edgesRevision;
         const stateMap = getStateMap();
         if (!dirtyKeys || dirtyKeys.size === 0 || !stateMap || stateMap.size === 0)
             return undefined;
@@ -44,7 +44,7 @@ const getEdgesDelta = () => {
                 continue;
             state[key] = encodeEdgesValue(stateMap.get(key));
         }
-        if (Object.keys(state).length === 0)
+        if (!rev || Object.keys(state).length === 0)
             return undefined;
         return { state, rev };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edges-svelte",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "license": "MIT",
   "author": "Pixel1917",
   "description": "A blazing-fast, extremely lightweight and SSR-friendly store for Svelte",