Skip to content

Angular - Allow create-lib schematic to detect custom exported route variables instead of requiring APP_ROUTES #24131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: rel-10.0
Choose a base branch
from
+17 −16
Open

Angular - Allow create-lib schematic to detect custom exported route variables instead of requiring APP_ROUTES #24131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export function addRoutingToAppRoutingModule(
? `() => import('${routePath}').then(m => m.${macroName}_ROUTES)`
: `() => import('${routePath}').then(m => m.${moduleName}.forLazy())`;
const routeToAdd = `{ path: '${routePath}', loadChildren: ${routeExpr} }`;
const change = addRouteToRoutesArray(source, 'APP_ROUTES', routeToAdd);
const change = addRouteToRoutesArray(source, routeToAdd);

if (change instanceof InsertChange) {
const recorder = tree.beginUpdate(appRoutesPath);
Expand Down Expand Up @@ -355,29 +355,30 @@ export function addRoutingToAppRoutingModule(

export function addRouteToRoutesArray(
source: ts.SourceFile,
arrayName: string,
routeToAdd: string,
): InsertChange | null {
const routesVar = source.statements.find(
stmt =>
ts.isVariableStatement(stmt) &&
stmt.declarationList.declarations.some(

// Find all variable declarations that are array literals and contain route definitions
const routeArrays = source.statements
.filter(ts.isVariableStatement)
.flatMap(stmt =>
stmt.declarationList.declarations.filter(
decl =>
ts.isVariableDeclaration(decl) &&
(decl.name.getText() === arrayName || decl.name.getText() === arrayName.toUpperCase()) &&
decl.initializer !== undefined &&
ts.isArrayLiteralExpression(decl.initializer),
decl.initializer &&
ts.isArrayLiteralExpression(decl.initializer) &&
decl.initializer.elements.some(el =>
el.getText().includes('path:')
),
),
);
);

if (!routesVar || !ts.isVariableStatement(routesVar)) {
throw new Error(`Could not find routes array named "${arrayName}".`);
if (routeArrays.length === 0) {
throw new Error('No routes array found in source file.');
}

const declaration = routesVar.declarationList.declarations.find(
decl => decl.name.getText() === arrayName,
) as ts.VariableDeclaration;

// Select the first routes array found
const declaration = routeArrays[0];
const arrayLiteral = declaration.initializer as ts.ArrayLiteralExpression;

const getPathValue = (routeText: string): string | null => {
Expand Down
Loading