@nstudio/angular 15.0.3 → 15.0.4-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/angular",
-  "version": "15.0.3",
+  "version": "15.0.4-rc.0",
   "description": "Angular Plugin for xplat",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -32,6 +32,6 @@
     "@nrwl/angular": "^15.0.0"
   },
   "peerDependencies": {
-    "@nstudio/xplat": "15.0.3"
+    "@nstudio/xplat": "15.0.4-rc.0"
   }
 }

package/src/schematics/elements/index.js

@@ -170,15 +170,15 @@ function addFiles(options, extra = '') {
     ])));
 }
 function updateWorkspaceSupport(options, tree, context) {
-    return (0, workspace_1.updateJsonInTree)('package.json', (json) => {
-        json.scripts = json.scripts || {};
-        json.dependencies = json.dependencies || {};
-        const angularVersion = json.dependencies['@angular/core'];
-        json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@angular/elements': angularVersion, '@webcomponents/webcomponentsjs': '^2.6.0' });
-        json.devDependencies = json.devDependencies || {};
-        json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { 'http-server': '^14.1.1', 'ngx-build-plus': '^15.0.0' });
-        return json;
-    })(tree, context);
+    const packagePath = 'package.json';
+    const json = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
+    json.scripts = json.scripts || {};
+    json.dependencies = json.dependencies || {};
+    const angularVersion = json.dependencies['@angular/core'];
+    json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@angular/elements': angularVersion, '@webcomponents/webcomponentsjs': '^2.6.0' });
+    json.devDependencies = json.devDependencies || {};
+    json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { 'http-server': '^14.1.1', 'ngx-build-plus': '^15.0.0' });
+    return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, json);
 }
 function createCustomElementList(componentSymbols) {
     const customElements = ['let component;'];

package/src/schematics/feature/index.js

@@ -37,7 +37,7 @@ function default_1(options) {
         // update libs index
         (tree, context) => options.onlyProject
             ? (0, schematics_1.noop)()(tree, context)
-            : xplat_1.XplatFeatureHelpers.adjustBarrelIndex(options, 'libs/xplat/features/src/lib/index.ts')(tree, context),
+            : xplat_1.XplatFeatureHelpers.adjustBarrelIndex(options, 'libs/xplat/features/src/lib/index.ts'),
         // external schematic handling
         (tree, context) => (0, schematics_1.chain)(externalChains),
         (0, workspace_1.formatFiles)({ skipFormat: options.skipFormat }),

package/src/schematics/feature/index.spec.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sandboxHomeSetup = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const workspace_1 = require("@nrwl/workspace");
 const testing_1 = require("@nstudio/xplat/testing");
 const testing_2 = require("../../utils/testing");
+const xplat_utils_1 = require("@nstudio/xplat-utils");
 describe('feature schematic', () => {
     let appTree;
     const defaultOptions = {
@@ -324,7 +324,7 @@ describe('feature schematic', () => {
         appTree = (0, testing_1.createXplatWithNativeScriptWeb)(appTree, true);
         // manually update home.component to prep for sandobx
         const homeCmpPath = `/apps/nativescript-viewer/src/features/home/components/home.component.html`;
-        (0, workspace_1.createOrUpdate)(appTree, homeCmpPath, sandboxHomeSetup());
+        (0, xplat_utils_1.updateFile)(appTree, homeCmpPath, sandboxHomeSetup());
         // console.log('homecmp:', getFileContent(tree, homeCmpPath));
         options.onlyProject = true;
         options.adjustSandbox = true;

package/src/schematics/helpers/applitools/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
-const workspace_1 = require("@nrwl/workspace");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 exports.config = {
     requiresTarget: true,
@@ -11,9 +10,9 @@ exports.config = {
 function applitools(helperChains, options) {
     return (tree, context) => {
         // update support index
-        helperChains.push((0, workspace_1.createOrUpdate)(tree, `/apps/${options.target}-e2e/src/support/index.ts`, updateCypressIndex()));
+        helperChains.push((0, xplat_utils_1.updateFile)(tree, `/apps/${options.target}-e2e/src/support/index.ts`, updateCypressIndex()));
         // update plugin index
-        helperChains.push((0, workspace_1.createOrUpdate)(tree, `/apps/${options.target}-e2e/src/plugins/index.ts`, updateCypressPlugins()));
+        helperChains.push((0, xplat_utils_1.updateFile)(tree, `/apps/${options.target}-e2e/src/plugins/index.ts`, updateCypressPlugins()));
         // ensure supportFile points to updates
         const cypressConfigPath = `/apps/${options.target}-e2e/cypress.json`;
         const cypressConfig = (0, xplat_utils_1.getJsonFromFile)(tree, cypressConfigPath);
@@ -31,7 +30,7 @@ function applitools(helperChains, options) {
         packageJson.devDependencies['@applitools/eyes-cypress'] = '^3.7.1';
         helperChains.push((0, xplat_utils_1.updateJsonFile)(tree, 'package.json', packageJson));
         // update sample test
-        helperChains.push((0, workspace_1.createOrUpdate)(tree, `/apps/${options.target}-e2e/src/integration/app.spec.ts`, updateSampleTest()));
+        helperChains.push((0, xplat_utils_1.updateFile)(tree, `/apps/${options.target}-e2e/src/integration/app.spec.ts`, updateSampleTest()));
     };
 }
 function note(options) {

package/src/utils/ast.d.ts

@@ -1,16 +1,78 @@
 import * as ts from 'typescript';
-import { Change } from '@nrwl/workspace/src/utils/ast-utils';
-import { Tree } from '@angular-devkit/schematics';
-export declare function addToCollection(source: ts.SourceFile, barrelIndexPath: string, symbolName: string, insertSpaces?: string): Change[];
-export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, expression: string): Change[];
-export declare function removeFromNgModule(source: ts.SourceFile, modulePath: string, property: string): Change[];
-export declare function addImportToModule(source: ts.SourceFile, modulePath: string, symbolName: string): Change[];
-export declare function addImportToTestBed(source: ts.SourceFile, specPath: string, symbolName: string): Change[];
+import { Tree } from '@nrwl/devkit';
+declare type DecoratorName = 'Component' | 'Directive' | 'NgModule' | 'Pipe';
+export declare function addToCollection(tree: Tree, source: ts.SourceFile, barrelIndexPath: string, symbolName: string, insertSpaces?: string): ts.SourceFile[];
+/**
+ * Check if the Component, Directive or Pipe is standalone
+ * @param sourceFile TS Source File containing the token to check
+ * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
+ */
+export declare function isStandalone(sourceFile: ts.SourceFile, decoratorName: DecoratorName): boolean;
+export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
+export declare function _addSymbolToNgModuleMetadata(host: Tree, source: ts.SourceFile, ngModulePath: string, metadataField: string, expression: string): ts.SourceFile;
+export declare function removeFromNgModule(host: Tree, source: ts.SourceFile, modulePath: string, property: string): ts.SourceFile;
+/**
+ * Add an import to a Standalone Component
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Component
+ * @param componentPath The path to the Component
+ * @param symbolName The import to add to the Component
+ */
+export declare function addImportToComponent(host: Tree, source: ts.SourceFile, componentPath: string, symbolName: string): ts.SourceFile;
+/**
+ * Add an import to a Standalone Directive
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Directive
+ * @param directivePath The path to the Directive
+ * @param symbolName The import to add to the Directive
+ */
+export declare function addImportToDirective(host: Tree, source: ts.SourceFile, directivePath: string, symbolName: string): ts.SourceFile;
+/**
+ * Add an import to a Standalone Pipe
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Pipe
+ * @param pipePath The path to the Pipe
+ * @param symbolName The import to add to the Pipe
+ */
+export declare function addImportToPipe(host: Tree, source: ts.SourceFile, pipePath: string, symbolName: string): ts.SourceFile;
+/**
+ * Add an import to an NgModule
+ * @param host Virtual Tree
+ * @param source TS Source File containing the NgModule
+ * @param modulePath The path to the NgModule
+ * @param symbolName The import to add to the NgModule
+ */
+export declare function addImportToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
+export declare function addImportToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string): ts.SourceFile;
+export declare function addDeclarationsToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string[]): ts.SourceFile;
+export declare function replaceIntoToTestBed(host: Tree, source: ts.SourceFile, specPath: string, newSymbol: string, previousSymbol: string): ts.SourceFile;
 export declare function getBootstrapComponent(source: ts.SourceFile, moduleClassName: string): string;
-export declare function addRoute(ngModulePath: string, source: ts.SourceFile, route: string): Change[];
-export declare function addProviderToModule(source: ts.SourceFile, modulePath: string, symbolName: string): Change[];
-export declare function addDeclarationToModule(source: ts.SourceFile, modulePath: string, symbolName: string): Change[];
-export declare function addEntryComponents(source: ts.SourceFile, modulePath: string, symbolName: string): Change[];
+export declare function addRouteToNgModule(host: Tree, ngModulePath: string, source: ts.SourceFile, route: string): ts.SourceFile;
+/**
+ * Add a provider to bootstrapApplication call for Standalone Applications
+ * @param tree Virtual Tree
+ * @param filePath Path to the file containing the bootstrapApplication call
+ * @param providerToAdd Provider to add
+ */
+export declare function addProviderToBootstrapApplication(tree: Tree, filePath: string, providerToAdd: string): void;
+/**
+ * Add a provider to an NgModule
+ * @param host Virtual Tree
+ * @param source TS Source File containing the NgModule
+ * @param modulePath Path to the NgModule
+ * @param symbolName The provider to add
+ */
+export declare function addProviderToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
+/**
+ * Add a provider to a Standalone Component
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Component
+ * @param componentPath Path to the Component
+ * @param symbolName The provider to add
+ */
+export declare function addProviderToComponent(host: Tree, source: ts.SourceFile, componentPath: string, symbolName: string): ts.SourceFile;
+export declare function addDeclarationToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
+export declare function addEntryComponents(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
 export declare function readBootstrapInfo(host: Tree, app: string): {
     moduleSpec: string;
     modulePath: string;
@@ -21,3 +83,5 @@ export declare function readBootstrapInfo(host: Tree, app: string): {
     bootstrapComponentFileName: string;
 };
 export declare function getDecoratorPropertyValueNode(host: Tree, modulePath: string, identifier: string, property: string, module: string): ts.Node;
+export declare function getTsSourceFile(host: Tree, path: string): ts.SourceFile;
+export {};

package/src/utils/ast.js

@@ -1,28 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.addSymbolToNgModuleMetadata = exports.addToCollection = void 0;
+exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToComponent = exports.addProviderToModule = exports.addProviderToBootstrapApplication = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports._addSymbolToNgModuleMetadata = exports.getDecoratorMetadata = exports.isStandalone = exports.addToCollection = void 0;
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+const typescript_1 = require("nx/src/utils/typescript");
 const ts = require("typescript");
-const ast_utils_1 = require("@nrwl/workspace/src/utils/ast-utils");
-const path = require("path");
-const xplat_utils_1 = require("@nstudio/xplat-utils");
-function addToCollection(source, barrelIndexPath, symbolName, insertSpaces = '') {
+const js_1 = require("@nrwl/js");
+const path_1 = require("path");
+const devkit_1 = require("@nrwl/devkit");
+let tsModule;
+function addToCollection(tree, source, barrelIndexPath, symbolName, insertSpaces = '') {
     const collection = getCollection(source);
     if (!collection)
         return [];
     // if (!collection) return [new NoopChange()];
     // return [new NoopChange()];
+    console.log('collection.hasTrailingComma:', collection.hasTrailingComma);
     if (collection.hasTrailingComma || collection.length === 0) {
-        return [new ast_utils_1.InsertChange(barrelIndexPath, collection.end, symbolName)];
+        return [
+            (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, symbolName),
+        ];
     }
     else {
         return [
-            new ast_utils_1.InsertChange(barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`),
+            (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`),
         ];
     }
 }
 exports.addToCollection = addToCollection;
 function getCollection(source) {
-    const allCollections = (0, ast_utils_1.findNodes)(source, ts.SyntaxKind.ArrayLiteralExpression);
+    const allCollections = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ArrayLiteralExpression);
     // console.log('allCollections:', allCollections);
     // allCollections.forEach((i: ts.ArrayLiteralExpression) => {
     //   console.log('getText:',i.getText());
@@ -35,10 +41,13 @@ function getCollection(source) {
     return null;
 }
 function _angularImportsFromNode(node, _sourceFile) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const ms = node.moduleSpecifier;
     let modulePath;
     switch (ms.kind) {
-        case ts.SyntaxKind.StringLiteral:
+        case tsModule.SyntaxKind.StringLiteral:
             modulePath = ms.text;
             break;
         default:
@@ -54,10 +63,10 @@ function _angularImportsFromNode(node, _sourceFile) {
         }
         else if (node.importClause.namedBindings) {
             const nb = node.importClause.namedBindings;
-            if (nb.kind == ts.SyntaxKind.NamespaceImport) {
+            if (nb.kind == tsModule.SyntaxKind.NamespaceImport) {
                 // This is of the form `import * as name from 'path'`. Return `name.`.
                 return {
-                    [nb.name.text + '.']: modulePath,
+                    [`${nb.name.text}.`]: modulePath,
                 };
             }
             else {
@@ -78,8 +87,21 @@ function _angularImportsFromNode(node, _sourceFile) {
         return {};
     }
 }
+/**
+ * Check if the Component, Directive or Pipe is standalone
+ * @param sourceFile TS Source File containing the token to check
+ * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
+ */
+function isStandalone(sourceFile, decoratorName) {
+    const decoratorMetadata = getDecoratorMetadata(sourceFile, decoratorName, '@angular/core');
+    return decoratorMetadata.some((node) => node.getText().includes('standalone: true'));
+}
+exports.isStandalone = isStandalone;
 function getDecoratorMetadata(source, identifier, module) {
-    const angularImports = (0, ast_utils_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration)
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const angularImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
         .map((node) => _angularImportsFromNode(node, source))
         .reduce((acc, current) => {
         for (const key of Object.keys(current)) {
@@ -87,60 +109,65 @@ function getDecoratorMetadata(source, identifier, module) {
         }
         return acc;
     }, {});
-    return (0, ast_utils_1.getSourceNodes)(source)
+    return (0, js_1.getSourceNodes)(source)
         .filter((node) => {
-        return (node.kind == ts.SyntaxKind.Decorator &&
-            node.expression.kind == ts.SyntaxKind.CallExpression);
+        return (node.kind == tsModule.SyntaxKind.Decorator &&
+            node.expression.kind ==
+                tsModule.SyntaxKind.CallExpression);
     })
         .map((node) => node.expression)
         .filter((expr) => {
-        if (expr.expression.kind == ts.SyntaxKind.Identifier) {
+        if (expr.expression.kind == tsModule.SyntaxKind.Identifier) {
             const id = expr.expression;
             return (id.getFullText(source) == identifier &&
                 angularImports[id.getFullText(source)] === module);
         }
-        else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {
+        else if (expr.expression.kind == tsModule.SyntaxKind.PropertyAccessExpression) {
             // This covers foo.NgModule when importing * as foo.
             const paExpr = expr.expression;
             // If the left expression is not an identifier, just give up at that point.
-            if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {
+            if (paExpr.expression.kind !== tsModule.SyntaxKind.Identifier) {
                 return false;
             }
             const id = paExpr.name.text;
             const moduleId = paExpr.expression.getText(source);
-            return id === identifier && angularImports[moduleId + '.'] === module;
+            return id === identifier && angularImports[`${moduleId}.`] === module;
         }
         return false;
     })
         .filter((expr) => expr.arguments[0] &&
-        expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
+        expr.arguments[0].kind == tsModule.SyntaxKind.ObjectLiteralExpression)
         .map((expr) => expr.arguments[0]);
 }
-function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expression) {
-    const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
+exports.getDecoratorMetadata = getDecoratorMetadata;
+function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, expression, decoratorName) {
+    const nodes = getDecoratorMetadata(source, decoratorName, '@angular/core');
     let node = nodes[0]; // tslint:disable-line:no-any
     // Find the decorator declaration.
     if (!node) {
-        return [];
+        return source;
+    }
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     // Get all the children property assignment of object literals.
     const matchingProperties = node.properties
-        .filter((prop) => prop.kind == ts.SyntaxKind.PropertyAssignment)
+        .filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter((prop) => {
         const name = prop.name;
         switch (name.kind) {
-            case ts.SyntaxKind.Identifier:
+            case tsModule.SyntaxKind.Identifier:
                 return name.getText(source) == metadataField;
-            case ts.SyntaxKind.StringLiteral:
+            case tsModule.SyntaxKind.StringLiteral:
                 return name.text == metadataField;
         }
         return false;
     });
     // Get the last node of the array literal.
     if (!matchingProperties) {
-        return [];
+        return source;
     }
     if (matchingProperties.length == 0) {
         // We haven't found the field in the metadata declaration. Insert a new field.
@@ -163,13 +190,12 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expres
                 toInsert = `, ${metadataField}: [${expression}]`;
             }
         }
-        const newMetadataProperty = new ast_utils_1.InsertChange(ngModulePath, position, toInsert);
-        return [newMetadataProperty];
+        return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
     }
     const assignment = matchingProperties[0];
     // If it's not an array, nothing we can do really.
-    if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {
-        return [];
+    if (assignment.initializer.kind !== tsModule.SyntaxKind.ArrayLiteralExpression) {
+        return source;
     }
     const arrLiteral = assignment.initializer;
     if (arrLiteral.elements.length == 0) {
@@ -181,20 +207,20 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expres
     }
     if (!node) {
         console.log('No app module found. Please add your new class to your component.');
-        return [];
+        return source;
     }
     const isArray = Array.isArray(node);
     if (isArray) {
         const nodeArray = node;
         const symbolsArray = nodeArray.map((node) => node.getText());
         if (symbolsArray.includes(expression)) {
-            return [];
+            return source;
         }
         node = node[node.length - 1];
     }
     let toInsert;
     let position = node.getEnd();
-    if (!isArray && node.kind == ts.SyntaxKind.ObjectLiteralExpression) {
+    if (!isArray && node.kind == tsModule.SyntaxKind.ObjectLiteralExpression) {
         // We haven't found the field in the metadata declaration. Insert a new
         // field.
         const expr = node;
@@ -215,7 +241,8 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expres
             }
         }
     }
-    else if (!isArray && node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
+    else if (!isArray &&
+        node.kind == tsModule.SyntaxKind.ArrayLiteralExpression) {
         // We found the field but it's empty. Insert it just before the `]`.
         position--;
         toInsert = `${expression}`;
@@ -230,54 +257,130 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expres
             toInsert = `, ${expression}`;
         }
     }
-    const insert = new ast_utils_1.InsertChange(ngModulePath, position, toInsert);
-    return [insert];
+    return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
+}
+function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
+    return _addSymbolToDecoratorMetadata(host, source, ngModulePath, metadataField, expression, 'NgModule');
 }
-exports.addSymbolToNgModuleMetadata = addSymbolToNgModuleMetadata;
-function removeFromNgModule(source, modulePath, property) {
+exports._addSymbolToNgModuleMetadata = _addSymbolToNgModuleMetadata;
+function removeFromNgModule(host, source, modulePath, property) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
     let node = nodes[0]; // tslint:disable-line:no-any
     // Find the decorator declaration.
     if (!node) {
-        return [];
+        return source;
     }
     // Get all the children property assignment of object literals.
     const matchingProperty = getMatchingProperty(source, property, 'NgModule', '@angular/core');
     if (matchingProperty) {
-        return [
-            new ast_utils_1.RemoveChange(modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source)),
-        ];
-    }
-    else {
-        return [];
+        return (0, js_1.removeChange)(host, source, modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source));
     }
 }
 exports.removeFromNgModule = removeFromNgModule;
-function addImportToModule(source, modulePath, symbolName) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'imports', symbolName);
+/**
+ * Add an import to a Standalone Component
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Component
+ * @param componentPath The path to the Component
+ * @param symbolName The import to add to the Component
+ */
+function addImportToComponent(host, source, componentPath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, componentPath, 'imports', symbolName, 'Component');
+}
+exports.addImportToComponent = addImportToComponent;
+/**
+ * Add an import to a Standalone Directive
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Directive
+ * @param directivePath The path to the Directive
+ * @param symbolName The import to add to the Directive
+ */
+function addImportToDirective(host, source, directivePath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, directivePath, 'imports', symbolName, 'Directive');
+}
+exports.addImportToDirective = addImportToDirective;
+/**
+ * Add an import to a Standalone Pipe
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Pipe
+ * @param pipePath The path to the Pipe
+ * @param symbolName The import to add to the Pipe
+ */
+function addImportToPipe(host, source, pipePath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, pipePath, 'imports', symbolName, 'Pipe');
+}
+exports.addImportToPipe = addImportToPipe;
+/**
+ * Add an import to an NgModule
+ * @param host Virtual Tree
+ * @param source TS Source File containing the NgModule
+ * @param modulePath The path to the NgModule
+ * @param symbolName The import to add to the NgModule
+ */
+function addImportToModule(host, source, modulePath, symbolName) {
+    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'imports', symbolName);
 }
 exports.addImportToModule = addImportToModule;
-function addImportToTestBed(source, specPath, symbolName) {
-    const allCalls = ((0, ast_utils_1.findNodes)(source, ts.SyntaxKind.CallExpression));
+function addImportToTestBed(host, source, specPath, symbolName) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
-        .filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
-        .map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
+        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
         ? c.arguments[0]
         : null);
     if (configureTestingModuleObjectLiterals.length > 0) {
         const startPosition = configureTestingModuleObjectLiterals[0]
             .getFirstToken(source)
             .getEnd();
-        return [
-            new ast_utils_1.InsertChange(specPath, startPosition, `imports: [${symbolName}], `),
-        ];
-    }
-    else {
-        return [];
+        return (0, js_1.insertChange)(host, source, specPath, startPosition, `imports: [${symbolName}], `);
     }
+    return source;
 }
 exports.addImportToTestBed = addImportToTestBed;
+function addDeclarationsToTestBed(host, source, specPath, symbolName) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+    const configureTestingModuleObjectLiterals = allCalls
+        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
+        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
+        ? c.arguments[0]
+        : null);
+    if (configureTestingModuleObjectLiterals.length > 0) {
+        const startPosition = configureTestingModuleObjectLiterals[0]
+            .getFirstToken(source)
+            .getEnd();
+        return (0, js_1.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
+    }
+    return source;
+}
+exports.addDeclarationsToTestBed = addDeclarationsToTestBed;
+function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+    const configureTestingModuleObjectLiterals = allCalls
+        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
+        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
+        ? c.arguments[0]
+        : null);
+    if (configureTestingModuleObjectLiterals.length > 0) {
+        const startPosition = configureTestingModuleObjectLiterals[0]
+            .getFirstToken(source)
+            .getEnd();
+        return (0, js_1.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
+    }
+    return source;
+}
+exports.replaceIntoToTestBed = replaceIntoToTestBed;
 function getBootstrapComponent(source, moduleClassName) {
     const bootstrap = getMatchingProperty(source, 'bootstrap', 'NgModule', '@angular/core');
     if (!bootstrap) {
@@ -300,56 +403,113 @@ function getMatchingProperty(source, property, identifier, module) {
     // Get all the children property assignment of object literals.
     return getMatchingObjectLiteralElement(node, source, property);
 }
-function addRoute(ngModulePath, source, route) {
+function addRouteToNgModule(host, ngModulePath, source, route) {
     const routes = getListOfRoutes(source);
     if (!routes)
-        return [];
+        return source;
     if (routes.hasTrailingComma || routes.length === 0) {
-        return [new ast_utils_1.InsertChange(ngModulePath, routes.end, route)];
+        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, route);
     }
     else {
-        return [new ast_utils_1.InsertChange(ngModulePath, routes.end, `, ${route}`)];
+        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, `, ${route}`);
     }
 }
-exports.addRoute = addRoute;
+exports.addRouteToNgModule = addRouteToNgModule;
 function getListOfRoutes(source) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const imports = getMatchingProperty(source, 'imports', 'NgModule', '@angular/core');
-    if (imports.initializer.kind === ts.SyntaxKind.ArrayLiteralExpression) {
+    if ((imports === null || imports === void 0 ? void 0 : imports.initializer.kind) === tsModule.SyntaxKind.ArrayLiteralExpression) {
         const a = imports.initializer;
-        for (let e of a.elements) {
-            if (e.kind === ts.SyntaxKind.CallExpression) {
+        for (const e of a.elements) {
+            if (e.kind === tsModule.SyntaxKind.CallExpression) {
                 const ee = e;
                 const text = ee.expression.getText(source);
                 if ((text === 'RouterModule.forRoot' ||
                     text === 'RouterModule.forChild') &&
                     ee.arguments.length > 0) {
                     const routes = ee.arguments[0];
-                    if (routes.kind === ts.SyntaxKind.ArrayLiteralExpression) {
+                    if (routes.kind === tsModule.SyntaxKind.ArrayLiteralExpression) {
                         return routes.elements;
                     }
+                    else if (routes.kind === tsModule.SyntaxKind.Identifier) {
+                        // find the array expression
+                        const variableDeclarations = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
+                        const routesDeclaration = variableDeclarations.find((x) => {
+                            return x.name.getText() === routes.getText();
+                        });
+                        if (routesDeclaration) {
+                            return routesDeclaration.initializer.elements;
+                        }
+                    }
                 }
             }
         }
     }
     return null;
 }
-function addProviderToModule(source, modulePath, symbolName) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'providers', symbolName);
+/**
+ * Add a provider to bootstrapApplication call for Standalone Applications
+ * @param tree Virtual Tree
+ * @param filePath Path to the file containing the bootstrapApplication call
+ * @param providerToAdd Provider to add
+ */
+function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const PROVIDERS_ARRAY_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression';
+    const fileContents = tree.read(filePath, 'utf-8');
+    const ast = tsquery.ast(fileContents);
+    const providersArrayNodes = tsquery(ast, PROVIDERS_ARRAY_SELECTOR, {
+        visitAllChildren: true,
+    });
+    if (providersArrayNodes.length === 0) {
+        throw new Error(`Providers does not exist in the bootstrapApplication call within ${filePath}.`);
+    }
+    const arrayNode = providersArrayNodes[0];
+    const newFileContents = `${fileContents.slice(0, arrayNode.getStart() + 1)}${providerToAdd},${fileContents.slice(arrayNode.getStart() + 1, fileContents.length)}`;
+    tree.write(filePath, newFileContents);
+}
+exports.addProviderToBootstrapApplication = addProviderToBootstrapApplication;
+/**
+ * Add a provider to an NgModule
+ * @param host Virtual Tree
+ * @param source TS Source File containing the NgModule
+ * @param modulePath Path to the NgModule
+ * @param symbolName The provider to add
+ */
+function addProviderToModule(host, source, modulePath, symbolName) {
+    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'providers', symbolName);
 }
 exports.addProviderToModule = addProviderToModule;
-function addDeclarationToModule(source, modulePath, symbolName) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'declarations', symbolName);
+/**
+ * Add a provider to a Standalone Component
+ * @param host Virtual Tree
+ * @param source TS Source File containing the Component
+ * @param componentPath Path to the Component
+ * @param symbolName The provider to add
+ */
+function addProviderToComponent(host, source, componentPath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, componentPath, 'providers', symbolName, 'Component');
+}
+exports.addProviderToComponent = addProviderToComponent;
+function addDeclarationToModule(host, source, modulePath, symbolName) {
+    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'declarations', symbolName);
 }
 exports.addDeclarationToModule = addDeclarationToModule;
-function addEntryComponents(source, modulePath, symbolName) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'entryComponents', symbolName);
+function addEntryComponents(host, source, modulePath, symbolName) {
+    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'entryComponents', symbolName);
 }
 exports.addEntryComponents = addEntryComponents;
 function readBootstrapInfo(host, app) {
-    const config = (0, ast_utils_1.getProjectConfig)(host, app);
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const config = (0, devkit_1.readProjectConfiguration)(host, app);
     let mainPath;
     try {
-        mainPath = config.architect.build.options.main;
+        mainPath = config.targets.build.options.main;
     }
     catch (e) {
         throw new Error('Main file cannot be located');
@@ -358,21 +518,21 @@ function readBootstrapInfo(host, app) {
         throw new Error('Main file cannot be located');
     }
     const mainSource = host.read(mainPath).toString('utf-8');
-    const main = ts.createSourceFile(mainPath, mainSource, ts.ScriptTarget.Latest, true);
-    const moduleImports = (0, ast_utils_1.getImport)(main, (s) => s.indexOf('.module') > -1);
+    const main = tsModule.createSourceFile(mainPath, mainSource, tsModule.ScriptTarget.Latest, true);
+    const moduleImports = (0, js_1.getImport)(main, (s) => s.indexOf('.module') > -1);
     if (moduleImports.length !== 1) {
         throw new Error(`main.ts can only import a single module`);
     }
     const moduleImport = moduleImports[0];
     const moduleClassName = moduleImport.bindings.filter((b) => b.endsWith('Module'))[0];
-    const modulePath = `${path.join(path.dirname(mainPath), moduleImport.moduleSpec)}.ts`;
+    const modulePath = `${(0, path_1.join)((0, path_1.dirname)(mainPath), moduleImport.moduleSpec)}.ts`;
     if (!host.exists(modulePath)) {
         throw new Error(`Cannot find '${modulePath}'`);
     }
     const moduleSourceText = host.read(modulePath).toString('utf-8');
-    const moduleSource = ts.createSourceFile(modulePath, moduleSourceText, ts.ScriptTarget.Latest, true);
+    const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
     const bootstrapComponentClassName = getBootstrapComponent(moduleSource, moduleClassName);
-    const bootstrapComponentFileName = `./${path.join(path.dirname(moduleImport.moduleSpec), `${(0, xplat_utils_1.toFileName)(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9))}.component`)}`;
+    const bootstrapComponentFileName = `./${(0, path_1.join)((0, path_1.dirname)(moduleImport.moduleSpec), `${(0, devkit_1.names)(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9)).fileName}.component`)}`;
     return {
         moduleSpec: moduleImport.moduleSpec,
         mainPath,
@@ -385,25 +545,44 @@ function readBootstrapInfo(host, app) {
 }
 exports.readBootstrapInfo = readBootstrapInfo;
 function getDecoratorPropertyValueNode(host, modulePath, identifier, property, module) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const moduleSourceText = host.read(modulePath).toString('utf-8');
-    const moduleSource = ts.createSourceFile(modulePath, moduleSourceText, ts.ScriptTarget.Latest, true);
+    const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
     const templateNode = getMatchingProperty(moduleSource, property, identifier, module);
     return templateNode.getChildAt(templateNode.getChildCount() - 1);
 }
 exports.getDecoratorPropertyValueNode = getDecoratorPropertyValueNode;
 function getMatchingObjectLiteralElement(node, source, property) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     return (node.properties
-        .filter((prop) => prop.kind == ts.SyntaxKind.PropertyAssignment)
+        .filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter((prop) => {
         const name = prop.name;
         switch (name.kind) {
-            case ts.SyntaxKind.Identifier:
+            case tsModule.SyntaxKind.Identifier:
                 return name.getText(source) === property;
-            case ts.SyntaxKind.StringLiteral:
+            case tsModule.SyntaxKind.StringLiteral:
                 return name.text === property;
         }
         return false;
     })[0]);
 }
