@aws/nx-plugin 1.0.0-rc.54 → 1.0.0-rc.55

package/src/utils/shared-rdb-scripts.d.ts

@@ -3,6 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
+import type { DependencyDeclaration, MustDeclare } from './declared-dependencies';
+/** Dependencies a caller must declare to use the shared RDB scripts. */
+export declare const SHARED_RDB_SCRIPTS_DEPENDENCIES: readonly [{
+    readonly name: "pg";
+}, {
+    readonly name: "@types/pg";
+}, {
+    readonly name: "mariadb";
+}, {
+    readonly name: "tsx";
+}];
 /**
  * Ensures the shared scripts package exists and adds RDB local-dev scripts
  * to packages/common/scripts/src/rdb/. Used by ts#rdb.
@@ -13,4 +24,4 @@ import { type Tree } from '@nx/devkit';
  * The engine-specific file names allow postgres and mysql projects to
  * coexist in the same workspace.
  */
-export declare function sharedRdbScriptsGenerator(tree: Tree, engine: 'postgres' | 'mysql'): Promise<void>;
+export declare function sharedRdbScriptsGenerator<const D extends DependencyDeclaration>(tree: Tree, engine: 'postgres' | 'mysql', declaration: D & MustDeclare<typeof SHARED_RDB_SCRIPTS_DEPENDENCIES, D>): Promise<void>;

package/src/utils/shared-rdb-scripts.js

@@ -6,6 +6,20 @@ import { addDependenciesToPackageJson } from "./dependencies.js";
 import { PACKAGES_DIR, SHARED_SCRIPTS_DIR } from "./shared-constructs-constants.js";
 import { ensureSharedScriptsProject } from "./shared-scripts.js";
 import { withVersions } from "./versions.js";
