@angular-devkit/schematics 11.1.0 → 11.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "11.1.0",
+  "version": "11.1.4",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "11.1.0",
+    "@angular-devkit/core": "11.1.4",
     "ora": "5.2.0",
     "rxjs": "6.6.3"
   },
@@ -28,7 +28,7 @@
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": ">= 6.11.0",
+    "npm": "^6.11.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/rules/schematic.js

@@ -23,7 +23,10 @@ function externalSchematic(collectionName, schematicName, options, executionOpti
     return (input, context) => {
         const collection = context.engine.createCollection(collectionName, context.schematic.collection);
         const schematic = collection.createSchematic(schematicName);
-        return schematic.call(options, rxjs_1.of(static_1.branch(input)), context, executionOptions);
+        return schematic.call(options, rxjs_1.of(static_1.branch(input)), context, executionOptions).pipe(operators_1.last(), operators_1.map(x => {
+            input.merge(x, interface_1.MergeStrategy.AllowOverwriteConflict);
+            return input;
+        }));
     };
 }
 exports.externalSchematic = externalSchematic;

package/src/tree/host-tree.d.ts

@@ -37,6 +37,7 @@ export declare class HostTree implements Tree {
     protected _willDelete(path: Path): boolean;
     protected _willRename(path: Path): boolean;
     branch(): Tree;
+    private isAncestorOf;
     merge(other: Tree, strategy?: MergeStrategy): void;
     get root(): DirEntry;
     read(path: string): Buffer | null;

package/src/tree/host-tree.js

@@ -12,9 +12,11 @@ const core_1 = require("@angular-devkit/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const exception_1 = require("../exception/exception");
+const delegate_1 = require("./delegate");
 const entry_1 = require("./entry");
 const interface_1 = require("./interface");
 const recorder_1 = require("./recorder");
+const scoped_1 = require("./scoped");
 let _uniqueId = 0;
 class HostDirEntry {
     constructor(parent, path, _host, _tree) {
@@ -101,24 +103,36 @@ class HostTree {
         branchedTree._ancestry = new Set(this._ancestry).add(this._id);
         return branchedTree;
     }
+    isAncestorOf(tree) {
+        if (tree instanceof HostTree) {
+            return tree._ancestry.has(this._id);
+        }
+        if (tree instanceof delegate_1.DelegateTree) {
+            return this.isAncestorOf(tree._other);
+        }
+        if (tree instanceof scoped_1.ScopedTree) {
+            return this.isAncestorOf(tree._base);
+        }
+        return false;
+    }
     merge(other, strategy = interface_1.MergeStrategy.Default) {
         if (other === this) {
             // Merging with yourself? Tsk tsk. Nothing to do at least.
             return;
         }
-        if (other instanceof HostTree && other._ancestry.has(this._id)) {
+        if (this.isAncestorOf(other)) {
             // Workaround for merging a branch back into one of its ancestors
             // More complete branch point tracking is required to avoid
             strategy |= interface_1.MergeStrategy.Overwrite;
         }
         const creationConflictAllowed = (strategy & interface_1.MergeStrategy.AllowCreationConflict) == interface_1.MergeStrategy.AllowCreationConflict;
         const overwriteConflictAllowed = (strategy & interface_1.MergeStrategy.AllowOverwriteConflict) == interface_1.MergeStrategy.AllowOverwriteConflict;
-        const deleteConflictAllowed = (strategy & interface_1.MergeStrategy.AllowOverwriteConflict) == interface_1.MergeStrategy.AllowDeleteConflict;
+        const deleteConflictAllowed = (strategy & interface_1.MergeStrategy.AllowDeleteConflict) == interface_1.MergeStrategy.AllowDeleteConflict;
         other.actions.forEach(action => {
             switch (action.kind) {
                 case 'c': {
                     const { path, content } = action;
-                    if ((this._willCreate(path) || this._willOverwrite(path))) {
+                    if (this._willCreate(path) || this._willOverwrite(path) || this.exists(path)) {
                         const existingContent = this.read(path);
                         if (existingContent && content.equals(existingContent)) {
                             // Identical outcome; no action required