@abp/ng.schematics 6.0.0-rc.4 → 6.0.0

package/utils/angular/dependency.js

@@ -0,0 +1,123 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDependency = exports.ExistingBehavior = exports.InstallBehavior = exports.DependencyType = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const path = require("path");
+const installTasks = new WeakMap();
+/**
+ * An enum used to specify the type of a dependency found within a package manifest
+ * file (`package.json`).
+ */
+var DependencyType;
+(function (DependencyType) {
+    DependencyType["Default"] = "dependencies";
+    DependencyType["Dev"] = "devDependencies";
+    DependencyType["Peer"] = "peerDependencies";
+})(DependencyType = exports.DependencyType || (exports.DependencyType = {}));
+/**
+ * An enum used to specify the dependency installation behavior for the {@link addDependency}
+ * schematics rule. The installation behavior affects if and when {@link NodePackageInstallTask}
+ * will be scheduled when using the rule.
+ */
+var InstallBehavior;
+(function (InstallBehavior) {
+    /**
+     * No installation will occur as a result of the rule when specified.
+     *
+     * NOTE: This does not prevent other rules from scheduling a {@link NodePackageInstallTask}
+     * which may install the dependency.
+     */
+    InstallBehavior[InstallBehavior["None"] = 0] = "None";
+    /**
+     * Automatically determine the need to schedule a {@link NodePackageInstallTask} based on
+     * previous usage of the {@link addDependency} within the schematic.
+     */
+    InstallBehavior[InstallBehavior["Auto"] = 1] = "Auto";
+    /**
+     * Always schedule a {@link NodePackageInstallTask} when the rule is executed.
+     */
+    InstallBehavior[InstallBehavior["Always"] = 2] = "Always";
+})(InstallBehavior = exports.InstallBehavior || (exports.InstallBehavior = {}));
+/**
+ * An enum used to specify the existing dependency behavior for the {@link addDependency}
+ * schematics rule. The existing behavior affects whether the named dependency will be added
+ * to the `package.json` when the dependency is already present with a differing specifier.
+ */
+var ExistingBehavior;
+(function (ExistingBehavior) {
+    /**
+     * The dependency will not be added or otherwise changed if it already exists.
+     */
+    ExistingBehavior[ExistingBehavior["Skip"] = 0] = "Skip";
+    /**
+     * The dependency's existing specifier will be replaced with the specifier provided in the
+     * {@link addDependency} call. A warning will also be shown during schematic execution to
+     * notify the user of the replacement.
+     */
+    ExistingBehavior[ExistingBehavior["Replace"] = 1] = "Replace";
+})(ExistingBehavior = exports.ExistingBehavior || (exports.ExistingBehavior = {}));
+/**
+ * Adds a package as a dependency to a `package.json`. By default the `package.json` located
+ * at the schematic's root will be used. The `manifestPath` option can be used to explicitly specify
+ * a `package.json` in different location. The type of the dependency can also be specified instead
+ * of the default of the `dependencies` section by using the `type` option for either `devDependencies`
+ * or `peerDependencies`.
+ *
+ * When using this rule, {@link NodePackageInstallTask} does not need to be included directly by
+ * a schematic. A package manager install task will be automatically scheduled as needed.
+ *
+ * @param name The name of the package to add.
+ * @param specifier The package specifier for the package to add. Typically a SemVer range.
+ * @param options An optional object that can contain the `type` of the dependency
+ * and/or a path (`packageJsonPath`) of a manifest file (`package.json`) to modify.
+ * @returns A Schematics {@link Rule}
+ */
+function addDependency(name, specifier, options = {}) {
+    const { type = DependencyType.Default, packageJsonPath = '/package.json', install = InstallBehavior.Auto, existing = ExistingBehavior.Replace, } = options;
+    return (tree, context) => {
+        const manifest = tree.readJson(packageJsonPath);
+        const dependencySection = manifest[type];
+        if (!dependencySection) {
+            // Section is not present. The dependency can be added to a new object literal for the section.
+            manifest[type] = { [name]: specifier };
+        }
+        else {
+            const existingSpecifier = dependencySection[name];
+            if (existingSpecifier === specifier) {
+                // Already present with same specifier
+                return;
+            }
+            if (existingSpecifier) {
+                // Already present but different specifier
+                if (existing === ExistingBehavior.Skip) {
+                    return;
+                }
+                // ExistingBehavior.Replace is the only other behavior currently
+                context.logger.warn(`Package dependency "${name}" already exists with a different specifier. ` +
+                    `"${existingSpecifier}" will be replaced with "${specifier}".`);
+            }
+            // Add new dependency in alphabetical order
+            const entries = Object.entries(dependencySection);
+            entries.push([name, specifier]);
+            entries.sort((a, b) => a[0].localeCompare(b[0]));
+            manifest[type] = Object.fromEntries(entries);
+        }
+        tree.overwrite(packageJsonPath, JSON.stringify(manifest, null, 2));
+        const installPaths = installTasks.get(context) ?? new Set();
+        if (install === InstallBehavior.Always ||
+            (install === InstallBehavior.Auto && !installPaths.has(packageJsonPath))) {
+            context.addTask(new tasks_1.NodePackageInstallTask({ workingDirectory: path.dirname(packageJsonPath) }));
+            installPaths.add(packageJsonPath);
+            installTasks.set(context, installPaths);
+        }
+    };
+}
+exports.addDependency = addDependency;
+//# sourceMappingURL=dependency.js.map

