@emberkit/core 0.2.8 → 0.2.9

package/dist/runtime/helpers/match.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Scores a route path for specificity. Higher score = more specific.
+ * Static segments beat dynamic params; dynamic params beat catch-alls.
+ * Used to resolve conflicts when multiple routes match the same URL.
+ */
+export declare function scoreRoute(routePath: string): number;
+/**
+ * Returns the best-matching route for the given pathname.
+ * When multiple routes match (e.g. /admin and /:language both match "/admin"),
+ * the route with the highest specificity score wins — static beats dynamic.
+ */
+export declare function matchRoute<T extends {
+    path: string;
+}>(routes: T[], pathname: string): T | undefined;
+//# sourceMappingURL=match.d.ts.map

package/dist/runtime/helpers/match.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../../src/runtime/helpers/match.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAmBpD;AAsBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAkBnG"}

package/dist/runtime/helpers/match.js

@@ -0,0 +1,63 @@
+/**
+ * Scores a route path for specificity. Higher score = more specific.
+ * Static segments beat dynamic params; dynamic params beat catch-alls.
+ * Used to resolve conflicts when multiple routes match the same URL.
+ */
+export function scoreRoute(routePath) {
+    let score = 100;
+    const segments = routePath.split('/').filter(Boolean);
+    score -= segments.length * 20;
+    for (const segment of segments) {
+        if (segment.startsWith(':') || segment.startsWith('*') || segment.endsWith('*')) {
+            score -= 30;
+        }
+        else {
+            score += 10;
+        }
+    }
+    if (routePath.includes('*')) {
+        score -= 50;
+    }
+    return Math.max(0, score);
+}
+function routeMatchesPath(routePath, normalized) {
+    if (routePath === normalized)
+        return true;
+    if (routePath !== '/' && normalized.startsWith(routePath + '/'))
+        return true;
+    if (routePath !== '/' && routePath.includes(':')) {
+        const routeParts = routePath.split('/');
+        const pathParts = normalized.split('/');
+        if (routeParts.length === pathParts.length) {
+            for (let i = 0; i < routeParts.length; i++) {
+                if (routeParts[i].startsWith(':'))
+                    continue;
+                if (routeParts[i] !== pathParts[i])
+                    return false;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Returns the best-matching route for the given pathname.
+ * When multiple routes match (e.g. /admin and /:language both match "/admin"),
+ * the route with the highest specificity score wins — static beats dynamic.
+ */
+export function matchRoute(routes, pathname) {
+    const normalized = pathname === '/' ? '/' : pathname.replace(/\/$/, '');
+    let bestMatch;
+    let bestScore = -1;
+    for (const route of routes) {
+        const routePath = route.path === '/' ? '/' : route.path.replace(/\/$/, '');
+        if (routeMatchesPath(routePath, normalized)) {
+            const score = scoreRoute(routePath);
+            if (score > bestScore) {
+                bestScore = score;
+                bestMatch = route;
+            }
+        }
+    }
+    return bestMatch;
+}

package/dist/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAInF,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,EACpD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACtC,GAAG,QAAQ,EAAE,OAAO,EAAE,GACrB,UAAU,CAYZ;AA6ID,wBAAgB,MAAM,CACpB,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,EACnF,SAAS,EAAE,OAAO,GAAG,MAAM,EAC3B,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,OAAO,CAAC;YAAE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAA;SAAE,CAAC,CAAC;KACpF,CAAC,CAAC;CACJ,GACA,IAAI,CA+FN;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAE9F;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAE9C;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,UAAU,CAEjE;AAED,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKnF,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,EACpD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACtC,GAAG,QAAQ,EAAE,OAAO,EAAE,GACrB,UAAU,CAYZ;AA6ID,wBAAgB,MAAM,CACpB,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,EACnF,SAAS,EAAE,OAAO,GAAG,MAAM,EAC3B,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,OAAO,CAAC;YAAE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAA;SAAE,CAAC,CAAC;KACpF,CAAC,CAAC;CACJ,GACA,IAAI,CAoFN;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAE9F;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAE9C;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,UAAU,CAEjE;AAED,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,CAAC"}

package/dist/runtime/index.js

@@ -1,5 +1,6 @@
 import { renderToString, getHandler, clearHandlers } from './helpers/render.js';
 import { getSignalByIndex } from '../signals/helpers/core.js';
+import { matchRoute } from './helpers/match.js';
 export function createElement(type, props, ...children) {
     const resolvedProps = props ?? {};
     const flatChildren = children.flat().filter((child) => child != null && child !== false);
@@ -147,36 +148,8 @@ export function render(element, container, options) {
         renderToTarget(layout, target);
         return;
     }
-    function matchRoute(pathname) {
-        const normalized = pathname === '/' ? '/' : pathname.replace(/\/$/, '');
-        for (const route of routes) {
-            const routePath = route.path === '/' ? '/' : route.path.replace(/\/$/, '');
-            if (routePath === normalized)
-                return route;
-            if (routePath !== '/' && normalized.startsWith(routePath + '/'))
-                return route;
-            if (routePath !== '/' && routePath.includes(':')) {
-                const routeParts = routePath.split('/');
-                const pathParts = normalized.split('/');
-                if (routeParts.length === pathParts.length) {
-                    let match = true;
-                    for (let i = 0; i < routeParts.length; i++) {
-                        if (routeParts[i].startsWith(':'))
-                            continue;
-                        if (routeParts[i] !== pathParts[i]) {
-                            match = false;
-                            break;
-                        }
-                    }
-                    if (match)
-                        return route;
-                }
-            }
-        }
-        return undefined;
-    }
     async function renderCurrentRoute() {
-        const matched = matchRoute(window.location.pathname);
+        const matched = matchRoute(routes, window.location.pathname);
         if (matched) {
             const mod = await matched.component();
             const params = extractParamsFromPath(matched.path, window.location.pathname);
@@ -196,8 +169,20 @@ export function render(element, container, options) {
         if (!link)
             return;
         const href = link.getAttribute('href');
-        if (!href || href.startsWith('http') || href.startsWith('#') || link.target === '_blank')
+        if (!href || href.startsWith('http') || link.target === '_blank')
             return;
+        // Handle anchor links
+        if (href.startsWith('#'))
+            return; // Pure anchor link (e.g., #section)
+        // Check if link is to an anchor on the same page (e.g., /current-page#section)
+        if (href.includes('#')) {
+            const [linkPath] = href.split('#');
+            const currentPath = window.location.pathname;
+            // If the path portion matches current page, it's a same-page anchor
+            if (linkPath === currentPath || linkPath === '') {
+                return; // Allow default browser behavior to scroll to anchor
+            }
+        }
         e.preventDefault();
         history.pushState(null, '', href);
         renderCurrentRoute();

package/dist/vite-plugin/index.js

@@ -1115,6 +1115,23 @@ function scanRouteFiles(dir) {
     walk(dir);
     return files;
 }
+function scoreRoutePath(routePath) {
+    let score = 100;
+    const segments = routePath.split('/').filter(Boolean);
+    score -= segments.length * 20;
+    for (const segment of segments) {
+        if (segment.startsWith(':') || segment.startsWith('*') || segment.endsWith('*')) {
+            score -= 30;
+        }
+        else {
+            score += 10;
+        }
+    }
+    if (routePath.includes('*')) {
+        score -= 50;
+    }
+    return Math.max(0, score);
+}
 function generateRoutesCode(files, routeDir) {
     const routeEntries = [];
     for (const file of files) {
@@ -1143,12 +1160,13 @@ function generateRoutesCode(files, routeDir) {
             routePath = '/' + routePath;
         }
         const importPath = file.replace(/\\/g, '/');
-        if (isMarkdown) {
-            routeEntries.push(`  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}), isMarkdown: true }`);
-        }
-        else {
-            routeEntries.push(`  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}) }`);
-        }
+        const entry = isMarkdown
+            ? `  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}), isMarkdown: true }`
+            : `  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}) }`;
+        routeEntries.push({ path: routePath, entry });
     }
-    return `export const routes = [\n${routeEntries.join(',\n')}\n];`;
+    // Sort static routes before dynamic routes so the emitted array already has
+    // the correct priority order (defense-in-depth alongside runtime scoring).
+    routeEntries.sort((a, b) => scoreRoutePath(b.path) - scoreRoutePath(a.path));
+    return `export const routes = [\n${routeEntries.map((r) => r.entry).join(',\n')}\n];`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emberkit/core",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "type": "module",
   "private": false,
   "description": "Lightweight TypeScript-first JSX framework core",