@getjack/jack 0.1.33 → 0.1.35

package/src/lib/services/storage-config.ts

@@ -3,6 +3,12 @@
  */
 
 import { existsSync } from "node:fs";
+import {
+	addSectionBeforeClosingBrace,
+	findLastObjectEndInArray,
+	findMatchingBracket,
+	isOnlyCommentsAndWhitespace,
+} from "../jsonc-edit.ts";
 import { parseJsonc } from "../jsonc.ts";
 
 export interface R2BindingConfig {
@@ -167,315 +173,7 @@ function appendToR2BucketsArray(content: string, bindingJson: string): string {
  * Inserts before the final closing brace.
  */
 function addR2BucketsSection(content: string, bindingJson: string): string {
-	// Find the last closing brace in the file
-	const lastBraceIndex = content.lastIndexOf("}");
-	if (lastBraceIndex === -1) {
-		throw new Error("Invalid JSON: no closing brace found");
-	}
-
-	// Check what comes before the last brace to determine if we need a comma
-	const beforeBrace = content.slice(0, lastBraceIndex);
-	const needsComma = shouldAddCommaBefore(beforeBrace);
-
-	// Build the r2_buckets section
-	const r2Section = `"r2_buckets": [
-		${bindingJson}
-	]`;
-
-	// Find proper insertion point - look for last non-whitespace content
-	const trimmedBefore = beforeBrace.trimEnd();
-
-	let insertion: string;
-	if (needsComma) {
-		insertion = `,\n\t${r2Section}`;
-	} else {
-		insertion = `\n\t${r2Section}`;
-	}
-
-	// Reconstruct: content before + insertion + newline + closing brace
-	return trimmedBefore + insertion + "\n" + content.slice(lastBraceIndex);
-}
-
-/**
- * Find the matching closing bracket/brace for an opening one
- */
-function findMatchingBracket(
-	content: string,
-	startIndex: number,
-	openChar: string,
-	closeChar: string,
-): number {
-	let depth = 0;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		// Handle line comments
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		// Handle block comments
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		// Handle strings
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		// Check for comment start
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		// Check for string start
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		// Track bracket depth
-		if (char === openChar) {
-			depth++;
-		} else if (char === closeChar) {
-			depth--;
-			if (depth === 0) {
-				return i;
-			}
-		}
-	}
-
-	return -1;
-}
-
-/**
- * Check if content is only whitespace and comments
- */
-function isOnlyCommentsAndWhitespace(content: string): boolean {
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = 0; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (!/\s/.test(char)) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/**
- * Find the last closing brace of an object within an array range
- */
-function findLastObjectEndInArray(content: string, startIndex: number, endIndex: number): number {
-	let lastBraceIndex = -1;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < endIndex; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "}") {
-			lastBraceIndex = i;
-		}
-	}
-
-	return lastBraceIndex;
-}
-
-/**
- * Determine if we need to add a comma before new content.
- * Looks at the last non-whitespace, non-comment character.
- */
-function shouldAddCommaBefore(content: string): boolean {
-	// Strip trailing comments and whitespace to find last meaningful char
-	let i = content.length - 1;
-
-	// First pass: find where any trailing line comment starts
-	for (let j = content.length - 1; j >= 0; j--) {
-		if (content[j] === "\n") {
-			// Check if there's a // comment on this line
-			const lineStart = content.lastIndexOf("\n", j - 1) + 1;
-			const line = content.slice(lineStart, j);
-			const commentIndex = findLineCommentStart(line);
-			if (commentIndex !== -1) {
-				i = lineStart + commentIndex - 1;
-			}
-			break;
-		}
-	}
-
-	// Skip whitespace
-	while (i >= 0 && /\s/.test(content[i] ?? "")) {
-		i--;
-	}
-
-	if (i < 0) return false;
-
-	const lastChar = content[i];
-	// Need comma if last char is }, ], ", number, or identifier char
-	// Don't need comma if last char is { or [ or ,
-	return lastChar !== "{" && lastChar !== "[" && lastChar !== ",";
-}
-
-/**
- * Find the start of a line comment (//) in a string, respecting strings
- */
-function findLineCommentStart(line: string): number {
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-
-	for (let i = 0; i < line.length - 1; i++) {
-		const char = line[i] ?? "";
-		const next = line[i + 1] ?? "";
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			return i;
-		}
-	}
-
-	return -1;
+	return addSectionBeforeClosingBrace(content, `"r2_buckets": [\n\t\t${bindingJson}\n\t]`);
 }
 
 /**

package/src/lib/services/storage-create.ts

@@ -9,6 +9,7 @@ import { $ } from "bun";
 import { createProjectResource } from "../control-plane.ts";
 import { readProjectLink } from "../project-link.ts";
 import { getProjectNameFromDir } from "../storage/index.ts";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import {
 	addR2Binding,
 	generateBucketName,
@@ -103,7 +104,7 @@ export async function createStorageBucket(
 	const projectName = await getProjectNameFromDir(projectDir);
 
 	// Get existing R2 bindings to determine naming
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir) ?? join(projectDir, "wrangler.jsonc");
 	const existingBindings = await getExistingR2Bindings(wranglerPath);
 	const existingCount = existingBindings.length;
 

package/src/lib/services/storage-delete.ts

@@ -8,6 +8,7 @@ import { join } from "node:path";
 import { $ } from "bun";
 import { deleteProjectResource, fetchProjectResources } from "../control-plane.ts";
 import { readProjectLink } from "../project-link.ts";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { getExistingR2Bindings, removeR2Binding } from "./storage-config.ts";
 
 export interface DeleteStorageBucketResult {
@@ -49,9 +50,9 @@ export async function deleteStorageBucket(
 		throw new Error("Not in a jack project. Run 'jack new' to create a project.");
 	}
 
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir) ?? join(projectDir, "wrangler.jsonc");
 
-	// Verify bucket exists in wrangler.jsonc
+	// Verify bucket exists in wrangler config
 	const bindings = await getExistingR2Bindings(wranglerPath);
 	const binding = bindings.find((b) => b.bucket_name === bucketName);
 

package/src/lib/services/storage-info.ts

@@ -9,6 +9,7 @@ import { join } from "node:path";
 import { $ } from "bun";
 import { fetchProjectResources } from "../control-plane.ts";
 import { readProjectLink } from "../project-link.ts";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { getExistingR2Bindings } from "./storage-config.ts";
 
 export interface StorageBucketInfo {
@@ -46,7 +47,7 @@ export async function getStorageBucketInfo(
 	projectDir: string,
 	bucketName?: string,
 ): Promise<StorageBucketInfo | null> {
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir) ?? join(projectDir, "wrangler.jsonc");
 
 	// Read deploy mode from .jack/project.json
 	const link = await readProjectLink(projectDir);

package/src/lib/services/storage-list.ts

@@ -5,7 +5,7 @@
  * For managed projects, fetches metadata via control plane instead of wrangler.
  */
 
