docusaurus-plugin-typedoc 1.2.2 → 1.2.3

package/dist/index.d.ts

@@ -2,4 +2,4 @@
  * @module core
  */
 export { PluginOptions } from './models.js';
-export { default } from './plugins/docusaurus.js';
+export { default } from './plugin/docusaurus.js';

package/dist/index.js

@@ -1 +1 @@
-export { default } from './plugins/docusaurus.js';
+export { default } from './plugin/docusaurus.js';

package/dist/options/declarations.d.ts

@@ -1,12 +1,4 @@
 import { DeclarationOption } from 'typedoc';
-/**
- * Used internally to pass options from docusaurus.config to TypeDoc.
- *
- * @internal
- *
- * @hidden
- */
-export declare const docusaurusConfigOptions: Partial<DeclarationOption>;
 /**
  * **autoConfiguration**
  *

package/dist/options/declarations.js

@@ -1,17 +1,5 @@
 import { ParameterType } from 'typedoc';
 import { DEFAULT_SIDEBAR_OPTIONS } from './options.js';
-/**
- * Used internally to pass options from docusaurus.config to TypeDoc.
- *
- * @internal
- *
- * @hidden
- */
-export const docusaurusConfigOptions = {
-    help: 'docusaurus.config options - should not be used if running as a docusaurus plugin.',
-    type: ParameterType.String,
-    defaultValue: '{}',
-};
 /**
  * **autoConfiguration**
  *

package/dist/options/options.js

@@ -26,10 +26,7 @@ export function getPluginOptions(context, opts) {
             ...opts.sidebar,
         },
         plugin: [
-            ...new Set([
-                ...['typedoc-plugin-markdown', 'docusaurus-plugin-typedoc/typedoc'],
-                ...(opts.plugin || []),
-            ]),
+            ...new Set([...['typedoc-plugin-markdown'], ...(opts.plugin || [])]),
         ],
     };
     return options;

package/dist/{plugins → plugin}/docusaurus.js

@@ -1,8 +1,6 @@
-import { spawnSync } from 'child_process';
 import * as fs from 'fs';
-import * as path from 'path';
 import { getPluginOptions } from '../options/options.js';
-import { presets } from '../options/presets.js';
+import { writeSidebar } from './sidebar.js';
 export default async function pluginDocusaurus(context, opts) {
     await generateTypedoc(context, opts);
     return {
@@ -26,19 +24,19 @@ export default async function pluginDocusaurus(context, opts) {
  * Initiates a new typedoc Application bootstrapped with plugin options
  */
 async function generateTypedoc(context, opts) {
+    // get plugin options
+    const options = getPluginOptions(context, opts);
     // create outDir if it doesn't exist
-    const outputDir = path.join(context?.siteDir, presets.out);
-    if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir, { recursive: true });
+    if (!fs.existsSync(options.out)) {
+        fs.mkdirSync(options.out, { recursive: true });
     }
