@ykdz/template 0.0.28 → 0.0.30

package/dist/application.js

@@ -123,20 +123,13 @@ export async function validateBlueprintFile(filePath, runtime) {
     }
     return "Blueprint is valid";
 }
-async function deriveExistingPackageScope(options) {
+function deriveExistingPackageScope(blueprint) {
     const scopes = new Set();
-    for (const definition of options.blueprint.packages) {
+    for (const definition of blueprint.packages) {
         const match = definition.name.match(/^@([^/]+)\//);
         if (!match?.[1]) {
             throw new Error(`Package Addition requires a scoped Package Definition: ${definition.name}`);
         }
-        const manifestPath = path.join(options.targetDir, definition.path, "package.json");
-        const manifest = JSON.parse(await readFile(manifestPath, "utf8"));
-        if (typeof manifest !== "object" ||
-            manifest === null ||
-            manifest.name !== definition.name) {
-            throw new Error(`Package Addition requires manifest truth for ${definition.path}: expected name ${definition.name}`);
-        }
         scopes.add(match[1]);
     }
     if (scopes.size !== 1) {
@@ -231,10 +224,7 @@ export async function runAddPackage(options, runtime) {
     const definition = builtInPresetRegistry.require(options.preset);
     const context = createGenerationContext({
         targetDir: runtime.cwd,
-        scope: await deriveExistingPackageScope({
-            targetDir: runtime.cwd,
-            blueprint,
-        }),
+        scope: deriveExistingPackageScope(blueprint),
         toolchain: {
             nodeLtsMajor: toolchain.nodeLtsMajor.value,
             packageManagerPin: toolchain.packageManagerPin.value,

package/node_modules/@ykdz/template-builtin-presets/dist/src/foundation.js

@@ -397,7 +397,14 @@ function readExistingPackageAdditionState(options) {
         if (contribution === undefined) {
             throw new Error(`Generation Record cannot reproduce Package Definition ${expectedDefinition.name} at ${expectedDefinition.path}`);
         }
-        const manifestPath = path.join(options.context.targetDir, expectedDefinition.path, "package.json");
+        return contribution;
+    });
+    for (const packagePath of new Set(options.manifestTruthPackagePaths ?? [])) {
+        const expectedDefinition = options.blueprint.packages.find((definition) => definition.path === packagePath);
+        if (expectedDefinition === undefined) {
+            throw new Error(`Package Addition requires manifest truth for unknown Package Path ${packagePath}`);
+        }
+        const manifestPath = path.join(options.context.targetDir, packagePath, "package.json");
         let manifest;
         try {
             manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
@@ -409,8 +416,7 @@ function readExistingPackageAdditionState(options) {
             throw new Error(`Package Addition requires manifest truth for ${expectedDefinition.path}: expected name ${expectedDefinition.name}`);
         }
         manifestTruthByPackagePath.set(expectedDefinition.path, manifest);
-        return contribution;
-    });
+    }
     const reconstructedCheckFacts = uniqueEnvironmentNeeds(contributions.flatMap((contribution) => contribution.environmentNeeds)).map(checkEnvironmentNeedFact);
     const reconstructedDeploymentFacts = uniqueEnvironmentNeeds(contributions.flatMap((contribution) => contribution.deploymentEnvironmentNeeds ?? [])).map(deploymentEnvironmentNeedFact);
     const persistedCheckFacts = persistedEnvironmentNeeds.check.map(checkEnvironmentNeedFact);
@@ -993,7 +999,19 @@ export function planGeneratedRepositoryPackageAddition(options) {
             : {}),
     };
     assertProjectBlueprintV2(blueprint);
-    const existing = readExistingPackageAdditionState(options);
+    const manifestTruthPackagePaths = requestedPackageLinkIntents.length === 0
+        ? []
+        : [
+            ...(options.blueprint.packageLinkIntents ?? []).flatMap((intent) => [
+                intent.consumerPackagePath,
+                intent.providerPackagePath,
+            ]),
+            ...requestedPackageLinkIntents.map((intent) => intent.consumerPackagePath),
+        ];
+    const existing = readExistingPackageAdditionState({
+        ...options,
+        manifestTruthPackagePaths,
+    });
     const generationRecord = {
         ...existing.generationRecord,
         packages: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ykdz/template",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "private": false,
   "description": "Project template generator for YKDZ starter projects.",
   "keywords": [