@nx/angular 22.4.0-canary.20260113-246d4fd → 22.4.0-canary.20260115-21d1555

package/generators.json

@@ -161,7 +161,8 @@
     "setup-tailwind": {
       "factory": "./src/generators/setup-tailwind/setup-tailwind",
       "schema": "./src/generators/setup-tailwind/schema.json",
-      "description": "Configures Tailwind CSS for an application or a buildable/publishable library."
+      "description": "Configures Tailwind CSS for an application or a buildable/publishable library.",
+      "x-deprecated": "Generating Tailwind configuration is no longer maintained. This generator will be removed in Nx 23."
     },
     "stories": {
       "factory": "./src/generators/stories/stories",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260115-21d1555",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -62,15 +62,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.0-canary.20260113-246d4fd",
-    "@nx/eslint": "22.4.0-canary.20260113-246d4fd",
-    "@nx/js": "22.4.0-canary.20260113-246d4fd",
-    "@nx/module-federation": "22.4.0-canary.20260113-246d4fd",
-    "@nx/rspack": "22.4.0-canary.20260113-246d4fd",
-    "@nx/web": "22.4.0-canary.20260113-246d4fd",
-    "@nx/webpack": "22.4.0-canary.20260113-246d4fd",
-    "@nx/workspace": "22.4.0-canary.20260113-246d4fd",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@nx/devkit": "22.4.0-canary.20260115-21d1555",
+    "@nx/eslint": "22.4.0-canary.20260115-21d1555",
+    "@nx/js": "22.4.0-canary.20260115-21d1555",
+    "@nx/module-federation": "22.4.0-canary.20260115-21d1555",
+    "@nx/rspack": "22.4.0-canary.20260115-21d1555",
+    "@nx/web": "22.4.0-canary.20260115-21d1555",
+    "@nx/webpack": "22.4.0-canary.20260115-21d1555",
+    "@nx/workspace": "22.4.0-canary.20260115-21d1555",
+    "@phenomnomnominal/tsquery": "~6.1.4",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",
     "magic-string": "~0.30.2",

package/src/generators/component/lib/component.js

@@ -46,10 +46,10 @@ function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
         return false;
     }
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
     const entryPointContent = tree.read(entryPoint, 'utf-8');
