@boon4681/giri 0.0.3-alpha-4 → 0.0.3-alpha-6

package/dist/cli.js

@@ -151,6 +151,15 @@ function buildObjectSchema(type, ctx) {
   }
   return schema;
 }
+function toJsonReturnType(type, ctx) {
+  const symbol = ctx.checker.getPropertyOfType(type, "toJSON");
+  if (!symbol) {
+    return void 0;
+  }
+  const methodType = ctx.checker.getTypeOfSymbolAtLocation(symbol, ctx.location);
+  const [signature] = methodType.getCallSignatures();
+  return signature ? ctx.checker.getReturnTypeOfSignature(signature) : void 0;
+}
 function defName(type) {
   const symbol = type.getSymbol() ?? type.aliasSymbol;
   const name = symbol?.getName();
@@ -164,6 +173,12 @@ function walkObject(type, ctx) {
   if (isDateType(type)) {
     return { type: "string", format: "date-time" };
   }
+  if (!checker.isArrayType(type) && !checker.isTupleType(type)) {
+    const jsonReturn = toJsonReturnType(type, ctx);
+    if (jsonReturn) {
+      return walkType(jsonReturn, ctx);
+    }
+  }
   if (checker.isArrayType(type)) {
     const [element] = checker.getTypeArguments(type);
     return { type: "array", items: element ? walkType(element, ctx) : {} };
@@ -688,6 +703,42 @@ function urlSegment(segment) {
   }
   return { value: segment };
 }
+function segmentRanks(segments) {
+  const ranks = [];
+  for (const segment of segments) {
+    const converted = urlSegment(segment);
+    if (!converted.value) {
+      continue;
+    }
+    if (converted.param?.catchAll) {
+      ranks.push({ rank: 2, text: converted.param.name });
+    } else if (converted.param) {
+      ranks.push({ rank: 1, text: converted.param.name });
+    } else {
+      ranks.push({ rank: 0, text: converted.value });
+    }
+  }
+  return ranks;
+}
+function compareRoutes(left, right) {
+  const leftRanks = segmentRanks(left.routeSegments);
+  const rightRanks = segmentRanks(right.routeSegments);
+  const shared = Math.min(leftRanks.length, rightRanks.length);
+  for (let i = 0; i < shared; i++) {
+    const a = leftRanks[i];
+    const b = rightRanks[i];
+    if (a.rank !== b.rank) {
+      return a.rank - b.rank;
+    }
+    if (a.rank === 0 && a.text !== b.text) {
+      return a.text.localeCompare(b.text);
+    }
+  }
+  if (leftRanks.length !== rightRanks.length) {
+    return leftRanks.length - rightRanks.length;
+  }
+  return METHOD_ORDER.indexOf(left.method) - METHOD_ORDER.indexOf(right.method);
+}
 function pathFromSegments(segments) {
   const pathSegments = [];
   const params = [];
@@ -764,13 +815,7 @@ async function scanRoutes(routesDir) {
       sharedFiles: sharedFilesForDir(routesDir, routeDir, sharedCache)
     });
   }
-  return routes.sort((left, right) => {
-    const pathOrder = left.path.localeCompare(right.path);
-    if (pathOrder !== 0) {
-      return pathOrder;
-    }
-    return METHOD_ORDER.indexOf(left.method) - METHOD_ORDER.indexOf(right.method);
-  });
+  return routes.sort(compareRoutes);
 }
 
 // src/types.ts