@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

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

@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
+import { getNpmScopePrefix, toScopeAlias } from "./npm-scope.js";
+import { getPackageManagerDisplayCommands } from "./pkg-manager.js";
+import { PACKAGES_DIR, SHARED_SCRIPTS_DIR, SHARED_SCRIPTS_NAME } from "./shared-constructs-constants.js";
+import { ensureSharedScriptsProject } from "./shared-scripts.js";
+import { withVersions } from "./versions.js";
+/**
+ * Ensures the shared scripts package exists and adds infra-deploy/infra-destroy
+ * scripts to packages/common/scripts/src/infra/. Called by ts#infra when
+ * stageConfig is enabled.
+ */ export async function sharedInfraScriptsGenerator(tree) {
+    const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);
+    await ensureSharedScriptsProject(tree);
+    const npmScopePrefix = getNpmScopePrefix(tree);
+    const scopeAlias = toScopeAlias(npmScopePrefix);
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SCRIPTS_DIR, 'src', 'infra'), joinPathFragments(scriptsDir, 'src', 'infra'), {
+        scopeAlias,
+        ...esmVars(tree)
+    }, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    // Used by deploy-time scripts for assumeRole
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        '@aws-sdk/client-sts',
+        '@aws-sdk/credential-providers'
+    ]));
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'), scriptsDir, {
+        fullyQualifiedName: `${npmScopePrefix}${SHARED_SCRIPTS_NAME}`,
+        name: SHARED_SCRIPTS_NAME,
+        pkgMgrCmd: getPackageManagerDisplayCommands().exec
+    }, {
+        overwriteStrategy: OverwriteStrategy.Overwrite
+    });
+    await formatFilesInSubtree(tree);
+}
+
+//# sourceMappingURL=shared-infra-scripts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n  SHARED_SCRIPTS_NAME,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { withVersions } from './versions';\n\n/**\n * Ensures the shared scripts package exists and adds infra-deploy/infra-destroy\n * scripts to packages/common/scripts/src/infra/. Called by ts#infra when\n * stageConfig is enabled.\n */\nexport async function sharedInfraScriptsGenerator(tree: Tree): Promise<void> {\n  const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);\n\n  await ensureSharedScriptsProject(tree);\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      SHARED_SCRIPTS_DIR,\n      'src',\n      'infra',\n    ),\n    joinPathFragments(scriptsDir, 'src', 'infra'),\n    { scopeAlias, ...esmVars(tree) },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Used by deploy-time scripts for assumeRole\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['@aws-sdk/client-sts', '@aws-sdk/credential-providers']),\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n    scriptsDir,\n    {\n      fullyQualifiedName: `${npmScopePrefix}${SHARED_SCRIPTS_NAME}`,\n      name: SHARED_SCRIPTS_NAME,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    },\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","formatFilesInSubtree","esmVars","getNpmScopePrefix","toScopeAlias","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_SCRIPTS_DIR","SHARED_SCRIPTS_NAME","ensureSharedScriptsProject","withVersions","sharedInfraScriptsGenerator","tree","scriptsDir","npmScopePrefix","scopeAlias","dirname","overwriteStrategy","KeepExisting","fullyQualifiedName","name","pkgMgrCmd","exec","Overwrite"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,gCAAgC,QAAQ,mBAAgB;AACjE,SACEC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,QACd,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;;CAIC,GACD,OAAO,eAAeC,4BAA4BC,IAAU;IAC1D,MAAMC,aAAad,kBAAkBO,cAAcC;IAEnD,MAAME,2BAA2BG;IAEjC,MAAME,iBAAiBX,kBAAkBS;IACzC,MAAMG,aAAaX,aAAaU;IAEhChB,cACEc,MACAb,kBACE,YAAYiB,OAAO,EACnB,SACAT,oBACA,OACA,UAEFR,kBAAkBc,YAAY,OAAO,UACrC;QAAEE;QAAY,GAAGb,QAAQU,KAAK;IAAC,GAC/B;QAAEK,mBAAmBjB,kBAAkBkB,YAAY;IAAC;IAGtD,6CAA6C;IAC7CrB,6BACEe,MACA,CAAC,GACDF,aAAa;QAAC;QAAuB;KAAgC;IAGvEZ,cACEc,MACAb,kBAAkB,YAAYiB,OAAO,EAAE,SAAS,UAAU,WAC1DH,YACA;QACEM,oBAAoB,GAAGL,iBAAiBN,qBAAqB;QAC7DY,MAAMZ;QACNa,WAAWhB,mCAAmCiB,IAAI;IACpD,GACA;QAAEL,mBAAmBjB,kBAAkBuB,SAAS;IAAC;IAGnD,MAAMtB,qBAAqBW;AAC7B"}

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

