We still need to return a union type with className to enable e.g. chaining of the magic whereX methods and scopes

Author: freerkminnema

src/support/docblocks.ts

@@ -77,15 +77,15 @@ const getBuilderReturnType = (
     }
 
     if (["static", "self"].includes(method.return)) {
-        return `\\Illuminate\\Database\\Eloquent\\Builder<${className}>`;
+        return `\\Illuminate\\Database\\Eloquent\\Builder<${className}>|${className}`;
     }
 
     const certainOfType = ["sole", "find", "first", "firstOrFail"].includes(method.name);
 
     const returnType = method.return
         .replace(
             "$this",
-            `\\Illuminate\\Database\\Eloquent\\Builder<${className}>`,
+            `\\Illuminate\\Database\\Eloquent\\Builder<${className}>|${className}`,
         )
         .replace("\\TReturn", "mixed")
         .replace("TReturn", "mixed")
@@ -202,7 +202,7 @@ const getAttributeBlocks = (
 
     if (!["accessor", "attribute"].includes(attr.cast || "")) {
         blocks.push(
-            `@method static \\Illuminate\\Database\\Eloquent\\Builder<${className}> where${attr.title_case}($value)`,
+            `@method static \\Illuminate\\Database\\Eloquent\\Builder<${className}>|${className}> where${attr.title_case}($value)`,
         );
     }