-    const entryPointAst = tsquery.ast(entryPointContent);
-    const moduleExport = tsquery(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
+    const entryPointAst = ast(entryPointContent);
+    const moduleExport = query(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`)[0];
     return Boolean(moduleExport);
 }

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -26,13 +26,13 @@ async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConf
 }
 function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
     let newWebpackConfigContents = webpackConfigContents;
-    let ast = tsquery_1.tsquery.ast(webpackConfigContents);
-    const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
+    let sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
+    const withModuleFederationImportNodes = (0, tsquery_1.query)(sourceFile, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
     if (withModuleFederationImportNodes.length > 0) {
         const withModuleFederationImportNode = withModuleFederationImportNodes[0];
         newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/angular';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
-        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
+        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
         if (exportedWithModuleFederationNodes.length > 0) {
             const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
             newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
@@ -50,12 +50,12 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
             devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
         }
     }
-    const withModuleFederationRequireNodes = (0, tsquery_1.tsquery)(ast, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
+    const withModuleFederationRequireNodes = (0, tsquery_1.query)(sourceFile, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
     if (withModuleFederationRequireNodes.length > 0) {
         const withModuleFederationRequireNode = withModuleFederationRequireNodes[0];
         newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
-        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
+        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
         if (exportedWithModuleFederationNodes.length > 0) {
             const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
             newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}

package/src/generators/convert-to-with-mf/lib/check-name-matches.d.ts

@@ -1,3 +1,3 @@
 import type { SourceFile } from 'typescript';
-export declare function checkOutputNameMatchesProjectName(ast: SourceFile, projectName: string): boolean;
+export declare function checkOutputNameMatchesProjectName(sourceFile: SourceFile, projectName: string): boolean;
 //# sourceMappingURL=check-name-matches.d.ts.map

package/src/generators/convert-to-with-mf/lib/check-name-matches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-name-matches.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,UAAU,EACf,WAAW,EAAE,MAAM,WAyBpB"}
+{"version":3,"file":"check-name-matches.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,WAuBpB"}

package/src/generators/convert-to-with-mf/lib/check-name-matches.js

@@ -2,19 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkOutputNameMatchesProjectName = checkOutputNameMatchesProjectName;
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-function checkOutputNameMatchesProjectName(ast, projectName) {
+function checkOutputNameMatchesProjectName(sourceFile, projectName) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { query } = require('@phenomnomnominal/tsquery');
     const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
     const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';
-    const outputNodes = tsquery(ast, OUTPUT_SELECTOR, { visitAllChildren: true });
+    const outputNodes = query(sourceFile, OUTPUT_SELECTOR);
     if (outputNodes.length === 0) {
         // If the output isnt set in the config, then we can still set the project name correctly
         return true;
     }
-    const uniqueNameNodes = tsquery(outputNodes[0], UNIQUENAME_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const uniqueNameNodes = query(outputNodes[0], UNIQUENAME_SELECTOR);
     if (uniqueNameNodes.length === 0) {
         // If the uniqeName isnt set in the config, then we can still set the project name correctly
         return true;

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.d.ts

@@ -1,3 +1,3 @@
 import type { SourceFile } from 'typescript';
-export declare function checkSharedNpmPackagesMatchExpected(ast: SourceFile): boolean;
+export declare function checkSharedNpmPackagesMatchExpected(sourceFile: SourceFile): boolean;
 //# sourceMappingURL=check-shared-npm-packages.d.ts.map

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-shared-npm-packages.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAQ,MAAM,YAAY,CAAC;AAGnD,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,UAAU,WAkElE"}
+{"version":3,"file":"check-shared-npm-packages.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAQ,MAAM,YAAY,CAAC;AAGnD,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,UAAU,WA4DzE"}

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js

@@ -2,31 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSharedNpmPackagesMatchExpected = checkSharedNpmPackagesMatchExpected;
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-function checkSharedNpmPackagesMatchExpected(ast) {
+function checkSharedNpmPackagesMatchExpected(sourceFile) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { query } = require('@phenomnomnominal/tsquery');
     const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
     const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';
-    const shareHelperNodes = tsquery(ast, SHARE_HELPER_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const shareHelperNodes = query(sourceFile, SHARE_HELPER_SELECTOR);
     let sharedPackageConfigNodes;
     let settingsToMatch = [];
     if (shareHelperNodes.length === 0) {
         // if we arent sharing using share helper, check for standard object sharing syntax
         const SHARED_OBJECT_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > ObjectLiteralExpression';
-        const sharedObjectNodes = tsquery(ast, SHARED_OBJECT_SELECTOR, {
-            visitAllChildren: true,
-        });
+        const sharedObjectNodes = query(sourceFile, SHARED_OBJECT_SELECTOR);
         if (sharedObjectNodes.length === 0) {
             // nothing is being shared, we're safe to continue
             return true;
         }
-        sharedPackageConfigNodes = tsquery(sharedObjectNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
+        sharedPackageConfigNodes = query(sourceFile, `${SHARED_OBJECT_SELECTOR} ${SHARED_PACKAGE_CONFIG_SELECTOR}`);
         settingsToMatch = [`singleton: true`, `strictVersion: true`];
     }
     else {
-        sharedPackageConfigNodes = tsquery(shareHelperNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
+        sharedPackageConfigNodes = query(sourceFile, `${SHARE_HELPER_SELECTOR} ${SHARED_PACKAGE_CONFIG_SELECTOR}`);
         settingsToMatch = [
             `singleton: true`,
             `strictVersion: true`,

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts

@@ -1,6 +1,6 @@
 import type { SourceFile } from 'typescript';
 export type IsHostRemoteConfigResult = 'host' | 'remote' | 'both' | false;
-export declare function isHostRemoteConfig(ast: SourceFile): IsHostRemoteConfigResult;
-export declare function getRemotesFromHost(ast: SourceFile): any[];
-export declare function getExposedModulesFromRemote(ast: SourceFile): any;
+export declare function isHostRemoteConfig(sourceFile: SourceFile): IsHostRemoteConfigResult;
+export declare function getRemotesFromHost(sourceFile: SourceFile): any[];
+export declare function getExposedModulesFromRemote(sourceFile: SourceFile): any;
 //# sourceMappingURL=is-host-remote-config.d.ts.map

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-host-remote-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,wBAAwB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC;AAQ1E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,wBAAwB,CAuB5E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,SA6BjD;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,UAAU,OAW1D"}
+{"version":3,"file":"is-host-remote-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,wBAAwB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC;AAQ1E,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,GACrB,wBAAwB,CAmB1B;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,SAyBxD;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,UAAU,OASjE"}

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js

@@ -7,38 +7,30 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
 const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
 const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
-function isHostRemoteConfig(ast) {
+function isHostRemoteConfig(sourceFile) {
     let isHost = false;
     let isRemote = false;
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const remotesNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const { query } = require('@phenomnomnominal/tsquery');
+    const remotesNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesNodes.length > 0) {
         isHost = true;
     }
-    const exposesNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const exposesNodes = query(sourceFile, EXPOSES_EXPRESSION_SELECTOR);
     if (exposesNodes.length > 0) {
         isRemote = true;
     }
     let result = isHost && isRemote ? 'both' : isHost ? 'host' : isRemote ? 'remote' : false;
     return result;
 }
-function getRemotesFromHost(ast) {
+function getRemotesFromHost(sourceFile) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const remotesObjectNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const { query } = require('@phenomnomnominal/tsquery');
+    const remotesObjectNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesObjectNodes.length === 0) {
         return [];
     }
-    const remotesNodes = tsquery(remotesObjectNodes[0], PROPERTY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const remotesNodes = query(remotesObjectNodes[0], PROPERTY_SELECTOR);
     if (remotesNodes.length === 0) {
         return [];
     }
@@ -54,12 +46,10 @@ function getRemotesFromHost(ast) {
     }
     return remotes;
 }
-function getExposedModulesFromRemote(ast) {
+function getExposedModulesFromRemote(sourceFile) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const exposesObjectNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const { query } = require('@phenomnomnominal/tsquery');
+    const exposesObjectNodes = query(sourceFile, EXPOSES_EXPRESSION_SELECTOR);
     if (exposesObjectNodes.length === 0) {
         return {};
     }

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,EACxB,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,QA2DtB"}
+{"version":3,"file":"convert-scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,EACxB,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,QA0DtB"}

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js

@@ -7,8 +7,8 @@ const version_utils_1 = require("../../utils/version-utils");
 function convertScamToStandalone(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName) {
     let newComponentContents = '';
     const COMPONENT_PROPERTY_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression';
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const componentDecoratorMetadataNode = tsquery(componentAST, COMPONENT_PROPERTY_SELECTOR, { visitAllChildren: true })[0];
+    const { query } = require('@phenomnomnominal/tsquery');
+    const componentDecoratorMetadataNode = query(componentAST, COMPONENT_PROPERTY_SELECTOR)[0];
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({
     imports: [${importsArray.join(',')}],${providersArray.length > 0

package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-component-data-from-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-component-data-from-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAEnD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM;;;;EA0BhC"}
+{"version":3,"file":"get-component-data-from-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-component-data-from-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAEnD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM;;;;EAuBhC"}

package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js

@@ -5,13 +5,11 @@ function getComponentDataFromAST(tree, normalizedComponentPath) {
     const COMPONENT_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]))';
     const COMPONENT_NAME_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component])) > Identifier';
     const componentFileContents = tree.read(normalizedComponentPath, 'utf-8');
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const componentAST = tsquery.ast(componentFileContents);
-    const componentNode = tsquery(componentAST, COMPONENT_CONTENT_SELECTOR, {
-        visitAllChildren: true,
-    })[0];
+    const { ast, query } = require('@phenomnomnominal/tsquery');
+    const componentAST = ast(componentFileContents);
+    const componentNode = query(componentAST, COMPONENT_CONTENT_SELECTOR)[0];
     const componentContents = componentFileContents.slice(componentNode.getStart(), componentNode.getEnd());
-    const componentNameNode = tsquery(tsquery.ast(componentContents), COMPONENT_NAME_SELECTOR, { visitAllChildren: true })[0];
+    const componentNameNode = query(ast(componentContents), COMPONENT_NAME_SELECTOR)[0];
     const componentName = componentNameNode.getText();
     return { componentFileContents, componentAST, componentName };
 }

package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-module-metadata-from-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM;;;;;;;EAyE9B"}
+{"version":3,"file":"get-module-metadata-from-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM;;;;;;;EA6D9B"}

package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModuleMetadataFromAST = getModuleMetadataFromAST;
 function getModuleMetadataFromAST(componentAST, componentFileContents) {
     const NGMODULE_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=NgModule]))';
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const moduleNodes = tsquery(componentAST, NGMODULE_CONTENT_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const { ast, query } = require('@phenomnomnominal/tsquery');
+    const moduleNodes = query(componentAST, NGMODULE_CONTENT_SELECTOR);
     const moduleContents = componentFileContents.slice(moduleNodes[0].getStart(), moduleNodes[0].getEnd());
     // verify module is a scam
     const NGMODULE_EXPORTS_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=exports]) ArrayLiteralExpression';
@@ -14,19 +12,11 @@ function getModuleMetadataFromAST(componentAST, componentFileContents) {
     const NGMODULE_IMPORTS_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=imports]) ArrayLiteralExpression';
     const NGMODULE_PROVIDERS_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) ArrayLiteralExpression';
     const NGMODULE_NAME_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=NgModule])) > Identifier';
-    const moduleAST = tsquery.ast(moduleContents);
-    const importsNode = tsquery(moduleAST, NGMODULE_IMPORTS_SELECTOR, {
-        visitAllChildren: true,
-    })[0];
-    const exportsNode = tsquery(moduleAST, NGMODULE_EXPORTS_SELECTOR, {
-        visitAllChildren: true,
-    })[0];
-    const declarationsNode = tsquery(moduleAST, NGMODULE_DECLARATIONS_SELECTOR, {
-        visitAllChildren: true,
-    })[0];
-    const providersNodes = tsquery(moduleAST, NGMODULE_PROVIDERS_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const moduleAST = ast(moduleContents);
+    const importsNode = query(moduleAST, NGMODULE_IMPORTS_SELECTOR)[0];
+    const exportsNode = query(moduleAST, NGMODULE_EXPORTS_SELECTOR)[0];
+    const declarationsNode = query(moduleAST, NGMODULE_DECLARATIONS_SELECTOR)[0];
+    const providersNodes = query(moduleAST, NGMODULE_PROVIDERS_SELECTOR);
     const exportsArray = moduleContents
         .slice(exportsNode.getStart(), exportsNode.getEnd())
         .replace('[', '')
@@ -49,9 +39,7 @@ function getModuleMetadataFromAST(componentAST, componentFileContents) {
             .replace(']', '')
             .split(',')
         : [];
-    const moduleName = tsquery(moduleAST, NGMODULE_NAME_SELECTOR, {
-        visitAllChildren: true,
-    })[0].getText();
+    const moduleName = query(moduleAST, NGMODULE_NAME_SELECTOR)[0].getText();
     return {
         moduleNodes,
         exportsArray,

package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.d.ts

@@ -1,3 +1,3 @@
 import type { SourceFile } from 'typescript';
-export declare function selectorExistsInAST(selector: string, ast: SourceFile): boolean;
+export declare function selectorExistsInAST(selector: string, sourceFile: SourceFile): boolean;
 //# sourceMappingURL=selector-exists-in-ast.d.ts.map

package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector-exists-in-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/selector-exists-in-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,WAGpE"}
+{"version":3,"file":"selector-exists-in-ast.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/selector-exists-in-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,WAG3E"}

package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectorExistsInAST = selectorExistsInAST;
-function selectorExistsInAST(selector, ast) {
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    return tsquery(ast, selector, { visitAllChildren: true }).length > 0;
+function selectorExistsInAST(selector, sourceFile) {
+    const { query } = require('@phenomnomnominal/tsquery');
+    return query(sourceFile, selector).length > 0;
 }

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -51,9 +51,9 @@ function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript
         throw new Error(`The selected host application, ${options.host}, does not contain a module-federation.config.{ts,js} or module-federation.manifest.json file. Are you sure it has been set up as a host application?`);
     }
     const hostMFConfig = tree.read(hostMFConfigPath, 'utf-8');
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const webpackAst = tsquery.ast(hostMFConfig);
-    const mfRemotesNode = tsquery(webpackAst, 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=remotes]) > ArrayLiteralExpression', { visitAllChildren: true })[0];
+    const { ast, query } = require('@phenomnomnominal/tsquery');
+    const webpackAst = ast(hostMFConfig);
+    const mfRemotesNode = query(webpackAst, 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=remotes]) > ArrayLiteralExpression')[0];
     const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
     const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
     const updatedConfig = `${hostMFConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFConfig.slice(endOfPropertiesPos)}`;

package/src/generators/setup-ssr/lib/set-router-initial-navigation.js

@@ -23,7 +23,7 @@ function setRouterInitialNavigation(tree, options) {
 }
 function processFileWithStandaloneSetup(tree, filePath, printer) {
     let content = tree.read(filePath, 'utf-8');
-    let sourceFile = tsquery_1.tsquery.ast(content);
+    let sourceFile = (0, tsquery_1.ast)(content);
     const provideRouterCallExpression = getProvideRouterCallExpression(sourceFile);
     if (!provideRouterCallExpression) {
         return;
@@ -36,9 +36,9 @@ function processFileWithStandaloneSetup(tree, filePath, printer) {
     const updatedProvideRouterCallExpression = printer.printNode(typescript_1.EmitHint.Unspecified, updateProvideRouterCallExpression(provideRouterCallExpression), sourceFile);
     content = `${content.slice(0, provideRouterCallExpression.getStart())}${updatedProvideRouterCallExpression}${content.slice(provideRouterCallExpression.getEnd())}`;
     tree.write(filePath, content);
-    sourceFile = tsquery_1.tsquery.ast(content);
+    sourceFile = (0, tsquery_1.ast)(content);
     sourceFile = (0, js_1.insertImport)(tree, sourceFile, filePath, 'withEnabledBlockingInitialNavigation', '@angular/router');
-    const withDisabledInitialNavigationImportNode = (0, tsquery_1.tsquery)(sourceFile, 'ImportDeclaration ImportSpecifier:has(Identifier[name=withDisabledInitialNavigation])')[0];
+    const withDisabledInitialNavigationImportNode = (0, tsquery_1.query)(sourceFile, 'ImportDeclaration ImportSpecifier:has(Identifier[name=withDisabledInitialNavigation])')[0];
     if (!withDisabledInitialNavigationImportNode) {
         return;
     }
@@ -56,7 +56,7 @@ function updateProvideRouterCallExpression(node) {
 }
 function processFileWithNgModuleSetup(tree, filePath, printer) {
     const content = tree.read(filePath, 'utf-8');
-    const sourceFile = tsquery_1.tsquery.ast(content);
+    const sourceFile = (0, tsquery_1.ast)(content);
     const routerModuleForRootCallExpression = getRouterModuleForRootCallExpression(sourceFile);
     if (!routerModuleForRootCallExpression) {
         return;
@@ -83,10 +83,10 @@ function updateRouterModuleForRootCallExpression(node) {
     return typescript_1.factory.createCallExpression(node.expression, node.typeArguments, args);
 }
 function getProvideRouterCallExpression(sourceFile) {
-    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression CallExpression:has(Identifier[name=provideRouter])', { visitAllChildren: true });
+    const routerModuleForRootCalls = (0, tsquery_1.query)(sourceFile.getText(), 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression CallExpression:has(Identifier[name=provideRouter])');
     return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
 }
 function getRouterModuleForRootCallExpression(sourceFile) {
-    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'Decorator > CallExpression:has(Identifier[name=NgModule]) PropertyAssignment:has(Identifier[name=imports]) > ArrayLiteralExpression CallExpression:has(Identifier[name=forRoot])', { visitAllChildren: true });
+    const routerModuleForRootCalls = (0, tsquery_1.query)(sourceFile.getText(), 'Decorator > CallExpression:has(Identifier[name=NgModule]) PropertyAssignment:has(Identifier[name=imports]) > ArrayLiteralExpression CallExpression:has(Identifier[name=forRoot])');
     return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
 }

package/src/generators/setup-tailwind/setup-tailwind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-tailwind.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAgC5B;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"setup-tailwind.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAoC5B;AAED,eAAe,sBAAsB,CAAC"}

package/src/generators/setup-tailwind/setup-tailwind.js

@@ -4,6 +4,7 @@ exports.setupTailwindGenerator = setupTailwindGenerator;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 async function setupTailwindGenerator(tree, rawOptions) {
+    devkit_1.logger.warn(`The 'setup-tailwind' generator is deprecated. Generating Tailwind configuration is no longer maintained. This generator will be removed in Nx 23.`);
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (rawOptions.buildTarget && !project.targets?.[rawOptions.buildTarget]) {

package/src/generators/utils/storybook-ast/component-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-info.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/component-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,MAAM,GAClB,aAAa,EAAE,CAkCjB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,GACrB,aAAa,EAAE,CAyCjB"}
+{"version":3,"file":"component-info.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/component-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAOhD,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,WAAW,EAAE,MAAM,GAClB,aAAa,EAAE,CAkCjB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,GACrB,aAAa,EAAE,CAyCjB"}

package/src/generators/utils/storybook-ast/component-info.js

@@ -8,7 +8,8 @@ const path_1 = require("path");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const module_info_1 = require("./module-info");
 let tsModule;
-let tsquery;
+let tsqueryAst;
+let tsqueryQuery;
 function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
     return moduleFilePaths
         .flatMap((moduleFilePath) => {
@@ -54,15 +55,17 @@ function getStandaloneComponentsInfo(tree, entryPoint) {
     return componentsInfo;
 }
 function getStandaloneComponents(tree, filePath) {
-    if (!tsquery) {
+    if (!tsqueryAst) {
         (0, ensure_typescript_1.ensureTypescript)();
-        tsquery = require('@phenomnomnominal/tsquery').tsquery;
+        const tsqueryModule = require('@phenomnomnominal/tsquery');
+        tsqueryAst = tsqueryModule.ast;
+        tsqueryQuery = tsqueryModule.query;
     }
     const fileContent = tree.read(filePath, 'utf-8');
-    const ast = tsquery.ast(fileContent);
+    const sourceFile = tsqueryAst(fileContent);
     // standalone: true is the default, so all components except those with
     // standalone: false are considered standalone
-    const standaloneComponentNodes = tsquery(ast, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression:not(:has(PropertyAssignment:has(Identifier[name=standalone]) > FalseKeyword))) > Identifier', { visitAllChildren: true });
+    const standaloneComponentNodes = tsqueryQuery(sourceFile, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression:not(:has(PropertyAssignment:has(Identifier[name=standalone]) > FalseKeyword))) > Identifier');
     return standaloneComponentNodes.map((component) => component.getText());
 }
 function getComponentImportPath(componentName, imports) {
@@ -94,13 +97,15 @@ function getComponentImportPath(componentName, imports) {
 }
 function tryGetComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePath, symbolName) {
     try {
-        if (!tsquery) {
+        if (!tsqueryQuery) {
             (0, ensure_typescript_1.ensureTypescript)();
-            tsquery = require('@phenomnomnominal/tsquery').tsquery;
+            const tsqueryModule = require('@phenomnomnominal/tsquery');
+            tsqueryAst = tsqueryModule.ast;
+            tsqueryQuery = tsqueryModule.query;
         }
         const moduleFolderPath = (0, path_1.dirname)(moduleFilePath);
         // try to get the component from the same file (inline scam)
-        const node = tsquery(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${symbolName}])`, { visitAllChildren: true })[0];
+        const node = tsqueryQuery(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${symbolName}])`)[0];
         if (node) {
             return {
                 componentFileName: (0, path_1.basename)(moduleFilePath, '.ts'),

package/src/generators/utils/storybook-ast/module-info.js

@@ -37,10 +37,10 @@ function getModuleFilePaths(tree, entryPoint) {
 }
 function hasNgModule(tree, filePath) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContent = tree.read(filePath, 'utf-8');
-    const ast = tsquery.ast(fileContent);
-    const ngModule = tsquery(ast, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]', { visitAllChildren: true });
+    const sourceFile = ast(fileContent);
+    const ngModule = query(sourceFile, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]');
     return ngModule.length > 0;
 }
 function getDeclaredComponentNodes(declarationsArray) {

package/src/migrations/update-19-6-0/turn-off-dts-by-default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-off-dts-by-default.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqC,MAAM,YAAY,CAAC;AAK1E,yBAA+B,IAAI,EAAE,IAAI,iBA+ExC"}
+{"version":3,"file":"turn-off-dts-by-default.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAqC,MAAM,YAAY,CAAC;AAK1E,yBAA+B,IAAI,EAAE,IAAI,iBA6ExC"}

package/src/migrations/update-19-6-0/turn-off-dts-by-default.js

@@ -17,13 +17,13 @@ async function default_1(tree) {
         }
         const WITH_MODULE_FEDERATION_SELECTOR = 'CallExpression:has(Identifier[name=withModuleFederation]),CallExpression:has(Identifier[name=withModuleFederationForSSR])';
         const EXISTING_MF_OVERRIDES_SELECTOR = 'ObjectLiteralExpression';
-        const ast = tsquery_1.tsquery.ast(webpackConfigContents);
-        const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_SELECTOR, { visitAllChildren: true });
+        const sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
+        const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_SELECTOR);
         if (!withModuleFederationNodes.length) {
             return;
         }
         const withModuleFederationNode = withModuleFederationNodes[0];
-        const existingOverridesNodes = (0, tsquery_1.tsquery)(withModuleFederationNode, EXISTING_MF_OVERRIDES_SELECTOR, { visitAllChildren: true });
+        const existingOverridesNodes = (0, tsquery_1.query)(withModuleFederationNode, EXISTING_MF_OVERRIDES_SELECTOR);
         if (!existingOverridesNodes.length) {
             // doesn't exist, add it
             webpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationNode.getEnd() - 1)},${JSON.stringify({ dts: false })}${webpackConfigContents.slice(withModuleFederationNode.getEnd() - 1)}`;
