fix(cling): Fix option list concatenation in usage description

simonlovesyou · Aug 4, 2021 · 4835ae1 · 4835ae1
1 parent 06a5dfb
commit 4835ae1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/packages/cling/src/utils/mapSchemaToUsageHelp.spec.ts b/packages/cling/src/utils/mapSchemaToUsageHelp.spec.ts
@@ -146,6 +146,41 @@ describe("multiple arguments", () => {
   });
 });
 
+describe("muliple options", () => {
+  const schemaFixture = testFixture({
+    options: {
+      help: {
+        type: "boolean",
+      },
+      version: {
+        type: 'boolean'
+      }
+    },
+  } as const);
+  it("should return the correct usage guide", () => {
+    expect(mapSchemaUsageToHelp(schemaFixture.get(), "lol")).toStrictEqual([
+      { content: "Usage: lol [--help] [--version]", header: "lol" },
+      {
+        header: "Options",
+        optionList: [
+          {
+            alias: undefined,
+            description: undefined,
+            name: "help",
+            typeLabel: "boolean",
+          },
+          {
+            alias: undefined,
+            description: undefined,
+            name: "version",
+            typeLabel: "boolean",
+          },
+        ],
+      },
+    ]);
+  });
+});
+
 describe("single positional", () => {
   const schemaFixture = testFixture({
     positionals: [

diff --git a/packages/cling/src/utils/mapSchemaToUsageHelp.ts b/packages/cling/src/utils/mapSchemaToUsageHelp.ts
@@ -47,8 +47,7 @@ const schemaToUsageDescription = (
             ...argument,
             name: argument.name ?? name,
           })
-        )
-        .join(" "),
+        ),
     schema.options &&
       Object.entries(schema.options).map(([name, argument]) =>
         mapArgumentToLabel({
@@ -64,6 +63,7 @@ const schemaToUsageDescription = (
     ),
   ]
     .filter((section) => section)
+    .map((section) => Array.isArray(section) ? section.join(' ') : section)
     .join(" ")
     .trim();
 };