@ionic/angular 7.5.5-dev.11699974376.13a15397 → 7.5.5-dev.11699997410.16566960

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ionic/angular",
-  "version": "7.5.5-dev.11699974376.13a15397",
+  "version": "7.5.5-dev.11699997410.16566960",
   "description": "Angular specific wrappers for @ionic/core",
   "keywords": [
     "ionic",
@@ -56,7 +56,7 @@
     }
   },
   "dependencies": {
-    "@ionic/core": "7.5.5-dev.11699974376.13a15397",
+    "@ionic/core": "7.5.5-dev.11699997410.16566960",
     "ionicons": "^7.0.0",
     "jsonc-parser": "^3.0.0",
     "tslib": "^2.3.0"

package/schematics/add/files/root/theme/variables.css

@@ -4,3 +4,244 @@
 
 /* To quickly generate your own theme, check out the color generator */
 /* https://ionicframework.com/docs/theming/color-generator */
+
+/** Ionic CSS Variables **/
+:root {
+  /** primary **/
+  --ion-color-primary: #3880ff;
+  --ion-color-primary-rgb: 56, 128, 255;
+  --ion-color-primary-contrast: #ffffff;
+  --ion-color-primary-contrast-rgb: 255, 255, 255;
+  --ion-color-primary-shade: #3171e0;
+  --ion-color-primary-tint: #4c8dff;
+
+  /** secondary **/
+  --ion-color-secondary: #3dc2ff;
+  --ion-color-secondary-rgb: 61, 194, 255;
+  --ion-color-secondary-contrast: #ffffff;
+  --ion-color-secondary-contrast-rgb: 255, 255, 255;
+  --ion-color-secondary-shade: #36abe0;
+  --ion-color-secondary-tint: #50c8ff;
+
+  /** tertiary **/
+  --ion-color-tertiary: #5260ff;
+  --ion-color-tertiary-rgb: 82, 96, 255;
+  --ion-color-tertiary-contrast: #ffffff;
+  --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+  --ion-color-tertiary-shade: #4854e0;
+  --ion-color-tertiary-tint: #6370ff;
+
+  /** success **/
+  --ion-color-success: #2dd36f;
+  --ion-color-success-rgb: 45, 211, 111;
+  --ion-color-success-contrast: #ffffff;
+  --ion-color-success-contrast-rgb: 255, 255, 255;
+  --ion-color-success-shade: #28ba62;
+  --ion-color-success-tint: #42d77d;
+
+  /** warning **/
+  --ion-color-warning: #ffc409;
+  --ion-color-warning-rgb: 255, 196, 9;
+  --ion-color-warning-contrast: #000000;
+  --ion-color-warning-contrast-rgb: 0, 0, 0;
+  --ion-color-warning-shade: #e0ac08;
+  --ion-color-warning-tint: #ffca22;
+
+  /** danger **/
+  --ion-color-danger: #eb445a;
+  --ion-color-danger-rgb: 235, 68, 90;
+  --ion-color-danger-contrast: #ffffff;
+  --ion-color-danger-contrast-rgb: 255, 255, 255;
+  --ion-color-danger-shade: #cf3c4f;
+  --ion-color-danger-tint: #ed576b;
+
+  /** dark **/
+  --ion-color-dark: #222428;
+  --ion-color-dark-rgb: 34, 36, 40;
+  --ion-color-dark-contrast: #ffffff;
+  --ion-color-dark-contrast-rgb: 255, 255, 255;
+  --ion-color-dark-shade: #1e2023;
+  --ion-color-dark-tint: #383a3e;
+
+  /** medium **/
+  --ion-color-medium: #92949c;
+  --ion-color-medium-rgb: 146, 148, 156;
+  --ion-color-medium-contrast: #ffffff;
+  --ion-color-medium-contrast-rgb: 255, 255, 255;
+  --ion-color-medium-shade: #808289;
+  --ion-color-medium-tint: #9d9fa6;
+
+  /** light **/
+  --ion-color-light: #f4f5f8;
+  --ion-color-light-rgb: 244, 245, 248;
+  --ion-color-light-contrast: #000000;
+  --ion-color-light-contrast-rgb: 0, 0, 0;
+  --ion-color-light-shade: #d7d8da;
+  --ion-color-light-tint: #f5f6f9;
+}
+
+@media (prefers-color-scheme: dark) {
+  /*
+   * Dark Colors
+   * -------------------------------------------
+   */
+
+  body {
+    --ion-color-primary: #428cff;
+    --ion-color-primary-rgb: 66, 140, 255;
+    --ion-color-primary-contrast: #ffffff;
+    --ion-color-primary-contrast-rgb: 255, 255, 255;
+    --ion-color-primary-shade: #3a7be0;
+    --ion-color-primary-tint: #5598ff;
+
+    --ion-color-secondary: #50c8ff;
+    --ion-color-secondary-rgb: 80, 200, 255;
+    --ion-color-secondary-contrast: #ffffff;
+    --ion-color-secondary-contrast-rgb: 255, 255, 255;
+    --ion-color-secondary-shade: #46b0e0;
+    --ion-color-secondary-tint: #62ceff;
+
+    --ion-color-tertiary: #6a64ff;
+    --ion-color-tertiary-rgb: 106, 100, 255;
+    --ion-color-tertiary-contrast: #ffffff;
+    --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+    --ion-color-tertiary-shade: #5d58e0;
+    --ion-color-tertiary-tint: #7974ff;
+
+    --ion-color-success: #2fdf75;
+    --ion-color-success-rgb: 47, 223, 117;
+    --ion-color-success-contrast: #000000;
+    --ion-color-success-contrast-rgb: 0, 0, 0;
+    --ion-color-success-shade: #29c467;
+    --ion-color-success-tint: #44e283;
+
+    --ion-color-warning: #ffd534;
+    --ion-color-warning-rgb: 255, 213, 52;
+    --ion-color-warning-contrast: #000000;
+    --ion-color-warning-contrast-rgb: 0, 0, 0;
+    --ion-color-warning-shade: #e0bb2e;
+    --ion-color-warning-tint: #ffd948;
+
+    --ion-color-danger: #ff4961;
+    --ion-color-danger-rgb: 255, 73, 97;
+    --ion-color-danger-contrast: #ffffff;
+    --ion-color-danger-contrast-rgb: 255, 255, 255;
+    --ion-color-danger-shade: #e04055;
+    --ion-color-danger-tint: #ff5b71;
+
+    --ion-color-dark: #f4f5f8;
+    --ion-color-dark-rgb: 244, 245, 248;
+    --ion-color-dark-contrast: #000000;
+    --ion-color-dark-contrast-rgb: 0, 0, 0;
+    --ion-color-dark-shade: #d7d8da;
+    --ion-color-dark-tint: #f5f6f9;
+
+    --ion-color-medium: #989aa2;
+    --ion-color-medium-rgb: 152, 154, 162;
+    --ion-color-medium-contrast: #000000;
+    --ion-color-medium-contrast-rgb: 0, 0, 0;
+    --ion-color-medium-shade: #86888f;
+    --ion-color-medium-tint: #a2a4ab;
+
+    --ion-color-light: #222428;
+    --ion-color-light-rgb: 34, 36, 40;
+    --ion-color-light-contrast: #ffffff;
+    --ion-color-light-contrast-rgb: 255, 255, 255;
+    --ion-color-light-shade: #1e2023;
+    --ion-color-light-tint: #383a3e;
+  }
+
+  /*
+   * iOS Dark Theme
+   * -------------------------------------------
+   */
+
+  .ios body {
+    --ion-background-color: #000000;
+    --ion-background-color-rgb: 0, 0, 0;
+
+    --ion-text-color: #ffffff;
+    --ion-text-color-rgb: 255, 255, 255;
+
+    --ion-color-step-50: #0d0d0d;
+    --ion-color-step-100: #1a1a1a;
+    --ion-color-step-150: #262626;
+    --ion-color-step-200: #333333;
+    --ion-color-step-250: #404040;
+    --ion-color-step-300: #4d4d4d;
+    --ion-color-step-350: #595959;
+    --ion-color-step-400: #666666;
+    --ion-color-step-450: #737373;
+    --ion-color-step-500: #808080;
+    --ion-color-step-550: #8c8c8c;
+    --ion-color-step-600: #999999;
+    --ion-color-step-650: #a6a6a6;
+    --ion-color-step-700: #b3b3b3;
+    --ion-color-step-750: #bfbfbf;
+    --ion-color-step-800: #cccccc;
+    --ion-color-step-850: #d9d9d9;
+    --ion-color-step-900: #e6e6e6;
+    --ion-color-step-950: #f2f2f2;
+
+    --ion-item-background: #000000;
+
+    --ion-card-background: #1c1c1d;
+  }
+
+  .ios ion-modal {
+    --ion-background-color: var(--ion-color-step-100);
+    --ion-toolbar-background: var(--ion-color-step-150);
+    --ion-toolbar-border-color: var(--ion-color-step-250);
+  }
+
+  /*
+   * Material Design Dark Theme
+   * -------------------------------------------
+   */
+
+  .md body {
+    --ion-background-color: #121212;
+    --ion-background-color-rgb: 18, 18, 18;
+
+    --ion-text-color: #ffffff;
+    --ion-text-color-rgb: 255, 255, 255;
+
+    --ion-border-color: #222222;
+
+    --ion-color-step-50: #1e1e1e;
+    --ion-color-step-100: #2a2a2a;
+    --ion-color-step-150: #363636;
+    --ion-color-step-200: #414141;
+    --ion-color-step-250: #4d4d4d;
+    --ion-color-step-300: #595959;
+    --ion-color-step-350: #656565;
+    --ion-color-step-400: #717171;
+    --ion-color-step-450: #7d7d7d;
+    --ion-color-step-500: #898989;
+    --ion-color-step-550: #949494;
+    --ion-color-step-600: #a0a0a0;
+    --ion-color-step-650: #acacac;
+    --ion-color-step-700: #b8b8b8;
+    --ion-color-step-750: #c4c4c4;
+    --ion-color-step-800: #d0d0d0;
+    --ion-color-step-850: #dbdbdb;
+    --ion-color-step-900: #e7e7e7;
+    --ion-color-step-950: #f3f3f3;
+
+    --ion-item-background: #1e1e1e;
+
+    --ion-toolbar-background: #1f1f1f;
+
+    --ion-tab-bar-background: #1f1f1f;
+
+    --ion-card-background: #1e1e1e;
+  }
+}
+
+html {
+  /*
+   * For more information on dynamic font scaling, visit the documentation:
+   * https://ionicframework.com/docs/layout/dynamic-font-scaling
+   */
+  --ion-dynamic-font: var(--ion-default-dynamic-font);
+}

package/schematics/add/index.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
+const utility_1 = require("@schematics/angular/utility");
 const workspace_1 = require("@schematics/angular/utility/workspace");
-const ast_1 = require("./../utils/ast");
+const ast_1 = require("../utils/ast");
 const config_1 = require("./../utils/config");
 const package_1 = require("./../utils/package");
 function addIonicAngularToPackageJson() {
@@ -19,9 +20,48 @@ function addIonicAngularToolkitToPackageJson() {
         return host;
     };
 }
+/**
+ * Adds the @ionic/angular-toolkit schematics and cli configuration to the project's `angular.json` file.
+ * @param projectName The name of the project.
+ */
+function addIonicAngularToolkitToAngularJson() {
+    return (host) => {
+        (0, config_1.addCli)(host, '@ionic/angular-toolkit');
+        (0, config_1.addSchematics)(host, '@ionic/angular-toolkit:component', {
+            styleext: 'scss',
+        });
+        (0, config_1.addSchematics)(host, '@ionic/angular-toolkit:page', {
+            styleext: 'scss',
+        });
+        return host;
+    };
+}
+/**
+ * Adds the `IonicModule.forRoot()` usage to the project's `AppModule`.
+ * If the project does not use modules this will operate as a noop.
+ * @param projectSourceRoot The source root path of the project.
+ */
 function addIonicAngularModuleToAppModule(projectSourceRoot) {
     return (host) => {
-        (0, ast_1.addModuleImportToRootModule)(host, projectSourceRoot, 'IonicModule.forRoot()', '@ionic/angular');
+        const appModulePath = `${projectSourceRoot}/app/app.module.ts`;
+        if (host.exists(appModulePath)) {
+            (0, ast_1.addIonicModuleImportToNgModule)(host, appModulePath);
+        }
+        return host;
+    };
+}
+/**
+ * Adds the `provideIonicAngular` usage to the project's app config.
+ * If the project does not use an app config this will operate as a noop.
+ * @param projectName The name of the project.
+ * @param projectSourceRoot The source root path of the project.
+ */
+function addProvideIonicAngular(projectName, projectSourceRoot) {
+    return (host) => {
+        const appConfig = `${projectSourceRoot}/app/app.config.ts`;
+        if (host.exists(appConfig)) {
+            return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => code `${external('provideIonicAngular', '@ionic/angular/standalone')}({})`);
+        }
         return host;
     };
 }
