packtory 0.0.95 → 0.0.97

package/package.json

@@ -149,5 +149,5 @@
         "./tar/tarball-builder.js"
     ],
     "type": "module",
-    "version": "0.0.95"
+    "version": "0.0.97"
 }

package/packages/package-processor.composition.d.ts

@@ -1,9 +1,31 @@
+import { type ArtifactsBuilder } from '../artifacts/artifacts-builder.ts';
+import { type PackEmitter } from '../pack-emitter/pack-emitter.ts';
+import { type VendorMaterializer } from '../vendor-materializer/vendor-materializer.ts';
 import { type CiEnvironment } from '../bundle-emitter/repository-coherence.ts';
+import type { DeadCodeEliminator } from '../dead-code-eliminator/analyzed-bundle.ts';
+import { type FileManager } from '../file-manager/file-manager.ts';
+import { type PackageProcessor } from '../packtory/package-processor.ts';
 import type { VersionSourceResolver } from '../packtory/map-config.ts';
+import { type ProgressBroadcaster } from '../progress/progress-broadcaster.ts';
+import { type VersionManager } from '../version-manager/manager.ts';
+import { type CurrentGitHeadReader } from '../git/current-git-head.ts';
+export type PackageProcessorComposition = {
+    readonly fileManager: FileManager;
+    readonly packageProcessor: PackageProcessor;
+    readonly progressBroadcaster: ProgressBroadcaster;
+    readonly deadCodeEliminator: DeadCodeEliminator;
+    readonly artifactsBuilder: ArtifactsBuilder;
+    readonly versionManager: VersionManager;
+    readonly packEmitter: PackEmitter;
+    readonly vendorMaterializer: VendorMaterializer;
+    readonly readCurrentGitHead: CurrentGitHeadReader;
+    readonly repositoryFolder: string;
+};
 export type PackageProcessorCompositionOptions = {
     readonly promptForOneTimePassword?: (() => Promise<string | undefined>) | undefined;
     readonly ciEnvironment: CiEnvironment;
     readonly repositoryFolder?: string | undefined;
     readonly resolveVersionSource?: VersionSourceResolver | undefined;
 };
+export declare function buildPackageProcessorComposition(options: PackageProcessorCompositionOptions): PackageProcessorComposition;
 //# sourceMappingURL=package-processor.composition.d.ts.map

package/packages/package-processor.composition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-processor.composition.d.ts","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,KAKC,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACnG,OAAO,KAAK,EAUE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;MAwBjE,MAAM,kCAakC,GAAG;IAC7C,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACpF,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACrE,CAAC"}
+{"version":3,"file":"package-processor.composition.d.ts","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGlG,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAA4B,KAAK,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AAClH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACnG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAOrF,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEtF,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAA6B,KAAK,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAK1G,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE1F,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAgBnG,MAAM,MAAM,2BAA2B,GAAG;IACtC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAChD,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAChD,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;IAClD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC7C,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACpF,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACrE,CAAC;AAoHF,wBAAgB,gCAAgC,CAC5C,OAAO,EAAE,kCAAkC,GAC5C,2BAA2B,CAiC7B"}

package/packages/package-processor.composition.js

