@gitsense/gsc-utils 0.1.0 → 0.2.0

package/dist/gsc-utils.cjs.js

@@ -6807,7 +6807,11 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     // To keep things simple we are going to require the source and target header line count to be the same.
     // By doing so, we can can just add the line count to the hunks
     if (sourceHeaderLineCount !== targetHeaderLineCount) {
-        throw new Error('Source and target header line count must be the same');
+        // Some LLMs will not generate a Parent-UUID for the first version so we won't make this
+        // fatal if the sourceHeader does not have a Parent-UUID
+        if (sourceHeaderLineCount.includes('Parent-UUID')) {
+            throw new Error('Source and target header line count must be the same');
+        }
     }
 
     const cleanSourceContent = sourceContent.trimEnd();
@@ -6817,7 +6821,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     const unadjustedDiffPatch = jsdiff$1.createTwoFilesPatch('Original', 'Modified', cleanSourceContent, cleanTargetContent, '', '', { context: 3, stripTrailingCr: true });
 
     // 3. Post-process Diff to Adjust Line Numbers and Add NNN: Prefixes
-    const diffLines = unadjustedDiffPatch.split('\n');
+    const diffLines = unadjustedDiffPatch.split('\n').filter(line => !line.includes('\'));
 
     for (let i = 0; i < diffLines.length; i++) {
         const line = diffLines[i];
@@ -6827,6 +6831,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
 
         // Hunk header: @@ -oldStart,oldCount +newStart,newCount @@
         const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+
         if (match) {
             let oldStart = parseInt(match[1], 10);
             let oldCount = match[2] ? parseInt(match[2], 10) : 1;

package/dist/gsc-utils.esm.js

@@ -6805,7 +6805,11 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     // To keep things simple we are going to require the source and target header line count to be the same.
     // By doing so, we can can just add the line count to the hunks
     if (sourceHeaderLineCount !== targetHeaderLineCount) {
-        throw new Error('Source and target header line count must be the same');
+        // Some LLMs will not generate a Parent-UUID for the first version so we won't make this
+        // fatal if the sourceHeader does not have a Parent-UUID
+        if (sourceHeaderLineCount.includes('Parent-UUID')) {
+            throw new Error('Source and target header line count must be the same');
+        }
     }
 
     const cleanSourceContent = sourceContent.trimEnd();
@@ -6815,7 +6819,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     const unadjustedDiffPatch = jsdiff$1.createTwoFilesPatch('Original', 'Modified', cleanSourceContent, cleanTargetContent, '', '', { context: 3, stripTrailingCr: true });
 
     // 3. Post-process Diff to Adjust Line Numbers and Add NNN: Prefixes
-    const diffLines = unadjustedDiffPatch.split('\n');
+    const diffLines = unadjustedDiffPatch.split('\n').filter(line => !line.includes('\'));
 
     for (let i = 0; i < diffLines.length; i++) {
         const line = diffLines[i];
@@ -6825,6 +6829,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
 
         // Hunk header: @@ -oldStart,oldCount +newStart,newCount @@
         const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+
         if (match) {
             let oldStart = parseInt(match[1], 10);
             let oldCount = match[2] ? parseInt(match[2], 10) : 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitsense/gsc-utils",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Utilities for GitSense Chat (GSC)",
   "main": "dist/gsc-utils.cjs.js",
   "module": "dist/gsc-utils.esm.js",

package/src/PatchUtils/patchProcessor.js

@@ -289,7 +289,11 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     // To keep things simple we are going to require the source and target header line count to be the same.
     // By doing so, we can can just add the line count to the hunks
     if (sourceHeaderLineCount !== targetHeaderLineCount) {
-        throw new Error('Source and target header line count must be the same');
+        // Some LLMs will not generate a Parent-UUID for the first version so we won't make this
+        // fatal if the sourceHeader does not have a Parent-UUID
+        if (sourceHeaderLineCount.includes('Parent-UUID')) {
+            throw new Error('Source and target header line count must be the same');
+        }
     }
 
     const cleanSourceContent = sourceContent.trimEnd();
@@ -299,7 +303,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
     const unadjustedDiffPatch = jsdiff.createTwoFilesPatch('Original', 'Modified', cleanSourceContent, cleanTargetContent, '', '', { context: 3, stripTrailingCr: true });
 
     // 3. Post-process Diff to Adjust Line Numbers and Add NNN: Prefixes
-    const diffLines = unadjustedDiffPatch.split('\n');
+    const diffLines = unadjustedDiffPatch.split('\n').filter(line => !line.includes('\'));
     const outputLines = [];
     const outputDiffLines = [];
 
@@ -311,6 +315,7 @@ function createPatchFromCodeBlocks(CodeBlockUtils, sourceCodeBlockText, targetCo
 
         // Hunk header: @@ -oldStart,oldCount +newStart,newCount @@
         const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+
         if (match) {
             let oldStart = parseInt(match[1], 10);
             let oldCount = match[2] ? parseInt(match[2], 10) : 1;