package/utils/angular/dependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependency.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/dependency.ts"],"names":[],"mappings":"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"}

package/utils/angular/find-module.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
@@ -8,16 +8,14 @@
 import { Path } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
 export interface ModuleOptions {
-    project?: string;
     module?: string;
     name: string;
     flat?: boolean;
     path?: string;
-    route?: string;
-    selector?: string;
     skipImport?: boolean;
     moduleExt?: string;
     routingModuleExt?: string;
+    standalone?: boolean;
 }
 export declare const MODULE_EXT = ".module.ts";
 export declare const ROUTING_MODULE_EXT = "-routing.module.ts";

package/utils/angular/find-module.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRelativePath = exports.findModule = exports.findModuleFromOptions = exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildRelativePath = exports.findModule = exports.findModuleFromOptions = exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
 const core_1 = require("@angular-devkit/core");
 exports.MODULE_EXT = '.module.ts';
 exports.ROUTING_MODULE_EXT = '-routing.module.ts';
@@ -15,32 +15,32 @@ exports.ROUTING_MODULE_EXT = '-routing.module.ts';
  * Find the module referred by a set of options passed to the schematics.
  */
 function findModuleFromOptions(host, options) {
-    if (Object.prototype.hasOwnProperty.call(options, 'skipImport') && options.skipImport) {
+    if (options.standalone || options.skipImport) {
         return undefined;
     }
     const moduleExt = options.moduleExt || exports.MODULE_EXT;
     const routingModuleExt = options.routingModuleExt || exports.ROUTING_MODULE_EXT;
     if (!options.module) {
         const pathToCheck = (options.path || '') + '/' + options.name;
-        return core_1.normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
+        return (0, core_1.normalize)(findModule(host, pathToCheck, moduleExt, routingModuleExt));
     }
     else {
-        const modulePath = core_1.normalize(`/${options.path}/${options.module}`);
-        const componentPath = core_1.normalize(`/${options.path}/${options.name}`);
-        const moduleBaseName = core_1.normalize(modulePath).split('/').pop();
-        const candidateSet = new Set([core_1.normalize(options.path || '/')]);
-        for (let dir = modulePath; dir != core_1.NormalizedRoot; dir = core_1.dirname(dir)) {
+        const modulePath = (0, core_1.normalize)(`/${options.path}/${options.module}`);
+        const componentPath = (0, core_1.normalize)(`/${options.path}/${options.name}`);
+        const moduleBaseName = (0, core_1.normalize)(modulePath).split('/').pop();
+        const candidateSet = new Set([(0, core_1.normalize)(options.path || '/')]);
+        for (let dir = modulePath; dir != core_1.NormalizedRoot; dir = (0, core_1.dirname)(dir)) {
             candidateSet.add(dir);
         }
-        for (let dir = componentPath; dir != core_1.NormalizedRoot; dir = core_1.dirname(dir)) {
+        for (let dir = componentPath; dir != core_1.NormalizedRoot; dir = (0, core_1.dirname)(dir)) {
             candidateSet.add(dir);
         }
         const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
         for (const c of candidatesDirs) {
-            const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map(x => core_1.join(c, x));
+            const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map((x) => (0, core_1.join)(c, x));
             for (const sc of candidateFiles) {
                 if (host.exists(sc)) {
-                    return core_1.normalize(sc);
+                    return (0, core_1.normalize)(sc);
                 }
             }
         }
@@ -56,14 +56,14 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
     let dir = host.getDir('/' + generateDir);
     let foundRoutingModule = false;
     while (dir) {
-        const allMatches = dir.subfiles.filter(p => p.endsWith(moduleExt));
-        const filteredMatches = allMatches.filter(p => !p.endsWith(routingModuleExt));
+        const allMatches = dir.subfiles.filter((p) => p.endsWith(moduleExt));
+        const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt));
         foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
         if (filteredMatches.length == 1) {
-            return core_1.join(dir.path, filteredMatches[0]);
+            return (0, core_1.join)(dir.path, filteredMatches[0]);
         }
         else if (filteredMatches.length > 1) {
-            throw new Error('More than one module matches. Use the skip-import option to skip importing ' +
+            throw new Error(`More than one module matches. Use the '--skip-import' option to skip importing ` +
                 'the component into the closest module or use the module option to specify a module.');
         }
         dir = dir.parent;
@@ -71,8 +71,8 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
     const errorMsg = foundRoutingModule
         ? 'Could not find a non Routing NgModule.' +
             `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.` +
-            '\nUse the skip-import option to skip importing in NgModule.'
-        : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.';
+            `\nUse the '--skip-import' option to skip importing in NgModule.`
+        : `Could not find an NgModule. Use the '--skip-import' option to skip importing in NgModule.`;
     throw new Error(errorMsg);
 }
 exports.findModule = findModule;
@@ -80,15 +80,15 @@ exports.findModule = findModule;
  * Build a relative path from one file path to another file path.
  */
 function buildRelativePath(from, to) {
-    from = core_1.normalize(from);
-    to = core_1.normalize(to);
+    from = (0, core_1.normalize)(from);
+    to = (0, core_1.normalize)(to);
     // Convert to arrays.
     const fromParts = from.split('/');
     const toParts = to.split('/');
     // Remove file names (preserving destination)
     fromParts.pop();
     const toFileName = toParts.pop();
-    const relativePath = core_1.relative(core_1.normalize(fromParts.join('/') || '/'), core_1.normalize(toParts.join('/') || '/'));
+    const relativePath = (0, core_1.relative)((0, core_1.normalize)(fromParts.join('/') || '/'), (0, core_1.normalize)(toParts.join('/') || '/'));
     let pathPrefix = '';
     // Set the path prefix for same dir or child dir, parent dir starts with `..`
     if (!relativePath) {

package/utils/angular/find-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-module.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/find-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,+CAAgG;AAgBnF,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAEvD;;GAEG;AACH,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAsB;IACtE,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;QACrF,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,kBAAU,CAAC;IAClD,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,0BAAkB,CAAC;IAExE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;QAE9D,OAAO,gBAAS,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC9E;SAAM;QACL,MAAM,UAAU,GAAG,gBAAS,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,gBAAS,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,gBAAS,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAE9D,MAAM,YAAY,GAAG,IAAI,GAAG,CAAO,CAAC,gBAAS,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;QAErE,KAAK,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,IAAI,qBAAc,EAAE,GAAG,GAAG,cAAO,CAAC,GAAG,CAAC,EAAE;YACpE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;QACD,KAAK,IAAI,GAAG,GAAG,aAAa,EAAE,GAAG,IAAI,qBAAc,EAAE,GAAG,GAAG,cAAO,CAAC,GAAG,CAAC,EAAE;YACvE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;QAED,MAAM,cAAc,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7E,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE;YAC9B,MAAM,cAAc,GAAG,CAAC,EAAE,EAAE,GAAG,cAAc,KAAK,EAAE,GAAG,cAAc,GAAG,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC3F,WAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CACX,CAAC;YAEF,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE;gBAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;oBACnB,OAAO,gBAAS,CAAC,EAAE,CAAC,CAAC;iBACtB;aACF;SACF;QAED,MAAM,IAAI,KAAK,CACb,qBAAqB,OAAO,CAAC,MAAM,qBAAqB;YACtD,6CAA6C,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAC/E,CAAC;KACH;AACH,CAAC;AA5CD,sDA4CC;AAED;;GAEG;AACH,SAAgB,UAAU,CACxB,IAAU,EACV,WAAmB,EACnB,SAAS,GAAG,kBAAU,EACtB,gBAAgB,GAAG,0BAAkB;IAErC,IAAI,GAAG,GAAoB,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC;IAC1D,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,OAAO,GAAG,EAAE;QACV,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE9E,kBAAkB,GAAG,kBAAkB,IAAI,UAAU,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,CAAC;QAExF,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC/B,OAAO,WAAI,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3C;aAAM,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,6EAA6E;gBAC3E,qFAAqF,CACxF,CAAC;SACH;QAED,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;KAClB;IAED,MAAM,QAAQ,GAAG,kBAAkB;QACjC,CAAC,CAAC,wCAAwC;YACxC,0BAA0B,gBAAgB,sCAAsC;YAChF,6DAA6D;QAC/D,CAAC,CAAC,uFAAuF,CAAC;IAE5F,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC;AAlCD,gCAkCC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,IAAY,EAAE,EAAU;IACxD,IAAI,GAAG,gBAAS,CAAC,IAAI,CAAC,CAAC;IACvB,EAAE,GAAG,gBAAS,CAAC,EAAE,CAAC,CAAC;IAEnB,qBAAqB;IACrB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9B,6CAA6C;IAC7C,SAAS,CAAC,GAAG,EAAE,CAAC;IAChB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEjC,MAAM,YAAY,GAAG,eAAQ,CAC3B,gBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EACrC,gBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CACpC,CAAC;IACF,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,6EAA6E;IAC7E,IAAI,CAAC,YAAY,EAAE;QACjB,UAAU,GAAG,GAAG,CAAC;KAClB;SAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACxC,UAAU,GAAG,IAAI,CAAC;KACnB;IACD,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3C,UAAU,IAAI,GAAG,CAAC;KACnB;IAED,OAAO,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC;AAC5E,CAAC;AA7BD,8CA6BC"}
+{"version":3,"file":"find-module.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/find-module.ts"],"names":[],"mappings":"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"}

package/utils/angular/generate-from-files.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+import { Rule } from '@angular-devkit/schematics';
+export interface GenerateFromFilesOptions {
+    flat?: boolean;
+    name: string;
+    path?: string;
+    prefix?: string;
+    project?: string;
+    skipTests?: boolean;
+}
+export declare function generateFromFiles(options: GenerateFromFilesOptions, extraTemplateValues?: Record<string, string | ((v: string) => string)>): Rule;

package/utils/angular/generate-from-files.js

@@ -0,0 +1,37 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateFromFiles = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const parse_name_1 = require("./parse-name");
+const validation_1 = require("./validation");
+const workspace_1 = require("./workspace");
+function generateFromFiles(options, extraTemplateValues = {}) {
+    return async (host) => {
+        options.path ?? (options.path = await (0, workspace_1.createDefaultPath)(host, options.project));
+        options.prefix ?? (options.prefix = '');
+        options.flat ?? (options.flat = true);
+        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+        options.name = parsedPath.name;
+        options.path = parsedPath.path;
+        (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+            options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
+            (0, schematics_1.applyTemplates)({
+                ...schematics_1.strings,
+                ...options,
+                ...extraTemplateValues,
+            }),
+            (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + schematics_1.strings.dasherize(options.name))),
+        ]);
+        return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)]);
+    };
+}
+exports.generateFromFiles = generateFromFiles;
+//# sourceMappingURL=generate-from-files.js.map

