add checks for directory cases

fern-api · Aug 6, 2024 · c18735b · c18735b
1 parent ad59904
commit c18735b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/packages/cli/project-loader/src/loadProject.ts b/packages/cli/project-loader/src/loadProject.ts
@@ -1,10 +1,13 @@
 import {
     APIS_DIRECTORY,
+    DEFINITION_DIRECTORY,
     fernConfigJson,
     FERN_DIRECTORY,
     generatorsYml,
+    GENERATORS_CONFIGURATION_FILENAME,
     getFernDirectory
 } from "@fern-api/configuration";
+import { ASYNCAPI_DIRECTORY, OPENAPI_DIRECTORY } from "@fern-api/configuration/src/constants";
 import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils";
 import { TaskContext } from "@fern-api/task-context";
 import {
@@ -46,9 +49,15 @@ export async function loadProject({
         return context.failAndThrow(`Directory "${nameOverride ?? FERN_DIRECTORY}" not found.`);
     }
 
-    var apiWorkspaces: APIWorkspace[] | undefined = undefined;
+    let apiWorkspaces: APIWorkspace[] = [];
 
-    if (await doesPathExist(join(fernDirectory, RelativeFilePath.of(APIS_DIRECTORY)))) {
+    if (
+        (await doesPathExist(join(fernDirectory, RelativeFilePath.of(APIS_DIRECTORY)))) ||
+        doesPathExist(join(fernDirectory, RelativeFilePath.of(DEFINITION_DIRECTORY))) ||
+        doesPathExist(join(fernDirectory, RelativeFilePath.of(GENERATORS_CONFIGURATION_FILENAME))) ||
+        doesPathExist(join(fernDirectory, RelativeFilePath.of(OPENAPI_DIRECTORY))) ||
+        doesPathExist(join(fernDirectory, RelativeFilePath.of(ASYNCAPI_DIRECTORY)))
+    ) {
         apiWorkspaces = await loadApis({
             cliName,
             fernDirectory,
@@ -61,7 +70,7 @@ export async function loadProject({
 
     return {
         config: await fernConfigJson.loadProjectConfig({ directory: fernDirectory, context }),
-        apiWorkspaces: apiWorkspaces ?? [],
+        apiWorkspaces: apiWorkspaces,
         docsWorkspaces: await loadDocsWorkspace({ fernDirectory, context })
     };
 }

diff --git a/packages/cli/workspace-loader/src/loadAPIWorkspace.ts b/packages/cli/workspace-loader/src/loadAPIWorkspace.ts
@@ -1,12 +1,5 @@
-import {
-    APIS_DIRECTORY,
-    ASYNCAPI_DIRECTORY,
-    DEFINITION_DIRECTORY,
-    generatorsYml,
-    OPENAPI_DIRECTORY
-} from "@fern-api/configuration";
+import { ASYNCAPI_DIRECTORY, DEFINITION_DIRECTORY, generatorsYml, OPENAPI_DIRECTORY } from "@fern-api/configuration";
 import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils";
-import { isDirectoryEmpty } from "@fern-api/fs-utils/src/doesPathExist";
 import { TaskContext } from "@fern-api/task-context";
 import { loadAPIChangelog } from "./loadAPIChangelog";
 import { getValidAbsolutePathToAsyncAPIFromFolder } from "./loadAsyncAPIFile";
@@ -156,17 +149,6 @@ export async function loadAPIWorkspace({
         };
     }
 
-    if (await isDirectoryEmpty(join(absolutePathToWorkspace, RelativeFilePath.of(APIS_DIRECTORY)))) {
-        return {
-            didSucceed: false,
-            failures: {
-                [RelativeFilePath.of(APIS_DIRECTORY)]: {
-                    type: WorkspaceLoaderFailureType.FILE_MISSING
-                }
-            }
-        };
-    }
-
     return {
         didSucceed: false,
         failures: {

diff --git a/packages/commons/fs-utils/src/doesPathExist.ts b/packages/commons/fs-utils/src/doesPathExist.ts
@@ -1,5 +1,5 @@
 import { lstatSync } from "fs";
-import { lstat, readdir } from "fs/promises";
+import { lstat } from "fs/promises";
 import { AbsoluteFilePath } from "./AbsoluteFilePath";
 
 export async function doesPathExist(filepath: AbsoluteFilePath): Promise<boolean> {
@@ -11,11 +11,6 @@ export async function doesPathExist(filepath: AbsoluteFilePath): Promise<boolean
     }
 }
 
-export async function isDirectoryEmpty(directoryPath: AbsoluteFilePath): Promise<boolean> {
-    const files = await readdir(directoryPath);
-    return files.length === 0;
-}
-
 export function doesPathExistSync(filepath: AbsoluteFilePath): boolean {
     try {
         lstatSync(filepath);