+/** Dependencies a caller must declare to use the shared RDB scripts. */ export const SHARED_RDB_SCRIPTS_DEPENDENCIES = [
+    {
+        name: 'pg'
+    },
+    {
+        name: '@types/pg'
+    },
+    {
+        name: 'mariadb'
+    },
+    {
+        name: 'tsx'
+    }
+];
 /**
  * Ensures the shared scripts package exists and adds RDB local-dev scripts
  * to packages/common/scripts/src/rdb/. Used by ts#rdb.
@@ -15,7 +29,7 @@ import { withVersions } from "./versions.js";
  * projects do not reference database client packages they don't install.
  * The engine-specific file names allow postgres and mysql projects to
  * coexist in the same workspace.
- */ export async function sharedRdbScriptsGenerator(tree, engine) {
+ */ export async function sharedRdbScriptsGenerator(tree, engine, declaration) {
     await ensureSharedScriptsProject(tree);
     const rdbScriptsDir = joinPathFragments(import.meta.dirname, 'files', SHARED_SCRIPTS_DIR, 'src', 'rdb');
     const targetDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb');
@@ -36,8 +50,8 @@ import { withVersions } from "./versions.js";
     const clientDevDeps = engine === 'postgres' ? [
         '@types/pg'
     ] : [];
-    addDependenciesToPackageJson(tree, withVersions(clientDeps), withVersions(clientDevDeps), joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'package.json'));
-    addDependenciesToPackageJson(tree, {}, withVersions([
+    addDependenciesToPackageJson(tree, withVersions(declaration, clientDeps), withVersions(declaration, clientDevDeps), joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'package.json'));
+    addDependenciesToPackageJson(tree, {}, withVersions(declaration, [
         'tsx'
     ]));
 }

package/src/utils/shared-rdb-scripts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-rdb-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { type ITsDepVersion, withVersions } from './versions';\n\n/**\n * Ensures the shared scripts package exists and adds RDB local-dev scripts\n * to packages/common/scripts/src/rdb/. Used by ts#rdb.\n *\n * Engine-agnostic scripts (pull-image, start-container) are always vended.\n * Only the wait-for-db script for the requested engine is vended so that\n * projects do not reference database client packages they don't install.\n * The engine-specific file names allow postgres and mysql projects to\n * coexist in the same workspace.\n */\nexport async function sharedRdbScriptsGenerator(\n  tree: Tree,\n  engine: 'postgres' | 'mysql',\n): Promise<void> {\n  await ensureSharedScriptsProject(tree);\n\n  const rdbScriptsDir = joinPathFragments(\n    import.meta.dirname,\n    'files',\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n  const targetDir = joinPathFragments(\n    PACKAGES_DIR,\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, 'shared'),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, engine),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // The engine's wait-for-db script imports the database client, so declare it\n  // in the scripts project's own package.json (tsx runs the scripts and lives\n  // in the workspace root devDependencies).\n  const clientDeps: ITsDepVersion[] =\n    engine === 'postgres' ? ['pg'] : ['mariadb'];\n  const clientDevDeps: ITsDepVersion[] =\n    engine === 'postgres' ? ['@types/pg'] : [];\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(clientDeps),\n    withVersions(clientDevDeps),\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'package.json'),\n  );\n  addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","addDependenciesToPackageJson","PACKAGES_DIR","SHARED_SCRIPTS_DIR","ensureSharedScriptsProject","withVersions","sharedRdbScriptsGenerator","tree","engine","rdbScriptsDir","dirname","targetDir","overwriteStrategy","KeepExisting","clientDeps","clientDevDeps"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SAASC,4BAA4B,QAAQ,oBAAiB;AAC9D,SACEC,YAAY,EACZC,kBAAkB,QACb,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D;;;;;;;;;CASC,GACD,OAAO,eAAeC,0BACpBC,IAAU,EACVC,MAA4B;IAE5B,MAAMJ,2BAA2BG;IAEjC,MAAME,gBAAgBV,kBACpB,YAAYW,OAAO,EACnB,SACAP,oBACA,OACA;IAEF,MAAMQ,YAAYZ,kBAChBG,cACAC,oBACA,OACA;IAGFL,cACES,MACAR,kBAAkBU,eAAe,WACjCE,WACA,CAAC,GACD;QAAEC,mBAAmBZ,kBAAkBa,YAAY;IAAC;IAEtDf,cACES,MACAR,kBAAkBU,eAAeD,SACjCG,WACA,CAAC,GACD;QAAEC,mBAAmBZ,kBAAkBa,YAAY;IAAC;IAGtD,6EAA6E;IAC7E,4EAA4E;IAC5E,0CAA0C;IAC1C,MAAMC,aACJN,WAAW,aAAa;QAAC;KAAK,GAAG;QAAC;KAAU;IAC9C,MAAMO,gBACJP,WAAW,aAAa;QAAC;KAAY,GAAG,EAAE;IAC5CP,6BACEM,MACAF,aAAaS,aACbT,aAAaU,gBACbhB,kBAAkBG,cAAcC,oBAAoB;IAEtDF,6BAA6BM,MAAM,CAAC,GAAGF,aAAa;QAAC;KAAM;AAC7D"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-rdb-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport type {\n  DependencyDeclaration,\n  MustDeclare,\n} from './declared-dependencies';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { type ITsDepVersion, withVersions } from './versions';\n\n/** Dependencies a caller must declare to use the shared RDB scripts. */\nexport const SHARED_RDB_SCRIPTS_DEPENDENCIES = [\n  { name: 'pg' },\n  { name: '@types/pg' },\n  { name: 'mariadb' },\n  { name: 'tsx' },\n] as const satisfies readonly { name: ITsDepVersion }[];\n\n/**\n * Ensures the shared scripts package exists and adds RDB local-dev scripts\n * to packages/common/scripts/src/rdb/. Used by ts#rdb.\n *\n * Engine-agnostic scripts (pull-image, start-container) are always vended.\n * Only the wait-for-db script for the requested engine is vended so that\n * projects do not reference database client packages they don't install.\n * The engine-specific file names allow postgres and mysql projects to\n * coexist in the same workspace.\n */\nexport async function sharedRdbScriptsGenerator<\n  const D extends DependencyDeclaration,\n>(\n  tree: Tree,\n  engine: 'postgres' | 'mysql',\n  declaration: D & MustDeclare<typeof SHARED_RDB_SCRIPTS_DEPENDENCIES, D>,\n): Promise<void> {\n  await ensureSharedScriptsProject(tree);\n\n  const rdbScriptsDir = joinPathFragments(\n    import.meta.dirname,\n    'files',\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n  const targetDir = joinPathFragments(\n    PACKAGES_DIR,\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, 'shared'),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, engine),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // The engine's wait-for-db script imports the database client, so declare it\n  // in the scripts project's own package.json (tsx runs the scripts and lives\n  // in the workspace root devDependencies).\n  const clientDeps: (typeof SHARED_RDB_SCRIPTS_DEPENDENCIES)[number]['name'][] =\n    engine === 'postgres' ? ['pg'] : ['mariadb'];\n  const clientDevDeps: (typeof SHARED_RDB_SCRIPTS_DEPENDENCIES)[number]['name'][] =\n    engine === 'postgres' ? ['@types/pg'] : [];\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(\n      declaration as DependencyDeclaration<\n        typeof SHARED_RDB_SCRIPTS_DEPENDENCIES\n      >,\n      clientDeps,\n    ),\n    withVersions(\n      declaration as DependencyDeclaration<\n        typeof SHARED_RDB_SCRIPTS_DEPENDENCIES\n      >,\n      clientDevDeps,\n    ),\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'package.json'),\n  );\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(\n      declaration as DependencyDeclaration<\n        typeof SHARED_RDB_SCRIPTS_DEPENDENCIES\n      >,\n      ['tsx'],\n    ),\n  );\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","addDependenciesToPackageJson","PACKAGES_DIR","SHARED_SCRIPTS_DIR","ensureSharedScriptsProject","withVersions","SHARED_RDB_SCRIPTS_DEPENDENCIES","name","sharedRdbScriptsGenerator","tree","engine","declaration","rdbScriptsDir","dirname","targetDir","overwriteStrategy","KeepExisting","clientDeps","clientDevDeps"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AAKpB,SAASC,4BAA4B,QAAQ,oBAAiB;AAC9D,SACEC,YAAY,EACZC,kBAAkB,QACb,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,sEAAsE,GACtE,OAAO,MAAMC,kCAAkC;IAC7C;QAAEC,MAAM;IAAK;IACb;QAAEA,MAAM;IAAY;IACpB;QAAEA,MAAM;IAAU;IAClB;QAAEA,MAAM;IAAM;CACf,CAAuD;AAExD;;;;;;;;;CASC,GACD,OAAO,eAAeC,0BAGpBC,IAAU,EACVC,MAA4B,EAC5BC,WAAuE;IAEvE,MAAMP,2BAA2BK;IAEjC,MAAMG,gBAAgBb,kBACpB,YAAYc,OAAO,EACnB,SACAV,oBACA,OACA;IAEF,MAAMW,YAAYf,kBAChBG,cACAC,oBACA,OACA;IAGFL,cACEW,MACAV,kBAAkBa,eAAe,WACjCE,WACA,CAAC,GACD;QAAEC,mBAAmBf,kBAAkBgB,YAAY;IAAC;IAEtDlB,cACEW,MACAV,kBAAkBa,eAAeF,SACjCI,WACA,CAAC,GACD;QAAEC,mBAAmBf,kBAAkBgB,YAAY;IAAC;IAGtD,6EAA6E;IAC7E,4EAA4E;IAC5E,0CAA0C;IAC1C,MAAMC,aACJP,WAAW,aAAa;QAAC;KAAK,GAAG;QAAC;KAAU;IAC9C,MAAMQ,gBACJR,WAAW,aAAa;QAAC;KAAY,GAAG,EAAE;IAC5CT,6BACEQ,MACAJ,aACEM,aAGAM,aAEFZ,aACEM,aAGAO,gBAEFnB,kBAAkBG,cAAcC,oBAAoB;IAEtDF,6BACEQ,MACA,CAAC,GACDJ,aACEM,aAGA;QAAC;KAAM;AAGb"}

package/src/utils/shared-shadcn.d.ts

@@ -3,4 +3,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
-export declare function sharedShadcnGenerator(tree: Tree): Promise<void>;
+import { type DependencyDeclaration, type MustDeclare } from './declared-dependencies';
+/** Dependencies a caller must declare to use the shared shadcn project. */
+export declare const SHADCN_DEPENDENCIES: readonly [{
+    readonly name: "react";
+}, {
+    readonly name: "react-dom";
+}, {
+    readonly name: "class-variance-authority";
+}, {
+    readonly name: "clsx";
+}, {
+    readonly name: "tailwind-merge";
+}, {
+    readonly name: "lucide-react";
+}, {
+    readonly name: "tw-animate-css";
+}, {
+    readonly name: "radix-ui";
+}, {
+    readonly name: "vite";
+}, {
+    readonly name: "vitest";
+}, {
+    readonly name: "@vitest/coverage-v8";
+}];
+export declare function sharedShadcnGenerator<const D extends DependencyDeclaration>(tree: Tree, declaration: D & MustDeclare<typeof SHADCN_DEPENDENCIES, D>): Promise<void>;

package/src/utils/shared-shadcn.js

@@ -4,23 +4,42 @@
  */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
 import tsProjectGenerator from "../ts/lib/generator.js";
 import { configureTsProject } from "../ts/lib/ts-project-utils.js";
+import { VITEST_DEPENDENCIES } from "../ts/lib/vitest.js";
+import { declaredNames, forDependencies } from "./declared-dependencies.js";
 import { addDependenciesToPackageJson } from "./dependencies.js";
 import { formatFilesInSubtree } from "./format.js";
 import { esmVars } from "./module-format.js";
 import { getNpmScopePrefix } from "./npm-scope.js";
 import { PACKAGES_DIR, SHARED_SHADCN_DIR, SHARED_SHADCN_NAME } from "./shared-constructs-constants.js";
 import { withVersions } from "./versions.js";
-const SHADCN_DEPS = [
-    'react',
-    'react-dom',
-    'class-variance-authority',
-    'clsx',
-    'tailwind-merge',
-    'lucide-react',
-    'tw-animate-css',
-    'radix-ui'
+/** Dependencies a caller must declare to use the shared shadcn project. */ export const SHADCN_DEPENDENCIES = [
+    {
+        name: 'react'
+    },
+    {
+        name: 'react-dom'
+    },
+    {
+        name: 'class-variance-authority'
+    },
+    {
+        name: 'clsx'
+    },
+    {
+        name: 'tailwind-merge'
+    },
+    {
+        name: 'lucide-react'
+    },
+    {
+        name: 'tw-animate-css'
+    },
+    {
+        name: 'radix-ui'
+    },
+    ...VITEST_DEPENDENCIES
 ];
-export async function sharedShadcnGenerator(tree) {
+export async function sharedShadcnGenerator(tree, declaration) {
     const npmScopePrefix = getNpmScopePrefix(tree);
     const scopeAlias = npmScopePrefix;
     const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;
@@ -49,7 +68,7 @@ export async function sharedShadcnGenerator(tree) {
         await configureTsProject(tree, {
             dir: libraryRoot,
             fullyQualifiedName
-        });
+        }, forDependencies(declaration));
         updateJson(tree, joinPathFragments(libraryRoot, 'tsconfig.lib.json'), (json)=>({
                 ...json,
                 compilerOptions: {
@@ -67,9 +86,7 @@ export async function sharedShadcnGenerator(tree) {
                     'src/**/*.tsx'
                 ]))
             }));
-        addDependenciesToPackageJson(tree, withVersions([
-            ...SHADCN_DEPS
-        ]), {}, joinPathFragments(libraryRoot, 'package.json'));
+        addDependenciesToPackageJson(tree, withVersions(forDependencies(declaration), declaredNames(SHADCN_DEPENDENCIES)), {}, joinPathFragments(libraryRoot, 'package.json'));
     }
     updateJson(tree, 'tsconfig.base.json', (json)=>({
             ...json,

package/src/utils/shared-shadcn.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { configureTsProject } from '../ts/lib/ts-project-utils';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix } from './npm-scope';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n  SHARED_SHADCN_NAME,\n} from './shared-constructs-constants';\nimport { type ITsDepVersion, withVersions } from './versions';\n\nconst SHADCN_DEPS = [\n  'react',\n  'react-dom',\n  'class-variance-authority',\n  'clsx',\n  'tailwind-merge',\n  'lucide-react',\n  'tw-animate-css',\n  'radix-ui',\n] as const satisfies ITsDepVersion[];\n\nexport async function sharedShadcnGenerator(tree: Tree) {\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = npmScopePrefix;\n  const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;\n  const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;\n  const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);\n  const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');\n\n  if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {\n    await tsProjectGenerator(tree, {\n      name: SHARED_SHADCN_NAME,\n      directory: PACKAGES_DIR,\n      subDirectory: SHARED_SHADCN_DIR,\n    });\n\n    tree.delete(shadcnSrcRoot);\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'),\n      shadcnSrcRoot,\n      {\n        scopeAlias,\n        ...esmVars(tree),\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        SHARED_SHADCN_DIR,\n        'readme',\n      ),\n      libraryRoot,\n      {\n        fullyQualifiedName,\n        scopeAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.Overwrite,\n      },\n    );\n\n    await configureTsProject(tree, {\n      dir: libraryRoot,\n      fullyQualifiedName,\n    });\n\n    updateJson(\n      tree,\n      joinPathFragments(libraryRoot, 'tsconfig.lib.json'),\n      (json) => ({\n        ...json,\n        compilerOptions: {\n          ...json.compilerOptions,\n          jsx: 'react-jsx',\n          module: 'preserve',\n          moduleResolution: 'bundler',\n          lib: Array.from(\n            new Set([...(json.compilerOptions?.lib ?? []), 'DOM']),\n          ),\n        },\n        include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),\n      }),\n    );\n\n    addDependenciesToPackageJson(\n      tree,\n      withVersions([...SHADCN_DEPS]),\n      {},\n      joinPathFragments(libraryRoot, 'package.json'),\n    );\n  }\n\n  updateJson(tree, 'tsconfig.base.json', (json) => ({\n    ...json,\n    compilerOptions: {\n      ...json.compilerOptions,\n      paths: {\n        ...(json.compilerOptions?.paths ?? {}),\n        [`${sharedShadcnAlias}/*`]: [\n          `./${joinPathFragments(libraryRoot, 'src', '*')}`,\n        ],\n      },\n    },\n  }));\n\n  // components.json lives in the package so `shadcn add` runs there and\n  // installs component dependencies into the package's own manifest.\n  if (!tree.exists(joinPathFragments(libraryRoot, 'components.json'))) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      libraryRoot,\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","addDependenciesToPackageJson","formatFilesInSubtree","esmVars","getNpmScopePrefix","PACKAGES_DIR","SHARED_SHADCN_DIR","SHARED_SHADCN_NAME","withVersions","SHADCN_DEPS","sharedShadcnGenerator","tree","npmScopePrefix","scopeAlias","sharedShadcnAlias","fullyQualifiedName","libraryRoot","shadcnSrcRoot","exists","name","directory","subDirectory","delete","dirname","overwriteStrategy","KeepExisting","Overwrite","dir","json","compilerOptions","jsx","module","moduleResolution","lib","Array","from","Set","include","paths"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,4BAA4B,QAAQ,oBAAiB;AAC9D,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,QAAQ,iBAAc;AAChD,SACEC,YAAY,EACZC,iBAAiB,EACjBC,kBAAkB,QACb,mCAAgC;AACvC,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,MAAMC,cAAc;IAClB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD;AAED,OAAO,eAAeC,sBAAsBC,IAAU;IACpD,MAAMC,iBAAiBR,kBAAkBO;IACzC,MAAME,aAAaD;IACnB,MAAME,oBAAoB,GAAGD,aAAaN,oBAAoB;IAC9D,MAAMQ,qBAAqB,GAAGH,iBAAiBL,oBAAoB;IACnE,MAAMS,cAAcpB,kBAAkBS,cAAcC;IACpD,MAAMW,gBAAgBrB,kBAAkBoB,aAAa;IAErD,IAAI,CAACL,KAAKO,MAAM,CAACtB,kBAAkBoB,aAAa,kBAAkB;QAChE,MAAMjB,mBAAmBY,MAAM;YAC7BQ,MAAMZ;YACNa,WAAWf;YACXgB,cAAcf;QAChB;QAEAK,KAAKW,MAAM,CAACL;QAEZtB,cACEgB,MACAf,kBAAkB,YAAY2B,OAAO,EAAE,SAASjB,mBAAmB,QACnEW,eACA;YACEJ;YACA,GAAGV,QAAQQ,KAAK;QAClB,GACA;YACEa,mBAAmB3B,kBAAkB4B,YAAY;QACnD;QAGF9B,cACEgB,MACAf,kBACE,YAAY2B,OAAO,EACnB,SACAjB,mBACA,WAEFU,aACA;YACED;YACAF;QACF,GACA;YACEW,mBAAmB3B,kBAAkB6B,SAAS;QAChD;QAGF,MAAM1B,mBAAmBW,MAAM;YAC7BgB,KAAKX;YACLD;QACF;QAEAjB,WACEa,MACAf,kBAAkBoB,aAAa,sBAC/B,CAACY,OAAU,CAAA;gBACT,GAAGA,IAAI;gBACPC,iBAAiB;oBACf,GAAGD,KAAKC,eAAe;oBACvBC,KAAK;oBACLC,QAAQ;oBACRC,kBAAkB;oBAClBC,KAAKC,MAAMC,IAAI,CACb,IAAIC,IAAI;2BAAKR,KAAKC,eAAe,EAAEI,OAAO,EAAE;wBAAG;qBAAM;gBAEzD;gBACAI,SAASH,MAAMC,IAAI,CAAC,IAAIC,IAAI;uBAAKR,KAAKS,OAAO,IAAI,EAAE;oBAAG;iBAAe;YACvE,CAAA;QAGFpC,6BACEU,MACAH,aAAa;eAAIC;SAAY,GAC7B,CAAC,GACDb,kBAAkBoB,aAAa;IAEnC;IAEAlB,WAAWa,MAAM,sBAAsB,CAACiB,OAAU,CAAA;YAChD,GAAGA,IAAI;YACPC,iBAAiB;gBACf,GAAGD,KAAKC,eAAe;gBACvBS,OAAO;oBACL,GAAIV,KAAKC,eAAe,EAAES,SAAS,CAAC,CAAC;oBACrC,CAAC,GAAGxB,kBAAkB,EAAE,CAAC,CAAC,EAAE;wBAC1B,CAAC,EAAE,EAAElB,kBAAkBoB,aAAa,OAAO,MAAM;qBAClD;gBACH;YACF;QACF,CAAA;IAEA,sEAAsE;IACtE,mEAAmE;IACnE,IAAI,CAACL,KAAKO,MAAM,CAACtB,kBAAkBoB,aAAa,qBAAqB;QACnErB,cACEgB,MACAf,kBAAkB,YAAY2B,OAAO,EAAE,SAAS,WAChDP,aACA;YACEF;QACF,GACA;YACEU,mBAAmB3B,kBAAkB4B,YAAY;QACnD;IAEJ;IAEA,MAAMvB,qBAAqBS;AAC7B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { configureTsProject } from '../ts/lib/ts-project-utils';\nimport { VITEST_DEPENDENCIES } from '../ts/lib/vitest';\nimport {\n  type DependencyDeclaration,\n  declaredNames,\n  forDependencies,\n  type MustDeclare,\n} from './declared-dependencies';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix } from './npm-scope';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n  SHARED_SHADCN_NAME,\n} from './shared-constructs-constants';\nimport { type ITsDepVersion, withVersions } from './versions';\n\n/** Dependencies a caller must declare to use the shared shadcn project. */\nexport const SHADCN_DEPENDENCIES = [\n  { name: 'react' },\n  { name: 'react-dom' },\n  { name: 'class-variance-authority' },\n  { name: 'clsx' },\n  { name: 'tailwind-merge' },\n  { name: 'lucide-react' },\n  { name: 'tw-animate-css' },\n  { name: 'radix-ui' },\n  ...VITEST_DEPENDENCIES,\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport async function sharedShadcnGenerator<\n  const D extends DependencyDeclaration,\n>(tree: Tree, declaration: D & MustDeclare<typeof SHADCN_DEPENDENCIES, D>) {\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = npmScopePrefix;\n  const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;\n  const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;\n  const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);\n  const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');\n\n  if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {\n    await tsProjectGenerator(tree, {\n      name: SHARED_SHADCN_NAME,\n      directory: PACKAGES_DIR,\n      subDirectory: SHARED_SHADCN_DIR,\n    });\n\n    tree.delete(shadcnSrcRoot);\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'),\n      shadcnSrcRoot,\n      {\n        scopeAlias,\n        ...esmVars(tree),\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        SHARED_SHADCN_DIR,\n        'readme',\n      ),\n      libraryRoot,\n      {\n        fullyQualifiedName,\n        scopeAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.Overwrite,\n      },\n    );\n\n    await configureTsProject(\n      tree,\n      {\n        dir: libraryRoot,\n        fullyQualifiedName,\n      },\n      forDependencies<typeof SHADCN_DEPENDENCIES>(declaration),\n    );\n\n    updateJson(\n      tree,\n      joinPathFragments(libraryRoot, 'tsconfig.lib.json'),\n      (json) => ({\n        ...json,\n        compilerOptions: {\n          ...json.compilerOptions,\n          jsx: 'react-jsx',\n          module: 'preserve',\n          moduleResolution: 'bundler',\n          lib: Array.from(\n            new Set([...(json.compilerOptions?.lib ?? []), 'DOM']),\n          ),\n        },\n        include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),\n      }),\n    );\n\n    addDependenciesToPackageJson(\n      tree,\n      withVersions(\n        forDependencies<typeof SHADCN_DEPENDENCIES>(declaration),\n        declaredNames(SHADCN_DEPENDENCIES),\n      ),\n      {},\n      joinPathFragments(libraryRoot, 'package.json'),\n    );\n  }\n\n  updateJson(tree, 'tsconfig.base.json', (json) => ({\n    ...json,\n    compilerOptions: {\n      ...json.compilerOptions,\n      paths: {\n        ...(json.compilerOptions?.paths ?? {}),\n        [`${sharedShadcnAlias}/*`]: [\n          `./${joinPathFragments(libraryRoot, 'src', '*')}`,\n        ],\n      },\n    },\n  }));\n\n  // components.json lives in the package so `shadcn add` runs there and\n  // installs component dependencies into the package's own manifest.\n  if (!tree.exists(joinPathFragments(libraryRoot, 'components.json'))) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      libraryRoot,\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","VITEST_DEPENDENCIES","declaredNames","forDependencies","addDependenciesToPackageJson","formatFilesInSubtree","esmVars","getNpmScopePrefix","PACKAGES_DIR","SHARED_SHADCN_DIR","SHARED_SHADCN_NAME","withVersions","SHADCN_DEPENDENCIES","name","sharedShadcnGenerator","tree","declaration","npmScopePrefix","scopeAlias","sharedShadcnAlias","fullyQualifiedName","libraryRoot","shadcnSrcRoot","exists","directory","subDirectory","delete","dirname","overwriteStrategy","KeepExisting","Overwrite","dir","json","compilerOptions","jsx","module","moduleResolution","lib","Array","from","Set","include","paths"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,mBAAmB,QAAQ,sBAAmB;AACvD,SAEEC,aAAa,EACbC,eAAe,QAEV,6BAA0B;AACjC,SAASC,4BAA4B,QAAQ,oBAAiB;AAC9D,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,QAAQ,iBAAc;AAChD,SACEC,YAAY,EACZC,iBAAiB,EACjBC,kBAAkB,QACb,mCAAgC;AACvC,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,yEAAyE,GACzE,OAAO,MAAMC,sBAAsB;IACjC;QAAEC,MAAM;IAAQ;IAChB;QAAEA,MAAM;IAAY;IACpB;QAAEA,MAAM;IAA2B;IACnC;QAAEA,MAAM;IAAO;IACf;QAAEA,MAAM;IAAiB;IACzB;QAAEA,MAAM;IAAe;IACvB;QAAEA,MAAM;IAAiB;IACzB;QAAEA,MAAM;IAAW;OAChBZ;CACJ,CAAuD;AAExD,OAAO,eAAea,sBAEpBC,IAAU,EAAEC,WAA2D;IACvE,MAAMC,iBAAiBV,kBAAkBQ;IACzC,MAAMG,aAAaD;IACnB,MAAME,oBAAoB,GAAGD,aAAaR,oBAAoB;IAC9D,MAAMU,qBAAqB,GAAGH,iBAAiBP,oBAAoB;IACnE,MAAMW,cAAczB,kBAAkBY,cAAcC;IACpD,MAAMa,gBAAgB1B,kBAAkByB,aAAa;IAErD,IAAI,CAACN,KAAKQ,MAAM,CAAC3B,kBAAkByB,aAAa,kBAAkB;QAChE,MAAMtB,mBAAmBgB,MAAM;YAC7BF,MAAMH;YACNc,WAAWhB;YACXiB,cAAchB;QAChB;QAEAM,KAAKW,MAAM,CAACJ;QAEZ3B,cACEoB,MACAnB,kBAAkB,YAAY+B,OAAO,EAAE,SAASlB,mBAAmB,QACnEa,eACA;YACEJ;YACA,GAAGZ,QAAQS,KAAK;QAClB,GACA;YACEa,mBAAmB/B,kBAAkBgC,YAAY;QACnD;QAGFlC,cACEoB,MACAnB,kBACE,YAAY+B,OAAO,EACnB,SACAlB,mBACA,WAEFY,aACA;YACED;YACAF;QACF,GACA;YACEU,mBAAmB/B,kBAAkBiC,SAAS;QAChD;QAGF,MAAM9B,mBACJe,MACA;YACEgB,KAAKV;YACLD;QACF,GACAjB,gBAA4Ca;QAG9ClB,WACEiB,MACAnB,kBAAkByB,aAAa,sBAC/B,CAACW,OAAU,CAAA;gBACT,GAAGA,IAAI;gBACPC,iBAAiB;oBACf,GAAGD,KAAKC,eAAe;oBACvBC,KAAK;oBACLC,QAAQ;oBACRC,kBAAkB;oBAClBC,KAAKC,MAAMC,IAAI,CACb,IAAIC,IAAI;2BAAKR,KAAKC,eAAe,EAAEI,OAAO,EAAE;wBAAG;qBAAM;gBAEzD;gBACAI,SAASH,MAAMC,IAAI,CAAC,IAAIC,IAAI;uBAAKR,KAAKS,OAAO,IAAI,EAAE;oBAAG;iBAAe;YACvE,CAAA;QAGFrC,6BACEW,MACAJ,aACER,gBAA4Ca,cAC5Cd,cAAcU,uBAEhB,CAAC,GACDhB,kBAAkByB,aAAa;IAEnC;IAEAvB,WAAWiB,MAAM,sBAAsB,CAACiB,OAAU,CAAA;YAChD,GAAGA,IAAI;YACPC,iBAAiB;gBACf,GAAGD,KAAKC,eAAe;gBACvBS,OAAO;oBACL,GAAIV,KAAKC,eAAe,EAAES,SAAS,CAAC,CAAC;oBACrC,CAAC,GAAGvB,kBAAkB,EAAE,CAAC,CAAC,EAAE;wBAC1B,CAAC,EAAE,EAAEvB,kBAAkByB,aAAa,OAAO,MAAM;qBAClD;gBACH;YACF;QACF,CAAA;IAEA,sEAAsE;IACtE,mEAAmE;IACnE,IAAI,CAACN,KAAKQ,MAAM,CAAC3B,kBAAkByB,aAAa,qBAAqB;QACnE1B,cACEoB,MACAnB,kBAAkB,YAAY+B,OAAO,EAAE,SAAS,WAChDN,aACA;YACEF;QACF,GACA;YACES,mBAAmB/B,kBAAkBgC,YAAY;QACnD;IAEJ;IAEA,MAAMxB,qBAAqBU;AAC7B"}

