nx-npm-tools 1.2.7 → 1.2.9
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/dist/commands/autofix.js +89 -2
- package/dist/commands/autofix.js.map +1 -1
- package/dist/commands/gitPull.js +30 -0
- package/dist/commands/gitPull.js.map +1 -0
- package/dist/commands/publishUpstream.js +371 -0
- package/dist/commands/publishUpstream.js.map +1 -0
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/utils/codeScan.js +59 -0
- package/dist/utils/codeScan.js.map +1 -1
- package/dist/utils/git.js +421 -0
- package/dist/utils/git.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/autofix.js
CHANGED
|
@@ -3,8 +3,8 @@ import path from "node:path";
|
|
|
3
3
|
import { resolveStationRoot } from "../utils/path.js";
|
|
4
4
|
import { discoverStationInventory } from "../station/discover.js";
|
|
5
5
|
import { buildStationGraph } from "../station/graph.js";
|
|
6
|
-
import { scanUnusedDependencies, scanMissingDependencies } from "../utils/codeScan.js";
|
|
7
|
-
import { readJson, writeJson } from "../utils/fs.js";
|
|
6
|
+
import { scanUnusedDependencies, scanMissingDependencies, scanMissingJsFiles } from "../utils/codeScan.js";
|
|
7
|
+
import { readJson, writeJson, exists, readText } from "../utils/fs.js";
|
|
8
8
|
import { saveBackup } from "../utils/backup.js";
|
|
9
9
|
import { scanGitIgnoreIssues, fixGitIgnoreIssues } from "../utils/gitignore.js";
|
|
10
10
|
export function autofixCommand() {
|
|
@@ -325,6 +325,93 @@ export function autofixCommand() {
|
|
|
325
325
|
}
|
|
326
326
|
}
|
|
327
327
|
}
|
|
328
|
+
// 6. Check for packages missing "files" field when dist is in .gitignore
|
|
329
|
+
console.log("Scanning for packages missing 'files' field...");
|
|
330
|
+
const missingFilesField = [];
|
|
331
|
+
// Group packages by repo root to check gitignore once per repo
|
|
332
|
+
const reposForFilesCheck = new Map();
|
|
333
|
+
for (const p of inv.packages) {
|
|
334
|
+
const list = reposForFilesCheck.get(p.repoRoot) ?? [];
|
|
335
|
+
list.push({ name: p.name, cwd: p.cwd });
|
|
336
|
+
reposForFilesCheck.set(p.repoRoot, list);
|
|
337
|
+
}
|
|
338
|
+
for (const [repoRoot, packages] of reposForFilesCheck) {
|
|
339
|
+
const gitignorePath = path.join(repoRoot, ".gitignore");
|
|
340
|
+
const gitignoreExists = exists(gitignorePath);
|
|
341
|
+
const gitignoreContent = gitignoreExists ? readText(gitignorePath) : "";
|
|
342
|
+
const distInGitignore = gitignoreContent.includes("dist") || gitignoreContent.includes("/dist") || gitignoreContent.includes("dist/");
|
|
343
|
+
for (const pkg of packages) {
|
|
344
|
+
const pkgJsonPath = path.join(pkg.cwd, "package.json");
|
|
345
|
+
const pkgJson = readJson(pkgJsonPath);
|
|
346
|
+
const distDir = path.join(pkg.cwd, "dist");
|
|
347
|
+
const hasDist = exists(distDir);
|
|
348
|
+
const hasMainDist = pkgJson.main && pkgJson.main.startsWith("dist/");
|
|
349
|
+
// Check if package needs a "files" field
|
|
350
|
+
if (hasDist && hasMainDist && distInGitignore && !pkgJson.files) {
|
|
351
|
+
missingFilesField.push({
|
|
352
|
+
packageName: pkg.name,
|
|
353
|
+
packageDir: pkg.cwd,
|
|
354
|
+
repoRoot
|
|
355
|
+
});
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
if (missingFilesField.length > 0) {
|
|
360
|
+
console.log(`Found ${missingFilesField.length} package(s) missing 'files' field...`);
|
|
361
|
+
console.log("");
|
|
362
|
+
for (const issue of missingFilesField) {
|
|
363
|
+
const pkgJsonPath = path.join(issue.packageDir, "package.json");
|
|
364
|
+
const pkgJson = readJson(pkgJsonPath);
|
|
365
|
+
if (opts.dryRun) {
|
|
366
|
+
fixes.push(` Would add "files": ["dist"] to ${issue.packageName}`);
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
backupChanges.push({
|
|
370
|
+
package: issue.packageName,
|
|
371
|
+
filePath: pkgJsonPath,
|
|
372
|
+
field: "dependencies", // Use dependencies as field for backup (files isn't in PackageJson type)
|
|
373
|
+
dependency: "",
|
|
374
|
+
oldValue: "", // Empty for new field
|
|
375
|
+
action: "added"
|
|
376
|
+
});
|
|
377
|
+
pkgJson.files = ["dist"];
|
|
378
|
+
writeJson(pkgJsonPath, pkgJson);
|
|
379
|
+
fixes.push(`✅ Added "files": ["dist"] to ${issue.packageName}`);
|
|
380
|
+
totalFixed++;
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
if (missingFilesField.length > 0) {
|
|
384
|
+
console.log("");
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
// 7. Check for missing JavaScript files (TypeScript declaration files without corresponding .js files)
|
|
388
|
+
console.log("Scanning for missing JavaScript files...");
|
|
389
|
+
const missingJsFiles = await scanMissingJsFiles(inv.packages);
|
|
390
|
+
if (missingJsFiles.size > 0) {
|
|
391
|
+
console.log(`Found ${missingJsFiles.size} package(s) with missing JavaScript files...`);
|
|
392
|
+
console.log("");
|
|
393
|
+
for (const [pkgName, issues] of missingJsFiles.entries()) {
|
|
394
|
+
if (opts.dryRun) {
|
|
395
|
+
for (const issue of issues) {
|
|
396
|
+
fixes.push(` ⚠️ ${pkgName}: Missing JS file for ${issue.declarationFile} (should be ${issue.missingJsFile})`);
|
|
397
|
+
}
|
|
398
|
+
}
|
|
399
|
+
else {
|
|
400
|
+
// This issue requires fixing the TypeScript configuration
|
|
401
|
+
// We can't auto-fix it, but we should report it
|
|
402
|
+
for (const issue of issues) {
|
|
403
|
+
fixes.push(`⚠️ ${pkgName}: Missing JS file for ${issue.declarationFile} (should be ${issue.missingJsFile})`);
|
|
404
|
+
console.log(` ${pkgName}: Missing JS file for ${issue.declarationFile}`);
|
|
405
|
+
console.log(` 💡 Check tsconfig.json - ensure it emits both .d.ts and .js files`);
|
|
406
|
+
console.log(` 💡 Remove "emitDeclarationOnly": true or ensure "noEmit": false`);
|
|
407
|
+
console.log("");
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
if (missingJsFiles.size > 0) {
|
|
412
|
+
console.log("");
|
|
413
|
+
}
|
|
414
|
+
}
|
|
328
415
|
// Summary
|
|
329
416
|
console.log("");
|
|
330
417
|
if (fixes.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../src/commands/autofix.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../src/commands/autofix.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Command } from "commander";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { pullWithAutoMerge } from "../utils/git.js";
|
|
4
|
+
export function gitPullCommand() {
|
|
5
|
+
return new Command("gitPull")
|
|
6
|
+
.alias("pull")
|
|
7
|
+
.description("git pull with automatic package.json conflict resolution")
|
|
8
|
+
.option("--cwd <path>", "Repo folder (default: current dir)", process.cwd())
|
|
9
|
+
.option("--remote <name>", "Remote name", "origin")
|
|
10
|
+
.option("--branch <name>", "Branch name (auto-detected if not provided)")
|
|
11
|
+
.action(async (opts) => {
|
|
12
|
+
const cwd = path.resolve(opts.cwd);
|
|
13
|
+
const result = await pullWithAutoMerge(cwd, {
|
|
14
|
+
remote: opts.remote,
|
|
15
|
+
branch: opts.branch
|
|
16
|
+
});
|
|
17
|
+
if (result.pulled) {
|
|
18
|
+
if (result.merged) {
|
|
19
|
+
console.log(`✅ ${result.message}`);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
console.log(`✅ ${result.message}`);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
console.log(`ℹ️ ${result.message}`);
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=gitPull.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitPull.js","sourceRoot":"","sources":["../../src/commands/gitPull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,UAAU,cAAc;IAC5B,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC;SAC1B,KAAK,CAAC,MAAM,CAAC;SACb,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,cAAc,EAAE,oCAAoC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;SAC3E,MAAM,CAAC,iBAAiB,EAAE,aAAa,EAAE,QAAQ,CAAC;SAClD,MAAM,CAAC,iBAAiB,EAAE,6CAA6C,CAAC;SACxE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE;YAC1C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,371 @@
|
|
|
1
|
+
import { Command } from "commander";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { resolveStationRoot } from "../utils/path.js";
|
|
4
|
+
import { discoverStationInventory } from "../station/discover.js";
|
|
5
|
+
import { buildStationGraph } from "../station/graph.js";
|
|
6
|
+
import { publishPackageFlow } from "../utils/git.js";
|
|
7
|
+
import { runCapture } from "../utils/exec.js";
|
|
8
|
+
async function checkNpmPackageStatus(pkgName, localVersion) {
|
|
9
|
+
try {
|
|
10
|
+
try {
|
|
11
|
+
await runCapture("npm", ["view", `${pkgName}@${localVersion}`, "version"], process.cwd());
|
|
12
|
+
return { published: true, latest: localVersion, alreadyPublished: true };
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
try {
|
|
16
|
+
const output = await runCapture("npm", ["view", pkgName, "version"], process.cwd());
|
|
17
|
+
const version = output.trim().replace(/^version\s*=\s*['"]?/, "").replace(/['"]\s*$/, "").trim();
|
|
18
|
+
if (version && version === localVersion) {
|
|
19
|
+
return { published: true, latest: version, alreadyPublished: true };
|
|
20
|
+
}
|
|
21
|
+
return { published: version.length > 0, latest: version, alreadyPublished: false };
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return { published: false, alreadyPublished: false };
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
const errorMsg = error?.message ?? String(error);
|
|
30
|
+
const stderr = error?.stderr ?? "";
|
|
31
|
+
if (errorMsg.includes("404") || errorMsg.includes("not found") || stderr.includes("404")) {
|
|
32
|
+
return { published: false, alreadyPublished: false };
|
|
33
|
+
}
|
|
34
|
+
return { published: false, alreadyPublished: false };
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Find all packages that depend on a given package (can be external)
|
|
39
|
+
*/
|
|
40
|
+
function findUpstreamPackages(targetPackageName, inv, graph) {
|
|
41
|
+
const upstreamPackages = new Set();
|
|
42
|
+
// Check if target is in station
|
|
43
|
+
const targetInStation = graph.nodes.has(targetPackageName);
|
|
44
|
+
if (targetInStation) {
|
|
45
|
+
// Use reverse edges to find dependents
|
|
46
|
+
const dependents = graph.reverseEdges.get(targetPackageName) ?? new Set();
|
|
47
|
+
for (const dependentName of dependents) {
|
|
48
|
+
const pkg = graph.nodes.get(dependentName);
|
|
49
|
+
if (pkg) {
|
|
50
|
+
upstreamPackages.add(pkg);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// External package - scan all packages' dependencies
|
|
56
|
+
for (const pkg of inv.packages) {
|
|
57
|
+
const allDeps = {
|
|
58
|
+
...pkg.deps.dependencies,
|
|
59
|
+
...pkg.deps.devDependencies,
|
|
60
|
+
...pkg.deps.peerDependencies,
|
|
61
|
+
...pkg.deps.optionalDependencies
|
|
62
|
+
};
|
|
63
|
+
if (allDeps[targetPackageName]) {
|
|
64
|
+
upstreamPackages.add(pkg);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return Array.from(upstreamPackages);
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Find all packages that transitively depend on the target package.
|
|
72
|
+
* Uses BFS to traverse the reverse dependency graph starting from direct dependents.
|
|
73
|
+
*/
|
|
74
|
+
function findAllUpstreamPackages(targetPackageName, fullGraph) {
|
|
75
|
+
const upstreamPackages = new Set();
|
|
76
|
+
const visited = new Set();
|
|
77
|
+
const queue = [];
|
|
78
|
+
// Start with direct dependents
|
|
79
|
+
const directDependents = fullGraph.reverseEdges.get(targetPackageName) ?? new Set();
|
|
80
|
+
for (const dependent of directDependents) {
|
|
81
|
+
if (!visited.has(dependent)) {
|
|
82
|
+
visited.add(dependent);
|
|
83
|
+
queue.push(dependent);
|
|
84
|
+
upstreamPackages.add(dependent);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// BFS: find all packages that transitively depend on the target
|
|
88
|
+
// (by following reverse edges - packages that depend on packages that depend on target)
|
|
89
|
+
while (queue.length > 0) {
|
|
90
|
+
const current = queue.shift();
|
|
91
|
+
// Find packages that depend on current (these are also upstream of target)
|
|
92
|
+
const dependentsOfCurrent = fullGraph.reverseEdges.get(current) ?? new Set();
|
|
93
|
+
for (const dependent of dependentsOfCurrent) {
|
|
94
|
+
if (!visited.has(dependent)) {
|
|
95
|
+
visited.add(dependent);
|
|
96
|
+
queue.push(dependent);
|
|
97
|
+
upstreamPackages.add(dependent);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return upstreamPackages;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Build a subgraph containing only packages that transitively depend on the target
|
|
105
|
+
* (excluding the target package itself and unrelated dependencies)
|
|
106
|
+
*/
|
|
107
|
+
function buildUpstreamGraph(upstreamPackages, targetPackageName, fullGraph) {
|
|
108
|
+
// Find ALL packages that transitively depend on target (not just direct)
|
|
109
|
+
const allUpstreamNames = findAllUpstreamPackages(targetPackageName, fullGraph);
|
|
110
|
+
// Exclude the target package itself
|
|
111
|
+
allUpstreamNames.delete(targetPackageName);
|
|
112
|
+
// Get all upstream packages
|
|
113
|
+
const upstreamPkgs = Array.from(allUpstreamNames)
|
|
114
|
+
.map(name => fullGraph.nodes.get(name))
|
|
115
|
+
.filter((p) => p !== undefined);
|
|
116
|
+
// Build edges only between upstream packages
|
|
117
|
+
// (only include dependencies that are also upstream packages)
|
|
118
|
+
const subEdges = new Map();
|
|
119
|
+
for (const pkg of upstreamPkgs) {
|
|
120
|
+
const deps = fullGraph.edges.get(pkg.name) ?? new Set();
|
|
121
|
+
const subDeps = new Set();
|
|
122
|
+
for (const dep of deps) {
|
|
123
|
+
// Only include dependencies that are also upstream packages
|
|
124
|
+
// This ensures we only follow the upstream chain
|
|
125
|
+
if (allUpstreamNames.has(dep)) {
|
|
126
|
+
subDeps.add(dep);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
if (subDeps.size > 0) {
|
|
130
|
+
subEdges.set(pkg.name, subDeps);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
// Toposort
|
|
134
|
+
const indeg = new Map();
|
|
135
|
+
for (const name of allUpstreamNames)
|
|
136
|
+
indeg.set(name, 0);
|
|
137
|
+
for (const [from, tos] of subEdges) {
|
|
138
|
+
for (const to of tos)
|
|
139
|
+
indeg.set(to, (indeg.get(to) ?? 0) + 1);
|
|
140
|
+
}
|
|
141
|
+
const q = [];
|
|
142
|
+
for (const [n, d] of indeg)
|
|
143
|
+
if (d === 0)
|
|
144
|
+
q.push(n);
|
|
145
|
+
const topo = [];
|
|
146
|
+
while (q.length) {
|
|
147
|
+
const n = q.shift();
|
|
148
|
+
topo.push(n);
|
|
149
|
+
for (const dep of subEdges.get(n) ?? []) {
|
|
150
|
+
const nd = (indeg.get(dep) ?? 0) - 1;
|
|
151
|
+
indeg.set(dep, nd);
|
|
152
|
+
if (nd === 0)
|
|
153
|
+
q.push(dep);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
// Add any remaining (cycles)
|
|
157
|
+
const remaining = Array.from(allUpstreamNames).filter(n => !topo.includes(n));
|
|
158
|
+
topo.push(...remaining);
|
|
159
|
+
// Reverse for publish order (dependencies first)
|
|
160
|
+
topo.reverse();
|
|
161
|
+
return { packages: upstreamPkgs, topo };
|
|
162
|
+
}
|
|
163
|
+
export function publishUpstreamCommand() {
|
|
164
|
+
return new Command("publishUpstream")
|
|
165
|
+
.alias("publish-upstream")
|
|
166
|
+
.description("Publish all packages that depend on a given package (works for external packages too)")
|
|
167
|
+
.option("--package <name>", "Package name to find dependents for (required)", "")
|
|
168
|
+
.option("--path <folder>", "Explicit station root folder (overrides prometheus mode)")
|
|
169
|
+
.option("--pro", "Use prometheus mode")
|
|
170
|
+
.option("--prometheus", "Alias of --pro")
|
|
171
|
+
.option("--prometheus-name <folder>", "Prometheus folder name", "prometheus")
|
|
172
|
+
.option("--max-up <n>", "Max parent hops", (v) => Number(v), 120)
|
|
173
|
+
.option("--message <msg>", "Git commit message", "publishing")
|
|
174
|
+
.option("--forceInstall", "Force reinstall per package")
|
|
175
|
+
.option("--no-push", "Don't push")
|
|
176
|
+
.option("--remote <name>", "Remote name", "origin")
|
|
177
|
+
.option("--branch <name>", "Branch name (auto-detected if not provided)")
|
|
178
|
+
.option("--solo", "Solo mode: auto-setup upstream, allow force-with-lease (default)", true)
|
|
179
|
+
.option("--collaborative", "Collaborative mode: safer, no force push")
|
|
180
|
+
.option("--force-upstream", "Push with --force-with-lease (solo mode only)")
|
|
181
|
+
.option("--build-script <name>", "Build script name", "build")
|
|
182
|
+
.option("--dist-check <path>", "File to verify after build", "dist/index.js")
|
|
183
|
+
.option("--bump <type>", "npm version bump (patch|minor|major|none)", "patch")
|
|
184
|
+
.option("--access <type>", "npm publish access (public|restricted)", "public")
|
|
185
|
+
.option("--tag <name>", "npm dist-tag (optional)", "")
|
|
186
|
+
.option("--preview", "Preview mode: show what would be published and exit (no execution)", false)
|
|
187
|
+
.option("--dry-run", "Don't execute commands", false)
|
|
188
|
+
.option("--no-fetch-merge", "Skip fetching and merging remote changes before publishing", false)
|
|
189
|
+
.action(async (opts) => {
|
|
190
|
+
if (!opts.package) {
|
|
191
|
+
console.error("❌ Error: --package is required");
|
|
192
|
+
process.exit(1);
|
|
193
|
+
}
|
|
194
|
+
const stationRoot = resolveStationRoot({
|
|
195
|
+
path: opts.path,
|
|
196
|
+
prometheus: opts.pro || opts.prometheus,
|
|
197
|
+
pro: opts.pro || opts.prometheus,
|
|
198
|
+
prometheusName: opts.prometheusName,
|
|
199
|
+
maxUp: opts.maxUp
|
|
200
|
+
});
|
|
201
|
+
console.log(`Station root: ${stationRoot}`);
|
|
202
|
+
console.log(`Finding packages that depend on: ${opts.package}\n`);
|
|
203
|
+
// Always exclude nx-npm-tools
|
|
204
|
+
const excludePackages = ["nx-npm-tools"];
|
|
205
|
+
const inv = await discoverStationInventory(stationRoot, excludePackages);
|
|
206
|
+
const graph = buildStationGraph(inv);
|
|
207
|
+
// Find upstream packages
|
|
208
|
+
const upstreamPackages = findUpstreamPackages(opts.package, inv, graph);
|
|
209
|
+
if (upstreamPackages.length === 0) {
|
|
210
|
+
console.log(`ℹ️ No packages in this station depend on "${opts.package}"`);
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
console.log(`Found ${upstreamPackages.length} package(s) that depend on "${opts.package}":`);
|
|
214
|
+
upstreamPackages.forEach(p => console.log(` - ${p.name} @ ${p.version} (${p.cwd})`));
|
|
215
|
+
console.log("");
|
|
216
|
+
// Build subgraph with dependencies (excluding target package itself)
|
|
217
|
+
const upstreamGraph = buildUpstreamGraph(upstreamPackages, opts.package, graph);
|
|
218
|
+
// Filter to publishable, non-private packages
|
|
219
|
+
const publishables = upstreamGraph.topo
|
|
220
|
+
.map(n => upstreamGraph.packages.find(p => p.name === n))
|
|
221
|
+
.filter((p) => p !== undefined && !p.private && p.publishable);
|
|
222
|
+
if (publishables.length === 0) {
|
|
223
|
+
console.log(`ℹ️ No publishable packages found upstream from "${opts.package}"`);
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
// Preview mode
|
|
227
|
+
if (opts.preview || opts.dryRun) {
|
|
228
|
+
console.log(`\n📋 PUBLISH UPSTREAM PLAN (${publishables.length} packages)\n`);
|
|
229
|
+
console.log("=".repeat(80));
|
|
230
|
+
console.log(`Target package: ${opts.package}`);
|
|
231
|
+
console.log(`Station root: ${stationRoot}`);
|
|
232
|
+
console.log(`Bump type: ${opts.bump}`);
|
|
233
|
+
console.log(`Access: ${opts.access}`);
|
|
234
|
+
console.log("=".repeat(80));
|
|
235
|
+
console.log("\n📦 Packages to publish (in dependency order):\n");
|
|
236
|
+
publishables.forEach((p, idx) => {
|
|
237
|
+
const deps = [...(graph.edges.get(p.name) ?? [])].filter(d => publishables.some(pub => pub.name === d));
|
|
238
|
+
console.log(`${(idx + 1).toString().padStart(3)}. ${p.name} @ ${p.version}`);
|
|
239
|
+
console.log(` Path: ${p.cwd}`);
|
|
240
|
+
if (deps.length > 0) {
|
|
241
|
+
console.log(` Depends on: ${deps.join(", ")}`);
|
|
242
|
+
}
|
|
243
|
+
console.log("");
|
|
244
|
+
});
|
|
245
|
+
console.log("=".repeat(80));
|
|
246
|
+
console.log("💡 To publish, run without --preview or --dry-run");
|
|
247
|
+
console.log("\n");
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
console.log(`Publish order (${publishables.length}):`);
|
|
251
|
+
for (const p of publishables)
|
|
252
|
+
console.log(`- ${p.name} @ ${p.version} (${p.cwd})`);
|
|
253
|
+
console.log("");
|
|
254
|
+
const soloMode = !opts.collaborative;
|
|
255
|
+
// Check which packages are already published
|
|
256
|
+
console.log("Checking npm registry for already-published packages...");
|
|
257
|
+
const packagesToPublish = [];
|
|
258
|
+
const skippedPackages = [];
|
|
259
|
+
for (const p of publishables) {
|
|
260
|
+
const npmStatus = await checkNpmPackageStatus(p.name, p.version);
|
|
261
|
+
if (npmStatus.alreadyPublished && npmStatus.latest === p.version) {
|
|
262
|
+
skippedPackages.push({
|
|
263
|
+
name: p.name,
|
|
264
|
+
version: p.version,
|
|
265
|
+
reason: `already published at ${p.version}`
|
|
266
|
+
});
|
|
267
|
+
continue;
|
|
268
|
+
}
|
|
269
|
+
packagesToPublish.push(p);
|
|
270
|
+
}
|
|
271
|
+
if (skippedPackages.length > 0) {
|
|
272
|
+
console.log(`\n⏭️ Skipping ${skippedPackages.length} already-published package(s):`);
|
|
273
|
+
for (const skipped of skippedPackages) {
|
|
274
|
+
console.log(` - ${skipped.name} @ ${skipped.version} (${skipped.reason})`);
|
|
275
|
+
}
|
|
276
|
+
console.log("");
|
|
277
|
+
}
|
|
278
|
+
if (packagesToPublish.length === 0) {
|
|
279
|
+
console.log("✅ All upstream packages are already published and up-to-date!");
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
console.log(`📦 Publishing ${packagesToPublish.length} package(s)...\n`);
|
|
283
|
+
const noRemotePackages = [];
|
|
284
|
+
const publishedPackages = [];
|
|
285
|
+
const failedPackages = [];
|
|
286
|
+
for (const p of packagesToPublish) {
|
|
287
|
+
console.log(`\n=== Publishing: ${p.name} (${p.cwd}) ===`);
|
|
288
|
+
try {
|
|
289
|
+
await publishPackageFlow(p.cwd, {
|
|
290
|
+
message: opts.message,
|
|
291
|
+
forceInstall: Boolean(opts.forceInstall),
|
|
292
|
+
push: Boolean(opts.push),
|
|
293
|
+
remote: opts.remote,
|
|
294
|
+
branch: opts.branch,
|
|
295
|
+
soloMode,
|
|
296
|
+
forceWithLease: Boolean(opts.forceUpstream),
|
|
297
|
+
buildScript: opts.buildScript,
|
|
298
|
+
distCheck: opts.distCheck,
|
|
299
|
+
bump: opts.bump,
|
|
300
|
+
access: opts.access,
|
|
301
|
+
tag: String(opts.tag || ""),
|
|
302
|
+
dryRun: Boolean(opts.dryRun),
|
|
303
|
+
fetchAndMerge: opts.fetchMerge !== false
|
|
304
|
+
});
|
|
305
|
+
try {
|
|
306
|
+
const { readJson } = await import("../utils/fs.js");
|
|
307
|
+
const pkg = readJson(path.join(p.cwd, "package.json"));
|
|
308
|
+
publishedPackages.push({ name: p.name, version: pkg.version });
|
|
309
|
+
}
|
|
310
|
+
catch {
|
|
311
|
+
publishedPackages.push({ name: p.name, version: p.version });
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
catch (error) {
|
|
315
|
+
const errorMsg = error?.message ?? String(error) ?? "";
|
|
316
|
+
const stderr = error?.stderr ?? "";
|
|
317
|
+
if (errorMsg.includes("409") || errorMsg.includes("Cannot publish over existing version") ||
|
|
318
|
+
errorMsg.includes("already exists") || stderr.includes("409")) {
|
|
319
|
+
console.log(`⏭️ Skipping ${p.name}: version already published`);
|
|
320
|
+
continue;
|
|
321
|
+
}
|
|
322
|
+
if (errorMsg.includes("does not appear to be a git repository") ||
|
|
323
|
+
errorMsg.includes("Could not read from remote repository")) {
|
|
324
|
+
noRemotePackages.push({ name: p.name, cwd: p.cwd, reason: "No git remote configured" });
|
|
325
|
+
try {
|
|
326
|
+
const publishArgs = ["publish"];
|
|
327
|
+
if (opts.access)
|
|
328
|
+
publishArgs.push("--access", String(opts.access));
|
|
329
|
+
if (opts.tag && String(opts.tag).trim())
|
|
330
|
+
publishArgs.push("--tag", String(opts.tag).trim());
|
|
331
|
+
const { run } = await import("../utils/exec.js");
|
|
332
|
+
await run("npm", publishArgs, p.cwd, true);
|
|
333
|
+
const { readJson } = await import("../utils/fs.js");
|
|
334
|
+
const pkg = readJson(path.join(p.cwd, "package.json"));
|
|
335
|
+
publishedPackages.push({ name: p.name, version: pkg.version });
|
|
336
|
+
console.log(`✅ Published to npm: ${p.name} @ ${pkg.version} (git push skipped - no remote)`);
|
|
337
|
+
}
|
|
338
|
+
catch (npmError) {
|
|
339
|
+
failedPackages.push({ name: p.name, error: npmError?.message ?? String(npmError) });
|
|
340
|
+
}
|
|
341
|
+
continue;
|
|
342
|
+
}
|
|
343
|
+
failedPackages.push({ name: p.name, error: errorMsg });
|
|
344
|
+
console.log(`❌ Failed to publish ${p.name}: ${errorMsg}`);
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
// Print summary
|
|
348
|
+
console.log("\n" + "=".repeat(80));
|
|
349
|
+
console.log("📊 PUBLISH UPSTREAM SUMMARY");
|
|
350
|
+
console.log("=".repeat(80));
|
|
351
|
+
if (publishedPackages.length > 0) {
|
|
352
|
+
console.log(`\n✅ Successfully published (${publishedPackages.length}):`);
|
|
353
|
+
publishedPackages.forEach(p => console.log(` - ${p.name} @ ${p.version}`));
|
|
354
|
+
}
|
|
355
|
+
if (noRemotePackages.length > 0) {
|
|
356
|
+
console.log(`\n⚠️ Published but no git remote (${noRemotePackages.length}):`);
|
|
357
|
+
noRemotePackages.forEach(p => console.log(` - ${p.name} (${p.cwd}) - ${p.reason}`));
|
|
358
|
+
}
|
|
359
|
+
if (failedPackages.length > 0) {
|
|
360
|
+
console.log(`\n❌ Failed to publish (${failedPackages.length}):`);
|
|
361
|
+
failedPackages.forEach(p => console.log(` - ${p.name}: ${p.error}`));
|
|
362
|
+
}
|
|
363
|
+
if (skippedPackages.length > 0) {
|
|
364
|
+
console.log(`\n⏭️ Skipped (already published) (${skippedPackages.length}):`);
|
|
365
|
+
skippedPackages.forEach(s => console.log(` - ${s.name} @ ${s.version} (${s.reason})`));
|
|
366
|
+
}
|
|
367
|
+
console.log("\n" + "=".repeat(80));
|
|
368
|
+
console.log("✅ Publish upstream finished.");
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
//# sourceMappingURL=publishUpstream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishUpstream.js","sourceRoot":"","sources":["../../src/commands/publishUpstream.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -5,9 +5,11 @@ import { fileURLToPath } from "node:url";
|
|
|
5
5
|
import { dirname, join } from "node:path";
|
|
6
6
|
import { runOnceCommand } from "./commands/runOnce.js";
|
|
7
7
|
import { gitSyncCommand } from "./commands/gitSync.js";
|
|
8
|
+
import { gitPullCommand } from "./commands/gitPull.js";
|
|
8
9
|
import { connectGitCommand } from "./commands/connectGit.js";
|
|
9
10
|
import { publishOneCommand } from "./commands/publishOne.js";
|
|
10
11
|
import { publishStationCommand } from "./commands/publishStation.js";
|
|
12
|
+
import { publishUpstreamCommand } from "./commands/publishUpstream.js";
|
|
11
13
|
import { reportStationCommand } from "./commands/reportStation.js";
|
|
12
14
|
import { archiveExcludedCommand } from "./commands/archiveExcluded.js";
|
|
13
15
|
import { archivePreviewCommand } from "./commands/archivePreview.js";
|
|
@@ -35,9 +37,11 @@ program
|
|
|
35
37
|
.version(version);
|
|
36
38
|
program.addCommand(runOnceCommand());
|
|
37
39
|
program.addCommand(gitSyncCommand());
|
|
40
|
+
program.addCommand(gitPullCommand());
|
|
38
41
|
program.addCommand(connectGitCommand());
|
|
39
42
|
program.addCommand(publishOneCommand());
|
|
40
43
|
program.addCommand(publishStationCommand());
|
|
44
|
+
program.addCommand(publishUpstreamCommand());
|
|
41
45
|
program.addCommand(reportStationCommand());
|
|
42
46
|
program.addCommand(archiveExcludedCommand());
|
|
43
47
|
program.addCommand(archivePreviewCommand());
|