+function getTsSourceFile(host, path) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const buffer = host.read(path);
+    if (!buffer) {
+        throw new Error(`Could not read TS file (${path}).`);
+    }
+    const content = buffer.toString();
+    const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
+    return source;
+}
+exports.getTsSourceFile = getTsSourceFile;

package/src/utils/generator.js

@@ -198,7 +198,7 @@ function getFeatureName(options) {
 }
 exports.getFeatureName = getFeatureName;
 function getNxFeaturePath(tree, featureName) {
-    const tsConfig = (0, workspace_1.readJsonInTree)(tree, 'tsconfig.base.json');
+    const tsConfig = (0, xplat_utils_1.getJsonFromFile)(tree, 'tsconfig.base.json');
     if (tsConfig) {
         if (tsConfig.compilerOptions &&
             tsConfig.compilerOptions.paths &&
@@ -331,7 +331,8 @@ function adjustBarrel(type, options, prefix) {
 }
 exports.adjustBarrel = adjustBarrel;
 function adjustBarrelIndex(type, options, indexFilePath, inSubFolder, isBase, importIfSubFolder) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustBarrelIndex:', indexFilePath);
         // console.log('host.exists(indexFilePath):', host.exists(indexFilePath));
         if (host.exists(indexFilePath)) {
@@ -346,45 +347,46 @@ function adjustBarrelIndex(type, options, indexFilePath, inSubFolder, isBase, im
                     const symbolName = `${xplat_1.stringUtils
                         .sanitize(options.subFolder)
                         .toUpperCase()}_${type.toUpperCase()}S`;
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, `...${symbolName}`, '  '));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`, false), ...(0, ast_1.addToCollection)(devKitTree, indexSourceFile, indexFilePath, `...${symbolName}`, '  '));
                 }
                 else {
                     const symbolName = `${xplat_1.stringUtils.classify(name)}${xplat_1.stringUtils.capitalize(type)}`;
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, symbolName, '  '));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`), ...(0, ast_1.addToCollection)(devKitTree, indexSourceFile, indexFilePath, symbolName, '  '));
                 }
             }
             if (type === 'component' || type === 'service' || type === 'pipe') {
                 // export symbol from barrel
                 if ((isBase || importIfSubFolder) && options.subFolder) {
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true));
                 }
                 else {
                     const subFolder = inSubFolder ? `${name}/` : '';
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true));
                 }
             }