package/src/utils/version-upgrade-migration/migration.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { MigrationReturnObject, Tree } from '@nx/devkit';
+/**
+ * Syncs the workspace's vended versions to those the installed plugin vends.
+ *
+ * Registered `everyMigration`, so it runs on every upgrade and last in the run:
+ * versions come from the installed plugin's own tables, so there is nothing
+ * release-specific to register, and running after the code migrations lets them
+ * add dependencies this then brings up to date.
+ */
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/utils/version-upgrade-migration/migration.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { syncVendedVersions } from "./sync-vended-versions.js";
+/**
+ * Syncs the workspace's vended versions to those the installed plugin vends.
+ *
+ * Registered `everyMigration`, so it runs on every upgrade and last in the run:
+ * versions come from the installed plugin's own tables, so there is nothing
+ * release-specific to register, and running after the code migrations lets them
+ * add dependencies this then brings up to date.
+ */ export default async function migration(tree) {
+    return syncVendedVersions(tree);
+}
+
+//# sourceMappingURL=migration.js.map

package/src/utils/version-upgrade-migration/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/version-upgrade-migration/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { MigrationReturnObject, Tree } from '@nx/devkit';\nimport { syncVendedVersions } from './sync-vended-versions';\n\n/**\n * Syncs the workspace's vended versions to those the installed plugin vends.\n *\n * Registered `everyMigration`, so it runs on every upgrade and last in the run:\n * versions come from the installed plugin's own tables, so there is nothing\n * release-specific to register, and running after the code migrations lets them\n * add dependencies this then brings up to date.\n */\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  return syncVendedVersions(tree);\n}\n"],"names":["syncVendedVersions","migration","tree"],"mappings":"AAAA;;;CAGC,GAED,SAASA,kBAAkB,QAAQ,4BAAyB;AAE5D;;;;;;;CAOC,GACD,eAAe,eAAeC,UAC5BC,IAAU;IAEV,OAAOF,mBAAmBE;AAC5B"}

