Skip to content

Commit

Permalink
fix: missing emoji in commit message 🐛
Browse files Browse the repository at this point in the history
  • Loading branch information
ize-302 committed Sep 28, 2024
1 parent 58ab692 commit 46481ad
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 276 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ press ENTER
bun run build

# Run command
./dist/cli.js gitmo cm
node ./dist/cli.js gitmo cm
```

---
Expand Down
57 changes: 0 additions & 57 deletions oldsrc/commit-types.json

This file was deleted.

83 changes: 0 additions & 83 deletions oldsrc/gitmo.ts

This file was deleted.

4 changes: 0 additions & 4 deletions oldsrc/index.ts

This file was deleted.

22 changes: 0 additions & 22 deletions oldsrc/utils/hasStagedChanges.ts

This file was deleted.

34 changes: 0 additions & 34 deletions oldsrc/utils/isConventionalCommit.ts

This file was deleted.

22 changes: 0 additions & 22 deletions oldsrc/utils/promptContinue.ts

This file was deleted.

34 changes: 0 additions & 34 deletions oldsrc/utils/showCommitMessagePrompt.ts

This file was deleted.

28 changes: 26 additions & 2 deletions src/gitmo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import packageJson from "../package.json";

import transformMessage from "@/utils/transformMessage.js";
import hasStagedChanges from "@/utils/hasStagedChanges.js";
import commitMessagePrompt from "@/utils/commitMessagePrompt.js";

shell.config.silent = false;

Expand All @@ -26,13 +27,36 @@ const gitmo = () => {
if (stagedChagesExists) {
if (message) {
const transformedMessage = await transformMessage(message);
console.log(transformedMessage); // commit this
shell.exec(`git commit -m '${transformedMessage}'`);
} else {
console.log("prompt");
const response = await commitMessagePrompt();
const transformedMessage = await transformMessage(response.commitMessage);
shell.exec(`git commit -m '${transformedMessage}'`);
}
}
});

program
.command("ac [message]")
.description("Ament last commit")
.action(async (message) => {
if (message) {
const transformedMessage = await transformMessage(message);
shell.exec(`git commit --amend -m '${transformedMessage}'`);
} else {
const response = await commitMessagePrompt();
const transformedMessage = await transformMessage(response.commitMessage);
shell.exec(`git commit --amend -m '${transformedMessage}'`);
}
});

program
.command("update")
.description("Update gitmo cli")
.action(() => {
shell.exec("npm i -g gitmo");
});

// Parse the command-line arguments
program.parse(process.argv);
} catch (error) {
Expand Down
17 changes: 17 additions & 0 deletions src/utils/commitMessagePrompt.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import prompts from "prompts";
import onCancel from "@/utils/onCancel.js";

const commitMessagePrompt = async (originalMessage?: string) => {
const commitMessageResponse = await prompts(
{
type: "text",
name: "commitMessage",
message: "commit message",
initial: originalMessage,
},
{ onCancel },
);
return commitMessageResponse;
};

export default commitMessagePrompt;
File renamed without changes.
8 changes: 2 additions & 6 deletions src/utils/optionsPrompt.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import prompts from "prompts";

const onCancel = () => {
console.log("Exited Gitmo!");
process.exit(1);
};
import onCancel from "@/utils/onCancel.js";

const optionsPrompt = async () => {
const response = await prompts(
{
type: "select",
name: "continue",
name: "choice",
message: "Not a conventional commit. continue anyway?",
choices: [
{ title: "Yes", value: "yes" },
Expand Down
15 changes: 11 additions & 4 deletions src/utils/transformMessage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import emojisData from "@/emojis-data.json";
import optionsPrompt from "./optionsPrompt.js";
import optionsPrompt from "@/utils/optionsPrompt.js";
import commitMessagePrompt from "@/utils/commitMessagePrompt.js";

// this adds appropriate emoji to message
const transformMessage = async (originalMessage: string) => {
Expand All @@ -9,9 +10,15 @@ const transformMessage = async (originalMessage: string) => {
const findMatchedEmoji = emojisData.find((item) => item.name === getMatchedPrefix);
return `${originalMessage} ${findMatchedEmoji?.emoji}`;
}
console.log("Not a conventional commit");
await optionsPrompt();
return;
// ("Not a conventional commit. Pick an option to continue");
const optionsPromptResponse = await optionsPrompt();
if (optionsPromptResponse.choice === "yes") {
return originalMessage;
}
if (optionsPromptResponse.choice === "correction") {
const response = await commitMessagePrompt(originalMessage);
return await transformMessage(response.commitMessage);
}
};

export default transformMessage;
7 changes: 0 additions & 7 deletions text.txt

This file was deleted.

0 comments on commit 46481ad

Please sign in to comment.