diff --git a/packages/core/src/pages/utils/display.utils.ts b/packages/core/src/pages/utils/display.utils.ts index d92e2d7..880b6eb 100644 --- a/packages/core/src/pages/utils/display.utils.ts +++ b/packages/core/src/pages/utils/display.utils.ts @@ -99,22 +99,26 @@ export const getSortedChildren = ( }; }) .sort((a, b) => { - const nameA = a.name.startsWith("_"); - const nameB = b.name.startsWith("_"); + const underscoreNameA = a.name.startsWith("_"); + const underscoreNameB = b.name.startsWith("_"); if (a.isMethod && b.isMethod) { return 0; } if (a.isMethod) { - return -1; + return 1; } - if (nameA && nameB) { + if (underscoreNameA && underscoreNameB) { return 0; } - if (nameA) { + if (underscoreNameA) { return 1; } + if (!a.isMethod && !b.isMethod) { + return 0; + } + return -1; }) .filter((element) => element.name !== "constructor"); diff --git a/packages/core/src/parsing/renderer/__tests__/__snapshots__/class-renderer.spec.tsx.snap b/packages/core/src/parsing/renderer/__tests__/__snapshots__/class-renderer.spec.tsx.snap index 70816e8..1e38460 100644 --- a/packages/core/src/parsing/renderer/__tests__/__snapshots__/class-renderer.spec.tsx.snap +++ b/packages/core/src/parsing/renderer/__tests__/__snapshots__/class-renderer.spec.tsx.snap @@ -3293,12 +3293,12 @@ toJSON() - used + abortKey
\`\`\`tsx -boolean +string \`\`\` @@ -3307,7 +3307,7 @@ boolean - updatedQueueKey + auth
@@ -3321,7 +3321,7 @@ boolean - updatedCacheKey + cache
@@ -3335,12 +3335,12 @@ boolean - updatedAbortKey + cacheKey
\`\`\`tsx -boolean +string \`\`\` @@ -3349,7 +3349,7 @@ boolean - retryTime + cacheTime
@@ -3363,12 +3363,12 @@ number - retry + cancelable
\`\`\`tsx -number +boolean \`\`\` @@ -3377,12 +3377,12 @@ number - requestOptions + deduplicate
\`\`\`tsx -RequestOptionsType, ExtractAdapterOptionsType>, ExtractAdapterMethodType>> +boolean \`\`\` @@ -3391,12 +3391,12 @@ RequestOptionsType, ExtractAdapterOptionsType - queued + deduplicateTime
\`\`\`tsx -boolean +number \`\`\` @@ -3405,12 +3405,12 @@ boolean - queryParams + disableRequestInterceptors
\`\`\`tsx -ExtractQueryParamsType | NegativeTypes +boolean | undefined \`\`\` @@ -3419,12 +3419,12 @@ ExtractQueryParamsType | NegativeTypes - queryKey + disableResponseInterceptors
\`\`\`tsx -string +boolean | undefined \`\`\` @@ -3433,12 +3433,12 @@ string - payload + endpoint
\`\`\`tsx -PayloadType> +ExtractEndpointType \`\`\` @@ -3447,12 +3447,12 @@ PayloadType> - params + garbageCollection
\`\`\`tsx -ExtractParamsType | NegativeTypes +number \`\`\` @@ -3461,12 +3461,12 @@ ExtractParamsType | NegativeTypes - options + headers
\`\`\`tsx -ExtractAdapterOptionsType> +HeadersInit \`\`\` @@ -3475,12 +3475,12 @@ ExtractAdapterOptionsType> - offline + method
\`\`\`tsx -boolean +ExtractAdapterMethodType> \`\`\` @@ -3489,12 +3489,12 @@ boolean - method + offline
\`\`\`tsx -ExtractAdapterMethodType> +boolean \`\`\` @@ -3503,12 +3503,12 @@ ExtractAdapterMethodType> - headers + options
\`\`\`tsx -HeadersInit +ExtractAdapterOptionsType> \`\`\` @@ -3517,12 +3517,12 @@ HeadersInit - garbageCollection + params
\`\`\`tsx -number +ExtractParamsType | NegativeTypes \`\`\` @@ -3531,12 +3531,12 @@ number - endpoint + payload
\`\`\`tsx -ExtractEndpointType +PayloadType> \`\`\` @@ -3545,12 +3545,12 @@ ExtractEndpointType - disableResponseInterceptors + queryKey
\`\`\`tsx -boolean | undefined +string \`\`\` @@ -3559,12 +3559,12 @@ boolean | undefined - disableRequestInterceptors + queryParams
\`\`\`tsx -boolean | undefined +ExtractQueryParamsType | NegativeTypes \`\`\` @@ -3573,12 +3573,12 @@ boolean | undefined - deduplicateTime + queued
\`\`\`tsx -number +boolean \`\`\` @@ -3587,12 +3587,12 @@ number - deduplicate + requestOptions
\`\`\`tsx -boolean +RequestOptionsType, ExtractAdapterOptionsType>, ExtractAdapterMethodType>> \`\`\` @@ -3601,12 +3601,12 @@ boolean - cancelable + retry
\`\`\`tsx -boolean +number \`\`\` @@ -3615,7 +3615,7 @@ boolean - cacheTime + retryTime
@@ -3629,12 +3629,12 @@ number - cacheKey + updatedAbortKey
\`\`\`tsx -string +boolean \`\`\` @@ -3643,7 +3643,7 @@ string - cache + updatedCacheKey
@@ -3657,7 +3657,7 @@ boolean - auth + updatedQueueKey
@@ -3671,12 +3671,12 @@ boolean - abortKey + used
\`\`\`tsx -string +boolean \`\`\`