@@ -6,38 +6,165 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-import 'node:fs';
-import '@ts-morph/common';
-import 'libnpmpublish';
-import 'npm-registry-fetch';
-import 'ts-morph';
-import "../artifacts/artifacts-builder.js";
-import "../bundle-emitter/emitter.js";
-import "../bundle-emitter/registry/registry-client.js";
-import "../pack-emitter/pack-emitter.js";
-import "../vendor-materializer/vendor-materializer.js";
-import "../bundle-emitter/repository-coherence.js";
-import "../dead-code-eliminator/eliminator.js";
-import "../dependency-scanner/scanner.js";
-import "../dependency-scanner/source-file-references.js";
-import "../dependency-scanner/source-map-file-locator.js";
-import "../dependency-scanner/typescript-file-host.js";
-import "../dependency-scanner/typescript-project-analyzer.js";
-import "../file-manager/file-manager.js";
-import "../linker/linker.js";
-import "../packtory/package-processor.js";
-import "../progress/progress-broadcaster.js";
-import "../report/decorators.js";
-import "../resource-resolver/resource-resolver.js";
-import "../tar/tarball-builder.js";
-import "../zip/zip-builder.js";
-import "../version-manager/manager.js";
-import "../common/clock.js";
-import "../git/current-git-head.js";
-import "../git/git-command.js";
-import "../npm-oidc-id-token-resolver.js";
-import "../sbom/license-resolver.js";
-import "../sbom/sbom-file.js";
-import "../sbom/sbom-serializer.js";
-import "../sbom/tool-version.js";
+import fs from 'node:fs';
+import { RealFileSystemHost } from '@ts-morph/common';
+import { publish } from 'libnpmpublish';
+import npmFetch from 'npm-registry-fetch';
+import { ModuleKind, ModuleResolutionKind, Project, ScriptTarget } from 'ts-morph';
+import { createArtifactsBuilder } from "../artifacts/artifacts-builder.js";
+import { createBundleEmitter } from "../bundle-emitter/emitter.js";
+import { createRegistryClient } from "../bundle-emitter/registry/registry-client.js";
+import { createPackEmitter } from "../pack-emitter/pack-emitter.js";
+import { createVendorMaterializer } from "../vendor-materializer/vendor-materializer.js";
+import { getCiRepositoryUrl } from "../bundle-emitter/repository-coherence.js";
+import { createDeadCodeEliminator } from "../dead-code-eliminator/eliminator.js";
+import { createDependencyScanner } from "../dependency-scanner/scanner.js";
+import { getReferencedModules } from "../dependency-scanner/source-file-references.js";
+import { createSourceMapFileLocator } from "../dependency-scanner/source-map-file-locator.js";
+import { createFileSystemAdapters } from "../dependency-scanner/typescript-file-host.js";
+import { createTypescriptProjectAnalyzer } from "../dependency-scanner/typescript-project-analyzer.js";
+import { createFileManager } from "../file-manager/file-manager.js";
+import { createBundleLinker } from "../linker/linker.js";
+import { createPackageProcessor } from "../packtory/package-processor.js";
+import { createProgressBroadcaster } from "../progress/progress-broadcaster.js";
+import { withStageTimings } from "../report/decorators.js";
+import { createResourceResolver } from "../resource-resolver/resource-resolver.js";
+import { createTarballBuilder } from "../tar/tarball-builder.js";
+import { createZipBuilder } from "../zip/zip-builder.js";
+import { createVersionManager } from "../version-manager/manager.js";
+import { createClock } from "../common/clock.js";
+import { createCurrentGitHeadReader } from "../git/current-git-head.js";
+import { createChildProcessGitCommandExecutor, createGitCommandRunner, spawnChildProcessGitCommand } from "../git/git-command.js";
+import { createNpmOidcIdTokenResolver } from "../npm-oidc-id-token-resolver.js";
+import { createLicenseResolver } from "../sbom/license-resolver.js";
+import { createSbomFileBuilder } from "../sbom/sbom-file.js";
+import { createSbomSerializer } from "../sbom/sbom-serializer.js";
+import { createPacktoryToolVersionResolver } from "../sbom/tool-version.js";
+async function importPackageJson(specifier) {
+    return await import(__rewriteRelativeImportExtension(specifier), { with: { type: 'json' } });
+}
+function getEnvironmentVariable(variableName) {
+    const environment = process.env[variableName];
+    return environment === undefined || environment.length === 0 ? undefined : environment;
+}
+function createDependencyScannerWith(fileManager) {
+    const sourceMapFileLocator = createSourceMapFileLocator({ fileManager });
+    const fileSystemAdapters = createFileSystemAdapters({ fileSystemHost: new RealFileSystemHost() });
+    const typescriptProjectAnalyzer = createTypescriptProjectAnalyzer({
+        Project,
+        getReferencedModules,
+        fileSystemAdapters
+    });
+    return createDependencyScanner({ sourceMapFileLocator, typescriptProjectAnalyzer });
+}
+function buildRegistryClient(options, clock) {
+    return createRegistryClient({
+        npmFetch,
+        publish,
+        fetch,
+        clock,
+        resolveIdToken: createNpmOidcIdTokenResolver({
+            fetch,
+            getEnvironmentVariable
+        }),
+        promptForOneTimePassword: options.promptForOneTimePassword
+    });
+}
+function buildSbomFileBuilder(fileManager) {
+    return createSbomFileBuilder({
+        licenseResolver: createLicenseResolver({ fileManager }),
+        sbomSerializer: createSbomSerializer(),
+        toolVersionProvider: createPacktoryToolVersionResolver({ importPackageJson }),
+        projectFolder: process.cwd()
+    });
+}
+function buildBundleEmitter(options, artifactsBuilder, readCurrentGitHead) {
+    const registryClient = buildRegistryClient(options, createClock());
+    return createBundleEmitter({
+        registryClient,
+        artifactsBuilder,
+        ciRepositoryUrl: getCiRepositoryUrl(options.ciEnvironment),
+        readCurrentGitHead
+    });
+}
+function buildDeadCodeEliminator(progressBroadcaster) {
+    return createDeadCodeEliminator({
+        progressBroadcaster: progressBroadcaster.provider,
+        trace: undefined,
+        createProject() {
+            return new Project({
+                compilerOptions: {
+                    allowJs: true,
+                    module: ModuleKind.Node16,
+                    esModuleInterop: true,
+                    noLib: true,
+                    target: ScriptTarget.ES2022,
+                    moduleResolution: ModuleResolutionKind.Node16
+                },
+                skipLoadingLibFiles: true
+            });
+        }
+    });
+}
+function buildCompositionParts(options) {
+    const repositoryFolder = options.repositoryFolder ?? process.cwd();
+    const fileManager = createFileManager({ hostFileSystem: fs.promises });
+    const runGitCommand = createGitCommandRunner(createChildProcessGitCommandExecutor(spawnChildProcessGitCommand));
+    const readCurrentGitHead = createCurrentGitHeadReader({
+        repositoryFolder,
+        runGitCommand
+    });
+    const dependencyScanner = createDependencyScannerWith(fileManager);
+    const progressBroadcaster = createProgressBroadcaster();
+    const artifactsBuilder = createArtifactsBuilder({
+        fileManager,
+        tarballBuilder: createTarballBuilder({ fileManager }),
+        zipBuilder: createZipBuilder({ fileManager }),
+        progressBroadcaster: progressBroadcaster.provider
+    });
+    return {
+        fileManager,
+        progressBroadcaster,
+        artifactsBuilder,
+        bundleEmitter: buildBundleEmitter(options, artifactsBuilder, readCurrentGitHead),
+        resourceResolver: createResourceResolver({ fileManager, dependencyScanner }),
+        sbomFileBuilder: buildSbomFileBuilder(fileManager),
+        deadCodeEliminator: buildDeadCodeEliminator(progressBroadcaster),
+        readCurrentGitHead,
+        repositoryFolder
+    };
+}
+export function buildPackageProcessorComposition(options) {
+    const parts = buildCompositionParts(options);
+    const versionManager = createVersionManager({ progressBroadcaster: parts.progressBroadcaster.provider });
+    const basePackageProcessor = createPackageProcessor({
+        progressBroadcaster: parts.progressBroadcaster.provider,
+        versionManager,
+        bundleEmitter: parts.bundleEmitter,
+        linker: createBundleLinker(),
+        resourceResolver: parts.resourceResolver,
+        sbomFileBuilder: parts.sbomFileBuilder,
+        deadCodeEliminator: parts.deadCodeEliminator,
+        fileManager: parts.fileManager,
+        repositoryFolder: parts.repositoryFolder
+    });
+    const packageProcessor = withStageTimings(basePackageProcessor, parts.progressBroadcaster.provider);
+    const packEmitter = createPackEmitter({
+        artifactsBuilder: parts.artifactsBuilder,
+        fileManager: parts.fileManager
+    });
+    const vendorMaterializer = createVendorMaterializer({ fileManager: parts.fileManager });
+    return {
+        fileManager: parts.fileManager,
+        packageProcessor,
+        progressBroadcaster: parts.progressBroadcaster,
+        deadCodeEliminator: parts.deadCodeEliminator,
+        artifactsBuilder: parts.artifactsBuilder,
+        versionManager,
+        packEmitter,
+        vendorMaterializer,
+        readCurrentGitHead: parts.readCurrentGitHead,
+        repositoryFolder: parts.repositoryFolder
+    };
+}
 //# sourceMappingURL=package-processor.composition.js.map

