revert(utils): "refactor(utils): fix compiler errors from recursive schema types"

This reverts commit 9c10784.

Author: matejchalk

packages/models/src/index.ts

@@ -132,8 +132,6 @@ export {
   type CoverageTreeMissingLOC,
   type CoverageTreeNode,
   type Tree,
-  type BasicTreeNodeValues,
-  type CoverageTreeNodeValues,
 } from './lib/tree.js';
 export { uploadConfigSchema, type UploadConfig } from './lib/upload-config.js';
 export {

packages/models/src/lib/tree.ts

@@ -5,8 +5,6 @@ const basicTreeNodeValuesSchema = z.record(
   z.string(),
   z.union([z.number(), z.string()]),
 );
-export type BasicTreeNodeValues = z.infer<typeof basicTreeNodeValuesSchema>;
-
 const basicTreeNodeDataSchema = z.object({
   name: z.string().min(1).describe('Text label for node'),
   values: basicTreeNodeValuesSchema
@@ -43,10 +41,6 @@ const coverageTreeNodeValuesSchema = z.object({
     .optional()
     .describe('Uncovered lines of code'),
 });
-export type CoverageTreeNodeValues = z.infer<
-  typeof coverageTreeNodeValuesSchema
->;
-
 const coverageTreeNodeDataSchema = z.object({
   name: z.string().min(1).describe('File or folder name'),
   values: coverageTreeNodeValuesSchema.describe(

packages/utils/src/lib/coverage-tree.ts

@@ -1,18 +1,11 @@
 import type {
   CoverageTree,
   CoverageTreeMissingLOC,
-  CoverageTreeNodeValues,
+  CoverageTreeNode,
 } from '@code-pushup/models';
 import { splitFilePath } from './file-system.js';
 import { formatGitPath } from './git/git.js';
 
-// recursive schemas cause compiler problems when using CoverageTreeNode
-type TreeNode = {
-  name: string;
-  values: CoverageTreeNodeValues;
-  children?: TreeNode[];
-};
-
 export type FileCoverage = {
   path: string;
   total: number;
@@ -101,7 +94,7 @@ function addNode(
   };
 }
 
-function calculateTreeCoverage(root: FileTree): TreeNode {
+function calculateTreeCoverage(root: FileTree): CoverageTreeNode {
   if ('children' in root) {
     const stats = aggregateChildCoverage(root.children);
     const coverage = calculateCoverage(stats);
@@ -160,7 +153,7 @@ function getNodeCoverageStats(
   return stats;
 }
 
-function sortCoverageTree(root: TreeNode): TreeNode {
+function sortCoverageTree(root: CoverageTreeNode): CoverageTreeNode {
   if (!root.children?.length) {
     return root;
   }

packages/utils/src/lib/text-formats/ascii/tree.ts

@@ -1,23 +1,16 @@
 import type {
-  BasicTreeNodeValues,
-  CoverageTreeNodeValues,
+  BasicTreeNode,
+  CoverageTreeNode,
   Tree,
 } from '@code-pushup/models';
 
-// recursive schemas cause compiler problems when using BasicTreeNode | CoverageTreeNode
-type TreeNode = {
-  name: string;
-  values?: BasicTreeNodeValues | CoverageTreeNodeValues;
-  children?: TreeNode[];
-};
+type TreeNode = BasicTreeNode | CoverageTreeNode;
 
 const INDENT_CHARS = 4;
 const COL_GAP = 2;
 
 export function formatAsciiTree(tree: Tree): string {
-  const root = tree.root as TreeNode;
-
-  const nodes = flatten(root);
+  const nodes = flatten(tree.root);
   const maxWidth = Math.max(
     ...nodes.map(({ node, level }) => level * INDENT_CHARS + node.name.length),
   );
@@ -37,7 +30,7 @@ export function formatAsciiTree(tree: Tree): string {
           {},
         );
 
-  return formatTreeNode(root, '', maxWidth, keysMaxWidths)
+  return formatTreeNode(tree.root, '', maxWidth, keysMaxWidths)
     .map(line => `${line}\n`)
     .join('');
 }