From 6107bd58d3bb659b4c1432dfe9bc668a70fb9c5d Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 25 Aug 2020 17:51:21 +0300 Subject: [PATCH] feat: use same schema on proxy and api commands --- .../schematics/src/commands/api/schema.json | 26 +++++++++---------- .../schematics/src/commands/api/schema.ts | 12 ++++----- .../schematics/src/commands/proxy/schema.json | 24 +++++------------ .../schematics/src/commands/proxy/schema.ts | 11 +++----- 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/api/schema.json b/npm/ng-packs/packages/schematics/src/commands/api/schema.json index afed78c2ca..4411418c34 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/api/schema.json @@ -4,36 +4,36 @@ "title": "ABP Generate API Schema", "type": "object", "properties": { - "solution": { - "alias": "x", - "description": "Solution name", + "module": { + "alias": "m", + "description": "Backend module to generate code for", "type": "string", "$default": { "$source": "argv", "index": 0 }, - "x-prompt": "Please enter the solution name. (case-sensitive, eg. Acme.BookStore)" + "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")" }, - "target": { - "alias": "t", - "description": "Angular project to generate code in", + "source": { + "alias": "s", + "description": "Angular project to resolve root namespace & API definition URL from", "type": "string", "$default": { "$source": "argv", "index": 1 }, - "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")" + "x-prompt": "Plese enter Angular project name to resolve root namespace & API definition URL from. (default: workspace \"defaultProject\")" }, - "module": { - "alias": "m", - "description": "Backend module to generate code for", + "target": { + "alias": "t", + "description": "Angular project to generate code in", "type": "string", "$default": { "$source": "argv", "index": 2 }, - "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")" + "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")" } }, - "required": ["solution"] + "required": [] } diff --git a/npm/ng-packs/packages/schematics/src/commands/api/schema.ts b/npm/ng-packs/packages/schematics/src/commands/api/schema.ts index 32e316cf53..0c26ce461f 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/schema.ts +++ b/npm/ng-packs/packages/schematics/src/commands/api/schema.ts @@ -1,16 +1,16 @@ export interface Schema { /** - * Solution name + * Backend module to generate code for */ - solution: string; + module?: string; /** - * Angular project to generate code in + * Angular project to resolve root namespace & API definition URL from */ - target?: string; + source?: string; /** - * Backend module to generate code for + * Angular project to generate code in */ - module?: string; + target?: string; } diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json index 7e4c0fc88e..f0b76bbdf6 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json @@ -4,25 +4,25 @@ "title": "ABP Generate Proxy Schema", "type": "object", "properties": { - "solution": { - "alias": "x", - "description": "Solution name", + "module": { + "alias": "m", + "description": "Backend module to generate code for", "type": "string", "$default": { "$source": "argv", "index": 0 }, - "x-prompt": "Please enter the solution name. (case-sensitive, eg. Acme.BookStore)" + "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")" }, "source": { "alias": "s", - "description": "Angular project to resolve API definition URL from", + "description": "Angular project to resolve root namespace & API definition URL from", "type": "string", "$default": { "$source": "argv", "index": 1 }, - "x-prompt": "Plese enter Angular project name to resolve API definition URL from. (default: workspace \"defaultProject\")" + "x-prompt": "Plese enter Angular project name to resolve root namespace & API definition URL from. (default: workspace \"defaultProject\")" }, "target": { "alias": "t", @@ -33,17 +33,7 @@ "index": 2 }, "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")" - }, - "module": { - "alias": "m", - "description": "Backend module to generate code for", - "type": "string", - "$default": { - "$source": "argv", - "index": 3 - }, - "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")" } }, - "required": ["solution"] + "required": [] } diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts index 54f11b2da8..0c26ce461f 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts @@ -1,11 +1,11 @@ export interface Schema { /** - * Solution name + * Backend module to generate code for */ - solution: string; + module?: string; /** - * Angular project to resolve API definition URL from + * Angular project to resolve root namespace & API definition URL from */ source?: string; @@ -13,9 +13,4 @@ export interface Schema { * Angular project to generate code in */ target?: string; - - /** - * Backend module to generate code for - */ - module?: string; }