package/utils/angular/generate-from-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-from-files.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/generate-from-files.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,2DAYoC;AACpC,6CAAyC;AACzC,6CAAiD;AACjD,2CAAgD;AAWhD,SAAgB,iBAAiB,CAC/B,OAAiC,EACjC,sBAAwE,EAAE;IAE1E,OAAO,KAAK,EAAE,IAAU,EAAE,EAAE;QAC1B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,MAAM,IAAA,6BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAiB,CAAC,EAAC;QAC1E,OAAO,CAAC,MAAM,KAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;QACtB,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,IAAI,EAAC;QAEtB,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC/B,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE/B,IAAA,8BAAiB,EAAC,oBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YAClF,IAAA,2BAAc,EAAC;gBACb,GAAG,oBAAO;gBACV,GAAG,OAAO;gBACV,GAAG,mBAAmB;aACvB,CAAC;YACF,IAAA,iBAAI,EAAC,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;SACpF,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAS,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC;AA3BD,8CA2BC"}

package/utils/angular/index.d.ts

@@ -1,17 +1,13 @@
 export * from './ast-utils';
 export * from './change';
-export * from './config';
 export * from './dependencies';
 export * from './find-module';
+export * from './generate-from-files';
 export * from './json-file';
-export * from './json-utils';
-export * from './latest-versions';
-export * from './lint-fix';
 export * from './ng-ast-utils';
 export * from './parse-name';
 export * from './paths';
 export * from './project-targets';
