simplify code

Redocly · Sep 6, 2024 · 3878eb6 · 3878eb6
1 parent f949ef9
commit 3878eb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/cli/src/utils/miscellaneous.ts b/packages/cli/src/utils/miscellaneous.ts
@@ -17,7 +17,6 @@ import {
   RedoclyClient,
 } from '@redocly/openapi-core';
 import {
-  isEmptyArray,
   isEmptyObject,
   isNotEmptyArray,
   isNotEmptyObject,
@@ -49,8 +48,7 @@ export async function getFallbackApisOrExit(
   config: ConfigApis
 ): Promise<Entrypoint[]> {
   const { apis } = config;
-  const shouldFallbackToAllDefinitions =
-    (!argsApis || isEmptyArray(argsApis)) && isNotEmptyObject(apis);
+  const shouldFallbackToAllDefinitions = !isNotEmptyArray(argsApis) && isNotEmptyObject(apis);
   const res = shouldFallbackToAllDefinitions
     ? fallbackToAllDefinitions(apis, config)
     : await expandGlobsInEntrypoints(argsApis!, config);
@@ -91,11 +89,12 @@ function fallbackToAllDefinitions(
 }
 
 function getAliasOrPath(config: ConfigApis, aliasOrPath: string): Entrypoint {
-  return config.apis[aliasOrPath]
+  const aliasApi = config.apis[aliasOrPath];
+  return aliasApi
     ? {
-        path: config.apis[aliasOrPath]?.root,
+        path: aliasApi.root,
         alias: aliasOrPath,
-        output: config.apis[aliasOrPath]?.output,
+        output: aliasApi.output,
       }
     : {
         path: aliasOrPath,

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -63,7 +63,7 @@ export function isEmptyArray(value: unknown) {
 }
 
 export function isNotEmptyArray<T>(args?: T[]): boolean {
-  return Array.isArray(args) && !!args.length;
+  return !!args && Array.isArray(args) && !!args.length;
 }
 
 export async function readFileFromUrl(url: string, config: HttpResolveConfig) {