@smoothbricks/cli 0.1.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +161 -32
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +110 -10
- package/dist/devenv/index.d.ts +10 -0
- package/dist/devenv/index.d.ts.map +1 -0
- package/dist/devenv/index.js +27 -0
- package/dist/generate/index.d.ts +20 -0
- package/dist/generate/index.d.ts.map +1 -0
- package/dist/generate/index.js +47 -0
- package/dist/lib/cli-package.d.ts +4 -0
- package/dist/lib/cli-package.d.ts.map +1 -0
- package/dist/lib/cli-package.js +15 -0
- package/dist/lib/run.d.ts +6 -0
- package/dist/lib/run.d.ts.map +1 -1
- package/dist/lib/run.js +32 -0
- package/dist/lib/workspace.d.ts +25 -1
- package/dist/lib/workspace.d.ts.map +1 -1
- package/dist/lib/workspace.js +79 -17
- package/dist/monorepo/commit-msg.d.ts +8 -1
- package/dist/monorepo/commit-msg.d.ts.map +1 -1
- package/dist/monorepo/commit-msg.js +85 -7
- package/dist/monorepo/index.d.ts +19 -2
- package/dist/monorepo/index.d.ts.map +1 -1
- package/dist/monorepo/index.js +104 -16
- package/dist/monorepo/lockfile.d.ts.map +1 -1
- package/dist/monorepo/lockfile.js +9 -0
- package/dist/monorepo/managed-files.js +1 -1
- package/dist/monorepo/nx-sync.d.ts +2 -1
- package/dist/monorepo/nx-sync.d.ts.map +1 -1
- package/dist/monorepo/nx-sync.js +8 -2
- package/dist/monorepo/package-hygiene.d.ts +6 -2
- package/dist/monorepo/package-hygiene.d.ts.map +1 -1
- package/dist/monorepo/package-hygiene.js +12 -4
- package/dist/monorepo/package-policy.d.ts +13 -4
- package/dist/monorepo/package-policy.d.ts.map +1 -1
- package/dist/monorepo/package-policy.js +208 -113
- package/dist/monorepo/packed-package.d.ts +3 -0
- package/dist/monorepo/packed-package.d.ts.map +1 -1
- package/dist/monorepo/packed-package.js +68 -36
- package/dist/monorepo/packs/index.d.ts +20 -1
- package/dist/monorepo/packs/index.d.ts.map +1 -1
- package/dist/monorepo/packs/index.js +238 -19
- package/dist/monorepo/publish-workflow.d.ts +0 -4
- package/dist/monorepo/publish-workflow.d.ts.map +1 -1
- package/dist/monorepo/publish-workflow.js +7 -15
- package/dist/monorepo/tool-validation.d.ts +22 -0
- package/dist/monorepo/tool-validation.d.ts.map +1 -0
- package/dist/monorepo/tool-validation.js +399 -0
- package/dist/nx/index.d.ts +25 -0
- package/dist/nx/index.d.ts.map +1 -0
- package/dist/nx/index.js +112 -0
- package/dist/release/bootstrap-npm-packages.d.ts +19 -0
- package/dist/release/bootstrap-npm-packages.d.ts.map +1 -0
- package/dist/release/bootstrap-npm-packages.js +58 -0
- package/dist/release/candidates.d.ts +11 -0
- package/dist/release/candidates.d.ts.map +1 -0
- package/dist/release/candidates.js +181 -0
- package/dist/release/core.d.ts +4 -1
- package/dist/release/core.d.ts.map +1 -1
- package/dist/release/core.js +76 -9
- package/dist/release/github-release.d.ts +1 -0
- package/dist/release/github-release.d.ts.map +1 -1
- package/dist/release/github-release.js +3 -3
- package/dist/release/index.d.ts +32 -1
- package/dist/release/index.d.ts.map +1 -1
- package/dist/release/index.js +488 -64
- package/dist/release/npm-auth.d.ts +0 -1
- package/dist/release/npm-auth.d.ts.map +1 -1
- package/dist/release/npm-auth.js +4 -16
- package/dist/release/orchestration.d.ts +11 -2
- package/dist/release/orchestration.d.ts.map +1 -1
- package/dist/release/orchestration.js +41 -3
- package/dist/release/publish-plan.js +1 -1
- package/managed/raw/git-format-staged.yml +54 -0
- package/managed/raw/tooling/git-hooks/commit-msg.sh +1 -1
- package/managed/templates/github/actions/setup-devenv/action.yml +1 -7
- package/managed/templates/github/workflows/ci.yml +4 -2
- package/package.json +15 -8
- package/src/cli.ts +153 -22
- package/src/devenv/index.test.ts +49 -0
- package/src/devenv/index.ts +38 -0
- package/src/generate/index.ts +92 -0
- package/src/lib/cli-package.ts +18 -0
- package/src/lib/run.ts +44 -0
- package/src/lib/workspace.ts +112 -17
- package/src/monorepo/__tests__/publish-workflow.test.ts +16 -9
- package/src/monorepo/commit-msg.test.ts +45 -0
- package/src/monorepo/commit-msg.ts +107 -7
- package/src/monorepo/index.ts +142 -16
- package/src/monorepo/lockfile.ts +9 -0
- package/src/monorepo/managed-files.ts +1 -1
- package/src/monorepo/nx-sync.ts +9 -2
- package/src/monorepo/package-hygiene.test.ts +34 -0
- package/src/monorepo/package-hygiene.ts +26 -4
- package/src/monorepo/package-policy.test.ts +1130 -0
- package/src/monorepo/package-policy.ts +237 -114
- package/src/monorepo/packed-package.ts +89 -37
- package/src/monorepo/packs/index.test.ts +189 -0
- package/src/monorepo/packs/index.ts +311 -20
- package/src/monorepo/publish-workflow.ts +10 -19
- package/src/monorepo/setup-test-tracing.test.ts +120 -0
- package/src/monorepo/tool-validation.test.ts +261 -0
- package/src/monorepo/tool-validation.ts +462 -0
- package/src/nx/index.test.ts +73 -0
- package/src/nx/index.ts +139 -0
- package/src/release/__tests__/bootstrap-npm-packages.test.ts +127 -0
- package/src/release/__tests__/candidates.test.ts +262 -0
- package/src/release/__tests__/core-properties.test.ts +6 -6
- package/src/release/__tests__/core-scenarios.test.ts +27 -20
- package/src/release/__tests__/core.test.ts +52 -5
- package/src/release/__tests__/fixture-repo.test.ts +90 -31
- package/src/release/__tests__/github-release.test.ts +22 -24
- package/src/release/__tests__/helpers/fixture-repo.ts +1 -0
- package/src/release/__tests__/npm-auth.test.ts +12 -21
- package/src/release/__tests__/orchestration.test.ts +142 -12
- package/src/release/__tests__/publish-plan.test.ts +9 -3
- package/src/release/__tests__/retag-unpublished.test.ts +10 -10
- package/src/release/__tests__/trust-publisher.test.ts +165 -0
- package/src/release/bootstrap-npm-packages.ts +88 -0
- package/src/release/candidates.ts +225 -0
- package/src/release/core.ts +96 -10
- package/src/release/github-release.ts +3 -3
- package/src/release/index.ts +658 -74
- package/src/release/npm-auth.ts +4 -33
- package/src/release/orchestration.ts +60 -5
- package/src/release/publish-plan.ts +1 -1
- package/dist/nx-version-actions.cjs +0 -25
- package/dist/nx-version-actions.d.cts +0 -6
- package/dist/nx-version-actions.d.cts.map +0 -1
- package/managed/raw/.git-format-staged.yml +0 -47
- package/src/nx-version-actions.cts +0 -36
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { isRecord } from '../lib/json.js';
|
|
2
|
+
import { releaseTag } from './core.js';
|
|
3
|
+
const releasableManifestKeys = [
|
|
4
|
+
'author',
|
|
5
|
+
'bin',
|
|
6
|
+
'browser',
|
|
7
|
+
'bugs',
|
|
8
|
+
'cpu',
|
|
9
|
+
'dependencies',
|
|
10
|
+
'description',
|
|
11
|
+
'engines',
|
|
12
|
+
'exports',
|
|
13
|
+
'files',
|
|
14
|
+
'funding',
|
|
15
|
+
'homepage',
|
|
16
|
+
'imports',
|
|
17
|
+
'keywords',
|
|
18
|
+
'license',
|
|
19
|
+
'main',
|
|
20
|
+
'module',
|
|
21
|
+
'name',
|
|
22
|
+
'optionalDependencies',
|
|
23
|
+
'os',
|
|
24
|
+
'peerDependencies',
|
|
25
|
+
'peerDependenciesMeta',
|
|
26
|
+
'publishConfig',
|
|
27
|
+
'repository',
|
|
28
|
+
'sideEffects',
|
|
29
|
+
'types',
|
|
30
|
+
'typesVersions',
|
|
31
|
+
];
|
|
32
|
+
export async function autoReleaseCandidatePackages(shell, packages) {
|
|
33
|
+
const candidates = [];
|
|
34
|
+
for (const pkg of packages) {
|
|
35
|
+
if (await isAutoReleaseCandidate(shell, pkg)) {
|
|
36
|
+
candidates.push(pkg);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return candidates;
|
|
40
|
+
}
|
|
41
|
+
async function isAutoReleaseCandidate(shell, pkg) {
|
|
42
|
+
const tagRef = `refs/tags/${releaseTag(pkg)}`;
|
|
43
|
+
if (await shell.gitRefExists(tagRef)) {
|
|
44
|
+
return packageHasReleasableChangesSince(shell, tagRef, pkg);
|
|
45
|
+
}
|
|
46
|
+
return !pkg.version.includes('-') && shell.packageHasHistory(pkg.path);
|
|
47
|
+
}
|
|
48
|
+
async function packageHasReleasableChangesSince(shell, ref, pkg) {
|
|
49
|
+
const changedFiles = await shell.packageChangedFilesSince(ref, pkg.path);
|
|
50
|
+
if (changedFiles.length === 0) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
const currentManifest = await shell.currentPackageJson(pkg.path);
|
|
54
|
+
const buildInputPatterns = await shell.packageBuildInputPatterns(pkg.projectName, pkg.path);
|
|
55
|
+
for (const changedFile of changedFiles) {
|
|
56
|
+
if (changedFile === 'package.json') {
|
|
57
|
+
const previousManifest = await shell.packageJsonAtRef(ref, pkg.path);
|
|
58
|
+
if (!previousManifest || !currentManifest || releasableManifestChanged(previousManifest, currentManifest)) {
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
if (isReleasablePackagePath(changedFile, currentManifest, buildInputPatterns)) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
function releasableManifestChanged(previousManifest, currentManifest) {
|
|
70
|
+
for (const key of releasableManifestKeys) {
|
|
71
|
+
if (!stableJsonEqual(previousManifest[key], currentManifest[key])) {
|
|
72
|
+
return true;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
function isReleasablePackagePath(path, manifest, buildInputPatterns) {
|
|
78
|
+
return (isBuildInputPath(path, buildInputPatterns) || isPackageMetadataPath(path) || isManifestFilesPath(path, manifest));
|
|
79
|
+
}
|
|
80
|
+
function isBuildInputPath(path, patterns) {
|
|
81
|
+
if (isReleaseIgnoredBuildInputPath(path)) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
let matched = false;
|
|
85
|
+
for (const pattern of patterns) {
|
|
86
|
+
const excluded = pattern.startsWith('!');
|
|
87
|
+
const rawPattern = excluded ? pattern.slice(1) : pattern;
|
|
88
|
+
if (matchesBuildInputPattern(path, rawPattern)) {
|
|
89
|
+
matched = !excluded;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return matched;
|
|
93
|
+
}
|
|
94
|
+
function matchesBuildInputPattern(path, pattern) {
|
|
95
|
+
const normalized = pattern.replace(/^\.\//, '').replace(/\/$/, '');
|
|
96
|
+
if (!normalized) {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
return globPatternToRegExp(normalized).test(path);
|
|
100
|
+
}
|
|
101
|
+
function globPatternToRegExp(pattern) {
|
|
102
|
+
let source = '^';
|
|
103
|
+
for (let index = 0; index < pattern.length; index += 1) {
|
|
104
|
+
const char = pattern[index];
|
|
105
|
+
if (char === '*') {
|
|
106
|
+
if (pattern[index + 1] === '*') {
|
|
107
|
+
if (pattern[index + 2] === '/') {
|
|
108
|
+
source += '(?:.*/)?';
|
|
109
|
+
index += 2;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
source += '.*';
|
|
113
|
+
index += 1;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
source += '[^/]*';
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
source += escapeRegExpChar(char);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return new RegExp(`${source}$`);
|
|
125
|
+
}
|
|
126
|
+
function escapeRegExpChar(char) {
|
|
127
|
+
if (!char) {
|
|
128
|
+
return '';
|
|
129
|
+
}
|
|
130
|
+
return /[\\^$+?.()|[\]{}]/.test(char) ? `\\${char}` : char;
|
|
131
|
+
}
|
|
132
|
+
function isReleaseIgnoredBuildInputPath(path) {
|
|
133
|
+
return (path === 'package.json' ||
|
|
134
|
+
path === 'tsconfig.test.json' ||
|
|
135
|
+
path.includes('/__tests__/') ||
|
|
136
|
+
path.endsWith('.test.ts') ||
|
|
137
|
+
path.endsWith('.test.tsx') ||
|
|
138
|
+
path.endsWith('.spec.ts') ||
|
|
139
|
+
path.endsWith('.spec.tsx'));
|
|
140
|
+
}
|
|
141
|
+
function isPackageMetadataPath(path) {
|
|
142
|
+
return /^(README|LICENSE|CHANGELOG)(\.|$)/.test(path);
|
|
143
|
+
}
|
|
144
|
+
function isManifestFilesPath(path, manifest) {
|
|
145
|
+
const files = manifest?.files;
|
|
146
|
+
if (!Array.isArray(files)) {
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
for (const entry of files) {
|
|
150
|
+
if (typeof entry !== 'string' || entry.length === 0 || entry.startsWith('!')) {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
if (matchesManifestFilesEntry(path, entry)) {
|
|
154
|
+
return true;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
function matchesManifestFilesEntry(path, entry) {
|
|
160
|
+
const normalized = entry.replace(/^\.\//, '').replace(/\/$/, '');
|
|
161
|
+
if (!normalized || normalized.includes('*')) {
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
164
|
+
return path === normalized || path.startsWith(`${normalized}/`);
|
|
165
|
+
}
|
|
166
|
+
function stableJsonEqual(left, right) {
|
|
167
|
+
return JSON.stringify(stableJson(left)) === JSON.stringify(stableJson(right));
|
|
168
|
+
}
|
|
169
|
+
function stableJson(value) {
|
|
170
|
+
if (Array.isArray(value)) {
|
|
171
|
+
return value.map(stableJson);
|
|
172
|
+
}
|
|
173
|
+
if (isRecord(value)) {
|
|
174
|
+
const normalized = {};
|
|
175
|
+
for (const key of Object.keys(value).sort()) {
|
|
176
|
+
normalized[key] = stableJson(value[key]);
|
|
177
|
+
}
|
|
178
|
+
return normalized;
|
|
179
|
+
}
|
|
180
|
+
return value;
|
|
181
|
+
}
|
package/dist/release/core.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export interface ReleasePackageInfo {
|
|
2
2
|
name: string;
|
|
3
|
+
projectName: string;
|
|
3
4
|
path: string;
|
|
4
5
|
version: string;
|
|
5
6
|
}
|
|
@@ -35,7 +36,9 @@ export interface ReleasePlanningShell {
|
|
|
35
36
|
packageVersionAtRef(packagePath: string, ref: string): Promise<string | null>;
|
|
36
37
|
durableTagState(pkg: ReleasePackageInfo, tag: string): Promise<DurableTagState>;
|
|
37
38
|
}
|
|
38
|
-
export declare function releaseTag(pkg: Pick<ReleasePackageInfo, '
|
|
39
|
+
export declare function releaseTag(pkg: Pick<ReleasePackageInfo, 'projectName' | 'version'>): string;
|
|
40
|
+
export declare function legacyReleaseTag(pkg: Pick<ReleasePackageInfo, 'name' | 'version'>): string;
|
|
41
|
+
export declare function releaseTagAliases(pkg: Pick<ReleasePackageInfo, 'name' | 'projectName' | 'version'>): string[];
|
|
39
42
|
export declare function npmDistTagForVersion(version: string): string;
|
|
40
43
|
export declare function releasePackageForTag<Package extends Omit<ReleasePackageInfo, 'version'>>(packages: Package[], tag: string): {
|
|
41
44
|
pkg: Package;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/release/core.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB;IACxF,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,CACvF,SAAQ,iBAAiB,CAAC,OAAO,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB;IACpF,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,EAAE,OAAO,EAAE,CAAC;IACvB,cAAc,EAAE,OAAO,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,OAAO,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,4BAA4B,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC7D,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC9E,eAAe,CAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACjF;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/release/core.ts"],"names":[],"mappings":"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"}
|
package/dist/release/core.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
export function releaseTag(pkg) {
|
|
2
|
+
return `${pkg.projectName}@${pkg.version}`;
|
|
3
|
+
}
|
|
4
|
+
export function legacyReleaseTag(pkg) {
|
|
2
5
|
return `${pkg.name}@${pkg.version}`;
|
|
3
6
|
}
|
|
7
|
+
export function releaseTagAliases(pkg) {
|
|
8
|
+
return [...new Set([releaseTag(pkg), legacyReleaseTag(pkg)])];
|
|
9
|
+
}
|
|
4
10
|
export function npmDistTagForVersion(version) {
|
|
5
11
|
return version.includes('-') ? 'next' : 'latest';
|
|
6
12
|
}
|
|
7
13
|
export function releasePackageForTag(packages, tag) {
|
|
8
14
|
for (const pkg of packages) {
|
|
9
|
-
const prefix = `${pkg.
|
|
15
|
+
const prefix = `${pkg.projectName}@`;
|
|
10
16
|
if (tag.startsWith(prefix)) {
|
|
11
17
|
const version = tag.slice(prefix.length);
|
|
12
18
|
if (!version) {
|
|
@@ -25,13 +31,10 @@ export function classifyReleaseTag(tag, state) {
|
|
|
25
31
|
};
|
|
26
32
|
}
|
|
27
33
|
export async function collectOwnedReleaseTagRecords(packages, ref, shell) {
|
|
28
|
-
const
|
|
29
|
-
const
|
|
34
|
+
const candidates = [];
|
|
35
|
+
const durableStates = new BoundedPromiseRunner(8);
|
|
30
36
|
for (const tag of await shell.listReleaseTagsByCreatorDate()) {
|
|
31
37
|
const match = releasePackageForTag(packages, tag.name);
|
|
32
|
-
if (match && completedPackages.has(match.pkg.name)) {
|
|
33
|
-
continue;
|
|
34
|
-
}
|
|
35
38
|
if (!match || !(await shell.isAncestor(tag.sha, ref))) {
|
|
36
39
|
continue;
|
|
37
40
|
}
|
|
@@ -40,14 +43,78 @@ export async function collectOwnedReleaseTagRecords(packages, ref, shell) {
|
|
|
40
43
|
throw new Error(`Release tag ${tag.name} points at ${tag.sha.slice(0, 12)}, but ${match.pkg.path}/package.json has version ${versionAtTag ?? 'missing'}.`);
|
|
41
44
|
}
|
|
42
45
|
const pkg = { ...match.pkg, version: match.version };
|
|
43
|
-
|
|
44
|
-
|
|
46
|
+
candidates.push({ tag, pkg });
|
|
47
|
+
}
|
|
48
|
+
const records = [];
|
|
49
|
+
const completedPackages = new Set();
|
|
50
|
+
const activePackages = new Set();
|
|
51
|
+
const states = new Map();
|
|
52
|
+
// Run durable-state checks concurrently across packages, but do not query an
|
|
53
|
+
// older tag for the same package until its newer tag proves incomplete.
|
|
54
|
+
const scheduleFrom = (startIndex) => {
|
|
55
|
+
for (let index = startIndex; index < candidates.length; index += 1) {
|
|
56
|
+
if (states.size >= 8) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const candidate = candidates[index];
|
|
60
|
+
if (!candidate || states.has(index) || completedPackages.has(candidate.pkg.name)) {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
if (activePackages.has(candidate.pkg.name)) {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
activePackages.add(candidate.pkg.name);
|
|
67
|
+
states.set(index, durableStates.run(() => shell.durableTagState(candidate.pkg, candidate.tag.name)));
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
for (const candidate of candidates) {
|
|
71
|
+
const index = candidates.indexOf(candidate);
|
|
72
|
+
scheduleFrom(index);
|
|
73
|
+
if (completedPackages.has(candidate.pkg.name)) {
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const state = await states.get(index);
|
|
77
|
+
if (!state) {
|
|
78
|
+
throw new Error(`Release tag ${candidate.tag.name} lost durable state planning.`);
|
|
79
|
+
}
|
|
80
|
+
activePackages.delete(candidate.pkg.name);
|
|
81
|
+
states.delete(index);
|
|
82
|
+
records.push(classifyReleaseTag({ tag: candidate.tag.name, sha: candidate.tag.sha, timestamp: candidate.tag.timestamp, pkg: candidate.pkg }, state));
|
|
45
83
|
if (state.npmPublished && state.githubReleaseExists) {
|
|
46
|
-
completedPackages.add(pkg.name);
|
|
84
|
+
completedPackages.add(candidate.pkg.name);
|
|
47
85
|
}
|
|
48
86
|
}
|
|
49
87
|
return records;
|
|
50
88
|
}
|
|
89
|
+
class BoundedPromiseRunner {
|
|
90
|
+
limit;
|
|
91
|
+
active = 0;
|
|
92
|
+
waiting = [];
|
|
93
|
+
constructor(limit) {
|
|
94
|
+
this.limit = limit;
|
|
95
|
+
}
|
|
96
|
+
async run(operation) {
|
|
97
|
+
await this.acquire();
|
|
98
|
+
try {
|
|
99
|
+
return await operation();
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
this.release();
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
async acquire() {
|
|
106
|
+
if (this.active < this.limit) {
|
|
107
|
+
this.active += 1;
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
await new Promise((resolve) => this.waiting.push(resolve));
|
|
111
|
+
this.active += 1;
|
|
112
|
+
}
|
|
113
|
+
release() {
|
|
114
|
+
this.active -= 1;
|
|
115
|
+
this.waiting.shift()?.();
|
|
116
|
+
}
|
|
117
|
+
}
|
|
51
118
|
export function groupReleaseTargets(records) {
|
|
52
119
|
const targets = new Map();
|
|
53
120
|
const packageNamesByTarget = new Map();
|
|
@@ -42,5 +42,6 @@ export declare function nxProjectChangelogArgs(pkg: ReleasePackageInfo, previous
|
|
|
42
42
|
};
|
|
43
43
|
export declare function projectChangelogContents(result: ProjectChangelogLookupResult, projectName: string): string;
|
|
44
44
|
export declare function githubReleaseCommandArgs(tag: string, notesFile: string, releaseExists: boolean, version: string): string[];
|
|
45
|
+
export declare function withNxWorkspaceRoot<T>(root: string, run: () => Promise<T>): Promise<T>;
|
|
45
46
|
export {};
|
|
46
47
|
//# sourceMappingURL=github-release.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-release.d.ts","sourceRoot":"","sources":["../../src/release/github-release.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,kBAAkB,EAAc,MAAM,WAAW,CAAC;AAYhE,UAAU,4BAA4B;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,6BAA6B,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB;IACpG,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAsB,gCAAgC,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,MAAM,CAAC,CAS5G;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;EAa1G;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,4BAA4B,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM1G;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,MAAM,GACd,MAAM,EAAE,CAgBV"}
|
|
1
|
+
{"version":3,"file":"github-release.d.ts","sourceRoot":"","sources":["../../src/release/github-release.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,kBAAkB,EAAc,MAAM,WAAW,CAAC;AAYhE,UAAU,4BAA4B;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,6BAA6B,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB;IACpG,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAsB,gCAAgC,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,MAAM,CAAC,CAS5G;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;EAa1G;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,4BAA4B,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM1G;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,MAAM,GACd,MAAM,EAAE,CAgBV;AAMD,wBAAsB,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAmB5F"}
|
|
@@ -15,7 +15,7 @@ export async function renderNxProjectChangelogContents(input) {
|
|
|
15
15
|
return withNxWorkspaceRoot(input.root, async () => {
|
|
16
16
|
const { createAPI } = await import('nx/src/command-line/release/changelog.js');
|
|
17
17
|
const result = await createAPI(nxRenderOnlyReleaseConfig, false)(nxProjectChangelogArgs(input.pkg, input.previousTag, input.dryRun));
|
|
18
|
-
return projectChangelogContents(result, input.pkg.
|
|
18
|
+
return projectChangelogContents(result, input.pkg.projectName);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
export async function createOrUpdateGithubRelease(pkg, contents, shell) {
|
|
@@ -35,7 +35,7 @@ export async function createOrUpdateGithubRelease(pkg, contents, shell) {
|
|
|
35
35
|
export function nxProjectChangelogArgs(pkg, previousTag, dryRun) {
|
|
36
36
|
const base = {
|
|
37
37
|
version: pkg.version,
|
|
38
|
-
projects: [pkg.
|
|
38
|
+
projects: [pkg.projectName],
|
|
39
39
|
gitCommit: false,
|
|
40
40
|
gitTag: false,
|
|
41
41
|
gitPush: false,
|
|
@@ -73,7 +73,7 @@ export function githubReleaseCommandArgs(tag, notesFile, releaseExists, version)
|
|
|
73
73
|
function isPrereleaseVersion(version) {
|
|
74
74
|
return version.includes('-');
|
|
75
75
|
}
|
|
76
|
-
async function withNxWorkspaceRoot(root, run) {
|
|
76
|
+
export async function withNxWorkspaceRoot(root, run) {
|
|
77
77
|
const workspaceRootModule = await import('nx/src/utils/workspace-root.js');
|
|
78
78
|
const previousWorkspaceRoot = workspaceRootModule.workspaceRoot;
|
|
79
79
|
const previousEnvWorkspaceRoot = process.env.NX_WORKSPACE_ROOT_PATH;
|
package/dist/release/index.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { type BootstrapNpmPackagesOptions } from './bootstrap-npm-packages.js';
|
|
2
|
+
import { type ReleasePackageInfo } from './core.js';
|
|
1
3
|
export interface ReleaseVersionOptions {
|
|
2
4
|
bump: string;
|
|
3
5
|
dryRun?: boolean;
|
|
@@ -12,8 +14,16 @@ export interface ReleaseRepairPendingOptions {
|
|
|
12
14
|
}
|
|
13
15
|
export interface ReleaseTrustPublisherOptions {
|
|
14
16
|
dryRun?: boolean;
|
|
15
|
-
|
|
17
|
+
bootstrap?: boolean;
|
|
18
|
+
bootstrapOtp?: string;
|
|
16
19
|
skipLogin?: boolean;
|
|
20
|
+
packages?: string[];
|
|
21
|
+
}
|
|
22
|
+
export interface ReleaseBootstrapNpmPackagesOptions {
|
|
23
|
+
dryRun?: boolean;
|
|
24
|
+
skipLogin?: boolean;
|
|
25
|
+
otp?: string;
|
|
26
|
+
packages?: string[];
|
|
17
27
|
}
|
|
18
28
|
export interface ReleaseRetagUnpublishedOptions {
|
|
19
29
|
tags: string[];
|
|
@@ -28,6 +38,27 @@ export declare function releaseVersion(root: string, options: ReleaseVersionOpti
|
|
|
28
38
|
export declare function releasePublish(root: string, options: ReleasePublishOptions): Promise<void>;
|
|
29
39
|
export declare function releaseRepairPending(root: string, options: ReleaseRepairPendingOptions): Promise<void>;
|
|
30
40
|
export declare function releaseTrustPublisher(root: string, options: ReleaseTrustPublisherOptions): Promise<void>;
|
|
41
|
+
export interface TrustPublisherShell<Package extends ReleasePackageInfo = ReleasePackageInfo> {
|
|
42
|
+
repository: string;
|
|
43
|
+
workflow: string;
|
|
44
|
+
listReleasePackages(): Package[];
|
|
45
|
+
packageExists(name: string): Promise<boolean>;
|
|
46
|
+
bootstrapNpmPackages(options: BootstrapNpmPackagesOptions): Promise<Package[]>;
|
|
47
|
+
trustPublisher(pkg: Package, dryRun: boolean, env?: Record<string, string>): Promise<TrustPublisherResult>;
|
|
48
|
+
trustedPublishers(pkg: Package): Promise<TrustedPublisher[]>;
|
|
49
|
+
log(message: string): void;
|
|
50
|
+
error(message: string): void;
|
|
51
|
+
}
|
|
52
|
+
export type TrustPublisherResult = 'configured' | 'already-configured';
|
|
53
|
+
export interface TrustedPublisher {
|
|
54
|
+
id: string;
|
|
55
|
+
type: string;
|
|
56
|
+
file?: string;
|
|
57
|
+
repository?: string;
|
|
58
|
+
}
|
|
59
|
+
export declare function configureTrustedPublishers<Package extends ReleasePackageInfo>(shell: TrustPublisherShell<Package>, options: ReleaseTrustPublisherOptions): Promise<void>;
|
|
60
|
+
export declare function releaseBootstrapNpmPackages(root: string, options: ReleaseBootstrapNpmPackagesOptions): Promise<void>;
|
|
31
61
|
export declare function releaseRetagUnpublished(root: string, options: ReleaseRetagUnpublishedOptions): Promise<void>;
|
|
32
62
|
export declare function printReleaseState(root: string): Promise<void>;
|
|
63
|
+
export declare function parseTrustedPublishers(stdout: string, packageName: string): TrustedPublisher[];
|
|
33
64
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/release/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/release/index.ts"],"names":[],"mappings":"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"}
|