From a6bd922de6166b5f5c5261c6eca89ab4954f0a4f Mon Sep 17 00:00:00 2001 From: cipchk Date: Fri, 13 Sep 2024 20:11:26 +0800 Subject: [PATCH 1/2] fix(cli): fix could not find any [routes] variable - close https://github.com/ng-alain/ng-alain/issues/2517 --- schematics/utils/alain.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/schematics/utils/alain.ts b/schematics/utils/alain.ts index 00a1ca6e2..61e8bad43 100644 --- a/schematics/utils/alain.ts +++ b/schematics/utils/alain.ts @@ -16,9 +16,9 @@ import { } from '@angular-devkit/schematics'; import { Schema as ComponentSchema } from '@schematics/angular/component/schema'; import { - findNode, insertImport, - addProviderToModule as _addProviderToModule + addProviderToModule as _addProviderToModule, + getSourceNodes } from '@schematics/angular/utility/ast-utils'; import { InsertChange } from '@schematics/angular/utility/change'; import { buildRelativePath, findModuleFromOptions, ModuleOptions } from '@schematics/angular/utility/find-module'; @@ -32,8 +32,6 @@ import { addServiceToModuleOrStandalone, findRoutesPath, getSourceFile, ROUTINS_ import { isStandalone } from './standalone'; import { getProject, NgAlainProjectDefinition } from './workspace'; -const TEMPLATE_FILENAME_RE = /\.template$/; - export interface CommonSchema extends ComponentSchema { // eslint-disable-next-line @typescript-eslint/no-explicit-any [key: string]: any; @@ -178,7 +176,11 @@ export function addValueToVariable( needWrap: boolean = true ): void { const source = getSourceFile(tree, filePath); - const node = findNode(source, ts.SyntaxKind.Identifier, variableName); + // const node = findNode(source, ts.SyntaxKind.Identifier, variableName); + // https://github.com/ng-alain/ng-alain/issues/2517 + const node = getSourceNodes(source).find( + node => node.kind == ts.SyntaxKind.Identifier && node.getText() === variableName + ); if (!node) { throw new SchematicsException(`Could not find any [${variableName}] variable in path '${filePath}'.`); } From 140748a361841cd0905a0354d5dbcffb96e82b87 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 18 Sep 2024 15:00:50 +0800 Subject: [PATCH 2/2] chore: clean codes --- schematics/utils/alain.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/schematics/utils/alain.ts b/schematics/utils/alain.ts index 61e8bad43..475690404 100644 --- a/schematics/utils/alain.ts +++ b/schematics/utils/alain.ts @@ -176,8 +176,6 @@ export function addValueToVariable( needWrap: boolean = true ): void { const source = getSourceFile(tree, filePath); - // const node = findNode(source, ts.SyntaxKind.Identifier, variableName); - // https://github.com/ng-alain/ng-alain/issues/2517 const node = getSourceNodes(source).find( node => node.kind == ts.SyntaxKind.Identifier && node.getText() === variableName );