From a4d9df215c4e7728fe09dff2f3d7d011a6f05c50 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 28 Aug 2020 00:50:11 +0300
Subject: [PATCH] feat: use proxy config reader and saver in commands

---
 .../packages/schematics/src/commands/api/index.ts     |  9 +++++----
 .../packages/schematics/src/commands/proxy/index.ts   | 11 ++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/commands/api/index.ts b/npm/ng-packs/packages/schematics/src/commands/api/index.ts
index 24e0f816af..9554c54506 100644
--- a/npm/ng-packs/packages/schematics/src/commands/api/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/api/index.ts
@@ -9,15 +9,16 @@ import {
   Tree,
   url,
 } from '@angular-devkit/schematics';
+import { PROXY_CONFIG_PATH } from '../../constants';
 import { Exception } from '../../enums';
 import { ServiceGeneratorParams } from '../../models';
 import {
   applyWithOverwrite,
   buildDefaultPath,
-  createApiDefinitionReader,
   createControllerToServiceMapper,
   createImportRefsToModelReducer,
   createImportRefToEnumMapper,
+  createProxyConfigReader,
   EnumGeneratorParams,
   getEnumNamesFromImports,
   getRootNamespace,
@@ -40,9 +41,9 @@ export default function(schema: GenerateProxySchema) {
       const target = await resolveProject(tree, params.target!);
       const solution = getRootNamespace(tree, source, moduleName);
       const targetPath = buildDefaultPath(target.definition);
-      const definitionPath = `${targetPath}/shared/api-definition.json`;
-      const readApiDefinition = createApiDefinitionReader(definitionPath);
-      const data = readApiDefinition(tree);
+      const definitionPath = targetPath + PROXY_CONFIG_PATH;
+      const readProxyConfig = createProxyConfigReader(definitionPath);
+      const data = readProxyConfig(tree);
       const types = data.types;
       const modules = data.modules;
       if (!types || !modules) throw new SchematicsException(Exception.InvalidApiDefinition);
diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy/index.ts
index ddbbd68caa..fc405b5a58 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy/index.ts
@@ -6,11 +6,11 @@ import {
   SchematicContext,
   Tree,
 } from '@angular-devkit/schematics';
-import { API_DEFINITION_ENDPOINT } from '../../constants';
+import { API_DEFINITION_ENDPOINT, PROXY_CONFIG_PATH } from '../../constants';
 import { ApiDefinition } from '../../models';
 import {
   buildDefaultPath,
-  createApiDefinitionSaver,
+  createProxyConfigSaver,
   getApiDefinition,
   getSourceUrl,
   removeDefaultPlaceholders,
@@ -30,13 +30,10 @@ export default function(schema: GenerateProxySchema) {
       const targetPath = buildDefaultPath(target.definition);
       const data: ApiDefinition = await getApiDefinition(sourceUrl + API_DEFINITION_ENDPOINT);
 
-      const saveApiDefinition = createApiDefinitionSaver(
-        data,
-        `${targetPath}/shared/api-definition.json`,
-      );
+      const saveProxyConfig = createProxyConfigSaver(data, targetPath + PROXY_CONFIG_PATH);
       const createApi = schematic('api', schema);
 
-      return branchAndMerge(chain([saveApiDefinition, createApi]));
+      return branchAndMerge(chain([saveProxyConfig, createApi]));
     },
   ]);
 }