-export * from './tsconfig';
 export * from './validation';
 export * from './workspace';
 export * from './workspace-models';

package/utils/angular/index.js

@@ -1,29 +1,29 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ast-utils"), exports);
 __exportStar(require("./change"), exports);
-__exportStar(require("./config"), exports);
 __exportStar(require("./dependencies"), exports);
 __exportStar(require("./find-module"), exports);
+__exportStar(require("./generate-from-files"), exports);
 __exportStar(require("./json-file"), exports);
-__exportStar(require("./json-utils"), exports);
-__exportStar(require("./latest-versions"), exports);
-__exportStar(require("./lint-fix"), exports);
 __exportStar(require("./ng-ast-utils"), exports);
 __exportStar(require("./parse-name"), exports);
 __exportStar(require("./paths"), exports);
 __exportStar(require("./project-targets"), exports);
-__exportStar(require("./tsconfig"), exports);
 __exportStar(require("./validation"), exports);
 __exportStar(require("./workspace"), exports);
 __exportStar(require("./workspace-models"), exports);

package/utils/angular/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,2CAAyB;AACzB,2CAAyB;AACzB,iDAA+B;AAC/B,gDAA8B;AAC9B,8CAA4B;AAC5B,+CAA6B;AAC7B,oDAAkC;AAClC,6CAA2B;AAC3B,iDAA+B;AAC/B,+CAA6B;AAC7B,0CAAwB;AACxB,oDAAkC;AAClC,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,qDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,2CAAyB;AACzB,iDAA+B;AAC/B,gDAA8B;AAC9B,wDAAsC;AACtC,8CAA4B;AAC5B,iDAA+B;AAC/B,+CAA6B;AAC7B,0CAAwB;AACxB,oDAAkC;AAClC,+CAA6B;AAC7B,8CAA4B;AAC5B,qDAAmC"}

