#208 fix broken tests and lint from merge

Author: F3l1x1vo

e2e/storage/file-operations.spec.ts

@@ -90,7 +90,7 @@ test.describe('Storage S3 — File Operations', () => {
 
       // Navigate into dest folder
       await rowByName(page, 'target').dblclick();
-      await expect(page).toHaveURL(new RegExp(`${encodeURIComponent('target')}/?$`));
+      await expect(page).toHaveURL(/target\/?(?:\?.*)?$/);
 
       // Paste (use keyboard shortcut — right-click in an empty folder
       // lands on the ".." row which has no context menu handler)
@@ -238,13 +238,14 @@ test.describe('Storage S3 — File Operations', () => {
     }
   });
 
-  test('rename conflict shows error inside modal', async ({ page }, testInfo) => {
+  test('rename conflict creates a uniquely named file', async ({ page }, testInfo) => {
     const credentials = requireGarageCredentials();
     const client = createS3Client(credentials);
     const prefix = uniquePrefix(testInfo, 'rename-conflict');
     const fileA = `${prefix}a.txt`;
     const fileB = `${prefix}b.txt`;
-    const cleanupKeys = [fileA, fileB];
+    const renamedFile = `${prefix}b (1).txt`;
+    const cleanupKeys = [fileA, fileB, renamedFile];
 
     try {
       await putTextObject(client, credentials.bucket, fileA, 'file a');
@@ -256,18 +257,15 @@ test.describe('Storage S3 — File Operations', () => {
       await rowByName(page, 'a.txt').click({ button: 'right' });
       await page.getByRole('menuitem', { name: 'Rename' }).click();
 
-      // Try to rename to b.txt (which exists)
+      // Rename to b.txt, preserving the existing file by assigning a unique name.
       const input = page.locator('.modal-box input');
       await input.fill('b.txt');
       await page.getByRole('button', { name: 'Rename' }).click();
 
-      // Modal should stay open and show conflict error
-      await expect(page.locator('.modal-box')).toBeVisible();
-      await expect(page.getByText(/already exists/i)).toBeVisible();
-
-      // Cancel the modal
-      await page.getByRole('button', { name: 'Cancel' }).click();
       await expect(page.locator('.modal-box')).not.toBeVisible();
+      await expect.poll(() => objectExists(client, credentials.bucket, fileA)).toBe(false);
+      await expect.poll(() => objectExists(client, credentials.bucket, fileB)).toBe(true);
+      await expect.poll(() => objectExists(client, credentials.bucket, renamedFile)).toBe(true);
     } finally {
       await deleteKnownKeys(client, credentials.bucket, cleanupKeys);
     }

playwright.config.ts

@@ -2,6 +2,7 @@ import { defineConfig } from '@playwright/test';
 import path from 'path';
 
 const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? 'http://localhost:4173';
+const appPort = new URL(baseURL).port || '80';
 const chromiumExecutablePath = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH;
 
 export default defineConfig({
@@ -35,6 +36,7 @@ export default defineConfig({
     },
     {
       command: 'node --env-file=.env.test build/index.js',
+      env: { PORT: appPort },
       url: baseURL,
       reuseExistingServer: false
     }

src/lib/editor/completion/completion-history.ts

@@ -46,17 +46,16 @@ function loadHistory(): HistoryStore {
     const parsed = JSON.parse(raw) as Partial<HistoryStore>;
     const fresh = emptyStore();
     for (const category of Object.keys(fresh) as HistoryCategory[]) {
-      // eslint-disable-next-line security/detect-object-injection
       const list = parsed[category];
       if (Array.isArray(list)) {
         // Sanitize: strings only, deduped, capped.
         const seen = new Set<string>();
         for (const name of list) {
           if (typeof name !== 'string' || seen.has(name)) continue;
           seen.add(name);
-          // eslint-disable-next-line security/detect-object-injection
+
           fresh[category].push(name);
-          // eslint-disable-next-line security/detect-object-injection
+
           if (fresh[category].length >= CAPS[category]) break;
         }
       }
@@ -85,13 +84,13 @@ function scheduleSave(): void {
  *  category. Moves it to the front of the LRU list and persists. */
 export function recordUse(category: HistoryCategory, name: string): void {
   const history = loadHistory();
-  // eslint-disable-next-line security/detect-object-injection
+
   const list = history[category];
   const index = list.indexOf(name);
   if (index === 0) return; // already at the head, nothing to do
   if (index > 0) list.splice(index, 1);
   list.unshift(name);
-  // eslint-disable-next-line security/detect-object-injection
+
   if (list.length > CAPS[category]) list.length = CAPS[category];
   scheduleSave();
 }
@@ -100,7 +99,7 @@ export function recordUse(category: HistoryCategory, name: string): void {
  *  present. The caller uses this to bias `sortText`. */
 export function rankOf(category: HistoryCategory, name: string): number | null {
   const history = loadHistory();
-  // eslint-disable-next-line security/detect-object-injection
+
   const index = history[category].indexOf(name);
   return index < 0 ? null : index;
 }

src/lib/editor/completion/cursor-context.ts

@@ -38,7 +38,6 @@ function partsToAlias(parts: string[]): RelationAlias | null {
 /** If `pos` points at an `(`, skip past the matching `)` and return the
  *  position after it. Otherwise return `pos` unchanged. */
 function skipOptionalParenGroup(tokens: Token[], pos: number): number {
-  // eslint-disable-next-line security/detect-object-injection
   if (tokens[pos]?.type !== LPAREN) return pos;
   return parenGroupEndPosition(tokens, pos).pos;
 }
@@ -52,7 +51,6 @@ function skipOptionalParenGroup(tokens: Token[], pos: number): number {
 function cursorScopeTokens(tokens: Token[], cursor: number): Token[] | null {
   let pos = 0;
   while (pos < tokens.length) {
-    // eslint-disable-next-line security/detect-object-injection
     if (tokens[pos].type !== LPAREN) {
       pos++;
       continue;
@@ -67,7 +65,7 @@ function cursorScopeTokens(tokens: Token[], cursor: number): Token[] | null {
     }
 
     const { pos: end, closed } = parenGroupEndPosition(tokens, pos);
-    // eslint-disable-next-line security/detect-object-injection
+
     const openChar = tokens[pos].start;
 
     // Cursor is inside this body if it's past the opening `(` and either
@@ -100,15 +98,15 @@ export function extractPrefixAtCursor(
 ): { prefixParts: string[]; wordAtCursor: string } {
   // Step 1: find the last token that starts before the cursor.
   let pos = tokens.length - 1;
-  // eslint-disable-next-line security/detect-object-injection
+
   while (pos >= 0 && tokens[pos].start >= cursorInStatement) pos--;
   if (pos < 0) return { prefixParts: [], wordAtCursor: '' };
 
   // Step 2: classify that token relative to the cursor. Three cases:
   //   A) cursor is inside/at the end of an identifier → that's the partial word
   //   B) cursor is immediately after a dot → no word yet, prefix continues
   //   C) cursor is attached to something else (keyword, operator) → no prefix
-  // eslint-disable-next-line security/detect-object-injection
+
   const last = tokens[pos];
   const lastEndExclusive = last.stop + 1;
   const cursorTouchesLast = lastEndExclusive >= cursorInStatement;
@@ -129,7 +127,7 @@ export function extractPrefixAtCursor(
 
   // Step 3: walk backwards through (DOT IDENTIFIER)* pairs.
   const prefixParts: string[] = [];
-  // eslint-disable-next-line security/detect-object-injection
+
   while (pos >= 1 && tokens[pos].type === DOT && IDENTIFIER_TOKENS.has(tokens[pos - 1].type)) {
     prefixParts.unshift(unquoteIdentifier(tokens[pos - 1].text ?? ''));
     pos -= 2;
@@ -173,7 +171,6 @@ export function extractAliasMap(
   const aliasMap = new Map<string, RelationAlias>();
 
   for (let pos = 0; pos < tokens.length; pos++) {
-    // eslint-disable-next-line security/detect-object-injection
     const token = tokens[pos];
 
     // FROM / JOIN <qualifiedName> [[AS] alias]
@@ -186,11 +183,10 @@ export function extractAliasMap(
         // Lowercase for case-insensitive lookup.
         aliasMap.set(alias.table.toLowerCase(), alias);
         // Optional [AS] <identifier> follows the name.
-        // eslint-disable-next-line security/detect-object-injection
+
         if (tokens[next]?.type === SqlBaseLexer.AS) next++;
-        // eslint-disable-next-line security/detect-object-injection
+
         if (tokens[next] && IDENTIFIER_TOKENS.has(tokens[next].type)) {
-          // eslint-disable-next-line security/detect-object-injection
           const aliasName = unquoteIdentifier(tokens[next].text ?? '');
           aliasMap.set(aliasName.toLowerCase(), alias);
           next++;
@@ -204,20 +200,19 @@ export function extractAliasMap(
     // the JSDoc for why the body is skipped).
     if (token.type === SqlBaseLexer.WITH) {
       let next = pos + 1;
-      // eslint-disable-next-line security/detect-object-injection
+
       while (next < tokens.length && IDENTIFIER_TOKENS.has(tokens[next].type)) {
-        // eslint-disable-next-line security/detect-object-injection
         const cteName = unquoteIdentifier(tokens[next].text ?? '');
         aliasMap.set(cteName.toLowerCase(), { table: cteName });
         next++;
 
         next = skipOptionalParenGroup(tokens, next); // optional column list
-        // eslint-disable-next-line security/detect-object-injection
+
         if (tokens[next]?.type === SqlBaseLexer.AS) next++;
         next = skipOptionalParenGroup(tokens, next); // CTE body
 
         // Comma means another CTE follows; anything else ends the WITH list.
-        // eslint-disable-next-line security/detect-object-injection
+
         if (tokens[next]?.type !== COMMA) break;
         next++;
       }

src/lib/editor/completion/grammar-analysis.ts

@@ -63,7 +63,6 @@ const LITERAL_NAMES = (SqlBaseLexer as unknown as { literalNames: (string | null
 /** Map a keyword token type back to its canonical uppercase spelling.
  *  `literalNames` entries look like `"'SELECT'"` (SQL single-quoted). */
 function keywordForToken(tokenType: number): string | null {
-  // eslint-disable-next-line security/detect-object-injection
   const literal = LITERAL_NAMES[tokenType];
   if (!literal) return null;
   const match = /^'(.+)'$/.exec(literal);
@@ -159,7 +158,6 @@ function parseAndAnalyse(sql: string, extendingPrevious: boolean): GrammarAnalys
 function lastDefaultChannelTokenIndex(parser: SqlBaseParser): number {
   const tokens = (parser.inputStream as CommonTokenStream).getTokens();
   for (let i = tokens.length - 1; i >= 0; i--) {
-    // eslint-disable-next-line security/detect-object-injection
     const token = tokens[i];
     if (token.channel === Token.DEFAULT_CHANNEL && token.type !== SqlBaseLexer.EOF) {
       return token.tokenIndex;

src/lib/editor/format-json.ts

@@ -5,7 +5,6 @@ export function repairTruncatedJson(text: string): string {
   const openBrackets: string[] = [];
 
   for (let i = 0; i < result.length; i++) {
-    // eslint-disable-next-line security/detect-object-injection
     const ch = result[i];
     if (escape) {
       escape = false;
@@ -41,7 +40,6 @@ export function repairTruncatedJson(text: string): string {
   }
 
   for (let i = openBrackets.length - 1; i >= 0; i--) {
-    // eslint-disable-next-line security/detect-object-injection
     result += openBrackets[i] === '{' ? '}' : ']';
   }
 
@@ -55,7 +53,6 @@ export function stripIncompleteTail(json: string): string {
   let lastComma = -1;
 
   for (let i = json.length - 1; i >= 0; i--) {
-    // eslint-disable-next-line security/detect-object-injection
     const ch = json[i];
     if (esc) {
       esc = false;

src/lib/editor/lexer-utils.test.ts

@@ -8,13 +8,12 @@ import { DOT, LPAREN, RPAREN, COMMA, lexSql, readQualifiedName } from './lexer-u
 describe('implicit token constants match the generated grammar', () => {
   const names = SqlBaseLexer.literalNames;
 
-  // eslint-disable-next-line security/detect-object-injection
   it('DOT is "."', () => expect(names[DOT]).toBe("'.'"));
-  // eslint-disable-next-line security/detect-object-injection
+
   it('LPAREN is "("', () => expect(names[LPAREN]).toBe("'('"));
-  // eslint-disable-next-line security/detect-object-injection
+
   it('RPAREN is ")"', () => expect(names[RPAREN]).toBe("')'"));
-  // eslint-disable-next-line security/detect-object-injection
+
   it('COMMA is ","', () => expect(names[COMMA]).toBe("','"));
 });
 

src/lib/editor/lexer-utils.ts

@@ -46,9 +46,7 @@ export function parenGroupEndPosition(
   let depth = 1;
   let pos = start + 1;
   while (pos < tokens.length && depth > 0) {
-    // eslint-disable-next-line security/detect-object-injection
     if (tokens[pos].type === LPAREN) depth++;
-    // eslint-disable-next-line security/detect-object-injection
     else if (tokens[pos].type === RPAREN) depth--;
     pos++;
   }
@@ -76,15 +74,13 @@ export function readQualifiedName(
   const parts: string[] = [];
   let pos = start;
 
-  // eslint-disable-next-line security/detect-object-injection
   while (pos < tokens.length && IDENTIFIER_TOKENS.has(tokens[pos].type)) {
-    // eslint-disable-next-line security/detect-object-injection
     parts.push(unquoteIdentifier(tokens[pos].text ?? ''));
     pos++;
 
     // Continue only when a `DOT IDENTIFIER` pair follows. Anything else
     // (end of input, trailing dot, different token) ends the name.
-    // eslint-disable-next-line security/detect-object-injection
+
     const dotFollows = tokens[pos]?.type === DOT;
     const identAfterDot =
       tokens[pos + 1] !== undefined && IDENTIFIER_TOKENS.has(tokens[pos + 1].type);

src/lib/editor/split-statements.ts

@@ -46,7 +46,6 @@ export function splitStatements(sql: string): SqlStatement[] {
   let depth = 0;
 
   for (let i = 0; i < tokens.length; i++) {
-    // eslint-disable-next-line security/detect-object-injection
     const token = tokens[i];
     const type = token.type;
 
@@ -111,9 +110,7 @@ export function getStatementAtOffset(sql: string, offset: number): SqlStatement
   // If cursor is between statements (on whitespace/semicolons), return the
   // previous statement so the user targets what they just finished typing.
   for (let i = statements.length - 1; i >= 0; i--) {
-    // eslint-disable-next-line security/detect-object-injection
     if (statements[i].endOffset <= offset) {
-      // eslint-disable-next-line security/detect-object-injection
       return statements[i];
     }
   }

src/lib/server/migrations/0000_initial_schema.sql

@@ -65,4 +65,4 @@ ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("
 CREATE INDEX "user_id_idx" ON "user_storage_connections" USING btree ("user_id");--> statement-breakpoint
 CREATE INDEX "account_userId_idx" ON "account" USING btree ("user_id");--> statement-breakpoint
 CREATE INDEX "session_userId_idx" ON "session" USING btree ("user_id");--> statement-breakpoint
-CREATE INDEX "verification_identifier_idx" ON "verification" USING btree ("identifier");
+CREATE INDEX "verification_identifier_idx" ON "verification" USING btree ("identifier");