package/src/utils/version-upgrade-migration/nx-package-updates.d.ts

@@ -0,0 +1,35 @@
+/**
+ * `packageJsonUpdates` for the nx packages a generated workspace pins.
+ *
+ * A migration cannot bump these: `nx migrate` builds its migration list from the
+ * packages it is itself bumping, so an nx version only rewritten by our migration
+ * silently skips Nx's own migrations for that hop. Declaring the bump here pulls
+ * them in.
+ *
+ * It also keeps every nx pin moving together. A workspace nx even a patch apart
+ * from the plugin's `@nx/*` packages hoists a second nested nx, and the two
+ * deadlock `nx sync`.
+ */
+export declare const NX_PACKAGE_UPDATES_NAME = "nx-packages";
+export declare const isNxPackage: (name: string) => boolean;
+/** Indexed to satisfy the open shape `migrations.json` entries carry. */
+export interface PackageJsonUpdate extends Record<string, unknown> {
+    version: string;
+    packages: Record<string, {
+        version: string;
+        alwaysAddToPackageJson: false;
+    }>;
+}
+export type PackageJsonUpdates = Record<string, PackageJsonUpdate>;
+/**
+ * `alwaysAddToPackageJson: false` so only packages already present are updated.
+ *
+ * Keyed by directory rather than version, because the key has to exist before
+ * the version does: an entry is written under `latest` and only re-keyed to
+ * `v<version>` once a release claims it. One release's entry stays behind as the
+ * next is written, so a workspace several releases behind gets each nx bump in
+ * turn — hence `<dir>-<name>`, which keeps every release's entry distinct.
+ *
+ * @param version version `nx migrate` gates the bump on
+ */
+export declare const nxPackageJsonUpdates: (dir: string, version: string, nxVersion?: string) => PackageJsonUpdates;

