Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e4ba7dab53 | |||
| 85649a71a6 | |||
| d30071e3d7 | |||
| 06f349c75a | |||
| 7a5880d211 | |||
| b05591a316 | |||
| 8e51587260 |
47
CHANGELOG.md
Normal file
47
CHANGELOG.md
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## v1.1.1
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
|
||||||
|
- [`7a5880d21`] - **commands**: incorrect changelog version generation
|
||||||
|
|
||||||
|
### Miscellaneous
|
||||||
|
|
||||||
|
- [`06f349c75`] - **release**: v1.1.1
|
||||||
|
|
||||||
|
## v1.1.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [`8e5158726`] - **commands**: add release and changelog commands
|
||||||
|
|
||||||
|
### Miscellaneous
|
||||||
|
|
||||||
|
- [`b05591a31`] - **release**: v1.1.0
|
||||||
|
|
||||||
|
## v1.0.0
|
||||||
|
|
||||||
|
### Breaking
|
||||||
|
|
||||||
|
- [`7ef777bb2`] - use commander for command management
|
||||||
|
|
||||||
|
### Miscellaneous
|
||||||
|
|
||||||
|
- [`b07d9aaaa`] - change question formatting, improve readme
|
||||||
|
|
||||||
|
## v1.0.0-alpha.1
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [`b5ca3152c`] - add support for body (#1)
|
||||||
|
- [`ce0c01347`] - initial commit
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
|
||||||
|
- [`2be2887ce`] - make commit body wrap properly
|
||||||
|
- [`e9d3c5e29`] - incorrect config parsing
|
||||||
|
|
||||||
|
### Miscellaneous
|
||||||
|
|
||||||
|
- [`4e16104d6`] - change intro and outro messages
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@resultium/rcz",
|
"name": "@resultium/rcz",
|
||||||
"version": "1.0.0",
|
"version": "1.1.2",
|
||||||
"description": "Resultium commit standardization library, based on conventional commits",
|
"description": "Resultium commit standardization library, based on conventional commits",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -28,10 +28,12 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@clack/prompts": "^0.7.0",
|
"@clack/prompts": "^0.7.0",
|
||||||
"commander": "^11.0.0",
|
"commander": "^11.0.0",
|
||||||
|
"semver": "^7.5.4",
|
||||||
"simple-git": "^3.19.1"
|
"simple-git": "^3.19.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^20.5.1",
|
"@types/node": "^20.5.1",
|
||||||
|
"@types/semver": "^7.5.0",
|
||||||
"typescript": "^5.1.6"
|
"typescript": "^5.1.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
29
pnpm-lock.yaml
generated
29
pnpm-lock.yaml
generated
@@ -11,6 +11,9 @@ dependencies:
|
|||||||
commander:
|
commander:
|
||||||
specifier: ^11.0.0
|
specifier: ^11.0.0
|
||||||
version: 11.0.0
|
version: 11.0.0
|
||||||
|
semver:
|
||||||
|
specifier: ^7.5.4
|
||||||
|
version: 7.5.4
|
||||||
simple-git:
|
simple-git:
|
||||||
specifier: ^3.19.1
|
specifier: ^3.19.1
|
||||||
version: 3.19.1
|
version: 3.19.1
|
||||||
@@ -19,6 +22,9 @@ devDependencies:
|
|||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20.5.1
|
specifier: ^20.5.1
|
||||||
version: 20.5.1
|
version: 20.5.1
|
||||||
|
'@types/semver':
|
||||||
|
specifier: ^7.5.0
|
||||||
|
version: 7.5.0
|
||||||
typescript:
|
typescript:
|
||||||
specifier: ^5.1.6
|
specifier: ^5.1.6
|
||||||
version: 5.1.6
|
version: 5.1.6
|
||||||
@@ -58,6 +64,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==}
|
resolution: {integrity: sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/@types/semver@7.5.0:
|
||||||
|
resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
|
||||||
|
dev: true
|
||||||
|
|
||||||
/commander@11.0.0:
|
/commander@11.0.0:
|
||||||
resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
|
resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
|
||||||
engines: {node: '>=16'}
|
engines: {node: '>=16'}
|
||||||
@@ -75,6 +85,13 @@ packages:
|
|||||||
ms: 2.1.2
|
ms: 2.1.2
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/lru-cache@6.0.0:
|
||||||
|
resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
|
||||||
|
engines: {node: '>=10'}
|
||||||
|
dependencies:
|
||||||
|
yallist: 4.0.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/ms@2.1.2:
|
/ms@2.1.2:
|
||||||
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
|
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
|
||||||
dev: false
|
dev: false
|
||||||
@@ -83,6 +100,14 @@ packages:
|
|||||||
resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
|
resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/semver@7.5.4:
|
||||||
|
resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
|
||||||
|
engines: {node: '>=10'}
|
||||||
|
hasBin: true
|
||||||
|
dependencies:
|
||||||
|
lru-cache: 6.0.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/simple-git@3.19.1:
|
/simple-git@3.19.1:
|
||||||
resolution: {integrity: sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==}
|
resolution: {integrity: sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -102,3 +127,7 @@ packages:
|
|||||||
engines: {node: '>=14.17'}
|
engines: {node: '>=14.17'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/yallist@4.0.0:
|
||||||
|
resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
|
||||||
|
dev: false
|
||||||
|
|||||||
211
src/index.ts
211
src/index.ts
@@ -12,9 +12,10 @@ import {
|
|||||||
} from "@clack/prompts";
|
} from "@clack/prompts";
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
import { Config } from "./types";
|
import { CommitStack, Config } from "./types";
|
||||||
import simpleGit from "simple-git";
|
import simpleGit from "simple-git";
|
||||||
import { Command } from "commander";
|
import { Command } from "commander";
|
||||||
|
import semver from "semver";
|
||||||
|
|
||||||
const GetConfig = async () => {
|
const GetConfig = async () => {
|
||||||
if (fs.existsSync(path.join(process.cwd(), ".rczrc"))) {
|
if (fs.existsSync(path.join(process.cwd(), ".rczrc"))) {
|
||||||
@@ -187,4 +188,212 @@ program
|
|||||||
outro("Finished creating a conventional commit, feel free to push");
|
outro("Finished creating a conventional commit, feel free to push");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
program
|
||||||
|
.command("changelog")
|
||||||
|
.description("Outputs a markdown formatted changelog")
|
||||||
|
.option("--show-hashes", "show first 9 characters of commit hashes")
|
||||||
|
.option("--last-only", "display only latest release changes")
|
||||||
|
.action(async (options) => {
|
||||||
|
const showHashes = options.showHashes ? true : false;
|
||||||
|
const lastOnly = options.lastOnly ? true : false;
|
||||||
|
|
||||||
|
if ((await simpleGit().tags()).all.length === 0) {
|
||||||
|
return console.log(
|
||||||
|
"[rcz]: not even one release has yet been made, cannot make a changelog"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const commits = (await simpleGit().log()).all;
|
||||||
|
let lastTag = "";
|
||||||
|
let parsedCommitStacks: Array<CommitStack> = [];
|
||||||
|
|
||||||
|
console.log("# Changelog");
|
||||||
|
console.log("Generation of this changelog is based on commits");
|
||||||
|
|
||||||
|
for (const commit of commits) {
|
||||||
|
const tag = semver.sort(
|
||||||
|
(await simpleGit().tags([`--contains=${commit.hash}`])).all
|
||||||
|
)[0]!;
|
||||||
|
const currentCommitStack = parsedCommitStacks.find(
|
||||||
|
(commitStack) => commitStack.version === tag
|
||||||
|
) || {
|
||||||
|
version: tag || "",
|
||||||
|
breaking: [],
|
||||||
|
features: [],
|
||||||
|
fixes: [],
|
||||||
|
miscellaneous: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
if (lastTag !== tag) {
|
||||||
|
parsedCommitStacks = [currentCommitStack, ...parsedCommitStacks];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (commit.message.includes("!:")) {
|
||||||
|
parsedCommitStacks = [
|
||||||
|
{
|
||||||
|
...currentCommitStack,
|
||||||
|
breaking: [...currentCommitStack.breaking, commit],
|
||||||
|
},
|
||||||
|
...parsedCommitStacks.filter(
|
||||||
|
(commitStack) => commitStack.version !== tag
|
||||||
|
),
|
||||||
|
];
|
||||||
|
} else if (commit.message.startsWith("feat")) {
|
||||||
|
parsedCommitStacks = [
|
||||||
|
{
|
||||||
|
...currentCommitStack,
|
||||||
|
features: [...currentCommitStack.features, commit],
|
||||||
|
},
|
||||||
|
...parsedCommitStacks.filter(
|
||||||
|
(commitStack) => commitStack.version !== tag
|
||||||
|
),
|
||||||
|
];
|
||||||
|
} else if (commit.message.startsWith("fix")) {
|
||||||
|
parsedCommitStacks = [
|
||||||
|
{
|
||||||
|
...currentCommitStack,
|
||||||
|
fixes: [...currentCommitStack.fixes, commit],
|
||||||
|
},
|
||||||
|
...parsedCommitStacks.filter(
|
||||||
|
(commitStack) => commitStack.version !== tag
|
||||||
|
),
|
||||||
|
];
|
||||||
|
} else {
|
||||||
|
parsedCommitStacks = [
|
||||||
|
{
|
||||||
|
...currentCommitStack,
|
||||||
|
miscellaneous: [...currentCommitStack.miscellaneous, commit],
|
||||||
|
},
|
||||||
|
...parsedCommitStacks.filter(
|
||||||
|
(commitStack) => commitStack.version !== tag
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
lastTag = tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedCommitStacks = parsedCommitStacks.reverse();
|
||||||
|
|
||||||
|
if (lastOnly) {
|
||||||
|
parsedCommitStacks = [parsedCommitStacks[0]];
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const commitStack of parsedCommitStacks) {
|
||||||
|
console.log(`## ${commitStack.version}`);
|
||||||
|
|
||||||
|
if (commitStack.breaking.length > 0) {
|
||||||
|
console.log(`### Breaking`);
|
||||||
|
for (const commit of commitStack.breaking) {
|
||||||
|
const shortHash = commit.hash.slice(0, 9);
|
||||||
|
|
||||||
|
// Selects contents between parenthesis and a semicolon, via https://stackoverflow.com/a/17779833/14544732
|
||||||
|
const type = /\(([^)]+)\):/.exec(commit.message)
|
||||||
|
? /\(([^)]+)\):/.exec(commit.message)![1]
|
||||||
|
: null;
|
||||||
|
const firstMessageLine = commit.message.split("\n");
|
||||||
|
const briefMessage = firstMessageLine[0].includes(":")
|
||||||
|
? firstMessageLine[0].split(":")[1].trim()
|
||||||
|
: firstMessageLine[0];
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`${showHashes ? `- [${shortHash}]` : ``} - ${
|
||||||
|
type ? `**${type}**: ${briefMessage}` : briefMessage
|
||||||
|
}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (commitStack.features.length > 0) {
|
||||||
|
console.log(`### Features`);
|
||||||
|
for (const commit of commitStack.features) {
|
||||||
|
const shortHash = commit.hash.slice(0, 9);
|
||||||
|
const type = /\(([^)]+)\):/.exec(commit.message)
|
||||||
|
? /\(([^)]+)\):/.exec(commit.message)![1]
|
||||||
|
: null;
|
||||||
|
const firstMessageLine = commit.message.split("\n");
|
||||||
|
const briefMessage = firstMessageLine[0].includes(":")
|
||||||
|
? firstMessageLine[0].split(":")[1].trim()
|
||||||
|
: firstMessageLine[0];
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`${showHashes ? `- [${"`"}${shortHash}${"`"}]` : ``} - ${
|
||||||
|
type ? `**${type}**: ${briefMessage}` : briefMessage
|
||||||
|
}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (commitStack.fixes.length > 0) {
|
||||||
|
console.log(`### Fixes`);
|
||||||
|
for (const commit of commitStack.fixes) {
|
||||||
|
const shortHash = commit.hash.slice(0, 9);
|
||||||
|
const type = /\(([^)]+)\):/.exec(commit.message)
|
||||||
|
? /\(([^)]+)\):/.exec(commit.message)![1]
|
||||||
|
: null;
|
||||||
|
const firstMessageLine = commit.message.split("\n");
|
||||||
|
const briefMessage = firstMessageLine[0].includes(":")
|
||||||
|
? firstMessageLine[0].split(":")[1].trim()
|
||||||
|
: firstMessageLine[0];
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`${showHashes ? `- [${shortHash}]` : ``} - ${
|
||||||
|
type ? `**${type}**: ${briefMessage}` : briefMessage
|
||||||
|
}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (commitStack.miscellaneous.length > 0) {
|
||||||
|
console.log(`### Miscellaneous`);
|
||||||
|
for (const commit of commitStack.miscellaneous) {
|
||||||
|
const shortHash = commit.hash.slice(0, 9);
|
||||||
|
const type = /\(([^)]+)\):/.exec(commit.message)
|
||||||
|
? /\(([^)]+)\):/.exec(commit.message)![1]
|
||||||
|
: null;
|
||||||
|
const firstMessageLine = commit.message.split("\n");
|
||||||
|
const briefMessage = firstMessageLine[0].includes(":")
|
||||||
|
? firstMessageLine[0].split(":")[1].trim()
|
||||||
|
: firstMessageLine[0];
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`${showHashes ? `- [${shortHash}]` : ``} - ${
|
||||||
|
type ? `**${type}**: ${briefMessage}` : briefMessage
|
||||||
|
}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
program
|
||||||
|
.command("release")
|
||||||
|
.description(
|
||||||
|
"Changes package.json version and creates a new commit with a tag"
|
||||||
|
)
|
||||||
|
.argument("<version>", "new version formatted in SemVer")
|
||||||
|
.action(async (string: string) => {
|
||||||
|
const version = string.replace("v", "");
|
||||||
|
const packageFile = JSON.parse(
|
||||||
|
(
|
||||||
|
await fs.promises.readFile(path.join(process.cwd(), "package.json"))
|
||||||
|
).toString()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!packageFile) {
|
||||||
|
console.log("[rcz]: this directory does not have a package.json file");
|
||||||
|
}
|
||||||
|
|
||||||
|
packageFile.version = version;
|
||||||
|
await fs.promises.writeFile(
|
||||||
|
path.join(process.cwd(), "package.json"),
|
||||||
|
JSON.stringify(packageFile, null, 4)
|
||||||
|
);
|
||||||
|
|
||||||
|
await simpleGit()
|
||||||
|
.add(".")
|
||||||
|
.commit(`chore(release): v${version}`)
|
||||||
|
.addTag(`v${version}`);
|
||||||
|
});
|
||||||
|
|
||||||
program.parse();
|
program.parse();
|
||||||
|
|||||||
10
src/types.ts
10
src/types.ts
@@ -1,3 +1,5 @@
|
|||||||
|
import { DefaultLogFields, ListLogLine } from "simple-git";
|
||||||
|
|
||||||
export interface Config {
|
export interface Config {
|
||||||
types?: Array<Type>;
|
types?: Array<Type>;
|
||||||
scopes?: Array<string>;
|
scopes?: Array<string>;
|
||||||
@@ -8,3 +10,11 @@ export interface Type {
|
|||||||
value: string;
|
value: string;
|
||||||
hint: string;
|
hint: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CommitStack {
|
||||||
|
version: string;
|
||||||
|
breaking: Array<DefaultLogFields & ListLogLine>;
|
||||||
|
features: Array<DefaultLogFields & ListLogLine>;
|
||||||
|
fixes: Array<DefaultLogFields & ListLogLine>;
|
||||||
|
miscellaneous: Array<DefaultLogFields & ListLogLine>;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user