Skip to content

Fix: Cannot read properties of undefined (reading 'length') #533 #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevin-valerio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Cannot read properties of undefined (reading 'length') #533 #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions out/cli.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67303,6 +67303,7 @@ var getMainCommitPrompt = async (fullGitMojiSpec, context) => {

// src/utils/mergeDiffs.ts
function mergeDiffs(arr, maxStringLength) {
if (arr.length === 0) return [];
const mergedArr = [];
let currentItem = arr[0];
for (const item of arr.slice(1)) {
Expand Down Expand Up @@ -67355,7 +67356,8 @@ var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false, context
const commitMessagePromises = await getCommitMsgsPromisesFromFileDiffs(
diff,
MAX_REQUEST_TOKENS,
fullGitMojiSpec
fullGitMojiSpec,
context
);
const commitMessages = [];
for (const promise of commitMessagePromises) {
Expand All @@ -67378,7 +67380,7 @@ var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false, context
throw error;
}
};
function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength, fullGitMojiSpec) {
function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength, fullGitMojiSpec, context) {
const hunkHeaderSeparator = "@@ ";
const [fileHeader, ...fileDiffByLines] = fileDiff.split(hunkHeaderSeparator);
const mergedChanges = mergeDiffs(
Expand All @@ -67400,7 +67402,8 @@ function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength
async (lineDiff) => {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + lineDiff,
fullGitMojiSpec
fullGitMojiSpec,
context
);
return engine.generateCommitMessage(messages);
}
Expand Down Expand Up @@ -67432,9 +67435,21 @@ function splitDiff(diff, maxChangeLength) {
}
return splitDiffs;
}
var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMojiSpec) => {
var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMojiSpec, context = "") => {
const separator = "diff --git ";
const diffByFiles = diff.split(separator).slice(1);
if (diffByFiles.length === 0) {
const engine = getEngine();
const chunks = splitDiff(diff, maxDiffLength);
return chunks.map(async (chunk) => {
const messages = await generateCommitMessageChatCompletionPrompt(
chunk,
fullGitMojiSpec,
context
);
return engine.generateCommitMessage(messages);
});
}
const mergedFilesDiffs = mergeDiffs(diffByFiles, maxDiffLength);
const commitMessagePromises = [];
for (const fileDiff of mergedFilesDiffs) {
Expand All @@ -67443,13 +67458,15 @@ var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMoji
fileDiff,
separator,
maxDiffLength,
fullGitMojiSpec
fullGitMojiSpec,
context
);
commitMessagePromises.push(...messagesPromises);
} else {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + fileDiff,
fullGitMojiSpec
fullGitMojiSpec,
context
);
const engine = getEngine();
commitMessagePromises.push(engine.generateCommitMessage(messages));
Expand Down Expand Up @@ -67544,7 +67561,7 @@ ${lockFiles.join(
);
const { stdout: diff } = await execa(
"git",
["diff", "--staged", "--", ...filesWithoutLocks],
["diff", "--staged", "--no-ext-diff", "--no-color", "--", ...filesWithoutLocks],
{ cwd: gitDir }
);
return diff;
Expand Down
29 changes: 23 additions & 6 deletions out/github-action.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87874,6 +87874,7 @@ var getMainCommitPrompt = async (fullGitMojiSpec, context2) => {

// src/utils/mergeDiffs.ts
function mergeDiffs(arr, maxStringLength) {
if (arr.length === 0) return [];
const mergedArr = [];
let currentItem = arr[0];
for (const item of arr.slice(1)) {
Expand Down Expand Up @@ -87926,7 +87927,8 @@ var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false, context2
const commitMessagePromises = await getCommitMsgsPromisesFromFileDiffs(
diff,
MAX_REQUEST_TOKENS,
fullGitMojiSpec
fullGitMojiSpec,
context2
);
const commitMessages = [];
for (const promise of commitMessagePromises) {
Expand All @@ -87949,7 +87951,7 @@ var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false, context2
throw error;
}
};
function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength, fullGitMojiSpec) {
function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength, fullGitMojiSpec, context2) {
const hunkHeaderSeparator = "@@ ";
const [fileHeader, ...fileDiffByLines] = fileDiff.split(hunkHeaderSeparator);
const mergedChanges = mergeDiffs(
Expand All @@ -87971,7 +87973,8 @@ function getMessagesPromisesByChangesInFile(fileDiff, separator, maxChangeLength
async (lineDiff) => {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + lineDiff,
fullGitMojiSpec
fullGitMojiSpec,
context2
);
return engine.generateCommitMessage(messages);
}
Expand Down Expand Up @@ -88003,9 +88006,21 @@ function splitDiff(diff, maxChangeLength) {
}
return splitDiffs;
}
var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMojiSpec) => {
var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMojiSpec, context2 = "") => {
const separator = "diff --git ";
const diffByFiles = diff.split(separator).slice(1);
if (diffByFiles.length === 0) {
const engine = getEngine();
const chunks = splitDiff(diff, maxDiffLength);
return chunks.map(async (chunk) => {
const messages = await generateCommitMessageChatCompletionPrompt(
chunk,
fullGitMojiSpec,
context2
);
return engine.generateCommitMessage(messages);
});
}
const mergedFilesDiffs = mergeDiffs(diffByFiles, maxDiffLength);
const commitMessagePromises = [];
for (const fileDiff of mergedFilesDiffs) {
Expand All @@ -88014,13 +88029,15 @@ var getCommitMsgsPromisesFromFileDiffs = async (diff, maxDiffLength, fullGitMoji
fileDiff,
separator,
maxDiffLength,
fullGitMojiSpec
fullGitMojiSpec,
context2
);
commitMessagePromises.push(...messagesPromises);
} else {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + fileDiff,
fullGitMojiSpec
fullGitMojiSpec,
context2
);
const engine = getEngine();
commitMessagePromises.push(engine.generateCommitMessage(messages));
Expand Down
33 changes: 27 additions & 6 deletions src/generateCommitMessageFromGitDiff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ export const generateCommitMessageByDiff = async (
const commitMessagePromises = await getCommitMsgsPromisesFromFileDiffs(
diff,
MAX_REQUEST_TOKENS,
fullGitMojiSpec
fullGitMojiSpec,
context
);

const commitMessages = [] as string[];
Expand Down Expand Up @@ -97,7 +98,8 @@ function getMessagesPromisesByChangesInFile(
fileDiff: string,
separator: string,
maxChangeLength: number,
fullGitMojiSpec: boolean
fullGitMojiSpec: boolean,
context: string
) {
const hunkHeaderSeparator = '@@ ';
const [fileHeader, ...fileDiffByLines] = fileDiff.split(hunkHeaderSeparator);
Expand Down Expand Up @@ -125,7 +127,8 @@ function getMessagesPromisesByChangesInFile(
async (lineDiff) => {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + lineDiff,
fullGitMojiSpec
fullGitMojiSpec,
context
);

return engine.generateCommitMessage(messages);
Expand Down Expand Up @@ -174,12 +177,28 @@ function splitDiff(diff: string, maxChangeLength: number) {
export const getCommitMsgsPromisesFromFileDiffs = async (
diff: string,
maxDiffLength: number,
fullGitMojiSpec: boolean
fullGitMojiSpec: boolean,
context: string = ''
) => {
const separator = 'diff --git ';

const diffByFiles = diff.split(separator).slice(1);

// If `git diff` output doesn't include file markers (e.g. external diff tools),
// fall back to splitting the full diff into chunks.
if (diffByFiles.length === 0) {
const engine = getEngine();
const chunks = splitDiff(diff, maxDiffLength);
return chunks.map(async (chunk) => {
const messages = await generateCommitMessageChatCompletionPrompt(
chunk,
fullGitMojiSpec,
context
);
return engine.generateCommitMessage(messages);
});
}

// merge multiple files-diffs into 1 prompt to save tokens
const mergedFilesDiffs = mergeDiffs(diffByFiles, maxDiffLength);

Expand All @@ -192,14 +211,16 @@ export const getCommitMsgsPromisesFromFileDiffs = async (
fileDiff,
separator,
maxDiffLength,
fullGitMojiSpec
fullGitMojiSpec,
context
);

commitMessagePromises.push(...messagesPromises);
} else {
const messages = await generateCommitMessageChatCompletionPrompt(
separator + fileDiff,
fullGitMojiSpec
fullGitMojiSpec,
context
);

const engine = getEngine();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const getDiff = async ({ files }: { files: string[] }) => {

const { stdout: diff } = await execa(
'git',
['diff', '--staged', '--', ...filesWithoutLocks],
['diff', '--staged', '--no-ext-diff', '--no-color', '--', ...filesWithoutLocks],
{ cwd: gitDir }
);

Expand Down
2 changes: 2 additions & 0 deletions src/utils/mergeDiffs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { tokenCount } from './tokenCount';

export function mergeDiffs(arr: string[], maxStringLength: number): string[] {
if (arr.length === 0) return [];

const mergedArr: string[] = [];
let currentItem: string = arr[0];
for (const item of arr.slice(1)) {
Expand Down
8 changes: 8 additions & 0 deletions test/unit/mergeDiffs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { mergeDiffs } from '../../src/utils/mergeDiffs';

describe('mergeDiffs', () => {
it('returns an empty array when given no diffs', () => {
expect(mergeDiffs([], 100)).toEqual([]);
});
});