Do not unpack arguments directly on exported items

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

packages/techdocs-common/src/stages/generate/generators.ts

@@ -31,17 +31,11 @@ export class Generators implements GeneratorBuilder {
 
   static async fromConfig(
     config: Config,
-    {
-      logger,
-      containerRunner,
-    }: { logger: Logger; containerRunner: ContainerRunner },
+    options: { logger: Logger; containerRunner: ContainerRunner },
   ): Promise<GeneratorBuilder> {
     const generators = new Generators();
 
-    const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
-      logger,
-      containerRunner,
-    });
+    const techdocsGenerator = TechdocsGenerator.fromConfig(config, options);
     generators.register('techdocs', techdocsGenerator);
 
     return generators;

packages/techdocs-common/src/stages/generate/techdocs.ts

@@ -52,11 +52,9 @@ export class TechdocsGenerator implements GeneratorBase {
 
   static fromConfig(
     config: Config,
-    {
-      containerRunner,
-      logger,
-    }: { containerRunner: ContainerRunner; logger: Logger },
+    options: { containerRunner: ContainerRunner; logger: Logger },
   ) {
+    const { containerRunner, logger } = options;
     const scmIntegrations = ScmIntegrations.fromConfig(config);
     return new TechdocsGenerator({
       logger,
@@ -66,31 +64,28 @@ export class TechdocsGenerator implements GeneratorBase {
     });
   }
 
-  constructor({
-    logger,
-    containerRunner,
-    config,
-    scmIntegrations,
-  }: {
+  constructor(options: {
     logger: Logger;
     containerRunner: ContainerRunner;
     config: Config;
     scmIntegrations: ScmIntegrationRegistry;
   }) {
-    this.logger = logger;
-    this.options = readGeneratorConfig(config, logger);
-    this.containerRunner = containerRunner;
-    this.scmIntegrations = scmIntegrations;
+    this.logger = options.logger;
+    this.options = readGeneratorConfig(options.config, options.logger);
+    this.containerRunner = options.containerRunner;
+    this.scmIntegrations = options.scmIntegrations;
   }
 
-  public async run({
-    inputDir,
-    outputDir,
-    parsedLocationAnnotation,
-    etag,
-    logger: childLogger,
-    logStream,
-  }: GeneratorRunOptions): Promise<void> {
+  public async run(options: GeneratorRunOptions): Promise<void> {
+    const {
+      inputDir,
+      outputDir,
+      parsedLocationAnnotation,
+      etag,
+      logger: childLogger,
+      logStream,
+    } = options;
+
     // Do some updates to mkdocs.yml before generating docs e.g. adding repo_url
     const { path: mkdocsYmlPath, content } = await getMkdocsYml(inputDir);
 

packages/techdocs-common/src/stages/generate/types.ts

@@ -34,12 +34,13 @@ export type GeneratorConfig = {
 /**
  * The values that the generator will receive.
  *
- * @param {string} inputDir The directory of the uncompiled documentation, with the values from the frontend
- * @param {string} outputDir Directory to store generated docs in. Usually - a newly created temporary directory.
- * @param {ParsedLocationAnnotation} parsedLocationAnnotation backstage.io/techdocs-ref annotation of an entity
- * @param {string} etag A unique identifier for the prepared tree e.g. commit SHA. If provided it will be stored in techdocs_metadata.json.
- * @param {Logger} [logger] A logger that forwards the messages to the caller to be displayed outside of the backend.
- * @param {Writable} [logStream] A log stream that can send raw log messages to the caller to be displayed outside of the backend..
+ * @public
+ * @param inputDir - The directory of the uncompiled documentation, with the values from the frontend
+ * @param outputDir - Directory to store generated docs in. Usually - a newly created temporary directory.
+ * @param parsedLocationAnnotation - backstage.io/techdocs-ref annotation of an entity
+ * @param etag - A unique identifier for the prepared tree e.g. commit SHA. If provided it will be stored in techdocs_metadata.json.
+ * @param logger - A logger that forwards the messages to the caller to be displayed outside of the backend.
+ * @param logStream - A log stream that can send raw log messages to the caller to be displayed outside of the backend.
  */
 export type GeneratorRunOptions = {
   inputDir: string;

packages/techdocs-common/src/stages/publish/index.ts

@@ -14,4 +14,9 @@
  * limitations under the License.
  */
 export { Publisher } from './publish';
-export type { PublisherBase, PublisherType, TechDocsMetadata } from './types';
+export type {
+  PublisherBase,
+  PublisherType,
+  TechDocsMetadata,
+  ReadinessResponse,
+} from './types';

packages/techdocs-common/src/stages/publish/types.ts

@@ -51,6 +51,8 @@ export type PublishResponse = {
 
 /**
  * Result for the validation check.
+ *
+ * @public
  */
 export type ReadinessResponse = {
   /** If true, the publisher is able to interact with the backing storage. */
@@ -59,7 +61,7 @@ export type ReadinessResponse = {
 
 /**
  * Type to hold metadata found in techdocs_metadata.json and associated with each site
- * @param etag ETag of the resource used to generate the site. Usually the latest commit sha of the source repository.
+ * @param etag - ETag of the resource used to generate the site. Usually the latest commit sha of the source repository.
  */
 export type TechDocsMetadata = {
   site_name: string;
@@ -86,6 +88,8 @@ export type MigrateRequest = {
  * Base class for a TechDocs publisher (e.g. Local, Google GCS Bucket, AWS S3, etc.)
  * The publisher handles publishing of the generated static files after the prepare and generate steps of TechDocs.
  * It also provides APIs to communicate with the storage service.
+ *
+ * @public
  */
 export interface PublisherBase {
   /**
@@ -99,8 +103,8 @@ export interface PublisherBase {
   /**
    * Store the generated static files onto a storage service (either local filesystem or external service).
    *
-   * @param request Object containing the entity from the service
-   * catalog, and the directory that contains the generated static files from TechDocs.
+   * @param request - Object containing the entity from the service
+   *                  catalog, and the directory that contains the generated static files from TechDocs.
    */
   publish(request: PublishRequest): Promise<PublishResponse>;