package/packages/package-processor.composition.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-processor.composition.js","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAe,SAAS,CAAC;AACzB,OAAmC,kBAAkB,CAAC;AACtD,OAAwB,eAAe,CAAC;AACxC,OAAqB,oBAAoB,CAAC;AAC1C,OAAwE,UAAU,CAAC;AACnF,OAA8D,mCAAmC,CAAC;AAClG,OAAwD,8BAA8B,CAAC;AACvF,OAA0D,+CAA+C,CAAC;AAC1G,OAAoD,iCAAiC,CAAC;AACtF,OAAkE,+CAA+C,CAAC;AAClH,OAAuD,2CAA2C,CAAC;AAEnG,OAAyC,uCAAuC,CAAC;AACjF,OAAgE,kCAAkC,CAAC;AACnG,OAAqC,iDAAiD,CAAC;AACvF,OAA2C,kDAAkD,CAAC;AAC9F,OAAyC,+CAA+C,CAAC;AACzF,OAAgD,sDAAsD,CAAC;AACvG,OAAoD,iCAAiC,CAAC;AACtF,OAAmC,qBAAqB,CAAC;AACzD,OAA8D,kCAAkC,CAAC;AAEjG,OAAoE,qCAAqC,CAAC;AAC1G,OAAiC,yBAAyB,CAAC;AAC3D,OAA8D,2CAA2C,CAAC;AAC1G,OAAqC,2BAA2B,CAAC;AACjE,OAAiC,uBAAuB,CAAC;AACzD,OAA0D,+BAA+B,CAAC;AAC1F,OAAwC,oBAAoB,CAAC;AAC7D,OAAsE,4BAA4B,CAAC;AACnG,OAIO,uBAAuB,CAAC;AAC/B,OAA6C,kCAAkC,CAAC;AAChF,OAAsC,6BAA6B,CAAC;AACpE,OAA4D,sBAAsB,CAAC;AACnF,OAAqC,4BAA4B,CAAC;AAClE,OAAkD,yBAAyB,CAAC"}
+{"version":3,"file":"package-processor.composition.js","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":"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"}

package/packtory/changelog-source-attribution.js

@@ -116,35 +116,35 @@ function resolveMapSource(mapFilePath, traceMap, source) {
     }
     return path.resolve(path.dirname(mapFilePath), traceMap.sourceRoot ?? '', source);
 }
