@angular-devkit/schematics 15.1.0-next.2 → 15.1.0-next.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "15.1.0-next.2",
+  "version": "15.1.0-next.3",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "15.1.0-next.2",
+    "@angular-devkit/core": "15.1.0-next.3",
     "jsonc-parser": "3.2.0",
     "magic-string": "0.27.0",
     "ora": "5.4.1",

package/testing/schematic-test-runner.d.ts

@@ -23,7 +23,15 @@ export declare class SchematicTestRunner {
     get logger(): logging.Logger;
     get tasks(): TaskConfiguration[];
     registerCollection(collectionName: string, collectionPath: string): void;
+    runSchematic<SchematicSchemaT extends object>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Promise<UnitTestTree>;
+    /**
+     * @deprecated since version 15.1. Use `runSchematic` instead.
+     */
     runSchematicAsync<SchematicSchemaT extends object>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
+    runExternalSchematic<SchematicSchemaT extends object>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Promise<UnitTestTree>;
+    /**
+     * @deprecated since version 15.1. Use `runExternalSchematic` instead.
+     */
     runExternalSchematicAsync<SchematicSchemaT extends object>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
     callRule(rule: Rule, tree: Tree, parentContext?: Partial<SchematicContext>): Observable<Tree>;
 }

package/testing/schematic-test-runner.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchematicTestRunner = exports.UnitTestTree = void 0;
 const core_1 = require("@angular-devkit/core");
 const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
 const src_1 = require("../src");
 const call_1 = require("../src/rules/call");
 const node_1 = require("../tasks/node");
@@ -57,22 +56,32 @@ class SchematicTestRunner {
     registerCollection(collectionName, collectionPath) {
         this._engineHost.registerCollection(collectionName, collectionPath);
     }
-    runSchematicAsync(schematicName, opts, tree) {
+    async runSchematic(schematicName, opts, tree) {
         const schematic = this._collection.createSchematic(schematicName, true);
         const host = (0, rxjs_1.of)(tree || new src_1.HostTree());
         this._engineHost.clearTasks();
-        return schematic
-            .call(opts || {}, host, { logger: this._logger })
-            .pipe((0, operators_1.map)((tree) => new UnitTestTree(tree)));
+        const newTree = await schematic.call(opts || {}, host, { logger: this._logger }).toPromise();
+        return new UnitTestTree(newTree);
     }
-    runExternalSchematicAsync(collectionName, schematicName, opts, tree) {
+    /**
+     * @deprecated since version 15.1. Use `runSchematic` instead.
+     */
+    runSchematicAsync(schematicName, opts, tree) {
+        return (0, rxjs_1.from)(this.runSchematic(schematicName, opts, tree));
+    }
+    async runExternalSchematic(collectionName, schematicName, opts, tree) {
         const externalCollection = this._engine.createCollection(collectionName);
         const schematic = externalCollection.createSchematic(schematicName, true);
         const host = (0, rxjs_1.of)(tree || new src_1.HostTree());
         this._engineHost.clearTasks();
-        return schematic
-            .call(opts || {}, host, { logger: this._logger })
-            .pipe((0, operators_1.map)((tree) => new UnitTestTree(tree)));
+        const newTree = await schematic.call(opts || {}, host, { logger: this._logger }).toPromise();
+        return new UnitTestTree(newTree);
+    }
+    /**
+     * @deprecated since version 15.1. Use `runExternalSchematic` instead.
+     */
+    runExternalSchematicAsync(collectionName, schematicName, opts, tree) {
+        return (0, rxjs_1.from)(this.runExternalSchematic(collectionName, schematicName, opts, tree));
     }
     callRule(rule, tree, parentContext) {
         const context = this._engine.createContext({}, parentContext);