-            (0, xplat_1.insert)(host, indexFilePath, changes);
+            // insert(devKitTree.tree, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustBarrelIndex = adjustBarrelIndex;
 function adjustBarrelIndexForType(type, options, indexFilePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         if (host.exists(indexFilePath)) {
             const indexSource = host.read(indexFilePath).toString('utf-8');
             const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
             const changes = [];
-            changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${type}';`, true));
-            (0, xplat_1.insert)(host, indexFilePath, changes);
+            changes.push(...(0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${type}';`, true));
+            // insert(devKitTree.tree, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustBarrelIndexForType = adjustBarrelIndexForType;
@@ -413,11 +415,12 @@ function adjustModule(tree, type, options, prefixPath) {
 }
 exports.adjustModule = adjustModule;
 function adjustFeatureModule(type, options, modulePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustFeatureModule:', modulePath);
         if (host.exists(modulePath)) {
             const moduleSource = host.read(modulePath).toString('utf-8');
-            const moduleSourceFile = ts.createSourceFile(modulePath, moduleSource, ts.ScriptTarget.Latest, true);
+            const moduleSourceFile = (0, ast_1.getTsSourceFile)(devKitTree, modulePath);
             const changes = [];
             let featureName;
             if (options.feature) {
@@ -463,18 +466,19 @@ function adjustFeatureModule(type, options, modulePath) {
             else {
                 if (type !== 'service') {
                     // add to module
-                    changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${collectionName} } from './${type}s';`));
-                    changes.push(...(0, ast_1.addDeclarationToModule)(moduleSourceFile, modulePath, `...${collectionName}`), ...(0, ast_1.addSymbolToNgModuleMetadata)(moduleSourceFile, modulePath, 'exports', `...${collectionName}`));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${collectionName} } from './${type}s';`));
+                    changes.push((0, ast_1.addDeclarationToModule)(devKitTree, moduleSourceFile, modulePath, `...${collectionName}`), (0, ast_1._addSymbolToNgModuleMetadata)(devKitTree, moduleSourceFile, modulePath, 'exports', `...${collectionName}`));
                 }
-                (0, xplat_1.insert)(host, modulePath, changes);
+                // insert(devKitTree.tree, modulePath, changes);
             }
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustFeatureModule = adjustFeatureModule;
 function adjustFeatureModuleForState(options, modulePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustFeatureModuleForState:', modulePath);
         if (host.exists(modulePath)) {
             const moduleSource = host.read(modulePath).toString('utf-8');
@@ -484,38 +488,39 @@ function adjustFeatureModuleForState(options, modulePath) {
             const name = options.name.toLowerCase();
             const changes = [];
             if (moduleSource.indexOf('StoreModule') === -1) {
-                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`));
+                changes.push(...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`));
             }
             if (moduleSource.indexOf('EffectsModule') === -1) {
-                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`));
+                changes.push(...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`));
             }
-            changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}Effects } from './state/${name}.effects';`), ...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.camelize(name)}Reducer } from './state/${name}.reducer';`), ...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}State } from './state/${name}.state';`));
+            changes.push(...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}Effects } from './state/${name}.effects';`), ...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.camelize(name)}Reducer } from './state/${name}.reducer';`), ...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}State } from './state/${name}.state';`));
             if (options.root) {
                 if (moduleSource.indexOf('environments/environment') === -1) {
                     const envFrom = isInLibs
                         ? './environments/environment'
                         : `@${(0, xplat_utils_1.getNpmScope)()}/xplat/core`;
-                    changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`));
+                    changes.push(...(0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`));
                 }