@@ -40,7 +40,7 @@ async function default_1(tree) {
                 existingOverrideNode = node;
             }
             const DTS_PROPERTY_SELECTOR = 'PropertyAssignment > Identifier[name=dts]';
-            const dtsPropertyNode = (0, tsquery_1.tsquery)(existingOverrideNode, DTS_PROPERTY_SELECTOR);
+            const dtsPropertyNode = (0, tsquery_1.query)(existingOverrideNode, DTS_PROPERTY_SELECTOR);
             if (dtsPropertyNode.length) {
                 // dts already exists, do nothing
                 return;

package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js

@@ -31,15 +31,15 @@ async function migrateMfImportsToNewPackage(tree) {
             if (!contents.includes(MF_IMPORT_TO_UPDATE)) {
                 return;
             }
-            const ast = tsquery_1.tsquery.ast(contents);
-            const importNodes = (0, tsquery_1.tsquery)(ast, MF_CONFIG_IMPORT_SELECTOR);
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNodes = (0, tsquery_1.query)(sourceFile, MF_CONFIG_IMPORT_SELECTOR);
             if (importNodes.length === 0) {
                 return;
             }
             const importNode = importNodes[0];
-            const importSpecifiers = (0, tsquery_1.tsquery)(importNode, IMPORT_TOKENS_SELECTOR);
+            const importSpecifiers = (0, tsquery_1.query)(importNode, IMPORT_TOKENS_SELECTOR);
             if (importSpecifiers.length > 1) {
-                const mfConfigImportSpecifierNode = (0, tsquery_1.tsquery)(importNode, MF_CONFIG_IMPORT_SPECIFIER_SELECTOR)[0];
+                const mfConfigImportSpecifierNode = (0, tsquery_1.query)(importNode, MF_CONFIG_IMPORT_SPECIFIER_SELECTOR)[0];
                 const end = contents.charAt(mfConfigImportSpecifierNode.getEnd()) === ','
                     ? mfConfigImportSpecifierNode.getEnd() + 1
                     : mfConfigImportSpecifierNode.getEnd();
@@ -47,7 +47,7 @@ async function migrateMfImportsToNewPackage(tree) {
       ${contents.slice(0, mfConfigImportSpecifierNode.getStart())}${contents.slice(end)}`;
             }
             else {
-                const nxWebpackImportStringNodes = (0, tsquery_1.tsquery)(ast, WEBPACK_IMPORT_SELECTOR);
+                const nxWebpackImportStringNodes = (0, tsquery_1.query)(sourceFile, WEBPACK_IMPORT_SELECTOR);
                 if (nxWebpackImportStringNodes.length === 0) {
                     return;
                 }

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -22,8 +22,8 @@ async function migrateWithMfImport(tree) {
             if (!contents.includes('@nx/angular/module-federation')) {
                 return;
             }
-            const ast = tsquery_1.tsquery.ast(contents);
-            const importNodes = (0, tsquery_1.tsquery)(ast, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNodes = (0, tsquery_1.query)(sourceFile, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
             if (importNodes.length === 0) {
                 return;
             }

package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAoBpB,yBAA+B,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCxD"}
+{"version":3,"file":"change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAqBpB,yBAA+B,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCxD"}

package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -8,7 +8,8 @@ const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const version_utils_1 = require("../../generators/utils/version-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 const projects_1 = require("../utils/projects");
-let tsquery;
+let tsqueryAst;
+let tsqueryQuery;
 const angularPluginTargetNames = ['npm:@nx/angular', 'npm:@nrwl/angular'];
 const dataPersistenceOperators = [
     'fetch',
@@ -23,7 +24,9 @@ async function default_1(tree) {
         return;
     }
     (0, ensure_typescript_1.ensureTypescript)();
-    tsquery = require('@phenomnomnominal/tsquery').tsquery;
+    const tsqueryModule = require('@phenomnomnominal/tsquery');
+    tsqueryAst = tsqueryModule.ast;
+    tsqueryQuery = tsqueryModule.query;
     const cachedFileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
     const filesWithNxAngularImports = [];
     for (const graphNode of projects) {
@@ -42,19 +45,19 @@ async function default_1(tree) {
 }
 function replaceDataPersistenceInFile(tree, file) {
     const fileContents = tree.read(file, 'utf-8');
-    const fileAst = tsquery.ast(fileContents);
+    const fileAst = tsqueryAst(fileContents);
     // "\\u002F" is the unicode code for "/", there's an issue with the query parser
     // that prevents using "/" directly in regex queries
     // https://github.com/estools/esquery/issues/68#issuecomment-415597670
     const NX_ANGULAR_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value=/@(nx|nrwl)\\u002Fangular$/])';
-    const nxAngularImports = tsquery(fileAst, NX_ANGULAR_IMPORT_SELECTOR, { visitAllChildren: true });
+    const nxAngularImports = tsqueryQuery(fileAst, NX_ANGULAR_IMPORT_SELECTOR);
     if (!nxAngularImports.length) {
         return false;
     }
     const recorder = new file_change_recorder_1.FileChangeRecorder(tree, file);
     const IMPORT_SPECIFIERS_SELECTOR = 'ImportClause NamedImports ImportSpecifier';
     for (const importDeclaration of nxAngularImports) {
-        const importSpecifiers = tsquery(importDeclaration, IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
+        const importSpecifiers = tsqueryQuery(importDeclaration, IMPORT_SPECIFIERS_SELECTOR);
         if (!importSpecifiers.length) {
             continue;
         }
@@ -65,9 +68,7 @@ function replaceDataPersistenceInFile(tree, file) {
         // all imported symbols are data persistence operators, change import path
         if (importSpecifiers.every((i) => isOperatorImport(i))) {
             const IMPORT_PATH_SELECTOR = `${NX_ANGULAR_IMPORT_SELECTOR} > StringLiteral`;
-            const importPathNode = tsquery(importDeclaration, IMPORT_PATH_SELECTOR, {
-                visitAllChildren: true,
-            });
+            const importPathNode = tsqueryQuery(importDeclaration, IMPORT_PATH_SELECTOR);
             recorder.replace(importPathNode[0], `'${newImportPath}'`);
             continue;
         }

package/src/migrations/update-21-2-0/replace-provide-server-routing.js

@@ -31,8 +31,8 @@ function processFile(tree, filePath) {
         !content.includes('@angular/ssr')) {
         return;
     }
-    const sourceFile = tsquery_1.tsquery.ast(content);
-    const providersArray = tsquery_1.tsquery.query(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression', { visitAllChildren: true })[0];
+    const sourceFile = (0, tsquery_1.ast)(content);
+    const providersArray = (0, tsquery_1.query)(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression')[0];
     if (!providersArray) {
         return;
     }

package/src/utils/get-mf-projects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-mf-projects.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAmCvC,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,EAAE,OAAO,CAAA;CAAsB,YA8BpD"}
+{"version":3,"file":"get-mf-projects.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgCvC,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,EAAE,OAAO,CAAA;CAAsB,YA8BpD"}

package/src/utils/get-mf-projects.js

@@ -9,11 +9,9 @@ function _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIE
             return;
         }
         const webpackConfig = tree.read(webpackPath, 'utf-8');
-        const { tsquery } = require('@phenomnomnominal/tsquery');
-        const ast = tsquery.ast(webpackConfig);
-        const moduleFederationWebpackConfig = tsquery(ast, MODULE_FEDERATION_IDENTIFIER, {
-            visitAllChildren: true,
-        });
+        const { ast, query } = require('@phenomnomnominal/tsquery');
+        const sourceFile = ast(webpackConfig);
+        const moduleFederationWebpackConfig = query(sourceFile, MODULE_FEDERATION_IDENTIFIER);
         if (!moduleFederationWebpackConfig ||
             moduleFederationWebpackConfig.length === 0) {
             return;

package/src/utils/nx-devkit/ast-utils.d.ts.map

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

package/src/utils/nx-devkit/ast-utils.js

@@ -449,13 +449,11 @@ function isNgStandaloneApp(tree, projectName) {
         return false;
     }
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const mainFileContents = tree.read(mainFile, 'utf-8');
     const BOOTSTRAP_APPLICATION_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
-    const ast = tsquery.ast(mainFileContents);
-    const nodes = tsquery(ast, BOOTSTRAP_APPLICATION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const sourceFile = ast(mainFileContents);
+    const nodes = query(sourceFile, BOOTSTRAP_APPLICATION_SELECTOR);
     return nodes.length > 0;
 }
 /**
@@ -466,13 +464,11 @@ function isNgStandaloneApp(tree, projectName) {
  */
 function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const PROVIDERS_ARRAY_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression';
     const fileContents = tree.read(filePath, 'utf-8');
-    const ast = tsquery.ast(fileContents);
-    const providersArrayNodes = tsquery(ast, PROVIDERS_ARRAY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const sourceFile = ast(fileContents);
+    const providersArrayNodes = query(sourceFile, PROVIDERS_ARRAY_SELECTOR);
     if (providersArrayNodes.length === 0) {
         throw new Error(`Providers does not exist in the bootstrapApplication call within ${filePath}.`);
     }
@@ -489,13 +485,11 @@ function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
  */
 function addProviderToAppConfig(tree, filePath, providerToAdd) {
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     const PROVIDERS_ARRAY_SELECTOR = 'VariableDeclaration:has(TypeReference > Identifier[name=ApplicationConfig]) > ObjectLiteralExpression  PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression';
     const fileContents = tree.read(filePath, 'utf-8');
-    const ast = tsquery.ast(fileContents);
-    const providersArrayNodes = tsquery(ast, PROVIDERS_ARRAY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const sourceFile = ast(fileContents);
+    const providersArrayNodes = query(sourceFile, PROVIDERS_ARRAY_SELECTOR);
     if (providersArrayNodes.length === 0) {
         throw new Error(`'providers' does not exist in the application configuration at '${filePath}'.`);
     }

package/src/utils/nx-devkit/route-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAOlC;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,OAAc,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,QAoEpB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,EAC5B,aAAa,EAAE,MAAM,QA+EtB"}
+{"version":3,"file":"route-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAOlC;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,OAAc,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,QAkEpB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,EAC5B,aAAa,EAAE,MAAM,QAwEtB"}

package/src/utils/nx-devkit/route-utils.js

@@ -22,18 +22,16 @@ function addRoute(tree, routesFile, route, lazy = true, routesConst, importPath)
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     let routesFileContents = tree.read(routesFile, 'utf-8');
     if (!lazy) {
         let parentSourceFile = tsModule.createSourceFile(routesFile, routesFileContents, tsModule.ScriptTarget.Latest, true);
         parentSourceFile = (0, js_1.insertImport)(tree, parentSourceFile, routesFile, routesConst, importPath);
         routesFileContents = tree.read(routesFile, 'utf-8');
     }
-    const ast = tsquery.ast(routesFileContents);
+    const sourceFile = ast(routesFileContents);
     const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route], Identifier[name=Routes]) > ArrayLiteralExpression';
-    const routesArrayNodes = tsquery(ast, ROUTES_ARRAY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const routesArrayNodes = query(sourceFile, ROUTES_ARRAY_SELECTOR);
     const isRoutesArray = routesArrayNodes.length > 0;
     if (!isRoutesArray) {
         if (routesFileContents.includes('@NgModule')) {
@@ -61,29 +59,23 @@ function addProviderToRoute(tree, routesFile, routeToAddProviderTo, providerToAd
         throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
     }
     (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     let routesFileContents = tree.read(routesFile, 'utf-8');
-    const ast = tsquery.ast(routesFileContents);
+    const sourceFile = ast(routesFileContents);
     const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route], Identifier[name=Routes]) > ArrayLiteralExpression';
-    const routesArrayNodes = tsquery(ast, ROUTES_ARRAY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const routesArrayNodes = query(sourceFile, ROUTES_ARRAY_SELECTOR);
     const isRoutesArray = routesArrayNodes.length > 0;
     if (!isRoutesArray) {
         throw new Error(`Routing file (${routesFile}) does not a routing configuration. Please ensure the parent contains a routing configuration.`);
     }
     const ROUTE_SELECTOR = `ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=path]) > StringLiteral[value=${routeToAddProviderTo}]):last-child`;
     const ROUTE_PATH_PROVIDERS_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers])';
-    const selectedRouteNodes = tsquery(routesArrayNodes[0], ROUTE_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const selectedRouteNodes = query(routesArrayNodes[0], ROUTE_SELECTOR);
     if (selectedRouteNodes.length === 0) {
         throw new Error(`Could not find '${routeToAddProviderTo}' in routes definition.`);
     }
     for (const selectedRouteNode of selectedRouteNodes) {
-        const routeProivdersNodes = tsquery(selectedRouteNode, ROUTE_PATH_PROVIDERS_SELECTOR, {
-            visitAllChildren: true,
-        });
+        const routeProivdersNodes = query(selectedRouteNode, ROUTE_PATH_PROVIDERS_SELECTOR);
         if (routeProivdersNodes.length === 0) {
             const newFileContents = `${routesFileContents.slice(0, selectedRouteNode.getEnd() - 1)}${routesFileContents
                 .slice(0, selectedRouteNode.getEnd() - 1)