package/src/utils/version-upgrade-migration/nx-package-updates.js

@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { migrationKey } from "../migration-versions.js";
+import { NX_PACKAGES, NX_VERSION } from "../versions.js";
+/**
+ * `packageJsonUpdates` for the nx packages a generated workspace pins.
+ *
+ * A migration cannot bump these: `nx migrate` builds its migration list from the
+ * packages it is itself bumping, so an nx version only rewritten by our migration
+ * silently skips Nx's own migrations for that hop. Declaring the bump here pulls
+ * them in.
+ *
+ * It also keeps every nx pin moving together. A workspace nx even a patch apart
+ * from the plugin's `@nx/*` packages hoists a second nested nx, and the two
+ * deadlock `nx sync`.
+ */ export const NX_PACKAGE_UPDATES_NAME = 'nx-packages';
+export const isNxPackage = (name)=>NX_PACKAGES.includes(name);
+/**
+ * `alwaysAddToPackageJson: false` so only packages already present are updated.
+ *
+ * Keyed by directory rather than version, because the key has to exist before
+ * the version does: an entry is written under `latest` and only re-keyed to
+ * `v<version>` once a release claims it. One release's entry stays behind as the
+ * next is written, so a workspace several releases behind gets each nx bump in
+ * turn — hence `<dir>-<name>`, which keeps every release's entry distinct.
+ *
+ * @param version version `nx migrate` gates the bump on
+ */ export const nxPackageJsonUpdates = (dir, version, nxVersion = NX_VERSION)=>({
+        [migrationKey(dir, NX_PACKAGE_UPDATES_NAME)]: {
+            version,
+            packages: Object.fromEntries(NX_PACKAGES.map((name)=>[
+                    name,
+                    {
+                        version: nxVersion,
+                        alwaysAddToPackageJson: false
+                    }
+                ]))
+        }
+    });
+
+//# sourceMappingURL=nx-package-updates.js.map