@@ -0,0 +1,16 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Tree } from '@nx/devkit';
+/**
+ * Ensures the shared scripts package exists and adds RDB local-dev scripts
+ * to packages/common/scripts/src/rdb/. Used by ts#rdb.
+ *
+ * Engine-agnostic scripts (pull-image, start-container) are always vended.
+ * Only the wait-for-db script for the requested engine is vended so that
+ * 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 declare function sharedRdbScriptsGenerator(tree: Tree, engine: 'postgres' | 'mysql'): Promise<void>;

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

@@ -0,0 +1,32 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { PACKAGES_DIR, SHARED_SCRIPTS_DIR } from "./shared-constructs-constants.js";
+import { ensureSharedScriptsProject } from "./shared-scripts.js";
+import { withVersions } from "./versions.js";
+/**
+ * Ensures the shared scripts package exists and adds RDB local-dev scripts
+ * to packages/common/scripts/src/rdb/. Used by ts#rdb.
+ *
+ * Engine-agnostic scripts (pull-image, start-container) are always vended.
+ * Only the wait-for-db script for the requested engine is vended so that
+ * 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) {
+    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');
+    generateFiles(tree, joinPathFragments(rdbScriptsDir, 'shared'), targetDir, {}, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    generateFiles(tree, joinPathFragments(rdbScriptsDir, engine), targetDir, {}, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'tsx'
+    ]));
+}
+
+//# sourceMappingURL=shared-rdb-scripts.js.map

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

@@ -0,0 +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  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { 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  addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","PACKAGES_DIR","SHARED_SCRIPTS_DIR","ensureSharedScriptsProject","withVersions","sharedRdbScriptsGenerator","tree","engine","rdbScriptsDir","dirname","targetDir","overwriteStrategy","KeepExisting"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SACEC,YAAY,EACZC,kBAAkB,QACb,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;;;;;;;CASC,GACD,OAAO,eAAeC,0BACpBC,IAAU,EACVC,MAA4B;IAE5B,MAAMJ,2BAA2BG;IAEjC,MAAME,gBAAgBT,kBACpB,YAAYU,OAAO,EACnB,SACAP,oBACA,OACA;IAEF,MAAMQ,YAAYX,kBAChBE,cACAC,oBACA,OACA;IAGFJ,cACEQ,MACAP,kBAAkBS,eAAe,WACjCE,WACA,CAAC,GACD;QAAEC,mBAAmBX,kBAAkBY,YAAY;IAAC;IAEtDd,cACEQ,MACAP,kBAAkBS,eAAeD,SACjCG,WACA,CAAC,GACD;QAAEC,mBAAmBX,kBAAkBY,YAAY;IAAC;IAGtDf,6BAA6BS,MAAM,CAAC,GAAGF,aAAa;QAAC;KAAM;AAC7D"}

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

@@ -2,11 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 /**
  * Lazily creates the shared scripts package at packages/common/scripts/.
- * Contains infra-deploy and infra-destroy scripts that resolve
- * credentials from infra-config and call CDK.
- * Invoked via `tsx packages/common/scripts/src/infra-deploy.ts` from NX targets.
  */
-export declare function sharedScriptsGenerator(tree: Tree): Promise<void>;
+export declare function ensureSharedScriptsProject(tree: Tree): Promise<void>;

package/src/utils/shared-scripts.js

