packtory 0.0.21 → 0.0.23

package/packtory/package-processor-publish.d.ts

@@ -7,9 +7,10 @@ import type { ProgressBroadcastProvider } from '../progress/progress-broadcaster
 import type { SbomFileBuilder } from '../sbom/sbom-file.ts';
 import type { VersionManager } from '../version-manager/manager.ts';
 import type { BuildAndPublishOptions } from './map-config.ts';
+import { type PublishedReleaseStatus } from './published-release-state.ts';
 type VersionedBundleWithManifest = Awaited<ReturnType<VersionManager['addVersion']>>;
 export type BuildAndPublishResult = {
-    readonly status: 'already-published' | 'initial-version' | 'new-version';
+    readonly status: PublishedReleaseStatus;
     readonly bundle: VersionedBundleWithManifest;
     readonly extraFiles: readonly FileDescription[];
     readonly previousReleaseArtifacts: Maybe<PublishedReleaseArtifacts>;

package/packtory/package-processor-publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-processor-publish.d.ts","sourceRoot":"","sources":["../../../../source/packtory/package-processor-publish.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B;AACjE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB;AAG7D,KAAK,2BAA2B,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;AAQpF,MAAM,MAAM,qBAAqB,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,GAAG,aAAa,CAAC;IACzE,QAAQ,CAAC,MAAM,EAAE,2BAA2B,CAAC;IAC7C,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD,QAAQ,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;CACvE"}
+{"version":3,"file":"package-processor-publish.d.ts","sourceRoot":"","sources":["../../../../source/packtory/package-processor-publish.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C;AAEhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B;AACjE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB;AAE7D,OAAO,EAA0B,KAAK,sBAAsB,EAAuB,MAAM,8BAA8B;AAEvH,KAAK,2BAA2B,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;AAQpF,MAAM,MAAM,qBAAqB,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,2BAA2B,CAAC;IAC7C,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD,QAAQ,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;CACvE"}

package/packtory/package-processor-publish.js

@@ -1,12 +1,14 @@
+/* eslint-disable import/max-dependencies -- the publish operation legitimately bridges bundle-emitter, version-manager, sbom, progress, and option-mapping helpers */
+import { isDefined, pickBy } from 'remeda';
+import { bundledDependenciesFrom } from "../common/bundled-dependency-groups.js";
 import { determineBuildVersion, inferVersionTrigger, shouldIncreaseVersion } from "./options/version-trigger.js";
+import { publishedReleaseStatus, wasAlreadyPublished } from "./published-release-state.js";
 function assertEsmMainPackageJson(mainPackageJson) {
     if (mainPackageJson.type !== 'module') {
         throw new Error('mainPackageJson.type must be "module"');
     }
 }
-function siblingsFromOptions(buildOptions) {
-    return [...buildOptions.bundleDependencies, ...buildOptions.bundlePeerDependencies];
-}
+const siblingsFromOptions = (bundledDependenciesFrom);
 export function createPublishOperations(dependencies) {
     async function buildVersionedBundle(analyzedBundle, options, substitutionPublicModuleSourcePaths) {
         assertEsmMainPackageJson(options.mainPackageJson);
@@ -71,19 +73,21 @@ export function createPublishOperations(dependencies) {
     async function tryBuildAndPublish(options) {
         const buildContext = await buildVersionedBundle(options.analyzedBundle, options.buildOptions, options.substitutionPublicModuleSourcePaths);
         const preBumpExtraFiles = await generateExtraFiles(buildContext.versionedBundle, options.buildOptions);
-        const alreadyPublished = await dependencies.bundleEmitter.checkBundleAlreadyPublished({
+        const alreadyPublished = await dependencies.bundleEmitter.checkBundleAlreadyPublished(pickBy({
             bundle: buildContext.versionedBundle,
             registrySettings: options.buildOptions.registrySettings,
-            ...(preBumpExtraFiles.length === 0 ? {} : { extraFiles: preBumpExtraFiles })
-        });
+            extraFiles: preBumpExtraFiles.length === 0 ? undefined : preBumpExtraFiles
+        }, isDefined));
         if (alreadyPublished.alreadyPublishedAsLatest) {
-            return finalizeWithoutBump(buildContext, options.buildOptions, 'already-published', {
+            return finalizeWithoutBump(buildContext, options.buildOptions, publishedReleaseStatus.alreadyPublished, {
                 extraFiles: preBumpExtraFiles,
                 previousReleaseArtifacts: alreadyPublished.previousReleaseArtifacts
             });
         }
         if (!shouldIncreaseVersion(buildContext.currentVersion, options.buildOptions)) {
-            return finalizeWithoutBump(buildContext, options.buildOptions, buildContext.currentVersion.isJust ? 'new-version' : 'initial-version', {
+            return finalizeWithoutBump(buildContext, options.buildOptions, buildContext.currentVersion.isJust
+                ? publishedReleaseStatus.newVersion
+                : publishedReleaseStatus.initialVersion, {
                 extraFiles: preBumpExtraFiles,
                 previousReleaseArtifacts: alreadyPublished.previousReleaseArtifacts
             });
@@ -92,26 +96,28 @@ export function createPublishOperations(dependencies) {
         const extraFiles = await generateExtraFiles(newVersionedBundle, options.buildOptions);
         return {
             bundle: newVersionedBundle,
-            status: buildContext.currentVersion.isJust ? 'new-version' : 'initial-version',
+            status: buildContext.currentVersion.isJust
+                ? publishedReleaseStatus.newVersion
+                : publishedReleaseStatus.initialVersion,
             extraFiles,
             previousReleaseArtifacts: alreadyPublished.previousReleaseArtifacts
         };
     }
     async function buildAndPublish(options) {
         const result = await tryBuildAndPublish(options);
-        if (result.status === 'already-published') {
+        if (wasAlreadyPublished(result)) {
             return result;
         }
         dependencies.progressBroadcaster.emit('publishing', {
             packageName: options.buildOptions.name,
             version: result.bundle.version
         });
-        await dependencies.bundleEmitter.publish({
+        await dependencies.bundleEmitter.publish(pickBy({
             bundle: result.bundle,
             registrySettings: options.buildOptions.registrySettings,
             publishSettings: options.buildOptions.publishSettings,
-            ...(result.extraFiles.length === 0 ? {} : { extraFiles: result.extraFiles })
-        });
+            extraFiles: result.extraFiles.length === 0 ? undefined : result.extraFiles
+        }, isDefined));
         return result;
     }
     return { buildAndPublish, tryBuildAndPublish };

package/packtory/package-processor-publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-processor-publish.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-publish.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAuBjH,SAAS,wBAAwB,CAAC,eAAuD;IACrF,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,YAAoC;IAC7D,OAAO,CAAC,GAAG,YAAY,CAAC,kBAAkB,EAAE,GAAG,YAAY,CAAC,sBAAsB,CAAC,CAAC;AACxF,CAAC;AAOD,MAAM,UAAU,uBAAuB,CAAC,YAAiC;IACrE,KAAK,UAAU,oBAAoB,CAC/B,cAA8B,EAC9B,OAA+B,EAC/B,mCAAoE;QAMpE,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,uBAAuB,CAAC;YAC5E,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,UAAU,EAAE,OAAO,CAAC,UAAU;SACjC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC/D,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1F,MAAM,eAAe,GAAG,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC;YAC3D,MAAM,EAAE,cAAc;YACtB,GAAG,OAAO;YACV,OAAO;YACP,mCAAmC;SACtC,CAAC,CAAC;QACH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;IACxD,CAAC;IAED,SAAS,qBAAqB,CAAC,IAK9B;QACG,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACxE,OAAO;QACX,CAAC;QACD,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,EAAE;YACvD,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC9B,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACnF,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO,EAAE,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;SAChF,CAAC,CAAC;IACP,CAAC;IAED,SAAS,mBAAmB,CACxB,YAA6F,EAC7F,OAA+B,EAC/B,MAAuC,EACvC,MAGC;QAED,qBAAqB,CAAC;YAClB,OAAO;YACP,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,aAAa,EAAE,YAAY,CAAC,eAAe,CAAC,OAAO;YACnD,OAAO,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,OAAO;YACH,MAAM,EAAE,YAAY,CAAC,eAAe;YACpC,MAAM;YACN,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,wBAAwB,EAAE,MAAM,CAAC,wBAAwB;SAC5D,CAAC;IACN,CAAC;IAED,KAAK,UAAU,WAAW,CACtB,YAA8G,EAC9G,OAA+B;QAE/B,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE;YAChD,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;SAChC,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,YAAY,CAAC,cAAc,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACrG,qBAAqB,CAAC;YAClB,OAAO;YACP,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,aAAa,EAAE,kBAAkB,CAAC,OAAO;YACzC,OAAO,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAED,KAAK,UAAU,kBAAkB,CAC7B,eAA4C,EAC5C,YAAoC;QAEpC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,QAAQ,CACtD,eAAe,EACf,mBAAmB,CAAC,YAAY,CAAC,EACjC,YAAY,CAAC,eAAe,CAC/B,CAAC;QACF,OAAO,MAAM,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,UAAU,kBAAkB,CAAC,OAA0C;QACxE,MAAM,YAAY,GAAG,MAAM,oBAAoB,CAC3C,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,mCAAmC,CAC9C,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,kBAAkB,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACvG,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,2BAA2B,CAAC;YAClF,MAAM,EAAE,YAAY,CAAC,eAAe;YACpC,gBAAgB,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB;YACvD,GAAG,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;SAC/E,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC,wBAAwB,EAAE,CAAC;YAC5C,OAAO,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,mBAAmB,EAAE;gBAChF,UAAU,EAAE,iBAAiB;gBAC7B,wBAAwB,EAAE,gBAAgB,CAAC,wBAAwB;aACtE,CAAC,CAAC;QACP,CAAC;QACD,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5E,OAAO,mBAAmB,CACtB,YAAY,EACZ,OAAO,CAAC,YAAY,EACpB,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB,EACtE;gBACI,UAAU,EAAE,iBAAiB;gBAC7B,wBAAwB,EAAE,gBAAgB,CAAC,wBAAwB;aACtE,CACJ,CAAC;QACN,CAAC;QACD,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACjF,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACtF,OAAO;YACH,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB;YAC9E,UAAU;YACV,wBAAwB,EAAE,gBAAgB,CAAC,wBAAwB;SACtE,CAAC;IACN,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,OAA0C;QACrE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;YACxC,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE;YAChD,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI;YACtC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;SACjC,CAAC,CAAC;QACH,MAAM,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB;YACvD,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,eAAe;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;SAC/E,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,CAAC;AACnD,CAAC"}
+{"version":3,"file":"package-processor-publish.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-publish.ts"],"names":[],"mappings":"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"}

package/packtory/packtory-pack.js

@@ -2,43 +2,16 @@
 import { Result } from 'true-myth';
 import { safeParse } from '@schema-hub/zod-error-formatter';
 import { z } from 'zod/mini';
-import { serializePackageJson } from "../version-manager/manifest/serialize.js";
+import { bundledInstalledDependencyPath } from "../common/package-layout.js";
+import { packageNameMap } from "../common/package-name-map.js";
+import { serializeStableJson } from "../common/stable-json.js";
+import { createWorklist } from "../common/worklist.js";
+import { vendorMaterializerFailureType } from "../vendor-materializer/vendor-materializer.js";
+import { packPackageFailureType } from "./packtory-results.js";
 const manifestSchema = z.record(z.string(), z.unknown());
-const nodeModulesFolderName = 'node_modules';
-function findPackage(resolved, packageName) {
-    const target = resolved.find((resolvedPackage) => {
-        return resolvedPackage.name === packageName;
-    });
-    if (target === undefined) {
-        return Result.err({ type: 'package-not-found', packageName });
-    }
-    return Result.ok(target);
-}
-function stripVendoredManifestFields(manifest) {
-    const slim = {};
-    for (const [key, value] of Object.entries(manifest)) {
-        if (key !== 'dependencies' && key !== 'peerDependencies') {
-            slim[key] = value;
-        }
-    }
-    return slim;
-}
-function asPackageJson(record) {
-    // serializePackageJson sorts and stringifies any plain object; the PackageJson cast keeps
-    // the public seam without forcing every test fixture through type-fest's deep type.
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- structural compat
-    return record;
-}
-function slimManifestForVendoredArtifact(bundle) {
-    const parsed = safeParse(manifestSchema, JSON.parse(bundle.manifestFile.content));
-    if (!parsed.success) {
-        return bundle;
-    }
-    const content = serializePackageJson(asPackageJson(stripVendoredManifestFields(parsed.data)));
-    return {
-        ...bundle,
-        manifestFile: { ...bundle.manifestFile, content }
-    };
+function shouldPreservePackageJsonArrayOrder(path) {
+    const [topLevelKey] = path;
+    return topLevelKey === 'imports' || topLevelKey === 'exports';
 }
 function buildVersionedBundle(versionManager, target, version) {
     return versionManager.addVersion({
@@ -51,107 +24,127 @@ function buildVersionedBundle(versionManager, target, version) {
         allowMutableSpecifiers: target.resolveOptions.allowMutableSpecifiers
     });
 }
-function bundleDependencyAsExtraFiles(versioned) {
-    const prefix = `${nodeModulesFolderName}/${versioned.name}`;
-    const manifest = {
-        filePath: `${prefix}/${versioned.manifestFile.filePath}`,
+function appendBundleDependency(closure, versionManager, fallbackVersion, pkg) {
+    const versioned = buildVersionedBundle(versionManager, pkg, fallbackVersion);
+    closure.packageNames.add(pkg.name);
+    closure.extraFiles.push({
+        filePath: bundledInstalledDependencyPath(versioned.name, versioned.manifestFile.filePath),
         content: versioned.manifestFile.content,
         isExecutable: versioned.manifestFile.isExecutable
-    };
-    const sources = versioned.contents.map((entry) => {
-        return {
-            filePath: `${prefix}/${entry.fileDescription.targetFilePath}`,
+    });
+    for (const entry of versioned.contents) {
+        closure.extraFiles.push({
+            filePath: bundledInstalledDependencyPath(versioned.name, entry.fileDescription.targetFilePath),
             content: entry.fileDescription.content,
             isExecutable: entry.fileDescription.isExecutable
-        };
-    });
-    return [manifest, ...sources];
-}
-function recordVisitedBundleDependency(builder, versionManager, fallbackVersion, pkg) {
-    builder.packageNames.add(pkg.name);
-    const versioned = buildVersionedBundle(versionManager, pkg, fallbackVersion);
-    builder.extraFiles.push(...bundleDependencyAsExtraFiles(versioned));
-    builder.peerRequirements.set(pkg.name, Object.keys(versioned.peerDependencies));
-}
-function visitBundleDependency(builder, versionManager, fallbackVersion, name) {
-    if (builder.packageNames.has(name)) {
-        return;
-    }
-    const pkg = builder.resolvedByName.get(name);
-    if (pkg === undefined) {
-        return;
-    }
-    recordVisitedBundleDependency(builder, versionManager, fallbackVersion, pkg);
-    for (const transitiveName of pkg.analyzedBundle.linkedBundleDependencies.keys()) {
-        visitBundleDependency(builder, versionManager, fallbackVersion, transitiveName);
+        });
     }
+    closure.peerRequirements.set(pkg.name, Object.keys(versioned.peerDependencies));
+    closure.pendingDependencyNames.scheduleAll(pkg.analyzedBundle.linkedBundleDependencies.keys());
 }
 function collectBundleDependencies(target, resolvedPackages, versionManager, fallbackVersion) {
-    const builder = {
+    const resolvedByName = new Map(packageNameMap(resolvedPackages));
+    const closure = {
         extraFiles: [],
         packageNames: new Set(),
         peerRequirements: new Map(),
-        resolvedByName: new Map(resolvedPackages.map((resolvedPackage) => {
-            return [resolvedPackage.name, resolvedPackage];
-        }))
+        pendingDependencyNames: createWorklist(target.analyzedBundle.linkedBundleDependencies.keys())
+    };
+    for (let dependencyName = closure.pendingDependencyNames.takeNext(); dependencyName !== undefined; dependencyName = closure.pendingDependencyNames.takeNext()) {
+        const pkg = closure.packageNames.has(dependencyName) ? undefined : resolvedByName.get(dependencyName);
+        if (pkg !== undefined) {
+            appendBundleDependency(closure, versionManager, fallbackVersion, pkg);
+        }
+    }
+    return {
+        extraFiles: closure.extraFiles,
+        packageNames: closure.packageNames,
+        peerRequirements: closure.peerRequirements
     };
-    for (const name of target.analyzedBundle.linkedBundleDependencies.keys()) {
-        visitBundleDependency(builder, versionManager, fallbackVersion, name);
+}
+function mapMaterializerFailure(packageName, error) {
+    if (error.type === vendorMaterializerFailureType.symlinkTargetOutsidePackage) {
+        return {
+            type: packPackageFailureType.vendorSymlinkTargetOutsidePackage,
+            packageName,
+            vendoredPackageName: error.packageName,
+            entryRelativePath: error.entryRelativePath,
+            resolvedTargetPath: error.resolvedTargetPath
+        };
     }
     return {
-        extraFiles: builder.extraFiles,
-        packageNames: builder.packageNames,
-        peerRequirements: builder.peerRequirements
+        type: packPackageFailureType.vendorInvalidDependencyName,
+        packageName,
+        sourcePackageName: error.sourcePackageName,
+        invalidDependencyName: error.invalidDependencyName
     };
 }
-function findUnsatisfiedPeers(closurePackageNames, peerRequirements) {
-    const unsatisfied = [];
+function buildUnsatisfiedPeers(peerRequirements, closurePackageNames) {
+    const unsatisfiedPeers = [];
     for (const [packageName, peers] of peerRequirements) {
         for (const peer of peers) {
             if (!closurePackageNames.has(peer)) {
-                unsatisfied.push({ packageName, peer });
+                unsatisfiedPeers.push({ packageName, peer });
             }
         }
     }
-    return unsatisfied;
+    return unsatisfiedPeers;
+}
+function buildVendoredClosureCheck(bundleClosure, materializationResult) {
+    const closurePackageNames = new Set([
+        ...bundleClosure.packageNames,
+        ...materializationResult.value.packageNames
+    ]);
+    const allPeerRequirements = new Map([
+        ...bundleClosure.peerRequirements,
+        ...materializationResult.value.peerRequirements
+    ]);
+    return {
+        closurePackageNames,
+        unsatisfiedPeers: buildUnsatisfiedPeers(allPeerRequirements, closurePackageNames)
+    };
 }
-function mergePeerRequirements(left, right) {
-    const merged = new Map();
-    for (const [name, peers] of left) {
-        merged.set(name, peers);
-    }
-    for (const [name, peers] of right) {
-        merged.set(name, peers);
+function stripVendoredManifestFields(manifest) {
+    const slimManifest = {};
+    for (const [key, value] of Object.entries(manifest)) {
+        if (key !== 'dependencies' && key !== 'peerDependencies') {
+            slimManifest[key] = value;
+        }
     }
-    return merged;
+    return slimManifest;
 }
-function mapSymlinkFailure(packageName, materializerFailure) {
-    return {
-        type: 'vendor-symlink-target-outside-package',
-        packageName,
-        vendoredPackageName: materializerFailure.packageName,
-        entryRelativePath: materializerFailure.entryRelativePath,
-        resolvedTargetPath: materializerFailure.resolvedTargetPath
-    };
+function serializeVendoredManifest(bundle) {
+    const parsedManifest = safeParse(manifestSchema, JSON.parse(bundle.manifestFile.content));
+    if (!parsedManifest.success) {
+        return undefined;
+    }
+    return serializeStableJson(stripVendoredManifestFields(parsedManifest.data), {
+        shouldPreserveArrayOrder: shouldPreservePackageJsonArrayOrder
+    });
 }
-function mapInvalidDependencyNameFailure(packageName, materializerFailure) {
+function slimManifestForVendoredArtifact(bundle) {
+    const serializedManifest = serializeVendoredManifest(bundle);
+    if (serializedManifest === undefined) {
+        return bundle;
+    }
     return {
-        type: 'vendor-invalid-dependency-name',
-        packageName,
-        sourcePackageName: materializerFailure.sourcePackageName,
-        invalidDependencyName: materializerFailure.invalidDependencyName
+        ...bundle,
+        manifestFile: { ...bundle.manifestFile, content: serializedManifest }
     };
 }
-function mapMaterializerFailure(packageName, materializerFailure) {
-    if (materializerFailure.type === 'symlink-target-outside-package') {
-        return mapSymlinkFailure(packageName, materializerFailure);
-    }
-    return mapInvalidDependencyNameFailure(packageName, materializerFailure);
+function prepareVendoredArtifactFailure(target, unsatisfiedPeers) {
+    return Result.err({
+        type: packPackageFailureType.peerDependenciesUnsatisfied,
+        packageName: target.name,
+        items: unsatisfiedPeers
+    });
 }
-function checkClosurePeers(bundleClosure, externals) {
-    const closurePackageNames = new Set([...bundleClosure.packageNames, ...externals.value.packageNames]);
-    const allPeerRequirements = mergePeerRequirements(bundleClosure.peerRequirements, externals.value.peerRequirements);
-    return findUnsatisfiedPeers(closurePackageNames, allPeerRequirements);
+function prepareVendoredArtifactSuccess(built, bundleClosure, materializationResult) {
+    return Result.ok({
+        bundle: slimManifestForVendoredArtifact(built),
+        vendorEntries: materializationResult.value.entries,
+        extraFiles: bundleClosure.extraFiles
+    });
 }
 async function prepareVendoredArtifact(dependencies, inputs) {
     const { target, resolved, built, version } = inputs;
@@ -163,50 +156,45 @@ async function prepareVendoredArtifact(dependencies, inputs) {
     if (materializationResult.isErr) {
         return Result.err(mapMaterializerFailure(target.name, materializationResult.error));
     }
-    const unsatisfiedPeers = checkClosurePeers(bundleClosure, materializationResult);
-    if (unsatisfiedPeers.length > 0) {
-        return Result.err({ type: 'peer-dependencies-unsatisfied', packageName: target.name, items: unsatisfiedPeers });
+    const closureCheck = buildVendoredClosureCheck(bundleClosure, materializationResult);
+    if (closureCheck.unsatisfiedPeers.length > 0) {
+        return prepareVendoredArtifactFailure(target, closureCheck.unsatisfiedPeers);
     }
-    return Result.ok({
-        bundle: slimManifestForVendoredArtifact(built),
-        vendorEntries: materializationResult.value.entries,
-        extraFiles: bundleClosure.extraFiles
-    });
+    return prepareVendoredArtifactSuccess(built, bundleClosure, materializationResult);
 }
 async function prepareArtifact(dependencies, target, resolved, options) {
     const built = buildVersionedBundle(dependencies.versionManager, target, options.version);
-    if (!options.vendorDependencies) {
-        if (target.resolveOptions.bundleDependencies.length > 0) {
-            return Result.err({ type: 'bundle-dependencies-unsupported', packageName: target.name });
-        }
-        return Result.ok({ bundle: built, vendorEntries: [], extraFiles: [] });
+    if (options.vendorDependencies) {
+        return await prepareVendoredArtifact(dependencies, {
+            target,
+            resolved,
+            built,
+            version: options.version
+        });
     }
-    return await prepareVendoredArtifact(dependencies, {
-        target,
-        resolved,
-        built,
-        version: options.version
-    });
-}
-async function emitPreparedArtifact(packEmitter, prepared, options) {
-    await packEmitter.pack({
-        bundle: prepared.bundle,
-        format: options.format,
-        outputPath: options.outputPath,
-        vendorEntries: prepared.vendorEntries,
-        extraFiles: prepared.extraFiles
-    });
+    if (target.resolveOptions.bundleDependencies.length > 0) {
+        return Result.err({ type: packPackageFailureType.bundleDependenciesUnsupported, packageName: target.name });
+    }
+    return Result.ok({ bundle: built, vendorEntries: [], extraFiles: [] });
 }
 async function packWithResolved(dependencies, resolved, options) {
-    const targetResult = findPackage(resolved, options.packageName);
-    if (targetResult.isErr) {
-        return Result.err(targetResult.error);
+    const target = resolved.find((resolvedPackage) => {
+        return resolvedPackage.name === options.packageName;
+    });
+    if (target === undefined) {
+        return Result.err({ type: packPackageFailureType.packageNotFound, packageName: options.packageName });
     }
-    const preparedResult = await prepareArtifact(dependencies, targetResult.value, resolved, options);
+    const preparedResult = await prepareArtifact(dependencies, target, resolved, options);
     if (preparedResult.isErr) {
         return Result.err(preparedResult.error);
     }
-    await emitPreparedArtifact(dependencies.packEmitter, preparedResult.value, options);
+    await dependencies.packEmitter.pack({
+        bundle: preparedResult.value.bundle,
+        format: options.format,
+        outputPath: options.outputPath,
+        vendorEntries: preparedResult.value.vendorEntries,
+        extraFiles: preparedResult.value.extraFiles
+    });
     return Result.ok(undefined);
 }
 export function createRunPackValidated(dependencies) {

package/packtory/packtory-pack.js.map

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

package/packtory/packtory-release-analysis.js

@@ -1,22 +1,18 @@
 import { Result } from 'true-myth';
-import { releaseAnalysisPartialFailure } from "./packtory-results.js";
+import { partialFailureType, releaseAnalysisPartialFailure } from "./packtory-results.js";
+import { mapResolvePartialFailure, succeededResultsFrom } from "./partial-result.js";
+import { wasAlreadyPublished } from "./published-release-state.js";
 import { classifyPackageRelease, summarizeReleaseAnalysis } from "./release-analysis.js";
 import { determineVersionAndPublishAll } from "./stages/publish-stage.js";
 function toReleaseAnalysisError(error) {
     return error instanceof Error ? error : new Error(String(error));
 }
-function succeededFromPublish(publishResult) {
-    if (publishResult.isOk) {
-        return publishResult.value;
-    }
-    return publishResult.error.succeeded;
-}
 async function analyzeSucceededPublishes(artifactsBuilder, succeededPublish) {
     const analyses = [];
     const failures = [];
     for (const buildResult of succeededPublish) {
         try {
-            const newFiles = buildResult.status === 'already-published'
+            const newFiles = wasAlreadyPublished(buildResult)
                 ? buildResult.extraFiles
                 : artifactsBuilder.collectContents(buildResult.bundle, 'package', buildResult.extraFiles);
             analyses.push(classifyPackageRelease(buildResult, newFiles));
@@ -28,18 +24,14 @@ async function analyzeSucceededPublishes(artifactsBuilder, succeededPublish) {
     return failures.length === 0 ? Result.ok(analyses) : Result.err({ failures, succeeded: analyses });
 }
 function mapResolveFailureToReleaseAnalysisFailure(error) {
-    if (error.type === 'partial') {
-        return {
-            type: 'partial',
-            succeeded: [],
-            failures: error.error.failures
-        };
+    if (error.type === partialFailureType) {
+        return mapResolvePartialFailure(error);
     }
     return error;
 }
 function buildPartialFromPublish(publishResult, analyses) {
     return {
-        type: 'partial',
+        type: partialFailureType,
         succeeded: analyses,
         failures: publishResult.error.failures
     };
@@ -62,7 +54,7 @@ export function createAnalyzeReleaseAgainstLatestPublishedValidated(dependencies
         const publishResult = await determineVersionAndPublishAll(dependencies, validated, resolved.value, {
             dryRun: true
         });
-        const analysisResult = await analyzeSucceededPublishes(dependencies.artifactsBuilder, succeededFromPublish(publishResult));
+        const analysisResult = await analyzeSucceededPublishes(dependencies.artifactsBuilder, succeededResultsFrom(publishResult));
         return toFinalReleaseAnalysisResult(publishResult, analysisResult);
     };
 }

package/packtory/packtory-release-analysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"packtory-release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/packtory-release-analysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,EACH,6BAA6B,EAKhC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,EAAE,6BAA6B,EAAiC,MAAM,2BAA2B,CAAC;AAezG,SAAS,sBAAsB,CAAC,KAAc;IAC1C,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,aAAkC;IAC5D,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;QACrB,OAAO,aAAa,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,OAAO,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,yBAAyB,CACpC,gBAA6E,EAC7E,gBAAkD;IAElD,MAAM,QAAQ,GAA6B,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAY,EAAE,CAAC;IAE7B,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE,CAAC;QACzC,IAAI,CAAC;YACD,MAAM,QAAQ,GACV,WAAW,CAAC,MAAM,KAAK,mBAAmB;gBACtC,CAAC,CAAC,WAAW,CAAC,UAAU;gBACxB,CAAC,CAAC,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;YAClG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;AACvG,CAAC;AAED,SAAS,yCAAyC,CAAC,KAA4B;IAC3E,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;YACH,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ;SACjC,CAAC;IACN,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,uBAAuB,CAC5B,aAA4D,EAC5D,QAA2C;IAE3C,OAAO;QACH,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,QAAQ;QACnB,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ;KACzC,CAAC;AACN,CAAC;AAED,SAAS,4BAA4B,CACjC,aAAkC,EAClC,cAAqE;IAErE,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,GAAG,CACb,uBAAuB,CACnB,aAAa,EACb,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAC9E,CACJ,CAAC;IACN,CAAC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,MAAM,CAAC,EAAE,CAAC,wBAAwB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,mDAAmD,CAC/D,YAAqD;IAKrD,OAAO,KAAK,UAAU,6CAA6C,CAAC,SAAS,EAAE,0BAA0B;QACrG,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,6BAA6B,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE;YAC/F,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,yBAAyB,CAClD,YAAY,CAAC,gBAAgB,EAC7B,oBAAoB,CAAC,aAAa,CAAC,CACtC,CAAC;QACF,OAAO,4BAA4B,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"packtory-release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/packtory-release-analysis.ts"],"names":[],"mappings":"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"}