package/src/utils/version-upgrade-migration/nx-package-updates.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/version-upgrade-migration/nx-package-updates.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { migrationKey } from '../migration-versions';\nimport { NX_PACKAGES, NX_VERSION } from '../versions';\n\n/**\n * `packageJsonUpdates` for the nx packages a generated workspace pins.\n *\n * A migration cannot bump these: `nx migrate` builds its migration list from the\n * packages it is itself bumping, so an nx version only rewritten by our migration\n * silently skips Nx's own migrations for that hop. Declaring the bump here pulls\n * them in.\n *\n * It also keeps every nx pin moving together. A workspace nx even a patch apart\n * from the plugin's `@nx/*` packages hoists a second nested nx, and the two\n * deadlock `nx sync`.\n */\n\nexport const NX_PACKAGE_UPDATES_NAME = 'nx-packages';\n\nexport const isNxPackage = (name: string): boolean =>\n  (NX_PACKAGES as readonly string[]).includes(name);\n\n/** Indexed to satisfy the open shape `migrations.json` entries carry. */\nexport interface PackageJsonUpdate extends Record<string, unknown> {\n  version: string;\n  packages: Record<string, { version: string; alwaysAddToPackageJson: false }>;\n}\n\nexport type PackageJsonUpdates = Record<string, PackageJsonUpdate>;\n\n/**\n * `alwaysAddToPackageJson: false` so only packages already present are updated.\n *\n * Keyed by directory rather than version, because the key has to exist before\n * the version does: an entry is written under `latest` and only re-keyed to\n * `v<version>` once a release claims it. One release's entry stays behind as the\n * next is written, so a workspace several releases behind gets each nx bump in\n * turn — hence `<dir>-<name>`, which keeps every release's entry distinct.\n *\n * @param version version `nx migrate` gates the bump on\n */\nexport const nxPackageJsonUpdates = (\n  dir: string,\n  version: string,\n  nxVersion: string = NX_VERSION,\n): PackageJsonUpdates => ({\n  [migrationKey(dir, NX_PACKAGE_UPDATES_NAME)]: {\n    version,\n    packages: Object.fromEntries(\n      NX_PACKAGES.map((name) => [\n        name,\n        { version: nxVersion, alwaysAddToPackageJson: false as const },\n      ]),\n    ),\n  },\n});\n"],"names":["migrationKey","NX_PACKAGES","NX_VERSION","NX_PACKAGE_UPDATES_NAME","isNxPackage","name","includes","nxPackageJsonUpdates","dir","version","nxVersion","packages","Object","fromEntries","map","alwaysAddToPackageJson"],"mappings":"AAAA;;;CAGC,GACD,SAASA,YAAY,QAAQ,2BAAwB;AACrD,SAASC,WAAW,EAAEC,UAAU,QAAQ,iBAAc;AAEtD;;;;;;;;;;;CAWC,GAED,OAAO,MAAMC,0BAA0B,cAAc;AAErD,OAAO,MAAMC,cAAc,CAACC,OAC1B,AAACJ,YAAkCK,QAAQ,CAACD,MAAM;AAUpD;;;;;;;;;;CAUC,GACD,OAAO,MAAME,uBAAuB,CAClCC,KACAC,SACAC,YAAoBR,UAAU,GACN,CAAA;QACxB,CAACF,aAAaQ,KAAKL,yBAAyB,EAAE;YAC5CM;YACAE,UAAUC,OAAOC,WAAW,CAC1BZ,YAAYa,GAAG,CAAC,CAACT,OAAS;oBACxBA;oBACA;wBAAEI,SAASC;wBAAWK,wBAAwB;oBAAe;iBAC9D;QAEL;IACF,CAAA,EAAG"}

package/src/utils/version-upgrade-migration/owned-dependencies.d.ts

@@ -0,0 +1,50 @@
+import { type Tree } from '@nx/devkit';
+import { type DependencyMetadata } from '../declared-dependencies';
+/** Directory holding `generators.json`, which maps ids to their modules. */
+export declare const PLUGIN_ROOT: string;
+/**
+ * Which vended dependencies this workspace's generators are responsible for.
+ *
+ * Only these are synced, so a package the user added themselves keeps the version
+ * they chose. Ownership is derived from the generators the workspace has run and
+ * the dependencies each declares — nothing extra is recorded in the workspace.
+ */
+export interface OwnedDependencies {
+    readonly ts: ReadonlySet<string>;
+    readonly py: ReadonlySet<string>;
+}
+/**
+ * One recorded run of a generator, with the metadata it wrote.
+ *
+ * The metadata carries the values the generator's dependency conditions read, so
+ * a declaration filters down to the branch this occurrence actually took.
+ */
+export interface GeneratorOccurrence {
+    readonly id: string;
+    readonly metadata: DependencyMetadata;
+}
+/**
+ * Every recorded run of a generator in this workspace, from the metadata
+ * generators record on the projects (and components) they create.
+ *
+ * A generator appears once per project or component it created, since each may
+ * have been run with different options.
+ *
+ * `init` creates no project, so its config file stands in for it.
+ */
+export declare const generatorOccurrences: (tree: Tree) => readonly GeneratorOccurrence[];
+/** Generator ids this workspace has run. */
+export declare const generatorsRun: (tree: Tree) => ReadonlySet<string>;
+/**
+ * Union of the dependencies declared by the generators this workspace has run,
+ * narrowed per occurrence to those whose conditions its recorded metadata
+ * satisfies — a project generated with one protocol does not own another's
+ * packages.
+ *
+ * A `versionOnly` entry is owned like any other: it is declared precisely so the
+ * sync keeps its pinned version current wherever the workspace already holds it.
+ *
+ * Each generator module exports its declaration, so reading one is an import
+ * rather than a run — the generators themselves are never invoked.
+ */
+export declare const ownedDependencies: (tree: Tree) => Promise<OwnedDependencies>;

package/src/utils/version-upgrade-migration/owned-dependencies.js

@@ -0,0 +1,98 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import * as path from "node:path";
+import { getProjects } from "@nx/devkit";
+import { AWS_NX_PLUGIN_CONFIG_FILE_NAME } from "../config/utils.js";
+import { ownedDependencyEntries } from "../declared-dependencies.js";
+import { buildGeneratorInfoList } from "../generators.js";
+/** Directory holding `generators.json`, which maps ids to their modules. */ export const PLUGIN_ROOT = path.resolve(import.meta.dirname, '..', '..', '..');
+/**
+ * Every recorded run of a generator in this workspace, from the metadata
+ * generators record on the projects (and components) they create.
+ *
+ * A generator appears once per project or component it created, since each may
+ * have been run with different options.
+ *
+ * `init` creates no project, so its config file stands in for it.
+ */ export const generatorOccurrences = (tree)=>{
+    const occurrences = [];
+    if (tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
+        occurrences.push({
+            id: 'init',
+            metadata: {}
+        });
+    }
+    for (const [, project] of getProjects(tree)){
+        const metadata = project.metadata;
+        if (metadata?.generator) {
+            const { components, ...ownMetadata } = metadata;
+            occurrences.push({
+                id: metadata.generator,
+                metadata: ownMetadata
+            });
+        }
+        for (const component of metadata?.components ?? []){
+            if (component.generator) {
+                occurrences.push({
+                    id: component.generator,
+                    metadata: component
+                });
+            }
+        }
+    }
+    return occurrences;
+};
+/** Generator ids this workspace has run. */ export const generatorsRun = (tree)=>new Set(generatorOccurrences(tree).map((occurrence)=>occurrence.id));
+/**
+ * Union of the dependencies declared by the generators this workspace has run,
+ * narrowed per occurrence to those whose conditions its recorded metadata
+ * satisfies — a project generated with one protocol does not own another's
+ * packages.
+ *
+ * A `versionOnly` entry is owned like any other: it is declared precisely so the
+ * sync keeps its pinned version current wherever the workspace already holds it.
+ *
+ * Each generator module exports its declaration, so reading one is an import
+ * rather than a run — the generators themselves are never invoked.
+ */ export const ownedDependencies = async (tree)=>{
+    const occurrences = generatorOccurrences(tree);
+    const ts = new Set();
+    const py = new Set();
+    for (const info of buildGeneratorInfoList(PLUGIN_ROOT)){
+        const matching = occurrences.filter((occurrence)=>occurrence.id === info.id);
+        if (matching.length === 0) {
+            continue;
+        }
+        const declaration = await readDeclaration(info.resolvedFactoryPath);
+        if (!declaration) {
+            continue;
+        }
+        for (const { metadata } of matching){
+            for (const entry of ownedDependencyEntries(declaration.ts, metadata)){
+                ts.add(entry.name);
+            }
+            for (const entry of ownedDependencyEntries(declaration.py, metadata)){
+                py.add(entry.name);
+            }
+        }
+    }
+    return {
+        ts,
+        py
+    };
+};
+/**
+ * A generator's `DEPENDENCIES`, or undefined when it declares none.
+ * A generator that fails to load must not fail the upgrade, so its dependencies
+ * are treated as unowned and left as they are.
+ */ const readDeclaration = async (factoryPath)=>{
+    try {
+        const module = await import(`${factoryPath}.js`);
+        return module.DEPENDENCIES;
+    } catch  {
+        return undefined;
+    }
+};
+
+//# sourceMappingURL=owned-dependencies.js.map