-                changes.push(...(0, ast_1.addImportToModule)(moduleSourceFile, modulePath, `StoreModule.forRoot(
+                changes.push((0, ast_1.addImportToModule)(devKitTree, moduleSourceFile, modulePath, `StoreModule.forRoot(
       { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.camelize(name)}Reducer },
       {
         initialState: { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.classify(name)}State.initialState }
       }
-    ), EffectsModule.forRoot([${xplat_1.stringUtils.classify(name)}Effects])`), ...(0, ast_1.addProviderToModule)(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+    ), EffectsModule.forRoot([${xplat_1.stringUtils.classify(name)}Effects])`), (0, ast_1.addProviderToModule)(devKitTree, moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
             }
             else {
                 // feature state
-                changes.push(...(0, ast_1.addImportToModule)(moduleSourceFile, modulePath, `StoreModule.forFeature('${xplat_1.stringUtils.camelize(name)}', ${xplat_1.stringUtils.camelize(name)}Reducer, { initialState: ${xplat_1.stringUtils.classify(name)}State.initialState }), EffectsModule.forFeature([${xplat_1.stringUtils.classify(name)}Effects])`), ...(0, ast_1.addProviderToModule)(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+                changes.push((0, ast_1.addImportToModule)(devKitTree, moduleSourceFile, modulePath, `StoreModule.forFeature('${xplat_1.stringUtils.camelize(name)}', ${xplat_1.stringUtils.camelize(name)}Reducer, { initialState: ${xplat_1.stringUtils.classify(name)}State.initialState }), EffectsModule.forFeature([${xplat_1.stringUtils.classify(name)}Effects])`), (0, ast_1.addProviderToModule)(devKitTree, moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
             }
-            (0, xplat_1.insert)(host, modulePath, changes);
+            // insert(devKitTree.tree, modulePath, changes);
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustFeatureModuleForState = adjustFeatureModuleForState;
 function adjustRouting(options, routingModulePaths, platform) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         const featureName = options.name.toLowerCase();
         let routingModulePath;
         // check which routing naming convention might be in use
@@ -533,13 +538,13 @@ function adjustRouting(options, routingModulePaths, platform) {
             const routingSourceFile = ts.createSourceFile(routingModulePath, routingSource, ts.ScriptTarget.Latest, true);
             const changes = [];
             // add component to route config
-            changes.push(...(0, ast_1.addToCollection)(routingSourceFile, routingModulePath, `{ 
+            changes.push(...(0, ast_1.addToCollection)(devKitTree, routingSourceFile, routingModulePath, `{ 
               path: '${featureName}',
               loadChildren: () => import('./features/${options.directory ? options.directory + '/' : ''}${featureName}/${featureName}.module').then(m => m.${xplat_1.stringUtils.classify(featureName)}Module)
           }`));
-            (0, xplat_1.insert)(host, routingModulePath, changes);
+            // insert(devKitTree.tree, routingModulePath, changes);
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustRouting = adjustRouting;
@@ -589,7 +594,7 @@ function adjustSandbox(options, platform, appDirectory) {
                             homeTemplate.slice(buttonEndIndex + 9);
                     break;
             }
-            (0, workspace_1.createOrUpdate)(tree, homeCmpPath, homeTemplate);
+            (0, xplat_utils_1.updateFile)(tree, homeCmpPath, homeTemplate);
         }
         else {
             throw new schematics_1.SchematicsException(`The --adjustSandbox option is only supported on the following at the moment: ${xplat_1.supportedSandboxPlatforms}`);

package/src/utils/versions.d.ts

@@ -4,8 +4,7 @@ export declare const angularVersion = "^15.0.0";
 export declare const angularDevkitVersion = "^15.0.0";
 export declare const ngxTranslateVersion = "~14.0.0";
 export declare const ngxTranslateHttpVersion = "~7.0.0";
-export declare const coreJsVersion = "^3.6.5";
 export declare const rxjsVersion = "^7.5.0";
-export declare const zonejsVersion = "~0.12.0";
-export declare const jestPresetAngular = "11.0.0";
+export declare const zonejsVersion = "~0.13.0";
+export declare const jestPresetAngular = "~13.0.0";
 export declare const typesJest = "29.4.0";

package/src/utils/versions.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typesJest = exports.jestPresetAngular = exports.zonejsVersion = exports.rxjsVersion = exports.coreJsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
-exports.xplatVersion = '15.0.3';
+exports.typesJest = exports.jestPresetAngular = exports.zonejsVersion = exports.rxjsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
+exports.xplatVersion = '15.0.4-rc.0';
 exports.nxVersion = '^15.0.0';
 exports.angularVersion = '^15.0.0';
 exports.angularDevkitVersion = '^15.0.0';
 exports.ngxTranslateVersion = '~14.0.0';
 exports.ngxTranslateHttpVersion = '~7.0.0';
-exports.coreJsVersion = '^3.6.5';
 exports.rxjsVersion = '^7.5.0';
-exports.zonejsVersion = '~0.12.0';
-exports.jestPresetAngular = '11.0.0';
+exports.zonejsVersion = '~0.13.0';
+exports.jestPresetAngular = '~13.0.0';
 exports.typesJest = '29.4.0';

package/src/utils/xplat.js

@@ -100,8 +100,9 @@ var XplatAngularHelpers;
                 dependencies[`@angular/platform-browser`] = ngVersion;
                 dependencies[`@angular/platform-browser-dynamic`] = ngVersion;
                 dependencies[`@angular/router`] = ngVersion;
-                dependencies[`core-js`] = versions_1.coreJsVersion;
-                dependencies[`rxjs`] = versions_1.rxjsVersion;
+                if (!dependencies[`rxjs`]) {
+                    dependencies[`rxjs`] = versions_1.rxjsVersion;
+                }
                 dependencies[`zone.js`] = versions_1.zonejsVersion;
                 devDependencies[`@angular/compiler-cli`] = ngVersion;
                 devDependencies[`@angular/language-service`] = ngVersion;