@@ -46,15 +86,36 @@ function addIonicStyles(projectName, projectSourceRoot) {
         return host;
     };
 }
-function addIonicons(projectName) {
+function addIonicons(projectName, projectSourceRoot) {
     return (host) => {
-        const ioniconsGlob = {
-            glob: '**/*.svg',
-            input: 'node_modules/ionicons/dist/ionicons/svg',
-            output: './svg',
-        };
-        (0, config_1.addAsset)(host, projectName, 'build', ioniconsGlob);
-        (0, config_1.addAsset)(host, projectName, 'test', ioniconsGlob);
+        const hasAppModule = host.exists(`${projectSourceRoot}/app/app.module.ts`);
+        if (hasAppModule) {
+            /**
+             * Add Ionicons to the `angular.json` file only if the project
+             * is using the lazy build of `@ionic/angular` with modules.
+             */
+            const ioniconsGlob = {
+                glob: '**/*.svg',
+                input: 'node_modules/ionicons/dist/ionicons/svg',
+                output: './svg',
+            };
+            (0, config_1.addAsset)(host, projectName, 'build', ioniconsGlob);
+            (0, config_1.addAsset)(host, projectName, 'test', ioniconsGlob);
+        }
+        return host;
+    };
+}
+function addIonicConfig() {
+    return (host) => {
+        const ionicConfig = `ionic.config.json`;
+        if (!host.exists(ionicConfig)) {
+            host.create(ionicConfig, JSON.stringify({
+                name: 'ionic-app',
+                app_id: '',
+                type: 'angular',
+                integrations: {},
+            }, null, 2));
+        }
         return host;
     };
 }
@@ -108,10 +169,13 @@ function ngAdd(options) {
             // @ionic/angular
             addIonicAngularToPackageJson(),
             addIonicAngularToolkitToPackageJson(),
+            addIonicAngularToolkitToAngularJson(),
             addIonicAngularModuleToAppModule(sourcePath),
+            addProvideIonicAngular(options.project, sourcePath),
             addIonicBuilder(options.project),
             addIonicStyles(options.project, sourcePath),
-            addIonicons(options.project),
+            addIonicons(options.project, sourcePath),
+            addIonicConfig(),
             (0, schematics_1.mergeWith)(rootTemplateSource),
             // install freshly added dependencies
             installNodeDeps(),

package/schematics/utils/ast.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addModuleImportToModule = exports.addModuleImportToRootModule = exports.getSourceFile = void 0;
-const core_1 = require("@angular-devkit/core");
+exports.addIonicModuleImportToNgModule = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const change_1 = require("@schematics/angular/utility/change");
 const ts = require("typescript");
-const ast_utils_1 = require("./devkit-utils/ast-utils");
-const change_1 = require("./devkit-utils/change");
 /**
  * Reads file given path and returns TypeScript source file.
  */
@@ -18,30 +17,16 @@ function getSourceFile(host, path) {
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }
-exports.getSourceFile = getSourceFile;
 /**
  * Import and add module to root app module.
  */
-function addModuleImportToRootModule(host, projectSourceRoot, moduleName, importSrc) {
-    addModuleImportToModule(host, (0, core_1.normalize)(`${projectSourceRoot}/app/app.module.ts`), moduleName, importSrc);
-}
-exports.addModuleImportToRootModule = addModuleImportToRootModule;
-/**
- * Import and add module to specific module path.
- * @param host the tree we are updating
- * @param modulePath src location of the module to import
- * @param moduleName name of module to import
- * @param src src location to import
- */
-function addModuleImportToModule(host, modulePath, moduleName, src) {
-    const moduleSource = getSourceFile(host, modulePath);
-    const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
+function addIonicModuleImportToNgModule(host, modulePath) {
     const recorder = host.beginUpdate(modulePath);
-    changes.forEach((change) => {
-        if (change instanceof change_1.InsertChange) {
-            recorder.insertLeft(change.pos, change.toAdd);
-        }
-    });
+    const moduleSource = getSourceFile(host, modulePath);
+    const ionicModuleChange = (0, ast_utils_1.insertImport)(moduleSource, modulePath, 'IonicModule', '@ionic/angular');
+    (0, change_1.applyToUpdateRecorder)(recorder, [ionicModuleChange]);
+    const metadataChange = (0, ast_utils_1.addSymbolToNgModuleMetadata)(moduleSource, modulePath, 'imports', 'IonicModule.forRoot({})');
+    (0, change_1.applyToUpdateRecorder)(recorder, metadataChange);
     host.commitUpdate(recorder);
 }
-exports.addModuleImportToModule = addModuleImportToModule;
+exports.addIonicModuleImportToNgModule = addIonicModuleImportToNgModule;

package/schematics/utils/config.js

@@ -1,24 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspace = exports.getWorkspacePath = exports.addArchitectBuilder = exports.addAsset = exports.addStyle = exports.getAngularAppConfig = exports.getDefaultAngularAppName = exports.writeConfig = exports.readConfig = void 0;
+exports.getWorkspace = exports.getWorkspacePath = exports.addSchematics = exports.addCli = exports.addArchitectBuilder = exports.addAsset = exports.addStyle = exports.getDefaultAngularAppName = exports.writeConfig = exports.readConfig = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const jsonc_parser_1 = require("jsonc-parser");
-const CONFIG_PATH = 'angular.json';
-// TODO(FW-2827): types
+const ANGULAR_JSON_PATH = 'angular.json';
 function readConfig(host) {
-    var _a;
-    const sourceText = (_a = host.read(CONFIG_PATH)) === null || _a === void 0 ? void 0 : _a.toString('utf-8');
-    return JSON.parse(sourceText);
+    return host.readJson(ANGULAR_JSON_PATH);
 }
 exports.readConfig = readConfig;
 function writeConfig(host, config) {
-    host.overwrite(CONFIG_PATH, JSON.stringify(config, null, 2));
+    host.overwrite(ANGULAR_JSON_PATH, JSON.stringify(config, null, 2));
 }
 exports.writeConfig = writeConfig;
 function isAngularBrowserProject(projectConfig) {
     if (projectConfig.projectType === 'application') {
         const buildConfig = projectConfig.architect.build;
-        return buildConfig.builder === '@angular-devkit/build-angular:browser';
+        // Angular 16 and lower
+        const legacyAngularBuilder = buildConfig.builder === '@angular-devkit/build-angular:browser';
+        // Angular 17+
+        const modernAngularBuilder = buildConfig.builder === '@angular-devkit/build-angular:application';
+        return legacyAngularBuilder || modernAngularBuilder;
     }
     return false;
 }
@@ -34,7 +35,7 @@ function getDefaultAngularAppName(config) {
     return projectNames[0];
 }
 exports.getDefaultAngularAppName = getDefaultAngularAppName;
-function getAngularAppConfig(config, projectName) {
+function getAngularJson(config, projectName) {
     // eslint-disable-next-line no-prototype-builtins
     if (!config.projects.hasOwnProperty(projectName)) {
         throw new schematics_1.SchematicsException(`Could not find project: ${projectName}`);
@@ -51,11 +52,10 @@ function getAngularAppConfig(config, projectName) {
         throw new schematics_1.SchematicsException(`Invalid builder for ${projectName}: ${buildConfig.builder}`);
     }
 }
-exports.getAngularAppConfig = getAngularAppConfig;
 function addStyle(host, projectName, stylePath) {
     const config = readConfig(host);
-    const appConfig = getAngularAppConfig(config, projectName);
-    appConfig.architect.build.options.styles.push({
+    const angularJson = getAngularJson(config, projectName);
+    angularJson.architect.build.options.styles.push({
         input: stylePath,
     });
     writeConfig(host, config);
@@ -63,8 +63,8 @@ function addStyle(host, projectName, stylePath) {
 exports.addStyle = addStyle;
 function addAsset(host, projectName, architect, asset) {
     const config = readConfig(host);
-    const appConfig = getAngularAppConfig(config, projectName);
-    const target = appConfig.architect[architect];
+    const angularJson = getAngularJson(config, projectName);
+    const target = angularJson.architect[architect];
     if (target) {
         target.options.assets.push(asset);
         writeConfig(host, config);
@@ -73,11 +73,32 @@ function addAsset(host, projectName, architect, asset) {
 exports.addAsset = addAsset;
 function addArchitectBuilder(host, projectName, builderName, builderOpts) {
     const config = readConfig(host);
-    const appConfig = getAngularAppConfig(config, projectName);
-    appConfig.architect[builderName] = builderOpts;
+    const angularJson = getAngularJson(config, projectName);
+    angularJson.architect[builderName] = builderOpts;
     writeConfig(host, config);
 }
 exports.addArchitectBuilder = addArchitectBuilder;
+function addCli(host, collectionName) {
+    const angularJson = readConfig(host);
+    if (angularJson.cli === undefined) {
+        angularJson.cli = {};
+    }
+    if (angularJson.cli.schematicCollections === undefined) {
+        angularJson.cli.schematicCollections = [];
+    }
+    angularJson.cli.schematicCollections.push(collectionName);
+    writeConfig(host, angularJson);
+}
+exports.addCli = addCli;
+function addSchematics(host, schematicName, schematicOpts) {
+    const angularJson = readConfig(host);
+    if (angularJson.schematics === undefined) {
+        angularJson.schematics = {};
+    }
+    angularJson.schematics[schematicName] = schematicOpts;
+    writeConfig(host, angularJson);
+}
+exports.addSchematics = addSchematics;
 function getWorkspacePath(host) {
     const possibleFiles = ['/angular.json', '/.angular.json'];
     const path = possibleFiles.filter((path) => host.exists(path))[0];

package/schematics/utils/devkit-utils/ast-utils.js

@@ -1,488 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isImported = exports.addEntryComponentToModule = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getFirstNgModuleName = exports.getDecoratorMetadata = exports.getContentOfKeyLiteral = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const ts = require("typescript");
-const change_1 = require("./change");
-/**
- * Add Import `import { symbolName } from fileName` if the import doesn't exit
- * already. Assumes fileToEdit can be resolved and accessed.
- * @param fileToEdit (file we want to add import to)
- * @param symbolName (item to import)
- * @param fileName (path to the file)
- * @param isDefault (if true, import follows style for importing default exports)
- * @return Change
- */
-function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
-    const rootNode = source;
-    const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
-    // get nodes that map to import statements from the file fileName
-    const relevantImports = allImports.filter((node) => {
-        // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-        const importFiles = node
-            .getChildren()
-            .filter((child) => child.kind === ts.SyntaxKind.StringLiteral)
-            .map((n) => n.text);
-        return importFiles.filter((file) => file === fileName).length === 1;
-    });
-    if (relevantImports.length > 0) {
-        let importsAsterisk = false;
-        // imports from import file
-        const imports = [];
-        relevantImports.forEach((n) => {
-            Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));
-            if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
-                importsAsterisk = true;
-            }
-        });
-        // if imports * from fileName, don't add symbolName
-        if (importsAsterisk) {
-            return new change_1.NoopChange();
-        }
-        const importTextNodes = imports.filter((n) => n.text === symbolName);
-        // insert import if it's not there
-        if (importTextNodes.length === 0) {
-            const fallbackPos = findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
-        }
-        return new change_1.NoopChange();
-    }
-    // no such import declaration exists
-    const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
-    let fallbackPos = 0;
-    if (useStrict.length > 0) {
-        fallbackPos = useStrict[0].end;
-    }
-    const open = isDefault ? '' : '{ ';
-    const close = isDefault ? '' : ' }';
-    // if there are no imports or 'use strict' statement, insert import at beginning of file
-    const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
-    const separator = insertAtBeginning ? '' : ';\n';
-    const toInsert = `${separator}import ${open}${symbolName}${close}` + ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
-}
-exports.insertImport = insertImport;
-/**
- * Find all nodes from the AST in the subtree of node of SyntaxKind kind.
- * @param node
- * @param kind
- * @param max The maximum number of items to return.
- * @return all nodes of kind, or [] if none is found
- */
-function findNodes(node, kind, max = Infinity) {
-    if (!node || max == 0) {
-        return [];
-    }
-    const arr = [];
-    if (node.kind === kind) {
-        arr.push(node);
-        max--;
-    }
-    if (max > 0) {
-        for (const child of node.getChildren()) {
-            findNodes(child, kind, max).forEach((node) => {
-                if (max > 0) {
-                    arr.push(node);
-                }
-                max--;
-            });
-            if (max <= 0) {
-                break;
-            }
-        }
-    }
-    return arr;
-}
-exports.findNodes = findNodes;
-/**
- * Get all the nodes from a source.
- * @param sourceFile The source file object.
- * @returns {Observable<ts.Node>} An observable of all the nodes in the source.
- */
-function getSourceNodes(sourceFile) {
-    const nodes = [sourceFile];
-    const result = [];
-    while (nodes.length > 0) {
-        const node = nodes.shift();
-        if (node) {
-            result.push(node);
-            if (node.getChildCount(sourceFile) >= 0) {
-                nodes.unshift(...node.getChildren());
-            }
-        }
-    }
-    return result;
-}
-exports.getSourceNodes = getSourceNodes;
-function findNode(node, kind, text) {
-    if (node.kind === kind && node.getText() === text) {
-        // throw new Error(node.getText());
-        return node;
-    }
-    let foundNode = null;
-    ts.forEachChild(node, (childNode) => {
-        foundNode = foundNode || findNode(childNode, kind, text);
-    });
-    return foundNode;
-}
-exports.findNode = findNode;
-/**
- * Helper for sorting nodes.
- * @return function to sort nodes in increasing order of position in sourceFile
- */
-function nodesByPosition(first, second) {
-    return first.getStart() - second.getStart();
-}
-/**
- * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`
- * or after the last of occurence of `syntaxKind` if the last occurence is a sub child
- * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.
- *
- * @param nodes insert after the last occurence of nodes
- * @param toInsert string to insert
- * @param file file to insert changes into
- * @param fallbackPos position to insert if toInsert happens to be the first occurence
- * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after
- * @return Change instance
- * @throw Error if toInsert is first occurence but fall back is not set
- */
-function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKind) {
-    // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
-    let lastItem = [...nodes].sort(nodesByPosition).pop();
-    if (!lastItem) {
-        throw new Error();
-    }
-    if (syntaxKind) {
-        lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
-    }
-    if (!lastItem && fallbackPos == undefined) {
-        throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);
-    }
-    const lastItemPosition = lastItem ? lastItem.getEnd() : fallbackPos;
-    return new change_1.InsertChange(file, lastItemPosition, toInsert);
-}
-exports.insertAfterLastOccurrence = insertAfterLastOccurrence;
-function getContentOfKeyLiteral(_source, node) {
-    if (node.kind == ts.SyntaxKind.Identifier) {
-        return node.text;
-    }
-    else if (node.kind == ts.SyntaxKind.StringLiteral) {
-        return node.text;
-    }
-    else {
-        return null;
-    }
-}
-exports.getContentOfKeyLiteral = getContentOfKeyLiteral;
-function _angularImportsFromNode(node, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-_sourceFile) {
-    const ms = node.moduleSpecifier;
-    let modulePath;
-    switch (ms.kind) {
-        case ts.SyntaxKind.StringLiteral:
-            modulePath = ms.text;
-            break;
-        default:
-            return {};
-    }
-    if (!modulePath.startsWith('@angular/')) {
-        return {};
-    }
-    if (node.importClause) {
-        if (node.importClause.name) {
-            // This is of the form `import Name from 'path'`. Ignore.
-            return {};
-        }
-        else if (node.importClause.namedBindings) {
-            const nb = node.importClause.namedBindings;
-            if (nb.kind == ts.SyntaxKind.NamespaceImport) {
-                // This is of the form `import * as name from 'path'`. Return `name.`.
-                return {
-                    [nb.name.text + '.']: modulePath,
-                };
-            }
-            else {
-                // This is of the form `import {a,b,c} from 'path'`
-                const namedImports = nb;
-                return namedImports.elements
-                    .map((is) => (is.propertyName ? is.propertyName.text : is.name.text))
-                    .reduce((acc, curr) => {
-                    acc[curr] = modulePath;
-                    return acc;
-                }, {});
-            }
-        }
-        return {};
-    }
-    else {
-        // This is of the form `import 'path';`. Nothing to do.
-        return {};
-    }
-}
-function getDecoratorMetadata(source, identifier, module) {
-    const angularImports = findNodes(source, ts.SyntaxKind.ImportDeclaration)
-        .map((node) => _angularImportsFromNode(node, source))
-        .reduce((acc, current) => {
-        for (const key of Object.keys(current)) {
-            acc[key] = current[key];
-        }
-        return acc;
-    }, {});
-    return getSourceNodes(source)
-        .filter((node) => {
-        return (node.kind == ts.SyntaxKind.Decorator && node.expression.kind == ts.SyntaxKind.CallExpression);
-    })
-        .map((node) => node.expression)
-        .filter((expr) => {
-        if (expr.expression.kind == ts.SyntaxKind.Identifier) {
-            const id = expr.expression;
-            return id.getFullText(source) == identifier && angularImports[id.getFullText(source)] === module;
-        }
-        else if (expr.expression.kind == ts.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) {
-                return false;
-            }
-            const id = paExpr.name.text;
-            const moduleId = paExpr.expression.getText(source);
-            return id === identifier && angularImports[moduleId + '.'] === module;
-        }
-        return false;
-    })
-        .filter((expr) => expr.arguments[0] && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
-        .map((expr) => expr.arguments[0]);
-}
-exports.getDecoratorMetadata = getDecoratorMetadata;
-function findClassDeclarationParent(node) {
-    if (ts.isClassDeclaration(node)) {
-        return node;
-    }
-    return node.parent && findClassDeclarationParent(node.parent);
-}
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-function getFirstNgModuleName(source) {
-    // First, find the @NgModule decorators.
-    const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    if (ngModulesMetadata.length === 0) {
-        return undefined;
-    }
-    // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule
-    // metadata.
-    const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);
-    if (!(moduleClass === null || moduleClass === void 0 ? void 0 : moduleClass.name)) {
-        return undefined;
-    }
-    // Get the class name of the module ClassDeclaration.
-    return moduleClass.name.text;
-}
-exports.getFirstNgModuleName = getFirstNgModuleName;
-function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbolName, importPath = null) {
-    const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    let node = nodes[0]; // tslint:disable-line:no-any
-    // Find the decorator declaration.
-    if (!node) {
-        return [];
-    }
-    // Get all the children property assignment of object literals.
-    const matchingProperties = node.properties
-        .filter((prop) => prop.kind == ts.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:
-                return name.getText(source) == metadataField;
-            case ts.SyntaxKind.StringLiteral:
-                return name.text == metadataField;
-        }
-        return false;
-    });
-    // Get the last node of the array literal.
-    if (!matchingProperties) {
-        return [];
-    }
-    if (matchingProperties.length == 0) {
-        // We haven't found the field in the metadata declaration. Insert a new field.
-        const expr = node;
-        let position;
-        let toInsert;
-        if (expr.properties.length == 0) {
-            position = expr.getEnd() - 1;
-            toInsert = `  ${metadataField}: [${symbolName}]\n`;
-        }
-        else {
-            node = expr.properties[expr.properties.length - 1];
-            position = node.getEnd();
-            // Get the indentation of the last element, if any.
-            const text = node.getFullText(source);
-            const matches = text.match(/^\r?\n\s*/);
-            if (matches.length > 0) {
-                toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;
-            }
-            else {
-                toInsert = `, ${metadataField}: [${symbolName}]`;
-            }
-        }
-        if (importPath !== null) {
-            return [
-                new change_1.InsertChange(ngModulePath, position, toInsert),
-                insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
-            ];
-        }
-        else {
-            return [new change_1.InsertChange(ngModulePath, 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 [];
-    }
-    const arrLiteral = assignment.initializer;
-    if (arrLiteral.elements.length == 0) {
-        // Forward the property.
-        node = arrLiteral;
-    }
-    else {
-        node = arrLiteral.elements;
-    }
-    if (!node) {
-        console.log('No app module found. Please add your new class to your component.');
-        return [];
-    }
-    if (Array.isArray(node)) {
-        // eslint-disable-next-line @typescript-eslint/ban-types
-        const nodeArray = node;
-        const symbolsArray = nodeArray.map((node) => node.getText());
-        if (symbolsArray.includes(symbolName)) {
-            return [];
-        }
-        node = node[node.length - 1];
-    }
-    let toInsert;
-    let position = node.getEnd();
-    if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {
-        // We haven't found the field in the metadata declaration. Insert a new
-        // field.
-        const expr = node;
-        if (expr.properties.length == 0) {
-            position = expr.getEnd() - 1;
-            toInsert = `  ${metadataField}: [${symbolName}]\n`;
-        }
-        else {
-            node = expr.properties[expr.properties.length - 1];
-            position = node.getEnd();
-            // Get the indentation of the last element, if any.
-            const text = node.getFullText(source);
-            if (text.match('^\r?\r?\n')) {
-                toInsert = `,${text.match(/^\r?\n\s+/)[0]}${metadataField}: [${symbolName}]`;
-            }
-            else {
-                toInsert = `, ${metadataField}: [${symbolName}]`;
-            }
-        }
-    }
-    else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
-        // We found the field but it's empty. Insert it just before the `]`.
-        position--;
-        toInsert = `${symbolName}`;
-    }
-    else {
-        // Get the indentation of the last element, if any.
-        const text = node.getFullText(source);
-        if (text.match(/^\r?\n/)) {
-            toInsert = `,${text.match(/^\r?\n(\r?)\s+/)[0]}${symbolName}`;
-        }
-        else {
-            toInsert = `, ${symbolName}`;
-        }
-    }
-    if (importPath !== null) {
-        return [
-            new change_1.InsertChange(ngModulePath, position, toInsert),
-            insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
-        ];
-    }
-    return [new change_1.InsertChange(ngModulePath, position, toInsert)];
-}
-exports.addSymbolToNgModuleMetadata = addSymbolToNgModuleMetadata;
-/**
- * Custom function to insert a declaration (component, pipe, directive)
- * into NgModule declarations. It also imports the component.
- */
-function addDeclarationToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'declarations', classifiedName, importPath);
-}
-exports.addDeclarationToModule = addDeclarationToModule;
-/**
- * Custom function to insert an NgModule into NgModule imports. It also imports the module.
- */
-function addImportToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);
-}
-exports.addImportToModule = addImportToModule;
-/**
- * Custom function to insert a provider into NgModule. It also imports it.
- */
-function addProviderToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);
-}
-exports.addProviderToModule = addProviderToModule;
-/**
- * Custom function to insert an export into NgModule. It also imports it.
- */
-function addExportToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);
-}
-exports.addExportToModule = addExportToModule;
-/**
- * Custom function to insert an export into NgModule. It also imports it.
- */
-function addBootstrapToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);
-}
-exports.addBootstrapToModule = addBootstrapToModule;
-/**
- * Custom function to insert an entryComponent into NgModule. It also imports it.
- */
-function addEntryComponentToModule(source, modulePath, classifiedName, importPath) {
-    return addSymbolToNgModuleMetadata(source, modulePath, 'entryComponents', classifiedName, importPath);
-}
-exports.addEntryComponentToModule = addEntryComponentToModule;
-/**
- * Determine if an import already exists.
- */
-function isImported(source, classifiedName, importPath) {
-    const allNodes = getSourceNodes(source);
-    const matchingNodes = allNodes
-        .filter((node) => node.kind === ts.SyntaxKind.ImportDeclaration)
-        .filter((imp) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
-        .filter((imp) => {
-        return imp.moduleSpecifier.text === importPath;
-    })
-        .filter((imp) => {
-        if (!imp.importClause) {
-            return false;
-        }
-        const nodes = findNodes(imp.importClause, ts.SyntaxKind.ImportSpecifier).filter((n) => n.getText() === classifiedName);
-        return nodes.length > 0;
-    });
-    return matchingNodes.length > 0;
-}
-exports.isImported = isImported;

package/schematics/utils/devkit-utils/change.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReplaceChange = exports.RemoveChange = exports.InsertChange = exports.NoopChange = void 0;
-/**
- * An operation that does nothing.
- */
-class NoopChange {
-    constructor() {
-        this.description = 'No operation.';
-        this.order = Infinity;
-        this.path = null;
-    }
-    apply() {
-        return Promise.resolve();
-    }
-}
-exports.NoopChange = NoopChange;
-/**
- * Will add text to the source code.
- */
-class InsertChange {
-    constructor(path, pos, toAdd) {
-        this.path = path;
-        this.pos = pos;
-        this.toAdd = toAdd;
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Inserted ${toAdd} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    /**
-     * This method does not insert spaces if there is none in the original string.
-     */
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos);
-            return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);
-        });
-    }
-}
-exports.InsertChange = InsertChange;
-/**
- * Will remove text from the source code.
- */
-class RemoveChange {
-    constructor(path, pos, toRemove) {
-        this.path = path;
-        this.pos = pos;
-        this.toRemove = toRemove;
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Removed ${toRemove} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.toRemove.length);
-            // TODO: throw error if toRemove doesn't match removed string.
-            return host.write(this.path, `${prefix}${suffix}`);
-        });
-    }
-}
-exports.RemoveChange = RemoveChange;
-/**
- * Will replace text from the source code.
- */
-class ReplaceChange {
-    constructor(path, pos, oldText, newText) {
-        this.path = path;
-        this.pos = pos;
-        this.oldText = oldText;
-        this.newText = newText;
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Replaced ${oldText} into position ${pos} of ${path} with ${newText}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.oldText.length);
-            const text = content.substring(this.pos, this.pos + this.oldText.length);
-            if (text !== this.oldText) {
-                return Promise.reject(new Error(`Invalid replace: "${text}" != "${this.oldText}".`));
-            }
-            // TODO: throw error if oldText doesn't match removed string.
-            return host.write(this.path, `${prefix}${this.newText}${suffix}`);
-        });
-    }
-}
-exports.ReplaceChange = ReplaceChange;

