@savvy-web/changelog 0.1.3 → 0.2.0

package/index.cjs

@@ -65,14 +65,14 @@ let semver_ranges_valid_js = require("semver/ranges/valid.js");
 semver_ranges_valid_js = __toESM(semver_ranges_valid_js, 1);
 let semver_functions_satisfies_js = require("semver/functions/satisfies.js");
 semver_functions_satisfies_js = __toESM(semver_functions_satisfies_js, 1);
+let semver_functions_inc_js = require("semver/functions/inc.js");
+semver_functions_inc_js = __toESM(semver_functions_inc_js, 1);
 let semver_functions_prerelease_js = require("semver/functions/prerelease.js");
 semver_functions_prerelease_js = __toESM(semver_functions_prerelease_js, 1);
 let semver_functions_parse_js = require("semver/functions/parse.js");
 semver_functions_parse_js = __toESM(semver_functions_parse_js, 1);
 let semver_functions_gt_js = require("semver/functions/gt.js");
 semver_functions_gt_js = __toESM(semver_functions_gt_js, 1);
-let semver_functions_inc_js = require("semver/functions/inc.js");
-semver_functions_inc_js = __toESM(semver_functions_inc_js, 1);
 //#region ../../node_modules/.pnpm/effect@4.0.0-rc.115/node_modules/effect/dist/Pipeable.js
 /**
 * The `Pipeable` module defines the shared interface and implementation helpers
@@ -97854,7 +97854,7 @@ function shouldSkipPackage({ packageJson }, { ignore, allowPrivatePackages }) {
 	return !packageJson.version;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+config@4.0.0/node_modules/@changesets/config/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+config@4.0.1/node_modules/@changesets/config/dist/index.mjs
 const DEFAULT_CONFIG = {
 	lang: void 0,
 	message: void 0,
@@ -98649,13 +98649,11 @@ const noDuplicateFixedPackages = ({ config, errors }) => {
 	if (config.fixed.length === 0) return;
 	const foundNames = /* @__PURE__ */ new Set();
 	const duplicatedNames = /* @__PURE__ */ new Set();
-	for (const fixedGroup of config.fixed) {
-		for (const name of fixedGroup) {
-			if (foundNames.has(name)) duplicatedNames.add(name);
-			foundNames.add(name);
-		}
-		errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `fixed: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of fixed packages. Packages can only be belong to a single group. ${picomatchNote}`));
+	for (const fixedGroup of config.fixed) for (const name of fixedGroup) {
+		if (foundNames.has(name)) duplicatedNames.add(name);
+		foundNames.add(name);
 	}
