@nx/nest 23.0.0-beta.2 → 23.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.20",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -33,10 +33,10 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^11.0.0",
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@nx/eslint": "23.0.0-beta.2",
-    "@nx/node": "23.0.0-beta.2",
+    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/js": "23.0.0-beta.20",
+    "@nx/eslint": "23.0.0-beta.20",
+    "@nx/node": "23.0.0-beta.20",
     "tslib": "^2.3.0"
   },
   "publishConfig": {

package/src/generators/application/lib/normalize-options.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.toNodeApplicationGeneratorOptions = toNodeApplicationGeneratorOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -26,7 +26,7 @@ async function normalizeOptions(tree, options) {
         linter: options.linter ?? 'eslint',
         unitTestRunner: options.unitTestRunner ?? 'jest',
         e2eTestRunner: options.e2eTestRunner ?? 'jest',
-        useProjectJson: options.useProjectJson ?? !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        useProjectJson: options.useProjectJson ?? !(0, internal_2.isUsingTsSolutionSetup)(tree),
     };
 }
 function toNodeApplicationGeneratorOptions(options) {

package/src/generators/application/lib/update-tsconfig.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = updateTsConfig;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'), (json) => {
         json.compilerOptions.experimentalDecorators = true;
         json.compilerOptions.emitDecoratorMetadata = true;
         json.compilerOptions.target = 'es2021';
         // Only set this when not using TS solution setup, as TS solution setup uses 'nodenext'
-        if (!(0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+        if (!(0, internal_1.isUsingTsSolutionSetup)(tree)) {
             json.compilerOptions.moduleResolution = 'node';
         }
         if (options.strict) {
@@ -25,7 +25,7 @@ function updateTsConfig(tree, options) {
         return json;
     });
     // For TS solution, we don't extend from shared tsconfig.json, so we need to make sure decorators are also turned on for spec tsconfig.
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(tree)) {
         const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json');
         if (tree.exists(tsconfigSpecPath)) {
             (0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {

package/src/generators/library/lib/add-exports-to-barrel.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addExportsToBarrelFile = addExportsToBarrelFile;
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function addExportsToBarrelFile(tree, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const indexPath = `${options.projectRoot}/src/index.ts`;
     const indexContent = tree.read(indexPath, 'utf-8');

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/src/generators/library/schema';
+import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/internal';
 import type { LibraryGeneratorOptions, NormalizedOptions } from '../schema';
 export declare function normalizeOptions(tree: Tree, options: LibraryGeneratorOptions): Promise<NormalizedOptions>;
 export declare function toJsLibraryGeneratorOptions(options: NormalizedOptions): JsLibraryGeneratorSchema;

package/src/generators/library/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAM9C,OAAO,KAAK,EAAE,sBAAsB,IAAI,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAC/G,OAAO,KAAK,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAM5E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,iBAAiB,GACzB,wBAAwB,CAmB1B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAU9C,OAAO,KAAK,EAAE,sBAAsB,IAAI,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC1F,OAAO,KAAK,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC5E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,iBAAiB,GACzB,wBAAwB,CAmB1B"}

package/src/generators/library/lib/normalize-options.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.toJsLibraryGeneratorOptions = toJsLibraryGeneratorOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -25,8 +24,8 @@ async function normalizeOptions(tree, options) {
     // this helper is called before the jsLibraryGenerator is called, so, if the
     // TS solution setup is not configured, we additionally check if the TS
     // solution setup will be configured by the jsLibraryGenerator
-    const isUsingTsSolutionsConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ||
-        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, addPlugin);
+    const isUsingTsSolutionsConfig = (0, internal_2.isUsingTsSolutionSetup)(tree) ||
+        (0, internal_2.shouldConfigureTsSolutionSetup)(tree, addPlugin);
     const normalized = {
         ...options,
         strict: options.strict ?? true,
@@ -35,7 +34,7 @@ async function normalizeOptions(tree, options) {
         global: options.global ?? false,
         linter: options.linter ?? 'eslint',
         parsedTags,
-        prefix: (0, get_npm_scope_1.getNpmScope)(tree), // we could also allow customizing this
+        prefix: (0, internal_2.getNpmScope)(tree), // we could also allow customizing this
         projectName: isUsingTsSolutionsConfig && !options.name ? importPath : projectName,
         projectRoot,
         importPath,

package/src/generators/library/library.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
@@ -35,7 +35,7 @@ async function libraryGeneratorInternal(tree, rawOptions) {
         initTask,
         depsTask,
         () => {
-            (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+            (0, internal_1.logShowProjectCommand)(options.projectName);
         },
     ]);
 }

package/src/generators/utils/normalize-options.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.unitTestRunnerToSpec = unitTestRunnerToSpec;
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function normalizeOptions(tree, options, normalizationOptions = {}) {
     const { allowedFileExtensions = ['js', 'ts'], skipLanguageOption = false, suffix, } = normalizationOptions;
-    const { directory, artifactName, fileExtension } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { directory, artifactName, fileExtension } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         allowedFileExtensions,
         fileExtension: options.language === 'js' ? 'js' : 'ts',