monocrate 0.11.0 → 0.13.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.
Files changed (162) hide show
  1. package/README.md +171 -92
  2. package/dist/{collect-package-locations.d.ts → src/collect-package-locations.d.ts} +2 -0
  3. package/dist/src/collect-package-locations.d.ts.map +1 -0
  4. package/dist/{collect-package-locations.js → src/collect-package-locations.js} +4 -1
  5. package/dist/src/collect-package-locations.js.map +1 -0
  6. package/dist/src/compute-package-closure.d.ts.map +1 -0
  7. package/dist/{compute-package-closure.js → src/compute-package-closure.js} +3 -0
  8. package/dist/src/compute-package-closure.js.map +1 -0
  9. package/dist/src/file-copier.d.ts.map +1 -0
  10. package/dist/src/file-copier.js.map +1 -0
  11. package/dist/src/get-files-to-pack.d.ts.map +1 -0
  12. package/dist/src/get-files-to-pack.js.map +1 -0
  13. package/dist/src/import-rewriter.d.ts +16 -0
  14. package/dist/src/import-rewriter.d.ts.map +1 -0
  15. package/dist/{import-rewriter.js → src/import-rewriter.js} +15 -6
  16. package/dist/src/import-rewriter.js.map +1 -0
  17. package/dist/src/index.d.ts.map +1 -0
  18. package/dist/src/index.js.map +1 -0
  19. package/dist/src/main.d.ts.map +1 -0
  20. package/dist/src/main.js.map +1 -0
  21. package/dist/src/mirror-sources.d.ts.map +1 -0
  22. package/dist/src/mirror-sources.js.map +1 -0
  23. package/dist/src/monocrate-cli.d.ts.map +1 -0
  24. package/dist/{monocrate-cli.js → src/monocrate-cli.js} +19 -3
  25. package/dist/src/monocrate-cli.js.map +1 -0
  26. package/dist/{monocrate-options.d.ts → src/monocrate-options.d.ts} +11 -6
  27. package/dist/src/monocrate-options.d.ts.map +1 -0
  28. package/dist/src/monocrate-options.js.map +1 -0
  29. package/dist/{monocrate-result.d.ts → src/monocrate-result.d.ts} +5 -2
  30. package/dist/src/monocrate-result.d.ts.map +1 -0
  31. package/dist/{monocrate-result.js.map → src/monocrate-result.js.map} +1 -1
  32. package/dist/src/monocrate.d.ts.map +1 -0
  33. package/dist/{monocrate.js → src/monocrate.js} +19 -19
  34. package/dist/src/monocrate.js.map +1 -0
  35. package/dist/src/name-mangler.d.ts.map +1 -0
  36. package/dist/src/name-mangler.js.map +1 -0
  37. package/dist/src/npm-client.d.ts.map +1 -0
  38. package/dist/src/npm-client.js.map +1 -0
  39. package/dist/{package-assembler.d.ts → src/package-assembler.d.ts} +2 -1
  40. package/dist/src/package-assembler.d.ts.map +1 -0
  41. package/dist/{package-assembler.js → src/package-assembler.js} +21 -7
  42. package/dist/src/package-assembler.js.map +1 -0
  43. package/dist/src/package-closure.d.ts.map +1 -0
  44. package/dist/{package-closure.js.map → src/package-closure.js.map} +1 -1
  45. package/dist/{package-json.d.ts → src/package-json.d.ts} +1 -0
  46. package/dist/src/package-json.d.ts.map +1 -0
  47. package/dist/{package-json.js → src/package-json.js} +1 -0
  48. package/dist/src/package-json.js.map +1 -0
  49. package/dist/{package-location.d.ts → src/package-location.d.ts} +1 -1
  50. package/dist/src/package-location.d.ts.map +1 -0
  51. package/dist/{package-location.js.map → src/package-location.js.map} +1 -1
  52. package/dist/src/paths.d.ts.map +1 -0
  53. package/dist/src/paths.js.map +1 -0
  54. package/dist/src/publish.d.ts.map +1 -0
  55. package/dist/src/publish.js.map +1 -0
  56. package/dist/{repo-explorer.d.ts → src/repo-explorer.d.ts} +1 -1
  57. package/dist/src/repo-explorer.d.ts.map +1 -0
  58. package/dist/{repo-explorer.js → src/repo-explorer.js} +33 -30
  59. package/dist/src/repo-explorer.js.map +1 -0
  60. package/dist/{resolve-version.d.ts → src/resolve-version.d.ts} +2 -1
  61. package/dist/src/resolve-version.d.ts.map +1 -0
  62. package/dist/{resolve-version.js → src/resolve-version.js} +18 -1
  63. package/dist/src/resolve-version.js.map +1 -0
  64. package/dist/src/rewrite-package-json.d.ts.map +1 -0
  65. package/dist/{rewrite-package-json.js → src/rewrite-package-json.js} +7 -0
  66. package/dist/src/rewrite-package-json.js.map +1 -0
  67. package/dist/src/run-npm.d.ts.map +1 -0
  68. package/dist/src/run-npm.js.map +1 -0
  69. package/dist/src/validate-esm.d.ts +10 -0
  70. package/dist/src/validate-esm.d.ts.map +1 -0
  71. package/dist/src/validate-esm.js +30 -0
  72. package/dist/src/validate-esm.js.map +1 -0
  73. package/dist/src/validate-publish-names.d.ts.map +1 -0
  74. package/dist/src/validate-publish-names.js +12 -0
  75. package/dist/src/validate-publish-names.js.map +1 -0
  76. package/dist/src/version-specifier.d.ts +10 -0
  77. package/dist/src/version-specifier.d.ts.map +1 -0
  78. package/dist/{version-specifier.js → src/version-specifier.js} +2 -5
  79. package/dist/src/version-specifier.js.map +1 -0
  80. package/package.json +18 -16
  81. package/dist/collect-package-locations.d.ts.map +0 -1
  82. package/dist/collect-package-locations.js.map +0 -1
  83. package/dist/compute-package-closure.d.ts.map +0 -1
  84. package/dist/compute-package-closure.js.map +0 -1
  85. package/dist/file-copier.d.ts.map +0 -1
  86. package/dist/file-copier.js.map +0 -1
  87. package/dist/get-files-to-pack.d.ts.map +0 -1
  88. package/dist/get-files-to-pack.js.map +0 -1
  89. package/dist/import-rewriter.d.ts +0 -12
  90. package/dist/import-rewriter.d.ts.map +0 -1
  91. package/dist/import-rewriter.js.map +0 -1
  92. package/dist/index.d.ts.map +0 -1
  93. package/dist/index.js.map +0 -1
  94. package/dist/main.d.ts.map +0 -1
  95. package/dist/main.js.map +0 -1
  96. package/dist/mirror-sources.d.ts.map +0 -1
  97. package/dist/mirror-sources.js.map +0 -1
  98. package/dist/monocrate-cli.d.ts.map +0 -1
  99. package/dist/monocrate-cli.js.map +0 -1
  100. package/dist/monocrate-options.d.ts.map +0 -1
  101. package/dist/monocrate-options.js.map +0 -1
  102. package/dist/monocrate-result.d.ts.map +0 -1
  103. package/dist/monocrate.d.ts.map +0 -1
  104. package/dist/monocrate.js.map +0 -1
  105. package/dist/name-mangler.d.ts.map +0 -1
  106. package/dist/name-mangler.js.map +0 -1
  107. package/dist/npm-client.d.ts.map +0 -1
  108. package/dist/npm-client.js.map +0 -1
  109. package/dist/package-assembler.d.ts.map +0 -1
  110. package/dist/package-assembler.js.map +0 -1
  111. package/dist/package-closure.d.ts.map +0 -1
  112. package/dist/package-json.d.ts.map +0 -1
  113. package/dist/package-json.js.map +0 -1
  114. package/dist/package-location.d.ts.map +0 -1
  115. package/dist/paths.d.ts.map +0 -1
  116. package/dist/paths.js.map +0 -1
  117. package/dist/publish.d.ts.map +0 -1
  118. package/dist/publish.js.map +0 -1
  119. package/dist/repo-explorer.d.ts.map +0 -1
  120. package/dist/repo-explorer.js.map +0 -1
  121. package/dist/resolve-version.d.ts.map +0 -1
  122. package/dist/resolve-version.js.map +0 -1
  123. package/dist/rewrite-package-json.d.ts.map +0 -1
  124. package/dist/rewrite-package-json.js.map +0 -1
  125. package/dist/run-npm.d.ts.map +0 -1
  126. package/dist/run-npm.js.map +0 -1
  127. package/dist/validate-publish-names.d.ts.map +0 -1
  128. package/dist/validate-publish-names.js +0 -11
  129. package/dist/validate-publish-names.js.map +0 -1
  130. package/dist/version-specifier.d.ts +0 -8
  131. package/dist/version-specifier.d.ts.map +0 -1
  132. package/dist/version-specifier.js.map +0 -1
  133. /package/dist/{compute-package-closure.d.ts → src/compute-package-closure.d.ts} +0 -0
  134. /package/dist/{file-copier.d.ts → src/file-copier.d.ts} +0 -0
  135. /package/dist/{file-copier.js → src/file-copier.js} +0 -0
  136. /package/dist/{get-files-to-pack.d.ts → src/get-files-to-pack.d.ts} +0 -0
  137. /package/dist/{get-files-to-pack.js → src/get-files-to-pack.js} +0 -0
  138. /package/dist/{index.d.ts → src/index.d.ts} +0 -0
  139. /package/dist/{index.js → src/index.js} +0 -0
  140. /package/dist/{main.d.ts → src/main.d.ts} +0 -0
  141. /package/dist/{main.js → src/main.js} +0 -0
  142. /package/dist/{mirror-sources.d.ts → src/mirror-sources.d.ts} +0 -0
  143. /package/dist/{mirror-sources.js → src/mirror-sources.js} +0 -0
  144. /package/dist/{monocrate-cli.d.ts → src/monocrate-cli.d.ts} +0 -0
  145. /package/dist/{monocrate-options.js → src/monocrate-options.js} +0 -0
  146. /package/dist/{monocrate-result.js → src/monocrate-result.js} +0 -0
  147. /package/dist/{monocrate.d.ts → src/monocrate.d.ts} +0 -0
  148. /package/dist/{name-mangler.d.ts → src/name-mangler.d.ts} +0 -0
  149. /package/dist/{name-mangler.js → src/name-mangler.js} +0 -0
  150. /package/dist/{npm-client.d.ts → src/npm-client.d.ts} +0 -0
  151. /package/dist/{npm-client.js → src/npm-client.js} +0 -0
  152. /package/dist/{package-closure.d.ts → src/package-closure.d.ts} +0 -0
  153. /package/dist/{package-closure.js → src/package-closure.js} +0 -0
  154. /package/dist/{package-location.js → src/package-location.js} +0 -0
  155. /package/dist/{paths.d.ts → src/paths.d.ts} +0 -0
  156. /package/dist/{paths.js → src/paths.js} +0 -0
  157. /package/dist/{publish.d.ts → src/publish.d.ts} +0 -0
  158. /package/dist/{publish.js → src/publish.js} +0 -0
  159. /package/dist/{rewrite-package-json.d.ts → src/rewrite-package-json.d.ts} +0 -0
  160. /package/dist/{run-npm.d.ts → src/run-npm.d.ts} +0 -0
  161. /package/dist/{run-npm.js → src/run-npm.js} +0 -0
  162. /package/dist/{validate-publish-names.d.ts → src/validate-publish-names.d.ts} +0 -0