+	errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `fixed: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of fixed packages. Packages can only be belong to a single group. ${picomatchNote}`));
 };
 const linkedGroupsExist = ({ config, writtenConfig, packageNames, warnings }) => {
 	if (config.linked.length === 0) return;
@@ -98665,13 +98663,11 @@ const noDuplicateLinkedPackages = ({ config, errors }) => {
 	if (config.linked.length === 0) return;
 	const foundNames = /* @__PURE__ */ new Set();
 	const duplicatedNames = /* @__PURE__ */ new Set();
-	for (const linkedGroup of config.linked) {
-		for (const name of linkedGroup) {
-			if (foundNames.has(name)) duplicatedNames.add(name);
-			foundNames.add(name);
-		}
-		errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `linked: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of linked packages. Packages can only be belong to a single group. ${picomatchNote}`));
+	for (const linkedGroup of config.linked) for (const name of linkedGroup) {
+		if (foundNames.has(name)) duplicatedNames.add(name);
+		foundNames.add(name);
 	}
+	errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `linked: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of linked packages. Packages can only be belong to a single group. ${picomatchNote}`));
 };
 const noFixedAndLinkedPackages = ({ config, errors }) => {
 	if (config.fixed.length === 0 || config.linked.length === 0) return;
@@ -98768,7 +98764,7 @@ async function readConfig(cwd, packages) {
 	packages ??= await getPackages(cwd);
 	return validateConfig(JSON.parse(await node_fs_promises.readFile(node_path.join(packages.rootDir, ".changeset", "config.json"), "utf8")), packages);
 }
-var version = "4.0.0";
+var version = "4.0.1";
 const defaultConfig = normalizeWrittenConfig({
 	packageNames: [],
 	writtenConfig: parse(WrittenConfigSchema, {
@@ -102218,7 +102214,7 @@ function applyEdits(text, edits) {
 	return text;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+apply-release-plan@8.1.0/node_modules/@changesets/apply-release-plan/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+apply-release-plan@8.1.1/node_modules/@changesets/apply-release-plan/dist/index.mjs
 /**
 * A simple JSON editing utility that preserves formatting. They specified operation keys
 * must exist in the JSON for this implementation.
@@ -102362,8 +102358,8 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 	for (const depType of DEPENDENCY_TYPES) {
 		const deps = packageJson[depType];
 		if (deps) for (const release of versionsToUpdate) {
-			if (release.newVersion == null) continue;
-			const { name, newVersion } = release;
+			const { name, newVersion, type } = release;
+			if (newVersion == null || type === "none") continue;
 			let depCurrentVersion = deps[name];
 			if (!depCurrentVersion || depCurrentVersion.startsWith("file:") || depCurrentVersion.startsWith("link:") || !shouldUpdateDependencyBasedOnConfig(cwd, release, {
 				depVersionRange: depCurrentVersion,
@@ -102380,7 +102376,7 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 				depCurrentVersion = workspaceDepVersion;
 			}
 			if (new semver_classes_range_js.default(depCurrentVersion).range !== "" || (0, semver_functions_prerelease_js.default)(newVersion) != null) {
-				let newNewRange = snapshot ? newVersion : `${getVersionRangeType(depCurrentVersion)}${newVersion}`;
+				let newNewRange = snapshot ? newVersion : getNewDependencyRange(depCurrentVersion, newVersion, type);
 				if (usesWorkspaceRange) newNewRange = `workspace:${newNewRange}`;
 				pkgJsonEdits.push({
 					keys: [depType, name],
@@ -102391,6 +102387,20 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 	}
 	return pkgJsonEdits;
 }
+function getNewDependencyRange(versionRange, newVersion, releaseType) {
+	const comparatorSets = new semver_classes_range_js.default(versionRange).set;
+	const comparators = comparatorSets.length === 1 ? comparatorSets[0] : [];
+	if (comparators.length === 2 && versionRange.includes(">") && versionRange.includes("<")) {
+		const lowerBound = comparators.find(({ operator }) => operator.startsWith(">"));
+		const upperBound = comparators.find(({ operator }) => operator.startsWith("<"));
+		if (lowerBound && upperBound) {
+			let newUpperBound = upperBound.value;
+			if (!(0, semver_functions_satisfies_js.default)(newVersion, newUpperBound)) newUpperBound = `<${(0, semver_functions_inc_js.default)(newVersion, releaseType)}`;
+			return comparators[0] === lowerBound ? `>=${newVersion} ${newUpperBound}` : `${newUpperBound} >=${newVersion}`;
+		}
+	}
+	return `${getVersionRangeType(versionRange)}${newVersion}`;
+}
 function getVersionRangeType(versionRange) {
 	if (versionRange.charAt(0) === "^") return "^";
 	if (versionRange.charAt(0) === "~") return "~";
@@ -102488,16 +102498,18 @@ async function applyReleasePlan(releasePlan, packages, config = defaultConfig, s
 			if (!changeset.releases.some((release) => shouldSkipPackage(packagesByName.get(release.name), {
 				ignore: config.ignore,
 				allowPrivatePackages: config.privatePackages.version
-			}))) if (isPreChangesets) {
-				const newChangesetPath = node_path.resolve(cwd, ".changeset", "pre", `${changeset.id}.md`);
-				await node_fs_promises.rename(changesetPath, newChangesetPath);
-				touchedFiles.push(changesetPath, newChangesetPath);
-			} else {
-				await node_fs_promises.rm(changesetPath, {
-					recursive: true,
-					force: true
-				});
-				touchedFiles.push(changesetPath);
+			}))) {
+				if (isPreChangesets) {
+					const newChangesetPath = node_path.resolve(cwd, ".changeset", "pre", `${changeset.id}.md`);
+					await node_fs_promises.rename(changesetPath, newChangesetPath);
+					touchedFiles.push(changesetPath, newChangesetPath);
+				} else {
+					await node_fs_promises.rm(changesetPath, {
+						recursive: true,
+						force: true
+					});
+					touchedFiles.push(changesetPath);
+				}
 			}
 		}
 	}));
@@ -102562,10 +102574,13 @@ async function updateChangelog(changelogPath, changelog, name) {
 		await node_fs_promises.writeFile(changelogPath, completelyNewChangelog);
 		return;
 	}
-	const isVersionHeading = /^#{1,6}\s+\d+\.\d+/.test(fileData);
+	const firstVersionHeaderIndex = fileData.search(/^#{1,6}\s+\d+\.\d+/m);
 	let newChangelog;
-	if (isVersionHeading) newChangelog = templateString.trimStart() + fileData;
-	else {
+	if (firstVersionHeaderIndex >= 0) {
+		const prefix = fileData.slice(0, firstVersionHeaderIndex);
+		const suffix = fileData.slice(firstVersionHeaderIndex);
+		newChangelog = prefix + templateString.trimStart() + "\n" + suffix;
+	} else {
 		const index = fileData.indexOf("\n");
 		newChangelog = index === -1 ? fileData + templateString : fileData.slice(0, index) + templateString + fileData.slice(index + 1);
 	}
@@ -103047,7 +103062,7 @@ async function readChangesets(rootDir, sinceRef) {
 	return await Promise.all(changesetContents);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+get-release-plan@5.0.1/node_modules/@changesets/get-release-plan/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+get-release-plan@5.0.2/node_modules/@changesets/get-release-plan/dist/index.mjs
 async function getReleasePlan(cwd, sinceRef, passedConfig) {
 	const packages = await getPackages(cwd);
 	const configResult = await readConfig(packages.rootDir, packages);

package/index.js

@@ -25,10 +25,10 @@ import * as assert from "node:assert";
 import * as v8 from "node:v8";
 import validRange from "semver/ranges/valid.js";
 import semverSatisfies from "semver/functions/satisfies.js";
+import semverInc from "semver/functions/inc.js";
 import semverPrerelease from "semver/functions/prerelease.js";
 import semverParse from "semver/functions/parse.js";
 import semverGt from "semver/functions/gt.js";
-import semverInc from "semver/functions/inc.js";
 
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -101608,7 +101608,7 @@ function shouldSkipPackage({ packageJson }, { ignore, allowPrivatePackages }) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+config@4.0.0/node_modules/@changesets/config/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+config@4.0.1/node_modules/@changesets/config/dist/index.mjs
 const DEFAULT_CONFIG = {
 	lang: void 0,
 	message: void 0,
@@ -102403,13 +102403,11 @@ const noDuplicateFixedPackages = ({ config, errors }) => {
 	if (config.fixed.length === 0) return;
 	const foundNames = /* @__PURE__ */ new Set();
 	const duplicatedNames = /* @__PURE__ */ new Set();
-	for (const fixedGroup of config.fixed) {
-		for (const name of fixedGroup) {
-			if (foundNames.has(name)) duplicatedNames.add(name);
-			foundNames.add(name);
-		}
-		errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `fixed: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of fixed packages. Packages can only be belong to a single group. ${picomatchNote}`));
+	for (const fixedGroup of config.fixed) for (const name of fixedGroup) {
+		if (foundNames.has(name)) duplicatedNames.add(name);
+		foundNames.add(name);
 	}
+	errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `fixed: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of fixed packages. Packages can only be belong to a single group. ${picomatchNote}`));
 };
 const linkedGroupsExist = ({ config, writtenConfig, packageNames, warnings }) => {
 	if (config.linked.length === 0) return;
@@ -102419,13 +102417,11 @@ const noDuplicateLinkedPackages = ({ config, errors }) => {
 	if (config.linked.length === 0) return;
 	const foundNames = /* @__PURE__ */ new Set();
 	const duplicatedNames = /* @__PURE__ */ new Set();
-	for (const linkedGroup of config.linked) {
-		for (const name of linkedGroup) {
-			if (foundNames.has(name)) duplicatedNames.add(name);
-			foundNames.add(name);
-		}
-		errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `linked: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of linked packages. Packages can only be belong to a single group. ${picomatchNote}`));
+	for (const linkedGroup of config.linked) for (const name of linkedGroup) {
+		if (foundNames.has(name)) duplicatedNames.add(name);
+		foundNames.add(name);
 	}
+	errors.push(...Array.from(duplicatedNames, (pkgOrGlob) => `linked: Invalid group: The package or glob "${pkgOrGlob}" is defined in multiple groups of linked packages. Packages can only be belong to a single group. ${picomatchNote}`));
 };
 const noFixedAndLinkedPackages = ({ config, errors }) => {
 	if (config.fixed.length === 0 || config.linked.length === 0) return;
@@ -102522,7 +102518,7 @@ async function readConfig(cwd, packages) {
 	packages ??= await getPackages(cwd);
 	return validateConfig(JSON.parse(await fs$1.readFile(path$1.join(packages.rootDir, ".changeset", "config.json"), "utf8")), packages);
 }
-var version = "4.0.0";
+var version = "4.0.1";
 const defaultWrittenConfig = {
 	["$schema"]: `https://unpkg.com/@changesets/config@${version}/schema.json`,
 	baseBranch: "main",
@@ -106005,7 +106001,7 @@ function applyEdits(text, edits) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+apply-release-plan@8.1.0/node_modules/@changesets/apply-release-plan/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+apply-release-plan@8.1.1/node_modules/@changesets/apply-release-plan/dist/index.mjs
 /**
 * A simple JSON editing utility that preserves formatting. They specified operation keys
 * must exist in the JSON for this implementation.
@@ -106022,7 +106018,7 @@ function editJson(json, operations) {
 		const error = errors[0];
 		throw new Error(`Failed to parse JSON at offset ${error.offset}: ${printParseErrorCode(error.error)}`);
 	}
-	return applyEdits(json, operations.map((op) => {
+	const edits = operations.map((op) => {
 		const valueNode = getValueNode(parsed, op.keys);
 		if (!valueNode) throw new Error(`Key path "${op.keys.join(".")}" not found in JSON`);
 		return {
@@ -106030,7 +106026,8 @@ function editJson(json, operations) {
 			offset: valueNode.offset,
 			length: valueNode.length
 		};
-	}));
+	});
+	return applyEdits(json, edits);
 }
 function getValueNode(root, keys) {
 	let node = root;
@@ -106149,8 +106146,8 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 	for (const depType of DEPENDENCY_TYPES) {
 		const deps = packageJson[depType];
 		if (deps) for (const release of versionsToUpdate) {
-			if (release.newVersion == null) continue;
-			const { name, newVersion } = release;
+			const { name, newVersion, type } = release;
+			if (newVersion == null || type === "none") continue;
 			let depCurrentVersion = deps[name];
 			if (!depCurrentVersion || depCurrentVersion.startsWith("file:") || depCurrentVersion.startsWith("link:") || !shouldUpdateDependencyBasedOnConfig(cwd, release, {
 				depVersionRange: depCurrentVersion,
@@ -106167,7 +106164,7 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 				depCurrentVersion = workspaceDepVersion;
 			}
 			if (new Range(depCurrentVersion).range !== "" || semverPrerelease(newVersion) != null) {
-				let newNewRange = snapshot ? newVersion : `${getVersionRangeType(depCurrentVersion)}${newVersion}`;
+				let newNewRange = snapshot ? newVersion : getNewDependencyRange(depCurrentVersion, newVersion, type);
 				if (usesWorkspaceRange) newNewRange = `workspace:${newNewRange}`;
 				pkgJsonEdits.push({
 					keys: [depType, name],
@@ -106178,6 +106175,20 @@ function getDependencyVersionEdits(packageJson, versionsToUpdate, { cwd, updateI
 	}
 	return pkgJsonEdits;
 }
+function getNewDependencyRange(versionRange, newVersion, releaseType) {
+	const comparatorSets = new Range(versionRange).set;
+	const comparators = comparatorSets.length === 1 ? comparatorSets[0] : [];
+	if (comparators.length === 2 && versionRange.includes(">") && versionRange.includes("<")) {
+		const lowerBound = comparators.find(({ operator }) => operator.startsWith(">"));
+		const upperBound = comparators.find(({ operator }) => operator.startsWith("<"));
+		if (lowerBound && upperBound) {
+			let newUpperBound = upperBound.value;
+			if (!semverSatisfies(newVersion, newUpperBound)) newUpperBound = `<${semverInc(newVersion, releaseType)}`;
+			return comparators[0] === lowerBound ? `>=${newVersion} ${newUpperBound}` : `${newUpperBound} >=${newVersion}`;
+		}
+	}
+	return `${getVersionRangeType(versionRange)}${newVersion}`;
+}
 function getVersionRangeType(versionRange) {
 	if (versionRange.charAt(0) === "^") return "^";
 	if (versionRange.charAt(0) === "~") return "~";
@@ -106276,16 +106287,18 @@ async function applyReleasePlan(releasePlan, packages, config = defaultConfig, s
 			if (!changeset.releases.some((release) => shouldSkipPackage(packagesByName.get(release.name), {
 				ignore: config.ignore,
 				allowPrivatePackages: config.privatePackages.version
-			}))) if (isPreChangesets) {
-				const newChangesetPath = path$1.resolve(cwd, ".changeset", "pre", `${changeset.id}.md`);
-				await fs$1.rename(changesetPath, newChangesetPath);
-				touchedFiles.push(changesetPath, newChangesetPath);
-			} else {
-				await fs$1.rm(changesetPath, {
-					recursive: true,
-					force: true
-				});
-				touchedFiles.push(changesetPath);
+			}))) {
+				if (isPreChangesets) {
+					const newChangesetPath = path$1.resolve(cwd, ".changeset", "pre", `${changeset.id}.md`);
+					await fs$1.rename(changesetPath, newChangesetPath);
+					touchedFiles.push(changesetPath, newChangesetPath);
+				} else {
+					await fs$1.rm(changesetPath, {
+						recursive: true,
+						force: true
+					});
+					touchedFiles.push(changesetPath);
+				}
 			}
 		}
 	}));
@@ -106350,10 +106363,13 @@ async function updateChangelog(changelogPath, changelog, name) {
 		await fs$1.writeFile(changelogPath, completelyNewChangelog);
 		return;
 	}
-	const isVersionHeading = /^#{1,6}\s+\d+\.\d+/.test(fileData);
+	const firstVersionHeaderIndex = fileData.search(/^#{1,6}\s+\d+\.\d+/m);
 	let newChangelog;
-	if (isVersionHeading) newChangelog = templateString.trimStart() + fileData;
-	else {
+	if (firstVersionHeaderIndex >= 0) {
+		const prefix = fileData.slice(0, firstVersionHeaderIndex);
+		const suffix = fileData.slice(firstVersionHeaderIndex);
+		newChangelog = prefix + templateString.trimStart() + "\n" + suffix;
+	} else {
 		const index = fileData.indexOf("\n");
 		newChangelog = index === -1 ? fileData + templateString : fileData.slice(0, index) + templateString + fileData.slice(index + 1);
 	}
@@ -106840,7 +106856,7 @@ async function readChangesets(rootDir, sinceRef) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+get-release-plan@5.0.1/node_modules/@changesets/get-release-plan/dist/index.mjs
+//#region ../../node_modules/.pnpm/@changesets+get-release-plan@5.0.2/node_modules/@changesets/get-release-plan/dist/index.mjs
 async function getReleasePlan(cwd, sinceRef, passedConfig) {
 	const packages = await getPackages(cwd);
 	const configResult = await readConfig(packages.rootDir, packages);
@@ -106849,7 +106865,9 @@ async function getReleasePlan(cwd, sinceRef, passedConfig) {
 		...configResult.config,
 		...passedConfig
 	} : configResult.config;
-	return assembleReleasePlan(await readChangesets(packages.rootDir, sinceRef), packages, config, await readPreState(packages.rootDir));
+	const changesets = await readChangesets(packages.rootDir, sinceRef);
+	const preState = await readPreState(packages.rootDir);
+	return assembleReleasePlan(changesets, packages, config, preState);
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/changelog",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"private": false,
 	"description": "The Silk Suite changesets changelog generator as a standalone package",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/changelog",