-function resolveSingleSourceMappingUrl(sourceFilePath, sourceMappingUrls) {
+function resolveSingleSourceMappingUrl(inputFilePath, sourceMappingUrls) {
     if (sourceMappingUrls.length > 1) {
-        throw new Error(`Multiple sourceMappingURL references found in "${sourceFilePath}"`);
+        throw new Error(`Multiple sourceMappingURL references found in "${inputFilePath}"`);
     }
     return sourceMappingUrls[0];
 }
-async function ensureMapIsReadable(dependencies, sourceFilePath, mapFilePath) {
+async function ensureMapIsReadable(dependencies, inputFilePath, mapFilePath) {
     const readability = await dependencies.fileManager.checkReadability(mapFilePath);
     if (!readability.isReadable) {
-        throw new Error(`Source map "${mapFilePath}" referenced by "${sourceFilePath}" is not readable`);
+        throw new Error(`Source map "${mapFilePath}" referenced by "${inputFilePath}" is not readable`);
     }
 }
-async function readReferencedMap(dependencies, sourceFilePath) {
-    const fileContent = await dependencies.fileManager.readFile(sourceFilePath);
-    const sourceMappingUrl = resolveSingleSourceMappingUrl(sourceFilePath, collectSourceMappingUrls(fileContent));
+async function readReferencedMap(dependencies, inputFilePath) {
+    const fileContent = await dependencies.fileManager.readFile(inputFilePath);
+    const sourceMappingUrl = resolveSingleSourceMappingUrl(inputFilePath, collectSourceMappingUrls(fileContent));
     if (sourceMappingUrl === undefined) {
         return undefined;
     }
-    const mapFilePath = path.resolve(path.dirname(sourceFilePath), sourceMappingUrl);
-    await ensureMapIsReadable(dependencies, sourceFilePath, mapFilePath);
+    const mapFilePath = path.resolve(path.dirname(inputFilePath), sourceMappingUrl);
+    await ensureMapIsReadable(dependencies, inputFilePath, mapFilePath);
     return {
         mapFilePath,
         content: await dependencies.fileManager.readFile(mapFilePath)
     };
 }
-async function attributeJavaScriptFile(dependencies, sourceFilePath) {
-    const referencedMap = await readReferencedMap(dependencies, sourceFilePath);
+async function attributeJavaScriptFile(dependencies, inputFilePath) {
+    const referencedMap = await readReferencedMap(dependencies, inputFilePath);
     if (referencedMap === undefined) {
-        return [toRepositoryRelativePath(dependencies.repositoryFolder, sourceFilePath)];
+        return [toRepositoryRelativePath(dependencies.repositoryFolder, inputFilePath)];
     }
     const traceMap = parseTraceMap(referencedMap.mapFilePath, referencedMap.content);
     return traceMap.sources.map(function (source) {
@@ -152,11 +152,11 @@ async function attributeJavaScriptFile(dependencies, sourceFilePath) {
     });
 }
 async function collectAttributedFiles(dependencies, entry) {
-    const { fileDescription: { sourceFilePath } } = entry;
-    if (isJavaScriptFile(sourceFilePath)) {
-        return attributeJavaScriptFile(dependencies, sourceFilePath);
+    const { fileDescription: { inputFilePath } } = entry;
+    if (isJavaScriptFile(inputFilePath)) {
+        return attributeJavaScriptFile(dependencies, inputFilePath);
     }
-    return [toRepositoryRelativePath(dependencies.repositoryFolder, sourceFilePath)];
+    return [toRepositoryRelativePath(dependencies.repositoryFolder, inputFilePath)];
 }
 export async function attributeChangelogSourceFiles(dependencies, analyzedBundle, additionalSourceFiles) {
     const attributedFiles = Array.from(additionalSourceFiles);

package/packtory/changelog-source-attribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"changelog-source-attribution.js","sourceRoot":"","sources":["../../../../source/packtory/changelog-source-attribution.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACjH,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAgBzD,MAAM,oBAAoB,GAAG,CAAE,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,CAAW,CAAC;AAOrG,SAAS,mBAAmB;IACxB,OAAO,uBAAuB,CAAC;AACnC,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAyB;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,UAAU,CAAC,KAAoD;IACpE,OAAO,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,0BAA0B,CAAC,eAAwC;IACxE,OAAO,CACH,UAAU,CAAC,eAAe,CAAC,+BAA+B,CAAC;QAC3D,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC;QACxC,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC;QAC5C,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CACtC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;IAC9C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAED,SAAS,mBAAmB,CACxB,QAA2C,EAC3C,SAAgD;IAEhD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAED,SAAS,yBAAyB,CAC9B,gBAAmD,EACnD,eAAkD,EAClD,SAAgD;IAEhD,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAE,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAE,CAAC,CAAC;IACrG,OAAO,KAAK;SACP,IAAI,CAAC,KAAK,CAAC;SACX,MAAM,CAAC,UAAU,IAAI;QAClB,OAAO,oBAAoB,CAAC,IAAI,CAAC,KAAK,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC,CAAC;SACD,QAAQ,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,qBAAqB,CAC1B,QAA2C,EAC3C,cAAsB;IAEtB,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,cAAc,CAAC,CAAC;QACzE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,OAAO,CAAC;QACnB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,mCAAmC,CAC/C,eAAwC,EACxC,qBAAwC;IAExC,OAAO,CAAE,GAAG,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAE,cAAc,CAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,qBAAqB,CAAE,CAAC;AAClH,CAAC;AAED,SAAS,6BAA6B;IAClC,OAAO,wDAAwD;QAC3D,+BAA+B,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACvD,OAAO,6BAA6B,EAAE,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,qCAAqC,CACjD,uBAA+B,EAC/B,sBAA8B;IAE9B,MAAM,gBAAgB,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,eAAe,CAAC,sBAAsB,CAAC,CAAC;IAChE,IAAI,gBAAgB,KAAK,SAAS,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClE,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,KAAK;SACP,IAAI,CACD,IAAI,GAAG,CACH,oBAAoB,CAAC,OAAO,CAAC,UAAU,SAAS;QAC5C,OAAO,yBAAyB,CAAC,gBAAgB,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC,CAAC,CACL,CACJ;SACA,QAAQ,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,eAAuB,EACvB,eAAkC;IAElC,MAAM,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAClD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,eAAe;SACjB,OAAO,CAAC,UAAU,IAAI;QACnB,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtD,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAE,CAAC;IAC9D,CAAC,CAAC,CAAC;AACX,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACtC,OAAO,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,wBAAwB,CAAC,gBAAwB,EAAE,QAAgB;IACxE,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAC/D,IAAI,YAAY,KAAK,EAAE,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACxF,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,mCAAmC,gBAAgB,GAAG,CAAC,CAAC;IAC9G,CAAC;IACD,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,wBAAwB,CAAC,WAAmB;IACjD,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QACjD,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,gBAAgB,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,gBAAgB,CAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAAC,WAAmB,EAAE,OAAe;IACvD,IAAI,CAAC;QACD,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACrF,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAmB,EAAE,QAAkB,EAAE,MAAqB;IACpF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,4BAA4B,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,6BAA6B,CAClC,cAAsB,EACtB,iBAAoC;IAEpC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kDAAkD,cAAc,GAAG,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,KAAK,UAAU,mBAAmB,CAC9B,YAAoD,EACpD,cAAsB,EACtB,WAAmB;IAEnB,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACjF,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,oBAAoB,cAAc,mBAAmB,CAAC,CAAC;IACrG,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC5B,YAAoD,EACpD,cAAsB;IAEtB,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,cAAc,EAAE,wBAAwB,CAAC,WAAW,CAAC,CAAC,CAAC;IAE9G,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjF,MAAM,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACrE,OAAO;QACH,WAAW;QACX,OAAO,EAAE,MAAM,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;KAChE,CAAC;AACN,CAAC;AAED,KAAK,UAAU,uBAAuB,CAClC,YAAoD,EACpD,cAAsB;IAEtB,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5E,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,CAAE,wBAAwB,CAAC,YAAY,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAE,CAAC;IACvF,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACjF,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM;QACxC,OAAO,wBAAwB,CAC3B,YAAY,CAAC,gBAAgB,EAC7B,gBAAgB,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAChE,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,sBAAsB,CACjC,YAAoD,EACpD,KAA6B;IAE7B,MAAM,EACF,eAAe,EAAE,EAAE,cAAc,EAAE,EACtC,GAAG,KAAK,CAAC;IACV,IAAI,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC;QACnC,OAAO,uBAAuB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,CAAE,wBAAwB,CAAC,YAAY,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAE,CAAC;AACvF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,YAAoD,EACpD,cAA8B,EAC9B,qBAAwC;IAExC,MAAM,eAAe,GAAa,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpE,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC7B,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,sBAAsB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;IACD,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qCAAqC,CACvD,YAAoD,EACpD,cAA8B,EAC9B,qBAAwC,EACxC,qBAA0C;IAE1C,MAAM,eAAe,GAAa,qBAAqB,CAAC,GAAG,CAAC,uBAAuB,CAAC;QAChF,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,qBAAqB,CAAC;QACrD,CAAC,CAAC,EAAE,CAAC;IACT,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAChF,IAAI,CAAC,KAAK,CAAC,mBAAmB,IAAI,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC1E,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,sBAAsB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;IACD,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"changelog-source-attribution.js","sourceRoot":"","sources":["../../../../source/packtory/changelog-source-attribution.ts"],"names":[],"mappings":"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"}

package/packtory/map-config.d.ts

@@ -1,10 +1,13 @@
-import type { PacktoryConfig } from '../config/config.ts';
+import type { PackageConfigsByName, PacktoryConfig, PacktoryConfigWithoutRegistry } from '../config/config.ts';
 import type { SourceManualVersioningSettings, VersionProvider } from '../config/manual-versioning-settings.ts';
 import type { BundleSubstitutionSource } from '../linker/linked-bundle.ts';
 import type { PublishedPackageWithManifest } from '../published-package/published-package.ts';
 import { type SharedPackageOptions, type VersioningSettings } from './options/prepare-package-options.ts';
 import { type AdditionalChangelogSourceFiles, type PublishSettings } from './options/setting-resolvers.ts';
 type PublishVersioningSettings = Exclude<VersioningSettings, SourceManualVersioningSettings>;
+export type BuildOptions = SharedPackageOptions<PublishedPackageWithManifest> & {
+    readonly version: string;
+};
 type PackageAttributionOptions = {
     readonly additionalChangelogSourceFiles: AdditionalChangelogSourceFiles;
 };
@@ -16,11 +19,18 @@ export type BuildAndPublishOptions = BuildAndPublishSharedOptions & {
     readonly ignoredAttributionPaths: readonly string[];
 };
 export type ResolveAndLinkOptions = PackageAttributionOptions & SharedPackageOptions<BundleSubstitutionSource>;
+export type BuildAndPublishMappingContext = {
+    readonly existingBundles: readonly PublishedPackageWithManifest[];
+    readonly repositoryFolder?: string | undefined;
+    readonly resolveVersionSource?: VersionSourceResolver | undefined;
+};
 type VersionSourceResolverInput = {
     readonly packageName: string;
     readonly source: SourceManualVersioningSettings;
     readonly packtoryConfig: PacktoryConfig;
 };
 export type VersionSourceResolver = (input: VersionSourceResolverInput) => VersionProvider;
+export declare function configToBuildAndPublishOptions(packageName: string, packageConfigs: PackageConfigsByName, packtoryConfig: PacktoryConfig, context: BuildAndPublishMappingContext): BuildAndPublishOptions;
+export declare function configToResolveAndLinkOptions(packageName: string, packageConfigs: PackageConfigsByName, packtoryConfig: PacktoryConfigWithoutRegistry, existingBundles: readonly BundleSubstitutionSource[]): ResolveAndLinkOptions;
 export {};
 //# sourceMappingURL=map-config.d.ts.map

package/packtory/map-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-config.d.ts","sourceRoot":"","sources":["../../../../source/packtory/map-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAqE,MAAM,qBAAqB,CAAC;AAC/G,OAAO,KAAK,EAAE,8BAA8B,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/G,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAC9F,OAAO,EAEH,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAC1B,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAEH,KAAK,8BAA8B,EACnC,KAAK,eAAe,EACvB,MAAM,gCAAgC,CAAC;AAExC,KAAK,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;8BAM/D,GAAG;IAC7B,QAAQ,CAAC,8BAA8B,EAAE,8BAA8B,CAAC;CAC3E,CAAC;AAEF,KAAK,4BAA4B,GAAG,yBAAyB,GAAG,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;AAEnH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG;IAChE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC3E,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,yBAAyB,CAAC;IAC/C,QAAQ,CAAC,uBAAuB,EAAE,SAAS,MAAM,EAAE,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;+BAQhF,GAAG;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,0BAA0B,KAAK,eAAe,CAAC;AAoB3F"}
+{"version":3,"file":"map-config.d.ts","sourceRoot":"","sources":["../../../../source/packtory/map-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC/G,OAAO,KAAK,EAAE,8BAA8B,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/G,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAC9F,OAAO,EAEH,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAC1B,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAEH,KAAK,8BAA8B,EACnC,KAAK,eAAe,EACvB,MAAM,gCAAgC,CAAC;AAExC,KAAK,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;AAE7F,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC,4BAA4B,CAAC,GAAG;IAC5E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC7B,QAAQ,CAAC,8BAA8B,EAAE,8BAA8B,CAAC;CAC3E,CAAC;AAEF,KAAK,4BAA4B,GAAG,yBAAyB,GAAG,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;AAEnH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG;IAChE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC3E,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,yBAAyB,CAAC;IAC/C,QAAQ,CAAC,uBAAuB,EAAE,SAAS,MAAM,EAAE,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;AAE/G,MAAM,MAAM,6BAA6B,GAAG;IACxC,QAAQ,CAAC,eAAe,EAAE,SAAS,4BAA4B,EAAE,CAAC;IAClE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACrE,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,0BAA0B,KAAK,eAAe,CAAC;AAoB3F,wBAAgB,8BAA8B,CAC1C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,oBAAoB,EACpC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,6BAA6B,GACvC,sBAAsB,CAiBxB;AAED,wBAAgB,6BAA6B,CACzC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,oBAAoB,EACpC,cAAc,EAAE,6BAA6B,EAC7C,eAAe,EAAE,SAAS,wBAAwB,EAAE,GACrD,qBAAqB,CAYvB"}

package/packtory/map-config.js

@@ -1,5 +1,36 @@
-import "../config/versioning-settings.js";
-import "./options/prepare-package-options.js";
-import "./generated-attribution-paths.js";
-import "./options/setting-resolvers.js";
+import { hasVersionSource } from "../config/versioning-settings.js";
+import { preparePackageOptions } from "./options/prepare-package-options.js";
+import { collectGeneratedAttributionPaths } from "./generated-attribution-paths.js";
+import { resolvePublishSettings } from "./options/setting-resolvers.js";
+function resolveVersioning(packageName, versioning, packtoryConfig, resolveVersionSource) {
+    if (!hasVersionSource(versioning)) {
+        return versioning;
+    }
+    if (resolveVersionSource === undefined) {
+        throw new Error(`Manual version source "${versioning.source}" is not available`);
+    }
+    return {
+        automatic: false,
+        provideVersion: resolveVersionSource({ packageName, source: versioning, packtoryConfig })
+    };
+}
+export function configToBuildAndPublishOptions(packageName, packageConfigs, packtoryConfig, context) {
+    const { additionalChangelogSourceFiles, packageConfig, sharedOptions, versioning } = preparePackageOptions(packageName, packageConfigs, packtoryConfig, context.existingBundles);
+    const publishSettings = resolvePublishSettings(packageConfig, packtoryConfig);
+    return {
+        ...sharedOptions,
+        additionalChangelogSourceFiles,
+        versioning: resolveVersioning(packageName, versioning, packtoryConfig, context.resolveVersionSource),
+        registrySettings: packtoryConfig.registrySettings ?? {},
+        publishSettings,
+        ignoredAttributionPaths: collectGeneratedAttributionPaths(context.repositoryFolder ?? '/', packtoryConfig)
+    };
+}
+export function configToResolveAndLinkOptions(packageName, packageConfigs, packtoryConfig, existingBundles) {
+    const { additionalChangelogSourceFiles, sharedOptions } = preparePackageOptions(packageName, packageConfigs, packtoryConfig, existingBundles);
+    return {
+        ...sharedOptions,
+        additionalChangelogSourceFiles
+    };
+}
 //# sourceMappingURL=map-config.js.map

package/packtory/map-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-config.js","sourceRoot":"","sources":["../../../../source/packtory/map-config.ts"],"names":[],"mappings":"AAEA,OAAiC,kCAAkC,CAAC;AAGpE,OAIO,sCAAsC,CAAC;AAC9C,OAAiD,kCAAkC,CAAC;AACpF,OAIO,gCAAgC,CAAC"}
+{"version":3,"file":"map-config.js","sourceRoot":"","sources":["../../../../source/packtory/map-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EACH,qBAAqB,EAGxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EACH,sBAAsB,EAGzB,MAAM,gCAAgC,CAAC;AAqCxC,SAAS,iBAAiB,CACtB,WAAmB,EACnB,UAA8B,EAC9B,cAA8B,EAC9B,oBAAuD;IAEvD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,OAAO,UAAU,CAAC;IACtB,CAAC;IACD,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,MAAM,oBAAoB,CAAC,CAAC;IACrF,CAAC;IACD,OAAO;QACH,SAAS,EAAE,KAAK;QAChB,cAAc,EAAE,oBAAoB,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;KAC5F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC1C,WAAmB,EACnB,cAAoC,EACpC,cAA8B,EAC9B,OAAsC;IAEtC,MAAM,EAAE,8BAA8B,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,qBAAqB,CACtG,WAAW,EACX,cAAc,EACd,cAAc,EACd,OAAO,CAAC,eAAe,CAC1B,CAAC;IACF,MAAM,eAAe,GAAG,sBAAsB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAE9E,OAAO;QACH,GAAG,aAAa;QAChB,8BAA8B;QAC9B,UAAU,EAAE,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,oBAAoB,CAAC;QACpG,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,IAAI,EAAE;QACvD,eAAe;QACf,uBAAuB,EAAE,gCAAgC,CAAC,OAAO,CAAC,gBAAgB,IAAI,GAAG,EAAE,cAAc,CAAC;KAC7G,CAAC;AACN,CAAC;AAED,MAAM,UAAU,6BAA6B,CACzC,WAAmB,EACnB,cAAoC,EACpC,cAA6C,EAC7C,eAAoD;IAEpD,MAAM,EAAE,8BAA8B,EAAE,aAAa,EAAE,GAAG,qBAAqB,CAC3E,WAAW,EACX,cAAc,EACd,cAAc,EACd,eAAe,CAClB,CAAC;IAEF,OAAO;QACH,GAAG,aAAa;QAChB,8BAA8B;KACjC,CAAC;AACN,CAAC"}

package/packtory/normalize-paths.js

@@ -1,2 +1,26 @@
-import 'node:path';
+import path from 'node:path';
+function ensureAbsolutePath(filePath, folder) {
+    if (path.isAbsolute(filePath)) {
+        return filePath;
+    }
+    return path.join(folder, filePath);
+}
+export function normalizeRoot(root, sourceFolder) {
+    const { js, declarationFile } = root;
+    if (declarationFile !== undefined) {
+        return {
+            js: ensureAbsolutePath(js, sourceFolder),
+            declarationFile: ensureAbsolutePath(declarationFile, sourceFolder)
+        };
+    }
+    return {
+        js: ensureAbsolutePath(js, sourceFolder)
+    };
+}
+export function normalizeAdditionalFile(additionalFile, sourceFolder) {
+    return {
+        inputFilePath: ensureAbsolutePath(additionalFile.inputFilePath, sourceFolder),
+        targetFilePath: additionalFile.targetFilePath
+    };
+}
 //# sourceMappingURL=normalize-paths.js.map

package/packtory/normalize-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-paths.js","sourceRoot":"","sources":["../../../../source/packtory/normalize-paths.ts"],"names":[],"mappings":"AAAA,OAAiB,WAAW,CAAC"}
+{"version":3,"file":"normalize-paths.js","sourceRoot":"","sources":["../../../../source/packtory/normalize-paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,SAAS,kBAAkB,CAAC,QAAgB,EAAE,MAAc;IACxD,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAU,EAAE,YAAoB;IAC1D,MAAM,EAAE,EAAE,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAErC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;YACH,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,YAAY,CAAC;YACxC,eAAe,EAAE,kBAAkB,CAAC,eAAe,EAAE,YAAY,CAAC;SACrE,CAAC;IACN,CAAC;IAED,OAAO;QACH,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,YAAY,CAAC;KAC3C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,cAAyC,EACzC,YAAoB;IAEpB,OAAO;QACH,aAAa,EAAE,kBAAkB,CAAC,cAAc,CAAC,aAAa,EAAE,YAAY,CAAC;QAC7E,cAAc,EAAE,cAAc,CAAC,cAAc;KAChD,CAAC;AACN,CAAC"}

package/packtory/options/bundle-dependency-resolution.js

@@ -1,2 +1,18 @@
-import "../../common/package-name-map.js";
+import { packageNameMap } from "../../common/package-name-map.js";
+function dependencyNamesToBundles(dependencyNames, bundlesByName) {
+    return dependencyNames.map(function (dependencyName) {
+        const matchingBundle = bundlesByName.get(dependencyName);
+        if (matchingBundle === undefined) {
+            throw new Error(`Dependent bundle "${dependencyName}" not found`);
+        }
+        return matchingBundle;
+    });
+}
+export function resolveBundleDependencies(packageConfig, existingBundles) {
+    const bundlesByName = packageNameMap(existingBundles);
+    return {
+        bundleDependencies: dependencyNamesToBundles(packageConfig.bundleDependencies ?? [], bundlesByName),
+        bundlePeerDependencies: dependencyNamesToBundles(packageConfig.bundlePeerDependencies ?? [], bundlesByName)
+    };
+}
 //# sourceMappingURL=bundle-dependency-resolution.js.map

package/packtory/options/bundle-dependency-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-dependency-resolution.js","sourceRoot":"","sources":["../../../../../source/packtory/options/bundle-dependency-resolution.ts"],"names":[],"mappings":"AACA,OAA+B,kCAAkC,CAAC"}
+{"version":3,"file":"bundle-dependency-resolution.js","sourceRoot":"","sources":["../../../../../source/packtory/options/bundle-dependency-resolution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,SAAS,wBAAwB,CAC7B,eAAkC,EAClC,aAA2C;IAE3C,OAAO,eAAe,CAAC,GAAG,CAAC,UAAU,cAAc;QAC/C,MAAM,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,qBAAqB,cAAc,aAAa,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC,CAAC;AACP,CAAC;AAOD,MAAM,UAAU,yBAAyB,CACrC,aAA4B,EAC5B,eAAmC;IAEnC,MAAM,aAAa,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IAEtD,OAAO;QACH,kBAAkB,EAAE,wBAAwB,CAAC,aAAa,CAAC,kBAAkB,IAAI,EAAE,EAAE,aAAa,CAAC;QACnG,sBAAsB,EAAE,wBAAwB,CAAC,aAAa,CAAC,sBAAsB,IAAI,EAAE,EAAE,aAAa,CAAC;KAC9G,CAAC;AACN,CAAC"}

package/packtory/options/dead-code-elimination-resolution.js

@@ -1,2 +1,11 @@
-import "../../config/dead-code-elimination-settings.js";
+import { resolveDeadCodeEliminationSettings } from "../../config/dead-code-elimination-settings.js";
+export function resolveDeadCodeEliminationByName(validated) {
+    const commonSettings = validated.packtoryConfig.commonPackageSettings?.deadCodeElimination;
+    return new Map(validated.packtoryConfig.packages.map(function (packageConfig) {
+        return [
+            packageConfig.name,
+            resolveDeadCodeEliminationSettings(packageConfig.deadCodeElimination, commonSettings)
+        ];
+    }));
+}
 //# sourceMappingURL=dead-code-elimination-resolution.js.map

package/packtory/options/dead-code-elimination-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"dead-code-elimination-resolution.js","sourceRoot":"","sources":["../../../../../source/packtory/options/dead-code-elimination-resolution.ts"],"names":[],"mappings":"AAAA,OAGO,gDAAgD,CAAC"}
+{"version":3,"file":"dead-code-elimination-resolution.js","sourceRoot":"","sources":["../../../../../source/packtory/options/dead-code-elimination-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kCAAkC,EAErC,MAAM,gDAAgD,CAAC;AAGxD,MAAM,UAAU,gCAAgC,CAC5C,SAA2C;IAE3C,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC,qBAAqB,EAAE,mBAAmB,CAAC;IAC3F,OAAO,IAAI,GAAG,CACV,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,aAAa;QACzD,OAAO;YACH,aAAa,CAAC,IAAI;YAClB,kCAAkC,CAAC,aAAa,CAAC,mBAAmB,EAAE,cAAc,CAAC;SACxF,CAAC;IACN,CAAC,CAAC,CACL,CAAC;AACN,CAAC"}

package/packtory/options/prepare-package-options.d.ts

@@ -1,7 +1,8 @@
-import type { PackageConfig } from '../../config/config.ts';
+import type { PackageConfig, PackageConfigsByName, PacktoryConfigWithoutRegistry } from '../../config/config.ts';
 import type { AdditionalPackageJsonAttributes, MainPackageJson } from '../../config/package-json.ts';
 import type { DeadCodeEliminationSettings } from '../../config/dead-code-elimination-settings.ts';
 import type { ResourceResolveOptions } from '../../resource-resolver/resource-resolve-options.ts';
+import { type AdditionalChangelogSourceFiles } from './setting-resolvers.ts';
 export type VersioningSettings = NonNullable<PackageConfig['versioning']>;
 export type SharedPackageOptions<TBundle extends {
     readonly name: string;
@@ -20,4 +21,15 @@ export type SharedPackageOptions<TBundle extends {
     readonly bundlePeerDependencies: readonly TBundle[];
     readonly deadCodeElimination?: DeadCodeEliminationSettings | undefined;
 };
+export type PreparedPackageOptions<TBundle extends {
+    readonly name: string;
+}> = {
+    readonly additionalChangelogSourceFiles: AdditionalChangelogSourceFiles;
+    readonly packageConfig: PackageConfig;
+    readonly sharedOptions: SharedPackageOptions<TBundle>;
+    readonly versioning: VersioningSettings;
+};
+export declare function preparePackageOptions<TBundle extends {
+    readonly name: string;
+}>(packageName: string, packageConfigs: PackageConfigsByName, packtoryConfig: PacktoryConfigWithoutRegistry, existingBundles: readonly TBundle[]): PreparedPackageOptions<TBundle>;
 //# sourceMappingURL=prepare-package-options.d.ts.map

package/packtory/options/prepare-package-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-package-options.d.ts","sourceRoot":"","sources":["../../../../../source/packtory/options/prepare-package-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAoE,MAAM,wBAAwB,CAAC;AACjH,OAAO,KAAK,EAAE,+BAA+B,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACrG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAClG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;MAiB5F,MAAM,kBAAkB,GAAG,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;AAE1E,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CAAE,IAAI;IAC3E,QAAQ,CAAC,+BAA+B,EAAE,+BAA+B,CAAC;IAC1E,QAAQ,CAAC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;IACnD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAChE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;IACzE,QAAQ,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,uBAAuB,CAAC,CAAC;IAChF,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;IACpE,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACrD,QAAQ,CAAC,kBAAkB,EAAE,SAAS,OAAO,EAAE,CAAC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,SAAS,OAAO,EAAE,CAAC;IACpD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAC;CAC1E,CAAC"}
+{"version":3,"file":"prepare-package-options.d.ts","sourceRoot":"","sources":["../../../../../source/packtory/options/prepare-package-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACjH,OAAO,KAAK,EAAE,+BAA+B,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACrG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAClG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAIlG,OAAO,EASH,KAAK,8BAA8B,EACtC,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;AAE1E,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CAAE,IAAI;IAC3E,QAAQ,CAAC,+BAA+B,EAAE,+BAA+B,CAAC;IAC1E,QAAQ,CAAC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;IACnD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAChE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;IACzE,QAAQ,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,uBAAuB,CAAC,CAAC;IAChF,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;IACpE,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACrD,QAAQ,CAAC,kBAAkB,EAAE,SAAS,OAAO,EAAE,CAAC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,SAAS,OAAO,EAAE,CAAC;IACpD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAC;CAC1E,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,OAAO,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CAAE,IAAI;IAC7E,QAAQ,CAAC,8BAA8B,EAAE,8BAA8B,CAAC;IACxE,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtD,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;CAC3C,CAAC;AA+CF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CAAE,EAC5E,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,oBAAoB,EACpC,cAAc,EAAE,6BAA6B,EAC7C,eAAe,EAAE,SAAS,OAAO,EAAE,GACpC,sBAAsB,CAAC,OAAO,CAAC,CAOjC"}