@feng0531/dsh-vcs 0.3.55 → 0.3.57

package/git-history.mjs

@@ -15,6 +15,17 @@ export function historySearchArgs(search){
  return {args,paths};
 }
 // Each line-porcelain record carries its own metadata; never interpret filename as an access path.
+export function decodeBlamePath(value){
+ if(!value.startsWith('"'))return value;
+ if(!value.endsWith('"'))throw Error('Invalid quoted blame path');
+ const bytes=[];const escapes={a:7,b:8,t:9,n:10,v:11,f:12,r:13,'"':34,'\\':92};
+ for(let i=1;i<value.length-1;i++){
+  if(value[i]!=='\\'){bytes.push(...Buffer.from(value[i],'utf8'));continue;}
+  const c=value[++i];if(Object.hasOwn(escapes,c)){bytes.push(escapes[c]);continue;}
+  const octal=value.slice(i,i+3);if(!/^[0-3][0-7]{2}$/.test(octal))throw Error('Invalid blame path escape');bytes.push(parseInt(octal,8));i+=2;
+ }
+ return new TextDecoder('utf-8',{fatal:true}).decode(Uint8Array.from(bytes));
+}
 export function parseBlame(text,maxLines=500){
  if(typeof text!=='string'||Buffer.byteLength(text,'utf8')>2*1024*1024)throw new Error('Invalid blame output size');
  if(!Number.isInteger(maxLines)||maxLines<1||maxLines>500)throw new Error('Invalid blame line limit');
@@ -35,7 +46,7 @@ export function parseBlame(text,maxLines=500){
   }
   if(i===fields.length||!['author','author-time','author-tz','summary','filename'].every(k=>Object.hasOwn(metadata,k)))throw new Error('Incomplete blame record');
   if(!/^-?[0-9]+$/.test(metadata['author-time'])||!Number.isSafeInteger(Number(metadata['author-time']))||! /^[+-][0-9]{4}$/.test(metadata['author-tz']))throw new Error('Invalid blame timestamp');
-  rows.push({commit:header[1],originalLine,line,author:metadata.author,authorTime:Number(metadata['author-time']),authorTimezone:metadata['author-tz'],summary:metadata.summary,text:fields[i++].slice(1)});
+  rows.push({commit:header[1],originalLine,line,author:metadata.author,authorTime:Number(metadata['author-time']),authorTimezone:metadata['author-tz'],summary:metadata.summary,path:decodeBlamePath(metadata.filename),text:fields[i++].slice(1)});
   if(rows.length>maxLines)throw new Error('Blame line limit exceeded');
  }
  return rows;
@@ -72,6 +83,27 @@ export function historyPage(rows,snapshot,offset,limit){
  const truncated=hasMore&&offset+limit>10000;
  return {snapshot,commits:rows.slice(0,limit),nextOffset:hasMore&&!truncated?offset+limit:null,truncated};
 }
