packtory 0.0.21 → 0.0.23

package/packtory/release-analysis.js

@@ -1,73 +1,83 @@
 import { isDeepStrictEqual } from 'node:util';
 import { maxDate } from "../common/max-date.js";
-const dependencyOnlyPackageJsonFields = new Set([
-    'bundleDependencies',
-    'bundledDependencies',
-    'dependencies',
-    'optionalDependencies',
-    'peerDependencies',
-    'peerDependenciesMeta',
-    'version'
-]);
-const unchangedPriority = 0;
-const dependencyOnlyPriority = 1;
-const substantivePriority = 2;
-const firstPublishPriority = 3;
-function parseJsonFile(file) {
-    const { content } = file;
-    return (() => {
-        try {
-            return { invalid: false, value: JSON.parse(content) };
-        }
-        catch {
-            return { invalid: true };
-        }
-    })();
+import { packageManifestFilePath } from "../common/package-layout.js";
+import { fileDescriptionByPath } from "../file-manager/file-description-by-path.js";
+import { sbomFilePath } from "../sbom/sbom-file.js";
+import { releaseAnalysisClassification } from "./packtory-results.js";
+import { publishedReleaseStatus } from "./published-release-state.js";
+function dependencyOnlyPackageJsonFields() {
+    return [
+        'bundleDependencies',
+        'bundledDependencies',
+        'dependencies',
+        'optionalDependencies',
+        'peerDependencies',
+        'peerDependenciesMeta',
+        'version'
+    ];
 }
-function packageJsonValueForComparison(index) {
-    const file = index.get('package.json');
-    if (file === undefined) {
-        return { invalid: true };
+function isDependencyOnlyPackageJsonField(key) {
+    return dependencyOnlyPackageJsonFields().includes(key);
+}
+function parseJsonFile(fileContent) {
+    try {
+        return JSON.parse(fileContent);
+    }
+    catch {
+        return Number.NEGATIVE_INFINITY;
     }
-    return parseJsonFile(file);
 }
-function maxClassificationPriority(current, nextPriority) {
-    const [highestPriority = unchangedPriority] = [current, nextPriority].toSorted((left, right) => {
-        return right - left;
-    });
-    return highestPriority;
+function packageJsonValueForComparison(index) {
+    const packageJsonFile = index.get(packageManifestFilePath);
+    return packageJsonFile === undefined ? Number.NEGATIVE_INFINITY : parseJsonFile(packageJsonFile.content);
+}
+function includesClassification(current, next, classification) {
+    return current === classification || next === classification;
+}
+function moreSignificantClassification(current, next) {
+    if (includesClassification(current, next, releaseAnalysisClassification.firstPublish)) {
+        return releaseAnalysisClassification.firstPublish;
+    }
+    if (includesClassification(current, next, releaseAnalysisClassification.substantive)) {
+        return releaseAnalysisClassification.substantive;
+    }
+    return releaseAnalysisClassification.dependencyOnly;
 }
 function hasLatestPublishedAt(analysis) {
     return analysis.latestPublishedAt !== undefined;
 }
+function hasInvalidPackageJsonValues(previousValue, newValue) {
+    return previousValue === Number.NEGATIVE_INFINITY || newValue === Number.NEGATIVE_INFINITY;
+}
 function normalizePackageJsonForDependencyComparison(value) {
     return JSON.parse(JSON.stringify(value, (key, entryValue) => {
-        return dependencyOnlyPackageJsonFields.has(key) ? undefined : entryValue;
+        return isDependencyOnlyPackageJsonField(key) ? undefined : entryValue;
     }));
 }
-function indexFiles(files) {
-    return new Map(files.map((file) => {
-        return [file.filePath, file];
-    }));
+function isDependencyDerivedFilePath(filePath) {
+    return filePath === packageManifestFilePath || filePath === sbomFilePath();
 }
-function nonPackageJsonFilesMatch(previousIndex, newIndex) {
-    return Array.from(previousIndex.entries()).every(([filePath, previousFile]) => {
+function nonDependencyDerivedFilesMatch(previousIndex, newIndex) {
+    for (const [filePath, previousFile] of previousIndex.entries()) {
         const currentFile = newIndex.get(filePath);
-        return filePath === 'package.json' || isDeepStrictEqual(previousFile, currentFile);
-    });
+        if (!isDependencyDerivedFilePath(filePath) && !isDeepStrictEqual(previousFile, currentFile)) {
+            return false;
+        }
+    }
+    return true;
 }
 function packageJsonChangeIsDependencyOnly(previousIndex, newIndex) {
     const previousPackageJsonValue = packageJsonValueForComparison(previousIndex);
     const newPackageJsonValue = packageJsonValueForComparison(newIndex);
-    if (previousPackageJsonValue.invalid || newPackageJsonValue.invalid) {
+    if (hasInvalidPackageJsonValues(previousPackageJsonValue, newPackageJsonValue)) {
         return false;
     }
-    return isDeepStrictEqual(normalizePackageJsonForDependencyComparison(previousPackageJsonValue.value), normalizePackageJsonForDependencyComparison(newPackageJsonValue.value));
+    return isDeepStrictEqual(normalizePackageJsonForDependencyComparison(previousPackageJsonValue), normalizePackageJsonForDependencyComparison(newPackageJsonValue));
 }
 function createComparisonIndexes(previousFiles, newFiles) {
     return {
-        previousIndex: indexFiles(previousFiles),
-        newIndex: indexFiles(newFiles)
+        previousIndex: fileDescriptionByPath(previousFiles),
+        newIndex: fileDescriptionByPath(newFiles)
     };
 }
 function isDependencyOnlyPublishedChange(previousFiles, newFiles) {
@@ -75,7 +85,7 @@ function isDependencyOnlyPublishedChange(previousFiles, newFiles) {
         return false;
     }
     const { previousIndex, newIndex } = createComparisonIndexes(previousFiles, newFiles);
-    if (!nonPackageJsonFilesMatch(previousIndex, newIndex)) {
+    if (!nonDependencyDerivedFilesMatch(previousIndex, newIndex)) {
         return false;
     }
     return packageJsonChangeIsDependencyOnly(previousIndex, newIndex);
@@ -87,9 +97,9 @@ export function classifyPackageRelease(buildResult, newFiles) {
     const latestPublishedAt = buildResult.previousReleaseArtifacts.isJust
         ? buildResult.previousReleaseArtifacts.value.publishedAt
         : undefined;
-    if (buildResult.status === 'already-published') {
+    if (buildResult.status === publishedReleaseStatus.alreadyPublished) {
         return {
-            classification: 'unchanged',
+            classification: releaseAnalysisClassification.unchanged,
             latestPublishedAt,
             latestPublishedVersion,
             name: buildResult.bundle.name
@@ -97,13 +107,13 @@ export function classifyPackageRelease(buildResult, newFiles) {
     }
     if (buildResult.previousReleaseArtifacts.isNothing) {
         return {
-            classification: 'first-publish',
+            classification: releaseAnalysisClassification.firstPublish,
             name: buildResult.bundle.name
         };
     }
     const classification = isDependencyOnlyPublishedChange(buildResult.previousReleaseArtifacts.value.files, newFiles)
-        ? 'dependency-only'
-        : 'substantive';
+        ? releaseAnalysisClassification.dependencyOnly
+        : releaseAnalysisClassification.substantive;
     return {
         classification,
         latestPublishedAt,
@@ -112,35 +122,23 @@ export function classifyPackageRelease(buildResult, newFiles) {
     };
 }
 export function summarizeReleaseAnalysis(packageAnalyses) {
-    const changedAnalyses = packageAnalyses.filter((analysis) => {
-        return analysis.classification !== 'unchanged';
-    });
-    const classificationPriority = {
-        unchanged: unchangedPriority,
-        'dependency-only': dependencyOnlyPriority,
-        substantive: substantivePriority,
-        'first-publish': firstPublishPriority
-    };
-    const classificationByPriority = {
-        [unchangedPriority]: 'unchanged',
-        [dependencyOnlyPriority]: 'dependency-only',
-        [substantivePriority]: 'substantive',
-        [firstPublishPriority]: 'first-publish'
-    };
-    const highestPriority = changedAnalyses.reduce((current, analysis) => {
-        const nextPriority = classificationPriority[analysis.classification];
-        return maxClassificationPriority(current, nextPriority);
-    }, unchangedPriority);
-    const classification = classificationByPriority[highestPriority];
-    const publishedDates = changedAnalyses.filter(hasLatestPublishedAt).map((analysis) => {
-        return analysis.latestPublishedAt;
-    });
-    const mostRecentPublishedAt = publishedDates.reduce((current, publishedAt) => {
-        return current === undefined ? publishedAt : maxDate(current, [publishedAt]);
-    }, undefined);
+    let classification = releaseAnalysisClassification.unchanged;
+    let hasPublishedAt = false;
+    let mostRecentPublishedAt = new Date(0);
+    for (const analysis of packageAnalyses) {
+        if (analysis.classification !== releaseAnalysisClassification.unchanged) {
+            classification = moreSignificantClassification(classification, analysis.classification);
+            if (hasLatestPublishedAt(analysis)) {
+                mostRecentPublishedAt = hasPublishedAt
+                    ? maxDate(mostRecentPublishedAt, [analysis.latestPublishedAt])
+                    : analysis.latestPublishedAt;
+                hasPublishedAt = true;
+            }
+        }
+    }
     return {
         classification,
-        mostRecentPublishedAt,
+        mostRecentPublishedAt: hasPublishedAt ? mostRecentPublishedAt : undefined,
         packageAnalyses
     };
 }

package/packtory/release-analysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/release-analysis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/release-analysis.ts"],"names":[],"mappings":"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"}

package/packtory/resolved-package.js

@@ -6,11 +6,10 @@ export function createResolvedPackage(name, analyzedBundle, resolveOptions) {
 }
 export function buildChecksResult(validated, resolvedPackages) {
     const { packtoryConfig: config } = validated;
-    const perPackageSettings = new Map(config.packages.map((packageConfig) => {
-        return [packageConfig.name, packageConfig.checks];
-    }));
+    const perPackageSettings = new Map();
     const commonMainPackageJson = config.commonPackageSettings?.mainPackageJson;
     const effectivePackageConfigs = mapToObj(config.packages, (packageConfig) => {
+        perPackageSettings.set(packageConfig.name, packageConfig.checks);
         return [
             packageConfig.name,
             {
@@ -19,13 +18,14 @@ export function buildChecksResult(validated, resolvedPackages) {
             }
         ];
     });
+    const bundles = resolvedPackages.map((resolvedPackage) => {
+        return resolvedPackage.analyzedBundle;
+    });
     const checkIssues = runChecks({
         settings: config.checks ?? {},
         perPackageSettings,
         packageConfigs: effectivePackageConfigs,
-        bundles: resolvedPackages.map((resolvedPackage) => {
-            return resolvedPackage.analyzedBundle;
-        })
+        bundles
     });
     if (checkIssues.length > 0) {
         return Result.err({ type: 'checks', issues: checkIssues });

package/packtory/resolved-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolved-package.js","sourceRoot":"","sources":["../../../../source/packtory/resolved-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAiBtD,MAAM,UAAU,qBAAqB,CACjC,IAAY,EACZ,cAA8B,EAC9B,cAAqC;IAErC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,SAAyD,EACzD,gBAA4C;IAE5C,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QAClC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;IACF,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,EAAE,eAAe,CAAC;IAC5E,MAAM,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,EAAE;QACxE,OAAO;YACH,aAAa,CAAC,IAAI;YAClB;gBACI,GAAG,aAAa;gBAChB,eAAe,EAAE,aAAa,CAAC,eAAe,IAAI,qBAAqB;aAC1E;SACJ,CAAC;IACN,CAAC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,SAAS,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;QAC7B,kBAAkB;QAClB,cAAc,EAAE,uBAAuB;QACvC,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;YAC9C,OAAO,eAAe,CAAC,cAAc,CAAC;QAC1C,CAAC,CAAC;KACL,CAAC,CAAC;IAEH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"resolved-package.js","sourceRoot":"","sources":["../../../../source/packtory/resolved-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAiBtD,MAAM,UAAU,qBAAqB,CACjC,IAAY,EACZ,cAA8B,EAC9B,cAAqC;IAErC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,SAAyD,EACzD,gBAA4C;IAE5C,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAsD,CAAC;IACzF,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,EAAE,eAAe,CAAC;IAC5E,MAAM,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,EAAE;QACxE,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAEjE,OAAO;YACH,aAAa,CAAC,IAAI;YAClB;gBACI,GAAG,aAAa;gBAChB,eAAe,EAAE,aAAa,CAAC,eAAe,IAAI,qBAAqB;aAC1E;SACJ,CAAC;IACN,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QACrD,OAAO,eAAe,CAAC,cAAc,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,SAAS,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;QAC7B,kBAAkB;QAClB,cAAc,EAAE,uBAAuB;QACvC,OAAO;KACV,CAAC,CAAC;IAEH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;AACvC,CAAC"}

package/packtory/scheduler.d.ts

@@ -2,6 +2,7 @@ import { Result } from 'true-myth';
 import type { ConfigWithGraph } from '../config/validation.ts';
 import type { ProgressBroadcastProvider } from '../progress/progress-broadcaster.ts';
 import type { PackageConfig } from '../config/config.ts';
+import type { PublishedReleaseStatus } from './published-release-state.ts';
 export type PartialError<TResult> = {
     readonly succeeded: readonly TResult[];
     readonly failures: readonly Error[];

package/packtory/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../source/packtory/scheduler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB;AAExD,MAAM,MAAM,YAAY,CAAC,OAAO,IAAI;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,KAAK,EAAE,CAAC;CACvC"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../source/packtory/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B;AAE1E,MAAM,MAAM,YAAY,CAAC,OAAO,IAAI;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,KAAK,EAAE,CAAC;CACvC"}

package/packtory/scheduler.js

@@ -1,29 +1,53 @@
-import { partition } from 'remeda';
 import { Result } from 'true-myth';
-function isFulfilledResult(result) {
-    return result.status === 'fulfilled';
-}
 function toError(error) {
     if (error instanceof Error) {
         return error;
     }
     return new Error('Unknown error');
 }
+function createGenerationSummary() {
+    return {
+        succeeded: [],
+        succeededResults: [],
+        failures: []
+    };
+}
+function recordGenerationResult(summary, result) {
+    if (result.status === 'fulfilled') {
+        summary.succeeded.push(result.value);
+        summary.succeededResults.push(result.value.result);
+        return;
+    }
+    summary.failures.push(toError(result.reason));
+}
+function summarizeCollectedResults(summary) {
+    if (summary.failures.length > 0) {
+        return Result.err({
+            succeeded: summary.succeededResults,
+            failures: summary.failures
+        });
+    }
+    return Result.ok(summary.succeeded);
+}
+function summarizeGenerationResults(results) {
+    const summary = createGenerationSummary();
+    for (const result of results) {
+        recordGenerationResult(summary, result);
+    }
+    return summarizeCollectedResults(summary);
+}
 export function createScheduler(dependencies) {
     const { progressBroadcastProvider } = dependencies;
     async function runForGeneration(packageNames, config, existingItems, params) {
-        const buildPackageSuccess = async (packageName) => {
-            const options = params.createOptions({ packageName, existing: existingItems, config });
-            const result = await params.execute(options);
-            const progressEvent = params.createProgressEvent?.({ packageName, result, options });
-            if (progressEvent !== undefined) {
-                progressBroadcastProvider.emit('done', { packageName, ...progressEvent });
-            }
-            return { packageName, result, options };
-        };
         const executePackage = async (packageName) => {
+            const options = params.createOptions({ packageName, existing: existingItems, config });
             try {
-                return await buildPackageSuccess(packageName);
+                const result = await params.execute(options);
+                const progressEvent = params.createProgressEvent?.({ packageName, result, options });
+                if (progressEvent !== undefined) {
+                    progressBroadcastProvider.emit('done', { packageName, ...progressEvent });
+                }
+                return { packageName, result, options };
             }
             catch (error) {
                 progressBroadcastProvider.emit('error', { packageName, error: toError(error) });
@@ -31,21 +55,7 @@ export function createScheduler(dependencies) {
             }
         };
         const results = await Promise.allSettled(packageNames.map(executePackage));
-        const [fulfilledResults, rejectedResults] = partition(results, isFulfilledResult);
-        const succeeded = fulfilledResults.map((entry) => {
-            return entry.value;
-        });
-        if (rejectedResults.length > 0) {
-            return Result.err({
-                succeeded: succeeded.map((entry) => {
-                    return entry.result;
-                }),
-                failures: rejectedResults.map((entry) => {
-                    return toError(entry.reason);
-                })
-            });
-        }
-        return Result.ok(succeeded);
+        return summarizeGenerationResults(results);
     }
     function emitScheduledEventForAllPackages(config) {
         for (const packageConfig of config.packtoryConfig.packages) {
@@ -56,34 +66,42 @@ export function createScheduler(dependencies) {
         const reverseGraph = config.packageGraph.reverse.bind(config.packageGraph);
         return reverseGraph().getTopologicalGenerations();
     }
+    function shouldEmitScheduledEvents(emitScheduledEvents) {
+        return emitScheduledEvents ?? true;
+    }
+    function createSchedulerState() {
+        return { nextItems: [], succeeded: [] };
+    }
+    function failGeneration(state, generationError) {
+        return Result.err({
+            succeeded: [...state.succeeded, ...generationError.succeeded],
+            failures: generationError.failures
+        });
+    }
+    function appendGenerationSuccesses(state, succeeded, selectNext) {
+        for (const entry of succeeded) {
+            state.nextItems.push(selectNext({ result: entry.result, options: entry.options }));
+            state.succeeded.push(entry.result);
+        }
+    }
+    async function runExecutionPlan(config, params) {
+        const state = createSchedulerState();
+        for (const generation of getExecutionPlan(config)) {
+            const generationResult = await runForGeneration(generation, config, state.nextItems, params);
+            if (generationResult.isErr) {
+                return failGeneration(state, generationResult.error);
+            }
+            appendGenerationSuccesses(state, generationResult.value, params.selectNext);
+        }
+        return Result.ok(state.succeeded);
+    }
     return {
         async runForEachScheduledPackage(params) {
             const { config } = params;
-            if (params.emitScheduledEvents ?? true) {
+            if (shouldEmitScheduledEvents(params.emitScheduledEvents)) {
                 emitScheduledEventForAllPackages(config);
             }
-            const state = { nextItems: [], succeeded: [] };
-            const processGeneration = async (generation) => {
-                const generationResult = await runForGeneration(generation, config, state.nextItems, params);
-                if (generationResult.isErr) {
-                    return Result.err({
-                        succeeded: [...state.succeeded, ...generationResult.error.succeeded],
-                        failures: generationResult.error.failures
-                    });
-                }
-                generationResult.value.forEach((entry) => {
-                    state.nextItems.push(params.selectNext({ result: entry.result, options: entry.options }));
-                    state.succeeded.push(entry.result);
-                });
-                return Result.ok(undefined);
-            };
-            for (const generation of getExecutionPlan(config)) {
-                const iterationResult = await processGeneration(generation);
-                if (iterationResult.isErr) {
-                    return Result.err(iterationResult.error);
-                }
-            }
-            return Result.ok(state.succeeded);
+            return runExecutionPlan(config, params);
         }
     };
 }

package/packtory/scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../../source/packtory/scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../../source/packtory/scheduler.ts"],"names":[],"mappings":"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"}

package/packtory/stages/publish-stage.js

@@ -1,13 +1,18 @@
 import { collectPublicModuleUsage } from "../../package-surface/public-module-usage.js";
 import { withFailureCapture } from "../../report/decorators.js";
 import { configToBuildAndPublishOptions } from "../map-config.js";
+function collectPublishStageInputs(resolvedPackages) {
+    const analyzedBundles = [];
+    const analyzedBundlesByName = {};
+    for (const resolvedPackage of resolvedPackages) {
+        analyzedBundles.push(resolvedPackage.analyzedBundle);
+        analyzedBundlesByName[resolvedPackage.name] = resolvedPackage.analyzedBundle;
+    }
+    return { analyzedBundles, analyzedBundlesByName };
+}
 export async function determineVersionAndPublishAll(dependencies, config, resolvedPackages, options) {
-    const analyzedBundlesByName = Object.fromEntries(resolvedPackages.map((resolvedPackage) => {
-        return [resolvedPackage.name, resolvedPackage.analyzedBundle];
-    }));
-    const publicModuleUsageByName = collectPublicModuleUsage(resolvedPackages.map((resolvedPackage) => {
-        return resolvedPackage.analyzedBundle;
-    }));
+    const { analyzedBundles, analyzedBundlesByName } = collectPublishStageInputs(resolvedPackages);
+    const publicModuleUsageByName = collectPublicModuleUsage(analyzedBundles);
     return dependencies.scheduler.runForEachScheduledPackage({
         config,
         createOptions: (context) => {

package/packtory/stages/publish-stage.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/publish-stage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAA+B,MAAM,kBAAkB,CAAC;AAoB/F,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,YAAsC,EACtC,MAAyB,EACzB,gBAA4C,EAC5C,OAAkC;IAElC,MAAM,qBAAqB,GAAgE,MAAM,CAAC,WAAW,CACzG,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QACrC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IAClE,CAAC,CAAC,CACL,CAAC;IACF,MAAM,uBAAuB,GAAG,wBAAwB,CACpD,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QACrC,OAAO,eAAe,CAAC,cAAc,CAAC;IAC1C,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,YAAY,CAAC,SAAS,CAAC,0BAA0B,CAKtD;QACE,MAAM;QACN,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE;YACvB,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;YACnE,OAAO,8BAA8B,CACjC,WAAW,EACX,eAAe,CAAC,cAAc,EAC9B,eAAe,CAAC,cAAc,EAC9B,QAAQ,CACX,CAAC;QACN,CAAC;QACD,OAAO,EAAE,kBAAkB,CAAC,YAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;YACrG,MAAM,cAAc,GAAG,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,CAAC,IAAI,cAAc,CAAC,CAAC;YACrF,CAAC;YAED,MAAM,gBAAgB,GAAsC;gBACxD,cAAc;gBACd,YAAY;gBACZ,mCAAmC,EAAE,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;aACtF,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO,YAAY,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAC9E,CAAC;YACD,OAAO,YAAY,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC3E,CAAC,CAAC;QACF,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACnB,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAChC,CAAC;QACD,mBAAmB,EAAE,KAAK;QAC1B,mBAAmB,EAAE,CAAC,MAAM,EAAE,EAAE;YAC5B,OAAO;gBACH,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO;gBACjD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;aAC/B,CAAC;QACN,CAAC;KACJ,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"publish-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/publish-stage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAA+B,MAAM,kBAAkB,CAAC;AAyB/F,SAAS,yBAAyB,CAAC,gBAA4C;IAC3E,MAAM,eAAe,GAAwC,EAAE,CAAC;IAChE,MAAM,qBAAqB,GAAsD,EAAE,CAAC;IAEpF,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;QAC7C,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACrD,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC;IACjF,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,YAAsC,EACtC,MAAyB,EACzB,gBAA4C,EAC5C,OAAkC;IAElC,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;IAC/F,MAAM,uBAAuB,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAE1E,OAAO,YAAY,CAAC,SAAS,CAAC,0BAA0B,CAKtD;QACE,MAAM;QACN,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE;YACvB,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;YACnE,OAAO,8BAA8B,CACjC,WAAW,EACX,eAAe,CAAC,cAAc,EAC9B,eAAe,CAAC,cAAc,EAC9B,QAAQ,CACX,CAAC;QACN,CAAC;QACD,OAAO,EAAE,kBAAkB,CAAC,YAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;YACrG,MAAM,cAAc,GAAG,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,CAAC,IAAI,cAAc,CAAC,CAAC;YACrF,CAAC;YAED,MAAM,gBAAgB,GAAsC;gBACxD,cAAc;gBACd,YAAY;gBACZ,mCAAmC,EAAE,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;aACtF,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO,YAAY,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAC9E,CAAC;YACD,OAAO,YAAY,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC3E,CAAC,CAAC;QACF,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACnB,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAChC,CAAC;QACD,mBAAmB,EAAE,KAAK;QAC1B,mBAAmB,EAAE,CAAC,MAAM,EAAE,EAAE;YAC5B,OAAO;gBACH,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO;gBACjD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;aAC/B,CAAC;QACN,CAAC;KACJ,CAAC,CAAC;AACP,CAAC"}

package/packtory/stages/release-diff-stage.js

@@ -1,7 +1,8 @@
 import { Result } from 'true-myth';
-import { buildFileSetDiff } from "../../report/release-diff/file-set-diff.js";
+import { buildFileSetDiff, packageReleaseDiffState } from "../../report/release-diff/file-set-diff.js";
 import { buildReleaseVersionLabel, buildReleaseVersionTransition } from "../../report/release-diff/release-version-transition.js";
 import { canonicalizeSbomInFileSet } from "../../sbom/sbom-canonicalizer.js";
+import { publishedReleaseArtifactsOf, wasAlreadyPublished } from "../published-release-state.js";
 function emptyFileSetDiff() {
     return { added: [], removed: [], modified: [], unchanged: [] };
 }
@@ -16,10 +17,9 @@ function asAddedFiles(files) {
     return { ...emptyFileSetDiff(), added: files.map(asAddedFile) };
 }
 function versionFieldsFor(buildResult) {
+    const publishedReleaseArtifacts = publishedReleaseArtifactsOf(buildResult);
     return {
-        previousVersion: buildResult.previousReleaseArtifacts.isJust
-            ? buildResult.previousReleaseArtifacts.value.version
-            : undefined,
+        previousVersion: publishedReleaseArtifacts?.version,
         chosenVersion: buildResult.bundle.version
     };
 }
@@ -34,15 +34,16 @@ function diffEntry(packageName, state, files, versionFields) {
 }
 function classifyDiff(artifactsBuilder, packageName, buildResult) {
     const versionFields = versionFieldsFor(buildResult);
-    if (buildResult.status === 'already-published') {
-        return diffEntry(packageName, 'unchanged', emptyFileSetDiff(), versionFields);
+    if (wasAlreadyPublished(buildResult)) {
+        return diffEntry(packageName, packageReleaseDiffState.unchanged, emptyFileSetDiff(), versionFields);
     }
     const newSideFiles = artifactsBuilder.collectContents(buildResult.bundle, 'package', buildResult.extraFiles);
-    if (buildResult.previousReleaseArtifacts.isNothing) {
-        return diffEntry(packageName, 'first-publish', asAddedFiles(newSideFiles), versionFields);
+    const publishedReleaseArtifacts = publishedReleaseArtifactsOf(buildResult);
+    if (publishedReleaseArtifacts === undefined) {
+        return diffEntry(packageName, packageReleaseDiffState.firstPublish, asAddedFiles(newSideFiles), versionFields);
     }
-    const files = buildFileSetDiff(canonicalizeSbomInFileSet(buildResult.previousReleaseArtifacts.value.files), canonicalizeSbomInFileSet(newSideFiles));
-    return diffEntry(packageName, 'changed', files, versionFields);
+    const files = buildFileSetDiff(canonicalizeSbomInFileSet(publishedReleaseArtifacts.files), canonicalizeSbomInFileSet(newSideFiles));
+    return diffEntry(packageName, packageReleaseDiffState.changed, files, versionFields);
 }
 function isDiffEntry(entry) {
     return entry !== undefined;

package/packtory/stages/release-diff-stage.js.map

@@ -1 +1 @@
-{"version":3,"file":"release-diff-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/release-diff-stage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"release-diff-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/release-diff-stage.ts"],"names":[],"mappings":"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"}