From d2794834052503ec8ae259f6ff2efecbf502e725 Mon Sep 17 00:00:00 2001
From: Alitzel Mendez <alitzelmendez@Alitzels-MacBook-Pro.local>
Date: Tue, 27 May 2025 13:29:26 -0700
Subject: [PATCH 1/3] Fix review of circular dependency

---
 packages/compiler/src/lib/paging.ts            |  9 ++++++---
 .../compiler/test/decorators/paging.test.ts    | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/compiler/src/lib/paging.ts b/packages/compiler/src/lib/paging.ts
index 2ec0efe5f79..7a204276d6a 100644
--- a/packages/compiler/src/lib/paging.ts
+++ b/packages/compiler/src/lib/paging.ts
@@ -298,21 +298,24 @@ function navigateProperties(
   type: Type,
   callback: (prop: ModelProperty, path: ModelProperty[]) => void,
   path: ModelProperty[] = [],
+  visited: Set<Type> = new Set(),
 ): void {
+  if (visited.has(type)) return;
+  visited.add(type);
   switch (type.kind) {
     case "Model":
       for (const prop of type.properties.values()) {
         callback(prop, [...path, prop]);
-        navigateProperties(prop.type, callback, [...path, prop]);
+        navigateProperties(prop.type, callback, [...path, prop], visited);
       }
       break;
     case "Union":
       for (const member of type.variants.values()) {
-        navigateProperties(member, callback, path);
+        navigateProperties(member, callback, path, visited);
       }
       break;
     case "UnionVariant":
-      navigateProperties(type.type, callback, path);
+      navigateProperties(type.type, callback, path, visited);
       break;
   }
 }
diff --git a/packages/compiler/test/decorators/paging.test.ts b/packages/compiler/test/decorators/paging.test.ts
index 0e5892f6a8e..d0cc4186428 100644
--- a/packages/compiler/test/decorators/paging.test.ts
+++ b/packages/compiler/test/decorators/paging.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import { ignoreDiagnostics, ModelProperty, Operation } from "../../src/index.js";
 import { getPagingOperation, PagingOperation } from "../../src/lib/paging.js";
-import { expectDiagnostics } from "../../src/testing/expect.js";
+import { expectDiagnosticEmpty, expectDiagnostics } from "../../src/testing/expect.js";
 import { createTestRunner } from "../../src/testing/test-host.js";
 import { BasicTestRunner } from "../../src/testing/types.js";
 
@@ -39,7 +39,21 @@ it("emit error if missing pageItems property", async () => {
   });
 });
 
-describe("emit conflict diagnostic if multiple properties are annotated with teh same property marker", () => {
+it("@list decorator handle recursive models without infinite loop", async () => {
+  const diagnostics = await runner.diagnose(`
+      model MyPage {
+        selfRef?: MyPage;
+        @pageItems items: string[];
+        @nextLink next: string;
+      }
+
+      @list
+      op foo(): MyPage;
+    `);
+  expectDiagnosticEmpty(diagnostics);
+});
+
+describe("emit conflict diagnostic if multiple properties are annotated with the same property marker", () => {
   it.each([
     ["offset", "int32"],
     ["pageSize", "int32"],

From ca0a46d58c5eed71d90a553371d9d601c525ecf6 Mon Sep 17 00:00:00 2001
From: Alitzel Mendez <alitzelmendez@Alitzels-MacBook-Pro.local>
Date: Tue, 27 May 2025 14:22:02 -0700
Subject: [PATCH 2/3] summary of changes

---
 .chronus/changes/inifite-loop-2025-4-27-14-20-40.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .chronus/changes/inifite-loop-2025-4-27-14-20-40.md

diff --git a/.chronus/changes/inifite-loop-2025-4-27-14-20-40.md b/.chronus/changes/inifite-loop-2025-4-27-14-20-40.md
new file mode 100644
index 00000000000..7fa98791ed0
--- /dev/null
+++ b/.chronus/changes/inifite-loop-2025-4-27-14-20-40.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@typespec/compiler"
+---
+
+Fix infinite recursion when navigating paging properties by detecting and handling circular model references.

From 232b1fe2584e25779619fa19f69bed9c934441de Mon Sep 17 00:00:00 2001
From: Alitzel Mendez <6895254+AlitzelMendez@users.noreply.github.com>
Date: Tue, 27 May 2025 15:49:07 -0700
Subject: [PATCH 3/3] Update packages/compiler/test/decorators/paging.test.ts

Co-authored-by: Timothee Guerin <timothee.guerin@outlook.com>
---
 packages/compiler/test/decorators/paging.test.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/compiler/test/decorators/paging.test.ts b/packages/compiler/test/decorators/paging.test.ts
index d0cc4186428..10d99bafac0 100644
--- a/packages/compiler/test/decorators/paging.test.ts
+++ b/packages/compiler/test/decorators/paging.test.ts
@@ -47,8 +47,7 @@ it("@list decorator handle recursive models without infinite loop", async () =>
         @nextLink next: string;
       }
 
-      @list
-      op foo(): MyPage;
+      @list op foo(): MyPage;
     `);
   expectDiagnosticEmpty(diagnostics);
 });