@@ -1,48 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedScriptsGenerator = sharedScriptsGenerator;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const npm_scope_1 = require("./npm-scope");
-const generator_1 = tslib_1.__importDefault(require("../ts/lib/generator"));
-const versions_1 = require("./versions");
-const format_1 = require("./format");
-const pkg_manager_1 = require("./pkg-manager");
-const shared_constructs_constants_1 = require("./shared-constructs-constants");
+ */ import { joinPathFragments } from "@nx/devkit";
+import tsProjectGenerator from "../ts/lib/generator.js";
+import { PACKAGES_DIR, SHARED_SCRIPTS_DIR, SHARED_SCRIPTS_NAME } from "./shared-constructs-constants.js";
 /**
  * Lazily creates the shared scripts package at packages/common/scripts/.
- * Contains infra-deploy and infra-destroy scripts that resolve
- * credentials from infra-config and call CDK.
- * Invoked via `tsx packages/common/scripts/src/infra-deploy.ts` from NX targets.
- */
-async function sharedScriptsGenerator(tree) {
-    const scriptsDir = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SCRIPTS_DIR);
-    // Don't recreate if it already exists
-    if (tree.exists((0, devkit_1.joinPathFragments)(scriptsDir, 'project.json'))) {
+ */ export async function ensureSharedScriptsProject(tree) {
+    const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);
+    if (tree.exists(joinPathFragments(scriptsDir, 'project.json'))) {
         return;
     }
-    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
-    await (0, generator_1.default)(tree, {
-        name: shared_constructs_constants_1.SHARED_SCRIPTS_NAME,
-        directory: shared_constructs_constants_1.PACKAGES_DIR,
-        subDirectory: shared_constructs_constants_1.SHARED_SCRIPTS_DIR,
+    await tsProjectGenerator(tree, {
+        name: SHARED_SCRIPTS_NAME,
+        directory: PACKAGES_DIR,
+        subDirectory: SHARED_SCRIPTS_DIR
     });
-    // Replace default src/ with our templates
-    tree.delete((0, devkit_1.joinPathFragments)(scriptsDir, 'src'));
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SCRIPTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(scriptsDir, 'src'), { scopeAlias }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-    // Add AWS SDK deps as dev dependencies (used by deploy-time scripts for assumeRole)
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['@aws-sdk/client-sts', '@aws-sdk/credential-providers']));
-    // Generate README
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), scriptsDir, {
-        fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_SCRIPTS_NAME}`,
-        name: shared_constructs_constants_1.SHARED_SCRIPTS_NAME,
-        pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
-    await (0, format_1.formatFilesInSubtree)(tree);
+    tree.delete(joinPathFragments(scriptsDir, 'src'));
 }
+
 //# sourceMappingURL=shared-scripts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared-scripts.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-scripts.ts"],"names":[],"mappings":";;AA4BA,wDAgDC;;AA5ED;;;GAGG;AACH,uCAMoB;AACpB,2CAA8D;AAC9D,4EAAqD;AACrD,yCAA0C;AAC1C,qCAAgD;AAChD,+CAAiE;AACjE,+EAIuC;AAEvC;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB,CAAC,IAAU;IACrD,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,0CAAY,EAAE,gDAAkB,CAAC,CAAC;IAEvE,sCAAsC;IACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iDAAmB;QACzB,SAAS,EAAE,0CAAY;QACvB,YAAY,EAAE,gDAAkB;KACjC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAClD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,gDAAkB,EAAE,KAAK,CAAC,EAChE,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,EACpC,EAAE,UAAU,EAAE,EACd,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,oFAAoF;IACpF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC,CACvE,CAAC;IAEF,kBAAkB;IAClB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,UAAU,EACV;QACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,iDAAmB,EAAE;QAC7D,IAAI,EAAE,iDAAmB;QACzB,SAAS,EAAE,IAAA,8CAAgC,GAAE,CAAC,IAAI;KACnD,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS,EAAE,CACnD,CAAC;IAEF,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, type Tree } from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n  SHARED_SCRIPTS_NAME,\n} from './shared-constructs-constants';\n\n/**\n * Lazily creates the shared scripts package at packages/common/scripts/.\n */\nexport async function ensureSharedScriptsProject(tree: Tree): Promise<void> {\n  const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);\n  if (tree.exists(joinPathFragments(scriptsDir, 'project.json'))) {\n    return;\n  }\n  await tsProjectGenerator(tree, {\n    name: SHARED_SCRIPTS_NAME,\n    directory: PACKAGES_DIR,\n    subDirectory: SHARED_SCRIPTS_DIR,\n  });\n  tree.delete(joinPathFragments(scriptsDir, 'src'));\n}\n"],"names":["joinPathFragments","tsProjectGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","SHARED_SCRIPTS_NAME","ensureSharedScriptsProject","tree","scriptsDir","exists","name","directory","subDirectory","delete"],"mappings":"AAAA;;;CAGC,GACD,SAASA,iBAAiB,QAAmB,aAAa;AAC1D,OAAOC,wBAAwB,yBAAsB;AACrD,SACEC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,QACd,mCAAgC;AAEvC;;CAEC,GACD,OAAO,eAAeC,2BAA2BC,IAAU;IACzD,MAAMC,aAAaP,kBAAkBE,cAAcC;IACnD,IAAIG,KAAKE,MAAM,CAACR,kBAAkBO,YAAY,kBAAkB;QAC9D;IACF;IACA,MAAMN,mBAAmBK,MAAM;QAC7BG,MAAML;QACNM,WAAWR;QACXS,cAAcR;IAChB;IACAG,KAAKM,MAAM,CAACZ,kBAAkBO,YAAY;AAC5C"}

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

@@ -2,5 +2,5 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare function sharedShadcnGenerator(tree: Tree): Promise<void>;

package/src/utils/shared-shadcn.js

@@ -1,101 +1,95 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedShadcnGenerator = sharedShadcnGenerator;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("../ts/lib/generator"));
-const ts_project_utils_1 = require("../ts/lib/ts-project-utils");
-const format_1 = require("./format");
-const npm_scope_1 = require("./npm-scope");
-const ast_1 = require("./ast");
-const shared_constructs_constants_1 = require("./shared-constructs-constants");
-const versions_1 = require("./versions");
-const pnpm_workspace_1 = require("./pnpm-workspace");
+ */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
+import tsProjectGenerator from "../ts/lib/generator.js";
+import { configureTsProject } from "../ts/lib/ts-project-utils.js";
+import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
+import { getNpmScopePrefix, toScopeAlias } from "./npm-scope.js";
+import { ensurePnpmIgnoresWorkspaceRootCheck } from "./pnpm-workspace.js";
+import { PACKAGES_DIR, SHARED_SHADCN_DIR, SHARED_SHADCN_NAME } from "./shared-constructs-constants.js";
+import { withVersions } from "./versions.js";
 const SHADCN_DEPS = [
     'class-variance-authority',
     'clsx',
     'tailwind-merge',
     'lucide-react',
     'tw-animate-css',
-    'radix-ui',
+    'radix-ui'
 ];
-const addSharedShadcnEslintRules = async (tree, eslintConfigPath) => {
-    if (!tree.exists(eslintConfigPath)) {
-        return;
-    }
-    // shadcn generates aliased imports from components.json, which conflict with our
-    // relative-import lint rule. This rule is therefore disabled for common-shadcn.
-    // The `not contains` guard makes this idempotent.
-    await (0, ast_1.applyGritQL)(tree, eslintConfigPath, "`export default [$items]` where { $items <: not contains `@nx/enforce-module-boundaries`, $items += `{ files: ['**/*.{ts,tsx,js,jsx}'], rules: { '@nx/enforce-module-boundaries': 'off' } }` }");
-};
-async function sharedShadcnGenerator(tree) {
-    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
-    const sharedShadcnAlias = `${scopeAlias}${shared_constructs_constants_1.SHARED_SHADCN_NAME}`;
-    const fullyQualifiedName = `${npmScopePrefix}${shared_constructs_constants_1.SHARED_SHADCN_NAME}`;
-    const libraryRoot = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR);
-    const shadcnSrcRoot = (0, devkit_1.joinPathFragments)(libraryRoot, 'src');
-    const eslintConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'eslint.config.mjs');
-    (0, pnpm_workspace_1.ensurePnpmIgnoresWorkspaceRootCheck)(tree);
-    if (!tree.exists((0, devkit_1.joinPathFragments)(libraryRoot, 'project.json'))) {
-        await (0, generator_1.default)(tree, {
-            name: shared_constructs_constants_1.SHARED_SHADCN_NAME,
-            directory: shared_constructs_constants_1.PACKAGES_DIR,
-            subDirectory: shared_constructs_constants_1.SHARED_SHADCN_DIR,
+export async function sharedShadcnGenerator(tree) {
+    const npmScopePrefix = getNpmScopePrefix(tree);
+    const scopeAlias = toScopeAlias(npmScopePrefix);
+    const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;
+    const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;
+    const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);
+    const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');
+    ensurePnpmIgnoresWorkspaceRootCheck(tree);
+    if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {
+        await tsProjectGenerator(tree, {
+            name: SHARED_SHADCN_NAME,
+            directory: PACKAGES_DIR,
+            subDirectory: SHARED_SHADCN_DIR
         });
         tree.delete(shadcnSrcRoot);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SHADCN_DIR, 'src'), shadcnSrcRoot, {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'), shadcnSrcRoot, {
             scopeAlias,
+            ...esmVars(tree)
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            overwriteStrategy: OverwriteStrategy.KeepExisting
         });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SHADCN_DIR, 'readme'), libraryRoot, {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'readme'), libraryRoot, {
             fullyQualifiedName,
-            scopeAlias,
+            scopeAlias
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+            overwriteStrategy: OverwriteStrategy.Overwrite
         });
-        await (0, ts_project_utils_1.configureTsProject)(tree, {
+        await configureTsProject(tree, {
             dir: libraryRoot,
-            fullyQualifiedName,
+            fullyQualifiedName
         });
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(libraryRoot, 'tsconfig.lib.json'), (json) => ({
+        updateJson(tree, joinPathFragments(libraryRoot, 'tsconfig.lib.json'), (json)=>({
+                ...json,
+                compilerOptions: {
+                    ...json.compilerOptions,
+                    jsx: 'react-jsx',
+                    module: 'preserve',
+                    moduleResolution: 'bundler',
+                    lib: Array.from(new Set([
+                        ...json.compilerOptions?.lib ?? [],
+                        'DOM'
+                    ]))
+                },
+                include: Array.from(new Set([
+                    ...json.include ?? [],
+                    'src/**/*.tsx'
+                ]))
+            }));
+        addDependenciesToPackageJson(tree, withVersions([
+            ...SHADCN_DEPS
+        ]), {});
+    }
+    updateJson(tree, 'tsconfig.base.json', (json)=>({
             ...json,
             compilerOptions: {
                 ...json.compilerOptions,
-                jsx: 'react-jsx',
-                module: 'preserve',
-                moduleResolution: 'bundler',
-                lib: Array.from(new Set([...(json.compilerOptions?.lib ?? []), 'DOM'])),
-            },
-            include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),
+                paths: {
+                    ...json.compilerOptions?.paths ?? {},
+                    [`${sharedShadcnAlias}/*`]: [
+                        `./${joinPathFragments(libraryRoot, 'src', '*')}`
+                    ]
+                }
+            }
         }));
-        await addSharedShadcnEslintRules(tree, eslintConfigPath);
-        (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([...SHADCN_DEPS]), {});
-    }
-    (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => ({
-        ...json,
-        compilerOptions: {
-            ...json.compilerOptions,
-            paths: {
-                ...(json.compilerOptions?.paths ?? {}),
-                [`${sharedShadcnAlias}/*`]: [
-                    `./${(0, devkit_1.joinPathFragments)(libraryRoot, 'src', '*')}`,
-                ],
-            },
-        },
-    }));
     if (!tree.exists('components.json')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'shadcn'), '.', {
-            sharedShadcnAlias,
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'shadcn'), '.', {
+            sharedShadcnAlias
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            overwriteStrategy: OverwriteStrategy.KeepExisting
         });
     }
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 }
+
 //# sourceMappingURL=shared-shadcn.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":"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"}
+{"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  addDependenciesToPackageJson,\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 { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { ensurePnpmIgnoresWorkspaceRootCheck } from './pnpm-workspace';\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  '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 = toScopeAlias(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  ensurePnpmIgnoresWorkspaceRootCheck(tree);\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(tree, withVersions([...SHADCN_DEPS]), {});\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  if (!tree.exists('components.json')) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      '.',\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","formatFilesInSubtree","esmVars","getNpmScopePrefix","toScopeAlias","ensurePnpmIgnoresWorkspaceRootCheck","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,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,mCAAmC,QAAQ,sBAAmB;AACvE,SACEC,YAAY,EACZC,iBAAiB,EACjBC,kBAAkB,QACb,mCAAgC;AACvC,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,MAAMC,cAAc;IAClB;IACA;IACA;IACA;IACA;IACA;CACD;AAED,OAAO,eAAeC,sBAAsBC,IAAU;IACpD,MAAMC,iBAAiBV,kBAAkBS;IACzC,MAAME,aAAaV,aAAaS;IAChC,MAAME,oBAAoB,GAAGD,aAAaN,oBAAoB;IAC9D,MAAMQ,qBAAqB,GAAGH,iBAAiBL,oBAAoB;IACnE,MAAMS,cAAcrB,kBAAkBU,cAAcC;IACpD,MAAMW,gBAAgBtB,kBAAkBqB,aAAa;IACrDZ,oCAAoCO;IAEpC,IAAI,CAACA,KAAKO,MAAM,CAACvB,kBAAkBqB,aAAa,kBAAkB;QAChE,MAAMlB,mBAAmBa,MAAM;YAC7BQ,MAAMZ;YACNa,WAAWf;YACXgB,cAAcf;QAChB;QAEAK,KAAKW,MAAM,CAACL;QAEZvB,cACEiB,MACAhB,kBAAkB,YAAY4B,OAAO,EAAE,SAASjB,mBAAmB,QACnEW,eACA;YACEJ;YACA,GAAGZ,QAAQU,KAAK;QAClB,GACA;YACEa,mBAAmB5B,kBAAkB6B,YAAY;QACnD;QAGF/B,cACEiB,MACAhB,kBACE,YAAY4B,OAAO,EACnB,SACAjB,mBACA,WAEFU,aACA;YACED;YACAF;QACF,GACA;YACEW,mBAAmB5B,kBAAkB8B,SAAS;QAChD;QAGF,MAAM3B,mBAAmBY,MAAM;YAC7BgB,KAAKX;YACLD;QACF;QAEAlB,WACEc,MACAhB,kBAAkBqB,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;QAGF5C,6BAA6BkB,MAAMH,aAAa;eAAIC;SAAY,GAAG,CAAC;IACtE;IAEAZ,WAAWc,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,EAAEnB,kBAAkBqB,aAAa,OAAO,MAAM;qBAClD;gBACH;YACF;QACF,CAAA;IAEA,IAAI,CAACL,KAAKO,MAAM,CAAC,oBAAoB;QACnCxB,cACEiB,MACAhB,kBAAkB,YAAY4B,OAAO,EAAE,SAAS,WAChD,KACA;YACET;QACF,GACA;YACEU,mBAAmB5B,kBAAkB6B,YAAY;QACnD;IAEJ;IAEA,MAAMzB,qBAAqBW;AAC7B"}

package/src/utils/test.d.ts

@@ -1,4 +1,18 @@
-import { Tree } from '@nx/devkit';
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Tree } from '@nx/devkit';
+/**
+ * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`
+ * reports `true`, matching the workspaces our preset generates. Rather than
+ * mocking nx internals, we set up the real markers it checks for:
+ * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)
+ * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`
+ * - `composite: true` in `tsconfig.base.json`
+ * - a root `package.json` with `type: module`, matching the ESM default the
+ *   preset establishes
+ */
 export declare const createTreeUsingTsSolutionSetup: () => Tree;
 /**
  * Snapshot all files within a directory in the given tree

package/src/utils/test.js

@@ -1,35 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.snapshotTreeDir = exports.createTreeUsingTsSolutionSetup = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const vitest_1 = require("vitest");
-const testing_1 = require("@nx/devkit/testing");
-const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = tslib_1.__importDefault(require("@nx/js/src/utils/typescript/ts-solution-setup"));
-const createTreeUsingTsSolutionSetup = () => {
-    vitest_1.vi.spyOn(ts_solution_setup_1.default, 'isUsingTsSolutionSetup').mockImplementation(() => true);
-    const tree = (0, testing_1.createTreeWithEmptyWorkspace)();
+ */ import { joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
+import { createTreeWithEmptyWorkspace } from "@nx/devkit/testing";
+import { expect } from "vitest";
+import { DEFAULT_BIOME_CONFIG } from "./format.js";
+/**
+ * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`
+ * reports `true`, matching the workspaces our preset generates. Rather than
+ * mocking nx internals, we set up the real markers it checks for:
+ * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)
+ * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`
+ * - `composite: true` in `tsconfig.base.json`
+ * - a root `package.json` with `type: module`, matching the ESM default the
+ *   preset establishes
+ */ export const createTreeUsingTsSolutionSetup = ()=>{
+    const tree = createTreeWithEmptyWorkspace();
     tree.write('pnpm-workspace.yaml', `packages:\n  - packages/*`);
-    tree.write('tsconfig.json', '{}');
+    updateJson(tree, 'package.json', (json)=>({
+            ...json,
+            type: 'module'
+        }));
+    const baseTsConfig = readJson(tree, 'tsconfig.base.json');
+    writeJson(tree, 'tsconfig.base.json', {
+        ...baseTsConfig,
+        compilerOptions: {
+            ...baseTsConfig.compilerOptions,
+            composite: true
+        }
+    });
+    writeJson(tree, 'tsconfig.json', {
+        extends: './tsconfig.base.json',
+        files: [],
+        include: [],
+        references: []
+    });
+    // The preset always writes biome.json at the workspace root, so mirror that
+    // here for realistic lint-target configuration.
+    tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));
     return tree;
 };