@@ -1,3 +1,5 @@
1
+ import * as fs from 'node:fs';
2
+ import * as path from 'node:path';
1
3
  import { createRequire } from 'node:module';
2
4
  import yargs from 'yargs';
3
5
  import { hideBin } from 'yargs/helpers';
@@ -16,6 +18,7 @@ Usage: $0 <packages...> [options]`)
16
18
  .example('$0 pkg/foo --bump patch', 'Bump to next patch and publish')
17
19
  .example('$0 libs/a libs/b', 'Multi-package (defaults to minor bump)')
18
20
  .example('$0 pkg/foo --dry-run', 'Prepare without publishing')
21
+ .example('$0 pkg/foo --bump package', 'Use version from package.json')
19
22
  .positional('packages', {
20
23
  describe: 'Package directories to publish',
21
24
  type: 'string',
@@ -25,7 +28,7 @@ Usage: $0 <packages...> [options]`)
25
28
  bump: {
26
29
  alias: 'b',
27
30
  type: 'string',
28
- description: 'Version or increment (patch/minor/major)',
31
+ description: 'Version, increment (patch/minor/major), or "package" to use package.json version',
29
32
  },
30
33
  'output-dir': {
31
34
  alias: 'o',
@@ -52,6 +55,11 @@ Usage: $0 <packages...> [options]`)
52
55
  description: 'Prepare without publishing',
53
56
  default: false,
54
57
  },
58
+ max: {
59
+ type: 'boolean',
60
+ description: 'Use max version across all packages (default: false)',
61
+ default: false,
62
+ },
55
63
  })
56
64
  .strict()
57
65
  .help()
@@ -70,11 +78,19 @@ Usage: $0 <packages...> [options]`)
70
78
  monorepoRoot: args.root,