-    const { plugin, ...options } = getPluginOptions(context, opts);
-    // spawn typedoc process and pass docusaurus.config options as a string
-    const typedocExecutable = process.platform === 'win32' ? 'typedoc.cmd' : 'typedoc';
-    spawnSync(typedocExecutable, [
-        ...plugin.flatMap((plugin) => ['--plugin', plugin]),
-        '--docusaurusConfigOptions',
-        `${JSON.stringify(options)}`,
-    ], {
-        stdio: 'inherit',
+    // configure options for typedoc
+    const { 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    id, siteDir, numberPrefixParser, docsPresetPath, sidebar, ...optionsPassedToTypeDoc } = options;
+    const typeDocApp = await import('./typedoc.cjs');
+    // bootstrap typedoc with options
+    await typeDocApp.bootstrap(optionsPassedToTypeDoc, async (renderer) => {
+        writeSidebar(renderer.navigation, renderer.outputDirectory, sidebar, siteDir, docsPresetPath, numberPrefixParser);
     });
 }

package/dist/plugin/sidebar.d.ts

@@ -0,0 +1,3 @@
+import { NavigationItem } from 'typedoc-plugin-markdown';
+import { Sidebar } from '../types/options.js';
+export declare function writeSidebar(navigation: NavigationItem[], outputDir: string, sidebar: Sidebar, siteDir: string, docsPresetPath: string, numberPrefixParser: any): void;

package/dist/{utils/get-sidebar.js → plugin/sidebar.js}

@@ -1,4 +1,25 @@
-export function getSidebar(navigation, basePath, options, numberPrefixParser) {
+import * as fs from 'fs';
+import * as path from 'path';
+import { adjustBaseDirectory } from '../utils/adjust-basedir.js';
+export function writeSidebar(navigation, outputDir, sidebar, siteDir, docsPresetPath, numberPrefixParser) {
+    if (sidebar?.autoConfiguration) {
+        const sidebarPath = path.resolve(outputDir, 'typedoc-sidebar.cjs');
+        let baseDir = path
+            .relative(siteDir, outputDir)
+            .split(path.sep)
+            .slice(1)
+            .join('/');
+        if (docsPresetPath) {
+            baseDir = adjustBaseDirectory(baseDir, docsPresetPath);
+        }
+        const sidebarJson = getSidebar(navigation, baseDir, sidebar, numberPrefixParser);
+        fs.writeFileSync(sidebarPath, `// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: ${JSON.stringify(sidebarJson, null, sidebar.pretty ? 2 : 0)}};
+module.exports = typedocSidebar.items;`);
+    }
+}
+function getSidebar(navigation, basePath, options, numberPrefixParser) {
     return navigation
         .map((navigationItem) => getNavigationItem(navigationItem, basePath, options, numberPrefixParser))
         .filter((navItem) => Boolean(navItem));

package/dist/plugin/typedoc.cjs

@@ -0,0 +1,31 @@
+/**
+ * Export as cjs to be compatible with esm
+ */
+module.exports = {
+  bootstrap: async (options, postRenderCallbackFn) => {
+    const typedoc = await import('typedoc');
+
+    const app = await typedoc.Application.bootstrapWithPlugins(options, [
+      new typedoc.TypeDocReader(),
+      new typedoc.PackageJsonReader(),
+      new typedoc.TSConfigReader(),
+    ]);
+
+    app.renderer.postRenderAsyncJobs.push(postRenderCallbackFn);
+
+    const project = await app.convert();
+
+    // if project is undefined typedoc has a problem - error logging will be supplied by typedoc.
+    if (!project) {
+      return;
+    }
+
+    if (options.watch) {
+      app.convertAndWatch(async (project) => {
+        await app.generateOutputs(project);
+      });
+    } else {
+      await app.generateOutputs(project);
+    }
+  },
+};

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "docusaurus-plugin-typedoc",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A Docusaurus plugin to integrate TypeDoc ( + typedoc-plugin-markdown ) into a Docusaurus project.",
   "exports": {
-    ".": "./dist/index.js",
-    "./typedoc": "./dist/plugins/typedoc.js"
+    ".": "./dist/index.js"
   },
   "type": "module",
   "files": [
@@ -24,7 +23,7 @@
   },
   "scripts": {
     "lint": "eslint ./src",
-    "prebuild": "rm -rf dist && prebuild-options",
+    "prebuild": "rm -rf dist && copyfiles --up 1 ./src/**/*.cjs ./dist/",
     "prepublishOnly": "npm run lint && npm run build",
     "build": "tsc",
     "pretest": "rm -rf ./test/out && docusaurus generate-typedoc",
@@ -39,7 +38,7 @@
     "plugin"
   ],
   "devDependencies": {
-    "@docusaurus/core": "^3.6.1",
-    "@docusaurus/types": "^3.6.1"
+    "@docusaurus/core": "^3.7.0",
+    "@docusaurus/types": "^3.7.0"
   }
 }

package/dist/plugins/typedoc.d.ts

@@ -1,2 +0,0 @@
-import { MarkdownApplication } from 'typedoc-plugin-markdown';
-export declare function load(app: MarkdownApplication): void;

package/dist/plugins/typedoc.js

@@ -1,56 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as options from '../options/declarations.js';
-import { adjustBaseDirectory } from '../utils/adjust-basedir.js';
-import { getSidebar } from '../utils/get-sidebar.js';
-export function load(app) {
-    Object.entries(options).forEach(([name, option]) => {
-        app.options.addDeclaration({
-            name,
-            ...option,
-        });
-    });
-    app.options.addReader(new (class {
-        name = 'docusaurus-options';
-        order = 100;
-        supportsPackages = false;
-        read(container) {
-            const presets = JSON.parse(container.getValue('docusaurusConfigOptions'));
-            const ignoreKeys = [
-                'id',
-                'siteDir',
-                'docsPresetPath',
-                'numberPrefixParser',
-            ];
-            Object.entries(presets)
-                .filter(([key]) => !ignoreKeys.includes(key))
-                .forEach(([key, value]) => {
-                container.setValue(key, value);
-            });
-        }
-    })());
-    app.renderer.postRenderAsyncJobs.push(async (output) => {
-        const outputDir = app.options.getValue('out');
-        const docusaurusConfigOptions = JSON.parse(app.options.getValue('docusaurusConfigOptions'));
-        const sidebar = app.options.getValue('sidebar');
-        const siteDir = docusaurusConfigOptions.siteDir;
-        const docsPresetPath = docusaurusConfigOptions.docsPresetPath;
-        const numberPrefixParser = docusaurusConfigOptions.numberPrefixParser;
-        if (sidebar?.autoConfiguration && output.navigation) {
-            const sidebarPath = path.resolve(outputDir, 'typedoc-sidebar.cjs');
-            let baseDir = path
-                .relative(siteDir, outputDir)
-                .split(path.sep)
-                .slice(1)
-                .join('/');
-            if (docsPresetPath) {
-                baseDir = adjustBaseDirectory(baseDir, docsPresetPath);
-            }
-            const sidebarJson = getSidebar(output.navigation, baseDir, sidebar, numberPrefixParser);
-            fs.writeFileSync(sidebarPath, `// @ts-check
-/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
-const typedocSidebar = { items: ${JSON.stringify(sidebarJson, null, sidebar.pretty ? 2 : 0)}};
-module.exports = typedocSidebar.items;`);
-        }
-    });
-}

package/dist/utils/get-sidebar.d.ts

@@ -1,3 +0,0 @@
-import { NavigationItem } from 'typedoc-plugin-markdown';
-import { Sidebar } from '../types/options.js';
-export declare function getSidebar(navigation: NavigationItem[], basePath: string, options: Sidebar, numberPrefixParser?: any): any;