@ng-doc/add 22.0.0-beta.1 → 22.0.0

package/schematics/ng-add/utils/add-array-entry.d.ts

@@ -0,0 +1,56 @@
+import { logging } from '@angular-devkit/core';
+import { ArrayLiteralExpression, CallExpression, Expression, Node, ObjectLiteralExpression } from 'ng-morph';
+import { ImportConstant } from '../constants/modules';
+/** What `addArrayEntries` did with an entry. */
+export type ArrayEntryResult = 'added' | 'extended' | 'unchanged' | 'skipped';
+/** The part of the schematic logger that the helpers report to. */
+export type EntryLogger = Pick<logging.LoggerApi, 'info' | 'warn'>;
+/**
+ * Returns the name that identifies an entry: the text of the initializer before its first `(`,
+ * for example `provideRouter`, `RouterModule.forRoot` or `NgDocRootComponent`.
+ * @param entry - The entry to name.
+ */
+export declare function getEntryName(entry: ImportConstant): string;
+/**
+ * Tells whether an expression is a call of `name` or the identifier `name`. A call through a
+ * namespace import (`router.provideRouter(...)`) matches too.
+ * @param node - The expression to check.
+ * @param name - The function or identifier name, as returned by `getEntryName`.
+ */
+export declare function isEntry(node: Node, name: string): boolean;
+/**
+ * Finds every element of an array that is a call of `name` or the identifier `name`.
+ * @param array - The array to search.
+ * @param name - The function or identifier name, as returned by `getEntryName`.
+ */
+export declare function findArrayEntries(array: ArrayLiteralExpression, name: string): Expression[];
+/**
+ * Adds entries to an `imports` or `providers` array, or extends the calls that are already there.
+ *
+ * An existing call keeps its own arguments; only the routes, features and options it lacks are
+ * added, so running `ng add` again, or on an application that already calls `provideRouter` or
+ * `provideHttpClient`, never registers them twice. Several calls of the same provider (as the
+ * previous `ng add` left them) are merged into the first one. New entries are appended in one
+ * edit, on separate lines when the array already spans several lines.
+ * @param array - The array literal to update.
+ * @param entries - The entries to add, in order.
+ * @param logger - Receives what was merged and what needs a manual change.
+ * @returns What happened to each entry, in the order of `entries`.
+ */
+export declare function addArrayEntries(array: ArrayLiteralExpression, entries: ImportConstant[], logger: EntryLogger): ArrayEntryResult[];
+/**
+ * Adds the routes, features and options of an entry that an existing call lacks.
+ * @param call - The existing call.
+ * @param entry - The entry that describes what the call needs.
+ * @param logger - Receives what needs a manual change.
+ * @returns Whether the call changed.
+ */
+export declare function extendCall(call: CallExpression, entry: ImportConstant, logger: EntryLogger): boolean;
+/**
+ * Returns the array literal of an object literal property, creating `name: []` when the property
+ * is missing. Returns `undefined` when the property is not an array literal (for example a
+ * variable), because it cannot be edited safely.
+ * @param objectLiteral - The object literal that owns the property.
+ * @param name - The property name.
+ */
+export declare function getArrayProperty(objectLiteral: ObjectLiteralExpression, name: string): ArrayLiteralExpression | undefined;

package/schematics/ng-add/utils/add-array-entry.js

