@codedrifters/configulator 0.0.435 → 0.0.436

package/lib/index.mjs

@@ -4770,13 +4770,16 @@ var createAppSkill = {
     "2. **Collect metadata** \u2014 ask the user for each of the following,",
     "   one question at a time:",
     "   - **Description** \u2014 one-line summary of what the app does.",
-    "   - **CDK version** \u2014 the AWS CDK version to pin (e.g. `2.150.0`).",
-    "     If the user is unsure, suggest they match the CDK version",
-    "     already in use by sibling `AwsCdkProject` entries in the",
-    "     monorepo; otherwise pick the latest stable release.",
     "   Skip any question the user has already answered in the initial",
     "   prompt.",
     "",
+    "   Do **not** ask for a CDK version. `AwsCdkProject` renders",
+    "   `aws-cdk-lib` and `constructs` as `catalog:`, so the monorepo's",
+    "   pnpm catalog pins both for every app. Passing a `cdkVersion` or",
+    "   `constructsVersion` that disagrees with the catalog throws at",
+    "   synth time \u2014 a version bump is a catalog edit, not a per-app",
+    "   option.",
+    "",
     "3. **Determine the target outdir.** The sub-project lives at:",
     "",
     "   ```",
@@ -4808,13 +4811,13 @@ var createAppSkill = {
     "     parent: monorepo,",
     "     name: '@codedrifters/my-stack',",
     "     description: '<one-line description>',",
-    "     cdkVersion: '<cdk-version>',",
     "   });",
     "   ```",
     "",
-    "   Substitute the user's scope, name, description, and CDK",
-    "   version. Do not hard-code `outdir` \u2014 the default places the",
-    "   sub-project at `apps/<scope>/<name>`.",
+    "   Substitute the user's scope, name, and description. Do not",
+    "   hard-code `outdir` \u2014 the default places the sub-project at",
+    "   `apps/<scope>/<name>` \u2014 and do not add `cdkVersion`; the",
+    "   catalog supplies it.",
     "",
     "6. **Tell the user how to synthesize.** Instruct them to run, from",
     "   the repo root, the safe three-step regen sequence:",
@@ -43531,6 +43534,21 @@ var AwsCdkProject = class extends awscdk.AwsCdkTypeScriptApp {
     const parent = userOptions.parent;
     const pnpmVersion = parent.pnpmVersion;
     const pnpmWorkspace = PnpmWorkspace.of(parent);
+    const defaultCatalog = pnpmWorkspace?.defaultCatalog ?? {};
+    const cdkVersion = resolveCatalogVersion(
+      "cdkVersion",
+      "aws-cdk-lib",
+      userOptions.cdkVersion,
+      VERSION.AWS_CDK_LIB_VERSION,
+      defaultCatalog
+    );
+    const constructsVersion = resolveCatalogVersion(
+      "constructsVersion",
+      "constructs",
+      userOptions.constructsVersion,
+      VERSION.AWS_CONSTRUCTS_VERSION,
+      defaultCatalog
+    );
     const resolvedOutdir = userOptions.outdir ?? resolveAwsCdkProjectOutdir(userOptions.packageName ?? userOptions.name);
     const testRunner = userOptions.testRunner ?? TestRunner.JEST;
     const useJest = testRunner === TestRunner.JEST;
@@ -43559,9 +43577,13 @@ var AwsCdkProject = class extends awscdk.AwsCdkTypeScriptApp {
        */
       sampleCode: false,
       /**
-       * CDK versions sourced from the configulator-managed catalog.
+       * CDK versions read back out of the catalog above. The framework and
+       * its `constructs` peer render as `catalog:` (see after `super()`);
+       * these keep projen's own view of the versions in step with whatever
+       * that catalog pins, rather than its `^10.5.1`-style fallbacks.
        */
-      cdkVersion: VERSION.AWS_CDK_LIB_VERSION,
+      cdkVersion,
+      constructsVersion,
       cdkCliVersion: VERSION.AWS_CDK_CLI_VERSION,
       ...useJest ? {
         /**
@@ -43610,7 +43632,7 @@ var AwsCdkProject = class extends awscdk.AwsCdkTypeScriptApp {
       depsUpgrade: true,
       depsUpgradeOptions: {
         workflow: false,
-        exclude: Object.keys(pnpmWorkspace?.defaultCatalog || {}),
+        exclude: Object.keys(defaultCatalog),
         workflowOptions: {
           schedule: UpgradeDependenciesSchedule3.WEEKLY
         },
@@ -43623,9 +43645,21 @@ var AwsCdkProject = class extends awscdk.AwsCdkTypeScriptApp {
         paths: [`${resolvedOutdir}/src/**`, `${resolvedOutdir}/package.json`]
       })
     };
-    const options = merge4(defaultOptions, userOptions);
+    const options = {
+      ...merge4(defaultOptions, userOptions),
+      /**
+       * Both versions are the catalog's, resolved above — restate them after
+       * the merge so a supplied option can never reintroduce a value the
+       * catalog disagrees with. Restating `cdkVersion` also keeps the
+       * intersection type honest, since it is optional here but required by
+       * projen.
+       */
+      cdkVersion,
+      constructsVersion
+    };
     super(options);
     this.addDevDeps("@types/node@catalog:");
+    this.addDeps("aws-cdk-lib@catalog:", "constructs@catalog:");
     this.tsconfig?.file.addOverride("compilerOptions.skipLibCheck", true);
     if (testRunner === TestRunner.VITEST) {
       new Vitest(this, {
@@ -43735,6 +43769,24 @@ var AwsCdkProject = class extends awscdk.AwsCdkTypeScriptApp {
     return new AwsDeploymentTarget(this, options);
   }
 };
+var EXACT_VERSION = /^\d+\.\d+\.\d+(?:-[\w.-]+)?(?:\+[\w.-]+)?$/;
+function resolveCatalogVersion(optionName, packageName, suppliedVersion, fallbackVersion, catalog) {
+  const catalogVersion = catalog[packageName];
+  if (catalogVersion === void 0) {
+    return suppliedVersion ?? fallbackVersion;
+  }
+  if (!EXACT_VERSION.test(catalogVersion)) {
+    throw new Error(
+      `AwsCdkProject renders "${packageName}" as "catalog:", which pins only as tightly as the catalog entry behind it. The parent MonorepoProject's catalog holds "${catalogVersion}" \u2014 a range, so every CDK app would keep floating within it. Set the catalog entry for "${packageName}" to an exact version.`
+    );
+  }
+  if (suppliedVersion !== void 0 && suppliedVersion !== catalogVersion) {
+    throw new Error(
+      `AwsCdkProject renders "${packageName}" as "catalog:", so the parent MonorepoProject's catalog pin (${catalogVersion}) decides the resolved version. \`${optionName}: "${suppliedVersion}"\` would be silently ignored. Drop the option, or bump the catalog entry for "${packageName}" to ${suppliedVersion}.`
+    );
+  }
+  return catalogVersion;
+}
 
 // src/projects/react-vite-site-project.ts
 import { SampleFile as SampleFile6, TextFile as TextFile8 } from "projen";