UNPKG

conventional-changelog

Version:
429 lines 31.4 kB
import fs from 'fs/promises'; import { Readable } from 'stream'; import { ConventionalGitClient, packagePrefix } from '@conventional-changelog/git-client'; import { transformCommit, formatDate, writeChangelog } from 'conventional-changelog-writer'; import { createPresetLoader, loadPreset as defaultLoadPreset } from 'conventional-changelog-preset-loader'; import normalizePackageData from 'normalize-package-data'; import { findPackage } from 'fd-package-json'; import { parseHostedGitUrl } from './hostedGitInfo.js'; import { getHostOptions, guessNextTag, isUnreleasedVersion, versionTagRegex, defaultCommitTransform, bindLogNamespace } from './utils.js'; export { packagePrefix }; /** * Conventional changelog generator */ export class ConventionalChangelog { gitClient; params; constructor(cwdOrGitClient = process.cwd()) { this.gitClient = typeof cwdOrGitClient === 'string' ? new ConventionalGitClient(cwdOrGitClient) : cwdOrGitClient; this.params = Promise.resolve({ options: { append: false, releaseCount: 1, formatDate, transformCommit: defaultCommitTransform }, commits: { format: '%B%n-hash-%n%H%n-gitTags-%n%d%n-committerDate-%n%ci', merges: false } }); } composeParams(params) { this.params = Promise.all([params, this.params]).then(([params, prevParams]) => ({ options: { ...prevParams.options, ...params.options }, context: { ...prevParams.context, ...params.context }, tags: { ...prevParams.tags, ...params.tags }, commits: { ...prevParams.commits, ...params.commits }, parser: { ...prevParams.parser, ...params.parser }, writer: { ...prevParams.writer, ...params.writer }, repository: { ...prevParams.repository, ...params.repository }, package: prevParams.package || params.package })); } async finalizeContext(semverTags, hostOptions) { const { options, package: pkg, repository, context } = await this.params; const finalContext = { packageData: pkg, version: pkg?.version, gitSemverTags: semverTags, ...context }; if (repository) { finalContext.repoUrl = finalContext.repoUrl || repository.url; finalContext.host = finalContext.host || repository.host; finalContext.owner = finalContext.owner || repository.owner; finalContext.repository = finalContext.repository || repository.project; } if (hostOptions) { finalContext.issue = finalContext.issue || hostOptions.issue; finalContext.commit = finalContext.commit || hostOptions.commit; } if (isUnreleasedVersion(semverTags, finalContext.version) && options.outputUnreleased) { finalContext.version = 'Unreleased'; } return finalContext; } async finalizeWriterOptions(semverTags, version) { const { options, tags, writer } = await this.params; let doFlush = options.outputUnreleased; if (isUnreleasedVersion(semverTags, version) && !doFlush) { doFlush = false; } else if (typeof doFlush !== 'boolean') { doFlush = true; } const finalOptions = { finalizeContext(context, _writerOpts, _filteredCommits, keyCommit, originalCommits) { const [firstCommit] = originalCommits; const lastCommit = originalCommits[originalCommits.length - 1]; const firstCommitHash = firstCommit ? firstCommit.hash : null; const lastCommitHash = lastCommit ? lastCommit.hash : null; if ((!context.currentTag || !context.previousTag) && keyCommit) { const matches = keyCommit.gitTags?.match(versionTagRegex); const { currentTag } = context; context.currentTag = currentTag || matches?.[1]; // currentTag || matches ? matches[1] : null const index = context.currentTag ? semverTags.indexOf(context.currentTag) : -1; // if `keyCommit.gitTags` is not a semver if (index === -1) { context.currentTag = currentTag || null; } else { const previousTag = semverTags[index + 1]; context.previousTag = previousTag; if (!previousTag) { if (options.append) { context.previousTag = context.previousTag || firstCommitHash; } else { context.previousTag = context.previousTag || lastCommitHash; } } } } else { context.previousTag = context.previousTag || semverTags[0]; if (context.version === 'Unreleased') { if (options.append) { context.currentTag = context.currentTag || lastCommitHash; } else { context.currentTag = context.currentTag || firstCommitHash; } } else if (!context.currentTag) { if (tags?.prefix) { context.currentTag = tags.prefix + (context.version || ''); } else { context.currentTag = guessNextTag(semverTags[0], context.version); } } } if (typeof context.linkCompare !== 'boolean' && context.previousTag && context.currentTag) { context.linkCompare = true; } return context; }, reverse: options.append, doFlush, ...writer }; if (!finalOptions.debug && options.debug) { finalOptions.debug = bindLogNamespace('writer', options.debug); } return finalOptions; } async getSemverTags() { const { gitClient } = this; const { tags: params } = await this.params; const tags = []; for await (const tag of gitClient.getSemverTags(params)) { tags.push(tag); } return tags; } async *getCommits(semverTags, hostOptions) { const { gitClient } = this; const { options, commits, parser } = await this.params; const { reset, releaseCount } = options; const params = { from: reset ? undefined : releaseCount ? semverTags[releaseCount - 1] : undefined, ...commits }; const parserParams = { ...parser }; if (!parserParams.warn && options.warn) { parserParams.warn = bindLogNamespace('parser', options.warn); } if (options.append) { params.reverse = true; } if (hostOptions?.referenceActions && !parserParams.referenceActions?.length) { parserParams.referenceActions = hostOptions.referenceActions; } if (hostOptions?.issuePrefixes && !parserParams.issuePrefixes?.length) { parserParams.issuePrefixes = hostOptions.issuePrefixes; } try { await gitClient.verify('HEAD'); let reverseTags = semverTags.slice().reverse(); reverseTags.push('HEAD'); if (params.from) { if (reverseTags.includes(params.from)) { reverseTags = reverseTags.slice(reverseTags.indexOf(params.from)); } else { reverseTags = [params.from, 'HEAD']; } } else { reverseTags.unshift(''); } const streams = []; for (let i = 1, len = reverseTags.length; i < len; i++) { streams.push(gitClient.getCommits({ ...params, from: reverseTags[i - 1], to: reverseTags[i] }, parserParams)); } if (!params.reverse) { streams.reverse(); } for (const stream of streams) { yield* stream; } } catch { yield* gitClient.getCommits(params, parserParams); } } async *transformCommits(commits) { const params = await this.params; const { transformCommit: transform } = params.options; let transformed; for await (const commit of commits) { transformed = await transformCommit(commit, transform, params); if (transformed) { yield transformed; } } } async getPackageJson(pkgPath, transform) { const { gitClient } = this; let pkg; if (pkgPath) { pkg = JSON.parse(await fs.readFile(pkgPath, 'utf-8')); } else { pkg = (await findPackage(gitClient.cwd) || {}); } normalizePackageData(pkg); if (!pkg.repository?.url) { try { const repoUrl = await gitClient.getConfig('remote.origin.url'); if (repoUrl) { pkg.repository = { ...pkg.repository, url: repoUrl }; } } catch { } } if (transform) { pkg = transform(pkg); } const result = { package: pkg }; const repositoryURL = (pkg.repository?.url || pkg.repository); if (repositoryURL) { result.repository = parseHostedGitUrl(repositoryURL); } return result; } /** * Load configs from a preset * @param preset * @param loader - Preset module loader, if not provided, will use default loader * @returns this */ loadPreset(preset, loader) { const loadPreset = loader ? createPresetLoader(loader) : defaultLoadPreset; const config = loadPreset(preset).then((config) => { if (!config) { throw Error('Preset is not loaded or have incorrect exports'); } return config; }); this.composeParams(config); return this; } /** * Set the config directly * @param config - Config object * @returns this */ config(config) { this.composeParams(config); return this; } readPackage(pathOrTransform, maybeTransform) { const [pkgPath, transform] = typeof pathOrTransform === 'string' ? [pathOrTransform, maybeTransform] : [undefined, pathOrTransform]; this.composeParams(this.getPackageJson(pkgPath, transform)); return this; } /** * Set package.json data * @param pkg - Package.json data * @returns this */ package(pkg) { this.composeParams({ package: pkg }); return this; } /** * Read repository info from the current git repository * @returns this */ readRepository() { this.composeParams(this.gitClient.getConfig('remote.origin.url').then(repository => ({ repository: parseHostedGitUrl(repository) }))); return this; } /** * Set repository info * @param infoOrGitUrl - Hosted git info or git url * @returns this */ repository(infoOrGitUrl) { const info = typeof infoOrGitUrl === 'string' ? parseHostedGitUrl(infoOrGitUrl) : infoOrGitUrl; this.composeParams({ repository: info }); return this; } /** * Set conventional-changelog options * @param options - Generator options * @returns this */ options(options) { this.composeParams({ options }); return this; } /** * Set writer context data * @param context - Writer context data * @returns this */ context(context) { this.composeParams({ context }); return this; } /** * Set params to get semver tags * @param params - Params to get the last semver tag * @returns this */ tags(params) { this.composeParams({ tags: params }); return this; } /** * Set params to get commits * @param params - Params to get commits since last release * @param parserOptions - Parser options * @returns this */ commits(params, parserOptions) { this.composeParams({ commits: params, parser: parserOptions }); return this; } /** * Set writer options * @param params - Writer options * @returns this */ writer(params) { this.composeParams({ writer: params }); return this; } async *write(includeDetails) { const { gitClient } = this; const { options, repository, context } = await this.params; const hostOptions = getHostOptions(repository, context); if (!gitClient.debug && options.debug) { gitClient.debug = bindLogNamespace('git-client', options.debug); } if (!hostOptions && options.warn) { options.warn('core', `Host is not supported: ${context?.host || repository?.host}`); } const semverTags = await this.getSemverTags(); const finalContext = await this.finalizeContext(semverTags, hostOptions); const writerOptions = await this.finalizeWriterOptions(semverTags, finalContext.version); const commits = this.getCommits(semverTags, hostOptions); const transformedCommits = this.transformCommits(commits); const changelogWriter = writeChangelog(finalContext, writerOptions, includeDetails); yield* changelogWriter(transformedCommits); } /** * Generate changelog to stream * @param includeDetails - Generate data objects instead of strings * @returns Changelog stream */ writeStream(includeDetails) { return Readable.from(this.write(includeDetails)); } } //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ConventionalChangelog.js","sourceRoot":"","sources":["../src/ConventionalChangelog.ts"],"names":[],"mappings":"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"}