feat: use same schema on proxy and api commands

npm/ng-packs/packages/schematics/src/commands/api/schema.json

@@ -4,36 +4,36 @@
   "title": "ABP Generate API Schema",
   "type": "object",
   "properties": {
-    "solution": {
+    "module": {
-      "alias": "x",
+      "alias": "m",
-      "description": "Solution name",
+      "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": {
+    "source": {
-      "alias": "t",
+      "alias": "s",
-      "description": "Angular project to generate code in",
+      "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": {
+    "target": {
-      "alias": "m",
+      "alias": "t",
-      "description": "Backend module to generate code for",
+      "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": []
 }

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;
 }

npm/ng-packs/packages/schematics/src/commands/proxy/schema.json

@@ -4,25 +4,25 @@
   "title": "ABP Generate Proxy Schema",
   "type": "object",
   "properties": {
-    "solution": {
+    "module": {
-      "alias": "x",
+      "alias": "m",
-      "description": "Solution name",
+      "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": []
 }

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;
 }