@nx/angular 23.0.0-beta.12 → 23.0.0-beta.13

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

@@ -25,13 +25,12 @@ exports.getDecoratorPropertyValueNode = getDecoratorPropertyValueNode;
 exports.getTsSourceFile = getTsSourceFile;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 let tsModule;
 function _angularImportsFromNode(node, _sourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const ms = node.moduleSpecifier;
     let modulePath;
@@ -94,7 +93,7 @@ function isStandalone(tree, sourceFile, decoratorName) {
 }
 function getDecoratorMetadata(source, identifier, module) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const angularImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
         .map((node) => _angularImportsFromNode(node, source))
@@ -142,7 +141,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
         return source;
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     // Get all the children property assignment of object literals.
     const matchingProperties = node.properties
@@ -311,7 +310,7 @@ function addImportToModule(host, source, modulePath, symbolName) {
 }
 function addImportToTestBed(host, source, specPath, symbolName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
@@ -330,7 +329,7 @@ function addImportToTestBed(host, source, specPath, symbolName) {
 }
 function addDeclarationsToTestBed(host, source, specPath, symbolName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
@@ -349,7 +348,7 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
 }
 function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
@@ -400,7 +399,7 @@ function addRouteToNgModule(host, ngModulePath, source, route) {
 }
 function getListOfRoutes(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const imports = getMatchingProperty(source, 'imports', 'NgModule', '@angular/core');
     if (imports?.initializer.kind === tsModule.SyntaxKind.ArrayLiteralExpression) {
@@ -441,14 +440,14 @@ function isNgStandaloneApp(tree, projectName) {
         hasMainFile = true;
     }
     else {
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+        const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
         mainFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
         hasMainFile = tree.exists(mainFile);
     }
     if (project.projectType !== 'application' || !hasMainFile) {
         return false;
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const mainFileContents = tree.read(mainFile, 'utf-8');
     const BOOTSTRAP_APPLICATION_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
@@ -463,7 +462,7 @@ function isNgStandaloneApp(tree, projectName) {
  * @param providerToAdd Provider to add
  */
 function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     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');
@@ -484,7 +483,7 @@ function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
  * @param providerToAdd Provider to add
  */
 function addProviderToAppConfig(tree, filePath, providerToAdd) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     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');
@@ -535,7 +534,7 @@ function addEntryComponents(host, source, modulePath, symbolName) {
 }
 function readBootstrapInfo(host, app) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const config = (0, devkit_1.readProjectConfiguration)(host, app);
     let mainPath;
@@ -544,7 +543,7 @@ function readBootstrapInfo(host, app) {
             config.targets.build.options?.main ??
                 config.targets.build.options?.browser;
         if (!mainPath) {
-            const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(config, host);
+            const sourceRoot = (0, internal_1.getProjectSourceRoot)(config, host);
             mainPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
         }
     }
@@ -582,7 +581,7 @@ function readBootstrapInfo(host, app) {
 }
 function getDecoratorPropertyValueNode(host, modulePath, identifier, property, module) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const moduleSourceText = host.read(modulePath).toString('utf-8');
     const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
@@ -591,7 +590,7 @@ function getDecoratorPropertyValueNode(host, modulePath, identifier, property, m
 }
 function getMatchingObjectLiteralElement(node, source, property) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     return (node.properties
         .filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
@@ -610,7 +609,7 @@ function getMatchingObjectLiteralElement(node, source, property) {
 }
 function getTsSourceFile(host, path) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const buffer = host.read(path);
     if (!buffer) {

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

@@ -4,7 +4,7 @@ exports.addRoute = addRoute;
 exports.addProviderToRoute = addProviderToRoute;
 const js_1 = require("@nx/js");
 const ast_utils_1 = require("./ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 /**
  * Add a new route to a routes definition
@@ -20,7 +20,7 @@ function addRoute(tree, routesFile, route, lazy = true, routesConst, importPath)
         throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const { ast, query } = require('@phenomnomnominal/tsquery');
     let routesFileContents = tree.read(routesFile, 'utf-8');
@@ -58,7 +58,7 @@ function addProviderToRoute(tree, routesFile, routeToAddProviderTo, providerToAd
     if (!tree.exists(routesFile)) {
         throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     let routesFileContents = tree.read(routesFile, 'utf-8');
     const sourceFile = ast(routesFileContents);

package/tailwind.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;
-const generate_globs_1 = require("@nx/js/src/utils/generate-globs");
+const internal_1 = require("@nx/js/internal");
 let hasWarned = false;
 /**
  * @deprecated `@nx/angular/tailwind` will be removed in Nx 24. Migrate to Tailwind CSS v4 which no longer needs glob patterns.
@@ -15,7 +15,7 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.s
             `See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular\n`);
     }
     try {
-        return (0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPattern);
+        return (0, internal_1.createGlobPatternsForDependencies)(dirPath, fileGlobPattern);
     }
     catch (e) {
         /**