package/schematics/utils/devkit-utils/route-utils.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertImport = void 0;
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const ts = require("typescript");
-const ast_utils_1 = require("./ast-utils");
-const change_1 = require("./change");
-/**
- * Add Import `import { symbolName } from fileName` if the import doesn't exit
- * already. Assumes fileToEdit can be resolved and accessed.
- * @param fileToEdit (file we want to add import to)
- * @param symbolName (item to import)
- * @param fileName (path to the file)
- * @param isDefault (if true, import follows style for importing default exports)
- * @return Change
- */
-function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
-    const rootNode = source;
-    const allImports = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
-    // get nodes that map to import statements from the file fileName
-    const relevantImports = allImports.filter((node) => {
-        // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-        const importFiles = node
-            .getChildren()
-            .filter((child) => child.kind === ts.SyntaxKind.StringLiteral)
-            .map((n) => n.text);
-        return importFiles.filter((file) => file === fileName).length === 1;
-    });
-    if (relevantImports.length > 0) {
-        let importsAsterisk = false;
-        // imports from import file
-        const imports = [];
-        relevantImports.forEach((n) => {
-            Array.prototype.push.apply(imports, (0, ast_utils_1.findNodes)(n, ts.SyntaxKind.Identifier));
-            if ((0, ast_utils_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
-                importsAsterisk = true;
-            }
-        });
-        // if imports * from fileName, don't add symbolName
-        if (importsAsterisk) {
-            return new change_1.NoopChange();
-        }
-        const importTextNodes = imports.filter((n) => n.text === symbolName);
-        // insert import if it's not there
-        if (importTextNodes.length === 0) {
-            const fallbackPos = (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return (0, ast_utils_1.insertAfterLastOccurrence)(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
-        }
-        return new change_1.NoopChange();
-    }
-    // no such import declaration exists
-    const useStrict = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
-    let fallbackPos = 0;
-    if (useStrict.length > 0) {
-        fallbackPos = useStrict[0].end;
-    }
-    const open = isDefault ? '' : '{ ';
-    const close = isDefault ? '' : ' }';
-    // if there are no imports or 'use strict' statement, insert import at beginning of file
-    const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
-    const separator = insertAtBeginning ? '' : ';\n';
-    const toInsert = `${separator}import ${open}${symbolName}${close}` + ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return (0, ast_utils_1.insertAfterLastOccurrence)(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
-}
-exports.insertImport = insertImport;