From 61ad5bee59d60dc1bd0954078fc6d37efea90da4 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Mon, 31 Aug 2020 19:51:58 +0300
Subject: [PATCH] refactor: replace chainAndMerge with mergeAndAllowDelete

---
 .../schematics/src/commands/proxy-add/index.ts      |  9 +++++++--
 .../schematics/src/commands/proxy-refresh/index.ts  |  6 +++---
 .../schematics/src/commands/proxy-remove/index.ts   |  6 +++---
 npm/ng-packs/packages/schematics/src/utils/rule.ts  | 13 ++++++-------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts
index 1400cfca1c..a0ddba2276 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts
@@ -3,13 +3,13 @@ import { chain, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { GenerateProxySchema } from '../../models';
 import {
   buildDefaultPath,
-  chainAndMerge,
   createApiDefinitionGetter,
   createApisGenerator,
   createProxyClearer,
   createProxyConfigReader,
   createProxyConfigSaver,
   createProxyWarningSaver,
+  mergeAndAllowDelete,
   removeDefaultPlaceholders,
   resolveProject,
 } from '../../utils';
@@ -45,7 +45,12 @@ export default function(schema: GenerateProxySchema) {
 
       const generateApis = createApisGenerator(schema, generated);
 
-      return chainAndMerge([clearProxy, saveProxyConfig, saveProxyWarning, generateApis])(host);
+      return chain([
+        mergeAndAllowDelete(host, clearProxy),
+        saveProxyConfig,
+        saveProxyWarning,
+        generateApis,
+      ]);
     },
   ]);
 }
diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts
index 2c4e20d7d2..4d3093edbb 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts
@@ -1,13 +1,13 @@
-import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import { chain, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { GenerateProxySchema } from '../../models';
 import {
   buildDefaultPath,
-  chainAndMerge,
   createApiDefinitionGetter,
   createApisGenerator,
   createProxyClearer,
   createProxyConfigReader,
   createProxyConfigSaver,
+  mergeAndAllowDelete,
   removeDefaultPlaceholders,
   resolveProject,
 } from '../../utils';
@@ -32,6 +32,6 @@ export default function(schema: GenerateProxySchema) {
 
     const generateApis = createApisGenerator(schema, generated);
 
-    return chainAndMerge([clearProxy, saveProxyConfig, generateApis])(host);
+    return chain([mergeAndAllowDelete(host, clearProxy), saveProxyConfig, generateApis]);
   };
 }
diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts
index 83cc43c0b8..6b6852a383 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts
@@ -1,14 +1,14 @@
 import { strings } from '@angular-devkit/core';
-import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import { chain, SchematicContext, Tree } from '@angular-devkit/schematics';
 import { GenerateProxySchema } from '../../models';
 import {
   buildDefaultPath,
-  chainAndMerge,
   createApiDefinitionGetter,
   createApisGenerator,
   createProxyClearer,
   createProxyConfigReader,
   createProxyConfigSaver,
+  mergeAndAllowDelete,
   removeDefaultPlaceholders,
   resolveProject,
 } from '../../utils';
@@ -38,6 +38,6 @@ export default function(schema: GenerateProxySchema) {
 
     const generateApis = createApisGenerator(schema, generated);
 
-    return chainAndMerge([clearProxy, saveProxyConfig, generateApis])(host);
+    return chain([mergeAndAllowDelete(host, clearProxy), saveProxyConfig, generateApis]);
   };
 }
diff --git a/npm/ng-packs/packages/schematics/src/utils/rule.ts b/npm/ng-packs/packages/schematics/src/utils/rule.ts
index 39b14cec78..bd6acdd646 100644
--- a/npm/ng-packs/packages/schematics/src/utils/rule.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/rule.ts
@@ -1,6 +1,6 @@
 import {
   apply,
-  chain,
+  callRule,
   forEach,
   MergeStrategy,
   mergeWith,
@@ -18,12 +18,11 @@ export function applyWithOverwrite(source: Source, rules: Rule[]): Rule {
   };
 }
 
-export function chainAndMerge(rules: Rule[]) {
-  return (host: Tree) => async (tree: Tree, context: SchematicContext) =>
-    host.merge(
-      (await (chain(rules)(tree, context) as any).toPromise()) as Tree,
-      MergeStrategy.AllowDeleteConflict,
-    );
+export function mergeAndAllowDelete(host: Tree, rule: Rule) {
+  return async (tree: Tree, context: SchematicContext) => {
+    const nextTree = await callRule(rule, tree, context).toPromise();
+    host.merge(nextTree, MergeStrategy.AllowDeleteConflict);
+  };
 }
 
 export function overwriteFileIfExists(tree: Tree): Rule {