@aws/nx-plugin 1.0.0-rc.9 → 1.0.0-rc.90

package/src/ts/lib/generator.js

@@ -1,124 +1,153 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsProjectGenerator = exports.getTsLibDetails = exports.TS_LIB_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
-const format_1 = require("../../utils/format");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const nx_1 = require("../../utils/nx");
-const object_1 = require("../../utils/object");
-const pkg_manager_1 = require("../../utils/pkg-manager");
-const ts_project_utils_1 = require("./ts-project-utils");
-exports.TS_LIB_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateJson, updateProjectConfiguration } from "@nx/devkit";
+import { libraryGenerator } from "@nx/js";
+import { declareDependencies } from "../../utils/declared-dependencies.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
+import { toKebabCase } from "../../utils/names.js";
+import { getNpmScopePrefix } from "../../utils/npm-scope.js";
+import { addGeneratorMetadata, getGeneratorInfo, mergeTargetDefault, projectExists } from "../../utils/nx.js";
+import { sortObjectKeys } from "../../utils/object.js";
+import { getPackageManagerDisplayCommands } from "../../utils/pkg-manager.js";
+import { configureTsProject } from "./ts-project-utils.js";
+import { VITEST_DEPENDENCIES } from "./vitest.js";
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        ...VITEST_DEPENDENCIES
+    ]
+});
+export const TS_LIB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+/**
+ * Consumes build artifacts produced by a project's dependencies, so a task
+ * re-runs when the output it actually reads changes.
+ *
+ * Test reports are excluded rather than build artifacts included: several
+ * generators emit generated sources outside `dist` (an OpenAPI client under a
+ * website's `src/generated`, a Smithy SSDK, the Prisma client) and add them to
+ * `.gitignore`, which keeps them out of the project's own fileset — so this
+ * input is the only thing that hashes them. `reports/` and `coverage/` hold
+ * pytest's JUnit and coverage XML, which carry a wall-clock timestamp and so
+ * mint a fresh hash on every test run that would cascade through the graph.
+ */ export const DEPENDENT_TASKS_OUTPUT_FILES_INPUT = {
+    dependentTasksOutputFiles: '!{reports,coverage}/**',
+    transitive: true
+};
+// Globs this generator has vended for the dependent-task-output input. Any of
+// them is replaced in place, so the entry is neither duplicated nor left at a
+// different scope when a generator re-runs.
+const VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [
+    '**/*',
+    'dist/**',
+    DEPENDENT_TASKS_OUTPUT_FILES_INPUT.dependentTasksOutputFiles
+];
 /**
  * Returns details about the TS library to be created
- */
-const getTsLibDetails = (tree, schema) => {
-    const scope = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    const normalizedName = (0, names_1.toKebabCase)(schema.name);
+ */ export const getTsLibDetails = (tree, schema)=>{
+    const scope = getNpmScopePrefix(tree);
+    const normalizedName = toKebabCase(schema.name);
     const fullyQualifiedName = `${scope}${normalizedName}`;
     // NB: interactive nx generator cli can pass empty string
-    const dir = (0, devkit_1.joinPathFragments)(schema.directory || '.', schema.subDirectory || normalizedName);
-    return { dir, fullyQualifiedName };
+    const dir = joinPathFragments(schema.directory || '.', schema.subDirectory || normalizedName);
+    return {
+        dir,
+        fullyQualifiedName
+    };
 };
-exports.getTsLibDetails = getTsLibDetails;
 /**
  * Generates a typescript project
- */
-const tsProjectGenerator = async (tree, schema) => {
-    const { fullyQualifiedName, dir } = (0, exports.getTsLibDetails)(tree, schema);
+ */ export const tsProjectGenerator = async (tree, schema)=>{
+    const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);
+    // The module format is workspace-wide, established by the preset when the
+    // workspace is created, so vending generators always infer it from the tree.
+    const esm = isEsmWorkspace(tree);
     // Only scaffold the project on first run; on re-run skip creation so user
     // edits are preserved, but continue to (re)apply the configuration below.
-    if (!(0, nx_1.projectExists)(tree, fullyQualifiedName)) {
-        await (0, js_1.libraryGenerator)(tree, {
+    if (!projectExists(tree, fullyQualifiedName)) {
+        await libraryGenerator(tree, {
             ...schema,
             name: fullyQualifiedName,
             directory: dir,
             skipPackageJson: true,
-            bundler: 'tsc', // TODO: consider supporting others
+            bundler: 'tsc',
             linter: 'none',
             unitTestRunner: 'vitest',
+            // Register the @nx/vitest plugin so the test target is inferred rather
+            // than emitting the deprecated @nx/vitest:test executor target.
+            addPlugin: true
         });
         // Replace with simpler sample source code
-        tree.delete((0, devkit_1.joinPathFragments)(dir, 'src'));
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)(dir), {
+        tree.delete(joinPathFragments(dir, 'src'));
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), joinPathFragments(dir), {
             fullyQualifiedName,
-            pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
+            esm,
+            pkgMgrCmd: getPackageManagerDisplayCommands().exec
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            overwriteStrategy: OverwriteStrategy.KeepExisting
         });
     }
-    await (0, ts_project_utils_1.configureTsProject)(tree, {
+    await configureTsProject(tree, {
         dir,
         fullyQualifiedName,
-    });
-    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+        esm
+    }, DEPENDENCIES);
+    const projectConfiguration = readProjectConfiguration(tree, fullyQualifiedName);
     const targets = projectConfiguration.targets;
     targets['compile'] = {
         executor: 'nx:run-commands',
-        outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],
+        outputs: [
+            '{workspaceRoot}/dist/{projectRoot}/tsc'
+        ],
         options: {
             command: 'tsc --build tsconfig.lib.json',
-            cwd: '{projectRoot}',
-        },
+            cwd: '{projectRoot}'
+        }
     };
     targets['build'] = {
-        dependsOn: ['lint', 'compile', 'test'],
+        dependsOn: [
+            'lint',
+            'compile',
+            'test'
+        ]
     };
-    targets['test'] = {
-        executor: '@nx/vitest:test',
-        outputs: ['{options.reportsDirectory}'],
-        options: {
-            reportsDirectory: '{workspaceRoot}/coverage/{projectRoot}',
-        },
+    // The artifact-only sibling of build, which the deploy targets depend on.
+    targets['assemble'] = {
+        dependsOn: [
+            'compile'
+        ]
     };
-    projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
-    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_LIB_GENERATOR_INFO);
-    (0, devkit_1.updateJson)(tree, 'nx.json', (nxJson) => {
+    projectConfiguration.targets = sortObjectKeys(targets);
+    updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);
+    addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);
+    updateJson(tree, 'nx.json', (nxJson)=>{
         nxJson.namedInputs = {
             ...nxJson.namedInputs,
             default: [
-                ...(nxJson.namedInputs?.default ?? []).filter((input) => typeof input !== 'object' ||
-                    !('dependentTasksOutputFiles' in input) ||
-                    !(input.dependentTasksOutputFiles === '**/*' && input.transitive)),
-                {
-                    dependentTasksOutputFiles: '**/*',
-                    transitive: true,
-                },
-            ],
+                ...(nxJson.namedInputs?.default ?? []).filter((input)=>typeof input !== 'object' || !('dependentTasksOutputFiles' in input) || !(VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS.includes(input.dependentTasksOutputFiles) && input.transitive)),
+                DEPENDENT_TASKS_OUTPUT_FILES_INPUT
+            ]
         };
+        const withDefaultInput = (base)=>({
+                ...base,
+                inputs: [
+                    ...(base.inputs ?? []).filter((i)=>i !== 'default'),
+                    'default'
+                ]
+            });
         nxJson.targetDefaults = {
             ...nxJson.targetDefaults,
-            compile: {
-                cache: true,
-                ...nxJson.targetDefaults?.compile,
-                inputs: [
-                    ...(nxJson.targetDefaults?.compile?.inputs ?? []).filter((i) => i !== 'default'),
-                    'default',
-                ],
-            },
-            build: {
-                cache: true,
-                ...nxJson.targetDefaults?.build,
-                inputs: [
-                    ...(nxJson.targetDefaults?.build?.inputs ?? []).filter((i) => i !== 'default'),
-                    'default',
-                ],
-            },
-            test: {
-                ...nxJson.targetDefaults?.test,
-                inputs: [
-                    ...(nxJson.targetDefaults?.test?.inputs ?? []).filter((i) => i !== 'default'),
-                    'default',
-                ],
-            },
+            compile: mergeTargetDefault(nxJson.targetDefaults?.compile, (base)=>({
+                    cache: true,
+                    ...withDefaultInput(base)
+                })),
+            build: mergeTargetDefault(nxJson.targetDefaults?.build, (base)=>({
+                    cache: true,
+                    ...withDefaultInput(base)
+                })),
+            test: mergeTargetDefault(nxJson.targetDefaults?.test, withDefaultInput)
         };
         // Ensure we only declare a single typescript plugin with the correct settings
         nxJson.plugins = [
@@ -126,28 +155,33 @@ const tsProjectGenerator = async (tree, schema) => {
                 plugin: '@nx/js/typescript',
                 options: {
                     typecheck: {
-                        targetName: 'typecheck',
+                        targetName: 'typecheck'
                     },
                     build: {
                         targetName: 'compile',
                         configName: 'tsconfig.lib.json',
                         buildDepsName: 'build-deps',
-                        watchDepsName: 'watch-deps',
-                    },
-                },
+                        watchDepsName: 'watch-deps'
+                    }
+                }
             },
-            ...(nxJson.plugins ?? []).filter((p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript'),
+            ...(nxJson.plugins ?? []).filter((p)=>typeof p === 'string' || p.plugin !== '@nx/js/typescript')
         ];
         return nxJson;
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_LIB_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        if (!schema.skipInstall) {
-            (0, devkit_1.installPackagesTask)(tree);
-        }
-    };
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_LIB_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    // `installDependencies` ensures vitest resolves for the `typescript` language (the
+    // generated vitest.config.mts imports it and Nx loads that config when
+    // computing the project graph), so a deferred install still runs when needed.
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.tsProjectGenerator = tsProjectGenerator;
-exports.default = exports.tsProjectGenerator;
+export default tsProjectGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/lib/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  type NxJsonConfiguration,\n  OverwriteStrategy,\n  readProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { libraryGenerator } from '@nx/js';\nimport { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { toKebabCase } from '../../utils/names.js';\nimport { getNpmScopePrefix } from '../../utils/npm-scope.js';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  mergeTargetDefault,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager.js';\nimport type { TsProjectGeneratorSchema } from './schema';\nimport { configureTsProject } from './ts-project-utils.js';\nimport { VITEST_DEPENDENCIES } from './vitest.js';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...VITEST_DEPENDENCIES],\n});\n\nexport const TS_LIB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Consumes build artifacts produced by a project's dependencies, so a task\n * re-runs when the output it actually reads changes.\n *\n * Test reports are excluded rather than build artifacts included: several\n * generators emit generated sources outside `dist` (an OpenAPI client under a\n * website's `src/generated`, a Smithy SSDK, the Prisma client) and add them to\n * `.gitignore`, which keeps them out of the project's own fileset — so this\n * input is the only thing that hashes them. `reports/` and `coverage/` hold\n * pytest's JUnit and coverage XML, which carry a wall-clock timestamp and so\n * mint a fresh hash on every test run that would cascade through the graph.\n */\nexport const DEPENDENT_TASKS_OUTPUT_FILES_INPUT = {\n  dependentTasksOutputFiles: '!{reports,coverage}/**',\n  transitive: true,\n};\n\n// Globs this generator has vended for the dependent-task-output input. Any of\n// them is replaced in place, so the entry is neither duplicated nor left at a\n// different scope when a generator re-runs.\nconst VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [\n  '**/*',\n  'dist/**',\n  DEPENDENT_TASKS_OUTPUT_FILES_INPUT.dependentTasksOutputFiles,\n];\n\nexport interface TsLibDetails {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n}\n\n/**\n * Returns details about the TS library to be created\n */\nexport const getTsLibDetails = (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): TsLibDetails => {\n  const scope = getNpmScopePrefix(tree);\n  const normalizedName = toKebabCase(schema.name);\n  const fullyQualifiedName = `${scope}${normalizedName}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName };\n};\n\n/**\n * Generates a typescript project\n */\nexport const tsProjectGenerator = async (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);\n  // The module format is workspace-wide, established by the preset when the\n  // workspace is created, so vending generators always infer it from the tree.\n  const esm = isEsmWorkspace(tree);\n\n  // Only scaffold the project on first run; on re-run skip creation so user\n  // edits are preserved, but continue to (re)apply the configuration below.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    await libraryGenerator(tree, {\n      ...schema,\n      name: fullyQualifiedName,\n      directory: dir,\n      skipPackageJson: true,\n      bundler: 'tsc', // TODO: consider supporting others\n      linter: 'none',\n      unitTestRunner: 'vitest',\n      // Register the @nx/vitest plugin so the test target is inferred rather\n      // than emitting the deprecated @nx/vitest:test executor target.\n      addPlugin: true,\n    });\n\n    // Replace with simpler sample source code\n    tree.delete(joinPathFragments(dir, 'src'));\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      joinPathFragments(dir),\n      {\n        fullyQualifiedName,\n        esm,\n        pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n  await configureTsProject(\n    tree,\n    {\n      dir,\n      fullyQualifiedName,\n      esm,\n    },\n    DEPENDENCIES,\n  );\n\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  const targets = projectConfiguration.targets;\n\n  targets['compile'] = {\n    executor: 'nx:run-commands',\n    outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],\n    options: {\n      command: 'tsc --build tsconfig.lib.json',\n      cwd: '{projectRoot}',\n    },\n  };\n  targets['build'] = {\n    dependsOn: ['lint', 'compile', 'test'],\n  };\n  // The artifact-only sibling of build, which the deploy targets depend on.\n  targets['assemble'] = {\n    dependsOn: ['compile'],\n  };\n  projectConfiguration.targets = sortObjectKeys(targets);\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);\n\n  updateJson(tree, 'nx.json', (nxJson: NxJsonConfiguration) => {\n    nxJson.namedInputs = {\n      ...nxJson.namedInputs,\n      default: [\n        ...(nxJson.namedInputs?.default ?? []).filter(\n          (input) =>\n            typeof input !== 'object' ||\n            !('dependentTasksOutputFiles' in input) ||\n            !(\n              VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS.includes(\n                input.dependentTasksOutputFiles as string,\n              ) && input.transitive\n            ),\n        ),\n        DEPENDENT_TASKS_OUTPUT_FILES_INPUT,\n      ],\n    };\n\n    const withDefaultInput = (base: Partial<TargetConfiguration>) => ({\n      ...base,\n      inputs: [\n        ...(base.inputs ?? []).filter((i) => i !== 'default'),\n        'default',\n      ],\n    });\n\n    nxJson.targetDefaults = {\n      ...nxJson.targetDefaults,\n      compile: mergeTargetDefault(nxJson.targetDefaults?.compile, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      build: mergeTargetDefault(nxJson.targetDefaults?.build, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      test: mergeTargetDefault(nxJson.targetDefaults?.test, withDefaultInput),\n    };\n\n    // Ensure we only declare a single typescript plugin with the correct settings\n    nxJson.plugins = [\n      {\n        plugin: '@nx/js/typescript',\n        options: {\n          typecheck: {\n            targetName: 'typecheck',\n          },\n          build: {\n            targetName: 'compile',\n            configName: 'tsconfig.lib.json',\n            buildDepsName: 'build-deps',\n            watchDepsName: 'watch-deps',\n          },\n        },\n      },\n      ...(nxJson.plugins ?? []).filter(\n        (p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript',\n      ),\n    ];\n\n    return nxJson;\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_LIB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  // `installDependencies` ensures vitest resolves for the `typescript` language (the\n  // generated vitest.config.mts imports it and Nx loads that config when\n  // computing the project graph), so a deferred install still runs when needed.\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\nexport default tsProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","updateProjectConfiguration","libraryGenerator","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","mergeTargetDefault","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","configureTsProject","VITEST_DEPENDENCIES","DEPENDENCIES","ts","TS_LIB_GENERATOR_INFO","filename","DEPENDENT_TASKS_OUTPUT_FILES_INPUT","dependentTasksOutputFiles","transitive","VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS","getTsLibDetails","tree","schema","scope","normalizedName","name","fullyQualifiedName","dir","directory","subDirectory","tsProjectGenerator","esm","skipPackageJson","bundler","linter","unitTestRunner","addPlugin","delete","dirname","pkgMgrCmd","exec","overwriteStrategy","KeepExisting","projectConfiguration","targets","executor","outputs","options","command","cwd","dependsOn","nxJson","namedInputs","default","filter","input","includes","withDefaultInput","base","inputs","i","targetDefaults","compile","cache","build","test","plugins","plugin","typecheck","targetName","configName","buildDepsName","watchDepsName","p","preferInstallDependencies","languages"],"mappings":"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"}

package/src/ts/lib/grit/vitest-pass-with-no-tests.grit

@@ -1,7 +1,4 @@
-`test: { $props }` => raw`test: {
-    passWithNoTests: true,
-    $props
-  }` where {
+`test: { $props }` => `test: { passWithNoTests: true, $props }` where {
   $props <: within `defineConfig($_)`,
   $props <: not some `passWithNoTests: $_`
 }

package/src/ts/lib/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/lib/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { LibraryGeneratorSchema } from '@nx/js/src/utils/schema';\nexport interface TsProjectGeneratorSchema {\n  name: LibraryGeneratorSchema['name'];\n  directory?: string;\n  //   unitTestRunner?: LibraryGeneratorSchema['unitTestRunner'];\n  // TODO: test and consider exposing alternate bundlers\n  // bundler?: LibraryGeneratorSchema['bundler'];\n  subDirectory?: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED,WAQC"}

package/src/ts/lib/schema.d.ts

@@ -10,5 +10,5 @@ export interface TsProjectGeneratorSchema {
   // TODO: test and consider exposing alternate bundlers
   // bundler?: LibraryGeneratorSchema['bundler'];
   subDirectory?: string;
-  skipInstall?: boolean;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/lib/schema.json

@@ -26,6 +26,11 @@
       "type": "string",
       "description": "The sub directory the lib is placed in. By default this is the library name.",
       "x-prompt": "Which sub directory do you want to create the library in? (By default this is the library name)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"]

package/src/ts/lib/ts-project-utils.d.ts

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
-import type { ConfigureProjectOptions } from './types';
+import { type DependencyDeclaration, type MustDeclare } from '../../utils/declared-dependencies.js';
+import type { ConfigureProjectOptions } from './types.js';
+import { type VITEST_DEPENDENCIES } from './vitest.js';
 interface TsConfigReference {
     path: string;
 }
@@ -16,5 +18,5 @@ export declare const mergeTsReferences: (existing: TsConfigReference[] | undefin
 /**
  * Updates typescript projects
  */
-export declare const configureTsProject: (tree: Tree, options: ConfigureProjectOptions) => Promise<void>;
+export declare const configureTsProject: <const D extends DependencyDeclaration>(tree: Tree, options: ConfigureProjectOptions, declaration: D & MustDeclare<typeof VITEST_DEPENDENCIES, D>) => Promise<void>;
 export {};

package/src/ts/lib/ts-project-utils.js

@@ -1,25 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureTsProject = exports.mergeTsReferences = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const config_1 = require("../../license/config");
-const npm_scope_1 = require("../../utils/npm-scope");
-const biome_1 = require("./biome");
-const vitest_1 = require("./vitest");
+ */ import { joinPathFragments, logger, updateJson } from "@nx/devkit";
+import { join, relative } from "path";
+import { addLicenseCheckToLintTarget } from "../../license/config.js";
+import { AWS_NX_PLUGIN_CONFIG_FILE_NAME } from "../../utils/config/utils.js";
+import { forDependencies } from "../../utils/declared-dependencies.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
+import { ensureProjectPackageJson } from "../../utils/project-package-json.js";
+import { configureBiomeLint } from "./biome.js";
+import { configureVitest } from "./vitest.js";
 /**
  * Merges new TypeScript project references into existing ones, deduplicating by
  * path and preserving the order of existing references so re-running a
  * generator neither duplicates nor reorders references.
- */
-const mergeTsReferences = (existing, toAdd) => {
-    const references = [...(existing ?? [])];
-    const existingPaths = new Set(references.map((ref) => ref.path));
-    for (const ref of toAdd) {
+ */ export const mergeTsReferences = (existing, toAdd)=>{
+    const references = [
+        ...existing ?? []
+    ];
+    const existingPaths = new Set(references.map((ref)=>ref.path));
+    for (const ref of toAdd){
         if (!existingPaths.has(ref.path)) {
             references.push(ref);
             existingPaths.add(ref.path);
@@ -27,79 +27,90 @@ const mergeTsReferences = (existing, toAdd) => {
     }
     return references;
 };
-exports.mergeTsReferences = mergeTsReferences;
 /**
  * Updates typescript projects
- */
-const configureTsProject = async (tree, options) => {
-    // Remove conflicting commonjs module from tsconfig
-    (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.json'), (tsConfig) => ({
-        ...tsConfig,
-        compilerOptions: {
-            ...tsConfig.compilerOptions,
-            module: tsConfig.compilerOptions?.module === 'commonjs'
-                ? undefined
-                : tsConfig.compilerOptions?.module,
-        },
-    }));
-    const outDirToRootRelativePath = (0, path_1.relative)((0, path_1.join)(tree.root, options.dir), tree.root);
-    const distDir = (0, path_1.join)(outDirToRootRelativePath, 'dist', options.dir, 'tsc');
-    // Remove baseUrl and rootDir from the tsconfig.lib.json
-    if (tree.exists((0, path_1.join)(options.dir, 'tsconfig.lib.json'))) {
-        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({
+ */ export const configureTsProject = async (tree, options, declaration)=>{
+    // Point users at init when the workspace hasn't been configured, since
+    // lint/format targets and workspace dependency sync depend on it.
+    if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
+        logger.warn(`This workspace has no ${AWS_NX_PLUGIN_CONFIG_FILE_NAME} — run 'nx g @aws/nx-plugin:init' (or 'nx add @aws/nx-plugin') to configure linting, formatting and workspace dependency sync.`);
+    }
+    // When the caller doesn't specify a module format, infer it from the
+    // workspace root package.json (defaulting to ESM for a fresh workspace).
+    const esm = options.esm ?? isEsmWorkspace(tree);
+    // Remove a conflicting `module: commonjs` from the project tsconfig.json
+    // (CommonJS is configured on tsconfig.lib.json below when needed).
+    updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig)=>({
             ...tsConfig,
             compilerOptions: {
                 ...tsConfig.compilerOptions,
-                baseUrl: undefined,
-                rootDir: '.',
-                outDir: distDir,
-                tsBuildInfoFile: (0, path_1.join)(distDir, 'tsconfig.lib.tsbuildinfo'),
-            },
+                module: tsConfig.compilerOptions?.module === 'commonjs' ? undefined : tsConfig.compilerOptions?.module
+            }
         }));
+    const outDirToRootRelativePath = relative(join(tree.root, options.dir), tree.root);
+    const distDir = join(outDirToRootRelativePath, 'dist', options.dir, 'tsc');
+    // Remove baseUrl and rootDir from the tsconfig.lib.json
+    if (tree.exists(join(options.dir, 'tsconfig.lib.json'))) {
+        updateJson(tree, join(options.dir, 'tsconfig.lib.json'), (tsConfig)=>({
+                ...tsConfig,
+                compilerOptions: {
+                    ...tsConfig.compilerOptions,
+                    baseUrl: undefined,
+                    rootDir: '.',
+                    outDir: distDir,
+                    tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),
+                    // @nx/js configures the lib for ESM (module `nodenext`). CommonJS
+                    // projects use `node16`, which honours the workspace's
+                    // `type: commonjs`, emits CommonJS and resolves extensionless relative
+                    // imports. (Plain `commonjs`/`node` is deprecated in TypeScript 6.)
+                    ...esm ? {} : {
+                        module: 'node16',
+                        moduleResolution: 'node16'
+                    }
+                }
+            }));
     }
     // Update root project tsconfig
-    (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (tsConfig) => ({
-        ...tsConfig,
-        compilerOptions: {
-            ...tsConfig.compilerOptions,
-            // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead
-            baseUrl: undefined,
-            rootDir: '.',
-            paths: {
-                // Remove any path aliases for this project with the npm scope prefix (eg remove @foo/bar)
-                ...Object.fromEntries(Object.entries(tsConfig.compilerOptions?.paths ?? {}).filter(([k]) => k !== options.fullyQualifiedName)),
-                // Add aliases which begin with colon (eg :foo/bar) to avoid sniping attacks
-                [(0, npm_scope_1.toScopeAlias)(options.fullyQualifiedName)]: [
-                    `./${(0, devkit_1.joinPathFragments)(options.dir, 'src', 'index.ts')}`,
-                ],
-            },
-        },
-    }));
-    if (tree.exists('tsconfig.json')) {
-        (0, devkit_1.updateJson)(tree, 'tsconfig.json', (tsConfig) => ({
+    updateJson(tree, 'tsconfig.base.json', (tsConfig)=>({
             ...tsConfig,
-            // Add project references, deduplicating and preserving existing order
-            references: (0, exports.mergeTsReferences)(tsConfig.references, [
-                { path: `./${options.dir}` },
-            ]),
+            compilerOptions: {
+                ...tsConfig.compilerOptions,
+                // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead
+                baseUrl: undefined,
+                rootDir: '.',
+                paths: {
+                    ...tsConfig.compilerOptions?.paths,
+                    [options.fullyQualifiedName]: [
+                        `./${joinPathFragments(options.dir, 'src', 'index.ts')}`
+                    ]
+                }
+            }
         }));
+    if (tree.exists('tsconfig.json')) {
+        updateJson(tree, 'tsconfig.json', (tsConfig)=>({
+                ...tsConfig,
+                // Add project references, deduplicating and preserving existing order
+                references: mergeTsReferences(tsConfig.references, [
+                    {
+                        path: `./${options.dir}`
+                    }
+                ])
+            }));
     }
-    // Update the root package.json
-    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => ({
-        ...packageJson,
-        type: 'module',
-    }));
-    // Remove package.json if it exists
-    if (tree.exists((0, path_1.join)(options.dir, 'package.json'))) {
-        tree.delete((0, path_1.join)(options.dir, 'package.json'));
-    }
-    await (0, biome_1.configureBiomeLint)(tree, options);
-    await (0, vitest_1.configureVitest)(tree, options);
+    // Every project carries a minimal private package.json so the workspace
+    // follows the standard npm package layout (see ensureProjectPackageJson).
+    ensureProjectPackageJson(tree, {
+        dir: options.dir,
+        fullyQualifiedName: options.fullyQualifiedName,
+        esm
+    });
+    await configureBiomeLint(tree, options);
+    await configureVitest(tree, options, forDependencies(declaration));
     // If license checking is configured, make this project's lint target depend
     // on the root license-check target. No-op if there's no license-check target
     // (i.e. the license generator hasn't run); the license generator wires up
     // existing projects itself, so this works regardless of generator order.
-    (0, config_1.addLicenseCheckToLintTarget)(tree, options.fullyQualifiedName);
+    addLicenseCheckToLintTarget(tree, options.fullyQualifiedName);
 };
-exports.configureTsProject = configureTsProject;
+
 //# sourceMappingURL=ts-project-utils.js.map