Merge branch 'fix/113-boolean-cli-flags'

OpenAPITools · Nov 5, 2020 · 66b3094 · 66b3094
2 parents f16f90c + 90e5e5f
commit 66b3094
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/apps/generator-cli/src/README.md b/apps/generator-cli/src/README.md
@@ -120,6 +120,7 @@ Initially the file has the following content:
 This configuration indicates the following:
 
 - the json file shall be formatted using **2 spaces**
+- the jar files shall be downloaded to *./my/custom/storage/dir*
 - the generator-cli version 4.3.1 is used
 
 Further it is also possible to configure generators, for example:
@@ -130,7 +131,8 @@ Further it is also possible to configure generators, for example:
   "spaces": 2,
   "generator-cli": {
     "version": "4.3.1",
-    "generators": {
+    "storageDir": "~/my/custom/storage/dir", // optional
+    "generators": { // optional
       "v2.0": { // any name you like (just printed to the console log) 
         "generatorName": "typescript-angular",
         "output": "#{cwd}/output/v2.0/#{ext}/#{name}",

diff --git a/apps/generator-cli/src/app/services/generator.service.spec.ts b/apps/generator-cli/src/app/services/generator.service.spec.ts
@@ -138,7 +138,7 @@ describe('GeneratorService', () => {
             `--rel-dir="def/app"`,
             `--rel-path="def/app/pet.yaml"`,
             `--ext="yaml"`,
-            '--some-bool=true',
+            '--some-bool',
             '--some-int=1',
           ]),
           cmd('[baz] def/app/car.json', [
@@ -152,20 +152,20 @@ describe('GeneratorService', () => {
             `--rel-dir="def/app"`,
             `--rel-path="def/app/car.json"`,
             `--ext="json"`,
-            '--some-bool=true',
+            '--some-bool',
             '--some-int=1',
           ]),
         ]],
         ['bar.json', [
           cmd('[bar] api/cat.yaml', [
             `--input-spec="${cwd}/api/cat.yaml"`,
             `--output="bar/cat"`,
-            '--some-bool=false',
+            '--some-bool',
           ]),
           cmd('[bar] api/bird.json', [
             `--input-spec="${cwd}/api/bird.json"`,
             `--output="bar/bird"`,
-            '--some-bool=false',
+            '--some-bool',
           ]),
         ]],
         ['none.json', []],

diff --git a/apps/generator-cli/src/app/services/generator.service.ts b/apps/generator-cli/src/app/services/generator.service.ts
@@ -90,16 +90,17 @@ export class GeneratorService {
         switch (typeof v) {
           case 'object':
             return `"${Object.entries(v).map(z => z.join('=')).join(',')}"`
-          case 'boolean':
           case 'number':
           case 'bigint':
             return `${v}`
+          case 'boolean':
+            return undefined
           default:
             return `"${v}"`
         }
       })()
 
-      return `--${key}=${value}`
+      return value === undefined ? `--${key}` : `--${key}=${value}`
     }).join(' ')
 
     const ext = path.extname(absoluteSpecPath)