package/utils/angular/json-file.d.ts

@@ -1,23 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
 import { JsonValue } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
+export declare type InsertionIndex = (properties: string[]) => number;
 export declare type JSONPath = (string | number)[];
 /** @internal */
 export declare class JSONFile {
     private readonly host;
     private readonly path;
-    private content;
-    error: undefined | Error;
+    content: string;
     constructor(host: Tree, path: string);
     private _jsonAst;
     private get JsonAst();
     get(jsonPath: JSONPath): unknown;
-    modify(jsonPath: JSONPath, value: JsonValue | undefined, getInsertionIndex?: (properties: string[]) => number): void;
+    modify(jsonPath: JSONPath, value: JsonValue | undefined, insertInOrder?: InsertionIndex | false): void;
     remove(jsonPath: JSONPath): void;
 }

package/utils/angular/json-file.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
@@ -14,41 +14,48 @@ class JSONFile {
     constructor(host, path) {
         this.host = host;
         this.path = path;
-        const buffer = this.host.read(this.path);
-        if (buffer) {
-            this.content = buffer.toString();
-        }
-        else {
-            this.error = new Error(`Could not read ${path}.`);
-        }
+        this.content = this.host.readText(this.path);
     }
     get JsonAst() {
         if (this._jsonAst) {
             return this._jsonAst;
         }
-        this._jsonAst = jsonc_parser_1.parseTree(this.content);
+        const errors = [];
+        this._jsonAst = (0, jsonc_parser_1.parseTree)(this.content, errors, { allowTrailingComma: true });
+        if (errors.length) {
+            const { error, offset } = errors[0];
+            throw new Error(`Failed to parse "${this.path}" as JSON AST Object. ${(0, jsonc_parser_1.printParseErrorCode)(error)} at location: ${offset}.`);
+        }
         return this._jsonAst;
     }
     get(jsonPath) {
+        const jsonAstNode = this.JsonAst;
+        if (!jsonAstNode) {
+            return undefined;
+        }
         if (jsonPath.length === 0) {
-            return jsonc_parser_1.getNodeValue(this.JsonAst);
+            return (0, jsonc_parser_1.getNodeValue)(jsonAstNode);
         }
-        const node = jsonc_parser_1.findNodeAtLocation(this.JsonAst, jsonPath);
-        return node === undefined ? undefined : jsonc_parser_1.getNodeValue(node);
+        const node = (0, jsonc_parser_1.findNodeAtLocation)(jsonAstNode, jsonPath);
+        return node === undefined ? undefined : (0, jsonc_parser_1.getNodeValue)(node);
     }
-    modify(jsonPath, value, getInsertionIndex) {
-        if (!getInsertionIndex) {
+    modify(jsonPath, value, insertInOrder) {
+        let getInsertionIndex;
+        if (insertInOrder === undefined) {
             const property = jsonPath.slice(-1)[0];
-            getInsertionIndex = properties => [...properties, property].sort().findIndex(p => p === property);
+            getInsertionIndex = (properties) => [...properties, property].sort().findIndex((p) => p === property);
+        }
+        else if (insertInOrder !== false) {
+            getInsertionIndex = insertInOrder;
         }
-        const edits = jsonc_parser_1.modify(this.content, jsonPath, value, {
+        const edits = (0, jsonc_parser_1.modify)(this.content, jsonPath, value, {
             getInsertionIndex,
             formattingOptions: {
                 insertSpaces: true,
                 tabSize: 2,
             },
         });
-        this.content = jsonc_parser_1.applyEdits(this.content, edits);
+        this.content = (0, jsonc_parser_1.applyEdits)(this.content, edits);
         this.host.overwrite(this.path, this.content);
         this._jsonAst = undefined;
     }

package/utils/angular/json-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/json-file.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,+CAOsB;AAItB,gBAAgB;AAChB,MAAa,QAAQ;IAInB,YAA6B,IAAU,EAAmB,IAAY;QAAzC,SAAI,GAAJ,IAAI,CAAM;QAAmB,SAAI,GAAJ,IAAI,CAAQ;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SAClC;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,kBAAkB,IAAI,GAAG,CAAC,CAAC;SACnD;IACH,CAAC;IAGD,IAAY,OAAO;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QAED,IAAI,CAAC,QAAQ,GAAG,wBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAExC,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,QAAkB;QACpB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,2BAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACnC;QAED,MAAM,IAAI,GAAG,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAExD,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,2BAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CACJ,QAAkB,EAClB,KAA4B,EAC5B,iBAAoD;QAEpD,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,iBAAiB,GAAG,UAAU,CAAC,EAAE,CAC/B,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;SACnE;QAED,MAAM,KAAK,GAAG,qBAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;YAClD,iBAAiB;YACjB,iBAAiB,EAAE;gBACjB,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,CAAC;aACX;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,yBAAU,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,QAAkB;QACvB,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SAClC;IACH,CAAC;CACF;AA/DD,4BA+DC"}
+{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/json-file.ts"],"names":[],"mappings":"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"}

package/utils/angular/ng-ast-utils.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
 import { Tree } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
 export declare function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null;

package/utils/angular/ng-ast-utils.js

@@ -1,30 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppModulePath = exports.findBootstrapModulePath = exports.findBootstrapModuleCall = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAppModulePath = exports.findBootstrapModulePath = exports.findBootstrapModuleCall = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const path_1 = require("path");
 const ts = require("typescript");
 const ast_utils_1 = require("./ast-utils");
 function findBootstrapModuleCall(host, mainPath) {
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = ast_utils_1.getSourceNodes(source);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     let bootstrapCall = null;
     for (const node of allNodes) {
         let bootstrapCallNode = null;
-        bootstrapCallNode = ast_utils_1.findNode(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
+        bootstrapCallNode = (0, ast_utils_1.findNode)(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
         // Walk up the parent until CallExpression is found.
         while (bootstrapCallNode &&
             bootstrapCallNode.parent &&
@@ -47,19 +43,15 @@ function findBootstrapModulePath(host, mainPath) {
         throw new schematics_1.SchematicsException('Bootstrap call not found');
     }
     const bootstrapModule = bootstrapCall.arguments[0];
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Client app main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = ast_utils_1.getSourceNodes(source);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     const bootstrapModuleRelativePath = allNodes
-        .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
+        .filter(ts.isImportDeclaration)
         .filter(imp => {
-        return ast_utils_1.findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
+        return (0, ast_utils_1.findNode)(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
     })
-        .map((imp) => {
+        .map(imp => {
         const modulePathStringLiteral = imp.moduleSpecifier;
         return modulePathStringLiteral.text;
     })[0];
@@ -68,8 +60,8 @@ function findBootstrapModulePath(host, mainPath) {
 exports.findBootstrapModulePath = findBootstrapModulePath;
 function getAppModulePath(host, mainPath) {
     const moduleRelativePath = findBootstrapModulePath(host, mainPath);
-    const mainDir = path_1.dirname(mainPath);
-    const modulePath = core_1.normalize(`/${mainDir}/${moduleRelativePath}.ts`);
+    const mainDir = (0, path_1.dirname)(mainPath);
+    const modulePath = (0, core_1.normalize)(`/${mainDir}/${moduleRelativePath}.ts`);
     return modulePath;
 }
 exports.getAppModulePath = getAppModulePath;

package/utils/angular/ng-ast-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/ng-ast-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/ng-ast-utils.ts"],"names":[],"mappings":"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"}