-import { join } from "node:path";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { getExistingR2Bindings } from "./storage-config.ts";
 
 export interface StorageBucketListEntry {
@@ -23,9 +23,12 @@ export interface StorageBucketListEntry {
  * the configured bindings. For detailed info, use storage info.
  */
 export async function listStorageBuckets(projectDir: string): Promise<StorageBucketListEntry[]> {
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir);
+	if (!wranglerPath) {
+		return [];
+	}
 
-	// Get existing R2 bindings from wrangler.jsonc
+	// Get existing R2 bindings from wrangler config
 	const bindings = await getExistingR2Bindings(wranglerPath);
 
 	if (bindings.length === 0) {

package/src/lib/services/vectorize-config.ts

@@ -3,6 +3,12 @@
  */
 
 import { existsSync } from "node:fs";
+import {
+	addSectionBeforeClosingBrace,
+	findLastObjectEndInArray,
+	findMatchingBracket,
+	isOnlyCommentsAndWhitespace,
+} from "../jsonc-edit.ts";
 import { parseJsonc } from "../jsonc.ts";
 
 export interface VectorizeBindingConfig {
@@ -132,28 +138,7 @@ function appendToVectorizeArray(content: string, bindingJson: string): string {
  * Add a new vectorize section to the config.
  */
 function addVectorizeSection(content: string, bindingJson: string): string {
-	const lastBraceIndex = content.lastIndexOf("}");
-	if (lastBraceIndex === -1) {
-		throw new Error("Invalid JSON: no closing brace found");
-	}
-
-	const beforeBrace = content.slice(0, lastBraceIndex);
-	const needsComma = shouldAddCommaBefore(beforeBrace);
-
-	const vecSection = `"vectorize": [
-		${bindingJson}
-	]`;
-
-	const trimmedBefore = beforeBrace.trimEnd();
-
-	let insertion: string;
-	if (needsComma) {
-		insertion = `,\n\t${vecSection}`;
-	} else {
-		insertion = `\n\t${vecSection}`;
-	}
-
-	return trimmedBefore + insertion + "\n" + content.slice(lastBraceIndex);
+	return addSectionBeforeClosingBrace(content, `"vectorize": [\n\t\t${bindingJson}\n\t]`);
 }
 
 /**
@@ -276,248 +261,6 @@ function removeVectorizeProperty(content: string, propertyStart: number, arrayEn
 	return content.slice(0, removeStart) + content.slice(removeEnd);
 }
 
-// Helper functions (same as in wrangler-config.ts)
-
-function findMatchingBracket(
-	content: string,
-	startIndex: number,
-	openChar: string,
-	closeChar: string,
-): number {
-	let depth = 0;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === openChar) {
-			depth++;
-		} else if (char === closeChar) {
-			depth--;
-			if (depth === 0) return i;
-		}
-	}
-
-	return -1;
-}
-
-function isOnlyCommentsAndWhitespace(content: string): boolean {
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = 0; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (!/\s/.test(char)) return false;
-	}
-
-	return true;
-}
-
-function findLastObjectEndInArray(content: string, startIndex: number, endIndex: number): number {
-	let lastBraceIndex = -1;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < endIndex; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") inLineComment = false;
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "}") lastBraceIndex = i;
-	}
-
-	return lastBraceIndex;
-}
-
-function shouldAddCommaBefore(content: string): boolean {
-	let i = content.length - 1;
-
-	for (let j = content.length - 1; j >= 0; j--) {
-		if (content[j] === "\n") {
-			const lineStart = content.lastIndexOf("\n", j - 1) + 1;
-			const line = content.slice(lineStart, j);
-			const commentIndex = findLineCommentStart(line);
-			if (commentIndex !== -1) {
-				i = lineStart + commentIndex - 1;
-			}
-			break;
-		}
-	}
-
-	while (i >= 0 && /\s/.test(content[i] ?? "")) {
-		i--;
-	}
-
-	if (i < 0) return false;
-
-	const lastChar = content[i];
-	return lastChar !== "{" && lastChar !== "[" && lastChar !== ",";
-}
-
-function findLineCommentStart(line: string): number {
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-
-	for (let i = 0; i < line.length - 1; i++) {
-		const char = line[i] ?? "";
-		const next = line[i + 1] ?? "";
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "/" && next === "/") return i;
-	}
-
-	return -1;
-}
-
 function findObjectStartBefore(content: string, fromPos: number): number {
 	let depth = 0;
 	for (let i = fromPos; i >= 0; i--) {

package/src/lib/services/vectorize-create.ts

@@ -7,6 +7,7 @@
 import { join } from "node:path";
 import { $ } from "bun";
 import { getProjectNameFromDir } from "../storage/index.ts";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { addVectorizeBinding, getExistingVectorizeBindings } from "./vectorize-config.ts";
 
 export type VectorizeMetric = "cosine" | "euclidean" | "dot-product";
@@ -128,7 +129,7 @@ export async function createVectorizeIndex(
 	const projectName = await getProjectNameFromDir(projectDir);
 
 	// Get existing Vectorize bindings to determine naming
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir) ?? join(projectDir, "wrangler.jsonc");
 	const existingBindings = await getExistingVectorizeBindings(wranglerPath);
 	const existingCount = existingBindings.length;