@rudderjs/cli 4.16.0 → 4.17.1

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.
Files changed (14) hide show
  1. package/dist/commands/completion.d.ts.map +1 -1
  2. package/dist/commands/completion.js +6 -5
  3. package/dist/commands/completion.js.map +1 -1
  4. package/dist/commands/make/_shared.d.ts.map +1 -1
  5. package/dist/commands/make/_shared.js +11 -1
  6. package/dist/commands/make/_shared.js.map +1 -1
  7. package/dist/commands/upgrade.d.ts +48 -0
  8. package/dist/commands/upgrade.d.ts.map +1 -1
  9. package/dist/commands/upgrade.js +340 -49
  10. package/dist/commands/upgrade.js.map +1 -1
  11. package/dist/suggest.d.ts.map +1 -1
  12. package/dist/suggest.js +5 -3
  13. package/dist/suggest.js.map +1 -1
  14. package/package.json +6 -6
package/dist/commands/completion.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAmCxC,eAAO,MAAM,gBAAgB,kCAAmC,CAAA;AAChE,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAErD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EA4B1C,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAE/C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,EAAE,CAG3F;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,EAAE,CAMxE;AAqBD,mEAAmE;AACnE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAQrD;AA8HD,UAAU,WAAW;IACnB,sDAAsD;IACtD,UAAU,EAAE,MAAM,CAAA;IAClB,oFAAoF;IACpF,MAAM,EAAM,MAAM,GAAG,IAAI,CAAA;IACzB,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAA;CACnB;AAKD,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAgBnE;AAED,oFAAoF;AACpF,wBAAgB,WAAW,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,KAAK,GAAG,IAAI,CAG9E;AA2BD,mFAAmF;AACnF,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOnE;AAED,2EAA2E;AAC3E,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAOlD;AAMD,iBAAS,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAmBpD;AAED,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAStD;AAID,iDAAiD;AACjD,eAAO,MAAM,SAAS;;;;;;;CAA0F,CAAA;AAEhH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwDxD"}
1
+ {"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAmCxC,eAAO,MAAM,gBAAgB,kCAAmC,CAAA;AAChE,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAErD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EA4B1C,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAE/C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,EAAE,CAG3F;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,EAAE,CAMxE;AAqBD,mEAAmE;AACnE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAQrD;AA+HD,UAAU,WAAW;IACnB,sDAAsD;IACtD,UAAU,EAAE,MAAM,CAAA;IAClB,oFAAoF;IACpF,MAAM,EAAM,MAAM,GAAG,IAAI,CAAA;IACzB,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAA;CACnB;AAKD,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAgBnE;AAED,oFAAoF;AACpF,wBAAgB,WAAW,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,KAAK,GAAG,IAAI,CAG9E;AA2BD,mFAAmF;AACnF,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOnE;AAED,2EAA2E;AAC3E,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAOlD;AAMD,iBAAS,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAmBpD;AAED,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAStD;AAID,iDAAiD;AACjD,eAAO,MAAM,SAAS;;;;;;;CAA0F,CAAA;AAEhH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwDxD"}
package/dist/commands/completion.js CHANGED
@@ -144,7 +144,7 @@ _rudder_complete() {
144
144
  cur="\${COMP_WORDS[cword]}"
145
145
 
146
146
  # Flag completion: the word starts with '-'. Extract the command as the
147
- # colon-run beginning at index 1 (robust to intervening arguments), then list
147
+ # colon-joined word beginning at index 1 (robust to intervening arguments), then list
148
148
  # its flags. Unknown/top-level falls back to the global flags.
149
149
  if [[ "\${cur}" == -* ]]; then
150
150
  local fcmd="\${COMP_WORDS[1]}" j=2
@@ -206,8 +206,9 @@ function zshScript(words, argCmds) {
206
206
  return `#compdef rudder
207
207
  # rudder zsh completion. Source this file or use \`rudder completion install\`.
208
208
  _rudder() {
209
- # Flag completion: the word being completed starts with '-'. $words[2] is the
210
- # command (zsh does not split on ':'); unknown/top-level uses the global flags.
209
+ # Flag completion: the word being completed starts with '-'. zsh arrays are
210
+ # 1-indexed, so $words[2] is the command token after 'rudder' (zsh does not
211
+ # split on ':'); unknown/top-level uses the global flags.
211
212
  if [[ "\${words[CURRENT]}" == -* ]]; then
212
213
  local cmd="\${words[2]}"
213
214
  local -a fl
@@ -246,8 +247,8 @@ function fishScript(words, argCmds) {
246
247
  return `# rudder fish completion. Autoloaded from the fish completions dir, or use \`rudder completion install\`.
247
248
  complete -c rudder -f -n '__fish_use_subcommand' -a '${words}'
248
249
  complete -c rudder -f -n '__fish_seen_subcommand_from ${argCmds}' -a '(rudder completion args (commandline -opc)[2] 2>/dev/null)'
249
- # Flag completion once a known command is present (fish offers these when the
250
- # token starts with '-'). Empty command list = every known command.
250
+ # Flag completion once a known subcommand is present; this condition matches the
251
+ # full known-command list (${words}). fish offers these when the token starts with '-'.
251
252
  complete -c rudder -f -n '__fish_seen_subcommand_from ${words}' -a '(rudder completion flags (commandline -opc)[2] 2>/dev/null)'
252
253
  `;
253
254
  }
package/dist/commands/completion.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"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"}
package/dist/commands/make/_shared.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../../src/commands/make/_shared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAIxC,MAAM,WAAW,WAAW;IAC1B,4CAA4C;IAC5C,KAAK,EAAQ,MAAM,CAAA;IACnB,wCAAwC;IACxC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,qDAAqD;IACrD,OAAO,EAAM,MAAM,CAAA;IACnB,sCAAsC;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,mEAAmE;IACnE,KAAK,EAAQ,MAAM,CAAA;IACnB,+DAA+D;IAC/D,MAAM,CAAC,EAAM,MAAM,CAAA;IACnB,4EAA4E;IAC5E,SAAS,EAAI,MAAM,CAAA;IACnB,8EAA8E;IAC9E,IAAI,EAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAA;IACzE;;;;;OAKG;IACH,QAAQ,CAAC,EAAI,SAAS,GAAG,MAAM,CAAA;IAC/B,sEAAsE;IACtE,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1G;AAoCD,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CA4CnE"}
1
+ {"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../../src/commands/make/_shared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAIxC,MAAM,WAAW,WAAW;IAC1B,4CAA4C;IAC5C,KAAK,EAAQ,MAAM,CAAA;IACnB,wCAAwC;IACxC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,qDAAqD;IACrD,OAAO,EAAM,MAAM,CAAA;IACnB,sCAAsC;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,mEAAmE;IACnE,KAAK,EAAQ,MAAM,CAAA;IACnB,+DAA+D;IAC/D,MAAM,CAAC,EAAM,MAAM,CAAA;IACnB,4EAA4E;IAC5E,SAAS,EAAI,MAAM,CAAA;IACnB,8EAA8E;IAC9E,IAAI,EAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAA;IACzE;;;;;OAKG;IACH,QAAQ,CAAC,EAAI,SAAS,GAAG,MAAM,CAAA;IAC/B,sEAAsE;IACtE,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1G;AAoCD,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAuDnE"}
package/dist/commands/make/_shared.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { writeFile, mkdir } from 'node:fs/promises';
2
2
  import { existsSync } from 'node:fs';
3
- import { resolve, dirname } from 'node:path';
3
+ import { resolve, dirname, sep } from 'node:path';
4
4
  import chalk from 'chalk';
5
5
  import { featureStub, unitStub } from './test-stubs.js';
6
6
  /**
@@ -48,6 +48,16 @@ export function registerMake(program, spec) {
48
48
  : name;
49
49
  const relPath = `${spec.directory}/${className}.ts`;
50
50
  const outPath = resolve(process.cwd(), relPath);
51
+ // Containment guard: a name like `../../../etc/foo` resolves outside the
52
+ // spec's target directory, and `mkdir({recursive})` + write would happily
53
+ // create it — an arbitrary-file-write vector when the name is untrusted.
54
+ // (The companion test file is only written after the main file lands, so
55
+ // blocking here covers it too.) Nested names like `Admin/User` stay valid.
56
+ const baseDir = resolve(process.cwd(), spec.directory);
57
+ if (outPath !== baseDir && !outPath.startsWith(baseDir + sep)) {
58
+ console.error(chalk.red(` ✗ Invalid name "${name}": the resolved path escapes ${spec.directory}.`));
59
+ return;
60
+ }
51
61
  await mkdir(dirname(outPath), { recursive: true });
52
62
  try {
53
63
  // Atomic create-or-overwrite: `wx` fails if the file already exists,
package/dist/commands/make/_shared.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../../src/commands/make/_shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../../src/commands/make/_shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAEjD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAmCvD;;;;GAIG;AACH,KAAK,UAAU,kBAAkB,CAC/B,SAAiB,EACjB,SAAiB,EACjB,QAA4B,EAC5B,KAAc;IAEd,MAAM,OAAO,GAAG,SAAS,SAAS,UAAU,CAAA;IAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAE3G,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IACjE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC,CAAA;YAC/D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC,CAAA;YACzD,OAAM;QACR,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAClE,oEAAoE;IACpE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;QAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,uFAAuF,CAAC,CAAC,CAAA;IACpH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAgB,EAAE,IAAc;IAC3D,IAAI,GAAG,GAAG,OAAO;SACd,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,SAAS,CAAC;SACjC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC;SAC7B,MAAM,CAAC,aAAa,EAAE,kCAAkC,CAAC,CAAA;IAE5D,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,6BAA6B,CAAA;QAC/G,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,yCAAyC,KAAK,EAAE,CAAC,CAAA;IACvF,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC;QAC5C,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;IAClD,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAA6B,EAAE,EAAE;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAC1D,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE;YACzB,CAAC,CAAC,IAAI,CAAA;QACR,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,KAAK,CAAA;QACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAA;QAE/C,yEAAyE;QACzE,0EAA0E;QAC1E,yEAAyE;QACzE,yEAAyE;QACzE,2EAA2E;QAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACtD,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qBAAqB,IAAI,gCAAgC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;YACpG,OAAM;QACR,CAAC;QAED,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAClD,IAAI,CAAC;YACH,qEAAqE;YACrE,qEAAqE;YACrE,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5F,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC,CAAA;gBAC1D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC,CAAA;gBACzD,OAAM;YACR,CAAC;YACD,MAAM,GAAG,CAAA;QACX,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QAEnE,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,MAAM,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACrF,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACN,CAAC"}
package/dist/commands/upgrade.d.ts CHANGED
@@ -58,6 +58,7 @@ type FetchManifestFn = (pkg: string, version: string) => Promise<NpmManifest | n
58
58
  * manifests.
59
59
  */
60
60
  export declare function collectPeerMismatches(rows: PlanRow[], consumer: Map<string, ConsumerPeer>, fetcher: FetchManifestFn): Promise<PeerMismatch[]>;
61
+ type UpgradeMode = 'latest' | 'minor' | 'patch';
61
62
  interface DepEntry {
62
63
  name: string;
63
64
  range: string;
@@ -71,6 +72,53 @@ interface PlanRow {
71
72
  target: ParsedVersion;
72
73
  newRange: string;
73
74
  }
75
+ type OverrideSource = 'pnpm-workspace.yaml' | 'pnpm.overrides' | 'resolutions';
76
+ interface OverridePin {
77
+ name: string;
78
+ value: string;
79
+ source: OverrideSource;
80
+ }
81
+ interface OverridePlanRow {
82
+ name: string;
83
+ source: OverrideSource;
84
+ current: ParsedVersion;
85
+ target: ParsedVersion;
86
+ oldValue: string;
87
+ newValue: string;
88
+ }
89
+ /**
90
+ * Parse the `@rudderjs/*` entries out of a `pnpm-workspace.yaml`'s top-level
91
+ * `overrides:` block. Deliberately text-scoped (not a full YAML parse) so the
92
+ * companion {@link replaceYamlOverride} can rewrite in place and preserve
93
+ * comments / formatting. Only simple `name: version` pins are read — pnpm's
94
+ * selector keys (`a>b`, `foo@1>bar`) never match a bare `@rudderjs/<name>`.
95
+ */
96
+ export declare function parseYamlOverrides(yaml: string): Array<[string, string]>;
97
+ /**
98
+ * Rewrite one `@rudderjs/<name>` pin in a `pnpm-workspace.yaml` overrides block
99
+ * to `version`, preserving the original quoting, operator prefix, and any inline
100
+ * comment. Returns the new text and whether a line was replaced.
101
+ */
102
+ export declare function replaceYamlOverride(yaml: string, name: string, version: string): {
103
+ text: string;
104
+ replaced: boolean;
105
+ };
106
+ /**
107
+ * Collect every `@rudderjs/*` override pin governing the run, from the root
108
+ * package.json (`pnpm.overrides`, `resolutions`) and `pnpm-workspace.yaml`.
109
+ */
110
+ export declare function collectOverridePins(rootPkg: Record<string, unknown>, workspaceYaml: string | null): OverridePin[];
111
+ type FetchLatestFn = (pkg: string) => Promise<string | null>;
112
+ /**
113
+ * Build the override-bump plan: for each pinned `@rudderjs/*` package fetch the
114
+ * latest version, cap it by `mode`, and (when it's an upgrade) produce a row
115
+ * with the rewritten pin value (original operator prefix preserved). Latest is
116
+ * fetched once per distinct package name even when pinned in several sources.
117
+ */
118
+ export declare function buildOverridePlan(pins: OverridePin[], mode: UpgradeMode, fetch: FetchLatestFn): Promise<{
119
+ rows: OverridePlanRow[];
120
+ skipped: string[];
121
+ }>;
74
122
  type FetchChangelogFn = (pkg: string) => Promise<string | null>;
75
123
  /**
76
124
  * Walk the plan, fetch + parse each package's CHANGELOG in parallel, return a
package/dist/commands/upgrade.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA6BxC,UAAU,aAAa;IAAG,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAyGvE,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1C;AA8CD;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAG,MAAM,CAAA;IAChB,MAAM,EAAI,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAyBD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,EAAE,EAAI,MAAM,EACZ,IAAI,EAAE,aAAa,EACnB,EAAE,EAAI,aAAa,GAClB,cAAc,EAAE,CAuBlB;AA2BD,UAAU,YAAY;IACpB,KAAK,EAAI,MAAM,CAAA;IACf,OAAO,EAAE,cAAc,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;CACjE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAUzF;AAED,UAAU,YAAY;IACpB,IAAI,EAAa,MAAM,CAAA;IACvB,QAAQ,EAAS,MAAM,CAAA;IACvB,aAAa,EAAI,MAAM,CAAA;IACvB,eAAe,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,IAAI,CAAA;IAC/C,aAAa,EAAI,MAAM,CAAA;IACvB,MAAM,EAAW,MAAM,CAAA;CACxB;AAED,KAAK,eAAe,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;AAEpF;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAM,OAAO,EAAE,EACnB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACnC,OAAO,EAAG,eAAe,GACxB,OAAO,CAAC,YAAY,EAAE,CAAC,CA+BzB;AAMD,UAAU,QAAQ;IAChB,IAAI,EAAK,MAAM,CAAA;IACf,KAAK,EAAI,MAAM,CAAA;IACf,OAAO,EAAE,cAAc,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;CACjE;AAED,UAAU,OAAO;IACf,IAAI,EAAM,MAAM,CAAA;IAChB,OAAO,EAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC7B,OAAO,EAAG,aAAa,CAAA;IACvB,MAAM,EAAI,aAAa,CAAA;IACvB,MAAM,EAAI,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAoED,KAAK,gBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;AAE/D;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAK,OAAO,EAAE,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CASxC;AAiCD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuLrD"}
1
+ {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
package/dist/commands/upgrade.js CHANGED
@@ -352,6 +352,181 @@ function collectDeps(pkg) {
352
352
  }
353
353
  return out;
354
354
  }
355
+ /** Read a file's text, or `null` if it doesn't exist / can't be read. Used
356
+ * instead of an `existsSync` precheck + read so there's no check-then-use
357
+ * file-system race (a `read` that fails is just `null`). */
358
+ function readFileOrNull(p) {
359
+ try {
360
+ return readFileSync(p, 'utf8');
361
+ }
362
+ catch {
363
+ return null;
364
+ }
365
+ }
366
+ /**
367
+ * Find the directory whose override config governs `cwd`. Overrides only take
368
+ * effect from the workspace root, so walk up for a `pnpm-workspace.yaml`, then
369
+ * (for yarn/npm) for a `package.json` declaring `workspaces`. Falls back to
370
+ * `cwd` for a plain single-package repo.
371
+ */
372
+ function findOverrideRoot(cwd) {
373
+ for (let dir = cwd;;) {
374
+ if (readFileOrNull(path.join(dir, 'pnpm-workspace.yaml')) !== null)
375
+ return dir;
376
+ const parent = path.dirname(dir);
377
+ if (parent === dir)
378
+ break;
379
+ dir = parent;
380
+ }
381
+ for (let dir = cwd;;) {
382
+ const raw = readFileOrNull(path.join(dir, 'package.json'));
383
+ if (raw !== null) {
384
+ try {
385
+ const j = JSON.parse(raw);
386
+ if (j['workspaces'])
387
+ return dir;
388
+ }
389
+ catch { /* unreadable — keep walking */ }
390
+ }
391
+ const parent = path.dirname(dir);
392
+ if (parent === dir)
393
+ break;
394
+ dir = parent;
395
+ }
396
+ return cwd;
397
+ }
398
+ /** The leading range operator of a version string (`^`/`~`), or `''` for an
399
+ * exact pin. Anything more exotic is treated as exact on rewrite. */
400
+ function rangePrefix(value) {
401
+ const m = /^\s*([\^~]?)/.exec(value);
402
+ return m?.[1] ?? '';
403
+ }
404
+ /**
405
+ * Parse the `@rudderjs/*` entries out of a `pnpm-workspace.yaml`'s top-level
406
+ * `overrides:` block. Deliberately text-scoped (not a full YAML parse) so the
407
+ * companion {@link replaceYamlOverride} can rewrite in place and preserve
408
+ * comments / formatting. Only simple `name: version` pins are read — pnpm's
409
+ * selector keys (`a>b`, `foo@1>bar`) never match a bare `@rudderjs/<name>`.
410
+ */
411
+ export function parseYamlOverrides(yaml) {
412
+ const out = [];
413
+ let inBlock = false;
414
+ for (const line of yaml.split('\n')) {
415
+ if (!inBlock) {
416
+ if (/^overrides:\s*$/.test(line))
417
+ inBlock = true;
418
+ continue;
419
+ }
420
+ if (line.trim() === '')
421
+ continue;
422
+ const indent = line.length - line.trimStart().length;
423
+ if (indent === 0) {
424
+ inBlock = false;
425
+ continue;
426
+ } // dedented out of the block
427
+ const m = /^\s*['"]?(@rudderjs\/[a-z0-9-]+)['"]?\s*:\s*['"]?([\^~]?[0-9][^'"#\s]*)['"]?/.exec(line);
428
+ if (m)
429
+ out.push([m[1], m[2]]);
430
+ }
431
+ return out;
432
+ }
433
+ /**
434
+ * Rewrite one `@rudderjs/<name>` pin in a `pnpm-workspace.yaml` overrides block
435
+ * to `version`, preserving the original quoting, operator prefix, and any inline
436
+ * comment. Returns the new text and whether a line was replaced.
437
+ */
438
+ export function replaceYamlOverride(yaml, name, version) {
439
+ const esc = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
440
+ const lines = yaml.split('\n');
441
+ let inBlock = false;
442
+ let replaced = false;
443
+ for (let i = 0; i < lines.length; i++) {
444
+ const line = lines[i];
445
+ if (!inBlock) {
446
+ if (/^overrides:\s*$/.test(line))
447
+ inBlock = true;
448
+ continue;
449
+ }
450
+ if (line.trim() === '')
451
+ continue;
452
+ const indent = line.length - line.trimStart().length;
453
+ if (indent === 0) {
454
+ inBlock = false;
455
+ continue;
456
+ }
457
+ // (prefix)(quote)(operator)(version)(quote)(trailing comment)
458
+ const re = new RegExp(`^(\\s*['"]?${esc}['"]?\\s*:\\s*)(['"]?)([\\^~]?)([0-9][^'"#\\s]*)(['"]?)(\\s*(?:#.*)?)$`);
459
+ const m = re.exec(line);
460
+ if (m) {
461
+ lines[i] = `${m[1]}${m[2]}${m[3]}${version}${m[5]}${m[6]}`;
462
+ replaced = true;
463
+ }
464
+ }
465
+ return { text: lines.join('\n'), replaced };
466
+ }
467
+ /**
468
+ * Collect every `@rudderjs/*` override pin governing the run, from the root
469
+ * package.json (`pnpm.overrides`, `resolutions`) and `pnpm-workspace.yaml`.
470
+ */
471
+ export function collectOverridePins(rootPkg, workspaceYaml) {
472
+ const out = [];
473
+ const pnpm = rootPkg['pnpm'];
474
+ const pnpmOverrides = pnpm && typeof pnpm === 'object' ? pnpm['overrides'] : undefined;
475
+ for (const [field, source] of [[pnpmOverrides, 'pnpm.overrides'], [rootPkg['resolutions'], 'resolutions']]) {
476
+ if (!field || typeof field !== 'object')
477
+ continue;
478
+ for (const [name, value] of Object.entries(field)) {
479
+ if (name.startsWith('@rudderjs/') && typeof value === 'string')
480
+ out.push({ name, value, source });
481
+ }
482
+ }
483
+ if (workspaceYaml) {
484
+ for (const [name, value] of parseYamlOverrides(workspaceYaml)) {
485
+ out.push({ name, value, source: 'pnpm-workspace.yaml' });
486
+ }
487
+ }
488
+ return out;
489
+ }
490
+ /**
491
+ * Build the override-bump plan: for each pinned `@rudderjs/*` package fetch the
492
+ * latest version, cap it by `mode`, and (when it's an upgrade) produce a row
493
+ * with the rewritten pin value (original operator prefix preserved). Latest is
494
+ * fetched once per distinct package name even when pinned in several sources.
495
+ */
496
+ export async function buildOverridePlan(pins, mode, fetch) {
497
+ const rows = [];
498
+ const skipped = [];
499
+ const names = [...new Set(pins.map(p => p.name))];
500
+ const latest = new Map();
501
+ await Promise.all(names.map(async (n) => { latest.set(n, await fetch(n)); }));
502
+ for (const pin of pins) {
503
+ const l = latest.get(pin.name) ?? null;
504
+ if (l === null) {
505
+ skipped.push(`${pin.name} (registry unreachable) [${pin.source}]`);
506
+ continue;
507
+ }
508
+ const current = parseVersion(pin.value);
509
+ const latestParsed = parseVersion(l);
510
+ if (!current || !latestParsed) {
511
+ skipped.push(`${pin.name} (couldn't parse "${pin.value}") [${pin.source}]`);
512
+ continue;
513
+ }
514
+ if (compareVersions(latestParsed, current) <= 0)
515
+ continue;
516
+ const target = buildTarget(current, latestParsed, mode);
517
+ if (compareVersions(target, current) <= 0)
518
+ continue;
519
+ rows.push({
520
+ name: pin.name,
521
+ source: pin.source,
522
+ current,
523
+ target,
524
+ oldValue: pin.value,
525
+ newValue: `${rangePrefix(pin.value)}${fmt(target)}`,
526
+ });
527
+ }
528
+ return { rows, skipped };
529
+ }
355
530
  // ── Output ────────────────────────────────────────────────────
356
531
  const isTTY = process.stdout.isTTY ?? false;
357
532
  const dim = (s) => isTTY ? `\x1b[2m${s}\x1b[0m` : s;
@@ -417,6 +592,32 @@ function applyUpdates(pkgPath, pkg, rows) {
417
592
  }
418
593
  writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
419
594
  }
595
+ /** Mutate the in-memory root package.json with the JSON-sourced override bumps
596
+ * (`pnpm.overrides`, `resolutions`). The caller writes the file. */
597
+ function applyJsonOverrides(rootPkg, rows) {
598
+ for (const row of rows) {
599
+ if (row.source === 'pnpm.overrides') {
600
+ const pnpm = rootPkg['pnpm'];
601
+ const ov = pnpm?.['overrides'];
602
+ if (ov && row.name in ov)
603
+ ov[row.name] = row.newValue;
604
+ }
605
+ else if (row.source === 'resolutions') {
606
+ const res = rootPkg['resolutions'];
607
+ if (res && row.name in res)
608
+ res[row.name] = row.newValue;
609
+ }
610
+ }
611
+ }
612
+ /** Render the override-pin bump plan — one row per pin, grouped value arrow. */
613
+ function renderOverridePlan(rows) {
614
+ const nameWidth = Math.max(...rows.map(r => r.name.length));
615
+ for (const row of rows) {
616
+ const color = colorBump(row.current, row.target);
617
+ const left = row.name.padEnd(nameWidth);
618
+ console.log(` ${left} ${dim(row.oldValue)} ${dim('→')} ${color(row.newValue)} ${dim('(' + row.source + ')')}`);
619
+ }
620
+ }
420
621
  function runInstall(pm, cwd) {
421
622
  return new Promise((resolve) => {
422
623
  const child = spawn(pm, pmInstall(pm), { cwd, stdio: 'inherit', shell: process.platform === 'win32' });
@@ -439,20 +640,42 @@ export function upgradeCommand(program) {
439
640
  .action(async (opts) => {
440
641
  const cwd = process.cwd();
441
642
  const pkgPath = path.join(cwd, 'package.json');
442
- if (!existsSync(pkgPath)) {
643
+ const pkgRaw = readFileOrNull(pkgPath);
644
+ if (pkgRaw === null) {
443
645
  console.error(red('[rudder upgrade]') + ` no package.json in ${cwd}`);
444
646
  process.exit(1);
445
647
  }
446
648
  // Mode selection — `--patch` beats `--minor` beats `--latest` if more
447
649
  // than one is passed (most-restrictive wins, matches npm conventions).
448
650
  const mode = opts.patch ? 'patch' : opts.minor ? 'minor' : 'latest';
449
- const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
651
+ const pkg = JSON.parse(pkgRaw);
450
652
  const deps = collectDeps(pkg);
451
- if (deps.length === 0) {
653
+ // Override pins (pnpm-workspace.yaml overrides / pnpm.overrides / resolutions)
654
+ // governing this run — read from the workspace ROOT, since that's where
655
+ // overrides take effect even when upgrade runs inside a member package.
656
+ const overrideRoot = findOverrideRoot(cwd);
657
+ const rootPkgPath = path.join(overrideRoot, 'package.json');
658
+ const rootPkg = (() => {
659
+ if (rootPkgPath === pkgPath)
660
+ return pkg;
661
+ const raw = readFileOrNull(rootPkgPath);
662
+ if (raw === null)
663
+ return {};
664
+ try {
665
+ return JSON.parse(raw);
666
+ }
667
+ catch {
668
+ return {};
669
+ }
670
+ })();
671
+ const wsYamlPath = path.join(overrideRoot, 'pnpm-workspace.yaml');
672
+ const wsYaml = readFileOrNull(wsYamlPath);
673
+ const overridePins = collectOverridePins(rootPkg, wsYaml);
674
+ if (deps.length === 0 && overridePins.length === 0) {
452
675
  console.log(dim(' No @rudderjs/* dependencies in package.json — nothing to upgrade.'));
453
676
  return;
454
677
  }
455
- console.log(`\n ${bold('Checking ' + deps.length + ' @rudderjs/* packages...')}`);
678
+ console.log(`\n ${bold('Checking ' + deps.length + ' @rudderjs/* packages' + (overridePins.length ? ` (+${overridePins.length} override pin(s))` : '') + '...')}`);
456
679
  const registry = opts.registry ?? 'https://registry.npmjs.org';
457
680
  const fetched = await Promise.all(deps.map(async (d) => {
458
681
  const latest = await fetchLatest(d.name, registry);
@@ -508,24 +731,42 @@ export function upgradeCommand(program) {
508
731
  for (const s of skipped)
509
732
  console.log(` ${dim('•')} ${s}`);
510
733
  }
511
- if (rows.length === 0) {
734
+ // ── Override-pin plan ─────────────────────────────────
735
+ //
736
+ // Issue #1089: when the rudder train is pinned via package-manager
737
+ // overrides, those pins win at install time. Bumping only the package.json
738
+ // ranges yields a silent partial upgrade. So plan a bump for every pinned
739
+ // @rudderjs/* package too — including transitive siblings that aren't
740
+ // direct deps — and keep the pins in lockstep with the ranges.
741
+ const { rows: overrideRows, skipped: overrideSkipped } = overridePins.length
742
+ ? await buildOverridePlan(overridePins, mode, (n) => fetchLatest(n, registry))
743
+ : { rows: [], skipped: [] };
744
+ if (overrideSkipped.length) {
745
+ console.log(yel('\n Could not check (override pins):'));
746
+ for (const s of overrideSkipped)
747
+ console.log(` ${dim('•')} ${s}`);
748
+ }
749
+ if (rows.length === 0 && overrideRows.length === 0) {
512
750
  const pinnedChecked = deps.length - skipped.length - floating.length
513
751
  - deps.filter(d => shapeOfRange(d.range) === 'workspace').length;
514
- if (pinnedChecked === 0 && floating.length === 0) {
752
+ if (deps.length === 0 && overridePins.length > 0) {
753
+ console.log(green('\n ✓ All override-pinned @rudderjs/* packages are up to date.'));
754
+ }
755
+ else if (pinnedChecked === 0 && floating.length === 0 && overridePins.length === 0) {
515
756
  // Every dep was workspace / unreachable — most commonly a
516
757
  // monorepo. Avoid the misleading "everything up to date" green tick.
517
758
  console.log(dim('\n Nothing to do — no parseable @rudderjs/* version ranges to check.'));
518
759
  }
519
- else if (pinnedChecked === 0) {
760
+ else if (pinnedChecked === 0 && overridePins.length === 0) {
520
761
  // Only floating ranges — the info block above already covered it.
521
762
  // Don't repeat with a green tick that implies bump verification.
522
763
  }
523
764
  else {
524
- console.log(green(`\n ✓ All ${pinnedChecked} pinned @rudderjs/* dependency(ies) are up to date.`));
765
+ const n = pinnedChecked + new Set(overridePins.map(p => p.name)).size;
766
+ console.log(green(`\n ✓ All ${n} pinned @rudderjs/* dependency(ies) are up to date.`));
525
767
  }
526
768
  return;
527
769
  }
528
- console.log(`\n ${bold('Updates available:')}`);
529
770
  // ── CHANGELOG snippets ────────────────────────────────
530
771
  //
531
772
  // For each bump, fetch the package's CHANGELOG.md from GitHub raw,
@@ -536,61 +777,108 @@ export function upgradeCommand(program) {
536
777
  // `--no-changelog` skips the fetch entirely for users who want speed
537
778
  // or quieter output. CHANGELOG failures degrade gracefully — a row
538
779
  // with no entries simply renders without the indented detail block.
539
- const changelogs = opts.changelog === false
540
- ? new Map()
541
- : await collectChangelogs(rows, (n) => fetchChangelog(n, opts.changelogBase ?? 'https://raw.githubusercontent.com/rudderjs/rudder/main'));
542
- renderPlanWithChangelogs(rows, changelogs);
543
- // Legend — only show when there are colored bumps to explain.
544
- const hasMajor = rows.some(r => r.target.major > r.current.major);
545
- if (hasMajor) {
546
- console.log(`\n ${red('●')} major ${cyan('●')} minor ${green('●')} patch`);
547
- console.log(dim(' Major bumps may contain breaking changes — review CHANGELOGs before applying.'));
548
- }
549
- // ── Peer-dep mismatch check ─────────────────────────────
550
- //
551
- // Closes the gap that bit rudderjs.com on 2026-05-29: `pnpm update --latest
552
- // "@rudderjs/*"` happily bumped the framework packages, but didn't notice
553
- // that `@rudderjs/vite@2.7.x` requires `vite ^8` while the consumer's
554
- // package.json still declared `"vite": "^7.1.0"`. Apps stayed on the old
555
- // peer, got a (silent or warned-but-tolerated) peer mismatch, and missed
556
- // the framework upgrade.
557
- //
558
- // Strategy: for every package we're bumping, fetch its manifest at the
559
- // TARGET version and look up its peerDependencies. Each peer is
560
- // intersected against the consumer's declared range in package.json. No
561
- // overlap = mismatch. Mismatches are shown loudly and (in --check mode)
562
- // promote the exit code.
563
- const consumerPeers = readConsumerPeers(pkg);
564
- const peerMismatches = await collectPeerMismatches(rows, consumerPeers, (n, v) => fetchManifest(n, v, registry));
565
- if (peerMismatches.length) {
566
- console.log(`\n ${yel(bold('⚠ Peer-dependency mismatches:'))}`);
567
- for (const m of peerMismatches) {
568
- console.log(` ${bold(m.peer)} ${dim('— required by')} ${m.causedBy}`);
569
- console.log(` ${dim('your package.json:')} ${m.consumerSection ? `${m.consumerSection}.` : ''}${m.peer} = ${red(`"${m.consumerRange}"`)}`);
570
- console.log(` ${dim('framework needs: ')} ${green(`"${m.requiredRange}"`)}`);
571
- console.log(` ${dim('reason: ')} ${m.reason}`);
780
+ let peerMismatches = [];
781
+ if (rows.length > 0) {
782
+ console.log(`\n ${bold('Updates available:')}`);
783
+ const changelogs = opts.changelog === false
784
+ ? new Map()
785
+ : await collectChangelogs(rows, (n) => fetchChangelog(n, opts.changelogBase ?? 'https://raw.githubusercontent.com/rudderjs/rudder/main'));
786
+ renderPlanWithChangelogs(rows, changelogs);
787
+ // Legend — only show when there are colored bumps to explain.
788
+ const hasMajor = rows.some(r => r.target.major > r.current.major);
789
+ if (hasMajor) {
790
+ console.log(`\n ${red('●')} major ${cyan('●')} minor ${green('●')} patch`);
791
+ console.log(dim(' Major bumps may contain breaking changes — review CHANGELOGs before applying.'));
792
+ }
793
+ // ── Peer-dep mismatch check ─────────────────────────────
794
+ //
795
+ // Closes the gap that bit rudderjs.com on 2026-05-29: `pnpm update --latest
796
+ // "@rudderjs/*"` happily bumped the framework packages, but didn't notice
797
+ // that `@rudderjs/vite@2.7.x` requires `vite ^8` while the consumer's
798
+ // package.json still declared `"vite": "^7.1.0"`. Apps stayed on the old
799
+ // peer, got a (silent or warned-but-tolerated) peer mismatch, and missed
800
+ // the framework upgrade.
801
+ const consumerPeers = readConsumerPeers(pkg);
802
+ peerMismatches = await collectPeerMismatches(rows, consumerPeers, (n, v) => fetchManifest(n, v, registry));
803
+ if (peerMismatches.length) {
804
+ console.log(`\n ${yel(bold('⚠ Peer-dependency mismatches:'))}`);
805
+ for (const m of peerMismatches) {
806
+ console.log(` ${bold(m.peer)} ${dim('— required by')} ${m.causedBy}`);
807
+ console.log(` ${dim('your package.json:')} ${m.consumerSection ? `${m.consumerSection}.` : ''}${m.peer} = ${red(`"${m.consumerRange}"`)}`);
808
+ console.log(` ${dim('framework needs: ')} ${green(`"${m.requiredRange}"`)}`);
809
+ console.log(` ${dim('reason: ')} ${m.reason}`);
810
+ }
811
+ console.log(dim('\n Update these peer ranges in your package.json (then re-run upgrade).'));
572
812
  }
573
- console.log(dim('\n Update these peer ranges in your package.json (then re-run upgrade).'));
813
+ }
814
+ if (overrideRows.length > 0) {
815
+ console.log(`\n ${bold('Override pins to update:')}`);
816
+ console.log(dim(' These overrides are the effective installed versions — bumped to keep the pin honest.'));
817
+ renderOverridePlan(overrideRows);
574
818
  }
575
819
  if (opts.check) {
820
+ const total = rows.length + overrideRows.length;
576
821
  const peerSuffix = peerMismatches.length ? `, ${peerMismatches.length} peer mismatch(es)` : '';
577
- console.log(dim(`\n --check mode: ${rows.length} update(s) available${peerSuffix} (exit 1).`));
822
+ console.log(dim(`\n --check mode: ${total} update(s) available${peerSuffix} (exit 1).`));
578
823
  process.exit(1);
579
824
  }
580
825
  if (opts.dryRun) {
581
- console.log(dim('\n --dry-run: package.json not modified.'));
826
+ console.log(dim('\n --dry-run: no files modified.'));
582
827
  return;
583
828
  }
584
- applyUpdates(pkgPath, pkg, rows);
585
- console.log(dim('\n Updated package.json.'));
829
+ // ── Apply ──────────────────────────────────────────────
830
+ const rootIsCwd = rootPkgPath === pkgPath;
831
+ const yamlOverrideRows = overrideRows.filter(r => r.source === 'pnpm-workspace.yaml');
832
+ const jsonOverrideRows = overrideRows.filter(r => r.source !== 'pnpm-workspace.yaml');
833
+ // cwd package.json: dep bumps + (when the override root is this same file)
834
+ // the JSON override bumps, folded into a single write.
835
+ for (const row of rows)
836
+ pkg[row.section][row.name] = row.newRange;
837
+ if (rootIsCwd && jsonOverrideRows.length)
838
+ applyJsonOverrides(pkg, jsonOverrideRows);
839
+ if (rows.length || (rootIsCwd && jsonOverrideRows.length)) {
840
+ writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
841
+ console.log(dim('\n Updated package.json.'));
842
+ }
843
+ // Separate root package.json (member-package run): JSON override bumps.
844
+ if (!rootIsCwd && jsonOverrideRows.length) {
845
+ applyJsonOverrides(rootPkg, jsonOverrideRows);
846
+ writeFileSync(rootPkgPath, JSON.stringify(rootPkg, null, 2) + '\n');
847
+ }
848
+ // pnpm-workspace.yaml: surgical line rewrite (preserves comments/formatting).
849
+ const unmatchedPins = [];
850
+ if (yamlOverrideRows.length) {
851
+ const wsPath = path.join(overrideRoot, 'pnpm-workspace.yaml');
852
+ let text = readFileOrNull(wsPath);
853
+ if (text !== null) {
854
+ for (const r of yamlOverrideRows) {
855
+ const res = replaceYamlOverride(text, r.name, fmt(r.target));
856
+ if (res.replaced)
857
+ text = res.text;
858
+ else
859
+ unmatchedPins.push(`${r.name} (pnpm-workspace.yaml)`);
860
+ }
861
+ writeFileSync(wsPath, text);
862
+ }
863
+ }
864
+ if (overrideRows.length) {
865
+ const where = rootIsCwd ? '' : ` at ${path.relative(cwd, overrideRoot) || '.'}/`;
866
+ console.log(dim(` Updated ${overrideRows.length} override pin(s)${where}.`));
867
+ }
868
+ if (unmatchedPins.length) {
869
+ console.log(yel('\n ⚠ Could not locate these pins to rewrite — update them by hand:'));
870
+ for (const u of unmatchedPins)
871
+ console.log(` ${dim('•')} ${u}`);
872
+ }
586
873
  const pm = detectPackageManager(cwd);
587
874
  console.log(`\n Running ${cyan(pm + ' install')}...\n`);
588
875
  const ok = await runInstall(pm, cwd);
589
876
  if (!ok) {
590
- console.error(red('\n Install failed.') + dim(' package.json was updated; you may need to install manually or revert.'));
877
+ console.error(red('\n Install failed.') + dim(' files were updated; you may need to install manually or revert.'));
591
878
  process.exit(1);
592
879
  }
593
- console.log(green(`\n ✓ Upgraded ${rows.length} package(s).`));
880
+ const totalApplied = rows.length + overrideRows.length;
881
+ console.log(green(`\n ✓ Upgraded ${totalApplied} package(s)/pin(s).`));
594
882
  });
595
883
  }
596
884
  // ── Test surface ──────────────────────────────────────────────
@@ -606,5 +894,8 @@ export const _internal = {
606
894
  diffPeerRange,
607
895
  readConsumerPeers,
608
896
  extractHeadline,
897
+ findOverrideRoot,
898
+ rangePrefix,
899
+ applyJsonOverrides,
609
900
  };
610
901
  //# sourceMappingURL=upgrade.js.map
package/dist/commands/upgrade.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
package/dist/suggest.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../src/suggest.ts"],"names":[],"mappings":"AAGA,oFAAoF;AACpF,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,MAAM,EAAE,CAmBjH"}
1
+ {"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../src/suggest.ts"],"names":[],"mappings":"AAGA,oFAAoF;AACpF,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,MAAM,EAAE,CAqBjH"}
package/dist/suggest.js CHANGED
@@ -32,7 +32,9 @@ export function suggestCommands(input, candidates, opts = {}) {
32
32
  const limit = opts.limit ?? 3;
33
33
  // Allow more slack for longer inputs; a 2-char typo budget on short names.
34
34
  const maxDistance = Math.max(2, Math.floor(input.length / 3));
35
- const inputNs = input.includes(':') ? input.slice(0, input.indexOf(':')) : '';
35
+ const colonIndex = input.indexOf(':');
36
+ const inputNs = colonIndex >= 0 ? input.slice(0, colonIndex) : '';
37
+ const inputNsPrefix = inputNs ? `${inputNs}:` : '';
36
38
  const scored = candidates
37
39
  .map(name => ({ name, dist: levenshtein(input, name) }))
38
40
  .filter(c => c.dist <= maxDistance)
@@ -40,8 +42,8 @@ export function suggestCommands(input, candidates, opts = {}) {
40
42
  if (a.dist !== b.dist)
41
43
  return a.dist - b.dist;
42
44
  // Tie-break: same-namespace first, then alphabetical for stability.
43
- const aNs = inputNs && a.name.startsWith(`${inputNs}:`) ? 0 : 1;
44
- const bNs = inputNs && b.name.startsWith(`${inputNs}:`) ? 0 : 1;
45
+ const aNs = inputNsPrefix && a.name.startsWith(inputNsPrefix) ? 0 : 1;
46
+ const bNs = inputNsPrefix && b.name.startsWith(inputNsPrefix) ? 0 : 1;
45
47
  if (aNs !== bNs)
46
48
  return aNs - bNs;
47
49
  return a.name < b.name ? -1 : 1;
package/dist/suggest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"suggest.js","sourceRoot":"","sources":["../src/suggest.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,qEAAqE;AAErE,oFAAoF;AACpF,MAAM,UAAU,WAAW,CAAC,CAAS,EAAE,CAAS;IAC9C,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,MAAM,CAAA;IACnC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,MAAM,CAAA;IAEnC,oFAAoF;IACpF,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC1C,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAChB,IAAI,CAAC,CAAC,CAAE,GAAG,CAAC,EAAS,WAAW;YAChC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,CAAC,EAAK,YAAY;YACjC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,IAAI,CACpB,CAAA;QACH,CAAC;QACD,IAAI,GAAG,IAAI,CAAA;IACb,CAAC;IACD,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAE,CAAA;AACxB,CAAC;AAOD;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,UAA6B,EAAE,OAAuB,EAAE;IACrG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;IAC7B,2EAA2E;IAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAE7E,MAAM,MAAM,GAAG,UAAU;SACtB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACvD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,WAAW,CAAC;SAClC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;QAC7C,oEAAoE;QACpE,MAAM,GAAG,GAAG,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/D,IAAI,GAAG,KAAK,GAAG;YAAE,OAAO,GAAG,GAAG,GAAG,CAAA;QACjC,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IAEJ,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAChD,CAAC"}
1
+ {"version":3,"file":"suggest.js","sourceRoot":"","sources":["../src/suggest.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rudderjs/cli",
3
- "version": "4.16.0",
3
+ "version": "4.17.1",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -24,11 +24,11 @@
24
24
  "chalk": "^5.0.0",
25
25
  "dotenv": "^16.4.0",
26
26
  "@clack/prompts": "^1.0.0",
27
- "@rudderjs/core": "^1.12.3",
28
- "@rudderjs/console": "^1.4.0"
27
+ "@rudderjs/core": "^1.13.0",
28
+ "@rudderjs/console": "^1.4.1"
29
29
  },
30
30
  "peerDependencies": {
31
- "@rudderjs/router": "^1.9.0"
31
+ "@rudderjs/router": "^1.9.1"
32
32
  },
33
33
  "peerDependenciesMeta": {
34
34
  "@rudderjs/router": {
@@ -39,7 +39,7 @@
39
39
  "@types/node": "^20.0.0",
40
40
  "typescript": "^5.4.0",
41
41
  "tsx": "^4.0.0",
42
- "@rudderjs/router": "^1.9.0"
42
+ "@rudderjs/router": "^1.9.1"
43
43
  },
44
44
  "author": "Suleiman Shahbari",
45
45
  "scripts": {
@@ -47,7 +47,7 @@
47
47
  "dev": "tsc -p tsconfig.build.json --watch",
48
48
  "typecheck": "tsc --noEmit",
49
49
  "lint": "eslint src",
50
- "test": "tsc -p tsconfig.test.json && node --test dist-test/index.test.js dist-test/load-package-commands.test.js dist-test/native-driver-cache.test.js dist-test/commands/add.test.js dist-test/commands/upgrade.test.js dist-test/commands/key-generate.test.js dist-test/commands/about.test.js dist-test/commands/test.test.js dist-test/commands/make/test.test.js dist-test/commands/optimize-clear.test.js dist-test/commands/completion.test.js dist-test/suggest.test.js dist-test/commands/make/exception.test.js dist-test/commands/make/policy.test.js dist-test/commands/make/observer.test.js dist-test/commands/make/cast.test.js dist-test/commands/make/notification.test.js dist-test/commands/make/with-test.test.js dist-test/commands/remove.test.js dist-test/commands/tinker.test.js dist-test/commands/module/publish.test.js dist-test/doctor/load-package-checks.test.js dist-test/doctor/orchestrator.test.js dist-test/doctor/reporter.test.js dist-test/doctor/fixer.test.js dist-test/doctor/load-dotenv.test.js dist-test/doctor/built-in/built-in.test.js dist-test/doctor/built-in/production.test.js",
50
+ "test": "tsc -p tsconfig.test.json && node --test dist-test/index.test.js dist-test/load-package-commands.test.js dist-test/native-driver-cache.test.js dist-test/commands/add.test.js dist-test/commands/upgrade.test.js dist-test/commands/key-generate.test.js dist-test/commands/about.test.js dist-test/commands/test.test.js dist-test/commands/make/test.test.js dist-test/commands/optimize-clear.test.js dist-test/commands/completion.test.js dist-test/suggest.test.js dist-test/commands/make/exception.test.js dist-test/commands/make/policy.test.js dist-test/commands/make/observer.test.js dist-test/commands/make/cast.test.js dist-test/commands/make/notification.test.js dist-test/commands/make/with-test.test.js dist-test/commands/make/path-traversal.test.js dist-test/commands/remove.test.js dist-test/commands/tinker.test.js dist-test/commands/module/publish.test.js dist-test/doctor/load-package-checks.test.js dist-test/doctor/orchestrator.test.js dist-test/doctor/reporter.test.js dist-test/doctor/fixer.test.js dist-test/doctor/load-dotenv.test.js dist-test/doctor/built-in/built-in.test.js dist-test/doctor/built-in/production.test.js",
51
51
  "clean": "rm -rf dist"
52
52
  }
53
53
  }