fix: append suffix to all filenames

Author: mdonnalley

src/ditamap/base-ditamap.ts

@@ -10,8 +10,8 @@ import { Ditamap } from './ditamap';
 export class BaseDitamap extends Ditamap {
   public constructor(topics: string[]) {
     // Set the data of topic and filenames
-    super(Ditamap.getFileName(), {
-      namespaceDitamapFiles: topics.sort().map((topic) => `${topic}/cli_reference_${topic}.ditamap`),
+    super(Ditamap.file('cli_reference', 'ditamap'), {
+      namespaceDitamapFiles: topics.sort().map((topic) => Ditamap.file(`${topic}/cli_reference_${topic}`, 'ditamap')),
     });
   }
 

src/ditamap/cli-reference-topic.ts

@@ -10,7 +10,7 @@ import { Ditamap } from './ditamap';
 
 export class CLIReferenceTopic extends Ditamap {
   public constructor(topic: string, longDescription: string) {
-    const filename = `cli_reference_${topic}.xml`;
+    const filename = Ditamap.file(`cli_reference_${topic}`, 'xml');
     // Set the data of topic and filenames
     super(filename, {
       topic,

src/ditamap/cli-reference.ts

@@ -9,7 +9,7 @@ import { Ditamap } from './ditamap';
 
 export class CLIReference extends Ditamap {
   public constructor() {
-    const filename = 'cli_reference.xml';
+    const filename = Ditamap.file('cli_reference', 'xml');
 
     super(filename, {
       cliVersion: Ditamap.cliVersion,

src/ditamap/command.ts

@@ -30,7 +30,7 @@ export type CommandHelpInfo = {
 export class Command extends Ditamap {
   public constructor(topic: string, subtopic: string, command: Dictionary, commandMeta: JsonMap = {}) {
     const commandWithUnderscores = ensureString(command.id).replace(/:/g, '_');
-    const filename = `cli_reference_${commandWithUnderscores}.xml`;
+    const filename = Ditamap.file(`cli_reference_${commandWithUnderscores}`, 'xml');
 
     super(filename, {});
 

src/ditamap/ditamap.ts

@@ -52,8 +52,8 @@ export abstract class Ditamap {
     Ditamap._suffix = suffix;
   }
 
-  public static getFileName(): string {
-    return Ditamap.suffix ? `cli_reference_${Ditamap.suffix}.ditamap` : 'cli_reference.ditamap';
+  public static file(name: string, ext: string): string {
+    return Ditamap.suffix ? `${name}_${Ditamap.suffix}.${ext}` : `${name}.${ext}`;
   }
 
   private static _suffix: string;

src/ditamap/main-topic-intro.ts

@@ -12,7 +12,7 @@ import { Ditamap } from './ditamap';
 
 export class MainTopicIntro extends Ditamap {
   public constructor(topic: string, subtopic: string, subTopicMeta: JsonMap) {
-    const filename = `cli_reference_${topic}_${subtopic}.xml`;
+    const filename = Ditamap.file(`cli_reference_${topic}_${subtopic}`, 'xml');
 
     let trailblazerCommunityUrl;
     let trailblazerCommunityName;

src/ditamap/topic-commands.ts

@@ -11,7 +11,7 @@ import { Ditamap } from './ditamap';
 
 export class TopicCommands extends Ditamap {
   public constructor(topic: string, topicMeta: JsonMap) {
-    const filename = `cli_reference_${topic}_commands.xml`;
+    const filename = Ditamap.file(`cli_reference_${topic}_commands`, 'xml');
     // Set the data of topic and filenames
     super(filename, topicMeta);
 

src/ditamap/topic-ditamap.ts

@@ -10,7 +10,7 @@ import { Ditamap } from './ditamap';
 
 export class TopicDitamap extends Ditamap {
   public constructor(topic: string, commandIds: string[]) {
-    const filename = `cli_reference_${topic}.ditamap`;
+    const filename = Ditamap.file(`cli_reference_${topic}`, 'ditamap');
     // Set the data of topic and filenames
     const commands = commandIds.sort().map((c) => ({ command: c.replace(/:/g, '_') }));
     super(filename, { topic, commands });

src/utils.ts

@@ -11,12 +11,14 @@ import { EOL } from 'os';
 import { join } from 'path';
 import { Dictionary, isObject } from '@salesforce/ts-types';
 import { fs } from '@salesforce/core';
+import { Ditamap } from './ditamap/ditamap';
 
 export const events = new EventEmitter();
 
 export async function copyStaticFile(outputDir: string, fileDir: string, fileName: string): Promise<void> {
   const source = join(fileDir, fileName);
-  const dest = join(outputDir, fileName);
+  const [name, ext] = fileName.split('.');
+  const dest = join(outputDir, Ditamap.file(name, ext));
   await fs.mkdirp(outputDir);
   copyFileSync(source, dest);
 }