package/src/utils/version-upgrade-migration/owned-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/version-upgrade-migration/owned-dependencies.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport * as path from 'node:path';\nimport { getProjects, type Tree } from '@nx/devkit';\nimport { AWS_NX_PLUGIN_CONFIG_FILE_NAME } from '../config/utils';\nimport {\n  type DependencyDeclaration,\n  type DependencyMetadata,\n  ownedDependencyEntries,\n} from '../declared-dependencies';\nimport { buildGeneratorInfoList } from '../generators';\n\n/** Directory holding `generators.json`, which maps ids to their modules. */\nexport const PLUGIN_ROOT = path.resolve(import.meta.dirname, '..', '..', '..');\n\n/**\n * Which vended dependencies this workspace's generators are responsible for.\n *\n * Only these are synced, so a package the user added themselves keeps the version\n * they chose. Ownership is derived from the generators the workspace has run and\n * the dependencies each declares — nothing extra is recorded in the workspace.\n */\nexport interface OwnedDependencies {\n  readonly ts: ReadonlySet<string>;\n  readonly py: ReadonlySet<string>;\n}\n\n/**\n * One recorded run of a generator, with the metadata it wrote.\n *\n * The metadata carries the values the generator's dependency conditions read, so\n * a declaration filters down to the branch this occurrence actually took.\n */\nexport interface GeneratorOccurrence {\n  readonly id: string;\n  readonly metadata: DependencyMetadata;\n}\n\n/**\n * Every recorded run of a generator in this workspace, from the metadata\n * generators record on the projects (and components) they create.\n *\n * A generator appears once per project or component it created, since each may\n * have been run with different options.\n *\n * `init` creates no project, so its config file stands in for it.\n */\nexport const generatorOccurrences = (\n  tree: Tree,\n): readonly GeneratorOccurrence[] => {\n  const occurrences: GeneratorOccurrence[] = [];\n  if (tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {\n    occurrences.push({ id: 'init', metadata: {} });\n  }\n  for (const [, project] of getProjects(tree)) {\n    const metadata = project.metadata as\n      | {\n          generator?: string;\n          components?: ({ generator?: string } & DependencyMetadata)[];\n        }\n      | undefined;\n    if (metadata?.generator) {\n      const { components, ...ownMetadata } = metadata;\n      occurrences.push({ id: metadata.generator, metadata: ownMetadata });\n    }\n    for (const component of metadata?.components ?? []) {\n      if (component.generator) {\n        occurrences.push({ id: component.generator, metadata: component });\n      }\n    }\n  }\n  return occurrences;\n};\n\n/** Generator ids this workspace has run. */\nexport const generatorsRun = (tree: Tree): ReadonlySet<string> =>\n  new Set(generatorOccurrences(tree).map((occurrence) => occurrence.id));\n\n/**\n * Union of the dependencies declared by the generators this workspace has run,\n * narrowed per occurrence to those whose conditions its recorded metadata\n * satisfies — a project generated with one protocol does not own another's\n * packages.\n *\n * A `versionOnly` entry is owned like any other: it is declared precisely so the\n * sync keeps its pinned version current wherever the workspace already holds it.\n *\n * Each generator module exports its declaration, so reading one is an import\n * rather than a run — the generators themselves are never invoked.\n */\nexport const ownedDependencies = async (\n  tree: Tree,\n): Promise<OwnedDependencies> => {\n  const occurrences = generatorOccurrences(tree);\n  const ts = new Set<string>();\n  const py = new Set<string>();\n\n  for (const info of buildGeneratorInfoList(PLUGIN_ROOT)) {\n    const matching = occurrences.filter(\n      (occurrence) => occurrence.id === info.id,\n    );\n    if (matching.length === 0) {\n      continue;\n    }\n    const declaration = await readDeclaration(info.resolvedFactoryPath);\n    if (!declaration) {\n      continue;\n    }\n    for (const { metadata } of matching) {\n      for (const entry of ownedDependencyEntries(declaration.ts, metadata)) {\n        ts.add(entry.name as string);\n      }\n      for (const entry of ownedDependencyEntries(declaration.py, metadata)) {\n        py.add(entry.name as string);\n      }\n    }\n  }\n\n  return { ts, py };\n};\n\n/**\n * A generator's `DEPENDENCIES`, or undefined when it declares none.\n * A generator that fails to load must not fail the upgrade, so its dependencies\n * are treated as unowned and left as they are.\n */\nconst readDeclaration = async (\n  factoryPath: string,\n): Promise<DependencyDeclaration | undefined> => {\n  try {\n    const module = await import(`${factoryPath}.js`);\n    return module.DEPENDENCIES;\n  } catch {\n    return undefined;\n  }\n};\n"],"names":["path","getProjects","AWS_NX_PLUGIN_CONFIG_FILE_NAME","ownedDependencyEntries","buildGeneratorInfoList","PLUGIN_ROOT","resolve","dirname","generatorOccurrences","tree","occurrences","exists","push","id","metadata","project","generator","components","ownMetadata","component","generatorsRun","Set","map","occurrence","ownedDependencies","ts","py","info","matching","filter","length","declaration","readDeclaration","resolvedFactoryPath","entry","add","name","factoryPath","module","DEPENDENCIES","undefined"],"mappings":"AAAA;;;CAGC,GACD,YAAYA,UAAU,YAAY;AAClC,SAASC,WAAW,QAAmB,aAAa;AACpD,SAASC,8BAA8B,QAAQ,qBAAkB;AACjE,SAGEC,sBAAsB,QACjB,8BAA2B;AAClC,SAASC,sBAAsB,QAAQ,mBAAgB;AAEvD,0EAA0E,GAC1E,OAAO,MAAMC,cAAcL,KAAKM,OAAO,CAAC,YAAYC,OAAO,EAAE,MAAM,MAAM,MAAM;AAyB/E;;;;;;;;CAQC,GACD,OAAO,MAAMC,uBAAuB,CAClCC;IAEA,MAAMC,cAAqC,EAAE;IAC7C,IAAID,KAAKE,MAAM,CAACT,iCAAiC;QAC/CQ,YAAYE,IAAI,CAAC;YAAEC,IAAI;YAAQC,UAAU,CAAC;QAAE;IAC9C;IACA,KAAK,MAAM,GAAGC,QAAQ,IAAId,YAAYQ,MAAO;QAC3C,MAAMK,WAAWC,QAAQD,QAAQ;QAMjC,IAAIA,UAAUE,WAAW;YACvB,MAAM,EAAEC,UAAU,EAAE,GAAGC,aAAa,GAAGJ;YACvCJ,YAAYE,IAAI,CAAC;gBAAEC,IAAIC,SAASE,SAAS;gBAAEF,UAAUI;YAAY;QACnE;QACA,KAAK,MAAMC,aAAaL,UAAUG,cAAc,EAAE,CAAE;YAClD,IAAIE,UAAUH,SAAS,EAAE;gBACvBN,YAAYE,IAAI,CAAC;oBAAEC,IAAIM,UAAUH,SAAS;oBAAEF,UAAUK;gBAAU;YAClE;QACF;IACF;IACA,OAAOT;AACT,EAAE;AAEF,0CAA0C,GAC1C,OAAO,MAAMU,gBAAgB,CAACX,OAC5B,IAAIY,IAAIb,qBAAqBC,MAAMa,GAAG,CAAC,CAACC,aAAeA,WAAWV,EAAE,GAAG;AAEzE;;;;;;;;;;;CAWC,GACD,OAAO,MAAMW,oBAAoB,OAC/Bf;IAEA,MAAMC,cAAcF,qBAAqBC;IACzC,MAAMgB,KAAK,IAAIJ;IACf,MAAMK,KAAK,IAAIL;IAEf,KAAK,MAAMM,QAAQvB,uBAAuBC,aAAc;QACtD,MAAMuB,WAAWlB,YAAYmB,MAAM,CACjC,CAACN,aAAeA,WAAWV,EAAE,KAAKc,KAAKd,EAAE;QAE3C,IAAIe,SAASE,MAAM,KAAK,GAAG;YACzB;QACF;QACA,MAAMC,cAAc,MAAMC,gBAAgBL,KAAKM,mBAAmB;QAClE,IAAI,CAACF,aAAa;YAChB;QACF;QACA,KAAK,MAAM,EAAEjB,QAAQ,EAAE,IAAIc,SAAU;YACnC,KAAK,MAAMM,SAAS/B,uBAAuB4B,YAAYN,EAAE,EAAEX,UAAW;gBACpEW,GAAGU,GAAG,CAACD,MAAME,IAAI;YACnB;YACA,KAAK,MAAMF,SAAS/B,uBAAuB4B,YAAYL,EAAE,EAAEZ,UAAW;gBACpEY,GAAGS,GAAG,CAACD,MAAME,IAAI;YACnB;QACF;IACF;IAEA,OAAO;QAAEX;QAAIC;IAAG;AAClB,EAAE;AAEF;;;;CAIC,GACD,MAAMM,kBAAkB,OACtBK;IAEA,IAAI;QACF,MAAMC,SAAS,MAAM,MAAM,CAAC,GAAGD,YAAY,GAAG,CAAC;QAC/C,OAAOC,OAAOC,YAAY;IAC5B,EAAE,OAAM;QACN,OAAOC;IACT;AACF"}

package/src/utils/version-upgrade-migration/register.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Tree } from '@nx/devkit';
+/**
+ * Register the nx bump a version update needs, in `migrations.json`. Call only
+ * when an nx package actually moved.
+ *
+ * The version sync migration itself is a committed `everyMigration` entry, so
+ * only the nx packages need registering per update: they go through
+ * `packageJsonUpdates` rather than a migration (see `nx-package-updates.ts`).
+ *
+ * Idempotent: re-running before a release claims the entry refreshes it in place.
+ *
+ * @returns paths written, for the update report
+ */
+export declare const registerNxPackageUpdates: (tree: Tree) => string[];