+// --follow emits one selected-path name-status record per commit. Fail closed on unexpected framing.
+export function parseFollowHistory(text,path,maxRecords){
+ if(typeof text!=='string'||Buffer.byteLength(text,'utf8')>2*1024*1024||!Number.isInteger(maxRecords)||maxRecords<1||maxRecords>10101)throw Error('Invalid follow history bounds');
+ if(!text)return [];if(!text.endsWith('\0'))throw Error('Truncated follow history');
+ const fields=text.slice(0,-1).split('\0'),rows=[];let current=path;
+ for(let i=0;i<fields.length;){
+  if(rows.length===maxRecords||i+6>=fields.length)throw Error('Invalid follow history framing');
+  const row=parseHistory(fields.slice(i,i+5).join('\0')+'\0',1)[0];i+=5;
+  const status=fields[i++];
+  if(!/^\n(?:[AMDT]|[RC][0-9]{1,3})$/.test(status))throw Error('Unsupported follow history status');
+  const oldPath=fields[i++],newPath=/^\n[RC]/.test(status)?fields[i++]:oldPath;
+  if(!oldPath||!newPath||newPath!==current)throw Error('Ambiguous follow history path');
+  if(/^\n[RC]/.test(status)&&Number(status.slice(2))>100)throw Error('Invalid follow similarity score');
+  const boundary=row.parents.length>1?'merge-first-parent':(/^\nC/.test(status)||(/^\nR/.test(status)&&status!=='\nR100'))?'copy-or-inexact-rename':null;
+  rows.push({...row,path:current,...(boundary?{boundary}:status==='\nR100'?{oldPath}:{})});
+  if(boundary)break;
+  if(status==='\nR100')current=oldPath;
+  if(status==='\nA')break; // Stop at creation; never cross an older unrelated same-name file.
+ }
+ return rows;
+}
 export function parseHistory(text, maxRecords = 101) {
   if(typeof text !== 'string' || Buffer.byteLength(text,'utf8') > 2*1024*1024) throw new Error('History output exceeds limit or is invalid');
   if(!Number.isInteger(maxRecords)||maxRecords<1||maxRecords>101) throw new Error('Invalid history record limit');

package/index.mjs

@@ -25,7 +25,7 @@ const rediscover = () => Object.assign(new Error('Repository authorization is mi
 import {historySearchArgs} from './git-history.mjs';
 function validatePayload(endpoint, payload) {
   if (!payload || typeof payload !== 'object' || Array.isArray(payload)) throw invalid('An object payload is required.');
-  const fields = endpoint==='vcs/tree-file'?['sessionId','repositoryId','commit','path'] : endpoint==='vcs/references'?['sessionId','repositoryId'] : endpoint==='vcs/commit-image'?['sessionId','repositoryId','commit','parentIndex','id','side'] : endpoint==='vcs/tree'?['sessionId','repositoryId','commit'] : endpoint==='vcs/file-history'?['sessionId','repositoryId','commit','parentIndex','id','offset','limit'] : ['vcs/revision-changes','vcs/revision-compare'].includes(endpoint) ? ['sessionId','repositoryId','base','target',...(endpoint==='vcs/revision-compare'?['id']:[])] : ['vcs/commit-compare','vcs/blame'].includes(endpoint) ? ['sessionId','repositoryId','commit','parentIndex','id'] : endpoint === 'vcs/commit' ? ['sessionId','repositoryId','commit','parentIndex'] : endpoint === 'vcs/history' ? ['sessionId','repositoryId','snapshot','offset','limit','search'] : endpoint === 'vcs/repositories' ? ['sessionId', 'subdirectory'] : ['sessionId', 'repositoryId', 'mode', ...(endpoint === 'vcs/compare' ? ['id'] : [])];
+  const fields = endpoint==='vcs/tree-file'?['sessionId','repositoryId','commit','path'] : endpoint==='vcs/references'?['sessionId','repositoryId'] : endpoint==='vcs/commit-image'?['sessionId','repositoryId','commit','parentIndex','id','side'] : endpoint==='vcs/tree'?['sessionId','repositoryId','commit'] : endpoint==='vcs/file-history'?['sessionId','repositoryId','commit','parentIndex','id','offset','limit','follow'] : ['vcs/revision-changes','vcs/revision-compare'].includes(endpoint) ? ['sessionId','repositoryId','base','target',...(endpoint==='vcs/revision-compare'?['id']:[])] : ['vcs/commit-compare','vcs/blame'].includes(endpoint) ? ['sessionId','repositoryId','commit','parentIndex','id',...(endpoint==='vcs/blame'?['startLine','lineLimit']:[])] : endpoint === 'vcs/commit' ? ['sessionId','repositoryId','commit','parentIndex'] : endpoint === 'vcs/history' ? ['sessionId','repositoryId','snapshot','offset','limit','search'] : endpoint === 'vcs/repositories' ? ['sessionId', 'subdirectory'] : ['sessionId', 'repositoryId', 'mode', ...(endpoint === 'vcs/compare' ? ['id'] : [])];
   if (Object.keys(payload).some(key => !fields.includes(key))) throw invalid('Only Session-addressed repository requests are supported; unknown payload field.');
   if (endpoint === 'vcs/repositories') {
     if (payload.subdirectory !== undefined) {
@@ -45,6 +45,8 @@ function validatePayload(endpoint, payload) {
       if(typeof payload.commit!=='string'||!/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(payload.commit))throw invalid('Invalid commit id.');
       if(payload.parentIndex!==undefined&&(!Number.isInteger(payload.parentIndex)||payload.parentIndex<0||payload.parentIndex>100))throw invalid('Invalid parent index.');
     }
+    if(endpoint==='vcs/blame'&&((payload.startLine!==undefined&&(!Number.isInteger(payload.startLine)||payload.startLine<1||payload.startLine>100001))||(payload.lineLimit!==undefined&&(!Number.isInteger(payload.lineLimit)||payload.lineLimit<1||payload.lineLimit>500))))throw invalid('Invalid blame line window.');
+    if(endpoint==='vcs/file-history'&&payload.follow!==undefined&&typeof payload.follow!=='boolean')throw invalid('Invalid rename follow mode.');
     if(endpoint==='vcs/history'){try{historySearchArgs(payload.search);}catch{throw invalid('Invalid history search.');}}
     if(['vcs/history','vcs/file-history'].includes(endpoint)){
       if(payload.offset===null||payload.limit===null)throw invalid('Invalid history pagination.');
@@ -132,9 +134,9 @@ export function createHandler(ctx, api = adapter, maxActive = 4, { now = Date.no
         : endpoint === 'vcs/tree'
         ? await api.getHistoricalTree({...repository},{commit:payload.commit,signal})
         : endpoint === 'vcs/blame'
-        ? await api.getFileBlame({...repository},{commit:payload.commit,parentIndex:payload.parentIndex??0,id:payload.id,signal})
+        ? await api.getFileBlame({...repository},{commit:payload.commit,parentIndex:payload.parentIndex??0,id:payload.id,...(payload.startLine!==undefined?{startLine:payload.startLine}:{}),...(payload.lineLimit!==undefined?{lineLimit:payload.lineLimit}:{}),signal})
         : endpoint === 'vcs/file-history'
-        ? await api.listFileHistory({...repository},{commit:payload.commit,parentIndex:payload.parentIndex??0,id:payload.id,offset:payload.offset??0,limit:payload.limit??50,signal})
+        ? await api.listFileHistory({...repository},{commit:payload.commit,parentIndex:payload.parentIndex??0,id:payload.id,offset:payload.offset??0,limit:payload.limit??50,...(payload.follow!==undefined?{follow:payload.follow}:{}),signal})
         : endpoint === 'vcs/revision-changes'
         ? await api.getRevisionChanges({...repository},{base:payload.base,target:payload.target,signal})
         : endpoint === 'vcs/revision-compare'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feng0531/dsh-vcs",
-  "version": "0.3.55",
+  "version": "0.3.57",
   "private": false,
   "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" },
   "type": "module",

package/vcs.mjs

@@ -1,6 +1,6 @@
 import {preparePng} from './image-preview.mjs';
 import { spawn } from 'node:child_process';
-import {parseHistory,HISTORY_FORMAT,historyPage,historySearchArgs,parseBlame,parseReferences,REFS_FORMAT} from './git-history.mjs';
+import {parseHistory,parseFollowHistory,HISTORY_FORMAT,historyPage,historySearchArgs,parseBlame,parseReferences,REFS_FORMAT} from './git-history.mjs';
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 import { createHash } from 'node:crypto';
@@ -331,28 +331,38 @@ export async function getCommitImage(repo,{commit,parentIndex=0,id,side='right',
  const {data,...metadata}=await preparePng(raw,{signal});
  return {commit:revision,path:file,oid,...metadata,base64:data.toString('base64')};
 }
-export async function getFileBlame(repo,{commit,parentIndex=0,id,signal}={}){
+export async function getFileBlame(repo,{commit,parentIndex=0,id,startLine=1,lineLimit=500,signal}={}){
+ if(!Number.isInteger(startLine)||startLine<1||startLine>100001||!Number.isInteger(lineLimit)||lineLimit<1||lineLimit>500)throw Error('Invalid blame line window');
  if(typeof id!=='string'||!/^[a-f0-9]{64}$/.test(id))throw new Error('Invalid historical change id');
  const details=await commitDetails(repo,{commit,parentIndex,signal});
  const entry=details.changes.find(row=>row.id===id);if(!entry)throw new Error('Change is not part of selected commit');
- const result={commit,path:entry.path,lines:[],truncated:false};
+ const result={commit,path:entry.path,lines:[],truncated:false,startLine,nextLine:null};
  if(entry.status==='deleted')return {...result,notice:'File is deleted at this commit; blame unavailable.'};
  const blob=await historicalBlob(repo.root,commit,entry.path,signal);
  if(blob.notice||blob.binary||blob.encoding!=='UTF-8')return {...result,notice:blob.notice||'Blame supports UTF-8 regular text only.'};
  if(!blob.text)return result;
- const count=blob.text.split('\n').length-(blob.text.endsWith('\n')?1:0),limit=Math.min(count,500);
+ const count=blob.text.split('\n').length-(blob.text.endsWith('\n')?1:0);
+ if(startLine>count)return {...result,totalLines:count};
+ const endLine=Math.min(count,startLine+lineLimit-1),limit=endLine-startLine+1;
  let ignored;
  try{ignored=(await git(repo.root,['config','--null','--get-all','blame.ignoreRevsFile'],MAX_TEXT,{signal})).toString('utf8');}catch(e){if(e.code!=='VCS_COMMAND'||e.exitCode!==1)throw e;}
  if(ignored?.split(String.fromCharCode(0)).some(value=>value.length>0))return {...result,notice:'Blame unavailable while blame.ignoreRevsFile is configured; external revision files are not read.'};
- const output=await git(repo.root,['--literal-pathspecs','blame','--ignore-revs-file=','--line-porcelain','--no-textconv','--encoding=UTF-8','-L','1,'+limit,commit,'--',entry.path],MAX_TEXT,{signal});
- return {...result,lines:parseBlame(output.toString('utf8'),limit),truncated:count>limit};
+ const output=await git(repo.root,['--literal-pathspecs','blame','--ignore-revs-file=','--line-porcelain','--no-textconv','--encoding=UTF-8','-L',startLine+','+endLine,commit,'--',entry.path],MAX_TEXT,{signal});
+ return {...result,lines:parseBlame(output.toString('utf8'),limit),totalLines:count,nextLine:endLine<count&&endLine<100001?endLine+1:null,truncated:endLine<count};
 }
-export async function listFileHistory(repo,{commit,parentIndex=0,id,offset=0,limit=50,signal}={}){
+export async function listFileHistory(repo,{commit,parentIndex=0,id,offset=0,limit=50,follow=false,signal}={}){
   if(!Number.isInteger(offset)||offset<0||offset>10000||!Number.isInteger(limit)||limit<1||limit>100)throw new Error('Invalid history pagination');
   if(typeof id!=='string'||!/^[a-f0-9]{64}$/.test(id))throw new Error('Invalid historical change id');
+  if(typeof follow!=='boolean')throw Error('Invalid rename follow mode');
   const details=await commitDetails(repo,{commit,parentIndex,signal});
   const entry=details.changes.find(row=>row.id===id);
   if(!entry)throw new Error('Change is not part of selected commit');
+  if(follow){
+   const count=offset+limit+1;
+   const output=await git(repo.root,['--literal-pathspecs','log','-z','--follow','--first-parent','--diff-merges=first-parent','--find-renames=100%','--name-status','--no-ext-diff','--no-textconv','--no-show-signature','--encoding=UTF-8','--max-count='+count,'--format='+HISTORY_FORMAT,commit,'--',entry.path],MAX_TEXT,{signal});
+   const rows=parseFollowHistory(output.toString('utf8'),entry.path,count).slice(offset);
+   return {...historyPage(rows,commit,offset,limit),path:entry.path,followsRenames:true,followPolicy:'exact-first-parent'};
+  }
   const text=await git(repo.root,['--literal-pathspecs','log','-z','--no-show-signature','--encoding=UTF-8','--topo-order','--max-count='+String(limit+1),'--skip='+String(offset),'--format='+HISTORY_FORMAT,commit,'--',entry.path],MAX_TEXT,{signal});
   return {...historyPage(parseHistory(text.toString('utf8'),limit+1),commit,offset,limit),path:entry.path,followsRenames:false};
 }