solidstep 0.2.0 → 0.3.1

package/utils/cache.js

@@ -39,7 +39,7 @@ export const getCache = (key) => {
     const entry = cacheMap.get(key);
     if (!entry || !entry.expiresAt)
         return null;
-    if (entry.expiresAt && entry.expiresAt < Date.now()) {
+    if (entry.expiresAt && entry.expiresAt < performance.now()) {
         cacheMap.delete(key);
         if (entry.prev)
             entry.prev.next = entry.next;
@@ -58,14 +58,14 @@ export const setCache = (key, value, ttlMs) => {
     if (cacheMap.has(key)) {
         const node = cacheMap.get(key);
         node.value = value;
-        node.expiresAt = ttlMs ? Date.now() + ttlMs : null;
+        node.expiresAt = ttlMs ? performance.now() + ttlMs : null;
         moveToFront(node);
         return;
     }
     const newNode = {
         key,
         value,
-        expiresAt: ttlMs ? Date.now() + ttlMs : null
+        expiresAt: ttlMs ? performance.now() + ttlMs : null
     };
     newNode.next = head;
     if (head)

package/utils/path-router.d.ts

@@ -0,0 +1,70 @@
+export type Import = {
+    src: string;
+    import: any;
+};
+export type RoutePageHandler = {
+    type: 'page';
+    mainPage: {
+        manifestPath: string;
+        page: Import;
+        loader?: Import;
+        generateMeta?: Import;
+        options?: Import;
+    };
+    loadingPage?: {
+        manifestPath: string;
+        page: Import;
+        generateMeta?: Import;
+    };
+    errorPage?: {
+        manifestPath: string;
+        page: Import;
+        generateMeta?: Import;
+    };
+    notFoundPage?: {
+        manifestPath: string;
+        page: Import;
+        generateMeta?: Import;
+    };
+    layouts: {
+        manifestPath: string;
+        layout: Import;
+        loader?: Import;
+        generateMeta?: Import;
+    }[];
+    groups?: {
+        [key: string]: {
+            manifestPath: string;
+            page: Import;
+            loader?: Import;
+        };
+    };
+};
+export type RouteHandler = {
+    type: 'route';
+    handler: Import;
+    manifestPath: string;
+} | RoutePageHandler;
+type Params = Record<string, string | string[]>;
+export type RouteNode = {
+    staticChildren: Map<string, RouteNode>;
+    paramChild?: {
+        name: string;
+        node: RouteNode;
+    };
+    catchAllChild?: {
+        name: string;
+        optional: boolean;
+        node: RouteNode;
+    };
+    handler?: RouteHandler;
+};
+export declare const createNode: () => RouteNode;
+export declare const insertRoute: (root: RouteNode, path: string, handler: RouteHandler) => void;
+type MatchResult = {
+    handler: RouteHandler;
+    params: Params;
+} | null;
+export declare const matchRoute: (root: RouteNode, path: string) => MatchResult;
+export {};
+//# sourceMappingURL=path-router.d.ts.map

package/utils/path-router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-router.d.ts","sourceRoot":"","sources":["../../utils/path-router.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,MAAM,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,WAAW,CAAC,EAAE;QACV,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,SAAS,CAAC,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,YAAY,CAAC,EAAE;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,OAAO,EAAE;QACL,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,YAAY,EAAE,MAAM,CAAC;YACrB,IAAI,EAAE,MAAM,CAAC;YACb,MAAM,CAAC,EAAE,MAAM,CAAC;SACnB,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,YAAY,GAClB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACxB,GACC,gBAAgB,CAAC;AAEvB,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG;IACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEvC,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,SAAS,CAAC;KACnB,CAAA;IAED,aAAa,CAAC,EAAE;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,OAAO,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC;KACnB,CAAA;IAED,OAAO,CAAC,EAAE,YAAY,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,UAAU,QAAO,SAE5B,CAAC;AAyCH,eAAO,MAAM,WAAW,GACpB,MAAM,SAAS,EACf,MAAM,MAAM,EACZ,SAAS,YAAY,SAyCxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACjB,GAAG,IAAI,CAAA;AAER,eAAO,MAAM,UAAU,GACnB,MAAM,SAAS,EACf,MAAM,MAAM,KACb,WAmDF,CAAA"}

package/utils/path-router.js

@@ -0,0 +1,97 @@
+export const createNode = () => ({
+    staticChildren: new Map()
+});
+const parseSegment = (segment) => {
+    // [[...slug]]
+    if (segment.startsWith('[[...') && segment.endsWith(']]')) {
+        return { type: 'catchAll', name: segment.slice(5, -2), optional: true };
+    }
+    // [...slug]
+    if (segment.startsWith('[...') && segment.endsWith(']')) {
+        return { type: 'catchAll', name: segment.slice(4, -1), optional: false };
+    }
+    // [id]
+    if (segment.startsWith('[') && segment.endsWith(']')) {
+        return { type: 'param', name: segment.slice(1, -1) };
+    }
+    return { type: 'static', value: segment };
+};
+export const insertRoute = (root, path, handler) => {
+    const segments = path.split('/').filter(Boolean);
+    let node = root;
+    for (const segment of segments) {
+        const parsed = parseSegment(segment);
+        if (parsed.type === 'static' && parsed.value) {
+            if (!node.staticChildren.has(parsed.value)) {
+                node.staticChildren.set(parsed.value, createNode());
+            }
+            node = node.staticChildren.get(parsed.value);
+            continue;
+        }
+        if (parsed.type === 'param') {
+            if (!node.paramChild) {
+                node.paramChild = {
+                    name: parsed.name,
+                    node: createNode()
+                };
+            }
+            node = node.paramChild.node;
+            continue;
+        }
+        if (parsed.type === 'catchAll') {
+            if (!node.catchAllChild) {
+                node.catchAllChild = {
+                    name: parsed.name,
+                    optional: parsed.optional,
+                    node: createNode()
+                };
+            }
+            node = node.catchAllChild.node;
+            break; // catch-all always consumes the rest
+        }
+    }
+    node.handler = handler;
+};
+export const matchRoute = (root, path) => {
+    const segments = path.split('/').filter(Boolean);
+    const params = {};
+    const walk = (node, index) => {
+        // End of path
+        if (index === segments.length) {
+            if (node.handler)
+                return node.handler;
+            // Optional catch-all can match empty
+            if (node.catchAllChild?.optional) {
+                params[node.catchAllChild.name] = [];
+                return node.catchAllChild.node.handler ?? null;
+            }
+            return null;
+        }
+        const segment = segments[index];
+        // 1. Static
+        const staticChild = node.staticChildren.get(segment);
+        if (staticChild) {
+            const res = walk(staticChild, index + 1);
+            if (res)
+                return res;
+        }
+        // 2. Param
+        if (node.paramChild) {
+            params[node.paramChild.name] = segment;
+            const res = walk(node.paramChild.node, index + 1);
+            if (res)
+                return res;
+            delete params[node.paramChild.name];
+        }
+        // 3. Catch-all
+        if (node.catchAllChild) {
+            params[node.catchAllChild.name] = segments.slice(index);
+            return node.catchAllChild.node.handler ?? null;
+        }
+        return null;
+    };
+    const handler = walk(root, 0);
+    if (!handler)
+        return null;
+    return { handler, params };
+};

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;AAuHpB,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,SAAS,oBA0M1D;;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,oBA2M1D;;AAED,wBAAkD"}

package/utils/server-action.server.js

@@ -244,9 +244,10 @@ export async function handleServerFunction(event) {
                 // Step 4: diff the cache with new html from server
                 const reqUrl = new URL(request.url);
                 const serverUrl = reqUrl.origin;
-                await fetch(serverUrl + revalidatePath, {
+                const response = await fetch(serverUrl + revalidatePath, {
                     method: 'GET'
                 }, false);
+                await response.text(); // ensure the fetch is completed and cache is populated
                 const newCacheValue = getCache(revalidatePath);
                 const newHtml = newCacheValue?.rendered;
                 const dd = createDiffDOM({