Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions cli/lucli/Module.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,68 @@ component extends="modules.BaseModule" {
var serverPort = $requireRunningServer();

try {
var routesUrl = "http://localhost:#serverPort#/wheels/ai?context=routing";
// /wheels/cli?command=routes returns the actual application route
// table as JSON. (The previous endpoint, /wheels/ai?context=routing,
// returns AI-documentation about routing patterns — not what users
// asking "what routes does my app have?" expect to see.)
var routesUrl = "http://localhost:#serverPort#/wheels/cli?command=routes&format=json";
var httpResult = makeHttpRequest(routesUrl);

out(httpResult);
var result = "";
try {
result = deserializeJSON(httpResult);
} catch (any jsonErr) {
out("Failed to parse routes response", "red");
verbose(httpResult);
return "";
}

if (!structKeyExists(result, "success") || !result.success) {
out("Failed to fetch routes: #result.message ?: 'unknown error'#", "red");
return "";
}

if (!structKeyExists(result, "routes") || !arrayLen(result.routes)) {
out("No routes configured.", "yellow");
return "";
}

// Normalise patterns so the leading "/" is shown exactly once. The
// framework stores routes with the leading slash already present,
// but defensively handle the case where it isn't.
var formatPattern = function(p) {
p = p ?: "";
return left(p, 1) == "/" ? p : "/" & p;
};

// Compute column widths from the data so the table aligns cleanly.
var maxMethod = len("METHOD");
var maxPattern = len("PATTERN");
var maxAction = len("CONTROLLER##ACTION");
for (var route in result.routes) {
var methodWidth = len(uCase(route.methods ?: ""));
var patternWidth = len(formatPattern(route.pattern));
var actionWidth = len((route.controller ?: "") & "##" & (route.action ?: ""));
if (methodWidth > maxMethod) maxMethod = methodWidth;
if (patternWidth > maxPattern) maxPattern = patternWidth;
if (actionWidth > maxAction) maxAction = actionWidth;
}

out(lJustify("METHOD", maxMethod) & " " & lJustify("PATTERN", maxPattern) & " " & "CONTROLLER##ACTION", "bold");
out(repeatString("-", maxMethod + maxPattern + maxAction + 4));

for (var route in result.routes) {
var line = lJustify(uCase(route.methods ?: ""), maxMethod)
& " " & lJustify(formatPattern(route.pattern), maxPattern)
& " " & (route.controller ?: "") & "##" & (route.action ?: "");
if (structKeyExists(route, "name") && len(route.name)) {
line &= " (" & route.name & ")";
}
out(line);
}

out("");
out("#arrayLen(result.routes)# route(s)", "cyan");
} catch (any e) {
out("Failed to fetch routes: #e.message#", "red");
}
Expand Down
12 changes: 6 additions & 6 deletions vendor/wheels/public/views/cli.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -417,14 +417,14 @@ try {
break;

case "routes":
// Return application routes
// Return application routes. Routes live at application.wheels.routes
// (the convention every other case in this file uses); the previous
// `application[application.wheels.appKey]` indirection was broken
// because `appKey` is a function, not a property.
data.success = true;
data.routes = [];

// Get routes from application
local.appKey = application.wheels.appKey;
if (structKeyExists(application, local.appKey) && structKeyExists(application[local.appKey], "routes")) {
for (local.route in application[local.appKey].routes) {
if (structKeyExists(application, "wheels") && structKeyExists(application.wheels, "routes")) {
for (local.route in application.wheels.routes) {
local.routeInfo = {
name = structKeyExists(local.route, "name") ? local.route.name : "",
pattern = structKeyExists(local.route, "pattern") ? local.route.pattern : "",
Expand Down