fix: update generate command reference

Author: mdonnalley

src/commands/commandreference/generate.ts

@@ -37,7 +37,7 @@ export default class CommandReferenceGenerate extends SfCommand {
       multiple: true,
     }),
     'ditamap-suffix': Flags.string({
-      char: 'b',
+      char: 's',
       description: messages.getMessage('ditamapSuffixFlagDescription'),
       default: Ditamap.SUFFIX,
     }),

src/ditamap/ditamap.ts

@@ -21,7 +21,7 @@ hb.registerHelper('join', (array) => array.join(', '));
  */
 // tslint:disable-next-line: no-any
 hb.registerHelper('isCodeBlock', function (this: any, val, options) {
-  return val.indexOf('sf') >= 0 || val.indexOf('sfdx') >= 0 || val.indexOf('$') >= 0 || val.indexOf('>>') >= 0
+  return val.indexOf('sf') === 0 || val.indexOf('sfdx') === 0 || val.indexOf('$') >= 0 || val.indexOf('>>') >= 0
     ? options.fn(this)
     : options.inverse(this);
 });

src/docs.ts

@@ -65,7 +65,6 @@ export class Docs {
         return;
       }
     }
-    await new CLIReferenceTopic(topic, description).write();
 
     const subTopicNames = [];
     const commandIds = [];
@@ -118,6 +117,10 @@ export class Docs {
 
     // The topic ditamap with all of the subtopic links.
     events.emit('subtopics', topic, subTopicNames);
+
+    if (commandIds.includes(topic)) {
+      await new CLIReferenceTopic(topic, description).write();
+    }
     await new TopicCommands(topic, topicMeta).write();
     await new TopicDitamap(topic, commandIds).write();
     return subTopicNames;

templates/command.hbs

@@ -54,7 +54,7 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
                 Trailblazer Community.</note>
         </section>{{/if}}{{#if isBetaCommand}}
         <section>
-            <note>This feature is a Beta Service. Customers may opt to try such Beta Service in its sole discretion. Any use of the Beta Service is subject to the applicable Beta Services Terms provided at Agreements and Terms (<xref href="{{trailblazerCommunityUrl}}" format="html" scope="external" type="new-window:HTML">https://www.salesforce.com/company/legal/agreements/</xref>).</note>
+            <note>This feature is a Beta Service. Customers may opt to try such Beta Service in its sole discretion. Any use of the Beta Service is subject to the applicable Beta Services Terms provided at Agreements and Terms (<xref href="https://www.salesforce.com/company/legal/agreements/" format="html" scope="external" type="new-window:HTML">https://www.salesforce.com/company/legal/agreements/</xref>).</note>
         </section>{{/if}}
         {{#if help}}
         <section>

templates/topic_ditamap.hbs

@@ -9,7 +9,7 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
 
 -->
     <title><codeph otherprops="nolang">{{topic}}</codeph> Namespace</title>
-    <topicref href="cli_reference_{{topic}}_commands.xml" type="concept" format="dita" scope="local">
+    <topicref href="cli_reference_{{topic}}_commands.xml" type="concept" format="dita" scope="local" chunk="to-content" collection-type="unordered">
         {{#each commands}}
         <topicref href="cli_reference_{{command}}.xml" type="reference" format="dita" scope="local"/>
         {{/each}}