@@ -0,0 +1,325 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntryName = getEntryName;
+exports.isEntry = isEntry;
+exports.findArrayEntries = findArrayEntries;
+exports.addArrayEntries = addArrayEntries;
+exports.extendCall = extendCall;
+exports.getArrayProperty = getArrayProperty;
+const ng_morph_1 = require("ng-morph");
+const modules_1 = require("../constants/modules");
+/**
+ * Returns the name that identifies an entry: the text of the initializer before its first `(`,
+ * for example `provideRouter`, `RouterModule.forRoot` or `NgDocRootComponent`.
+ * @param entry - The entry to name.
+ */
+function getEntryName(entry) {
+    return getCallName(entry.initializer);
+}
+/**
+ * Tells whether an expression is a call of `name` or the identifier `name`. A call through a
+ * namespace import (`router.provideRouter(...)`) matches too.
+ * @param node - The expression to check.
+ * @param name - The function or identifier name, as returned by `getEntryName`.
+ */
+function isEntry(node, name) {
+    const text = ng_morph_1.Node.isCallExpression(node)
+        ? node.getExpression().getText()
+        : node.getText();
+    return text === name || text.endsWith(`.${name}`);
+}
+/**
+ * Finds every element of an array that is a call of `name` or the identifier `name`.
+ * @param array - The array to search.
+ * @param name - The function or identifier name, as returned by `getEntryName`.
+ */
+function findArrayEntries(array, name) {
+    return array.getElements().filter((element) => isEntry(element, name));
+}
+/**
+ * Adds entries to an `imports` or `providers` array, or extends the calls that are already there.
+ *
+ * An existing call keeps its own arguments; only the routes, features and options it lacks are
+ * added, so running `ng add` again, or on an application that already calls `provideRouter` or
+ * `provideHttpClient`, never registers them twice. Several calls of the same provider (as the
+ * previous `ng add` left them) are merged into the first one. New entries are appended in one
+ * edit, on separate lines when the array already spans several lines.
+ * @param array - The array literal to update.
+ * @param entries - The entries to add, in order.
+ * @param logger - Receives what was merged and what needs a manual change.
+ * @returns What happened to each entry, in the order of `entries`.
+ */
+function addArrayEntries(array, entries, logger) {
+    // Decided before any call is extended, since extending a call may add line breaks inside it.
+    const multiline = array.getText().includes('\n');
+    const added = [];
+    const results = entries.map((entry) => {
+        const name = getEntryName(entry);
+        const existing = findArrayEntries(array, name);
+        if (!existing.length) {
+            added.push(entry.initializer);
+            return 'added';
+        }
+        const calls = existing.filter(ng_morph_1.Node.isCallExpression);
+        if (!calls.length) {
+            return 'unchanged';
+        }
+        if (calls.length > 1) {
+            if (entry.options) {
+                // Options objects cannot be merged safely; a second `forRoot` throws at startup anyway.
+                logger.warn(`⚠️ "${name}" is called ${calls.length} times. Keep one call and add "${entry.routes}" to it manually.`);
+                return 'skipped';
+            }
+            extendCall(mergeCalls(array, calls, entry, logger), entry, logger);
+            return 'extended';
+        }
+        return extendCall(calls[0], entry, logger) ? 'extended' : 'unchanged';
+    });
+    if (added.length) {
+        array.addElements(added, { useNewLines: multiline });
+    }
+    return results;
+}
+/**
+ * Adds the routes, features and options of an entry that an existing call lacks.
+ * @param call - The existing call.
+ * @param entry - The entry that describes what the call needs.
+ * @param logger - Receives what needs a manual change.
+ * @returns Whether the call changed.
+ */
+function extendCall(call, entry, logger) {
+    const changes = [
+        entry.routes ? addRoutes(call, entry.routes, logger) : false,
+        ...(entry.features ?? []).map((feature) => addFeature(call, feature)),
+        entry.options ? addOptions(call, getEntryName(entry), entry.options, logger) : false,
+    ];
+    return changes.some(Boolean);
+}
+/**
+ * Returns the array literal of an object literal property, creating `name: []` when the property
+ * is missing. Returns `undefined` when the property is not an array literal (for example a
+ * variable), because it cannot be edited safely.
+ * @param objectLiteral - The object literal that owns the property.
+ * @param name - The property name.
+ */
+function getArrayProperty(objectLiteral, name) {
+    const property = objectLiteral.getProperty(name) ?? objectLiteral.addProperty(`${name}: []`);
+    if (!ng_morph_1.Node.isPropertyAssignment(property)) {
+        return undefined;
+    }
+    const initializer = property.getInitializer();
+    return ng_morph_1.Node.isArrayLiteralExpression(initializer) ? initializer : undefined;
+}
+/**
+ * Merges several calls of one provider into the first. Routes are concatenated in call order,
+ * which is the order in which two `provideRouter` calls registered them. Features are kept once
+ * by name; when two calls pass the same feature, the later one wins, as it did in the injector.
+ * Deprecated features that the previous `ng add` added are dropped.
+ * @param array - The array that holds the calls.
+ * @param calls - The calls, in array order.
+ * @param entry - The entry the calls belong to.
+ * @param logger - Receives the merge.
+ * @returns The merged call.
+ */
+function mergeCalls(array, calls, entry, logger) {
+    const routes = [];
+    const features = new Map();
+    const dropped = [];
+    calls.forEach((call) => {
+        const args = call.getArguments();
+        if (entry.routes && args[0]) {
+            const [first] = args;
+            const parts = ng_morph_1.Node.isArrayLiteralExpression(first)
+                ? first.getElements().map((element) => element.getText())
+                : [`...${first.getText()}`];
+            parts
+                .filter((part) => !routes.includes(part))
+                .forEach((part) => routes.push(part));
+        }
+        (entry.routes ? args.slice(1) : args).forEach((argument) => {
+            const text = argument.getText();
+            const name = ng_morph_1.Node.isCallExpression(argument) ? getCallName(text) : text;
+            if (modules_1.DROPPED_FEATURES.includes(name)) {
+                dropped.push(name);
+            }
+            else {
+                features.set(name, text);
+            }
+        });
+    });
+    const [first, ...rest] = calls;
+    const callee = first.getExpression().getText();
+    const args = [
+        ...(entry.routes ? [`[${routes.join(', ')}]`] : []),
+        ...features.values(),
+    ];
+    const sourceFile = array.getSourceFile();
+    rest.forEach((call) => array.removeElement(call));
+    const merged = first.replaceWithText(`${callee}(${args.join(', ')})`);
+    removeUnusedImports(sourceFile, dropped);
+    logger.info(`🔄 Merged ${calls.length} "${getEntryName(entry)}" calls into one.`);
+    return merged;
+}
+/**
+ * Makes the first argument of a router call include `routes`. The application's own routes stay
+ * first, which keeps their precedence the same as when the routes were registered by two calls,
+ * except that the routes go before a trailing wildcard (`**`) route, which would hide them.
+ * @param call - The router call.
+ * @param routes - The identifier of the routes to include.
+ * @param logger - Receives the wildcard warnings.
+ */
+function addRoutes(call, routes, logger) {
+    const [first] = call.getArguments();
+    if (!first) {
+        call.addArgument(routes);
+        return true;
+    }
+    const mentioned = [first, ...first.getDescendantsOfKind(ng_morph_1.SyntaxKind.Identifier)].some((node) => ng_morph_1.Node.isIdentifier(node) && node.getText() === routes);
+    if (mentioned) {
+        return false;
+    }
+    if (ng_morph_1.Node.isArrayLiteralExpression(first)) {
+        const wildcard = first.getElements().findIndex(isWildcardRoute);
+        if (wildcard === -1) {
+            first.addElement(`...${routes}`);
+        }
+        else {
+            first.insertElement(wildcard, `...${routes}`);
+        }
+        return true;
+    }
+    warnAboutWildcard(first, routes, logger);
+    first.replaceWithText(`[...${first.getText()}, ...${routes}]`);
+    return true;
+}
+/**
+ * Warns when routes that are not written inline may end with a wildcard route, which would hide
+ * the routes appended after them.
+ * @param routesArgument - The routes argument of the router call.
+ * @param routes - The identifier of the routes that are appended.
+ * @param logger - Receives the warning.
+ */
+function warnAboutWildcard(routesArgument, routes, logger) {
+    const definition = ng_morph_1.Node.isIdentifier(routesArgument)
+        ? routesArgument.getDefinitionNodes()[0]
+        : undefined;
+    const initializer = ng_morph_1.Node.isVariableDeclaration(definition)
+        ? definition.getInitializer()
+        : undefined;
+    if (ng_morph_1.Node.isArrayLiteralExpression(initializer)) {
+        if (initializer.getElements().some(isWildcardRoute)) {
+            logger.warn(`⚠️ "${routesArgument.getText()}" has a wildcard ("**") route that hides "${routes}". Move it after "${routes}".`);
+        }
+        return;
+    }
+    logger.warn(`⚠️ "${routes}" is added after "${routesArgument.getText()}". If those routes end with a wildcard ("**") route, move it after "${routes}".`);
+}
+/**
+ * Tells whether a route literal is a wildcard route (`{path: '**', ...}`).
+ * @param node - An element of a routes array.
+ */
+function isWildcardRoute(node) {
+    if (!ng_morph_1.Node.isObjectLiteralExpression(node)) {
+        return false;
+    }
+    const path = node.getProperty('path');
+    const value = ng_morph_1.Node.isPropertyAssignment(path)
+        ? path.getInitializer()
+        : undefined;
+    return ng_morph_1.Node.isStringLiteral(value) || ng_morph_1.Node.isNoSubstitutionTemplateLiteral(value)
+        ? value.getLiteralValue() === '**'
+        : false;
+}
+/**
+ * Appends a feature call unless the call already passes a feature with the same function name.
+ * @param call - The call to extend.
+ * @param feature - The feature call, for example `withInterceptorsFromDi()`.
+ */
+function addFeature(call, feature) {
+    const name = getCallName(feature);
+    const present = call
+        .getArguments()
+        .some((argument) => ng_morph_1.Node.isCallExpression(argument) && isEntry(argument, name));
+    if (present) {
+        return false;
+    }
+    call.addArgument(feature);
+    return true;
+}
+/**
+ * Adds the options a call does not set yet. An options object that is not an object literal is
+ * left alone, because its properties cannot be inspected; the logger says what to set.
+ * @param call - The call whose second argument holds the options.
+ * @param name - The name of the call, for the warning.
+ * @param options - The property names and initializers to set.
+ * @param logger - Receives the warning.
+ */
+function addOptions(call, name, options, logger) {
+    const [, current] = call.getArguments();
+    const text = options
+        .map(([property, initializer]) => `${property}: ${initializer}`)
+        .join(', ');
+    if (!current) {
+        call.addArgument(`{${text}}`);
+        return true;
+    }
+    if (!ng_morph_1.Node.isObjectLiteralExpression(current)) {
+        logger.warn(`⚠️ The options of "${name}" ("${current.getText()}") are not an object literal. Set {${text}} in them manually.`);
+        return false;
+    }
+    const missing = options.filter(([property]) => !current.getProperty(property));
+    if (!missing.length) {
+        return false;
+    }
+    const added = missing.map(([property, initializer]) => `${property}: ${initializer}`);
+    if (current.getText().includes('\n')) {
+        missing.forEach(([property, initializer]) => current.addPropertyAssignment({ name: property, initializer }));
+    }
+    else {
+        // ts-morph puts every added property on a new line; a one-line object stays on one line.
+        const source = current.getText();
+        const body = source.slice(1, -1).trim().replace(/,$/, '');
+        const inner = [body, ...added].filter(Boolean).join(', ');
+        current.replaceWithText(/^\{\s/.test(source) ? `{ ${inner} }` : `{${inner}}`);
+    }
+    return true;
+}
+/**
+ * Removes named imports that the file no longer uses (the features dropped by `mergeCalls`).
+ * @param sourceFile - The file to clean up.
+ * @param names - The imported names to check.
+ */
+function removeUnusedImports(sourceFile, names) {
+    names.forEach((name) => {
+        const used = sourceFile
+            .getDescendantsOfKind(ng_morph_1.SyntaxKind.Identifier)
+            .some((identifier) => identifier.getText() === name &&
+            !identifier.getFirstAncestorByKind(ng_morph_1.SyntaxKind.ImportDeclaration));
+        if (used) {
+            return;
+        }
+        sourceFile.getImportDeclarations().forEach((declaration) => {
+            const specifier = declaration
+                .getNamedImports()
+                .find((named) => named.getName() === name && !named.getAliasNode());
+            if (!specifier) {
+                return;
+            }
+            specifier.remove();
+            if (!declaration.getNamedImports().length &&
+                !declaration.getDefaultImport() &&
+                !declaration.getNamespaceImport()) {
+                declaration.remove();
+            }
+        });
+    });
+}
+/**
+ * Returns the text of a call before its first `(`.
+ * @param text - The call, for example `withInterceptorsFromDi()`.
+ */
+function getCallName(text) {
+    const index = text.indexOf('(');
+    return index === -1 ? text : text.slice(0, index);
+}
+//# sourceMappingURL=add-array-entry.js.map

package/schematics/ng-add/utils/add-array-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-array-entry.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/add-array-entry.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/utils/add-unique-import.d.ts

@@ -1,7 +1,11 @@
 /**
+ * Adds a named import to a file unless the file already imports that name from the module.
  *
- * @param filePath
- * @param namedImport
- * @param moduleSpecifier
+ * The name is added to an existing named-import declaration of the module. A namespace import
+ * (`import * as router from '@angular/router'`) or a type-only import cannot take it, so a
+ * separate declaration is added in that case.
+ * @param filePath - The file to update.
+ * @param namedImport - The exported name to import.
+ * @param moduleSpecifier - The module that exports it.
  */
 export declare function addUniqueImport(filePath: string, namedImport: string, moduleSpecifier: string): void;

package/schematics/ng-add/utils/add-unique-import.js

@@ -3,33 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUniqueImport = addUniqueImport;
 const ng_morph_1 = require("ng-morph");
 /**
+ * Adds a named import to a file unless the file already imports that name from the module.
  *
- * @param filePath
- * @param namedImport
- * @param moduleSpecifier
+ * The name is added to an existing named-import declaration of the module. A namespace import
+ * (`import * as router from '@angular/router'`) or a type-only import cannot take it, so a
+ * separate declaration is added in that case.
+ * @param filePath - The file to update.
+ * @param namedImport - The exported name to import.
+ * @param moduleSpecifier - The module that exports it.
  */
 function addUniqueImport(filePath, namedImport, moduleSpecifier) {
-    const existingNamedImport = (0, ng_morph_1.getImports)(filePath, {
-        namedImports: namedImport,
-        moduleSpecifier,
-    });
-    if (existingNamedImport.length) {
+    const declarations = (0, ng_morph_1.getImports)(filePath, { moduleSpecifier });
+    const imported = declarations.some((declaration) => !declaration.isTypeOnly() &&
+        declaration
+            .getNamedImports()
+            .some((specifier) => !specifier.isTypeOnly() &&
+            specifier.getName() === namedImport &&
+            (specifier.getAliasNode()?.getText() ?? namedImport) === namedImport));
+    if (imported) {
         return;
     }
-    const existingDeclaration = (0, ng_morph_1.getImports)(filePath, {
-        moduleSpecifier,
-    });
-    if (existingDeclaration.length) {
-        const modules = existingDeclaration[0]
+    const target = declarations.find((declaration) => !declaration.getNamespaceImport() && !declaration.isTypeOnly());
+    if (target) {
+        const modules = target
             .getNamedImports()
-            .map((namedImport) => namedImport.getText());
-        (0, ng_morph_1.editImports)(existingDeclaration[0], () => ({
+            .map((specifier) => specifier.getText());
+        (0, ng_morph_1.editImports)(target, () => ({
             namedImports: [...modules, namedImport],
         }));
         return;
     }
     (0, ng_morph_1.addImports)(filePath, {
-        moduleSpecifier: moduleSpecifier,
+        moduleSpecifier,
         namedImports: [namedImport],
     });
 }

package/schematics/ng-add/utils/add-unique-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-unique-import.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/add-unique-import.ts"],"names":[],"mappings":";;AAQA,0CAkCC;AA1CD,uCAAmG;AAEnG;;;;;GAKG;AACH,SAAgB,eAAe,CAC9B,QAAgB,EAChB,WAAmB,EACnB,eAAuB;IAEvB,MAAM,mBAAmB,GAAwB,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACrE,YAAY,EAAE,WAAW;QACzB,eAAe;KACf,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;QAChC,OAAO;IACR,CAAC;IAED,MAAM,mBAAmB,GAAwB,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACrE,eAAe;KACf,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,OAAO,GAAa,mBAAmB,CAAC,CAAC,CAAC;aAC9C,eAAe,EAAE;aACjB,GAAG,CAAC,CAAC,WAA4B,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/D,IAAA,sBAAW,EAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1C,YAAY,EAAE,CAAC,GAAG,OAAO,EAAE,WAAW,CAAC;SACvC,CAAC,CAAC,CAAC;QAEJ,OAAO;IACR,CAAC;IAED,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACpB,eAAe,EAAE,eAAe;QAChC,YAAY,EAAE,CAAC,WAAW,CAAC;KAC3B,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"add-unique-import.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/add-unique-import.ts"],"names":[],"mappings":";;AAYA,0CA4CC;AAxDD,uCAAmG;AAEnG;;;;;;;;;GASG;AACH,SAAgB,eAAe,CAC7B,QAAgB,EAChB,WAAmB,EACnB,eAAuB;IAEvB,MAAM,YAAY,GAAwB,IAAA,qBAAU,EAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAY,YAAY,CAAC,IAAI,CACzC,CAAC,WAA8B,EAAE,EAAE,CACjC,CAAC,WAAW,CAAC,UAAU,EAAE;QACzB,WAAW;aACR,eAAe,EAAE;aACjB,IAAI,CACH,CAAC,SAA0B,EAAE,EAAE,CAC7B,CAAC,SAAS,CAAC,UAAU,EAAE;YACvB,SAAS,CAAC,OAAO,EAAE,KAAK,WAAW;YACnC,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,WAAW,CAAC,KAAK,WAAW,CACvE,CACN,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAkC,YAAY,CAAC,IAAI,CAC7D,CAAC,WAA8B,EAAE,EAAE,CACjC,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CACjE,CAAC;IAEF,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,OAAO,GAAa,MAAM;aAC7B,eAAe,EAAE;aACjB,GAAG,CAAC,CAAC,SAA0B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5D,IAAA,sBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACzB,YAAY,EAAE,CAAC,GAAG,OAAO,EAAE,WAAW,CAAC;SACxC,CAAC,CAAC,CAAC;QAEJ,OAAO;IACT,CAAC;IAED,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACnB,eAAe;QACf,YAAY,EAAE,CAAC,WAAW,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC"}

package/schematics/ng-add/utils/get-app-component.d.ts

@@ -1,8 +1,9 @@
 import { Tree } from '@angular-devkit/schematics';
 import { ClassDeclaration } from 'ng-morph';
 /**
- *
- * @param tree
- * @param mainPath
+ * Returns the root component: the component passed to `bootstrapApplication`, or the first
+ * declaration of the module passed to `bootstrapModule`.
+ * @param tree - The workspace tree.
+ * @param mainPath - Path of the application's main file.
  */
 export declare function getAppComponent(tree: Tree, mainPath: string): ClassDeclaration | undefined;

package/schematics/ng-add/utils/get-app-component.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppComponent = getAppComponent;
 const ng_morph_1 = require("ng-morph");
 const get_initializer_1 = require("./get-initializer");
+const get_root_module_1 = require("./get-root-module");
 /**
- *
- * @param tree
- * @param mainPath
+ * Returns the root component: the component passed to `bootstrapApplication`, or the first
+ * declaration of the module passed to `bootstrapModule`.
+ * @param tree - The workspace tree.
+ * @param mainPath - Path of the application's main file.
  */
 function getAppComponent(tree, mainPath) {
     const bootstrapApplicationFn = (0, ng_morph_1.getBootstrapApplicationFn)(mainPath);
@@ -20,8 +22,8 @@ function getAppComponent(tree, mainPath) {
         }
     }
     else {
-        const mainModule = (0, ng_morph_1.getMainModule)(mainPath);
-        const mainInitializer = (0, get_initializer_1.getInitializer)(mainModule, 'NgModule', 'declarations');
+        const mainModule = (0, get_root_module_1.getRootModule)(mainPath);
+        const mainInitializer = mainModule && (0, get_initializer_1.getInitializer)(mainModule, 'NgModule', 'declarations');
         if (ng_morph_1.Node.isArrayLiteralExpression(mainInitializer)) {
             const appIdentifier = mainInitializer.getElements()[0];
             if (ng_morph_1.Node.isIdentifier(appIdentifier)) {

package/schematics/ng-add/utils/get-app-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-app-component.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-app-component.ts"],"names":[],"mappings":";;AAgBA,0CAmCC;AAlDD,uCAMkB;AAElB,uDAAmD;AAEnD;;;;GAIG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,QAAgB;IAC1D,MAAM,sBAAsB,GAAG,IAAA,oCAAyB,EAAC,QAAQ,CAAC,CAAC;IAEnE,IAAI,sBAAsB,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,sBAAsB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3D,IAAI,eAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,MAAM,oBAAoB,GAAG,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/D,IAAI,eAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAClD,OAAO,oBAAoB,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,GAAqB,IAAA,wBAAa,EAAC,QAAQ,CAAE,CAAC;QAC9D,MAAM,eAAe,GAA2B,IAAA,gCAAc,EAC5D,UAAU,EACV,UAAU,EACV,cAAc,CACf,CAAC;QAEF,IAAI,eAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,CAAC;YACnD,MAAM,aAAa,GAA2B,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/E,IAAI,eAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;gBACrC,MAAM,YAAY,GAAqB,aAAa,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;gBAE7E,IAAI,eAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC1C,OAAO,YAAY,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"get-app-component.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-app-component.ts"],"names":[],"mappings":";;AAYA,0CAgCC;AA3CD,uCAAyF;AAEzF,uDAAmD;AACnD,uDAAkD;AAElD;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,QAAgB;IAC1D,MAAM,sBAAsB,GAAG,IAAA,oCAAyB,EAAC,QAAQ,CAAC,CAAC;IAEnE,IAAI,sBAAsB,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,sBAAsB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3D,IAAI,eAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,MAAM,oBAAoB,GAAG,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/D,IAAI,eAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAClD,OAAO,oBAAoB,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,GAAiC,IAAA,+BAAa,EAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,eAAe,GACnB,UAAU,IAAI,IAAA,gCAAc,EAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QAEvE,IAAI,eAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,CAAC;YACnD,MAAM,aAAa,GAA2B,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/E,IAAI,eAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;gBACrC,MAAM,YAAY,GAAqB,aAAa,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;gBAE7E,IAAI,eAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC1C,OAAO,YAAY,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/schematics/ng-add/utils/get-app-template-path.d.ts

@@ -1,12 +1,8 @@
-/**
- *
- * @param tree
- * @param mainPath
- */
 import { Tree } from '@angular-devkit/schematics';
 /**
- *
- * @param tree
- * @param mainPath
+ * Returns the path of the root component's template (`templateUrl`, or `app.component.html` next
+ * to the component when it has none).
+ * @param tree - The workspace tree.
+ * @param mainPath - Path of the application's main file.
  */
 export declare function getAppTemplatePath(tree: Tree, mainPath: string): string | undefined;

package/schematics/ng-add/utils/get-app-template-path.js

@@ -6,9 +6,10 @@ const path = require("path");
 const get_app_component_1 = require("./get-app-component");
 const get_initializer_1 = require("./get-initializer");
 /**
- *
- * @param tree
- * @param mainPath
+ * Returns the path of the root component's template (`templateUrl`, or `app.component.html` next
+ * to the component when it has none).
+ * @param tree - The workspace tree.
+ * @param mainPath - Path of the application's main file.
  */
 function getAppTemplatePath(tree, mainPath) {
     const appComponent = (0, get_app_component_1.getAppComponent)(tree, mainPath);
@@ -18,7 +19,6 @@ function getAppTemplatePath(tree, mainPath) {
     const templateInitializer = (0, get_initializer_1.getInitializer)(appComponent, 'Component', 'templateUrl');
     const appComponentDir = appComponent.getSourceFile().getDirectoryPath();
     const templateUrlPath = path.join(appComponentDir, templateInitializer?.getText().replace(/['"]/g, '') ?? 'app.component.html');
-    (0, ng_morph_1.saveActiveProject)();
     return templateUrlPath;
 }
 //# sourceMappingURL=get-app-template-path.js.map

package/schematics/ng-add/utils/get-app-template-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-app-template-path.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-app-template-path.ts"],"names":[],"mappings":";;AAiBA,gDAuBC;AAlCD,uCAAiF;AACjF,6BAA6B;AAE7B,2DAAsD;AACtD,uDAAmD;AAEnD;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,QAAgB;IAC9D,MAAM,YAAY,GAAiC,IAAA,mCAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEnF,IAAI,CAAC,eAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,OAAO;IACR,CAAC;IAED,MAAM,mBAAmB,GAA2B,IAAA,gCAAc,EACjE,YAAY,EACZ,WAAW,EACX,aAAa,CACb,CAAC;IAEF,MAAM,eAAe,GAAW,YAAY,CAAC,aAAa,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEhF,MAAM,eAAe,GAAW,IAAI,CAAC,IAAI,CACxC,eAAe,EACf,mBAAmB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAC3E,CAAC;IAEF,IAAA,4BAAiB,GAAE,CAAC;IAEpB,OAAO,eAAe,CAAC;AACxB,CAAC"}
+{"version":3,"file":"get-app-template-path.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-app-template-path.ts"],"names":[],"mappings":";;AAaA,gDAqBC;AAjCD,uCAA8D;AAC9D,6BAA6B;AAE7B,2DAAsD;AACtD,uDAAmD;AAEnD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,QAAgB;IAC7D,MAAM,YAAY,GAAiC,IAAA,mCAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEnF,IAAI,CAAC,eAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,MAAM,mBAAmB,GAA2B,IAAA,gCAAc,EAChE,YAAY,EACZ,WAAW,EACX,aAAa,CACd,CAAC;IAEF,MAAM,eAAe,GAAW,YAAY,CAAC,aAAa,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEhF,MAAM,eAAe,GAAW,IAAI,CAAC,IAAI,CACvC,eAAe,EACf,mBAAmB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAC5E,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/schematics/ng-add/utils/get-build-options-target.d.ts

@@ -0,0 +1,17 @@
+import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
+/** The builder of the Vite engine's production build. */
+export declare const VITE_APPLICATION_BUILDER = "@ng-doc/builder:vite-application";
+/**
+ * The target the Vite setup keeps the Angular build options in, for the Angular builders that
+ * read them (`unit-test`, `extract-i18n`). `@ng-doc/builder:vite-setup` creates it.
+ */
+export declare const ANGULAR_BUILD_TARGET = "build-angular";
+/** The target `migrate-to-vite` keeps the legacy build target in. */
+export declare const LEGACY_BUILD_TARGET = "build-legacy";
+/**
+ * The target that holds the application's Angular build options: `build`, or, once `build` runs
+ * the Vite engine (whose options are a Vite configuration file), `build-angular` of `ng add` or
+ * `build-legacy` of `migrate-to-vite`.
+ * @param project - The application project.
+ */
+export declare function getBuildOptionsTarget(project: ProjectDefinition): string;

package/schematics/ng-add/utils/get-build-options-target.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LEGACY_BUILD_TARGET = exports.ANGULAR_BUILD_TARGET = exports.VITE_APPLICATION_BUILDER = void 0;
+exports.getBuildOptionsTarget = getBuildOptionsTarget;
+/** The builder of the Vite engine's production build. */
+exports.VITE_APPLICATION_BUILDER = '@ng-doc/builder:vite-application';
+/**
+ * The target the Vite setup keeps the Angular build options in, for the Angular builders that
+ * read them (`unit-test`, `extract-i18n`). `@ng-doc/builder:vite-setup` creates it.
+ */
+exports.ANGULAR_BUILD_TARGET = 'build-angular';
+/** The target `migrate-to-vite` keeps the legacy build target in. */
+exports.LEGACY_BUILD_TARGET = 'build-legacy';
+/**
+ * The target that holds the application's Angular build options: `build`, or, once `build` runs
+ * the Vite engine (whose options are a Vite configuration file), `build-angular` of `ng add` or
+ * `build-legacy` of `migrate-to-vite`.
+ * @param project - The application project.
+ */
+function getBuildOptionsTarget(project) {
+    if (project.targets.get('build')?.builder !== exports.VITE_APPLICATION_BUILDER) {
+        return 'build';
+    }
+    return ([exports.ANGULAR_BUILD_TARGET, exports.LEGACY_BUILD_TARGET].find((name) => project.targets.has(name)) ??
+        'build');
+}
+//# sourceMappingURL=get-build-options-target.js.map

package/schematics/ng-add/utils/get-build-options-target.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-build-options-target.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-build-options-target.ts"],"names":[],"mappings":";;;AAoBA,sDASC;AA3BD,yDAAyD;AAC5C,QAAA,wBAAwB,GAAG,kCAAkC,CAAC;AAE3E;;;GAGG;AACU,QAAA,oBAAoB,GAAG,eAAe,CAAC;AAEpD,qEAAqE;AACxD,QAAA,mBAAmB,GAAG,cAAc,CAAC;AAElD;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,OAA0B;IAC9D,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,gCAAwB,EAAE,CAAC;QACvE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,CACL,CAAC,4BAAoB,EAAE,2BAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7F,OAAO,CACR,CAAC;AACJ,CAAC"}

package/schematics/ng-add/utils/get-main-path.d.ts

@@ -1,6 +1,6 @@
 import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
 /**
- *
- * @param project
+ * Returns the browser entry of the application (`browser`, or `main` of older builders).
+ * @param project - The application project.
  */
 export declare function getMainPath(project: ProjectDefinition): string;