@mintlify/prebuild 1.0.799 → 1.0.800

package/dist/prebuild/update/docsConfig/generateOpenApiFromDocsConfig.js

@@ -82,31 +82,41 @@ export const generateOpenApiFromDocsConfig = async (navigation, openApiFiles, pa
         if ('openapi' in nav && nav.openapi !== null) {
             const openapiProp = nav.openapi;
             if (typeof openapiProp === 'string') {
-                return openapiProp;
+                return { source: openapiProp, directory: undefined };
             }
             else if (Array.isArray(openapiProp) && openapiProp.length > 0) {
-                return openapiProp[0];
+                return { source: openapiProp[0], directory: undefined };
             }
             else if (typeof openapiProp === 'object' &&
                 'source' in openapiProp &&
                 typeof openapiProp.source === 'string') {
-                return openapiProp.source;
+                const directory = 'directory' in openapiProp && typeof openapiProp.directory === 'string'
+                    ? openapiProp.directory
+                    : undefined;
+                return {
+                    source: openapiProp.source,
+                    directory,
+                };
             }
         }
-        return undefined;
+        return { source: undefined, directory: undefined };
     }
     const skipBulkForNode = new Set();
     const skipBulkForNodeId = new Set();
     let numNodes = 0;
-    async function processNav(nav, inheritedOpenApi, openApiOwner) {
+    async function processNav(nav, inheritedOpenApi, inheritedDirectory, openApiOwner) {
         const nodeId = numNodes++;
-        const currentOpenApi = extractOpenApiFromNav(nav) ?? inheritedOpenApi;
-        const currentOpenApiOwner = extractOpenApiFromNav(nav) ? nodeId : openApiOwner;
+        const extracted = extractOpenApiFromNav(nav);
+        const currentOpenApi = extracted.source ?? inheritedOpenApi;
+        const currentDirectory = extracted.source
+            ? extracted.directory
+            : extracted.directory ?? inheritedDirectory;
+        const currentOpenApiOwner = extracted.source ? nodeId : openApiOwner;
         let newNav = nav;
         if ('pages' in newNav) {
             newNav.pages = await Promise.all(newNav.pages.map(async (page) => {
                 if (typeof page === 'object' && page !== null && 'group' in page) {
-                    return processNav(page, currentOpenApi, currentOpenApiOwner);
+                    return processNav(page, currentOpenApi, currentDirectory, currentOpenApiOwner);
                 }
                 if (typeof page !== 'string') {
                     return page;
@@ -152,7 +162,7 @@ export const generateOpenApiFromDocsConfig = async (navigation, openApiFiles, pa
                             processOpenApiWebhook(endpoint, webhookObject, schema, tempNav, tempDecoratedNav, writePromises, pagesAcc, {
                                 openApiFilePath: openApiFile.originalFileLocation,
                                 writeFiles,
-                                outDir: DEFAULT_OUTPUT_DIR,
+                                outDir: currentDirectory ?? DEFAULT_OUTPUT_DIR,
                                 outDirBasePath: path.join(targetDir ?? '', 'src', '_props'),
                                 overwrite,
                                 localSchema,
@@ -170,7 +180,7 @@ export const generateOpenApiFromDocsConfig = async (navigation, openApiFiles, pa
                             processOpenApiPath(endpoint, { [method.toLowerCase()]: opObject }, schema, tempNav, tempDecoratedNav, writePromises, pagesAcc, {
                                 openApiFilePath: openApiFile.originalFileLocation,
                                 writeFiles,
-                                outDir: DEFAULT_OUTPUT_DIR,
+                                outDir: currentDirectory ?? DEFAULT_OUTPUT_DIR,
                                 outDirBasePath: path.join(targetDir ?? '', 'src', '_props'),
                                 overwrite,
                                 localSchema,
@@ -209,7 +219,7 @@ export const generateOpenApiFromDocsConfig = async (navigation, openApiFiles, pa
                 const items = newNav[division];
                 newNav = {
                     ...newNav,
-                    [division]: await Promise.all(items.map((item) => processNav(item, currentOpenApi, currentOpenApiOwner))),
+                    [division]: await Promise.all(items.map((item) => processNav(item, currentOpenApi, currentDirectory, currentOpenApiOwner))),
                 };
             }
         }
@@ -218,10 +228,10 @@ export const generateOpenApiFromDocsConfig = async (navigation, openApiFiles, pa
         }
         return newNav;
     }
-    const navAfterExplicit = await processNav(navigation, undefined);
+    const navAfterExplicit = await processNav(navigation, undefined, undefined, undefined);
     async function generateBulkNav(node) {
         let updated = node;
-        if (extractOpenApiFromNav(updated) && !skipBulkForNode.has(updated)) {
+        if (extractOpenApiFromNav(updated).source && !skipBulkForNode.has(updated)) {
             const processed = await processOpenApiInNav(updated);
             if (processed)
                 updated = processed;