@angular-devkit/schematics 14.2.0-next.0 → 14.2.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "14.2.0-next.0",
+  "version": "14.2.0-rc.0",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "14.2.0-next.0",
+    "@angular-devkit/core": "14.2.0-rc.0",
     "jsonc-parser": "3.1.0",
     "magic-string": "0.26.2",
     "ora": "5.4.1",

package/src/engine/schematic.js

@@ -9,7 +9,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchematicImpl = exports.InvalidSchematicsNameException = void 0;
 const core_1 = require("@angular-devkit/core");
-const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const call_1 = require("../rules/call");
 const scoped_1 = require("../tree/scoped");
@@ -49,7 +48,7 @@ class SchematicImpl {
             else {
                 input = tree;
             }
-            return (0, call_1.callRule)(this._factory(transformedOptions), (0, rxjs_1.of)(input), context).pipe((0, operators_1.map)((output) => {
+            return (0, call_1.callRule)(this._factory(transformedOptions), input, context).pipe((0, operators_1.map)((output) => {
                 if (output === input) {
                     return tree;
                 }

package/src/rules/call.js

@@ -53,58 +53,41 @@ class InvalidSourceResultException extends core_1.BaseException {
 }
 exports.InvalidSourceResultException = InvalidSourceResultException;
 function callSource(source, context) {
-    const result = source(context);
-    if ((0, rxjs_1.isObservable)(result)) {
-        // Only return the last Tree, and make sure it's a Tree.
-        return result.pipe((0, operators_1.defaultIfEmpty)(), (0, operators_1.last)(), (0, operators_1.tap)((inner) => {
-            if (!inner || !(interface_1.TreeSymbol in inner)) {
-                throw new InvalidSourceResultException(inner);
-            }
-        }));
-    }
-    else if (result && interface_1.TreeSymbol in result) {
-        return (0, rxjs_1.of)(result);
-    }
-    else {
-        return (0, rxjs_1.throwError)(new InvalidSourceResultException(result));
-    }
+    return (0, rxjs_1.defer)(async () => {
+        let result = source(context);
+        if ((0, rxjs_1.isObservable)(result)) {
+            result = await result.pipe((0, operators_1.defaultIfEmpty)()).toPromise();
+        }
+        if (result && interface_1.TreeSymbol in result) {
+            return result;
+        }
+        throw new InvalidSourceResultException(result);
+    });
 }
 exports.callSource = callSource;
 function callRule(rule, input, context) {
-    return ((0, rxjs_1.isObservable)(input) ? input : (0, rxjs_1.of)(input)).pipe((0, operators_1.mergeMap)((inputTree) => {
-        const result = rule(inputTree, context);
-        if (!result) {
-            return (0, rxjs_1.of)(inputTree);
-        }
-        else if (typeof result == 'function') {
-            // This is considered a Rule, chain the rule and return its output.
-            return callRule(result, inputTree, context);
-        }
-        else if ((0, rxjs_1.isObservable)(result)) {
-            // Only return the last Tree, and make sure it's a Tree.
-            return result.pipe((0, operators_1.defaultIfEmpty)(), (0, operators_1.last)(), (0, operators_1.tap)((inner) => {
-                if (!inner || !(interface_1.TreeSymbol in inner)) {
-                    throw new InvalidRuleResultException(inner);
-                }
-            }));
-        }
-        else if ((0, core_1.isPromise)(result)) {
-            return (0, rxjs_1.from)(result).pipe((0, operators_1.mergeMap)((inner) => {
-                if (typeof inner === 'function') {
-                    // This is considered a Rule, chain the rule and return its output.
-                    return callRule(inner, inputTree, context);
-                }
-                else {
-                    return (0, rxjs_1.of)(inputTree);
-                }
-            }));
-        }
-        else if (interface_1.TreeSymbol in result) {
-            return (0, rxjs_1.of)(result);
-        }
-        else {
-            return (0, rxjs_1.throwError)(new InvalidRuleResultException(result));
-        }
-    }));
+    if ((0, rxjs_1.isObservable)(input)) {
+        return input.pipe((0, operators_1.mergeMap)((inputTree) => callRuleAsync(rule, inputTree, context)));
+    }
+    else {
+        return (0, rxjs_1.defer)(() => callRuleAsync(rule, input, context));
+    }
 }
 exports.callRule = callRule;
+async function callRuleAsync(rule, tree, context) {
+    let result = await rule(tree, context);
+    while (typeof result === 'function') {
+        // This is considered a Rule, chain the rule and return its output.
+        result = await result(tree, context);
+    }
+    if (typeof result === 'undefined') {
+        return tree;
+    }
+    if ((0, rxjs_1.isObservable)(result)) {
+        result = await result.pipe((0, operators_1.defaultIfEmpty)(tree)).toPromise();
+    }
+    if (interface_1.TreeSymbol in result) {
+        return result;
+    }
+    throw new InvalidRuleResultException(result);
+}