Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion dist/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30738,6 +30738,12 @@ function parseManifest(manifestPath) {
throw new Error(`Failed to parse package manifest "${manifestPath}": ${message}`);
}
}
function getNodeDependencies(manifest) {
return [...new Set(["dependencies", "devDependencies"].flatMap((field) => {
const dependencies = manifest[field];
return dependencies && typeof dependencies === "object" && !Array.isArray(dependencies) ? Object.keys(dependencies) : [];
}))];
}
function getPackages(path) {
const rootDir = resolve$1(path);
const manifestPaths = globSync(MANIFEST_PATTERN, {
Expand Down Expand Up @@ -30765,6 +30771,7 @@ function getPackages(path) {
version: typeof manifest.version === "string" ? manifest.version : void 0,
type,
private: type === "node" ? manifest.private === true : manifest.publish_to === "none",
dependencies: type === "node" ? getNodeDependencies(manifest) : [],
dir,
relativeDir
};
Expand Down Expand Up @@ -31441,6 +31448,44 @@ async function confirmReleaseLog(prNumber, log, token) {
}
//#endregion
//#region src/utils/publish.ts
function sortReleasePackages(releases, packages) {
const releaseIndexes = /* @__PURE__ */ new Map();
releases.forEach((release, index) => {
if (releaseIndexes.has(release.name)) throw new Error(`Duplicate release package name: ${release.name}`);
releaseIndexes.set(release.name, index);
});
const packageDependencies = new Map(packages.map((pkg) => [pkg.name, pkg.dependencies]));
const indegrees = new Map(releases.map((release) => [release.name, 0]));
const dependents = /* @__PURE__ */ new Map();
releases.forEach((release) => {
packageDependencies.get(release.name)?.forEach((dependency) => {
if (!releaseIndexes.has(dependency)) return;
indegrees.set(release.name, (indegrees.get(release.name) || 0) + 1);
dependents.set(dependency, [...dependents.get(dependency) || [], release]);
});
});
const ready = releases.filter((release) => indegrees.get(release.name) === 0);
const sorted = [];
const enqueue = (release) => {
const index = ready.findIndex((item) => releaseIndexes.get(item.name) > releaseIndexes.get(release.name));
if (index === -1) ready.push(release);
else ready.splice(index, 0, release);
};
while (ready.length) {
const release = ready.shift();
sorted.push(release);
dependents.get(release.name)?.forEach((dependent) => {
const indegree = (indegrees.get(dependent.name) || 0) - 1;
indegrees.set(dependent.name, indegree);
if (indegree === 0) enqueue(dependent);
});
}
if (sorted.length !== releases.length) {
const circularPackages = releases.filter((release) => indegrees.get(release.name) > 0).map((release) => release.name);
throw new Error(`Circular package dependencies detected: ${circularPackages.join(", ")}`);
}
return sorted;
}
function publishRelease(release) {
if (release.type === "flutter") return Promise.resolve(0);
return exec("pnpm", [
Expand Down Expand Up @@ -82732,7 +82777,8 @@ async function pull_request(token) {
await useGit(token).checkoutCommit(pullRequestData.merge_commit_sha);
const changeFiles = await getPullRequestFiles(prNumber);
info(`changeFiles: ${JSON.stringify(changeFiles, null, 2)}`);
const releaseDirs = await getPullRequestReleaseDirs(changeFiles, getConfiguredPackages(cwd()));
const packages = getConfiguredPackages(cwd());
const releaseDirs = sortReleasePackages(getPullRequestReleaseDirs(changeFiles, packages), packages);
info(`releaseDirs: ${JSON.stringify(releaseDirs, null, 2)}`);
if (!releaseDirs.length) {
info("没有更新发布版本");
Expand Down
5 changes: 3 additions & 2 deletions src/github-event/pull-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { PullRequestData } from '../types'
import { cwd } from 'node:process'
import { getInput, info, setOutput } from '@actions/core'
import * as github from '@actions/github'
import { extractChangelog, getConfiguredPackages, getInputPkgs, getPullRequestNumber, getPullRequestReleaseDirs, getStashChangelog, publishRelease, renderChangelogMarkdown } from '../utils'
import { extractChangelog, getConfiguredPackages, getInputPkgs, getPullRequestNumber, getPullRequestReleaseDirs, getStashChangelog, publishRelease, renderChangelogMarkdown, sortReleasePackages } from '../utils'
import useGit from '../utils/git'
import useGithub from '../utils/github'
import { translateText } from '../utils/translate'
Expand Down Expand Up @@ -97,7 +97,8 @@ export async function pull_request(token: string) {
await useGit(token).checkoutCommit(pullRequestData.merge_commit_sha)
const changeFiles = await getPullRequestFiles(prNumber)
info(`changeFiles: ${JSON.stringify(changeFiles, null, 2)}`)
const releaseDirs = await getPullRequestReleaseDirs(changeFiles, getConfiguredPackages(cwd()))
const packages = getConfiguredPackages(cwd())
const releaseDirs = sortReleasePackages(getPullRequestReleaseDirs(changeFiles, packages), packages)
info(`releaseDirs: ${JSON.stringify(releaseDirs, null, 2)}`)
if (!releaseDirs.length) {
info('没有更新发布版本')
Expand Down
11 changes: 11 additions & 0 deletions src/utils/get-packages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface Package {
version?: string
type: PackageType
private: boolean
dependencies: string[]
dir: string
relativeDir: string
}
Expand Down Expand Up @@ -38,6 +39,15 @@ function parseManifest(manifestPath: string) {
}
}

function getNodeDependencies(manifest: Record<string, unknown>) {
return [...new Set(['dependencies', 'devDependencies'].flatMap((field) => {
const dependencies = manifest[field]
return dependencies && typeof dependencies === 'object' && !Array.isArray(dependencies)
? Object.keys(dependencies)
: []
}))]
}

export function getPackages(path: string): Package[] {
const rootDir = resolve(path)
const manifestPaths = globSync(MANIFEST_PATTERN, {
Expand Down Expand Up @@ -79,6 +89,7 @@ export function getPackages(path: string): Package[] {
version: typeof manifest.version === 'string' ? manifest.version : undefined,
type,
private: type === 'node' ? manifest.private === true : manifest.publish_to === 'none',
dependencies: type === 'node' ? getNodeDependencies(manifest) : [],
dir,
relativeDir,
}
Expand Down
51 changes: 51 additions & 0 deletions src/utils/publish.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,57 @@
import type { ReleasePackage } from '../types'
import type { Package } from './get-packages'
import { exec } from '@actions/exec'

export function sortReleasePackages(releases: ReleasePackage[], packages: Package[]) {
const releaseIndexes = new Map<string, number>()
releases.forEach((release, index) => {
if (releaseIndexes.has(release.name))
throw new Error(`Duplicate release package name: ${release.name}`)
releaseIndexes.set(release.name, index)
})

const packageDependencies = new Map(packages.map(pkg => [pkg.name, pkg.dependencies]))
const indegrees = new Map(releases.map(release => [release.name, 0]))
const dependents = new Map<string, ReleasePackage[]>()

releases.forEach((release) => {
packageDependencies.get(release.name)?.forEach((dependency) => {
if (!releaseIndexes.has(dependency))
return
indegrees.set(release.name, (indegrees.get(release.name) || 0) + 1)
dependents.set(dependency, [...(dependents.get(dependency) || []), release])
})
})

const ready = releases.filter(release => indegrees.get(release.name) === 0)
const sorted: ReleasePackage[] = []
const enqueue = (release: ReleasePackage) => {
const index = ready.findIndex(item => releaseIndexes.get(item.name)! > releaseIndexes.get(release.name)!)
if (index === -1)
ready.push(release)
else
ready.splice(index, 0, release)
}

while (ready.length) {
const release = ready.shift()!
sorted.push(release)
dependents.get(release.name)?.forEach((dependent) => {
const indegree = (indegrees.get(dependent.name) || 0) - 1
indegrees.set(dependent.name, indegree)
if (indegree === 0)
enqueue(dependent)
})
}

if (sorted.length !== releases.length) {
const circularPackages = releases.filter(release => indegrees.get(release.name)! > 0).map(release => release.name)
throw new Error(`Circular package dependencies detected: ${circularPackages.join(', ')}`)
}

return sorted
}

export function publishRelease(release: ReleasePackage) {
if (release.type === 'flutter')
return Promise.resolve(0)
Expand Down
12 changes: 12 additions & 0 deletions test/get-packages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ describe('getPackages', () => {
expect(packages[0].dir).toBe(resolve('fixtures/repo3/packages/flutter-a'))
})

it('reads Node runtime and development dependencies', () => {
const dir = createTempDir()
writeFileSync(join(dir, 'package.json'), JSON.stringify({
name: 'example',
dependencies: { runtime: 'workspace:^', shared: '^1.0.0' },
devDependencies: { development: '^1.0.0', shared: '^1.0.0' },
peerDependencies: { peer: '^1.0.0' },
}))

expect(getPackages(dir)[0].dependencies).toEqual(['runtime', 'shared', 'development'])
})

it('keeps a Flutter root package when it contains an example app', () => {
const dir = createTempDir()
mkdirSync(join(dir, 'example'), { recursive: true })
Expand Down
64 changes: 63 additions & 1 deletion test/publish.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { ReleasePackage } from '../src/types'
import type { Package } from '../src/utils/get-packages'
import { exec } from '@actions/exec'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { publishRelease } from '../src/utils/publish'
import { publishRelease, sortReleasePackages } from '../src/utils/publish'

vi.mock('@actions/exec', () => ({ exec: vi.fn() }))

Expand All @@ -15,6 +16,67 @@ const release: ReleasePackage = {
changelog: '',
}

function createRelease(name: string): ReleasePackage {
return { ...release, dir: `packages/${name}`, name }
}

function createPackage(name: string, dependencies: string[] = []): Package {
return {
name,
version: '1.0.0',
type: 'node',
private: false,
dependencies,
dir: `packages/${name}`,
relativeDir: `packages/${name}`,
}
}

describe('sortReleasePackages', () => {
it('publishes workspace dependencies before their dependents', () => {
const releases = [createRelease('tdesign-icons-view'), createRelease('tdesign-icons-vue-next')]
const packages = [
createPackage('tdesign-icons-view', ['tdesign-icons-vue-next']),
createPackage('tdesign-icons-vue-next'),
]

expect(sortReleasePackages(releases, packages).map(item => item.name)).toEqual([
'tdesign-icons-vue-next',
'tdesign-icons-view',
])
})

it('sorts transitive dependencies', () => {
const releases = [createRelease('a'), createRelease('b'), createRelease('c')]
const packages = [createPackage('a', ['b']), createPackage('b', ['c']), createPackage('c')]

expect(sortReleasePackages(releases, packages).map(item => item.name)).toEqual(['c', 'b', 'a'])
})

it('keeps unrelated packages stable and ignores dependencies outside the release', () => {
const releases = [createRelease('consumer'), createRelease('unrelated'), createRelease('dependency')]
const packages = [
createPackage('consumer', ['dependency', 'external']),
createPackage('unrelated'),
createPackage('dependency'),
]

expect(sortReleasePackages(releases, packages).map(item => item.name)).toEqual([
'unrelated',
'dependency',
'consumer',
])
})

it('rejects circular dependencies before publishing', () => {
const releases = [createRelease('a'), createRelease('b')]
const packages = [createPackage('a', ['b']), createPackage('b', ['a'])]

expect(() => sortReleasePackages(releases, packages)).toThrow('Circular package dependencies detected: a, b')
expect(exec).not.toHaveBeenCalled()
})
})

describe('publishRelease', () => {
beforeEach(() => {
vi.mocked(exec).mockReset()
Expand Down