-exports.createTreeUsingTsSolutionSetup = createTreeUsingTsSolutionSetup;
 /**
  * Snapshot all files within a directory in the given tree
- */
-const snapshotTreeDir = (tree, dir) => {
+ */ export const snapshotTreeDir = (tree, dir)=>{
     if (tree.isFile(dir)) {
-        (0, vitest_1.expect)(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);
-    }
-    else {
-        tree
-            .children(dir)
-            .forEach((subDir) => (0, exports.snapshotTreeDir)(tree, (0, devkit_1.joinPathFragments)(dir, subDir)));
+        expect(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);
+    } else {
+        tree.children(dir).forEach((subDir)=>snapshotTreeDir(tree, joinPathFragments(dir, subDir)));
     }
 };
-exports.snapshotTreeDir = snapshotTreeDir;
+
 //# sourceMappingURL=test.js.map

package/src/utils/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/test.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,mCAAoC;AACpC,gDAAkE;AAClE,uCAAqD;AACrD,8GAA0E;AAEnE,MAAM,8BAA8B,GAAG,GAAS,EAAE;IACvD,WAAE,CAAC,KAAK,CAAC,2BAAa,EAAE,wBAAwB,CAAC,CAAC,kBAAkB,CAClE,GAAG,EAAE,CAAC,IAAI,CACX,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,sCAA4B,GAAE,CAAC;IAE5C,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAXW,QAAA,8BAA8B,kCAWzC;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,IAAU,EAAE,GAAW,EAAE,EAAE;IACzD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,IAAI;aACD,QAAQ,CAAC,GAAG,CAAC;aACb,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClB,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CACtD,CAAC;IACN,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/test.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';\nimport { expect } from 'vitest';\nimport { DEFAULT_BIOME_CONFIG } from './format';\n\n/**\n * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`\n * reports `true`, matching the workspaces our preset generates. Rather than\n * mocking nx internals, we set up the real markers it checks for:\n * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)\n * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`\n * - `composite: true` in `tsconfig.base.json`\n * - a root `package.json` with `type: module`, matching the ESM default the\n *   preset establishes\n */\nexport const createTreeUsingTsSolutionSetup = (): Tree => {\n  const tree = createTreeWithEmptyWorkspace();\n\n  tree.write('pnpm-workspace.yaml', `packages:\\n  - packages/*`);\n\n  updateJson(tree, 'package.json', (json) => ({ ...json, type: 'module' }));\n\n  const baseTsConfig = readJson(tree, 'tsconfig.base.json');\n  writeJson(tree, 'tsconfig.base.json', {\n    ...baseTsConfig,\n    compilerOptions: { ...baseTsConfig.compilerOptions, composite: true },\n  });\n  writeJson(tree, 'tsconfig.json', {\n    extends: './tsconfig.base.json',\n    files: [],\n    include: [],\n    references: [],\n  });\n\n  // The preset always writes biome.json at the workspace root, so mirror that\n  // here for realistic lint-target configuration.\n  tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));\n  return tree;\n};\n\n/**\n * Snapshot all files within a directory in the given tree\n */\nexport const snapshotTreeDir = (tree: Tree, dir: string) => {\n  if (tree.isFile(dir)) {\n    expect(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);\n  } else {\n    tree\n      .children(dir)\n      .forEach((subDir) =>\n        snapshotTreeDir(tree, joinPathFragments(dir, subDir)),\n      );\n  }\n};\n"],"names":["joinPathFragments","readJson","updateJson","writeJson","createTreeWithEmptyWorkspace","expect","DEFAULT_BIOME_CONFIG","createTreeUsingTsSolutionSetup","tree","write","json","type","baseTsConfig","compilerOptions","composite","extends","files","include","references","JSON","stringify","snapshotTreeDir","dir","isFile","read","toMatchSnapshot","children","forEach","subDir"],"mappings":"AAAA;;;CAGC,GAED,SACEA,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,SAASC,4BAA4B,QAAQ,qBAAqB;AAClE,SAASC,MAAM,QAAQ,SAAS;AAChC,SAASC,oBAAoB,QAAQ,cAAW;AAEhD;;;;;;;;;CASC,GACD,OAAO,MAAMC,iCAAiC;IAC5C,MAAMC,OAAOJ;IAEbI,KAAKC,KAAK,CAAC,uBAAuB,CAAC,yBAAyB,CAAC;IAE7DP,WAAWM,MAAM,gBAAgB,CAACE,OAAU,CAAA;YAAE,GAAGA,IAAI;YAAEC,MAAM;QAAS,CAAA;IAEtE,MAAMC,eAAeX,SAASO,MAAM;IACpCL,UAAUK,MAAM,sBAAsB;QACpC,GAAGI,YAAY;QACfC,iBAAiB;YAAE,GAAGD,aAAaC,eAAe;YAAEC,WAAW;QAAK;IACtE;IACAX,UAAUK,MAAM,iBAAiB;QAC/BO,SAAS;QACTC,OAAO,EAAE;QACTC,SAAS,EAAE;QACXC,YAAY,EAAE;IAChB;IAEA,4EAA4E;IAC5E,gDAAgD;IAChDV,KAAKC,KAAK,CAAC,cAAcU,KAAKC,SAAS,CAACd,sBAAsB,MAAM;IACpE,OAAOE;AACT,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMa,kBAAkB,CAACb,MAAYc;IAC1C,IAAId,KAAKe,MAAM,CAACD,MAAM;QACpBjB,OAAOG,KAAKgB,IAAI,CAACF,KAAK,UAAUG,eAAe,CAACH;IAClD,OAAO;QACLd,KACGkB,QAAQ,CAACJ,KACTK,OAAO,CAAC,CAACC,SACRP,gBAAgBb,MAAMR,kBAAkBsB,KAAKM;IAEnD;AACF,EAAE"}

package/src/utils/toml.d.ts

@@ -2,8 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
 import TOML from '@iarna/toml';
+import type { Tree } from '@nx/devkit';
 /**
  * Update a toml file
  */

package/src/utils/toml.js

@@ -1,24 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readToml = exports.updateToml = void 0;
-const tslib_1 = require("tslib");
-const toml_1 = tslib_1.__importDefault(require("@iarna/toml"));
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import TOML from "@iarna/toml";
 /**
  * Update a toml file
- */
-const updateToml = (tree, filePath, updater) => {
-    const prev = (0, exports.readToml)(tree, filePath);
-    tree.write(filePath, toml_1.default.stringify(updater(prev)));
+ */ export const updateToml = (tree, filePath, updater)=>{
+    const prev = readToml(tree, filePath);
+    tree.write(filePath, TOML.stringify(updater(prev)));
 };
-exports.updateToml = updateToml;
 /**
  * Read a toml file
- */
-const readToml = (tree, filePath) => {
+ */ export const readToml = (tree, filePath)=>{
     if (!tree.exists(filePath)) {
         throw new Error(`${filePath} does not exist`);
     }
-    return toml_1.default.parse(tree.read(filePath, 'utf-8'));
+    return TOML.parse(tree.read(filePath, 'utf-8'));
 };
-exports.readToml = readToml;
+
 //# sourceMappingURL=toml.js.map

package/src/utils/toml.js.map

@@ -1 +1 @@
-{"version":3,"file":"toml.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/toml.ts"],"names":[],"mappings":";;;;AAKA,+DAA+B;AAE/B;;GAEG;AACI,MAAM,UAAU,GAAG,CACxB,IAAU,EACV,QAAgB,EAChB,OAA6C,EAC7C,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,gBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB;AAEF;;GAEG;AACI,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAE,QAAgB,EAAgB,EAAE;IACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/toml.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport TOML from '@iarna/toml';\nimport type { Tree } from '@nx/devkit';\n\n/**\n * Update a toml file\n */\nexport const updateToml = (\n  tree: Tree,\n  filePath: string,\n  updater: (prev: TOML.JsonMap) => TOML.JsonMap,\n) => {\n  const prev = readToml(tree, filePath);\n  tree.write(filePath, TOML.stringify(updater(prev)));\n};\n\n/**\n * Read a toml file\n */\nexport const readToml = (tree: Tree, filePath: string): TOML.JsonMap => {\n  if (!tree.exists(filePath)) {\n    throw new Error(`${filePath} does not exist`);\n  }\n  return TOML.parse(tree.read(filePath, 'utf-8'));\n};\n"],"names":["TOML","updateToml","tree","filePath","updater","prev","readToml","write","stringify","exists","Error","parse","read"],"mappings":"AAAA;;;CAGC,GAED,OAAOA,UAAU,cAAc;AAG/B;;CAEC,GACD,OAAO,MAAMC,aAAa,CACxBC,MACAC,UACAC;IAEA,MAAMC,OAAOC,SAASJ,MAAMC;IAC5BD,KAAKK,KAAK,CAACJ,UAAUH,KAAKQ,SAAS,CAACJ,QAAQC;AAC9C,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMC,WAAW,CAACJ,MAAYC;IACnC,IAAI,CAACD,KAAKO,MAAM,CAACN,WAAW;QAC1B,MAAM,IAAIO,MAAM,GAAGP,SAAS,eAAe,CAAC;IAC9C;IACA,OAAOH,KAAKW,KAAK,CAACT,KAAKU,IAAI,CAACT,UAAU;AACxC,EAAE"}