71
79
  bump: args.bump,
72
80
  publish: !args['dry-run'],
73
- report: args.report,
74
81
  cwd: process.cwd(),
75
82
  mirrorTo: args['mirror-to'],
83
+ max: args.max,
76
84
  };
77
- await monocrate(options);
85
+ const result = await monocrate(options);
86
+ const output = result.resolvedVersion ?? result.summaries.map((s) => `${s.packageName}@${s.version}`).join('\n');
87
+ if (args.report) {
88
+ const outputFilePath = path.resolve(process.cwd(), args.report);
89
+ fs.writeFileSync(outputFilePath, output);
90
+ }
91
+ else {
92
+ console.log(output);
93
+ }
78
94
  })
79
95
  .catch((error) => {
80
96
  console.error('Fatal error:', error instanceof Error ? error.stack : error);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate-cli.js","sourceRoot":"","sources":["../../src/monocrate-cli.ts"],"names":[],"mappings":"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"}
@@ -33,12 +33,6 @@ export interface MonocrateOptions {
33
33
  * (useful for inspection or manual publishing).
34
34
  */
35
35
  publish: boolean;
36
- /**
37
- * Path to write the report (resolved version) to a file instead of stdout.
38
- * Can be absolute or relative. Relative paths are resolved from the cwd option.
39
- * If not specified, output is written to stdout.
40
- */
41
- report?: string;
42
36
  /**
43
37
  * Base directory for resolving relative paths. Must be a valid, existing directory.
44
38
  */
@@ -63,5 +57,16 @@ export interface MonocrateOptions {
63
57
  * Can be absolute or relative. Relative paths are resolved from the cwd option.
64
58
  */
65
59
  mirrorTo?: string;
60
+ /**
61
+ * Whether to use the maximum version across all packages.
62
+ *
63
+ * When true: All packages are published at the same version, computed as the
64
+ * maximum of all individual resolved versions.
65
+ *
66
+ * When false (default): Each package is published at its own individually resolved version based
67
+ * on its current published version. Useful when packages have divergent version histories
68
+ * and you want to preserve meaningful versioning per package.
69
+ */
70
+ max?: boolean;
66
71
  }
67
72
  //# sourceMappingURL=monocrate-options.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate-options.d.ts","sourceRoot":"","sources":["../../src/monocrate-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,qBAAqB,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IACxC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;;;;;;;OASG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;CACd"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate-options.js","sourceRoot":"","sources":["../../src/monocrate-options.ts"],"names":[],"mappings":""}
@@ -4,15 +4,18 @@ export interface MonocrateResult {
4
4
  */
5
5
  outputDir: string;
6
6
  /**
7
- * The new version (AKA: 'resolved version') for the package (or packages).
7
+ * The unified version for all packages. Only set when using unified versioning (--max).
8
+ * When using individual versioning (the default), this is undefined and each package's version
9
+ * can be found in its respective summary entry.
8
10
  */
9
- resolvedVersion: string;
11
+ resolvedVersion?: string;
10
12
  /**
11
13
  * Details about each individual package that was assembled/published.
12
14
  */
13
15
  summaries: {
14
16
  packageName: string;
15
17
  outputDir: string;
18
+ version: string;
16
19
  }[];
17
20
  }
18
21
  //# sourceMappingURL=monocrate-result.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate-result.d.ts","sourceRoot":"","sources":["../../src/monocrate-result.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,SAAS,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CACzE"}
@@ -1 +1 @@
1
- {"version":3,"file":"monocrate-result.js","sourceRoot":"","sources":["../src/monocrate-result.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"monocrate-result.js","sourceRoot":"","sources":["../../src/monocrate-result.ts"],"names":[],"mappings":""}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate.d.ts","sourceRoot":"","sources":["../../src/monocrate.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAiGnF"}
@@ -1,5 +1,4 @@
1
1
  import * as fs from 'node:fs/promises';
2
- import * as fsSync from 'node:fs';
3
2
  import * as os from 'node:os';
4
3
  import * as path from 'node:path';
5
4
  import { RepoExplorer } from './repo-explorer.js';
@@ -17,6 +16,8 @@ import { mirrorSources } from './mirror-sources.js';
17
16
  * @throws Error if assembly or publishing fails
18
17
  */
19
18
  export async function monocrate(options) {
19
+ // Determine whether to use unified max version or individual versions per package
20
+ const useMax = options.max ?? false;
20
21
  // Resolve and validate cwd first, then use it to resolve all other paths
21
22
  const cwd = AbsolutePath(path.resolve(options.cwd));
22
23
  const cwdExists = await fs
@@ -51,17 +52,19 @@ export async function monocrate(options) {
51
52
  if (!a0) {
52
53
  throw new Error(`Incosistency - could not find an assembler for the first package`);
53
54
  }
54
- // versionSpecifier is always defined (defaults to 'minor'), so computeNewVersion always returns a string
55
- const versions = (await Promise.all(assemblers.map((a) => a.computeNewVersion(versionSpecifier)))).flatMap((v) => v ? [v] : []);
56
- const v = versions.at(0);
57
- if (!v) {
55
+ const pairs = await Promise.all(assemblers.map(async (a) => ({ assembler: a, version: await a.computeNewVersion(versionSpecifier) })));
56
+ let max = pairs.at(0)?.version;
57
+ if (!max) {
58
58
  throw new Error('Inconsistency - no versions computed');
59
59
  }
60
- const resolvedVersion = versions.reduce((soFar, curr) => maxVersion(soFar, curr), v);
60
+ for (const at of pairs) {
61
+ max = maxVersion(max, at.version);
62
+ }
63
+ const resolvedPairs = pairs.map((at) => ({ ...at, version: useMax ? max : at.version }));
61
64
  const allPackagesForMirror = new Map();
62
65
  // Phase 1: Assemble all packages and publish with --tag pending
63
- for (const assembler of assemblers) {
64
- const { compiletimeMembers } = await assembler.assemble(resolvedVersion);
66
+ for (const { assembler, version } of resolvedPairs) {
67
+ const { compiletimeMembers } = await assembler.assemble(version);
65
68
  for (const pkg of compiletimeMembers) {
66
69
  allPackagesForMirror.set(pkg.name, pkg);
67
70
  }
@@ -71,8 +74,8 @@ export async function monocrate(options) {
71
74
  }
72
75
  // Phase 2: Move 'latest' tag to all published packages (only if all publishes succeeded)
73
76
  if (options.publish) {
74
- for (const assembler of assemblers) {
75
- await npmClient.distTagAdd(`${assembler.publishAs}@${resolvedVersion}`, 'latest', assembler.getOutputDir());
77
+ for (const { assembler, version } of resolvedPairs) {
78
+ await npmClient.distTagAdd(`${assembler.publishAs}@${version}`, 'latest', assembler.getOutputDir());
76
79
  }
77
80
  }
78
81
  // Mirror source files if mirrorTo is specified
@@ -80,17 +83,14 @@ export async function monocrate(options) {
80
83
  const mirrorDir = AbsolutePath(path.resolve(cwd, options.mirrorTo));
81
84
  await mirrorSources([...allPackagesForMirror.values()], mirrorDir);
82
85
  }
83
- if (options.report) {
84
- const outputFilePath = path.resolve(cwd, options.report);
85
- fsSync.writeFileSync(outputFilePath, resolvedVersion);
86
- }
87
- else {
88
- console.log(resolvedVersion);
89
- }
90
86
  return {
91
87
  outputDir: a0.getOutputDir(),
92
- resolvedVersion,
93
- summaries: assemblers.map((at) => ({ outputDir: at.getOutputDir(), packageName: at.pkgName })),
88
+ resolvedVersion: useMax ? max : undefined,
89
+ summaries: resolvedPairs.map(({ assembler, version }) => ({
90
+ outputDir: assembler.getOutputDir(),
91
+ packageName: assembler.pkgName,
92
+ version,
93
+ })),
94
94
  };
95
95
  }
96
96
  //# sourceMappingURL=monocrate.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"monocrate.js","sourceRoot":"","sources":["../../src/monocrate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"name-mangler.d.ts","sourceRoot":"","sources":["../../src/name-mangler.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"name-mangler.js","sourceRoot":"","sources":["../../src/name-mangler.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AACpC,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"npm-client.d.ts","sourceRoot":"","sources":["../../src/npm-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAC,MAAM,cAAc,CAAC;AAWlD,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAX,UAAU,CAAC,EAAE,cAAc,YAAA;IAExD;;;;;OAKG;IACG,MAAM,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAiB1C,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvD,UAAU,CAAC,oBAAoB,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F;;;;OAIG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA4BhF,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;CA2C7D"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"npm-client.js","sourceRoot":"","sources":["../../src/npm-client.ts"],"names":[],"mappings":"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"}
@@ -9,9 +9,10 @@ export declare class PackageAssembler {
9
9
  private readonly outputRoot;
10
10
  readonly pkgName: string;
11
11
  readonly publishAs: string;
12
+ private readonly pathInRepo;
12
13
  constructor(npmClient: NpmClient, explorer: RepoExplorer, fromDir: AbsolutePath, outputRoot: AbsolutePath);
13
14
  getOutputDir(): AbsolutePath;
14
- computeNewVersion(versionSpecifier: VersionSpecifier | undefined): Promise<string | undefined>;
15
+ computeNewVersion(versionSpecifier: VersionSpecifier): Promise<string>;
15
16
  assemble(newVersion: string | undefined): Promise<{
16
17
  compiletimeMembers: MonorepoPackage[];
17
18
  }>;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-assembler.d.ts","sourceRoot":"","sources":["../../src/package-assembler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAGhD,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAP7B,QAAQ,CAAC,OAAO,SAAA;IAChB,QAAQ,CAAC,SAAS,SAAA;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAA;gBAER,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,YAAY;IAW3C,YAAY;IAIN,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB;IAKpD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAAE,kBAAkB,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;CAiCnG"}
@@ -1,12 +1,13 @@
1
1
  import * as fsPromises from 'node:fs/promises';
2
+ import * as path from 'node:path';
2
3
  import { collectPackageLocations } from './collect-package-locations.js';
3
4
  import { FileCopier } from './file-copier.js';
4
5
  import { ImportRewriter } from './import-rewriter.js';
5
6
  import { resolveVersion } from './resolve-version.js';
6
7
  import { rewritePackageJson } from './rewrite-package-json.js';
7
- import { AbsolutePath, RelativePath } from './paths.js';
8
+ import { AbsolutePath } from './paths.js';
8
9
  import { computePackageClosure } from './compute-package-closure.js';
9
- import { manglePackageName } from './name-mangler.js';
10
+ import { validateEsmOnly } from './validate-esm.js';
10
11
  export class PackageAssembler {
11
12
  npmClient;
12
13
  explorer;
@@ -14,6 +15,7 @@ export class PackageAssembler {
14
15
  outputRoot;
15
16
  pkgName;
16
17
  publishAs;
18
+ pathInRepo;
17
19
  constructor(npmClient, explorer, fromDir, outputRoot) {
18
20
  this.npmClient = npmClient;
19
21
  this.explorer = explorer;
@@ -25,19 +27,20 @@ export class PackageAssembler {
25
27
  }
26
28
  this.pkgName = found.name;
27
29
  this.publishAs = found.publishAs;
30
+ this.pathInRepo = found.pathInRepo;
28
31
  }
29
32
  getOutputDir() {
30
- return AbsolutePath.join(this.outputRoot, RelativePath(manglePackageName(this.pkgName)));
33
+ return AbsolutePath.join(this.outputRoot, this.pathInRepo);
31
34
  }
32
35
  async computeNewVersion(versionSpecifier) {
33
- return versionSpecifier
34
- ? await resolveVersion(this.npmClient, this.fromDir, this.pkgName, versionSpecifier)
35
- : Promise.resolve(undefined);
36
+ const packageJsonVersion = this.explorer.getPackage(this.pkgName).packageJson.version;
37
+ return await resolveVersion(this.npmClient, this.fromDir, this.pkgName, versionSpecifier, packageJsonVersion);
36
38
  }
37
39
  async assemble(newVersion) {
38
40
  const closure = computePackageClosure(this.pkgName, this.explorer);
39
41
  const outputDir = this.getOutputDir();
40
42
  const locations = await collectPackageLocations(this.npmClient, closure, outputDir);
43
+ validateEsmOnly(locations, this.explorer.repoRootDir);
41
44
  const packageMap = new Map(locations.map((at) => [at.name, at]));
42
45
  const subject = packageMap.get(closure.subjectPackageName);
43
46
  if (!subject) {
@@ -45,7 +48,18 @@ export class PackageAssembler {
45
48
  }
46
49
  await fsPromises.mkdir(outputDir, { recursive: true });
47
50
  const copiedFiles = await new FileCopier(packageMap).copy();
48
- await new ImportRewriter(packageMap).rewriteAll(copiedFiles);
51
+ const isInRepoPackage = (pkgName) => this.explorer.lookupPackage(pkgName) !== undefined;
52
+ const toRepoPath = (outputPath) => {
53
+ for (const loc of packageMap.values()) {
54
+ if (outputPath.startsWith(loc.toDir)) {
55
+ const relativePath = outputPath.slice(loc.toDir.length);
56
+ const pkg = this.explorer.getPackage(loc.name);
57
+ return path.join(pkg.pathInRepo, relativePath);
58
+ }
59
+ }
60
+ throw new Error(`Could not map output path to repo path: ${outputPath}`);
61
+ };
62
+ await new ImportRewriter(packageMap, isInRepoPackage, toRepoPath).rewriteAll(copiedFiles);
49
63
  // This must happen after file copying completes (otherwise the rewritten package.json could be overwritten)
50
64
  rewritePackageJson(closure, newVersion, outputDir);
51
65
  return { compiletimeMembers: closure.compiletimeMembers };
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-assembler.js","sourceRoot":"","sources":["../../src/package-assembler.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-closure.d.ts","sourceRoot":"","sources":["../../src/package-closure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,mEAAmE;IACnE,kBAAkB,EAAE,MAAM,CAAA;IAC1B,0FAA0F;IAC1F,cAAc,EAAE,eAAe,EAAE,CAAA;IACjC,mIAAmI;IACnI,kBAAkB,EAAE,eAAe,EAAE,CAAA;IACrC,wEAAwE;IACxE,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CACnD"}
@@ -1 +1 @@
1
- {"version":3,"file":"package-closure.js","sourceRoot":"","sources":["../src/package-closure.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"package-closure.js","sourceRoot":"","sources":["../../src/package-closure.ts"],"names":[],"mappings":""}
@@ -11,6 +11,7 @@ export declare const PackageJson: z.ZodObject<{
11
11
  dependencies: z.ZodOptional<z.ZodRecord<z.ZodString & z.core.$partial, z.ZodString>>;
12
12
  devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString & z.core.$partial, z.ZodString>>;
13
13
  peerDependencies: z.ZodOptional<z.ZodRecord<z.ZodString & z.core.$partial, z.ZodString>>;
14
+ optionalDependencies: z.ZodOptional<z.ZodRecord<z.ZodString & z.core.$partial, z.ZodString>>;
14
15
  description: z.ZodOptional<z.ZodString>;
15
16
  keywords: z.ZodOptional<z.ZodArray<z.ZodString>>;
16
17
  author: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../src/package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,eAAe;;kBAIf,CAAA;AAEb,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAyBd,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAA"}
@@ -14,6 +14,7 @@ export const PackageJson = z
14
14
  dependencies: z.partialRecord(z.string(), z.string()).optional(),
15
15
  devDependencies: z.partialRecord(z.string(), z.string()).optional(),
16
16
  peerDependencies: z.partialRecord(z.string(), z.string()).optional(),
17
+ optionalDependencies: z.partialRecord(z.string(), z.string()).optional(),
17
18
  description: z.string().optional(),
18
19
  keywords: z.array(z.string()).optional(),
19
20
  author: z.union([z.string(), z.object({ name: z.string(), email: z.string().optional() })]).optional(),
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../src/package-json.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,7 @@ export interface PackageLocation {
13
13
  fromDir: AbsolutePath;
14
14
  /**
15
15
  * Absolute path to the the package's output directory
16
- * @example "/tmp/monocrate-ab00003/deps/packages/my-package" (in-repo dependency)
16
+ * @example "/tmp/monocrate-ab00003/deps/__myorg__my-package" (in-repo dependency)
17
17
  */
18
18
  toDir: AbsolutePath;
19
19
  /**
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-location.d.ts","sourceRoot":"","sources":["../../src/package-location.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,OAAO,EAAE,YAAY,CAAA;IAErB;;;OAGG;IACH,KAAK,EAAE,YAAY,CAAA;IAEnB;;;;OAIG;IACH,WAAW,EAAE,MAAM,EAAE,CAAA;IAErB;;OAEG;IACH,WAAW,EAAE,WAAW,CAAA;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"package-location.js","sourceRoot":"","sources":["../src/package-location.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"package-location.js","sourceRoot":"","sources":["../../src/package-location.ts"],"names":[],"mappings":""}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/paths.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAA;AAExE;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAMpD;AAGD,yBAAiB,YAAY,CAAC;IAC5B,SAAgB,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAE1F;IAED,SAAgB,OAAO,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAErD;IAED;;OAEG;IACH,SAAgB,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAG3E;CACF;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAA;AAExE;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAMpD;AAGD,yBAAiB,YAAY,CAAC;IAC5B,SAAgB,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAOzE;IAED,SAAgB,OAAO,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAErD;CACF"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAQ5B;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC;IACD,OAAO,UAA0B,CAAA;AACnC,CAAC;AAED,2DAA2D;AAC3D,WAAiB,YAAY;IAC3B,SAAgB,IAAI,CAAC,IAAkB,EAAE,CAAe,EAAE,GAAG,KAAe;QAC1E,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACtE,CAAC;IAFe,iBAAI,OAEnB,CAAA;IAED,SAAgB,OAAO,CAAC,CAAe;QACrC,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;IAFe,oBAAO,UAEtB,CAAA;IAED;;OAEG;IACH,SAAgB,QAAQ,CAAC,MAAoB,EAAE,KAAmB;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACjE,CAAC;IAHe,qBAAQ,WAGvB,CAAA;AACH,CAAC,EAhBgB,YAAY,KAAZ,YAAY,QAgB5B;AAQD;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACpC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC;IACD,OAAO,UAA0B,CAAA;AACnC,CAAC;AAED,2DAA2D;AAC3D,WAAiB,YAAY;IAC3B,SAAgB,IAAI,CAAC,IAAkB,EAAE,GAAG,KAAe;QACzD,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,kBAAkB,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;QACD,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAA;IAChD,CAAC;IAPe,iBAAI,OAOnB,CAAA;IAED,SAAgB,OAAO,CAAC,CAAe;QACrC,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;IAFe,oBAAO,UAEtB,CAAA;AACH,CAAC,EAbgB,YAAY,KAAZ,YAAY,QAa5B"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/publish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEhD,wBAAsB,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,iBAEvF"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/publish.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,SAAoB,EAAE,SAAuB,EAAE,GAAW;IACtF,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;AACzC,CAAC"}
@@ -19,6 +19,6 @@ export declare class RepoExplorer {
19
19
  static findMonorepoRoot(startDir: AbsolutePath): AbsolutePath;
20
20
  private static readPackageJson;
21
21
  private static parseWorkspacePatterns;
22
- static discover(monorepoRoot: AbsolutePath): Promise<Map<string, MonorepoPackage>>;
22
+ private static discover;
23
23
  }
24
24
  //# sourceMappingURL=repo-explorer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repo-explorer.d.ts","sourceRoot":"","sources":["../../src/repo-explorer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGvD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,YAAY,CAAA;IACxB,WAAW,EAAE,WAAW,CAAA;CACzB;AAED,qBAAa,YAAY;IAErB,QAAQ,CAAC,WAAW,EAAE,YAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBADX,WAAW,EAAE,YAAY,EACjB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;WAKvC,MAAM,CAAC,YAAY,EAAE,YAAY;IAkB9C,SAAS;IAGT,YAAY;IAIZ,UAAU,CAAC,OAAO,EAAE,MAAM;IAQ1B,aAAa,CAAC,OAAO,EAAE,MAAM;IAI7B,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY;IAuB7D,OAAO,CAAC,MAAM,CAAC,eAAe;IAa9B,OAAO,CAAC,MAAM,CAAC,sBAAsB;mBAkChB,QAAQ;CA2B9B"}
@@ -1,6 +1,8 @@
1
1
  import * as fs from 'node:fs';
2
2
  import * as path from 'node:path';
3
- import { glob } from 'glob';
3
+ import { glob } from 'tinyglobby';
4
+ import yaml from 'yaml';
5
+ import { z } from 'zod';
4
6
  import { PackageJson } from './package-json.js';
5
7
  import { AbsolutePath, RelativePath } from './paths.js';
6
8
  import { validatePublishNames } from './validate-publish-names.js';
@@ -74,48 +76,49 @@ export class RepoExplorer {
74
76
  static parseWorkspacePatterns(monorepoRoot) {
75
77
  const packageJsonPath = path.join(monorepoRoot, 'package.json');
76
78
  if (fs.existsSync(packageJsonPath)) {
77
- const parsed = PackageJson.safeParse(JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8')));
78
- if (parsed.success) {
79
+ const WorkspacesConfig = z.object({
80
+ workspaces: z.union([z.array(z.string()), z.object({ packages: z.array(z.string()) })]).optional(),
81
+ });
82
+ const parsed = WorkspacesConfig.safeParse(JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8')));
83
+ if (!parsed.success) {
84
+ throw new Error(`Invalid workspaces field in package.json: expected an array of strings (e.g., ["packages/*"]) or an object with a "packages" array (e.g., { packages: ["packages/*"] })`);
85
+ }
86
+ if (parsed.data.workspaces) {
79
87
  const workspaces = parsed.data.workspaces;
80
- if (Array.isArray(workspaces)) {
81
- return workspaces;
82
- }
83
- if (workspaces && typeof workspaces === 'object' && 'packages' in workspaces) {
84
- return workspaces.packages;
85
- }
88
+ return Array.isArray(workspaces) ? workspaces : workspaces.packages;
86
89
  }
87
90
  }
88
91
  const pnpmWorkspacePath = path.join(monorepoRoot, 'pnpm-workspace.yaml');
89
92
  if (fs.existsSync(pnpmWorkspacePath)) {
90
93
  const content = fs.readFileSync(pnpmWorkspacePath, 'utf-8');
91
- const match = /packages:\s*\n((?:\s+-\s+.+\n?)+)/m.exec(content);
92
- if (match?.[1]) {
93
- return match[1]
94
- .split('\n')
95
- .map((line) => line.replace(/^\s*-\s*['"]?|['"]?\s*$/g, ''))
96
- .filter(Boolean);
94
+ const PnpmWorkspace = z.object({ packages: z.array(z.string()) });
95
+ const parsed = PnpmWorkspace.safeParse(yaml.parse(content));
96
+ if (!parsed.success) {
97
+ throw new Error(`Invalid pnpm-workspace.yaml: expected a "packages" field with an array of strings (e.g., packages: ["packages/*"])`);
97
98
  }
99
+ return parsed.data.packages;
98
100
  }
99
101
  return ['packages/*'];
100
102
  }
101
103
  static async discover(monorepoRoot) {
102
104
  const patterns = this.parseWorkspacePatterns(monorepoRoot);
105
+ const globPatterns = patterns.map((p) => path.join(p, 'package.json'));
106
+ const matches = await glob(globPatterns, {
107
+ cwd: monorepoRoot,
108
+ ignore: ['**/node_modules/**'],
109
+ });
103
110
  const packages = new Map();
104
- for (const pattern of patterns) {
105
- const fullPattern = path.join(monorepoRoot, pattern, 'package.json');
106
- const matches = await glob(fullPattern, { ignore: '**/node_modules/**' });
107
- for (const match of matches) {
108
- const packageDir = AbsolutePath(path.dirname(match));
109
- const packageJson = this.readPackageJson(packageDir);
110
- if (packageJson.name) {
111
- packages.set(packageJson.name, {
112
- name: packageJson.name,
113
- publishAs: packageJson.monocrate?.publishName ?? packageJson.name,
114
- fromDir: packageDir,
115
- pathInRepo: RelativePath(path.relative(monorepoRoot, packageDir)),
116
- packageJson,
117
- });
118
- }
111
+ for (const match of matches) {
112
+ const packageDir = AbsolutePath(path.join(monorepoRoot, path.dirname(match)));
113
+ const packageJson = this.readPackageJson(packageDir);
114
+ if (packageJson.name) {
115
+ packages.set(packageJson.name, {
116
+ name: packageJson.name,
117
+ publishAs: packageJson.monocrate?.publishName ?? packageJson.name,
118
+ fromDir: packageDir,
119
+ pathInRepo: RelativePath(path.dirname(match)),
120
+ packageJson,
121
+ });
119
122
  }
120
123
  }
121
124
  return packages;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repo-explorer.js","sourceRoot":"","sources":["../../src/repo-explorer.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { AbsolutePath } from './paths.js';
2
2
  import type { VersionSpecifier } from './version-specifier.js';
3
3
  import type { NpmClient } from './npm-client.js';
4
- export declare function resolveVersion(npmClient: NpmClient, dir: AbsolutePath, packageName: string, versionSpecifier: VersionSpecifier): Promise<string>;
4
+ export declare function resolveVersionFromPackageJson(packageName: string, packageJsonVersion: string | undefined): string;
5
+ export declare function resolveVersion(npmClient: NpmClient, dir: AbsolutePath, packageName: string, versionSpecifier: VersionSpecifier, packageJsonVersion?: string): Promise<string>;
5
6
  export declare function maxVersion(va: string, vb: string): string;
6
7
  //# sourceMappingURL=resolve-version.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-version.d.ts","sourceRoot":"","sources":["../../src/resolve-version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAUhD,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAoBjH;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,CAAC,EAAE,MAAM,mBAc5B;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAiBhD"}
@@ -1,10 +1,27 @@
1
1
  async function getCurrentPublishedVersion(npmClient, dir, packageName) {
2
2
  return (await npmClient.viewVersion(packageName, dir)) ?? '0.0.0';
3
3
  }
4
- export async function resolveVersion(npmClient, dir, packageName, versionSpecifier) {
4
+ export function resolveVersionFromPackageJson(packageName, packageJsonVersion) {
5
+ if (packageJsonVersion === undefined) {
6
+ throw new Error(`No version found in package.json for "${packageName}"`);
7
+ }
8
+ const prereleaseMatch = /^\d+\.\d+\.\d+-/.test(packageJsonVersion);
9
+ if (prereleaseMatch) {
10
+ throw new Error(`Prerelease versions are not supported with --bump package. Found "${packageJsonVersion}" in package.json for "${packageName}". Please use a version in X.Y.Z format.`);
11
+ }
12
+ const validSemver = /^\d+\.\d+\.\d+$/.test(packageJsonVersion);
13
+ if (!validSemver) {
14
+ throw new Error(`Invalid version "${packageJsonVersion}" in package.json for "${packageName}". Expected a valid semver in X.Y.Z format.`);
15
+ }
16
+ return packageJsonVersion;
17
+ }
18
+ export async function resolveVersion(npmClient, dir, packageName, versionSpecifier, packageJsonVersion) {
5
19
  if (versionSpecifier.tag === 'explicit') {
6
20
  return versionSpecifier.value;
7
21
  }
22
+ if (versionSpecifier.tag === 'package') {
23
+ return resolveVersionFromPackageJson(packageName, packageJsonVersion);
24
+ }
8
25
  const currentVersion = await getCurrentPublishedVersion(npmClient, dir, packageName);
9
26
  const nums = parseVersion(currentVersion);
10
27
  const indexToIncrement = { major: 0, minor: 1, patch: 2 }[versionSpecifier.tag];
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-version.js","sourceRoot":"","sources":["../../src/resolve-version.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rewrite-package-json.d.ts","sourceRoot":"","sources":["../../src/rewrite-package-json.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,YAAY,QA8B/G"}