tinkiet 0.11.0 → 0.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinkiet",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Pragmatic UI Web Components",
   "type": "module",
   "main": "index.js",

package/router/index.js

@@ -30,22 +30,35 @@ function matchPath(pattern, pathname) {
     const patternParts = pattern.split('/').filter(Boolean);
     const pathParts = pathname.split('/').filter(Boolean);
     const params = {};
+    let pathIndex = 0;
     for (let i = 0; i < patternParts.length; i++) {
         const pat = patternParts[i];
-        const isLastPatternSegment = i === patternParts.length - 1;
-        const segment = pathParts[i];
+        const segment = pathParts[pathIndex];
+        const isRestParam = pat.startsWith(':') && pat.endsWith('*');
+        const isOptionalParam = pat.startsWith(':') && pat.endsWith('?');
+        const isParam = pat.startsWith(':') && !isRestParam && !isOptionalParam;
         // Wildcard "rest" param: :name*
-        if (pat.startsWith(':') && pat.endsWith('*')) {
+        if (isRestParam) {
             const name = pat.slice(1, -1); // remove ':' and '*'
-            params[name] = decodeURIComponent(pathParts.slice(i).join('/'));
+            params[name] = decodeURIComponent(pathParts.slice(pathIndex).join('/'));
             return { params };
         }
+        // Optional param :name?
+        if (isOptionalParam) {
+            if (segment != null) {
+                const name = pat.slice(1, -1); // remove ':' and '?'
+                params[name] = decodeURIComponent(segment);
+                pathIndex += 1;
+            }
+            continue;
+        }
         // Simple param :name
-        if (pat.startsWith(':')) {
+        if (isParam) {
             if (segment == null)
                 return null;
             const name = pat.slice(1);
             params[name] = decodeURIComponent(segment);
+            pathIndex += 1;
             continue;
         }
         // Plain wildcard "*"
@@ -56,13 +69,10 @@ function matchPath(pattern, pathname) {
         if (segment !== pat) {
             return null;
         }
-        // If we are at end of pattern but still have more path segments
-        if (isLastPatternSegment && pathParts.length > patternParts.length) {
-            return null;
-        }
+        pathIndex += 1;
     }
-    // Extra segments in path not matched by a rest param => no match
-    if (pathParts.length > patternParts.length) {
+    // Extra segments in path not matched by optional/rest params => no match
+    if (pathIndex < pathParts.length) {
         return null;
     }
     return { params };