package/src/utils/version-upgrade-migration/register.js

@@ -0,0 +1,33 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { updateJson } from "@nx/devkit";
+import { LATEST_MIGRATIONS_DIR } from "../migration-versions.js";
+import { nxPackageJsonUpdates } from "./nx-package-updates.js";
+const MIGRATIONS_JSON_PATH = 'packages/nx-plugin/migrations.json';
+/**
+ * Register the nx bump a version update needs, in `migrations.json`. Call only
+ * when an nx package actually moved.
+ *
+ * The version sync migration itself is a committed `everyMigration` entry, so
+ * only the nx packages need registering per update: they go through
+ * `packageJsonUpdates` rather than a migration (see `nx-package-updates.ts`).
+ *
+ * Idempotent: re-running before a release claims the entry refreshes it in place.
+ *
+ * @returns paths written, for the update report
+ */ export const registerNxPackageUpdates = (tree)=>{
+    updateJson(tree, MIGRATIONS_JSON_PATH, (migrations)=>({
+            ...migrations,
+            // Recorded under `latest` until stamping resolves the version it ships with.
+            packageJsonUpdates: {
+                ...migrations.packageJsonUpdates,
+                ...nxPackageJsonUpdates(LATEST_MIGRATIONS_DIR, LATEST_MIGRATIONS_DIR)
+            }
+        }));
+    return [
+        MIGRATIONS_JSON_PATH
+    ];
+};
+
+//# sourceMappingURL=register.js.map

package/src/utils/version-upgrade-migration/register.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/version-upgrade-migration/register.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { type Tree, updateJson } from '@nx/devkit';\nimport {\n  LATEST_MIGRATIONS_DIR,\n  type MigrationsJson,\n} from '../migration-versions';\nimport { nxPackageJsonUpdates } from './nx-package-updates';\n\nconst MIGRATIONS_JSON_PATH = 'packages/nx-plugin/migrations.json';\n\n/**\n * Register the nx bump a version update needs, in `migrations.json`. Call only\n * when an nx package actually moved.\n *\n * The version sync migration itself is a committed `everyMigration` entry, so\n * only the nx packages need registering per update: they go through\n * `packageJsonUpdates` rather than a migration (see `nx-package-updates.ts`).\n *\n * Idempotent: re-running before a release claims the entry refreshes it in place.\n *\n * @returns paths written, for the update report\n */\nexport const registerNxPackageUpdates = (tree: Tree): string[] => {\n  updateJson<MigrationsJson>(tree, MIGRATIONS_JSON_PATH, (migrations) => ({\n    ...migrations,\n    // Recorded under `latest` until stamping resolves the version it ships with.\n    packageJsonUpdates: {\n      ...migrations.packageJsonUpdates,\n      ...nxPackageJsonUpdates(LATEST_MIGRATIONS_DIR, LATEST_MIGRATIONS_DIR),\n    },\n  }));\n\n  return [MIGRATIONS_JSON_PATH];\n};\n"],"names":["updateJson","LATEST_MIGRATIONS_DIR","nxPackageJsonUpdates","MIGRATIONS_JSON_PATH","registerNxPackageUpdates","tree","migrations","packageJsonUpdates"],"mappings":"AAAA;;;CAGC,GACD,SAAoBA,UAAU,QAAQ,aAAa;AACnD,SACEC,qBAAqB,QAEhB,2BAAwB;AAC/B,SAASC,oBAAoB,QAAQ,0BAAuB;AAE5D,MAAMC,uBAAuB;AAE7B;;;;;;;;;;;CAWC,GACD,OAAO,MAAMC,2BAA2B,CAACC;IACvCL,WAA2BK,MAAMF,sBAAsB,CAACG,aAAgB,CAAA;YACtE,GAAGA,UAAU;YACb,6EAA6E;YAC7EC,oBAAoB;gBAClB,GAAGD,WAAWC,kBAAkB;gBAChC,GAAGL,qBAAqBD,uBAAuBA,sBAAsB;YACvE;QACF,CAAA;IAEA,OAAO;QAACE;KAAqB;AAC/B,EAAE"}

package/src/utils/version-upgrade-migration/sync-metrics-version.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Tree } from '@nx/devkit';
+/**
+ * Sync the plugin version the metrics files report, so usage is attributed to
+ * the release the workspace actually runs. The metric id and tags are owned by
+ * the generators and left alone.
+ *
+ * @returns the metrics files that changed
+ */
+export declare const syncMetricsVersion: (tree: Tree) => Promise<string[]>;