@marko/run 0.1.6 → 0.1.7

package/README.md

@@ -481,9 +481,9 @@ express()
 
 **`MarkoRun.Handler`** - Type that represents a handler function to be exported by a +handler or +middleware file
 
-**`MarkoRun.CurrentRoute`** - Type of the route's params and metadata
+**`MarkoRun.Route`** - Type of the route's params and metadata
 
-**`MarkoRun.CurrentContext`** - Type of the request context object in a handler and `out.global` in your Marko files
+**`MarkoRun.Context`** - Type of the request context object in a handler and `out.global` in your Marko files
 
 
 ### Generated Types
@@ -493,13 +493,13 @@ If a [TSConfig](https://www.typescriptlang.org/tsconfig) file is discovered in t
 These types are replaced with more specific versions per routable file:
 
 **`MarkoRun.Handler`**
-- Overrides context with specific MarkoRun.CurrentContext
+- Overrides context with specific MarkoRun.Context
 
-**`MarkoRun.CurrentRoute`**
+**`MarkoRun.Route`**
 - Adds specific parameters and meta types 
 - In middleware and layouts which are used in many routes, this type will be a union of all possible routes that the file will see
 
-**`MarkoRun.CurrentContext`**
+**`MarkoRun.Context`**
 - In middleware and layouts which are used in many routes, this type will be a union of all possible routes that the file will see.
 - When an adapter is used, it can provide types for the platform
 

package/dist/vite/index.cjs

@@ -232,7 +232,7 @@ async function buildRoutes(walk, basePath) {
             });
           }
         }
-        pathStack.push(name.toLowerCase());
+        pathStack.push(name);
       }
       dirStack.push(name);
       isRoot = false;
@@ -957,7 +957,8 @@ function renderMatch(verb, route, pathIndex) {
   const handler = `${verb}${route.index}`;
   const params = ((_a = route.params) == null ? void 0 : _a.length) ? renderParamsInfo(route.params, pathIndex) : "{}";
   const meta = route.meta ? `meta${route.index}` : "{}";
-  return `{ handler: ${handler}, params: ${params}, meta: ${meta} }`;
+  const path3 = pathToURLPatternString(route.path);
+  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path3}' }`;
 }
 function renderMiddleware(middleware) {
   const writer = createStringWriter();
@@ -1016,13 +1017,7 @@ interface NoMeta {}
   for (const route of routes.list) {
     const { meta, handler, params, middleware, page, layouts } = route;
     const routeType = `Route${route.index}`;
-    const pathType = `\`${route.path.replace(
-      /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => {
-        name = decodeURIComponent(name);
-        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
-      }
-    )}\``;
+    const pathType = `\`${pathToURLPatternString(route.path)}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
     if (page || handler) {
@@ -1201,6 +1196,15 @@ function writeModuleDeclaration(writer, path3 = "global", routeType = "AnyRoute"
   }
 }`);
 }
+function pathToURLPatternString(path3) {
+  return path3.replace(
+    /\/\$(\$?)([^\/]*)/g,
+    (_, catchAll, name) => {
+      name = decodeURIComponent(name);
+      return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+    }
+  );
+}
 
 // src/vite/utils/ast.ts
 var t = __toESM(require("@babel/types"), 1);

package/dist/vite/index.js

@@ -195,7 +195,7 @@ async function buildRoutes(walk, basePath) {
             });
           }
         }
-        pathStack.push(name.toLowerCase());
+        pathStack.push(name);
       }
       dirStack.push(name);
       isRoot = false;
@@ -920,7 +920,8 @@ function renderMatch(verb, route, pathIndex) {
   const handler = `${verb}${route.index}`;
   const params = ((_a = route.params) == null ? void 0 : _a.length) ? renderParamsInfo(route.params, pathIndex) : "{}";
   const meta = route.meta ? `meta${route.index}` : "{}";
-  return `{ handler: ${handler}, params: ${params}, meta: ${meta} }`;
+  const path3 = pathToURLPatternString(route.path);
+  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path3}' }`;
 }
 function renderMiddleware(middleware) {
   const writer = createStringWriter();
@@ -979,13 +980,7 @@ interface NoMeta {}
   for (const route of routes.list) {
     const { meta, handler, params, middleware, page, layouts } = route;
     const routeType = `Route${route.index}`;
-    const pathType = `\`${route.path.replace(
-      /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => {
-        name = decodeURIComponent(name);
-        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
-      }
-    )}\``;
+    const pathType = `\`${pathToURLPatternString(route.path)}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
     if (page || handler) {
@@ -1164,6 +1159,15 @@ function writeModuleDeclaration(writer, path3 = "global", routeType = "AnyRoute"
   }
 }`);
 }
+function pathToURLPatternString(path3) {
+  return path3.replace(
+    /\/\$(\$?)([^\/]*)/g,
+    (_, catchAll, name) => {
+      name = decodeURIComponent(name);
+      return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+    }
+  );
+}
 
 // src/vite/utils/ast.ts
 import * as t from "@babel/types";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",