repoburg 1.3.9 → 1.3.10

package/backend/package.json

@@ -13,7 +13,7 @@
     "start:debug": "nest start --debug --watch",
     "start:prod": "NODE_ENV=production node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest --bail",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --bail",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
@@ -57,7 +57,10 @@
       "json",
       "ts"
     ],
-    "rootDir": "src",
+    "roots": [
+      "<rootDir>/src",
+      "<rootDir>/packages"
+    ],
     "testRegex": ".*\\.spec\\.ts$",
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
@@ -65,7 +68,7 @@
     "collectCoverageFrom": [
       "**/*.(t|j)s"
     ],
-    "coverageDirectory": "../coverage",
+    "coverageDirectory": "coverage",
     "testEnvironment": "node"
   }
 }

package/backend/packages/tokenpatch/index.spec.ts

@@ -0,0 +1,579 @@
+import { applySnippetPatch } from './index';
+import * as path from 'path';
+
+const TS_WASM_PATH = path.join(
+  __dirname,
+  './grammar/tree-sitter-typescript.wasm',
+);
+
+const TSX_WASM_PATH = path.join(__dirname, './grammar/tree-sitter-tsx.wasm');
+
+// Helper to normalize whitespace for robust comparison
+const normalize = (str: string) => str.replace(/\s+/g, ' ').trim();
+
+describe('applySnippetPatch', () => {
+  it('should replace a method body in a class by automatically finding anchor size', async () => {
+    const sourceCode = `
+class Greeter {
+  greet() {
+    return "Hello, world";
+  }
+  
+  fc(){ return 42; }
+}
+`;
+    const patchCode = `
+  greet() {
+    // A new implementation
+    return "Hello, TypeScript!";
+  }
+  fc(){
+`;
+    const expectedResult = `
+class Greeter {
+  greet() {
+    // A new implementation
+    return "Hello, TypeScript!";
+  }
+    fc(){ return 42; }
+
+}
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should replace a data structure definition', async () => {
+    const sourceCode = `
+interface MyData {
+  field1: string;
+}
+console.log("hello");
+`;
+    const patchCode = `
+interface MyData {
+  field1: number;
+  field2: boolean;
+}
+`;
+    const expectedResult = `
+interface MyData {
+  field1: number;
+  field2: boolean;
+}
+console.log("hello");
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should replace a full function definition', async () => {
+    const sourceCode = `
+import fs from 'fs';
+
+function calculate() {
+  return 1 + 1;
+}
+
+export { calculate };
+`;
+    const patchCode = `
+function calculate() {
+  // A more complex calculation
+  const result = 2 * 2;
+  return result;
+}
+`;
+    const expectedResult = `
+import fs from 'fs';
+
+function calculate() {
+  // A more complex calculation
+  const result = 2 * 2;
+  return result;
+}
+
+export { calculate };
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should replace a beginning of the file @begin-of-file', async () => {
+    const sourceCode = `
+import { ModuleA } from './moduleA';
+import { ModuleB } from './moduleB';
+
+console.log('starting up');
+`;
+    const patchCode = `
+// @begin-of-file
+import groupBy from  'lodash'; 
+import { ModuleA } from './moduleA';
+`;
+    const expectedResult = `
+import groupBy from  'lodash'; 
+import { ModuleA } from './moduleA';
+import { ModuleB } from './moduleB';
+
+console.log('starting up');
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should handle @begin-of-file marker with variations', async () => {
+    const sourceCode = `
+import { ModuleA } from './moduleA';
+import { ModuleB } from './moduleB';
+
+console.log('starting up');
+`;
+    const patchCode = `
+//@begin-of-file extra text
+import groupBy from  'lodash'; 
+import { ModuleA } from './moduleA';
+`;
+    const expectedResult = `
+import groupBy from  'lodash'; 
+import { ModuleA } from './moduleA';
+import { ModuleB } from './moduleB';
+
+console.log('starting up');
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should replace a end of the file @end-of-file', async () => {
+    const sourceCode = `
+import fs from 'fs';
+
+function calculate() {
+  return 1 + 1;
+}
+
+export { calculate };
+`;
+    const patchCode = `
+export { calculate };
+export { sum };
+// @end-of-file
+`;
+    const expectedResult = `
+import fs from 'fs';
+
+function calculate() {
+  return 1 + 1;
+}
+
+export { calculate };
+export { sum };
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should handle @end-of-file marker with variations', async () => {
+    const sourceCode = `
+import fs from 'fs';
+
+function calculate() {
+  return 1 + 1;
+}
+
+export { calculate };
+`;
+    const patchCode = `
+export { calculate };
+export { sum };
+//@end-of-file some extra text
+`;
+    const expectedResult = `
+import fs from 'fs';
+
+function calculate() {
+  return 1 + 1;
+}
+
+export { calculate };
+export { sum };
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+  it('should succeed with dynamic anchor sizing when initial anchors are ambiguous', async () => {
+    const sourceCode = `
+const config = {
+    port: 8080,
+    host: 'localhost',
+};
+
+function connect() {
+    // uses config
+}
+
+const config2 = {
+    port: 3000,
+    host: 'remote',
+};
+`;
+    const patchCode = `
+const config = {
+    port: 9000,
+    host: 'localhost',
+    protocol: 'https'
+};
+
+function connect() {
+`;
+    const expectedResult = `
+const config = {
+    port: 9000,
+    host: 'localhost',
+    protocol: 'https'
+};
+
+function connect() {
+    // uses config
+}
+
+const config2 = {
+    port: 3000,
+    host: 'remote',
+};
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should handle partial type definitions by trimming ambiguous tokens', async () => {
+    const sourceCode = `
+    /**
+     * Bill date of the vendor bill
+     */
+    billDate: everest_appserver_primitive_PlainDate;
+    billNumber: everest_appserver_primitive_Text;
+    businessPartnerId: everest_appserver_primitive_ID;
+    /**
+     * Conditionally return status or paymentStatus
+     */
+    combinedStatus?: everest_appserver_primitive_Text | null;
+    /**
+     * Contains Billable Expense line
+     */
+    containsBillableItem?: everest_appserver_primitive_TrueFalse | null;
+    /**
+     * Denotes whether bill type is prepaid or not
+     */
+    containsPrepaidItem?: everest_appserver_primitive_TrueFalse | null;
+`;
+    const patchCode = `
+    businessPartnerId: everest_appserver_primitive_ID;
+    /**
+     * Conditionally return status or paymentStatus
+     */
+    combinedStatusNew2?: everest_appserver_primitive_Text | null;
+    /**
+`;
+    const expectedResult = `
+    /**
+     * Bill date of the vendor bill
+     */
+    billDate: everest_appserver_primitive_PlainDate;
+    billNumber: everest_appserver_primitive_Text;
+    businessPartnerId: everest_appserver_primitive_ID;
+    /**
+     * Conditionally return status or paymentStatus
+     */
+    combinedStatusNew2?: everest_appserver_primitive_Text | null;
+    /**
+     * Contains Billable Expense line
+     */
+    containsBillableItem?: everest_appserver_primitive_TrueFalse | null;
+    /**
+     * Denotes whether bill type is prepaid or not
+     */
+    containsPrepaidItem?: everest_appserver_primitive_TrueFalse | null;
+`;
+    const result = await applySnippetPatch(sourceCode, patchCode, TS_WASM_PATH);
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+
+  it('should patch TSX correctly by trimming tokens from invalid partial snippets', async () => {
+    const sourceCode = `
+    import { useEffect, useMemo } from "react"
+import { trpc } from "@/lib/trpc"
+
+import { Button } from "@/components/ui/button"
+import { DataTable } from "@/components/ui/data-table"
+import { useReconciliationStore } from "@/store/reconciliation"
+
+import {
+  getBillColumns,
+  getInvoiceColumns,
+  getMatchedColumns,
+  getTransactionColumns,
+} from "./transactions-columns"
+
+export function TransactionsPage() {
+  const {
+    transactions,
+    invoices,
+    matchedItems,
+    selectedTransactionId,
+    selectedMatchableId,
+    loadInitialData,
+    selectTransaction,
+    selectMatchable,
+    matchItems,
+    unmatchItems,
+  } = useReconciliationStore()
+  const { data: bills = [] } = trpc.bills.getBills.useQuery()
+
+  // Load mock data when component mounts
+  useEffect(() => {
+    loadInitialData()
+  }, [loadInitialData])
+
+  const selectedTransaction =
+    transactions.find((t) => t.id === selectedTransactionId) || null
+
+  const transactionColumns = useMemo(() => getTransactionColumns(), [])
+
+  const invoiceColumns = useMemo(() => getInvoiceColumns(), [])
+
+  const billColumns = useMemo(() => getBillColumns(), [])
+
+  const matchedColumns = useMemo(
+    () =>
+      getMatchedColumns({
+        onUnmatch: unmatchItems,
+      }),
+    [unmatchItems]
+  )
+
+  const canMatch = selectedTransactionId && selectedMatchableId
+
+  return (
+    <div>
+      <div className="flex justify-between items-center mb-4">
+        <h2 className="text-2xl font-bold">Transaction Matching</h2>
+        <Button onClick={matchItems} disabled={!canMatch}>
+          Match Items
+        </Button>
+      </div>
+
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
+        {/* Left Panel: Bank Transactions */}
+        <div>
+          <h3 className="text-lg font-semibold mb-2">Bank Transactions</h3>
+          <p className="text-sm text-muted-foreground mb-4">
+            Select a transaction to begin matching.
+          </p>
+          <DataTable
+            columns={transactionColumns}
+            data={transactions}
+            onRowClick={(row) => selectTransaction(row.id)}
+            selectedId={selectedTransactionId}
+          />
+        </div>
+
+        {/* Right Panel: Matching Items */}
+        <div>
+          <h3 className="text-lg font-semibold mb-2">Potential Matches</h3>
+          {!selectedTransaction ? (
+            <div className="h-full flex items-center justify-center rounded-lg border-2 border-dashed border-muted-foreground/30 p-8">
+              <p className="text-muted-foreground">
+                Select a transaction to see potential matches.
+              </p>
+            </div>
+          ) : selectedTransaction.amount > 0 ? (
+            <div>
+              <h4 className="text-md font-semibold mb-2 text-muted-foreground">
+                Unpaid Invoices
+              </h4>
+              <DataTable
+                columns={invoiceColumns}
+                data={invoices}
+                onRowClick={(row) => selectMatchable(row.id)}
+                selectedId={selectedMatchableId}
+              />
+            </div>
+          ) : (
+            <div>
+              <h4 className="text-md font-semibold mb-2 text-muted-foreground">
+                Unpaid Bills
+              </h4>
+              <DataTable
+                columns={billColumns}
+                data={bills}
+                onRowClick={(row) => selectMatchable(row.id)}
+                selectedId={selectedMatchableId}
+              />
+            </div>
+          )}
+        </div>
+      </div>
+
+      {matchedItems.length > 0 && (
+        <div className="mt-12">
+          <h3 className="text-lg font-semibold mb-2">Matched Transactions</h3>
+          <DataTable columns={matchedColumns} data={matchedItems} />
+        </div>
+      )}
+    </div>
+  )
+}
+`;
+    const patchCode = `
+Unpaid Bills
+              </h4>
+              <DataTable
+                columns={billColumns}
+                data={bills}
+                onRowClick={(row) => {
+                  console.log(\`[UI] Selected matchable bill ID\`)
+                  selectMatchable(row.id)
+                }}
+                selectedId={selectedMatchableId}
+              />
+            </div>
+          )}
+`;
+    const expectedResult = `
+    import { useEffect, useMemo } from "react"
+import { trpc } from "@/lib/trpc"
+
+import { Button } from "@/components/ui/button"
+import { DataTable } from "@/components/ui/data-table"
+import { useReconciliationStore } from "@/store/reconciliation"
+
+import {
+  getBillColumns,
+  getInvoiceColumns,
+  getMatchedColumns,
+  getTransactionColumns,
+} from "./transactions-columns"
+
+export function TransactionsPage() {
+  const {
+    transactions,
+    invoices,
+    matchedItems,
+    selectedTransactionId,
+    selectedMatchableId,
+    loadInitialData,
+    selectTransaction,
+    selectMatchable,
+    matchItems,
+    unmatchItems,
+  } = useReconciliationStore()
+  const { data: bills = [] } = trpc.bills.getBills.useQuery()
+
+  // Load mock data when component mounts
+  useEffect(() => {
+    loadInitialData()
+  }, [loadInitialData])
+
+  const selectedTransaction =
+    transactions.find((t) => t.id === selectedTransactionId) || null
+
+  const transactionColumns = useMemo(() => getTransactionColumns(), [])
+
+  const invoiceColumns = useMemo(() => getInvoiceColumns(), [])
+
+  const billColumns = useMemo(() => getBillColumns(), [])
+
+  const matchedColumns = useMemo(
+    () =>
+      getMatchedColumns({
+        onUnmatch: unmatchItems,
+      }),
+    [unmatchItems]
+  )
+
+  const canMatch = selectedTransactionId && selectedMatchableId
+
+  return (
+    <div>
+      <div className="flex justify-between items-center mb-4">
+        <h2 className="text-2xl font-bold">Transaction Matching</h2>
+        <Button onClick={matchItems} disabled={!canMatch}>
+          Match Items
+        </Button>
+      </div>
+
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
+        {/* Left Panel: Bank Transactions */}
+        <div>
+          <h3 className="text-lg font-semibold mb-2">Bank Transactions</h3>
+          <p className="text-sm text-muted-foreground mb-4">
+            Select a transaction to begin matching.
+          </p>
+          <DataTable
+            columns={transactionColumns}
+            data={transactions}
+            onRowClick={(row) => selectTransaction(row.id)}
+            selectedId={selectedTransactionId}
+          />
+        </div>
+
+        {/* Right Panel: Matching Items */}
+        <div>
+          <h3 className="text-lg font-semibold mb-2">Potential Matches</h3>
+          {!selectedTransaction ? (
+            <div className="h-full flex items-center justify-center rounded-lg border-2 border-dashed border-muted-foreground/30 p-8">
+              <p className="text-muted-foreground">
+                Select a transaction to see potential matches.
+              </p>
+            </div>
+          ) : selectedTransaction.amount > 0 ? (
+            <div>
+              <h4 className="text-md font-semibold mb-2 text-muted-foreground">
+                Unpaid Invoices
+              </h4>
+              <DataTable
+                columns={invoiceColumns}
+                data={invoices}
+                onRowClick={(row) => selectMatchable(row.id)}
+                selectedId={selectedMatchableId}
+              />
+            </div>
+          ) : (
+            <div>
+              <h4 className="text-md font-semibold mb-2 text-muted-foreground">
+                Unpaid Bills
+              </h4>
+              <DataTable
+                columns={billColumns}
+                data={bills}
+                onRowClick={(row) => {
+                  console.log(\`[UI] Selected matchable bill ID\`)
+                  selectMatchable(row.id)
+                }}
+                selectedId={selectedMatchableId}
+              />
+            </div>
+          )}
+        </div>
+      </div>
+
+      {matchedItems.length > 0 && (
+        <div className="mt-12">
+          <h3 className="text-lg font-semibold mb-2">Matched Transactions</h3>
+          <DataTable columns={matchedColumns} data={matchedItems} />
+        </div>
+      )}
+    </div>
+  )
+}
+`;
+    const result = await applySnippetPatch(
+      sourceCode,
+      patchCode,
+      TSX_WASM_PATH,
+    );
+    expect(normalize(result)).toEqual(normalize(expectedResult));
+  });
+});

package/backend/packages/tokenpatch/index.ts

@@ -0,0 +1,80 @@
+import { initializeParser } from './parser';
+import { collectTokens } from './tokens';
+import {
+  handleBeginOfFilePatch,
+  handleEndOfFilePatch,
+  handleStandardPatch,
+} from './patcher';
+
+export async function applySnippetPatch(
+  sourceCode: string,
+  patchCode: string,
+  grammarPath: string,
+): Promise<string> {
+  const parser = await initializeParser(grammarPath);
+
+  const sourceTree = parser.parse(sourceCode);
+  if (!sourceTree) {
+    throw new Error('Failed to parse source code.');
+  }
+  const sourceTokens = collectTokens(sourceTree, sourceCode);
+
+  let patchResult: {
+    replaceStart: number;
+    replaceEnd: number;
+    patchInsertStart: number;
+    patchInsertEnd: number;
+  };
+  let processedPatchCode = patchCode;
+
+  const beginOfFileRegex = /\/\/\s*@begin-of-file.*/;
+  const endOfFileRegex = /\/\/\s*@end-of-file.*/;
+
+  const hasBeginOfFile = beginOfFileRegex.test(patchCode);
+  const hasEndOfFile = endOfFileRegex.test(patchCode);
+
+  if (hasBeginOfFile) {
+    processedPatchCode = patchCode.replace(beginOfFileRegex, '');
+    const patchTree = parser.parse(processedPatchCode);
+    if (!patchTree) {
+      throw new Error('Failed to parse patch code.');
+    }
+    const patchTokens = collectTokens(patchTree, processedPatchCode).filter(
+      (t) => t.text !== '',
+    );
+    patchResult = handleBeginOfFilePatch(sourceTokens, patchTokens);
+  } else if (hasEndOfFile) {
+    processedPatchCode = patchCode.replace(endOfFileRegex, '');
+    const patchTree = parser.parse(processedPatchCode);
+    if (!patchTree) {
+      throw new Error('Failed to parse patch code.');
+    }
+    const patchTokens = collectTokens(patchTree, processedPatchCode).filter(
+      (t) => t.text !== '',
+    );
+    patchResult = handleEndOfFilePatch(sourceTokens, patchTokens, sourceCode);
+  } else {
+    processedPatchCode = patchCode.trim();
+    const patchTree = parser.parse(processedPatchCode);
+    if (!patchTree) {
+      throw new Error('Failed to parse patch code.');
+    }
+    const patchTokens = collectTokens(patchTree, processedPatchCode).filter(
+      (t) => t.text !== '',
+    );
+    patchResult = handleStandardPatch(sourceTokens, patchTokens);
+  }
+
+  // NOTE: replaceStart/End are byte offsets.
+  // If your code can contain non-ASCII characters, you need to
+  // map byte offsets to JS string indices. For pure ASCII, this
+  // works as-is.
+  const prefix = sourceCode.slice(0, patchResult.replaceStart);
+  const suffix = sourceCode.slice(patchResult.replaceEnd);
+  const finalPatchContent = processedPatchCode.slice(
+    patchResult.patchInsertStart,
+    patchResult.patchInsertEnd,
+  );
+
+  return prefix + finalPatchContent + suffix;
+}

package/backend/packages/tokenpatch/parser.ts

@@ -0,0 +1,18 @@
+// import Parser from 'web-tree-sitter';
+
+// Cache parsers by grammar path to avoid re-initialization.
+import { Language, Parser } from 'web-tree-sitter';
+
+const parsers = new Map<string, Parser>();
+
+export async function initializeParser(grammarPath: string): Promise<Parser> {
+  if (parsers.has(grammarPath)) {
+    return parsers.get(grammarPath)!;
+  }
+  await Parser.init();
+  const newParser = new Parser();
+  const language = await Language.load(grammarPath);
+  newParser.setLanguage(language);
+  parsers.set(grammarPath, newParser);
+  return newParser;
+}