From 49d9b4cbe55cc68b48aab7543d50e6e82082dd7d Mon Sep 17 00:00:00 2001 From: Kay Schecker Date: Thu, 5 Nov 2020 20:43:53 +0100 Subject: [PATCH 1/3] fix(#113): command builder for boolean args --- apps/generator-cli/src/app/services/generator.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/generator-cli/src/app/services/generator.service.ts b/apps/generator-cli/src/app/services/generator.service.ts index 2984baebd..650db5ae3 100644 --- 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) From fca1bba4f9dcd1ff0920029e79bbc7bd9c37e3d7 Mon Sep 17 00:00:00 2001 From: Kay Schecker Date: Thu, 5 Nov 2020 20:44:09 +0100 Subject: [PATCH 2/3] chore: update README.md --- apps/generator-cli/src/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/generator-cli/src/README.md b/apps/generator-cli/src/README.md index 391265f44..a6b517783 100644 --- 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}", From 90e5e5f508d60ac236671949f47dcc88dc137b34 Mon Sep 17 00:00:00 2001 From: Kay Schecker Date: Thu, 5 Nov 2020 20:48:09 +0100 Subject: [PATCH 3/3] fix: unit test --- .../src/app/services/generator.service.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/generator-cli/src/app/services/generator.service.spec.ts b/apps/generator-cli/src/app/services/generator.service.spec.ts index 776334f85..ae8f4a063 100644 --- 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,7 +152,7 @@ describe('GeneratorService', () => { `--rel-dir="def/app"`, `--rel-path="def/app/car.json"`, `--ext="json"`, - '--some-bool=true', + '--some-bool', '--some-int=1', ]), ]], @@ -160,12 +160,12 @@ describe('GeneratorService', () => { 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', []],